From bde7f6157847206fa57f918ef158e860e49f8d2e Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 1 Sep 2023 11:00:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BB=E7=BA=BFboos?= =?UTF-8?q?=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 2 +- bin/json/game_buzkashimount.json | 234 +- bin/json/game_buzkashitrack.json | 12 +- bin/json/game_circulate.json | 1004 +++---- bin/json/game_global.json | 3 + bin/json/game_huntingopentime.json | 26 +- bin/json/game_mainboss.json | 2642 +++++++++++++++++ bin/json/game_mainchapter.json | 36 +- bin/json/game_mainstage.json | 432 +-- bin/json/game_monsterformat.json | 24 +- bin/json/game_skillafteratk.json | 40 +- bin/json/game_skillatk.json | 76 +- bin/json/game_skillbuff.json | 34 + modules/mainline/api_booschallenge.go | 94 + modules/mainline/api_booschallengeover.go | 90 + modules/mainline/api_challengeover.go | 18 +- modules/mainline/api_info.go | 21 + modules/mainline/comp_configure.go | 24 +- modules/mainline/model_mainline.go | 26 +- modules/parkour/api_changemts.go | 20 +- modules/parkour/api_invite.go | 22 +- modules/parkour/api_invitehandle.go | 20 +- modules/parkour/api_jointeam.go | 24 +- modules/parkour/api_racematch.go | 13 +- modules/parkour/configure.go | 20 - modules/parkour/model_parkour.go | 10 +- pb/mainline_db.pb.go | 244 +- pb/mainline_msg.pb.go | 410 ++- sys/configure/structs/Game.BuzkashiMount.go | 14 +- .../structs/Game.BuzkashiMountData.go | 8 + sys/configure/structs/Game.MainBoss.go | 42 + sys/configure/structs/Game.MainBossData.go | 73 + sys/configure/structs/Game.MainChapterData.go | 2 + sys/configure/structs/Tables.go | 7 + sys/configure/structs/game.globalData.go | 6 + 35 files changed, 4559 insertions(+), 1214 deletions(-) create mode 100644 bin/json/game_mainboss.json create mode 100644 modules/mainline/api_booschallenge.go create mode 100644 modules/mainline/api_booschallengeover.go create mode 100644 sys/configure/structs/Game.MainBoss.go create mode 100644 sys/configure/structs/Game.MainBossData.go diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 6d2c81c05..6301d3006 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -573,7 +573,7 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": 0, - "Numrounds": 100 + "Numrounds": 60 }, { "id": 118, diff --git a/bin/json/game_buzkashimount.json b/bin/json/game_buzkashimount.json index 61335d960..00efd8d35 100644 --- a/bin/json/game_buzkashimount.json +++ b/bin/json/game_buzkashimount.json @@ -1,77 +1,263 @@ [ { "id": "20030001", + "type": 1, "name": { - "key": "", - "text": "" + "key": "buzkashi_Mount_name_1", + "text": "测试名称1" }, "intr": { - "key": "", - "text": "" + "key": "buzkashi_Mount_intr_1", + "text": "测试描述1" }, "Color": 1, - "Img": "", + "Img": "by_img_tx", "access": [ 107 ], - "model": "", + "model": "20030001_3", "point": "", "stime": 20, - "etime": 80, + "etime": 0, "hp": 7, "moderate": 10, "sprint": 200, "acceleration": 100, - "deceleration": 100 + "deceleration": 100, + "itemsprint": 100, + "caddtime": 0, + "csubtime": 0 + }, + { + "id": "20030001", + "type": 2, + "name": { + "key": "buzkashi_Mount_name_2", + "text": "测试名称2" + }, + "intr": { + "key": "buzkashi_Mount_intr_2", + "text": "测试描述2" + }, + "Color": 1, + "Img": "by_img_tx", + "access": [ + 107 + ], + "model": "20030001_3", + "point": "", + "stime": 20, + "etime": 0, + "hp": 7, + "moderate": 10, + "sprint": 200, + "acceleration": 100, + "deceleration": 100, + "itemsprint": 100, + "caddtime": 0, + "csubtime": 0 + }, + { + "id": "20030001", + "type": 3, + "name": { + "key": "buzkashi_Mount_name_3", + "text": "测试名称3" + }, + "intr": { + "key": "buzkashi_Mount_intr_3", + "text": "测试描述3" + }, + "Color": 1, + "Img": "by_img_tx", + "access": [ + 107 + ], + "model": "20030001_3", + "point": "", + "stime": 20, + "etime": 40, + "hp": 7, + "moderate": 10, + "sprint": 200, + "acceleration": 100, + "deceleration": 100, + "itemsprint": 100, + "caddtime": 10, + "csubtime": 10 }, { "id": "20030002", + "type": 1, "name": { - "key": "", - "text": "" + "key": "buzkashi_Mount_name_4", + "text": "测试名称4" }, "intr": { - "key": "", - "text": "" + "key": "buzkashi_Mount_intr_4", + "text": "测试描述4" }, "Color": 1, - "Img": "", + "Img": "by_img_tx2", "access": [ 107 ], - "model": "", + "model": "20030001_3", "point": "", "stime": 20, - "etime": 80, + "etime": 0, "hp": 7, "moderate": 10, "sprint": 200, "acceleration": 100, - "deceleration": 100 + "deceleration": 100, + "itemsprint": 100, + "caddtime": 0, + "csubtime": 0 + }, + { + "id": "20030002", + "type": 2, + "name": { + "key": "buzkashi_Mount_name_5", + "text": "测试名称5" + }, + "intr": { + "key": "buzkashi_Mount_intr_5", + "text": "测试描述5" + }, + "Color": 1, + "Img": "by_img_tx2", + "access": [ + 107 + ], + "model": "20030001_3", + "point": "", + "stime": 20, + "etime": 0, + "hp": 7, + "moderate": 10, + "sprint": 200, + "acceleration": 100, + "deceleration": 100, + "itemsprint": 100, + "caddtime": 0, + "csubtime": 0 + }, + { + "id": "20030002", + "type": 3, + "name": { + "key": "buzkashi_Mount_name_6", + "text": "测试名称6" + }, + "intr": { + "key": "buzkashi_Mount_intr_6", + "text": "测试描述6" + }, + "Color": 1, + "Img": "by_img_tx2", + "access": [ + 107 + ], + "model": "20030001_3", + "point": "", + "stime": 20, + "etime": 0, + "hp": 7, + "moderate": 10, + "sprint": 200, + "acceleration": 100, + "deceleration": 100, + "itemsprint": 100, + "caddtime": 0, + "csubtime": 0 }, { "id": "20030003", + "type": 1, "name": { - "key": "", - "text": "" + "key": "buzkashi_Mount_name_7", + "text": "测试名称7" }, "intr": { - "key": "", - "text": "" + "key": "buzkashi_Mount_intr_7", + "text": "测试描述7" }, "Color": 1, - "Img": "", + "Img": "by_img_tx3", "access": [ 107 ], - "model": "", + "model": "20030001_3", "point": "", "stime": 20, - "etime": 80, + "etime": 0, "hp": 7, "moderate": 10, "sprint": 200, "acceleration": 100, - "deceleration": 100 + "deceleration": 100, + "itemsprint": 100, + "caddtime": 0, + "csubtime": 0 + }, + { + "id": "20030003", + "type": 2, + "name": { + "key": "buzkashi_Mount_name_8", + "text": "测试名称8" + }, + "intr": { + "key": "buzkashi_Mount_intr_8", + "text": "测试描述8" + }, + "Color": 1, + "Img": "by_img_tx3", + "access": [ + 107 + ], + "model": "20030001_3", + "point": "", + "stime": 20, + "etime": 0, + "hp": 7, + "moderate": 10, + "sprint": 200, + "acceleration": 100, + "deceleration": 100, + "itemsprint": 100, + "caddtime": 0, + "csubtime": 0 + }, + { + "id": "20030003", + "type": 3, + "name": { + "key": "buzkashi_Mount_name_9", + "text": "测试名称9" + }, + "intr": { + "key": "buzkashi_Mount_intr_9", + "text": "测试描述9" + }, + "Color": 1, + "Img": "by_img_tx3", + "access": [ + 107 + ], + "model": "20030001_3", + "point": "", + "stime": 20, + "etime": 0, + "hp": 7, + "moderate": 10, + "sprint": 200, + "acceleration": 100, + "deceleration": 100, + "itemsprint": 100, + "caddtime": 0, + "csubtime": 0 } ] \ No newline at end of file diff --git a/bin/json/game_buzkashitrack.json b/bin/json/game_buzkashitrack.json index e5fb3eddf..4eb823392 100644 --- a/bin/json/game_buzkashitrack.json +++ b/bin/json/game_buzkashitrack.json @@ -27,16 +27,16 @@ "id": 100004, "track": "Track", "type": 3, - "startPos": 1, - "endPos": 2, - "local": 1 + "startPos": 4, + "endPos": 5, + "local": 0 }, { "id": 100005, "track": "Track", "type": 4, - "startPos": 2, - "endPos": 3, - "local": 2 + "startPos": 5, + "endPos": 6, + "local": 1 } ] \ No newline at end of file diff --git a/bin/json/game_circulate.json b/bin/json/game_circulate.json index 66bf27a4b..df52fbbeb 100644 --- a/bin/json/game_circulate.json +++ b/bin/json/game_circulate.json @@ -225,7 +225,7 @@ "model_display": 13002 }, { - "id": 210000006, + "id": 21000006, "name": 2, "restriction": 1, "battlereadyID": 130, @@ -11270,7 +11270,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_301", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -11315,7 +11315,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_302", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -11360,7 +11360,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_303", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -11405,7 +11405,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_304", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -11450,7 +11450,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_305", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -11495,7 +11495,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_306", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -11540,7 +11540,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_307", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -11585,7 +11585,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_308", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -11630,7 +11630,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_309", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -11675,7 +11675,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_310", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -11720,7 +11720,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_311", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -11765,7 +11765,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_312", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -11810,7 +11810,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_313", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -11855,7 +11855,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_314", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -11900,7 +11900,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_315", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -11945,7 +11945,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_316", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -11990,7 +11990,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_317", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -12035,7 +12035,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_318", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -12080,7 +12080,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_319", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -12125,7 +12125,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_320", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -12170,7 +12170,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_321", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -12215,7 +12215,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_322", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -12260,7 +12260,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_323", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -12305,7 +12305,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_324", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -12350,7 +12350,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_325", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -12395,7 +12395,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_326", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -12440,7 +12440,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_327", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -12485,7 +12485,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_328", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -12530,7 +12530,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_329", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -12575,7 +12575,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_330", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -12620,7 +12620,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_331", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -12665,7 +12665,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_332", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -12710,7 +12710,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_333", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -12755,7 +12755,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_334", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -12800,7 +12800,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_335", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -12845,7 +12845,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_336", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -12890,7 +12890,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_337", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -12935,7 +12935,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_338", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -12980,7 +12980,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_339", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -13025,7 +13025,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_340", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -13070,7 +13070,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_341", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -13115,7 +13115,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_342", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -13160,7 +13160,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_343", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -13205,7 +13205,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_344", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -13250,7 +13250,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_345", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -13295,7 +13295,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_346", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -13340,7 +13340,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_347", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -13385,7 +13385,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_348", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -13430,7 +13430,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_349", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -13475,7 +13475,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_350", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -13520,7 +13520,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_351", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -13565,7 +13565,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_352", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -13610,7 +13610,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_353", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -13655,7 +13655,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_354", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -13700,7 +13700,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_355", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -13745,7 +13745,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_356", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -13790,7 +13790,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_357", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -13835,7 +13835,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_358", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -13880,7 +13880,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_359", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -13925,7 +13925,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_360", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -13970,7 +13970,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_361", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -14015,7 +14015,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_362", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -14060,7 +14060,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_363", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -14105,7 +14105,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_364", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -14150,7 +14150,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_365", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -14195,7 +14195,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_366", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -14240,7 +14240,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_367", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -14285,7 +14285,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_368", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -14330,7 +14330,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_369", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -14375,7 +14375,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_370", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -14420,7 +14420,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_371", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -14465,7 +14465,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_372", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -14510,7 +14510,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_373", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -14555,7 +14555,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_374", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -14600,7 +14600,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_375", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -14645,7 +14645,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_376", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -14690,7 +14690,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_377", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -14735,7 +14735,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_378", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -14780,7 +14780,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_379", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -14825,7 +14825,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_380", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -14870,7 +14870,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_381", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -14915,7 +14915,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_382", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -14960,7 +14960,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_383", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -15005,7 +15005,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_384", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -15050,7 +15050,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_385", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -15095,7 +15095,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_386", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -15140,7 +15140,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_387", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -15185,7 +15185,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_388", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -15230,7 +15230,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_389", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -15275,7 +15275,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_390", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -15320,7 +15320,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_391", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -15365,7 +15365,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_392", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -15410,7 +15410,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_393", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -15455,7 +15455,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_394", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -15500,7 +15500,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_395", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -15545,7 +15545,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_396", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -15590,7 +15590,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_397", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -15635,7 +15635,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_398", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -15680,7 +15680,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_399", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -15725,7 +15725,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_400", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -15770,7 +15770,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_401", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -15815,7 +15815,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_402", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -15860,7 +15860,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_403", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -15905,7 +15905,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_404", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -15950,7 +15950,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_405", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -15995,7 +15995,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_406", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -16040,7 +16040,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_407", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -16085,7 +16085,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_408", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -16130,7 +16130,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_409", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -16175,7 +16175,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_410", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -16220,7 +16220,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_411", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -16265,7 +16265,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_412", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -16310,7 +16310,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_413", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -16355,7 +16355,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_414", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -16400,7 +16400,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_415", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -16445,7 +16445,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_416", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -16490,7 +16490,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_417", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -16535,7 +16535,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_418", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -16580,7 +16580,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_419", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -16625,7 +16625,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_420", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -16670,7 +16670,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_421", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -16715,7 +16715,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_422", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -16760,7 +16760,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_423", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -16805,7 +16805,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_424", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -16850,7 +16850,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_425", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -16895,7 +16895,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_426", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -16940,7 +16940,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_427", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -16985,7 +16985,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_428", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -17030,7 +17030,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_429", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -17075,7 +17075,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_430", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -17120,7 +17120,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_431", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -17165,7 +17165,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_432", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -17210,7 +17210,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_433", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -17255,7 +17255,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_434", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -17300,7 +17300,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_435", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -17345,7 +17345,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_436", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -17390,7 +17390,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_437", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -17435,7 +17435,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_438", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -17480,7 +17480,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_439", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -17525,7 +17525,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_440", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -17570,7 +17570,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_441", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -17615,7 +17615,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_442", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -17660,7 +17660,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_443", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -17705,7 +17705,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_444", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -17750,7 +17750,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_445", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -17795,7 +17795,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_446", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -17840,7 +17840,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_447", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -17885,7 +17885,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_448", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -17930,7 +17930,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_449", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -17975,7 +17975,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_450", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -18020,7 +18020,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_451", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -18065,7 +18065,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_452", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -18110,7 +18110,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_453", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -18155,7 +18155,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_454", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -18200,7 +18200,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_455", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -18245,7 +18245,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_456", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -18290,7 +18290,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_457", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -18335,7 +18335,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_458", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -18380,7 +18380,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_459", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -18425,7 +18425,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_460", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -18470,7 +18470,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_461", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -18515,7 +18515,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_462", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -18560,7 +18560,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_463", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -18605,7 +18605,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_464", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -18650,7 +18650,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_465", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -18695,7 +18695,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_466", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -18740,7 +18740,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_467", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -18785,7 +18785,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_468", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -18830,7 +18830,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_469", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -18875,7 +18875,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_470", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -18920,7 +18920,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_471", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -18965,7 +18965,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_472", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -19010,7 +19010,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_473", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -19055,7 +19055,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_474", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -19100,7 +19100,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_475", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -19145,7 +19145,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_476", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -19190,7 +19190,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_477", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -19235,7 +19235,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_478", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -19280,7 +19280,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_479", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -19325,7 +19325,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_480", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -19370,7 +19370,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_481", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -19415,7 +19415,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_482", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -19460,7 +19460,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_483", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -19505,7 +19505,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_484", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -19550,7 +19550,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_485", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -19595,7 +19595,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_486", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -19640,7 +19640,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_487", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -19685,7 +19685,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_488", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -19730,7 +19730,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_489", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -19775,7 +19775,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_490", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -19820,7 +19820,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_491", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -19865,7 +19865,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_492", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -19910,7 +19910,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_493", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -19955,7 +19955,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_494", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -20000,7 +20000,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_495", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -20045,7 +20045,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_496", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -20090,7 +20090,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_497", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -20135,7 +20135,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_498", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -20180,7 +20180,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_499", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -20225,7 +20225,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_500", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -20270,7 +20270,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_501", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -20315,7 +20315,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_502", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -20360,7 +20360,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_503", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -20405,7 +20405,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_504", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -20450,7 +20450,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_505", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -20495,7 +20495,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_506", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -20540,7 +20540,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_507", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -20585,7 +20585,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_508", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -20630,7 +20630,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_509", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -20675,7 +20675,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_510", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -20720,7 +20720,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_511", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -20765,7 +20765,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_512", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -20810,7 +20810,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_513", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -20855,7 +20855,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_514", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -20900,7 +20900,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_515", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -20945,7 +20945,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_516", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -20990,7 +20990,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_517", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -21035,7 +21035,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_518", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -21080,7 +21080,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_519", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -21125,7 +21125,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_520", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -21170,7 +21170,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_521", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601001 @@ -21215,7 +21215,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_522", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601002 @@ -21260,7 +21260,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_523", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601003 @@ -21305,7 +21305,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_524", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601004 @@ -21350,7 +21350,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_525", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601005 @@ -21395,7 +21395,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_526", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601006 @@ -21440,7 +21440,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_527", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601007 @@ -21485,7 +21485,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_528", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601008 @@ -21530,7 +21530,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_529", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601009 @@ -21575,7 +21575,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_530", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601010 @@ -21620,7 +21620,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_531", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -21665,7 +21665,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_532", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -21710,7 +21710,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_533", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -21755,7 +21755,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_534", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -21800,7 +21800,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_535", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -21845,7 +21845,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_536", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -21890,7 +21890,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_537", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -21935,7 +21935,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_538", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -21980,7 +21980,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_539", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -22025,7 +22025,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_540", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -22070,7 +22070,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_541", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601011 @@ -22115,7 +22115,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_542", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601012 @@ -22160,7 +22160,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_543", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601013 @@ -22205,7 +22205,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_544", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601014 @@ -22250,7 +22250,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_545", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601015 @@ -22295,7 +22295,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_546", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601016 @@ -22340,7 +22340,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_547", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601017 @@ -22385,7 +22385,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_548", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601018 @@ -22430,7 +22430,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_549", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601019 @@ -22475,7 +22475,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_550", - "text": "共情阵营之塔" + "text": "直觉阵营之塔" }, "monsterlineup": [ 601020 @@ -22520,7 +22520,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_551", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -22565,7 +22565,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_552", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -22610,7 +22610,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_553", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -22655,7 +22655,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_554", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -22700,7 +22700,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_555", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -22745,7 +22745,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_556", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -22790,7 +22790,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_557", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -22835,7 +22835,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_558", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -22880,7 +22880,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_559", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -22925,7 +22925,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_560", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -22970,7 +22970,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_561", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -23015,7 +23015,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_562", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -23060,7 +23060,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_563", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -23105,7 +23105,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_564", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -23150,7 +23150,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_565", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -23195,7 +23195,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_566", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -23240,7 +23240,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_567", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -23285,7 +23285,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_568", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -23330,7 +23330,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_569", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -23375,7 +23375,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_570", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -23420,7 +23420,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_571", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -23465,7 +23465,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_572", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -23510,7 +23510,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_573", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -23555,7 +23555,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_574", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -23600,7 +23600,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_575", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -23645,7 +23645,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_576", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -23690,7 +23690,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_577", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -23735,7 +23735,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_578", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -23780,7 +23780,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_579", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -23825,7 +23825,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_580", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -23870,7 +23870,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_581", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -23915,7 +23915,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_582", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -23960,7 +23960,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_583", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -24005,7 +24005,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_584", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -24050,7 +24050,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_585", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -24095,7 +24095,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_586", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -24140,7 +24140,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_587", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -24185,7 +24185,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_588", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -24230,7 +24230,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_589", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -24275,7 +24275,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_590", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -24320,7 +24320,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_591", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -24365,7 +24365,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_592", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -24410,7 +24410,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_593", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -24455,7 +24455,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_594", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -24500,7 +24500,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_595", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -24545,7 +24545,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_596", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -24590,7 +24590,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_597", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -24635,7 +24635,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_598", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -24680,7 +24680,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_599", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -24725,7 +24725,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_600", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -24770,7 +24770,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_601", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -24815,7 +24815,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_602", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -24860,7 +24860,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_603", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -24905,7 +24905,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_604", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -24950,7 +24950,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_605", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -24995,7 +24995,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_606", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -25040,7 +25040,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_607", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -25085,7 +25085,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_608", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -25130,7 +25130,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_609", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -25175,7 +25175,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_610", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -25220,7 +25220,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_611", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -25265,7 +25265,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_612", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -25310,7 +25310,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_613", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -25355,7 +25355,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_614", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -25400,7 +25400,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_615", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -25445,7 +25445,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_616", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -25490,7 +25490,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_617", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -25535,7 +25535,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_618", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -25580,7 +25580,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_619", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -25625,7 +25625,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_620", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -25670,7 +25670,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_621", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -25715,7 +25715,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_622", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -25760,7 +25760,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_623", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -25805,7 +25805,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_624", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -25850,7 +25850,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_625", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -25895,7 +25895,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_626", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -25940,7 +25940,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_627", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -25985,7 +25985,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_628", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -26030,7 +26030,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_629", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -26075,7 +26075,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_630", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -26120,7 +26120,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_631", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -26165,7 +26165,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_632", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -26210,7 +26210,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_633", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -26255,7 +26255,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_634", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -26300,7 +26300,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_635", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -26345,7 +26345,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_636", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -26390,7 +26390,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_637", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -26435,7 +26435,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_638", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -26480,7 +26480,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_639", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -26525,7 +26525,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_640", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -26570,7 +26570,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_641", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -26615,7 +26615,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_642", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -26660,7 +26660,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_643", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -26705,7 +26705,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_644", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -26750,7 +26750,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_645", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -26795,7 +26795,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_646", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -26840,7 +26840,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_647", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -26885,7 +26885,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_648", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -26930,7 +26930,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_649", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -26975,7 +26975,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_650", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -27020,7 +27020,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_651", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -27065,7 +27065,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_652", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -27110,7 +27110,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_653", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -27155,7 +27155,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_654", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -27200,7 +27200,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_655", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -27245,7 +27245,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_656", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -27290,7 +27290,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_657", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -27335,7 +27335,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_658", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -27380,7 +27380,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_659", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -27425,7 +27425,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_660", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -27470,7 +27470,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_661", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -27515,7 +27515,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_662", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -27560,7 +27560,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_663", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -27605,7 +27605,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_664", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -27650,7 +27650,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_665", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -27695,7 +27695,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_666", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -27740,7 +27740,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_667", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -27785,7 +27785,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_668", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -27830,7 +27830,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_669", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -27875,7 +27875,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_670", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -27920,7 +27920,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_671", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -27965,7 +27965,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_672", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -28010,7 +28010,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_673", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -28055,7 +28055,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_674", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -28100,7 +28100,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_675", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -28145,7 +28145,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_676", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -28190,7 +28190,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_677", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -28235,7 +28235,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_678", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -28280,7 +28280,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_679", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -28325,7 +28325,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_680", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -28370,7 +28370,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_681", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -28415,7 +28415,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_682", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -28460,7 +28460,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_683", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -28505,7 +28505,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_684", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -28550,7 +28550,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_685", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -28595,7 +28595,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_686", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -28640,7 +28640,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_687", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -28685,7 +28685,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_688", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -28730,7 +28730,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_689", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -28775,7 +28775,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_690", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -28820,7 +28820,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_691", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -28865,7 +28865,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_692", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -28910,7 +28910,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_693", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -28955,7 +28955,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_694", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -29000,7 +29000,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_695", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -29045,7 +29045,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_696", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -29090,7 +29090,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_697", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -29135,7 +29135,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_698", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -29180,7 +29180,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_699", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -29225,7 +29225,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_700", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -29270,7 +29270,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_701", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -29315,7 +29315,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_702", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -29360,7 +29360,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_703", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -29405,7 +29405,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_704", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -29450,7 +29450,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_705", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -29495,7 +29495,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_706", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -29540,7 +29540,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_707", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -29585,7 +29585,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_708", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -29630,7 +29630,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_709", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -29675,7 +29675,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_710", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -29720,7 +29720,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_711", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -29765,7 +29765,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_712", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -29810,7 +29810,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_713", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -29855,7 +29855,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_714", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -29900,7 +29900,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_715", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -29945,7 +29945,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_716", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -29990,7 +29990,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_717", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -30035,7 +30035,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_718", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -30080,7 +30080,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_719", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -30125,7 +30125,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_720", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -30170,7 +30170,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_721", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -30215,7 +30215,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_722", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -30260,7 +30260,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_723", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -30305,7 +30305,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_724", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -30350,7 +30350,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_725", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -30395,7 +30395,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_726", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -30440,7 +30440,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_727", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -30485,7 +30485,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_728", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -30530,7 +30530,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_729", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -30575,7 +30575,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_730", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -30620,7 +30620,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_731", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -30665,7 +30665,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_732", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -30710,7 +30710,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_733", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -30755,7 +30755,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_734", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -30800,7 +30800,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_735", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -30845,7 +30845,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_736", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -30890,7 +30890,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_737", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -30935,7 +30935,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_738", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -30980,7 +30980,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_739", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -31025,7 +31025,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_740", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -31070,7 +31070,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_741", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -31115,7 +31115,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_742", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -31160,7 +31160,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_743", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -31205,7 +31205,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_744", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -31250,7 +31250,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_745", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -31295,7 +31295,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_746", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -31340,7 +31340,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_747", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -31385,7 +31385,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_748", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -31430,7 +31430,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_749", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -31475,7 +31475,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_750", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -31520,7 +31520,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_751", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -31565,7 +31565,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_752", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -31610,7 +31610,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_753", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -31655,7 +31655,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_754", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -31700,7 +31700,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_755", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -31745,7 +31745,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_756", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -31790,7 +31790,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_757", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -31835,7 +31835,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_758", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -31880,7 +31880,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_759", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -31925,7 +31925,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_760", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -31970,7 +31970,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_761", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -32015,7 +32015,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_762", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -32060,7 +32060,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_763", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -32105,7 +32105,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_764", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -32150,7 +32150,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_765", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -32195,7 +32195,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_766", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -32240,7 +32240,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_767", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -32285,7 +32285,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_768", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -32330,7 +32330,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_769", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -32375,7 +32375,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_770", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -32420,7 +32420,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_771", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601001 @@ -32465,7 +32465,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_772", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601002 @@ -32510,7 +32510,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_773", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601003 @@ -32555,7 +32555,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_774", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601004 @@ -32600,7 +32600,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_775", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601005 @@ -32645,7 +32645,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_776", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601006 @@ -32690,7 +32690,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_777", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601007 @@ -32735,7 +32735,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_778", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601008 @@ -32780,7 +32780,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_779", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601009 @@ -32825,7 +32825,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_780", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601010 @@ -32870,7 +32870,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_781", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -32915,7 +32915,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_782", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -32960,7 +32960,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_783", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -33005,7 +33005,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_784", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -33050,7 +33050,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_785", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -33095,7 +33095,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_786", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -33140,7 +33140,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_787", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -33185,7 +33185,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_788", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -33230,7 +33230,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_789", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -33275,7 +33275,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_790", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -33320,7 +33320,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_791", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601011 @@ -33365,7 +33365,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_792", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601012 @@ -33410,7 +33410,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_793", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601013 @@ -33455,7 +33455,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_794", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601014 @@ -33500,7 +33500,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_795", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601015 @@ -33545,7 +33545,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_796", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601016 @@ -33590,7 +33590,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_797", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601017 @@ -33635,7 +33635,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_798", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601018 @@ -33680,7 +33680,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_799", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601019 @@ -33725,7 +33725,7 @@ "tabIcon": "", "tabTitle": { "key": "circularcamptower_Sheet1_tabTitle_800", - "text": "直觉阵营之塔" + "text": "共情阵营之塔" }, "monsterlineup": [ 601020 @@ -33965,7 +33965,7 @@ "model_display": 13002 }, { - "id": 110000006, + "id": 11000006, "name": 1, "restriction": 10, "battlereadyID": 129, diff --git a/bin/json/game_global.json b/bin/json/game_global.json index a3c7c44d3..0bb7748db 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -403,6 +403,7 @@ "library_StoryUnlocking": 3, "ps_recovery": 360, "ps_ul": 2000, + "Mian_BossNum": 1, "ps_buy": [ { "a": "attr", @@ -728,6 +729,8 @@ "buzkashi_caddtracktime": 1000, "buzkashi_addtracktime": 1000, "buzkashi_subtracktime": 1000, + "buzkashi_caddblurtime": 1000, + "buzkashi_csubblurtime": 1000, "buzkashi_bumpspeedtime": 1000, "buzkashi_deathsubtime": 1000, "buzkashi_catchsubtime": 1000, diff --git a/bin/json/game_huntingopentime.json b/bin/json/game_huntingopentime.json index 7c83cf884..35bd2b5c8 100644 --- a/bin/json/game_huntingopentime.json +++ b/bin/json/game_huntingopentime.json @@ -2,13 +2,8 @@ { "type": 1, "opentime": [ - 0, 1, - 2, - 3, - 4, - 5, - 6 + 2 ], "name": { "key": "hunting_opentime_name_1", @@ -29,13 +24,8 @@ { "type": 2, "opentime": [ - 0, - 1, - 2, 3, - 4, - 5, - 6 + 4 ], "name": { "key": "hunting_opentime_name_2", @@ -56,11 +46,6 @@ { "type": 3, "opentime": [ - 0, - 1, - 2, - 3, - 4, 5, 6 ], @@ -84,12 +69,7 @@ "type": 4, "opentime": [ 0, - 1, - 2, - 3, - 4, - 5, - 6 + 1 ], "name": { "key": "hunting_opentime_name_4", diff --git a/bin/json/game_mainboss.json b/bin/json/game_mainboss.json new file mode 100644 index 000000000..e3a3f1f3b --- /dev/null +++ b/bin/json/game_mainboss.json @@ -0,0 +1,2642 @@ +[ + { + "id": 1100101, + "monster_chapter": 11001, + "MonsterDisplay_Ip": 1, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100102, + "monster_chapter": 11001, + "MonsterDisplay_Ip": 1, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100103, + "monster_chapter": 11001, + "MonsterDisplay_Ip": 1, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100104, + "monster_chapter": 11001, + "MonsterDisplay_Ip": 1, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100105, + "monster_chapter": 11001, + "MonsterDisplay_Ip": 1, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100106, + "monster_chapter": 11001, + "MonsterDisplay_Ip": 1, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100107, + "monster_chapter": 11001, + "MonsterDisplay_Ip": 1, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100108, + "monster_chapter": 11001, + "MonsterDisplay_Ip": 1, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100109, + "monster_chapter": 11001, + "MonsterDisplay_Ip": 1, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100110, + "monster_chapter": 11001, + "MonsterDisplay_Ip": 1, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100201, + "monster_chapter": 11002, + "MonsterDisplay_Ip": 2, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100202, + "monster_chapter": 11002, + "MonsterDisplay_Ip": 2, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100203, + "monster_chapter": 11002, + "MonsterDisplay_Ip": 2, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100204, + "monster_chapter": 11002, + "MonsterDisplay_Ip": 2, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100205, + "monster_chapter": 11002, + "MonsterDisplay_Ip": 2, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100206, + "monster_chapter": 11002, + "MonsterDisplay_Ip": 2, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100207, + "monster_chapter": 11002, + "MonsterDisplay_Ip": 2, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100208, + "monster_chapter": 11002, + "MonsterDisplay_Ip": 2, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100209, + "monster_chapter": 11002, + "MonsterDisplay_Ip": 2, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100210, + "monster_chapter": 11002, + "MonsterDisplay_Ip": 2, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100301, + "monster_chapter": 11003, + "MonsterDisplay_Ip": 3, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100302, + "monster_chapter": 11003, + "MonsterDisplay_Ip": 3, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100303, + "monster_chapter": 11003, + "MonsterDisplay_Ip": 3, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100304, + "monster_chapter": 11003, + "MonsterDisplay_Ip": 3, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100305, + "monster_chapter": 11003, + "MonsterDisplay_Ip": 3, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100306, + "monster_chapter": 11003, + "MonsterDisplay_Ip": 3, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100307, + "monster_chapter": 11003, + "MonsterDisplay_Ip": 3, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100308, + "monster_chapter": 11003, + "MonsterDisplay_Ip": 3, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100309, + "monster_chapter": 11003, + "MonsterDisplay_Ip": 3, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100310, + "monster_chapter": 11003, + "MonsterDisplay_Ip": 3, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100401, + "monster_chapter": 11004, + "MonsterDisplay_Ip": 4, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100402, + "monster_chapter": 11004, + "MonsterDisplay_Ip": 4, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100403, + "monster_chapter": 11004, + "MonsterDisplay_Ip": 4, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100404, + "monster_chapter": 11004, + "MonsterDisplay_Ip": 4, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100405, + "monster_chapter": 11004, + "MonsterDisplay_Ip": 4, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100406, + "monster_chapter": 11004, + "MonsterDisplay_Ip": 4, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100407, + "monster_chapter": 11004, + "MonsterDisplay_Ip": 4, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100408, + "monster_chapter": 11004, + "MonsterDisplay_Ip": 4, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100409, + "monster_chapter": 11004, + "MonsterDisplay_Ip": 4, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100410, + "monster_chapter": 11004, + "MonsterDisplay_Ip": 4, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100501, + "monster_chapter": 11005, + "MonsterDisplay_Ip": 5, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100502, + "monster_chapter": 11005, + "MonsterDisplay_Ip": 5, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100503, + "monster_chapter": 11005, + "MonsterDisplay_Ip": 5, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100504, + "monster_chapter": 11005, + "MonsterDisplay_Ip": 5, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100505, + "monster_chapter": 11005, + "MonsterDisplay_Ip": 5, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100506, + "monster_chapter": 11005, + "MonsterDisplay_Ip": 5, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100507, + "monster_chapter": 11005, + "MonsterDisplay_Ip": 5, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100508, + "monster_chapter": 11005, + "MonsterDisplay_Ip": 5, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100509, + "monster_chapter": 11005, + "MonsterDisplay_Ip": 5, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100510, + "monster_chapter": 11005, + "MonsterDisplay_Ip": 5, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100601, + "monster_chapter": 11006, + "MonsterDisplay_Ip": 6, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100602, + "monster_chapter": 11006, + "MonsterDisplay_Ip": 6, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100603, + "monster_chapter": 11006, + "MonsterDisplay_Ip": 6, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100604, + "monster_chapter": 11006, + "MonsterDisplay_Ip": 6, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100605, + "monster_chapter": 11006, + "MonsterDisplay_Ip": 6, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100606, + "monster_chapter": 11006, + "MonsterDisplay_Ip": 6, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100607, + "monster_chapter": 11006, + "MonsterDisplay_Ip": 6, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100608, + "monster_chapter": 11006, + "MonsterDisplay_Ip": 6, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100609, + "monster_chapter": 11006, + "MonsterDisplay_Ip": 6, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100610, + "monster_chapter": 11006, + "MonsterDisplay_Ip": 6, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100701, + "monster_chapter": 11007, + "MonsterDisplay_Ip": 7, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100702, + "monster_chapter": 11007, + "MonsterDisplay_Ip": 7, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100703, + "monster_chapter": 11007, + "MonsterDisplay_Ip": 7, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100704, + "monster_chapter": 11007, + "MonsterDisplay_Ip": 7, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100705, + "monster_chapter": 11007, + "MonsterDisplay_Ip": 7, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100706, + "monster_chapter": 11007, + "MonsterDisplay_Ip": 7, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100707, + "monster_chapter": 11007, + "MonsterDisplay_Ip": 7, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100708, + "monster_chapter": 11007, + "MonsterDisplay_Ip": 7, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100709, + "monster_chapter": 11007, + "MonsterDisplay_Ip": 7, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100710, + "monster_chapter": 11007, + "MonsterDisplay_Ip": 7, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100801, + "monster_chapter": 11008, + "MonsterDisplay_Ip": 8, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100802, + "monster_chapter": 11008, + "MonsterDisplay_Ip": 8, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100803, + "monster_chapter": 11008, + "MonsterDisplay_Ip": 8, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100804, + "monster_chapter": 11008, + "MonsterDisplay_Ip": 8, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100805, + "monster_chapter": 11008, + "MonsterDisplay_Ip": 8, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100806, + "monster_chapter": 11008, + "MonsterDisplay_Ip": 8, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100807, + "monster_chapter": 11008, + "MonsterDisplay_Ip": 8, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100808, + "monster_chapter": 11008, + "MonsterDisplay_Ip": 8, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100809, + "monster_chapter": 11008, + "MonsterDisplay_Ip": 8, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100810, + "monster_chapter": 11008, + "MonsterDisplay_Ip": 8, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100901, + "monster_chapter": 11009, + "MonsterDisplay_Ip": 9, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100902, + "monster_chapter": 11009, + "MonsterDisplay_Ip": 9, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100903, + "monster_chapter": 11009, + "MonsterDisplay_Ip": 9, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100904, + "monster_chapter": 11009, + "MonsterDisplay_Ip": 9, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100905, + "monster_chapter": 11009, + "MonsterDisplay_Ip": 9, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100906, + "monster_chapter": 11009, + "MonsterDisplay_Ip": 9, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100907, + "monster_chapter": 11009, + "MonsterDisplay_Ip": 9, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100908, + "monster_chapter": 11009, + "MonsterDisplay_Ip": 9, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100909, + "monster_chapter": 11009, + "MonsterDisplay_Ip": 9, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1100910, + "monster_chapter": 11009, + "MonsterDisplay_Ip": 9, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101001, + "monster_chapter": 11010, + "MonsterDisplay_Ip": 10, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101002, + "monster_chapter": 11010, + "MonsterDisplay_Ip": 10, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101003, + "monster_chapter": 11010, + "MonsterDisplay_Ip": 10, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101004, + "monster_chapter": 11010, + "MonsterDisplay_Ip": 10, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101005, + "monster_chapter": 11010, + "MonsterDisplay_Ip": 10, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101006, + "monster_chapter": 11010, + "MonsterDisplay_Ip": 10, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101007, + "monster_chapter": 11010, + "MonsterDisplay_Ip": 10, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101008, + "monster_chapter": 11010, + "MonsterDisplay_Ip": 10, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101009, + "monster_chapter": 11010, + "MonsterDisplay_Ip": 10, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101010, + "monster_chapter": 11010, + "MonsterDisplay_Ip": 10, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101101, + "monster_chapter": 11011, + "MonsterDisplay_Ip": 11, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101102, + "monster_chapter": 11011, + "MonsterDisplay_Ip": 11, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101103, + "monster_chapter": 11011, + "MonsterDisplay_Ip": 11, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101104, + "monster_chapter": 11011, + "MonsterDisplay_Ip": 11, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101105, + "monster_chapter": 11011, + "MonsterDisplay_Ip": 11, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101106, + "monster_chapter": 11011, + "MonsterDisplay_Ip": 11, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101107, + "monster_chapter": 11011, + "MonsterDisplay_Ip": 11, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101108, + "monster_chapter": 11011, + "MonsterDisplay_Ip": 11, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101109, + "monster_chapter": 11011, + "MonsterDisplay_Ip": 11, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101110, + "monster_chapter": 11011, + "MonsterDisplay_Ip": 11, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101201, + "monster_chapter": 11012, + "MonsterDisplay_Ip": 12, + "monster_strength": 1, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101202, + "monster_chapter": 11012, + "MonsterDisplay_Ip": 12, + "monster_strength": 2, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101203, + "monster_chapter": 11012, + "MonsterDisplay_Ip": 12, + "monster_strength": 3, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101204, + "monster_chapter": 11012, + "MonsterDisplay_Ip": 12, + "monster_strength": 4, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101205, + "monster_chapter": 11012, + "MonsterDisplay_Ip": 12, + "monster_strength": 5, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101206, + "monster_chapter": 11012, + "MonsterDisplay_Ip": 12, + "monster_strength": 6, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101207, + "monster_chapter": 11012, + "MonsterDisplay_Ip": 12, + "monster_strength": 7, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101208, + "monster_chapter": 11012, + "MonsterDisplay_Ip": 12, + "monster_strength": 8, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101209, + "monster_chapter": 11012, + "MonsterDisplay_Ip": 12, + "monster_strength": 9, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + }, + { + "id": 1101210, + "monster_chapter": 11012, + "MonsterDisplay_Ip": 12, + "monster_strength": 10, + "battlereadyid": 0, + "formatList": [ + 101011 + ], + "reward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + }, + { + "a": "item", + "t": "10000003", + "n": 1 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_mainchapter.json b/bin/json/game_mainchapter.json index 625174d66..e99984dd2 100644 --- a/bin/json/game_mainchapter.json +++ b/bin/json/game_mainchapter.json @@ -36,7 +36,8 @@ "text": "原始人聚集地惊现能量强大的月光原石，主角和守护者们前往收集，却遭到当地“土著居民”们的轮番驱赶……" }, "starreward": 11001, - "exploreward": 11001 + "exploreward": 11001, + "bosspro": 1000 }, { "id": 11002, @@ -75,7 +76,8 @@ "text": "复仇者强势归来，带着怨恨与不甘，大龙的回归之路，既是守护者的试炼，亦是神龙大侠的考验。" }, "starreward": 11002, - "exploreward": 11002 + "exploreward": 11002, + "bosspro": 2000 }, { "id": 11003, @@ -114,7 +116,8 @@ "text": "善良之花滋养罪恶，铁窗下的小小豚鼠正伺机而动，捕食他的猎物。" }, "starreward": 11003, - "exploreward": 11003 + "exploreward": 11003, + "bosspro": 3000 }, { "id": 11004, @@ -153,7 +156,8 @@ "text": "“欢迎来到杜洛克，我们有些规矩要同你讲，别兴风作浪、服从管理，我们就会是好朋友……杜洛克是，杜洛克是，杜洛克是个完美的好地方！”" }, "starreward": 11004, - "exploreward": 11004 + "exploreward": 11004, + "bosspro": 4000 }, { "id": 11005, @@ -192,7 +196,8 @@ "text": "暗夜追寻光的身影，迷雾森林到处是彼此交织的轮舞，是谁在追寻守护者的脚步，誓不罢休！" }, "starreward": 11005, - "exploreward": 11005 + "exploreward": 11005, + "bosspro": 5000 }, { "id": 11006, @@ -231,7 +236,8 @@ "text": "亚丝翠告诉主角团，致命纳得喜欢闪亮亮的东西，自从它得到一块会发光的月光原石后，便远离人群，用其筑巢求偶。为了拿回月光原石，主角团不得不投其所好，趁机夺宝……" }, "starreward": 11006, - "exploreward": 11006 + "exploreward": 11006, + "bosspro": 6000 }, { "id": 11007, @@ -270,7 +276,8 @@ "text": "激烈的战斗后，阿宝以自己对武功的悟性和师父传授的武术，战胜了太郎，拯救了山谷，为山谷带来了和平。" }, "starreward": 11007, - "exploreward": 11007 + "exploreward": 11007, + "bosspro": 7000 }, { "id": 11008, @@ -309,7 +316,8 @@ "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11008, - "exploreward": 11008 + "exploreward": 11008, + "bosspro": 8000 }, { "id": 11009, @@ -348,7 +356,8 @@ "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11009, - "exploreward": 11009 + "exploreward": 11009, + "bosspro": 9000 }, { "id": 11010, @@ -387,7 +396,8 @@ "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11010, - "exploreward": 11010 + "exploreward": 11010, + "bosspro": 10000 }, { "id": 11011, @@ -426,7 +436,8 @@ "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11011, - "exploreward": 11011 + "exploreward": 11011, + "bosspro": 11000 }, { "id": 11012, @@ -465,6 +476,7 @@ "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。" }, "starreward": 11012, - "exploreward": 11012 + "exploreward": 11012, + "bosspro": 12000 } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 948152518..cb4af7061 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -9084,7 +9084,7 @@ "destroy": 1, "progress": 0, "stroyshow": 0, - "frontstoryid": 0, + "frontstoryid": 20200, "afterstoryid": 0, "maingroupName": { "key": "", @@ -9149,8 +9149,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 20222, - "afterstoryid": 0, + "frontstoryid": 20201, + "afterstoryid": 20202, "maingroupName": { "key": "", "text": "" @@ -9210,7 +9210,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 102011 + 103011 ], "helphero": [], "banhero": [], @@ -9262,8 +9262,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 20223, - "afterstoryid": 20224, + "frontstoryid": 20205, + "afterstoryid": 20207, "maingroupName": { "key": "", "text": "" @@ -9323,7 +9323,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 102011 + 103021 ], "helphero": [], "banhero": [], @@ -9375,8 +9375,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 20228, - "afterstoryid": 20231, + "frontstoryid": 20208, + "afterstoryid": 20210, "maingroupName": { "key": "", "text": "" @@ -9436,7 +9436,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 102011 + 103031 ], "helphero": [], "banhero": [], @@ -9488,8 +9488,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 20232, - "afterstoryid": 20233, + "frontstoryid": 20211, + "afterstoryid": 20212, "maingroupName": { "key": "", "text": "" @@ -9549,7 +9549,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 102011 + 103041 ], "helphero": [], "banhero": [], @@ -9578,7 +9578,7 @@ 100304 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "openlevel": 1, "EditorStage": 0, "venturemodelspeed": 0, @@ -9601,86 +9601,38 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 20300, - "afterstoryid": 20305, + "frontstoryid": 20215, + "afterstoryid": 0, "maingroupName": { "key": "", "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_100", - "text": "4-1" + "key": "", + "text": "" }, "title": { - "key": "mainchapter_main_stage_title_100", - "text": "深夜探查" + "key": "", + "text": "" }, "desc": { - "key": "mainchapter_main_stage_desc_96", - "text": "洞穴前，香蕉树上的香蕉被猴子们疯狂抢夺，原始人一家加入抢夺战。" + "key": "", + "text": "" }, "exp": 0, - "hero_exp": 400, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 8000 - }, - { - "a": "equi", - "t": "11610", - "n": 1 - } - ], - "lotteryward": 17111610, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 8000 - }, - { - "a": "equi", - "t": "11620", - "n": 1 - } - ], - "BattleReadyID": 116, - "FormatList": [ - 102011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -9691,7 +9643,7 @@ 100305 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "openlevel": 1, "EditorStage": 0, "venturemodelspeed": 0, @@ -9714,86 +9666,38 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 20306, - "afterstoryid": 20307, + "frontstoryid": 20217, + "afterstoryid": 0, "maingroupName": { "key": "", "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_101", - "text": "4-2" + "key": "", + "text": "" }, "title": { - "key": "mainchapter_main_stage_title_101", - "text": "新伙伴加入" + "key": "", + "text": "" }, "desc": { - "key": "mainchapter_main_stage_desc_97", - "text": "猴子抢空所有香蕉，原始人一家为了解决早餐问题，把目标转向巨型鸟蛋。" + "key": "", + "text": "" }, "exp": 0, - "hero_exp": 400, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 8000 - }, - { - "a": "equi", - "t": "11611", - "n": 1 - } - ], - "lotteryward": 17111610, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 8000 - }, - { - "a": "equi", - "t": "11621", - "n": 1 - } - ], - "BattleReadyID": 116, - "FormatList": [ - 102011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -9827,8 +9731,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 20309, - "afterstoryid": 20314, + "frontstoryid": 20223, + "afterstoryid": 0, "maingroupName": { "key": "", "text": "" @@ -9888,7 +9792,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 102011 + 103051 ], "helphero": [], "banhero": [], @@ -9940,8 +9844,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 20316, - "afterstoryid": 0, + "frontstoryid": 20224, + "afterstoryid": 20225, "maingroupName": { "key": "", "text": "" @@ -10001,7 +9905,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 102011 + 103061 ], "helphero": [], "banhero": [], @@ -10030,7 +9934,7 @@ 100308 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "openlevel": 1, "EditorStage": 0, "venturemodelspeed": 0, @@ -10053,86 +9957,38 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 20317, + "frontstoryid": 20229, "afterstoryid": 0, "maingroupName": { "key": "", "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_104", - "text": "4-5" + "key": "", + "text": "" }, "title": { - "key": "mainchapter_main_stage_title_104", - "text": "遇袭" + "key": "", + "text": "" }, "desc": { - "key": "mainchapter_main_stage_desc_100", - "text": "瓜哥一家逃到一个山洞前，大批外来世界的人也涌向这里，似乎寻找着什么……" + "key": "", + "text": "" }, "exp": 0, - "hero_exp": 400, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 8000 - }, - { - "a": "equi", - "t": "11614", - "n": 1 - } - ], - "lotteryward": 17111610, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 8000 - }, - { - "a": "equi", - "t": "11624", - "n": 1 - } - ], - "BattleReadyID": 116, - "FormatList": [ - 102011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -10166,8 +10022,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 0, - "afterstoryid": 20318, + "frontstoryid": 20230, + "afterstoryid": 20231, "maingroupName": { "key": "", "text": "" @@ -10227,7 +10083,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 102011 + 103071 ], "helphero": [], "banhero": [], @@ -10279,8 +10135,8 @@ "destroy": 1, "progress": 1, "stroyshow": 0, - "frontstoryid": 20321, - "afterstoryid": 20322, + "frontstoryid": 20232, + "afterstoryid": 20233, "maingroupName": { "key": "", "text": "" @@ -10340,7 +10196,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 102011 + 103081 ], "helphero": [], "banhero": [], @@ -10363,13 +10219,13 @@ }, { "id": 1100312, - "chapterid": 11004, - "group_id": 100401, + "chapterid": 11003, + "group_id": 100312, "previous_group_id": [ 100311 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "openlevel": 1, "EditorStage": 0, "venturemodelspeed": 0, @@ -10381,104 +10237,58 @@ }, "venturetype": 0, "ventureavatar": [], - "herocolor": 0, - "heroimg": "", + "herocolor": 2, + "heroimg": "zxgq_qp_icon_gth", "bubbletext": { "key": "", "text": "" }, "animation": [], "hide": 0, - "destroy": 0, - "progress": 0, + "destroy": 1, + "progress": 1, "stroyshow": 0, - "frontstoryid": 20323, - "afterstoryid": 20326, + "frontstoryid": 20236, + "afterstoryid": 0, "maingroupName": { "key": "", "text": "" }, "mainlineName": { - "key": "mainchapter_main_stage_mainlineName_107", - "text": "4-8" + "key": "", + "text": "" }, "title": { - "key": "mainchapter_main_stage_title_107", - "text": "智取邀请函" + "key": "", + "text": "" }, "desc": { - "key": "mainchapter_main_stage_desc_103", - "text": "结识新伙伴，一起去平先生面馆打卡吃美食吧！" + "key": "", + "text": "" }, "exp": 0, - "hero_exp": 400, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 8000 - }, - { - "a": "equi", - "t": "11615", - "n": 1 - } - ], - "lotteryward": 17111610, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 8000 - }, - { - "a": "equi", - "t": "11625", - "n": 1 - } - ], - "BattleReadyID": 116, - "FormatList": [ - 102011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { "id": 1100313, - "chapterid": 11005, - "group_id": 0, - "previous_group_id": [], + "chapterid": 11004, + "group_id": 100400, + "previous_group_id": [ + 100312 + ], "previoustage": 0, "Episodetype": 1, "openlevel": 1, @@ -10587,9 +10397,11 @@ }, { "id": 1100314, - "chapterid": 11005, - "group_id": 0, - "previous_group_id": [], + "chapterid": 11004, + "group_id": 100401, + "previous_group_id": [ + 100312 + ], "previoustage": 0, "Episodetype": 1, "openlevel": 1, @@ -10698,7 +10510,7 @@ }, { "id": 1100315, - "chapterid": 11005, + "chapterid": 11004, "group_id": 0, "previous_group_id": [], "previoustage": 0, @@ -10809,7 +10621,7 @@ }, { "id": 1100316, - "chapterid": 11005, + "chapterid": 11004, "group_id": 0, "previous_group_id": [], "previoustage": 0, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 287c9293a..e3a302d66 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -124665,7 +124665,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 3, "equip": [], "newskill": [], @@ -124965,7 +124965,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 3, "equip": [], "newskill": [], @@ -125265,7 +125265,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 3, "equip": [], "newskill": [], @@ -125565,7 +125565,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 3, "equip": [], "newskill": [], @@ -125865,7 +125865,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 4, "equip": [], "newskill": [], @@ -126165,7 +126165,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 4, "equip": [], "newskill": [], @@ -126465,7 +126465,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 4, "equip": [], "newskill": [], @@ -126765,7 +126765,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 4, "equip": [], "newskill": [], @@ -127065,7 +127065,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 5, "equip": [], "newskill": [], @@ -127365,7 +127365,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 5, "equip": [], "newskill": [], @@ -127665,7 +127665,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 5, "equip": [], "newskill": [], @@ -127965,7 +127965,7 @@ "captainId": 1, "IsBoss": 0, "bossHpCnt": 0, - "heroid": 53003, + "heroid": 14002, "star": 5, "equip": [], "newskill": [], diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 2219f8108..bdb27819d 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -26512,10 +26512,10 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001404, + 390001401, 1000, 1, - 3 + 1 ], "FollowSK": [], "SucFollowSK": [], @@ -26592,6 +26592,30 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 255004214, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000071, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 255004311, "EmitPR": 1000, @@ -26650,10 +26674,10 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001105, + 390001401, 1000, 1, - 1 + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -26937,7 +26961,7 @@ "Type": 3, "Argu": [ 390001404, - 1000, + 800, 1, 3 ], @@ -27215,7 +27239,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001401, + 390001105, 1000, 1, 1 @@ -27552,10 +27576,10 @@ 2, 500 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 255006213 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index f7818496d..a258ae7ac 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -20425,9 +20425,11 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_155004111_1", - "text": "对敌方发起一次攻击，并造成1次伤害。" + "text": "对敌方发起一次攻击，并造成1次伤害，有概率为目标附加1回合【中毒】。" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { @@ -20449,8 +20451,8 @@ "Target": 2, "ChildSkill": { "Id": [ - 255004211, - 255004213 + 255004213, + 255004214 ] }, "passSkill": [], @@ -20489,7 +20491,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_155004311_1", - "text": "对敌方造成1次伤害，并附带2回合[color=#e5621b]中毒[/color]状态。" + "text": "对全体造成敌方伤害，并附带2回合[color=#e5621b]中毒[/color]状态。" }, "buffid": [ 390001401 @@ -20619,9 +20621,11 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_155003111_1", - "text": "对敌方发起一次攻击，并造成1次伤害。" + "text": "对敌方发起一次攻击，并造成1次伤害，有概率附加3回合[color=#e5621b]流血[/color]。" }, - "buffid": [], + "buffid": [ + 390001404 + ], "map": "" }, { @@ -20650,7 +20654,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_155003211_1", - "text": "自身身上有[color=#37d8a9]护盾[/color]状态时，造成伤害提升，受到伤害降低。" + "text": "（被动）有敌人死亡时立即获得回合。" }, "buffid": [], "map": "" @@ -20680,9 +20684,11 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_155003311_1", - "text": "对敌方目标造成1次伤害，并获得以自身最大生命值为一定比例的[color=#37d8a9]护盾[/color]。" + "text": "对敌方所有目标造成伤害并附带1回合[color=#e5621b]眩晕[/color状态。" }, - "buffid": [], + "buffid": [ + 390001105 + ], "map": "" }, { @@ -20776,7 +20782,7 @@ "text": "对敌方目标造成1次伤害，并附带1回合[color=#e5621b]眩晕[/color]。" }, "buffid": [ - 390001401 + 390001105 ], "map": "" }, @@ -21751,7 +21757,9 @@ "key": "skill_skill_atk_Desc_114002111_2", "text": "伤害提升至110%。" }, - "buffid": [], + "buffid": [ + 390001110 + ], "map": "" }, { @@ -21781,7 +21789,9 @@ "key": "skill_skill_atk_Desc_114002111_3", "text": "伤害提升至120%。" }, - "buffid": [], + "buffid": [ + 390001110 + ], "map": "" }, { @@ -21811,7 +21821,9 @@ "key": "skill_skill_atk_Desc_114002111_4", "text": "伤害提升至130%。" }, - "buffid": [], + "buffid": [ + 390001110 + ], "map": "" }, { @@ -21841,7 +21853,9 @@ "key": "skill_skill_atk_Desc_114002111_5", "text": "伤害提升至140%。" }, - "buffid": [], + "buffid": [ + 390001110 + ], "map": "" }, { @@ -21936,7 +21950,9 @@ "key": "skill_skill_atk_Desc_114002311_2", "text": "伤害提升480%。" }, - "buffid": [], + "buffid": [ + 390001426 + ], "map": "" }, { @@ -21966,7 +21982,9 @@ "key": "skill_skill_atk_Desc_114002311_3", "text": "伤害提升560%。" }, - "buffid": [], + "buffid": [ + 390001426 + ], "map": "" }, { @@ -21996,7 +22014,9 @@ "key": "skill_skill_atk_Desc_114002311_4", "text": "伤害提升640%。" }, - "buffid": [], + "buffid": [ + 390001426 + ], "map": "" }, { @@ -22026,7 +22046,9 @@ "key": "skill_skill_atk_Desc_114002311_5", "text": "伤害提升720%。" }, - "buffid": [], + "buffid": [ + 390001426 + ], "map": "" }, { @@ -26494,8 +26516,8 @@ }, "ico": "jn_34005_3", "CorrectPos": 0, - "IsMelee": 1, - "act": "Skill_4", + "IsMelee": 0, + "act": "Skill_3", "Type": 1, "CD": 5, "Where": [], @@ -26526,8 +26548,8 @@ }, "ico": "jn_34005_3", "CorrectPos": 0, - "IsMelee": 2, - "act": "Skill_5", + "IsMelee": 0, + "act": "Skill_3", "Type": 1, "CD": 5, "Where": [], @@ -26558,8 +26580,8 @@ }, "ico": "jn_34005_3", "CorrectPos": 0, - "IsMelee": 3, - "act": "Skill_6", + "IsMelee": 0, + "act": "Skill_3", "Type": 1, "CD": 5, "Where": [], @@ -26590,8 +26612,8 @@ }, "ico": "jn_34005_3", "CorrectPos": 0, - "IsMelee": 4, - "act": "Skill_7", + "IsMelee": 0, + "act": "Skill_3", "Type": 1, "CD": 5, "Where": [], diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index e8153edb8..57276c3d7 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -10745,5 +10745,39 @@ "buffeffect": "", "buffpos": "", "forbidFloat": 0 + }, + { + "Id": 391000071, + "Name": { + "key": "skill_skill_buff_Name_391000070", + "text": "有中毒状态伤害提升25%" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000071", + "text": "有中毒状态伤害提升25%" + }, + "BuffType": 90, + "EffectArgu": [ + 250, + 390001401 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 3, + 0 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "", + "forbidFloat": 0 } ] \ No newline at end of file diff --git a/modules/mainline/api_booschallenge.go b/modules/mainline/api_booschallenge.go new file mode 100644 index 000000000..36e86b0ea --- /dev/null +++ b/modules/mainline/api_booschallenge.go @@ -0,0 +1,94 @@ +package mainline + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +// 参数校验 +func (this *apiComp) BoosChallengeCheck(session comm.IUserSession, req *pb.MainlineBoosChallengeReq) (errdata *pb.ErrorData) { + if req.Boosid == 0 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + } + return +} + +// /挑战主线关卡 +func (this *apiComp) BoosChallenge(session comm.IUserSession, req *pb.MainlineBoosChallengeReq) (errdata *pb.ErrorData) { + var ( + info *pb.DBMainline // 当前章节信息 + conf *cfg.GameMainBossData // 当前章节数据 + err error + ) + + if errdata = this.BoosChallengeCheck(session, req); errdata != nil { + return // 参数校验失败直接返回 + } + + if conf, err = this.module.configure.getGameMainBossData(req.Boosid); err != nil { // 配置文件校验 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_MainlineNotFindChapter, + Title: pb.ErrorCode_MainlineNotFindChapter.ToString(), + Message: err.Error(), + } + return + } + if info, err = this.module.modelMline.getMainlineData(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + //不是当前章节 + if conf.MonsterChapter != info.Currbooschapter { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: "boos is no Currbooschapter", + } + return + } + + //未解锁 + if info.Chapterboos[conf.MonsterChapter]+1 < conf.MonsterStrength { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: "boos is unlock", + } + return + } + + errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{ + Rulesid: conf.Battlereadyid, + Ptype: pb.PlayType_mainline, + Title: "", + Format: req.Battle, + Mformat: conf.FormatList, + }) + if errdata != nil { + return + } + session.SendMsg(string(this.module.GetType()), "challenge", &pb.MainlineBoosChallengeResp{ + Info: &pb.BattleInfo{ + Id: record.Id, + Title: record.Title, + Rulesid: conf.Battlereadyid, + Btype: record.Btype, + Ptype: record.Ptype, + RedCompId: record.RedCompId, + Redflist: record.Redflist, + BlueCompId: record.BlueCompId, + Buleflist: record.Buleflist, + Tasks: record.Tasks, + }, + Boosid: req.Boosid, + }) + return +} diff --git a/modules/mainline/api_booschallengeover.go b/modules/mainline/api_booschallengeover.go new file mode 100644 index 000000000..4e50ab3d9 --- /dev/null +++ b/modules/mainline/api_booschallengeover.go @@ -0,0 +1,90 @@ +package mainline + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + cfg "go_dreamfactory/sys/configure/structs" +) + +// 参数校验 +func (this *apiComp) BoosChallengeOverCheck(session comm.IUserSession, req *pb.MainlineBoosChallengeOverReq) (errdata *pb.ErrorData) { + if req.Boosid == 0 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + return + } + return +} + +// /挑战主线关卡 +func (this *apiComp) BoosChallengeOver(session comm.IUserSession, req *pb.MainlineBoosChallengeOverReq) (errdata *pb.ErrorData) { + var ( + conf *cfg.GameMainBossData + info *pb.DBMainline + aeward []*pb.UserAtno = make([]*pb.UserAtno, 0) + isWin bool + err error + ) + if errdata = this.BoosChallengeOverCheck(session, req); errdata != nil { + return // 参数校验失败直接返回 + } + if conf, err = this.module.configure.getGameMainBossData(req.Boosid); err != nil { // 配置文件校验 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_MainlineNotFindChapter, + Title: pb.ErrorCode_MainlineNotFindChapter.ToString(), + Message: err.Error(), + } + return + } + + if info, err = this.module.modelMline.getMainlineData(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + + // 校验通过 + errdata, isWin = this.module.battle.CheckBattleReport(session, req.Report) + if errdata != nil { + return + } + if !isWin { // 战斗失败返还扣除的体力 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_BattleValidationFailed, + Title: pb.ErrorCode_BattleValidationFailed.ToString(), + Message: "battle is defeated", + } + return + } + + if errdata, aeward = this.module.DispenseAtno(session, conf.Reward, true); errdata != nil { + this.module.Debugf("Mline Boos DispenseRes err:+%v", conf.Reward) + return + } + + info.Chapterboos[conf.MonsterChapter] = conf.MonsterStrength + info.Currbooschallengenum++ + if err = this.module.modelMline.Change(session.GetUserId(), map[string]interface{}{ + "chapterboos": info.Chapterboos, + "currbooschallengenum": info.Currbooschallengenum, + }); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + session.SendMsg(string(this.module.GetType()), "booschallengeover", &pb.MainlineBoosChallengeOverResp{ + Boosid: req.Boosid, + Reward: aeward, + }) + + return +} diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index 0f78429a5..74b2776c8 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -117,32 +117,22 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh if first { // 发奖 if errdata, atno = this.module.DispenseAtno(session, conf.Firstaward, true); errdata != nil { this.module.Debugf("Mline first DispenseRes err:+%v", conf.Firstaward) + return } aeward = append(aeward, atno...) - // for _, v := range conf.Firstaward { - // aeward = append(aeward, &pb.UserAssets{ - // A: v.A, - // T: v.T, - // N: v.N, - // }) - // } } else { if errdata, atno = this.module.DispenseAtno(session, conf.Commonaward, true); errdata != nil { this.module.Debugf("Mline Commonaward DispenseRes err:+%v", conf.Commonaward) + return } aeward = append(aeward, atno...) - // for _, v := range conf.Commonaward { - // aeward = append(aeward, &pb.UserAssets{ - // A: v.A, - // T: v.T, - // N: v.N, - // }) - // } + } user := this.module.ModuleUser.GetUser(session.GetUserId()) if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(conf.Lotteryward, user.Vip, user.Lv); len(lotteryward) > 0 { if errdata, atno = this.module.DispenseAtno(session, lotteryward, true); errdata != nil { this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward) + return } aeward = append(aeward, atno...) } diff --git a/modules/mainline/api_info.go b/modules/mainline/api_info.go index 14fc4e0ac..5ca84f866 100644 --- a/modules/mainline/api_info.go +++ b/modules/mainline/api_info.go @@ -3,6 +3,7 @@ package mainline import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + "go_dreamfactory/utils" ) // 参数校验 @@ -34,6 +35,26 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.MainlineInfoReq) (e } return } + if !utils.IsToday(info.Lastboosrefresh) { //不是同一天 + if err = this.module.modelMline.randomboos(info); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + if err = this.module.modelMline.Change(session.GetUserId(), map[string]interface{}{ + "currbooschapter": info.Currbooschapter, + "lastboosrefresh": info.Lastboosrefresh, + }); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + } + } tasks = this.module.configure.getChapteTasks() condiIds = make([]int32, 0, len(tasks)) diff --git a/modules/mainline/comp_configure.go b/modules/mainline/comp_configure.go index 8ea359c17..e919f1089 100644 --- a/modules/mainline/comp_configure.go +++ b/modules/mainline/comp_configure.go @@ -9,13 +9,13 @@ import ( "sync" ) -const moduleName = "mline" const ( game_mainchapter = "game_mainchapter.json" game_mainstage = "game_mainstage.json" game_mainstarreward = "game_mainstarreward.json" game_mainshopitem = "game_mainshopitem.json" game_mainachievement = "game_mainachievement.json" + game_mainboos = "game_mainboss.json" ) // /配置管理基础组件 @@ -39,6 +39,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.LoadMultiConfigure(map[string]interface{}{ game_mainchapter: cfg.NewGameMainChapter, game_mainshopitem: cfg.NewGameMainShopItem, + game_mainboos: cfg.NewGameMainBoss, }) this.chapterMap = make(map[int32][]*cfg.GameMainStageData) configure.RegisterConfigure(game_mainstage, cfg.NewGameMainStage, this.updateMlineStage) @@ -156,7 +157,7 @@ func (this *configureComp) GetMainStageConf(id int32) (data *cfg.GameMainStageDa } } } - err = comm.NewNotFoundConfErr(moduleName, game_mainstage, id) + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_mainstage, id) return } @@ -183,7 +184,7 @@ func (this *configureComp) GetMlineShopConfById(cid int32) (conf *cfg.GameMainSh } } } - err = comm.NewNotFoundConfErr(moduleName, game_mainstage, cid) + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_mainstage, cid) return } @@ -284,3 +285,20 @@ func (this *configureComp) updateGameMainChapter() { this.lock.Unlock() return } + +// 获取主线boos +func (this *configureComp) getGameMainBossData(id int32) (conf *cfg.GameMainBossData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_mainboos); err != nil { + return + } + if conf, ok = v.(*cfg.GameMainBoss).GetDataMap()[id]; !ok { + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_mainboos, id) + this.module.Errorln(err) + return + } + return +} diff --git a/modules/mainline/model_mainline.go b/modules/mainline/model_mainline.go index 7a57819da..24e9dce34 100644 --- a/modules/mainline/model_mainline.go +++ b/modules/mainline/model_mainline.go @@ -8,6 +8,7 @@ import ( "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/modules" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "go.mongodb.org/mongo-driver/bson/primitive" @@ -31,7 +32,6 @@ func (this *ModelMline) Init(service core.IService, module core.IModule, comp co return } -// 获取用户全部的埋点数据 func (this *ModelMline) getMainlineData(uid string) (results *pb.DBMainline, err error) { results = &pb.DBMainline{} if err = this.Get(uid, results); err != nil && err != mgo.MongodbNil { @@ -158,3 +158,27 @@ func (this *ModelMline) checklevel(level int32, data *pb.DBMainline) (err error) } return } + +// 随机boos +func (this *ModelMline) randomboos(data *pb.DBMainline) (err error) { + var ( + chapters []int32 = make([]int32, 0) + weight []int32 = make([]int32, 0) + conf *cfg.GameMainChapterData + index int32 + ) + for k, _ := range data.Chapteraward { + chapters = append(chapters, k) + } + for _, v := range chapters { + if conf, err = this.module.configure.GetMainChapterConf(v); err != nil { + return + } + weight = append(weight, conf.Bosspro) + } + + index = comm.GetRandW(weight) + data.Currbooschapter = chapters[index] + data.Lastboosrefresh = configure.Now().Unix() + return +} diff --git a/modules/parkour/api_changemts.go b/modules/parkour/api_changemts.go index b45f82c7e..59003ed94 100644 --- a/modules/parkour/api_changemts.go +++ b/modules/parkour/api_changemts.go @@ -3,7 +3,6 @@ package parkour import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -14,10 +13,9 @@ func (this *apiComp) ChangeMtsCheck(session comm.IUserSession, req *pb.ParkourCh ///游戏 func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeMtsReq) (errdata *pb.ErrorData) { var ( - info *pb.DBParkour - team *pb.DBParkour - mount *cfg.GameBuzkashiMountData - err error + info *pb.DBParkour + team *pb.DBParkour + err error ) if errdata = this.ChangeMtsCheck(session, req); errdata != nil { return @@ -39,19 +37,11 @@ func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeM } info.Dfmount = req.Mtsid if info.Captainid != "" { - if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), - } - return - } if info.Captainid == session.GetUserId() { for _, v := range info.Member { if v.Uid == session.GetUserId() { v.Mount = info.Dfmount - v.Maxhp = mount.Hp + v.Maxhp = 10 } } if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{ @@ -77,7 +67,7 @@ func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeM for _, v := range team.Member { if v.Uid == session.GetUserId() { v.Mount = info.Dfmount - v.Maxhp = mount.Hp + v.Maxhp = 10 } } if err = this.module.parkourComp.Change(team.Captainid, map[string]interface{}{ diff --git a/modules/parkour/api_invite.go b/modules/parkour/api_invite.go index 23a83b6bc..9f828c944 100644 --- a/modules/parkour/api_invite.go +++ b/modules/parkour/api_invite.go @@ -4,7 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" - cfg "go_dreamfactory/sys/configure/structs" "time" ) @@ -25,7 +24,6 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) info *pb.DBParkour tinfo *pb.DBParkour tuser *pb.DBUser - mount *cfg.GameBuzkashiMountData member *pb.DBRaceMember users []string ok bool @@ -64,14 +62,6 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) } return } - if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), - } - return - } ok = false for _, v := range info.Member { @@ -80,7 +70,7 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) } } if !ok { - info.Member = append(info.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: info.Dfmount, Maxhp: mount.Hp}) + info.Member = append(info.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: info.Dfmount, Maxhp: 10}) } if tinfo, err = this.module.parkourComp.queryinfo(req.Uid); err != nil { @@ -98,18 +88,10 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) } return } - if mount, err = this.module.configure.getGameBuzkashiMount(tinfo.Dfmount); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), - } - return - } //目标是否在线 if !this.module.ModuleUser.IsOnline(req.Uid) { - member = &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: tinfo.Dfmount, Maxhp: mount.Hp, Isai: true} + member = &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: tinfo.Dfmount, Maxhp: 10, Isai: true} info.Captainid = session.GetUserId() info.Member = append(info.Member, member) users = make([]string, len(info.Member)) diff --git a/modules/parkour/api_invitehandle.go b/modules/parkour/api_invitehandle.go index e334d3db7..29a5f0211 100644 --- a/modules/parkour/api_invitehandle.go +++ b/modules/parkour/api_invitehandle.go @@ -4,7 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" - cfg "go_dreamfactory/sys/configure/structs" "time" ) @@ -20,7 +19,6 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi tean *pb.DBParkour invite *pb.DBRaceInvite member *pb.DBRaceMember - mount *cfg.GameBuzkashiMountData users []string ok bool index int32 @@ -48,8 +46,8 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi } if len(tean.Member) >= 3 { errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ParkourMemberFull, - Title: pb.ErrorCode_ParkourMemberFull.ToString(), + Code: pb.ErrorCode_ParkourMemberFull, + Title: pb.ErrorCode_ParkourMemberFull.ToString(), } return } @@ -64,8 +62,8 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi } if !ok { errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ParkourInviteOverdue, - Title: pb.ErrorCode_ParkourInviteOverdue.ToString(), + Code: pb.ErrorCode_ParkourInviteOverdue, + Title: pb.ErrorCode_ParkourInviteOverdue.ToString(), } return } @@ -74,16 +72,8 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi for i, v := range tean.Member { users[i] = v.Uid } - if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), - } - return - } users = append(users, invite.Uid) - member = &pb.DBRaceMember{Uid: invite.Uid, Name: invite.Name, Avatar: invite.Avatar, Lv: invite.Lv, Mount: info.Dfmount, Maxhp: mount.Hp} + member = &pb.DBRaceMember{Uid: invite.Uid, Name: invite.Name, Avatar: invite.Avatar, Lv: invite.Lv, Mount: info.Dfmount, Maxhp: 10} tean.Captainid = tean.Uid tean.State = pb.RaceTeamState_teaming tean.Member = append(tean.Member, member) diff --git a/modules/parkour/api_jointeam.go b/modules/parkour/api_jointeam.go index a6dc7ba06..a5d4f516c 100644 --- a/modules/parkour/api_jointeam.go +++ b/modules/parkour/api_jointeam.go @@ -3,7 +3,6 @@ package parkour import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -23,7 +22,6 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam var ( info *pb.DBParkour tean *pb.DBParkour - mount *cfg.GameBuzkashiMountData member *pb.DBRaceMember users []string @@ -82,15 +80,8 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam } if tean.Captainid == "" { user := this.module.ModuleUser.GetUser(tean.Uid) - if mount, err = this.module.configure.getGameBuzkashiMount(tean.Dfmount); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), - } - return - } - member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: tean.Dfmount, Maxhp: mount.Hp} + + member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: tean.Dfmount, Maxhp: 10} tean.Captainid = tean.Uid tean.State = pb.RaceTeamState_teaming tean.Member = append(tean.Member, member) @@ -98,16 +89,9 @@ func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeam } users = append(users, session.GetUserId()) - if mount, err = this.module.configure.getGameBuzkashiMount(info.Dfmount); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), - } - return - } + user := this.module.ModuleUser.GetUser(session.GetUserId()) - member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: info.Dfmount, Maxhp: mount.Hp} + member = &pb.DBRaceMember{Uid: user.Uid, Name: user.Name, Avatar: user.Avatar, Lv: user.Lv, Mount: info.Dfmount, Maxhp: 10} tean.Member = append(tean.Member, member) if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{ "state": tean.State, diff --git a/modules/parkour/api_racematch.go b/modules/parkour/api_racematch.go index 9a692f22c..da3ca3b8b 100644 --- a/modules/parkour/api_racematch.go +++ b/modules/parkour/api_racematch.go @@ -3,7 +3,6 @@ package parkour import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -22,7 +21,6 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat var ( team *pb.DBParkour tuser *pb.DBUser - mount *cfg.GameBuzkashiMountData users []string err error ) @@ -54,15 +52,8 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat } return } - if mount, err = this.module.configure.getGameBuzkashiMount(team.Dfmount); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), - } - return - } - team.Member = append(team.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: team.Dfmount, Maxhp: mount.Hp}) + + team.Member = append(team.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Lv: tuser.Lv, Mount: team.Dfmount, Maxhp: 10}) if err = this.module.parkourComp.Change(team.Captainid, map[string]interface{}{ "state": team.State, "captainid": team.Captainid, diff --git a/modules/parkour/configure.go b/modules/parkour/configure.go index 35c83663d..427e5cbf6 100644 --- a/modules/parkour/configure.go +++ b/modules/parkour/configure.go @@ -2,7 +2,6 @@ package parkour import ( "fmt" - "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/modules" "go_dreamfactory/sys/configure" @@ -63,25 +62,6 @@ func (this *configureComp) isopen() (open bool) { return } -// 查询坐骑表 -func (this *configureComp) getGameBuzkashiMount(id string) (configure *cfg.GameBuzkashiMountData, err error) { - var ( - v interface{} - ok bool - ) - if v, err = this.GetConfigure(game_buzkashimount); err != nil { - this.module.Errorln(err) - return - } else { - if configure, ok = v.(*cfg.GameBuzkashiMount).GetDataMap()[id]; !ok { - err = comm.NewNotFoundConfErr(moduleName, game_buzkashimount, id) - this.module.Errorln(err) - return - } - } - return -} - func (this *configureComp) getGameBuzkashiReward(id int32) (configure *cfg.GameBuzkashiRewardData) { if v, err := this.GetConfigure(game_buzkashireward); err == nil { var ok bool diff --git a/modules/parkour/model_parkour.go b/modules/parkour/model_parkour.go index 4d4277696..7351055c5 100644 --- a/modules/parkour/model_parkour.go +++ b/modules/parkour/model_parkour.go @@ -10,7 +10,6 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" - cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/sys/db" "math/rand" "sync" @@ -54,7 +53,6 @@ func (this *ModelParkourComp) Start() (err error) { func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBRaceMember, err error) { var ( users []*Recommend - mount *cfg.GameBuzkashiMountData ondata bool ) this.lock.RLock() @@ -84,18 +82,14 @@ func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBRaceMembe if users[v].user = this.module.ModuleUser.GetUser(users[v].parkour.Uid); users[v].user == nil { continue } - if mount, err = this.module.configure.getGameBuzkashiMount(users[v].parkour.Dfmount); err != nil { - err = nil - continue - } users[v].member = &pb.DBRaceMember{ Uid: users[v].user.Uid, Name: users[v].user.Name, Avatar: users[v].user.Avatar, Lv: users[v].user.Lv, Mount: users[v].parkour.Dfmount, - Maxhp: mount.Hp, - Currhp: mount.Hp, + Maxhp: 10, + Currhp: 10, } } recommend[i] = users[v].member diff --git a/pb/mainline_db.pb.go b/pb/mainline_db.pb.go index 494316fac..dc8aa9188 100644 --- a/pb/mainline_db.pb.go +++ b/pb/mainline_db.pb.go @@ -25,14 +25,18 @@ type DBMainline struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` - Lastlevel map[int32]int32 `protobuf:"bytes,3,rep,name=lastlevel,proto3" json:"lastlevel" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //最后一次通关管卡 - Level map[int32]int32 `protobuf:"bytes,4,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //已通关管卡的星级 - Chapteraward map[int32]*DBMainlineAward `protobuf:"bytes,5,rep,name=chapteraward,proto3" json:"chapteraward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节进度奖励 - Exploreaward map[int32]*DBMainlineAward `protobuf:"bytes,6,rep,name=exploreaward,proto3" json:"exploreaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励 - Groupaward map[int32]*DBMainlineAward `protobuf:"bytes,7,rep,name=groupaward,proto3" json:"groupaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励 - Ps map[int32]int32 `protobuf:"bytes,8,rep,name=ps,proto3" json:"ps" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 预扣的体力 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` + Lastlevel map[int32]int32 `protobuf:"bytes,3,rep,name=lastlevel,proto3" json:"lastlevel" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //最后一次通关管卡 + Level map[int32]int32 `protobuf:"bytes,4,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //已通关管卡的星级 + Chapteraward map[int32]*DBMainlineAward `protobuf:"bytes,5,rep,name=chapteraward,proto3" json:"chapteraward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节进度奖励 + Exploreaward map[int32]*DBMainlineAward `protobuf:"bytes,6,rep,name=exploreaward,proto3" json:"exploreaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励 + Groupaward map[int32]*DBMainlineAward `protobuf:"bytes,7,rep,name=groupaward,proto3" json:"groupaward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //章节探索奖励 + Ps map[int32]int32 `protobuf:"bytes,8,rep,name=ps,proto3" json:"ps" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 预扣的体力 + Chapterboos map[int32]int32 `protobuf:"bytes,9,rep,name=chapterboos,proto3" json:"chapterboos" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //章节boos + Currbooschapter int32 `protobuf:"varint,10,opt,name=currbooschapter,proto3" json:"currbooschapter"` //当前boos章节 + Currbooschallengenum int32 `protobuf:"varint,11,opt,name=currbooschallengenum,proto3" json:"currbooschallengenum"` //当日boos挑战次数 + Lastboosrefresh int64 `protobuf:"varint,12,opt,name=lastboosrefresh,proto3" json:"lastboosrefresh"` //上一次boos刷新时间 } func (x *DBMainline) Reset() { @@ -123,6 +127,34 @@ func (x *DBMainline) GetPs() map[int32]int32 { return nil } +func (x *DBMainline) GetChapterboos() map[int32]int32 { + if x != nil { + return x.Chapterboos + } + return nil +} + +func (x *DBMainline) GetCurrbooschapter() int32 { + if x != nil { + return x.Currbooschapter + } + return 0 +} + +func (x *DBMainline) GetCurrbooschallengenum() int32 { + if x != nil { + return x.Currbooschallengenum + } + return 0 +} + +func (x *DBMainline) GetLastboosrefresh() int64 { + if x != nil { + return x.Lastboosrefresh + } + return 0 +} + type DBMainlineAward struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -325,7 +357,7 @@ var File_mainline_mainline_db_proto protoreflect.FileDescriptor var file_mainline_mainline_db_proto_rawDesc = []byte{ 0x0a, 0x1a, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa4, 0x06, 0x0a, + 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xac, 0x08, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x38, 0x0a, @@ -349,78 +381,94 @@ var file_mainline_mainline_db_proto_rawDesc = []byte{ 0x75, 0x70, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x23, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, - 0x65, 0x2e, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x02, 0x70, 0x73, 0x1a, 0x3c, 0x0a, - 0x0e, 0x4c, 0x61, 0x73, 0x74, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, - 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x51, 0x0a, 0x11, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, - 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, - 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x51, 0x0a, 0x11, 0x45, 0x78, 0x70, 0x6c, - 0x6f, 0x72, 0x65, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, - 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4f, 0x0a, 0x0f, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, - 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x35, 0x0a, 0x07, - 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x65, 0x2e, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x02, 0x70, 0x73, 0x12, 0x3e, 0x0a, + 0x0b, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x09, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2e, + 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x0b, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x12, 0x28, 0x0a, + 0x0f, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, + 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, + 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x12, 0x32, 0x0a, 0x14, 0x63, 0x75, 0x72, 0x72, 0x62, + 0x6f, 0x6f, 0x73, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x18, + 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x63, 0x75, 0x72, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x63, + 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x6c, + 0x61, 0x73, 0x74, 0x62, 0x6f, 0x6f, 0x73, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x0c, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x62, 0x6f, 0x6f, 0x73, 0x72, 0x65, + 0x66, 0x72, 0x65, 0x73, 0x68, 0x1a, 0x3c, 0x0a, 0x0e, 0x4c, 0x61, 0x73, 0x74, 0x6c, 0x65, 0x76, + 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, - 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, - 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x96, 0x02, 0x0a, 0x0e, 0x44, - 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, - 0x36, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, - 0x70, 0x2e, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, - 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x75, 0x6e, 0x6c, 0x6f, 0x63, - 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, - 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x1a, 0x3a, 0x0a, 0x0c, - 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x55, 0x6e, 0x6c, 0x6f, - 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x22, 0x82, 0x02, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, - 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, - 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x03, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, - 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x61, 0x73, - 0x6b, 0x73, 0x12, 0x2f, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e, - 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x1a, 0x38, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, - 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x51, 0x0a, + 0x11, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, + 0x1a, 0x51, 0x0a, 0x11, 0x45, 0x78, 0x70, 0x6c, 0x6f, 0x72, 0x65, 0x61, 0x77, 0x61, 0x72, 0x64, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, + 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x1a, 0x4f, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x35, 0x0a, 0x07, 0x50, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x43, + 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x0f, + 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, + 0x31, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, + 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, + 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x77, 0x61, + 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, + 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x22, 0x96, 0x02, 0x0a, 0x0e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, + 0x65, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, + 0x6d, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, + 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x2e, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, + 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x62, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x12, + 0x33, 0x0a, 0x06, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x1b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x68, 0x6f, 0x70, + 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x75, 0x6e, + 0x6c, 0x6f, 0x63, 0x6b, 0x1a, 0x3a, 0x0a, 0x0c, 0x42, 0x75, 0x79, 0x74, 0x69, 0x6d, 0x65, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, + 0x1a, 0x39, 0x0a, 0x0b, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x82, 0x02, 0x0a, 0x0a, + 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x05, + 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, + 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x2f, 0x0a, 0x06, 0x72, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x4d, + 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x38, 0x0a, 0x0a, 0x54, + 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -435,7 +483,7 @@ func file_mainline_mainline_db_proto_rawDescGZIP() []byte { return file_mainline_mainline_db_proto_rawDescData } -var file_mainline_mainline_db_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_mainline_mainline_db_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_mainline_mainline_db_proto_goTypes = []interface{}{ (*DBMainline)(nil), // 0: DBMainline (*DBMainlineAward)(nil), // 1: DBMainlineAward @@ -447,11 +495,12 @@ var file_mainline_mainline_db_proto_goTypes = []interface{}{ nil, // 7: DBMainline.ExploreawardEntry nil, // 8: DBMainline.GroupawardEntry nil, // 9: DBMainline.PsEntry - nil, // 10: DBMainlineAward.AwardEntry - nil, // 11: DBMainlineShop.BuytimeEntry - nil, // 12: DBMainlineShop.UnlockEntry - nil, // 13: DBMainTask.TasksEntry - nil, // 14: DBMainTask.RewardEntry + nil, // 10: DBMainline.ChapterboosEntry + nil, // 11: DBMainlineAward.AwardEntry + nil, // 12: DBMainlineShop.BuytimeEntry + nil, // 13: DBMainlineShop.UnlockEntry + nil, // 14: DBMainTask.TasksEntry + nil, // 15: DBMainTask.RewardEntry } var file_mainline_mainline_db_proto_depIdxs = []int32{ 4, // 0: DBMainline.lastlevel:type_name -> DBMainline.LastlevelEntry @@ -460,19 +509,20 @@ var file_mainline_mainline_db_proto_depIdxs = []int32{ 7, // 3: DBMainline.exploreaward:type_name -> DBMainline.ExploreawardEntry 8, // 4: DBMainline.groupaward:type_name -> DBMainline.GroupawardEntry 9, // 5: DBMainline.ps:type_name -> DBMainline.PsEntry - 10, // 6: DBMainlineAward.award:type_name -> DBMainlineAward.AwardEntry - 11, // 7: DBMainlineShop.buytime:type_name -> DBMainlineShop.BuytimeEntry - 12, // 8: DBMainlineShop.unlock:type_name -> DBMainlineShop.UnlockEntry - 13, // 9: DBMainTask.tasks:type_name -> DBMainTask.TasksEntry - 14, // 10: DBMainTask.reward:type_name -> DBMainTask.RewardEntry - 1, // 11: DBMainline.ChapterawardEntry.value:type_name -> DBMainlineAward - 1, // 12: DBMainline.ExploreawardEntry.value:type_name -> DBMainlineAward - 1, // 13: DBMainline.GroupawardEntry.value:type_name -> DBMainlineAward - 14, // [14:14] is the sub-list for method output_type - 14, // [14:14] is the sub-list for method input_type - 14, // [14:14] is the sub-list for extension type_name - 14, // [14:14] is the sub-list for extension extendee - 0, // [0:14] is the sub-list for field type_name + 10, // 6: DBMainline.chapterboos:type_name -> DBMainline.ChapterboosEntry + 11, // 7: DBMainlineAward.award:type_name -> DBMainlineAward.AwardEntry + 12, // 8: DBMainlineShop.buytime:type_name -> DBMainlineShop.BuytimeEntry + 13, // 9: DBMainlineShop.unlock:type_name -> DBMainlineShop.UnlockEntry + 14, // 10: DBMainTask.tasks:type_name -> DBMainTask.TasksEntry + 15, // 11: DBMainTask.reward:type_name -> DBMainTask.RewardEntry + 1, // 12: DBMainline.ChapterawardEntry.value:type_name -> DBMainlineAward + 1, // 13: DBMainline.ExploreawardEntry.value:type_name -> DBMainlineAward + 1, // 14: DBMainline.GroupawardEntry.value:type_name -> DBMainlineAward + 15, // [15:15] is the sub-list for method output_type + 15, // [15:15] is the sub-list for method input_type + 15, // [15:15] is the sub-list for extension type_name + 15, // [15:15] is the sub-list for extension extendee + 0, // [0:15] is the sub-list for field type_name } func init() { file_mainline_mainline_db_proto_init() } @@ -536,7 +586,7 @@ func file_mainline_mainline_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_mainline_mainline_db_proto_rawDesc, NumEnums: 0, - NumMessages: 15, + NumMessages: 16, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/mainline_msg.pb.go b/pb/mainline_msg.pb.go index d39bf48f6..842000cb5 100644 --- a/pb/mainline_msg.pb.go +++ b/pb/mainline_msg.pb.go @@ -1176,6 +1176,229 @@ func (x *MainlineTaskChapteRewardResp) GetAward() []*UserAtno { return nil } +//boos 挑战 +type MainlineBoosChallengeReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Boosid int32 `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"` + Battle *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"` +} + +func (x *MainlineBoosChallengeReq) Reset() { + *x = MainlineBoosChallengeReq{} + if protoimpl.UnsafeEnabled { + mi := &file_mainline_mainline_msg_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *MainlineBoosChallengeReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*MainlineBoosChallengeReq) ProtoMessage() {} + +func (x *MainlineBoosChallengeReq) ProtoReflect() protoreflect.Message { + mi := &file_mainline_mainline_msg_proto_msgTypes[21] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use MainlineBoosChallengeReq.ProtoReflect.Descriptor instead. +func (*MainlineBoosChallengeReq) Descriptor() ([]byte, []int) { + return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{21} +} + +func (x *MainlineBoosChallengeReq) GetBoosid() int32 { + if x != nil { + return x.Boosid + } + return 0 +} + +func (x *MainlineBoosChallengeReq) GetBattle() *BattleFormation { + if x != nil { + return x.Battle + } + return nil +} + +//boos 挑战回应 +type MainlineBoosChallengeResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` + Boosid int32 `protobuf:"varint,2,opt,name=boosid,proto3" json:"boosid"` +} + +func (x *MainlineBoosChallengeResp) Reset() { + *x = MainlineBoosChallengeResp{} + if protoimpl.UnsafeEnabled { + mi := &file_mainline_mainline_msg_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *MainlineBoosChallengeResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*MainlineBoosChallengeResp) ProtoMessage() {} + +func (x *MainlineBoosChallengeResp) ProtoReflect() protoreflect.Message { + mi := &file_mainline_mainline_msg_proto_msgTypes[22] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use MainlineBoosChallengeResp.ProtoReflect.Descriptor instead. +func (*MainlineBoosChallengeResp) Descriptor() ([]byte, []int) { + return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{22} +} + +func (x *MainlineBoosChallengeResp) GetInfo() *BattleInfo { + if x != nil { + return x.Info + } + return nil +} + +func (x *MainlineBoosChallengeResp) GetBoosid() int32 { + if x != nil { + return x.Boosid + } + return 0 +} + +//关卡战斗结束请求 +type MainlineBoosChallengeOverReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Boosid int32 `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"` + Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报 +} + +func (x *MainlineBoosChallengeOverReq) Reset() { + *x = MainlineBoosChallengeOverReq{} + if protoimpl.UnsafeEnabled { + mi := &file_mainline_mainline_msg_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *MainlineBoosChallengeOverReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*MainlineBoosChallengeOverReq) ProtoMessage() {} + +func (x *MainlineBoosChallengeOverReq) ProtoReflect() protoreflect.Message { + mi := &file_mainline_mainline_msg_proto_msgTypes[23] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use MainlineBoosChallengeOverReq.ProtoReflect.Descriptor instead. +func (*MainlineBoosChallengeOverReq) Descriptor() ([]byte, []int) { + return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{23} +} + +func (x *MainlineBoosChallengeOverReq) GetBoosid() int32 { + if x != nil { + return x.Boosid + } + return 0 +} + +func (x *MainlineBoosChallengeOverReq) GetReport() *BattleReport { + if x != nil { + return x.Report + } + return nil +} + +type MainlineBoosChallengeOverResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Boosid int32 `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"` + Reward []*UserAtno `protobuf:"bytes,2,rep,name=reward,proto3" json:"reward"` //奖励 +} + +func (x *MainlineBoosChallengeOverResp) Reset() { + *x = MainlineBoosChallengeOverResp{} + if protoimpl.UnsafeEnabled { + mi := &file_mainline_mainline_msg_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *MainlineBoosChallengeOverResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*MainlineBoosChallengeOverResp) ProtoMessage() {} + +func (x *MainlineBoosChallengeOverResp) ProtoReflect() protoreflect.Message { + mi := &file_mainline_mainline_msg_proto_msgTypes[24] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use MainlineBoosChallengeOverResp.ProtoReflect.Descriptor instead. +func (*MainlineBoosChallengeOverResp) Descriptor() ([]byte, []int) { + return file_mainline_mainline_msg_proto_rawDescGZIP(), []int{24} +} + +func (x *MainlineBoosChallengeOverResp) GetBoosid() int32 { + if x != nil { + return x.Boosid + } + return 0 +} + +func (x *MainlineBoosChallengeOverResp) GetReward() []*UserAtno { + if x != nil { + return x.Reward + } + return nil +} + var File_mainline_mainline_msg_proto protoreflect.FileDescriptor var file_mainline_mainline_msg_proto_rawDesc = []byte{ @@ -1289,8 +1512,31 @@ var file_mainline_mainline_msg_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, - 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x5c, 0x0a, 0x18, 0x4d, 0x61, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, + 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, + 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, + 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x54, 0x0a, 0x19, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, + 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, + 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x22, 0x5d, 0x0a, 0x1c, + 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, + 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, + 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, + 0x6f, 0x73, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, + 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x5a, 0x0a, 0x1d, 0x4d, + 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6c, 0x6c, + 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, + 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, + 0x6f, 0x73, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, + 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1305,60 +1551,68 @@ func file_mainline_mainline_msg_proto_rawDescGZIP() []byte { return file_mainline_mainline_msg_proto_rawDescData } -var file_mainline_mainline_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21) +var file_mainline_mainline_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 25) var file_mainline_mainline_msg_proto_goTypes = []interface{}{ - (*MainlineInfoReq)(nil), // 0: MainlineInfoReq - (*MainlineInfoResp)(nil), // 1: MainlineInfoResp - (*MainlineChallengeReq)(nil), // 2: MainlineChallengeReq - (*MainlineChallengeResp)(nil), // 3: MainlineChallengeResp - (*MainlineChallengeOverReq)(nil), // 4: MainlineChallengeOverReq - (*MainlineChallengeOverResp)(nil), // 5: MainlineChallengeOverResp - (*MainlineLevelPassReq)(nil), // 6: MainlineLevelPassReq - (*MainlineLevelPassResp)(nil), // 7: MainlineLevelPassResp - (*MainlineReceiveAwardReq)(nil), // 8: MainlineReceiveAwardReq - (*MainlineReceiveAwardResp)(nil), // 9: MainlineReceiveAwardResp - (*MainlineShopReq)(nil), // 10: MainlineShopReq - (*MainlineShopResp)(nil), // 11: MainlineShopResp - (*MainlineShopBuyReq)(nil), // 12: MainlineShopBuyReq - (*MainlineShopBuyResp)(nil), // 13: MainlineShopBuyResp - (*MainlineShopChangePush)(nil), // 14: MainlineShopChangePush - (*MainlineTaskInfoReq)(nil), // 15: MainlineTaskInfoReq - (*MainlineTaskInfoResp)(nil), // 16: MainlineTaskInfoResp - (*MainlineTaskReceiveReq)(nil), // 17: MainlineTaskReceiveReq - (*MainlineTaskReceiveResp)(nil), // 18: MainlineTaskReceiveResp - (*MainlineTaskChapteRewardReq)(nil), // 19: MainlineTaskChapteRewardReq - (*MainlineTaskChapteRewardResp)(nil), // 20: MainlineTaskChapteRewardResp - (*DBMainline)(nil), // 21: DBMainline - (*ConIProgress)(nil), // 22: ConIProgress - (*BattleFormation)(nil), // 23: BattleFormation - (*BattleInfo)(nil), // 24: BattleInfo - (*BattleReport)(nil), // 25: BattleReport - (*UserAtno)(nil), // 26: UserAtno - (*DBMainlineShop)(nil), // 27: DBMainlineShop - (*DBMainTask)(nil), // 28: DBMainTask + (*MainlineInfoReq)(nil), // 0: MainlineInfoReq + (*MainlineInfoResp)(nil), // 1: MainlineInfoResp + (*MainlineChallengeReq)(nil), // 2: MainlineChallengeReq + (*MainlineChallengeResp)(nil), // 3: MainlineChallengeResp + (*MainlineChallengeOverReq)(nil), // 4: MainlineChallengeOverReq + (*MainlineChallengeOverResp)(nil), // 5: MainlineChallengeOverResp + (*MainlineLevelPassReq)(nil), // 6: MainlineLevelPassReq + (*MainlineLevelPassResp)(nil), // 7: MainlineLevelPassResp + (*MainlineReceiveAwardReq)(nil), // 8: MainlineReceiveAwardReq + (*MainlineReceiveAwardResp)(nil), // 9: MainlineReceiveAwardResp + (*MainlineShopReq)(nil), // 10: MainlineShopReq + (*MainlineShopResp)(nil), // 11: MainlineShopResp + (*MainlineShopBuyReq)(nil), // 12: MainlineShopBuyReq + (*MainlineShopBuyResp)(nil), // 13: MainlineShopBuyResp + (*MainlineShopChangePush)(nil), // 14: MainlineShopChangePush + (*MainlineTaskInfoReq)(nil), // 15: MainlineTaskInfoReq + (*MainlineTaskInfoResp)(nil), // 16: MainlineTaskInfoResp + (*MainlineTaskReceiveReq)(nil), // 17: MainlineTaskReceiveReq + (*MainlineTaskReceiveResp)(nil), // 18: MainlineTaskReceiveResp + (*MainlineTaskChapteRewardReq)(nil), // 19: MainlineTaskChapteRewardReq + (*MainlineTaskChapteRewardResp)(nil), // 20: MainlineTaskChapteRewardResp + (*MainlineBoosChallengeReq)(nil), // 21: MainlineBoosChallengeReq + (*MainlineBoosChallengeResp)(nil), // 22: MainlineBoosChallengeResp + (*MainlineBoosChallengeOverReq)(nil), // 23: MainlineBoosChallengeOverReq + (*MainlineBoosChallengeOverResp)(nil), // 24: MainlineBoosChallengeOverResp + (*DBMainline)(nil), // 25: DBMainline + (*ConIProgress)(nil), // 26: ConIProgress + (*BattleFormation)(nil), // 27: BattleFormation + (*BattleInfo)(nil), // 28: BattleInfo + (*BattleReport)(nil), // 29: BattleReport + (*UserAtno)(nil), // 30: UserAtno + (*DBMainlineShop)(nil), // 31: DBMainlineShop + (*DBMainTask)(nil), // 32: DBMainTask } var file_mainline_mainline_msg_proto_depIdxs = []int32{ - 21, // 0: MainlineInfoResp.info:type_name -> DBMainline - 22, // 1: MainlineInfoResp.conlds:type_name -> ConIProgress - 23, // 2: MainlineChallengeReq.battle:type_name -> BattleFormation - 24, // 3: MainlineChallengeResp.info:type_name -> BattleInfo - 25, // 4: MainlineChallengeOverReq.report:type_name -> BattleReport - 26, // 5: MainlineChallengeOverResp.reward:type_name -> UserAtno - 26, // 6: MainlineLevelPassResp.reward:type_name -> UserAtno - 26, // 7: MainlineReceiveAwardResp.reward:type_name -> UserAtno - 27, // 8: MainlineShopResp.info:type_name -> DBMainlineShop - 27, // 9: MainlineShopBuyResp.info:type_name -> DBMainlineShop - 26, // 10: MainlineShopBuyResp.item:type_name -> UserAtno - 22, // 11: MainlineTaskInfoResp.conlds:type_name -> ConIProgress - 28, // 12: MainlineTaskInfoResp.tasks:type_name -> DBMainTask - 26, // 13: MainlineTaskReceiveResp.award:type_name -> UserAtno - 28, // 14: MainlineTaskChapteRewardResp.task:type_name -> DBMainTask - 26, // 15: MainlineTaskChapteRewardResp.award:type_name -> UserAtno - 16, // [16:16] is the sub-list for method output_type - 16, // [16:16] is the sub-list for method input_type - 16, // [16:16] is the sub-list for extension type_name - 16, // [16:16] is the sub-list for extension extendee - 0, // [0:16] is the sub-list for field type_name + 25, // 0: MainlineInfoResp.info:type_name -> DBMainline + 26, // 1: MainlineInfoResp.conlds:type_name -> ConIProgress + 27, // 2: MainlineChallengeReq.battle:type_name -> BattleFormation + 28, // 3: MainlineChallengeResp.info:type_name -> BattleInfo + 29, // 4: MainlineChallengeOverReq.report:type_name -> BattleReport + 30, // 5: MainlineChallengeOverResp.reward:type_name -> UserAtno + 30, // 6: MainlineLevelPassResp.reward:type_name -> UserAtno + 30, // 7: MainlineReceiveAwardResp.reward:type_name -> UserAtno + 31, // 8: MainlineShopResp.info:type_name -> DBMainlineShop + 31, // 9: MainlineShopBuyResp.info:type_name -> DBMainlineShop + 30, // 10: MainlineShopBuyResp.item:type_name -> UserAtno + 26, // 11: MainlineTaskInfoResp.conlds:type_name -> ConIProgress + 32, // 12: MainlineTaskInfoResp.tasks:type_name -> DBMainTask + 30, // 13: MainlineTaskReceiveResp.award:type_name -> UserAtno + 32, // 14: MainlineTaskChapteRewardResp.task:type_name -> DBMainTask + 30, // 15: MainlineTaskChapteRewardResp.award:type_name -> UserAtno + 27, // 16: MainlineBoosChallengeReq.battle:type_name -> BattleFormation + 28, // 17: MainlineBoosChallengeResp.info:type_name -> BattleInfo + 29, // 18: MainlineBoosChallengeOverReq.report:type_name -> BattleReport + 30, // 19: MainlineBoosChallengeOverResp.reward:type_name -> UserAtno + 20, // [20:20] is the sub-list for method output_type + 20, // [20:20] is the sub-list for method input_type + 20, // [20:20] is the sub-list for extension type_name + 20, // [20:20] is the sub-list for extension extendee + 0, // [0:20] is the sub-list for field type_name } func init() { file_mainline_mainline_msg_proto_init() } @@ -1623,6 +1877,54 @@ func file_mainline_mainline_msg_proto_init() { return nil } } + file_mainline_mainline_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*MainlineBoosChallengeReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_mainline_mainline_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*MainlineBoosChallengeResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_mainline_mainline_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*MainlineBoosChallengeOverReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_mainline_mainline_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*MainlineBoosChallengeOverResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1630,7 +1932,7 @@ func file_mainline_mainline_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_mainline_mainline_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 21, + NumMessages: 25, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.BuzkashiMount.go b/sys/configure/structs/Game.BuzkashiMount.go index 3617f9d71..9a4bd87b6 100644 --- a/sys/configure/structs/Game.BuzkashiMount.go +++ b/sys/configure/structs/Game.BuzkashiMount.go @@ -9,34 +9,26 @@ package cfg type GameBuzkashiMount struct { - _dataMap map[string]*GameBuzkashiMountData _dataList []*GameBuzkashiMountData } func NewGameBuzkashiMount(_buf []map[string]interface{}) (*GameBuzkashiMount, error) { _dataList := make([]*GameBuzkashiMountData, 0, len(_buf)) - dataMap := make(map[string]*GameBuzkashiMountData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGameBuzkashiMountData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v } } - return &GameBuzkashiMount{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GameBuzkashiMount) GetDataMap() map[string]*GameBuzkashiMountData { - return table._dataMap + return &GameBuzkashiMount{_dataList:_dataList}, nil } func (table *GameBuzkashiMount) GetDataList() []*GameBuzkashiMountData { return table._dataList } -func (table *GameBuzkashiMount) Get(key string) *GameBuzkashiMountData { - return table._dataMap[key] +func (table *GameBuzkashiMount) Get(index int) *GameBuzkashiMountData { + return table._dataList[index] } - diff --git a/sys/configure/structs/Game.BuzkashiMountData.go b/sys/configure/structs/Game.BuzkashiMountData.go index 140ac2f86..6552486c1 100644 --- a/sys/configure/structs/Game.BuzkashiMountData.go +++ b/sys/configure/structs/Game.BuzkashiMountData.go @@ -12,6 +12,7 @@ import "errors" type GameBuzkashiMountData struct { Id string + Type int32 Name string Intr string Color int32 @@ -26,6 +27,9 @@ type GameBuzkashiMountData struct { Sprint int32 Acceleration int32 Deceleration int32 + Itemsprint int32 + Caddtime int32 + Csubtime int32 } const TypeId_GameBuzkashiMountData = 1598069936 @@ -36,6 +40,7 @@ func (*GameBuzkashiMountData) GetTypeId() int32 { func (_v *GameBuzkashiMountData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Color"].(float64); !_ok_ { err = errors.New("Color error"); return }; _v.Color = int32(_tempNum_) } @@ -63,6 +68,9 @@ func (_v *GameBuzkashiMountData)Deserialize(_buf map[string]interface{}) (err er { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sprint"].(float64); !_ok_ { err = errors.New("sprint error"); return }; _v.Sprint = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["acceleration"].(float64); !_ok_ { err = errors.New("acceleration error"); return }; _v.Acceleration = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deceleration"].(float64); !_ok_ { err = errors.New("deceleration error"); return }; _v.Deceleration = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["itemsprint"].(float64); !_ok_ { err = errors.New("itemsprint error"); return }; _v.Itemsprint = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["caddtime"].(float64); !_ok_ { err = errors.New("caddtime error"); return }; _v.Caddtime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["csubtime"].(float64); !_ok_ { err = errors.New("csubtime error"); return }; _v.Csubtime = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.MainBoss.go b/sys/configure/structs/Game.MainBoss.go new file mode 100644 index 000000000..292ee1c7a --- /dev/null +++ b/sys/configure/structs/Game.MainBoss.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameMainBoss struct { + _dataMap map[int32]*GameMainBossData + _dataList []*GameMainBossData +} + +func NewGameMainBoss(_buf []map[string]interface{}) (*GameMainBoss, error) { + _dataList := make([]*GameMainBossData, 0, len(_buf)) + dataMap := make(map[int32]*GameMainBossData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameMainBossData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameMainBoss{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameMainBoss) GetDataMap() map[int32]*GameMainBossData { + return table._dataMap +} + +func (table *GameMainBoss) GetDataList() []*GameMainBossData { + return table._dataList +} + +func (table *GameMainBoss) Get(key int32) *GameMainBossData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.MainBossData.go b/sys/configure/structs/Game.MainBossData.go new file mode 100644 index 000000000..3bd40fa20 --- /dev/null +++ b/sys/configure/structs/Game.MainBossData.go @@ -0,0 +1,73 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameMainBossData struct { + Id int32 + MonsterChapter int32 + MonsterDisplayIp int32 + MonsterStrength int32 + Battlereadyid int32 + FormatList []int32 + Reward []*Gameatn +} + +const TypeId_GameMainBossData = 923446796 + +func (*GameMainBossData) GetTypeId() int32 { + return 923446796 +} + +func (_v *GameMainBossData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monster_chapter"].(float64); !_ok_ { err = errors.New("monster_chapter error"); return }; _v.MonsterChapter = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MonsterDisplay_Ip"].(float64); !_ok_ { err = errors.New("MonsterDisplay_Ip error"); return }; _v.MonsterDisplayIp = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monster_strength"].(float64); !_ok_ { err = errors.New("monster_strength error"); return }; _v.MonsterStrength = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["battlereadyid"].(float64); !_ok_ { err = errors.New("battlereadyid error"); return }; _v.Battlereadyid = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["formatList"].([]interface{}); !_ok_ { err = errors.New("formatList error"); return } + + _v.FormatList = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.FormatList = append(_v.FormatList, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return } + + _v.Reward = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Reward = append(_v.Reward, _list_v_) + } + } + + return +} + +func DeserializeGameMainBossData(_buf map[string]interface{}) (*GameMainBossData, error) { + v := &GameMainBossData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.MainChapterData.go b/sys/configure/structs/Game.MainChapterData.go index eafb322d8..3240e3863 100644 --- a/sys/configure/structs/Game.MainChapterData.go +++ b/sys/configure/structs/Game.MainChapterData.go @@ -26,6 +26,7 @@ type GameMainChapterData struct { Desc string Starreward int32 Exploreward int32 + Bosspro int32 } const TypeId_GameMainChapterData = 2014963746 @@ -50,6 +51,7 @@ func (_v *GameMainChapterData)Deserialize(_buf map[string]interface{}) (err erro {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starreward"].(float64); !_ok_ { err = errors.New("starreward error"); return }; _v.Starreward = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exploreward"].(float64); !_ok_ { err = errors.New("exploreward error"); return }; _v.Exploreward = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bosspro"].(float64); !_ok_ { err = errors.New("bosspro error"); return }; _v.Bosspro = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 141f8ca94..1fc361824 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -253,6 +253,7 @@ type Tables struct { TopUIConfig *GameTopUIConfig MainShopItem *GameMainShopItem MainAchievement *GameMainAchievement + MainBoss *GameMainBoss Trainlv *GameTrainlv DragonPlay *GameDragonPlay DragonPlot *GameDragonPlot @@ -1715,6 +1716,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.MainAchievement, err = NewGameMainAchievement(buf) ; err != nil { return nil, err } + if buf, err = loader("game_mainboss") ; err != nil { + return nil, err + } + if tables.MainBoss, err = NewGameMainBoss(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_trainlv") ; err != nil { return nil, err } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 9880879ae..c58d4697a 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -162,6 +162,7 @@ type GameGlobalData struct { LibraryStoryUnlocking int32 PsRecovery int32 PsUl int32 + MianBossNum int32 PsBuy []*Gameatn PsLimit int32 PsItem *Gameatn @@ -233,6 +234,8 @@ type GameGlobalData struct { BuzkashiCaddtracktime int32 BuzkashiAddtracktime int32 BuzkashiSubtracktime int32 + BuzkashiCaddblurtime int32 + BuzkashiCsubblurtime int32 BuzkashiBumpspeedtime int32 BuzkashiDeathsubtime int32 BuzkashiCatchsubtime int32 @@ -775,6 +778,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["library_StoryUnlocking"].(float64); !_ok_ { err = errors.New("library_StoryUnlocking error"); return }; _v.LibraryStoryUnlocking = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ps_recovery"].(float64); !_ok_ { err = errors.New("ps_recovery error"); return }; _v.PsRecovery = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ps_ul"].(float64); !_ok_ { err = errors.New("ps_ul error"); return }; _v.PsUl = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Mian_BossNum"].(float64); !_ok_ { err = errors.New("Mian_BossNum error"); return }; _v.MianBossNum = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool @@ -989,6 +993,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_caddtracktime"].(float64); !_ok_ { err = errors.New("buzkashi_caddtracktime error"); return }; _v.BuzkashiCaddtracktime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_addtracktime"].(float64); !_ok_ { err = errors.New("buzkashi_addtracktime error"); return }; _v.BuzkashiAddtracktime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_subtracktime"].(float64); !_ok_ { err = errors.New("buzkashi_subtracktime error"); return }; _v.BuzkashiSubtracktime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_caddblurtime"].(float64); !_ok_ { err = errors.New("buzkashi_caddblurtime error"); return }; _v.BuzkashiCaddblurtime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_csubblurtime"].(float64); !_ok_ { err = errors.New("buzkashi_csubblurtime error"); return }; _v.BuzkashiCsubblurtime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpspeedtime"].(float64); !_ok_ { err = errors.New("buzkashi_bumpspeedtime error"); return }; _v.BuzkashiBumpspeedtime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_deathsubtime"].(float64); !_ok_ { err = errors.New("buzkashi_deathsubtime error"); return }; _v.BuzkashiDeathsubtime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_catchsubtime"].(float64); !_ok_ { err = errors.New("buzkashi_catchsubtime error"); return }; _v.BuzkashiCatchsubtime = int32(_tempNum_) }