From 8e2ea69ee61d4fc99c6c2e23921fddb920a01e73 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Wed, 23 Nov 2022 10:24:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_worldbattle.json | 54 ++++++++++++------- sys/configure/structs/Game.WorldBattleData.go | 2 + 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index 41d9ccd4d..622a8094a 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -14,7 +14,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 102, @@ -31,7 +32,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 103, @@ -48,7 +50,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 104, @@ -65,7 +68,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 105, @@ -82,7 +86,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 106, @@ -99,7 +104,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 107, @@ -116,7 +122,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 108, @@ -133,7 +140,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 109, @@ -150,7 +158,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 110, @@ -167,7 +176,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 111, @@ -184,7 +194,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 112, @@ -201,7 +212,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 113, @@ -218,7 +230,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 114, @@ -235,7 +248,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 115, @@ -252,7 +266,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 116, @@ -269,7 +284,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 117, @@ -286,7 +302,8 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 }, { "id": 118, @@ -303,6 +320,7 @@ "EventList": [ 12, 14 - ] + ], + "playexp": 1000 } ] \ No newline at end of file diff --git a/sys/configure/structs/Game.WorldBattleData.go b/sys/configure/structs/Game.WorldBattleData.go index 3b5c89f30..a3cc32ce8 100644 --- a/sys/configure/structs/Game.WorldBattleData.go +++ b/sys/configure/structs/Game.WorldBattleData.go @@ -18,6 +18,7 @@ type GameWorldBattleData struct { LockSlots []int32 AssistTeam int32 EventList []int32 + Playexp int32 } const TypeId_GameWorldBattleData = 1096332216 @@ -86,6 +87,7 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["playexp"].(float64); !_ok_ { err = errors.New("playexp error"); return }; _v.Playexp = int32(_tempNum_) } return } From 2626616cc2bcafce470e71aabe3689b25bbbbe32 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 23 Nov 2022 10:29:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=87=E6=98=9F=E6=B2=A1=E7=BB=99?= =?UTF-8?q?=E5=A4=A9=E8=B5=8B=E7=82=B9=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_herostarup.json | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/bin/json/game_herostarup.json b/bin/json/game_herostarup.json index 430927df6..5e8b1382c 100644 --- a/bin/json/game_herostarup.json +++ b/bin/json/game_herostarup.json @@ -1526,7 +1526,13 @@ "needracestar": 5, "needracenum": 5, "gold": 10000, - "starup": [] + "starup": [ + { + "a": "item", + "t": "90001", + "n": 1 + } + ] }, { "key": 94, @@ -1619,7 +1625,13 @@ "needracestar": 5, "needracenum": 5, "gold": 10000, - "starup": [] + "starup": [ + { + "a": "item", + "t": "90002", + "n": 1 + } + ] }, { "key": 100, @@ -3468,7 +3480,13 @@ "needracestar": 4, "needracenum": 4, "gold": 10000, - "starup": [] + "starup": [ + { + "a": "item", + "t": "90003", + "n": 1 + } + ] }, { "key": 213, From c9f961186dff6b6e7269a368b26e3cdcedf7b9b1 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 23 Nov 2022 11:16:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=B3=E5=8D=A1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_combatbox.json | 38 ++++- bin/json/game_combatlevel.json | 294 ++++----------------------------- 2 files changed, 63 insertions(+), 269 deletions(-) diff --git a/bin/json/game_combatbox.json b/bin/json/game_combatbox.json index a06f3545c..3316ae4d8 100644 --- a/bin/json/game_combatbox.json +++ b/bin/json/game_combatbox.json @@ -1,15 +1,15 @@ [ { "id": 10001, - "drop": 1001 + "drop": 1002 }, { "id": 10002, - "drop": 1001 + "drop": 1002 }, { "id": 10003, - "drop": 1001 + "drop": 1002 }, { "id": 10004, @@ -58,5 +58,37 @@ { "id": 10015, "drop": 1001 + }, + { + "id": 10101, + "drop": 1001 + }, + { + "id": 10102, + "drop": 1001 + }, + { + "id": 10103, + "drop": 1001 + }, + { + "id": 10301, + "drop": 1001 + }, + { + "id": 10302, + "drop": 1001 + }, + { + "id": 10401, + "drop": 1001 + }, + { + "id": 10402, + "drop": 1001 + }, + { + "id": 10403, + "drop": 1001 } ] \ No newline at end of file diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index faf789660..ecfa969d0 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -1,18 +1,18 @@ [ { "id": 10001, - "scene": "LevelDemo_Fcamer 1", - "formatList": [ - 101011, - 101021 - ], + "scene": "LevelDemo_Fcamer_1_1", + "formatList": [], "droplist": [ 10001, - 10002 + 10002, + 10003 ], "passformatList": [], "passdroplist": [ - 10001 + 10001, + 10002, + 10003 ], "award": [ { @@ -24,17 +24,18 @@ }, { "id": 10002, - "scene": "LevelDemo", - "formatList": [ - 110212, - 110213 - ], + "scene": "LevelDemo_Fcamer_1_2", + "formatList": [], "droplist": [ - 10002 + 10101, + 10102, + 10103 ], "passformatList": [], "passdroplist": [ - 10002 + 10101, + 10102, + 10103 ], "award": [ { @@ -46,17 +47,16 @@ }, { "id": 10003, - "scene": "LevelDemo", - "formatList": [ - 110213, - 110214 - ], + "scene": "LevelDemo_Fcamer_1_3", + "formatList": [], "droplist": [ - 10003 + 10301, + 10302 ], "passformatList": [], "passdroplist": [ - 10003 + 10301, + 10302 ], "award": [ { @@ -67,255 +67,17 @@ ] }, { - "id": 20001, - "scene": "LevelDemo", - "formatList": [ - 110214, - 110215 - ], + "id": 10004, + "scene": "LevelDemo_Fcamer_1_4", + "formatList": [], "droplist": [ - 10004 + 10401, + 10402, + 10403 ], "passformatList": [], "passdroplist": [ - 10004 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 20002, - "scene": "LevelDemo", - "formatList": [ - 110215, - 110216 - ], - "droplist": [ - 10005 - ], - "passformatList": [], - "passdroplist": [ - 10005 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 20003, - "scene": "LevelDemo", - "formatList": [ - 110216, - 120031 - ], - "droplist": [ - 10006 - ], - "passformatList": [], - "passdroplist": [ - 10006 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 30001, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120031, - 120032 - ], - "droplist": [ - 10007 - ], - "passformatList": [], - "passdroplist": [ - 10007 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 30002, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120032, - 120033 - ], - "droplist": [ - 10008 - ], - "passformatList": [], - "passdroplist": [ - 10008 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 30003, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120033, - 120034 - ], - "droplist": [ - 10009 - ], - "passformatList": [], - "passdroplist": [ - 10009 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 40001, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120034, - 120035 - ], - "droplist": [ - 10010 - ], - "passformatList": [], - "passdroplist": [ - 10010 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 40002, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120035 - ], - "droplist": [ - 10011 - ], - "passformatList": [], - "passdroplist": [ - 10011 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 40003, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 120036 - ], - "droplist": [ - 10012 - ], - "passformatList": [], - "passdroplist": [ - 10012 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 50001, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 130011 - ], - "droplist": [ - 10013 - ], - "passformatList": [], - "passdroplist": [ - 10013 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 50002, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 130012 - ], - "droplist": [ - 10014 - ], - "passformatList": [], - "passdroplist": [ - 10014 - ], - "award": [ - { - "a": "attr", - "t": "gold", - "n": 1650 - } - ] - }, - { - "id": 50003, - "scene": "LevelDemo_Fcamer", - "formatList": [ - 130013 - ], - "droplist": [ - 10015 - ], - "passformatList": [], - "passdroplist": [ - 10015 + 10403 ], "award": [ {