From 3d3d2f117b5f4d0698c581088a1186c4996125fc Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 13 Sep 2023 17:07:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=81=E5=8C=A0=E9=93=BA=E9=A1=BE=E5=AE=A2?= =?UTF-8?q?=E6=94=B6=E8=B4=AD=E8=A3=85=E5=A4=87=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_combatlevel.json | 2 +- bin/json/game_dragonplay.json | 16 ++- bin/json/game_gameklotski.json | 4 - bin/json/game_gm.json | 10 ++ bin/json/game_item.json | 4 +- bin/json/game_mainstage.json | 187 +++++++++++++++++++++++++++++++ bin/json/game_rdtasknpc.json | 27 +++-- bin/json/game_skillafteratk.json | 2 +- bin/json/game_skillatk.json | 17 +-- bin/json/game_skillbuff.json | 2 +- bin/json/game_skillpassive.json | 2 +- bin/json/game_worldtask.json | 2 +- modules/smithy/api_trade.go | 16 +-- modules/smithy/model_trade.go | 12 +- 14 files changed, 255 insertions(+), 48 deletions(-) diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index 968ca5415..75d34e893 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -267,7 +267,7 @@ }, { "id": 10008, - "scene": "leveldemo_fcamer_1_8", + "scene": "leveldemo_fcamer_dragoncave", "levelname": "Save the holy tree", "maintask": [ 11187001 diff --git a/bin/json/game_dragonplay.json b/bin/json/game_dragonplay.json index aae415714..5cfdb808a 100644 --- a/bin/json/game_dragonplay.json +++ b/bin/json/game_dragonplay.json @@ -43,7 +43,13 @@ "exp": 200, "time": 1, "cd": 0, - "deplete": [], + "deplete": [ + { + "a": "item", + "t": "24012001", + "n": 1 + } + ], "bubble": 14005, "group": 0 }, @@ -91,7 +97,13 @@ "exp": 300, "time": 1, "cd": 0, - "deplete": [], + "deplete": [ + { + "a": "item", + "t": "24012002", + "n": 1 + } + ], "bubble": 14005, "group": 0 }, diff --git a/bin/json/game_gameklotski.json b/bin/json/game_gameklotski.json index e99142774..a99ce67a4 100644 --- a/bin/json/game_gameklotski.json +++ b/bin/json/game_gameklotski.json @@ -11,10 +11,6 @@ "k": 2, "v": 3 }, - { - "k": 4, - "v": 0 - }, { "k": 4, "v": 4 diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index 2448ea378..e23ab8773 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -428,5 +428,15 @@ }, "data": " ", "prefix": "bingo:opencond" + }, + { + "id": 46, + "type": 4, + "text": { + "key": "GM_GM_text_46", + "text": "武馆" + }, + "data": "137", + "prefix": "" } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 871ee57de..7996ad5d1 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -19809,7 +19809,7 @@ "access": [], "use_skip": 0, "upper_limit": 0, - "img": "", + "img": "item_24012001", "intr": { "key": "item_item_intr_408", "text": "" @@ -19855,7 +19855,7 @@ "access": [], "use_skip": 0, "upper_limit": 0, - "img": "", + "img": "item_24012002", "intr": { "key": "item_item_intr_409", "text": "" diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 9b224c254..0cbf13259 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -6,6 +6,7 @@ "previous_group_id": [], "previoustage": 0, "Episodetype": 0, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -74,6 +75,7 @@ "previous_group_id": [], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -182,6 +184,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -252,6 +255,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -334,6 +338,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -442,6 +447,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -526,6 +532,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -608,6 +615,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -716,6 +724,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -786,6 +795,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -856,6 +866,7 @@ ], "previoustage": 0, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -964,6 +975,7 @@ ], "previoustage": 1100110, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -1072,6 +1084,7 @@ ], "previoustage": 1100111, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -1180,6 +1193,7 @@ ], "previoustage": 1100112, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -1288,6 +1302,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -1356,6 +1371,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -1424,6 +1440,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 2, "move_type": 1, @@ -1492,6 +1509,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 2, "move_type": 1, @@ -1560,6 +1578,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 2, "move_type": 1, @@ -1666,6 +1685,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 2, "move_type": 1, @@ -1734,6 +1754,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 2, "move_type": 1, @@ -1840,6 +1861,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -1946,6 +1968,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -2052,6 +2075,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 2, "move_type": 1, @@ -2120,6 +2144,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -2186,6 +2211,7 @@ "previous_group_id": [], "previoustage": 0, "Episodetype": 9, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -2292,6 +2318,7 @@ ], "previoustage": 0, "Episodetype": 0, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -2398,6 +2425,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -2507,6 +2535,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -2618,6 +2647,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -2729,6 +2759,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -2845,6 +2876,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -2922,6 +2954,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -3033,6 +3066,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -3101,6 +3135,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -3175,6 +3210,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -3249,6 +3285,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -3323,6 +3360,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -3393,6 +3431,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -3463,6 +3502,7 @@ ], "previoustage": 0, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -3574,6 +3614,7 @@ ], "previoustage": 1100213, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -3685,6 +3726,7 @@ ], "previoustage": 1100214, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -3796,6 +3838,7 @@ ], "previoustage": 0, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -3907,6 +3950,7 @@ ], "previoustage": 1100216, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -4018,6 +4062,7 @@ ], "previoustage": 1100217, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -4129,6 +4174,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -4197,6 +4243,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -4276,6 +4323,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -4356,6 +4404,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -4424,6 +4473,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -4538,6 +4588,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -4612,6 +4663,7 @@ ], "previoustage": 0, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -4728,6 +4780,7 @@ ], "previoustage": 1100225, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -4844,6 +4897,7 @@ ], "previoustage": 1100226, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -4960,6 +5014,7 @@ ], "previoustage": 1100227, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -5076,6 +5131,7 @@ ], "previoustage": 1100228, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -5192,6 +5248,7 @@ ], "previoustage": 1100229, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -5308,6 +5365,7 @@ ], "previoustage": 1100230, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -5424,6 +5482,7 @@ ], "previoustage": 1100231, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -5540,6 +5599,7 @@ ], "previoustage": 0, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -5656,6 +5716,7 @@ ], "previoustage": 1100233, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -5772,6 +5833,7 @@ ], "previoustage": 1100234, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -5888,6 +5950,7 @@ ], "previoustage": 1100235, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -6004,6 +6067,7 @@ ], "previoustage": 1100236, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -6120,6 +6184,7 @@ ], "previoustage": 1100237, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -6236,6 +6301,7 @@ ], "previoustage": 1100238, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -6352,6 +6418,7 @@ ], "previoustage": 1100239, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -6468,6 +6535,7 @@ ], "previoustage": 0, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -6584,6 +6652,7 @@ ], "previoustage": 1100241, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -6700,6 +6769,7 @@ ], "previoustage": 1100242, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -6816,6 +6886,7 @@ ], "previoustage": 1100243, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -6932,6 +7003,7 @@ ], "previoustage": 1100244, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -7048,6 +7120,7 @@ ], "previoustage": 1100245, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -7164,6 +7237,7 @@ ], "previoustage": 1100246, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -7280,6 +7354,7 @@ ], "previoustage": 1100247, "Episodetype": 8, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -7396,6 +7471,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -7512,6 +7588,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -7586,6 +7663,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -7660,6 +7738,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -7735,6 +7814,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -7809,6 +7889,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -7883,6 +7964,7 @@ ], "previoustage": 0, "Episodetype": 2, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -7951,6 +8033,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -8025,6 +8108,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -8099,6 +8183,7 @@ ], "previoustage": 0, "Episodetype": 5, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -8167,6 +8252,7 @@ ], "previoustage": 0, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -8283,6 +8369,7 @@ ], "previoustage": 1100259, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -8399,6 +8486,7 @@ ], "previoustage": 1100260, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -8515,6 +8603,7 @@ ], "previoustage": 1100261, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -8631,6 +8720,7 @@ ], "previoustage": 1100262, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -8747,6 +8837,7 @@ ], "previoustage": 1100263, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -8863,6 +8954,7 @@ ], "previoustage": 1100264, "Episodetype": 4, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -8979,6 +9071,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9053,6 +9146,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9127,6 +9221,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9203,6 +9298,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9277,6 +9373,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9351,6 +9448,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9425,6 +9523,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9501,6 +9600,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9575,6 +9675,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9649,6 +9750,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9723,6 +9825,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9799,6 +9902,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9875,6 +9979,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -9991,6 +10096,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -10065,6 +10171,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -10139,6 +10246,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -10213,6 +10321,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -10329,6 +10438,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -10407,6 +10517,7 @@ "previous_group_id": [], "previoustage": 0, "Episodetype": 9, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -10487,6 +10598,7 @@ ], "previoustage": 0, "Episodetype": 0, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -10555,6 +10667,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 6, "venturemodelscale": 1, "move_type": 0, @@ -10671,6 +10784,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 10, "venturemodelscale": 1, "move_type": 0, @@ -10787,6 +10901,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 10, "venturemodelscale": 1, "move_type": 0, @@ -10903,6 +11018,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 10, "venturemodelscale": 1, "move_type": 0, @@ -11019,6 +11135,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 10, "venturemodelscale": 1, "move_type": 0, @@ -11087,6 +11204,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 10, "venturemodelscale": 1, "move_type": 0, @@ -11155,6 +11273,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 10, "venturemodelscale": 1, "move_type": 0, @@ -11271,6 +11390,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 10, "venturemodelscale": 1, "move_type": 0, @@ -11387,6 +11507,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 10, "venturemodelscale": 1, "move_type": 0, @@ -11455,6 +11576,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 10, "venturemodelscale": 1, "move_type": 0, @@ -11571,6 +11693,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 10, "venturemodelscale": 1, "move_type": 0, @@ -11687,6 +11810,7 @@ ], "previoustage": 0, "Episodetype": 7, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -11755,6 +11879,7 @@ ], "previoustage": 0, "Episodetype": 0, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -11823,6 +11948,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -11891,6 +12017,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -12007,6 +12134,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -12123,6 +12251,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -12191,6 +12320,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -12307,6 +12437,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -12423,6 +12554,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -12539,6 +12671,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -12607,6 +12740,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -12675,6 +12809,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -12791,6 +12926,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -12859,6 +12995,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -12975,6 +13112,7 @@ ], "previoustage": 0, "Episodetype": 3, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -13043,6 +13181,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -13159,6 +13298,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -13275,6 +13415,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -13391,6 +13532,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -13507,6 +13649,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -13623,6 +13766,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -13739,6 +13883,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -13855,6 +14000,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -13971,6 +14117,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -14087,6 +14234,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -14203,6 +14351,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -14319,6 +14468,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -14435,6 +14585,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -14551,6 +14702,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -14667,6 +14819,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -14783,6 +14936,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -14899,6 +15053,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -15015,6 +15170,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -15131,6 +15287,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -15247,6 +15404,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -15363,6 +15521,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -15479,6 +15638,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -15595,6 +15755,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -15711,6 +15872,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -15827,6 +15989,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -15943,6 +16106,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -16059,6 +16223,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -16175,6 +16340,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -16291,6 +16457,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -16407,6 +16574,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -16523,6 +16691,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -16639,6 +16808,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -16755,6 +16925,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -16871,6 +17042,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -16987,6 +17159,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -17103,6 +17276,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -17219,6 +17393,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -17335,6 +17510,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -17451,6 +17627,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -17567,6 +17744,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -17683,6 +17861,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -17799,6 +17978,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -17915,6 +18095,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -18031,6 +18212,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -18147,6 +18329,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -18263,6 +18446,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -18379,6 +18563,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -18495,6 +18680,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, @@ -18611,6 +18797,7 @@ ], "previoustage": 0, "Episodetype": 1, + "stage_param": 0, "venturemodelspeed": 0, "venturemodelscale": 0, "move_type": 0, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 322a87ca3..b0108fd75 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -380,6 +380,7 @@ "Levelid": 0, "datas": [ "GameMain", + "20020_熊猫_船甲板", "901" ], "event": [ @@ -488,8 +489,8 @@ "901" ], "event": [ - 2, - 10120 + 1, + 102 ], "goto": 0 }, @@ -531,8 +532,8 @@ "901" ], "event": [ - 2, - 10140 + 1, + 103 ], "goto": 0 }, @@ -585,9 +586,13 @@ "Levelid": 0, "datas": [ "GameMain", + "20020_熊猫_船甲板", "901" ], - "event": [], + "event": [ + 2, + 10162 + ], "goto": 0 }, { @@ -615,8 +620,8 @@ "901" ], "event": [ - 2, - 10180 + 1, + 103 ], "goto": 0 }, @@ -626,12 +631,12 @@ "Levelid": 0, "datas": [ "GameMain", - "20020_邦尼兔_常驻", + "20020_熊猫_船甲板", "901" ], "event": [ 2, - 10190 + 10180 ], "goto": 0 }, @@ -669,7 +674,7 @@ ], "event": [ 2, - 10210 + 10201 ], "goto": 0 }, @@ -888,7 +893,7 @@ ], "event": [ 2, - 10230 + 10202 ], "goto": 0 }, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index f86658cfc..e3399adc2 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -34170,7 +34170,7 @@ { "Id": 244001214, "EmitPR": 1000, - "From": 2, + "From": 12, "Where": [], "Order": "", "Limit": 1, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 9052aed7f..d468ac22a 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -17564,7 +17564,7 @@ { "id": 133001111, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_133001111", @@ -17813,8 +17813,7 @@ "text": "巫嘎对敌方1个目标造成攻击力300%的伤害，并附加1回合[color=#e5621b]冰冻[/color]状态。" }, "buffid": [ - 390001106, - 390001007 + 390001106 ], "map": "" }, @@ -17846,8 +17845,7 @@ "text": "伤害提升至310%。" }, "buffid": [ - 390001106, - 390001007 + 390001106 ], "map": "" }, @@ -17879,8 +17877,7 @@ "text": "伤害提升至320%。" }, "buffid": [ - 390001106, - 390001007 + 390001106 ], "map": "" }, @@ -17912,8 +17909,7 @@ "text": "伤害提升至330%。" }, "buffid": [ - 390001106, - 390001007 + 390001106 ], "map": "" }, @@ -17945,8 +17941,7 @@ "text": "伤害提升至340%。" }, "buffid": [ - 390001106, - 390001007 + 390001106 ], "map": "" }, diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 197f4ab49..727603545 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -3764,7 +3764,7 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001431", - "text": "下一次攻击暴击率提升100%。" + "text": "下一次攻击暴击率提升100%，并提高一定暴击伤害。" }, "BuffType": 67, "EffectArgu": [ diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 534fc53b2..1e75f8b2f 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -2678,7 +2678,7 @@ "Id": 435004211, "When": 2, "FromCheck": "Target=3", - "TargetCheck": "3", + "TargetCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index be0af1ae3..cd6778b4d 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -71,7 +71,7 @@ "completetask": [ 12070020 ], - "deliver_npc": 100108, + "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, "tasktips": 0, diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go index 071673889..4bcc8ad81 100644 --- a/modules/smithy/api_trade.go +++ b/modules/smithy/api_trade.go @@ -41,15 +41,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err return } } - - if _, ok := cus.Customers[req.CustomerId]; !ok { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ReqParameterError, - Title: pb.ErrorCode_ReqParameterError.ToString(), - } - return - } - conf, err := this.module.configure.GetSmithyCustomerConf(cus.Customers[req.CustomerId].CustomerId) + conf, err := this.module.configure.GetSmithyCustomerConf(1) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, @@ -67,10 +59,10 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err EquipIds: req.EquipIds, } - if cus != nil { - rsp.Customers = cus.Customers - } else { + if len(cus.Customers) == 0 { rsp.Customers = make(map[string]*pb.CustomerInfo) + } else { + rsp.Customers = cus.Customers } session.SendMsg(string(this.module.GetType()), "sell", rsp) diff --git a/modules/smithy/model_trade.go b/modules/smithy/model_trade.go index 019d3afd5..4a1733063 100644 --- a/modules/smithy/model_trade.go +++ b/modules/smithy/model_trade.go @@ -143,7 +143,17 @@ func (s *modelTrade) updateCustomer(uid string, customerId string) (*pb.DBCustom limit := s.module.modelStove.StoveSkillAddCustomer(uid) left := limit - cus.Total if left < 0 { - return nil, comm.NewCustomError(pb.ErrorCode_SmithyCustomerLimit) + left = 0 + cus.LastRefreshTime = configure.Now().Unix() + update := map[string]interface{}{ + "customers": cus.Customers, + "total": cus.Total, + "lastRefreshTime": cus.LastRefreshTime, + } + if err := s.Change(uid, update); err != nil { + return nil, err + } + return cus, nil } randCustomerId := s.getCustomerRandom() conf, err := s.module.configure.GetSmithyCustomerConf(randCustomerId)