From b839fc7d38b91aaf97d18eb41501235bd565e52a Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 1 Sep 2023 11:20:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9D=90=E9=AA=91=E5=8A=A0=E7=BB=8F?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 2 +- 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_item.json | 238 +++- 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/dragon/api_list.go | 2 + modules/dragon/api_train.go | 83 ++ modules/dragon/configure_comp.go | 31 +- modules/dragon/model_dragon.go | 10 + pb/dragon_db.pb.go | 29 +- pb/dragon_msg.pb.go | 53 +- sys/configure/structs/Game.MainChapterData.go | 2 + sys/configure/structs/game.globalData.go | 6 + 20 files changed, 1207 insertions(+), 936 deletions(-) create mode 100644 modules/dragon/api_train.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_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_item.json b/bin/json/game_item.json index cd8fb3660..ef247459b 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -19627,7 +19627,7 @@ "upper_limit": 0, "img": "", "intr": { - "key": "", + "key": "item_item_intr_404", "text": "" }, "describe": { @@ -19673,7 +19673,7 @@ "upper_limit": 0, "img": "", "intr": { - "key": "", + "key": "item_item_intr_405", "text": "" }, "describe": { @@ -19719,7 +19719,7 @@ "upper_limit": 0, "img": "", "intr": { - "key": "", + "key": "item_item_intr_406", "text": "" }, "describe": { @@ -19765,7 +19765,7 @@ "upper_limit": 0, "img": "", "intr": { - "key": "", + "key": "item_item_intr_407", "text": "" }, "describe": { @@ -19784,5 +19784,235 @@ } ], "gm": 1 + }, + { + "id": "24012001", + "name": { + "key": "item_item_name_406", + "text": "幼龙吃的小鱼" + }, + "usetype": 1, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "", + "intr": { + "key": "item_item_intr_408", + "text": "" + }, + "describe": { + "key": "item_item_describe_408", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_406", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 1 + }, + { + "id": "24012002", + "name": { + "key": "item_item_name_407", + "text": "成龙吃的大鱼" + }, + "usetype": 1, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "", + "intr": { + "key": "item_item_intr_409", + "text": "" + }, + "describe": { + "key": "item_item_describe_409", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_407", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 1 + }, + { + "id": "24012003", + "name": { + "key": "item_item_name_408", + "text": "驯龙交互次数总上限" + }, + "usetype": 1, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "", + "intr": { + "key": "item_item_intr_410", + "text": "" + }, + "describe": { + "key": "item_item_describe_410", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_408", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 1 + }, + { + "id": "24012004", + "name": { + "key": "item_item_name_409", + "text": "成龙特殊提升道具1" + }, + "usetype": 1, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "", + "intr": { + "key": "item_item_intr_411", + "text": "" + }, + "describe": { + "key": "item_item_describe_411", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_409", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 1 + }, + { + "id": "24012005", + "name": { + "key": "item_item_name_410", + "text": "成龙特殊提升道具2" + }, + "usetype": 1, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "", + "intr": { + "key": "item_item_intr_412", + "text": "" + }, + "describe": { + "key": "item_item_describe_412", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_410", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 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/dragon/api_list.go b/modules/dragon/api_list.go index c34711a7b..e2568bded 100644 --- a/modules/dragon/api_list.go +++ b/modules/dragon/api_list.go @@ -13,6 +13,8 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.DragonGetListR func (this *apiComp) List(session comm.IUserSession, req *pb.DragonGetListReq) (errdata *pb.ErrorData) { rsp := &pb.DragonGetListResp{} + rsp.Dragons, _ = this.module.modelDragon.GetDragonList(session.GetUserId()) + session.SendMsg(string(this.module.GetType()), "", rsp) return } diff --git a/modules/dragon/api_train.go b/modules/dragon/api_train.go new file mode 100644 index 000000000..7ff77c534 --- /dev/null +++ b/modules/dragon/api_train.go @@ -0,0 +1,83 @@ +package dragon + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +//参数校验 +func (this *apiComp) TrainCheck(session comm.IUserSession, req *pb.DragonTrainReq) (errdata *pb.ErrorData) { + if len(req.Oid) == 0 || req.Ttype == 0 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + } + return +} + +func (this *apiComp) Train(session comm.IUserSession, req *pb.DragonTrainReq) (errdata *pb.ErrorData) { + var ( + err error + dragon *pb.DBDragon + addExp int32 // 获得的训练值 + playConf *cfg.GameDragonPlayData + update map[string]interface{} + ) + update = make(map[string]interface{}) + rsp := &pb.DragonTrainResp{} + if errdata = this.TrainCheck(session, req); errdata != nil { + return + } + + if dragon, err = this.module.modelDragon.GetDragonByOid(session.GetUserId(), req.Oid); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: err.Error(), + } + } + if conf, err := this.module.configure.GetDragonConfById(dragon.Dragonid, dragon.Lv); err == nil { + if playConf, err = this.module.configure.GetDragonPlayConfById(dragon.Dragonid, conf.Type, req.Ttype); err == nil { + addExp = playConf.Exp + // 校验消耗 + if errdata = this.module.CheckRes(session, []*cfg.Gameatn{playConf.Deplete}); errdata != nil { + return + } + } else { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + + dragon.Exp += playConf.Exp // 加经验 + + for { + if dragon.Exp >= conf.Exp { + dragon.Lv += 1 + dragon.Exp -= conf.Exp + if conf, err = this.module.configure.GetDragonConfById(dragon.Dragonid, dragon.Lv); err != nil { + dragon.Lv -= 1 + dragon.Exp += conf.Exp + break + } + }else{ + break + } + } + } + + // 校验训练次数 + if dragon.Play[req.Ttype] >= playConf.Time { + return + } + dragon.Play[req.Ttype] += 1 // 次数+1 + update["play"] = dragon.Play + this.module.modelDragon.UpdateDragonData(session.GetUserId(), dragon.Id, update) + session.SendMsg(string(this.module.GetType()), "", rsp) + return +} diff --git a/modules/dragon/configure_comp.go b/modules/dragon/configure_comp.go index 0e629a2cd..35e97c5c5 100644 --- a/modules/dragon/configure_comp.go +++ b/modules/dragon/configure_comp.go @@ -16,6 +16,7 @@ import ( const moduleName = "dragon" const ( dragon_trainlv = "game_trainlv.json" + dragon_play = "game_dragonplay.json" ) // /配置管理组件 @@ -24,6 +25,7 @@ type configureComp struct { module *Dragon hlock sync.RWMutex dragon map[string]*cfg.GameTrainlvData + play map[string]*cfg.GameDragonPlayData } // 组件初始化接口 @@ -35,7 +37,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp //dragon_trainlv: cfg.NewGameTrainlv, }) configure.RegisterConfigure(dragon_trainlv, cfg.NewGameTrainlv, this.LoadDragon) - + configure.RegisterConfigure(dragon_play, cfg.NewGameDragonPlay, this.LoadDragonPlay) return } @@ -54,6 +56,21 @@ func (this *configureComp) LoadDragon() { err = fmt.Errorf("%T no is *cfg.GameTrainlv", v) } } +func (this *configureComp) LoadDragonPlay() { + if v, err := this.GetConfigure(dragon_play); err == nil { + this.hlock.Lock() + defer this.hlock.Unlock() + this.play = make(map[string]*cfg.GameDragonPlayData) + if _configure, ok := v.(*cfg.GameDragonPlay); ok { + for _, v := range _configure.GetDataList() { + this.play[v.Id+"-"+strconv.Itoa(int(v.Grow))+"-"+strconv.Itoa(int(v.Type))] = v + } + return + } + } else { + err = fmt.Errorf("%T no is *cfg.GameDragonPlay", v) + } +} //加载多个配置文件 func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err error) { @@ -96,3 +113,15 @@ func (this *configureComp) GetDragonConfById(id string, lv int32) (conf *cfg.Gam err = comm.NewNotFoundConfErr(moduleName, dragon_trainlv, fmt.Sprintf("id:%s,lv:%d", id, lv)) return } + +func (this *configureComp) GetDragonPlayConfById(id string, grow int32, itype int32) (conf *cfg.GameDragonPlayData, err error) { + key := id + "-" + strconv.Itoa(int(grow)) + "-" + strconv.Itoa(int(itype)) + this.hlock.RLock() + defer this.hlock.RUnlock() + ok := false + if conf, ok = this.play[key]; ok { + return + } + err = comm.NewNotFoundConfErr(moduleName, dragon_trainlv, fmt.Sprintf("id:%s,grow:%d,itype:%d", id, grow, itype)) + return +} diff --git a/modules/dragon/model_dragon.go b/modules/dragon/model_dragon.go index f52239a7c..b0c18fde6 100644 --- a/modules/dragon/model_dragon.go +++ b/modules/dragon/model_dragon.go @@ -105,6 +105,8 @@ func (this *ModelDragon) CreateDragon(session comm.IUserSession, dragons map[str Lv: lv, Exp: 0, Property: map[int32]int32{}, + Play: map[int32]int32{}, + Rtime: 0, } if dbModel != nil { if dbModel, err1 := this.module.GetDBModelByUid(uid, this.TableName); err1 == nil { @@ -157,3 +159,11 @@ func (this *ModelDragon) UpdateDragonData(uid string, oid string, data map[strin } return } + +func (this *ModelDragon) GetDragonByOid(uid string, oid string) (dragon *pb.DBDragon, err error) { + dragon = &pb.DBDragon{} + if err = this.GetListObj(uid, oid, dragon); err != nil { + this.module.Errorf("err:%v", err) + } + return +} diff --git a/pb/dragon_db.pb.go b/pb/dragon_db.pb.go index 264caaff3..5c76deeea 100644 --- a/pb/dragon_db.pb.go +++ b/pb/dragon_db.pb.go @@ -32,6 +32,7 @@ type DBDragon struct { Exp int32 `protobuf:"varint,5,opt,name=exp,proto3" json:"exp"` // 经验 Property map[int32]int32 `protobuf:"bytes,6,rep,name=property,proto3" json:"property" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 坐骑属性 Play map[int32]int32 `protobuf:"bytes,7,rep,name=play,proto3" json:"play" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 坐骑训练次数 + Rtime int64 `protobuf:"varint,8,opt,name=rtime,proto3" json:"rtime"` } func (x *DBDragon) Reset() { @@ -115,11 +116,18 @@ func (x *DBDragon) GetPlay() map[int32]int32 { return nil } +func (x *DBDragon) GetRtime() int64 { + if x != nil { + return x.Rtime + } + return 0 +} + var File_dragon_dragon_db_proto protoreflect.FileDescriptor var file_dragon_dragon_db_proto_rawDesc = []byte{ 0x0a, 0x16, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x2f, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x5f, - 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbe, 0x02, 0x0a, 0x08, 0x44, 0x42, 0x44, + 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd4, 0x02, 0x0a, 0x08, 0x44, 0x42, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 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, 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x67, 0x6f, @@ -132,15 +140,16 @@ var file_dragon_dragon_db_proto_rawDesc = []byte{ 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x27, 0x0a, 0x04, 0x70, 0x6c, 0x61, 0x79, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x70, - 0x6c, 0x61, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x37, 0x0a, 0x09, 0x50, 0x6c, 0x61, 0x79, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x61, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x37, 0x0a, 0x09, 0x50, 0x6c, 0x61, 0x79, 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, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/dragon_msg.pb.go b/pb/dragon_msg.pb.go index b982c2b33..1b2a2616a 100644 --- a/pb/dragon_msg.pb.go +++ b/pb/dragon_msg.pb.go @@ -168,7 +168,8 @@ type DragonTrainResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Dragons *DBDragon `protobuf:"bytes,1,opt,name=dragons,proto3" json:"dragons"` + Dragons *DBDragon `protobuf:"bytes,1,opt,name=dragons,proto3" json:"dragons"` + Reward []*UserAtno `protobuf:"bytes,2,rep,name=reward,proto3" json:"reward"` // 升级奖励 } func (x *DragonTrainResp) Reset() { @@ -210,26 +211,35 @@ func (x *DragonTrainResp) GetDragons() *DBDragon { return nil } +func (x *DragonTrainResp) GetReward() []*UserAtno { + if x != nil { + return x.Reward + } + return nil +} + var File_dragon_dragon_msg_proto protoreflect.FileDescriptor var file_dragon_dragon_msg_proto_rawDesc = []byte{ 0x0a, 0x17, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x2f, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x2f, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x47, 0x65, 0x74, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x38, 0x0a, 0x11, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x47, - 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x07, 0x64, 0x72, - 0x61, 0x67, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, - 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x52, 0x07, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x73, 0x22, - 0x38, 0x0a, 0x0e, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x52, 0x65, - 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6f, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x74, 0x74, 0x79, 0x70, 0x65, 0x22, 0x36, 0x0a, 0x0f, 0x44, 0x72, 0x61, - 0x67, 0x6f, 0x6e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x07, - 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x44, 0x42, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x52, 0x07, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, - 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, + 0x10, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, + 0x71, 0x22, 0x38, 0x0a, 0x11, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x47, 0x65, 0x74, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x07, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x44, 0x72, 0x61, 0x67, + 0x6f, 0x6e, 0x52, 0x07, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x73, 0x22, 0x38, 0x0a, 0x0e, 0x44, + 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, + 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, + 0x14, 0x0a, 0x05, 0x74, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x74, 0x74, 0x79, 0x70, 0x65, 0x22, 0x59, 0x0a, 0x0f, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x54, + 0x72, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x07, 0x64, 0x72, 0x61, 0x67, + 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x44, 0x72, + 0x61, 0x67, 0x6f, 0x6e, 0x52, 0x07, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x73, 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 ( @@ -251,15 +261,17 @@ var file_dragon_dragon_msg_proto_goTypes = []interface{}{ (*DragonTrainReq)(nil), // 2: DragonTrainReq (*DragonTrainResp)(nil), // 3: DragonTrainResp (*DBDragon)(nil), // 4: DBDragon + (*UserAtno)(nil), // 5: UserAtno } var file_dragon_dragon_msg_proto_depIdxs = []int32{ 4, // 0: DragonGetListResp.dragons:type_name -> DBDragon 4, // 1: DragonTrainResp.dragons:type_name -> DBDragon - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 5, // 2: DragonTrainResp.reward:type_name -> UserAtno + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_dragon_dragon_msg_proto_init() } @@ -268,6 +280,7 @@ func file_dragon_dragon_msg_proto_init() { return } file_dragon_dragon_db_proto_init() + file_comm_proto_init() if !protoimpl.UnsafeEnabled { file_dragon_dragon_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DragonGetListReq); i { 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/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_) } From 2935394ebf37154a5dbc3567d53b835badc4e467 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 1 Sep 2023 11:30:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_dragonplay.json | 143 ++++++---- bin/json/game_global.json | 3 +- bin/json/game_item.json | 4 +- bin/json/game_lottery.json | 240 +++++++++++++++++ bin/json/game_shop.json | 7 +- bin/json/game_shopitem.json | 266 ++++++++++++------- comm/imodule.go | 2 + modules/dragon/api_train.go | 12 +- modules/dragon/model_dragon.go | 5 + modules/dragon/module.go | 4 + sys/configure/structs/Game.DragonPlayData.go | 19 +- sys/configure/structs/game.globalData.go | 2 + 12 files changed, 542 insertions(+), 165 deletions(-) diff --git a/bin/json/game_dragonplay.json b/bin/json/game_dragonplay.json index aa42ba459..ff281e978 100644 --- a/bin/json/game_dragonplay.json +++ b/bin/json/game_dragonplay.json @@ -6,11 +6,14 @@ "type": 1, "exp": 10, "time": 2, - "deplete": { - "a": "attr", - "t": "gold", - "n": 1 - }, + "cd": 0, + "deplete": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "group": 0 }, { @@ -20,11 +23,14 @@ "type": 3, "exp": 10, "time": 2, - "deplete": { - "a": "attr", - "t": "gold", - "n": 2 - }, + "cd": 0, + "deplete": [ + { + "a": "attr", + "t": "gold", + "n": 2 + } + ], "group": 10001 }, { @@ -34,11 +40,14 @@ "type": 4, "exp": 10, "time": 2, - "deplete": { - "a": "attr", - "t": "gold", - "n": 3 - }, + "cd": 0, + "deplete": [ + { + "a": "attr", + "t": "gold", + "n": 3 + } + ], "group": 0 }, { @@ -48,11 +57,14 @@ "type": 1, "exp": 10, "time": 2, - "deplete": { - "a": "attr", - "t": "gold", - "n": 4 - }, + "cd": 0, + "deplete": [ + { + "a": "attr", + "t": "gold", + "n": 4 + } + ], "group": 0 }, { @@ -62,11 +74,14 @@ "type": 2, "exp": 10, "time": 2, - "deplete": { - "a": "attr", - "t": "gold", - "n": 5 - }, + "cd": 0, + "deplete": [ + { + "a": "attr", + "t": "gold", + "n": 5 + } + ], "group": 0 }, { @@ -76,11 +91,14 @@ "type": 3, "exp": 10, "time": 2, - "deplete": { - "a": "attr", - "t": "gold", - "n": 6 - }, + "cd": 0, + "deplete": [ + { + "a": "attr", + "t": "gold", + "n": 6 + } + ], "group": 10002 }, { @@ -90,11 +108,14 @@ "type": 4, "exp": 10, "time": 2, - "deplete": { - "a": "attr", - "t": "gold", - "n": 7 - }, + "cd": 0, + "deplete": [ + { + "a": "attr", + "t": "gold", + "n": 7 + } + ], "group": 0 }, { @@ -104,11 +125,14 @@ "type": 1, "exp": 10, "time": 2, - "deplete": { - "a": "attr", - "t": "gold", - "n": 8 - }, + "cd": 0, + "deplete": [ + { + "a": "attr", + "t": "gold", + "n": 8 + } + ], "group": 0 }, { @@ -118,11 +142,14 @@ "type": 2, "exp": 10, "time": 2, - "deplete": { - "a": "attr", - "t": "gold", - "n": 9 - }, + "cd": 0, + "deplete": [ + { + "a": "attr", + "t": "gold", + "n": 9 + } + ], "group": 0 }, { @@ -132,11 +159,14 @@ "type": 4, "exp": 10, "time": 2, - "deplete": { - "a": "attr", - "t": "gold", - "n": 10 - }, + "cd": 0, + "deplete": [ + { + "a": "attr", + "t": "gold", + "n": 10 + } + ], "group": 0 }, { @@ -146,11 +176,14 @@ "type": 5, "exp": 10, "time": 2, - "deplete": { - "a": "attr", - "t": "gold", - "n": 11 - }, + "cd": 7200, + "deplete": [ + { + "a": "attr", + "t": "gold", + "n": 11 + } + ], "group": 0 } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 0bb7748db..a2b0e3853 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -842,6 +842,7 @@ "a": "attr", "t": "diamond", "n": 200 - } + }, + "dragon_interaction": 15 } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index ef247459b..6c271c773 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -15771,7 +15771,7 @@ "id": "17060009", "name": { "key": "item_item_name_320", - "text": "5星守护者自选箱碎片" + "text": "5星3系守护者自选箱碎片" }, "usetype": 4, "color": 4, @@ -15782,7 +15782,7 @@ "reddottype": 0, "effects": "", "modelName": "", - "box_id": 0, + "box_id": 22000007, "synthetize_num": 0, "synthetize_deplete": [], "synthetize_get": [], diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json index a633b1af5..2e6c4092b 100644 --- a/bin/json/game_lottery.json +++ b/bin/json/game_lottery.json @@ -46438,5 +46438,245 @@ "playerlvmin": 0, "playerlvmax": 0, "notice": 0 + }, + { + "id": 1936, + "lotteryid": 22000007, + "description": "5星3系守护者自选箱碎片", + "type": 3, + "groupwt": 1, + "groupid": 1, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "11015002", + "n": 1 + }, + "itemdes": "15002", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1937, + "lotteryid": 22000007, + "description": "5星3系守护者自选箱碎片", + "type": 3, + "groupwt": 1, + "groupid": 1, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "11015003", + "n": 1 + }, + "itemdes": "15003", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1938, + "lotteryid": 22000007, + "description": "5星3系守护者自选箱碎片", + "type": 3, + "groupwt": 1, + "groupid": 1, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "11015004", + "n": 1 + }, + "itemdes": "15004", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1939, + "lotteryid": 22000007, + "description": "5星3系守护者自选箱碎片", + "type": 3, + "groupwt": 1, + "groupid": 1, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "11025001", + "n": 1 + }, + "itemdes": "25001", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1940, + "lotteryid": 22000007, + "description": "5星3系守护者自选箱碎片", + "type": 3, + "groupwt": 1, + "groupid": 1, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "11025004", + "n": 1 + }, + "itemdes": "25004", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1941, + "lotteryid": 22000007, + "description": "5星3系守护者自选箱碎片", + "type": 3, + "groupwt": 1, + "groupid": 1, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "11035001", + "n": 1 + }, + "itemdes": "35001", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1942, + "lotteryid": 22000007, + "description": "5星3系守护者自选箱碎片", + "type": 3, + "groupwt": 1, + "groupid": 1, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "11035002", + "n": 1 + }, + "itemdes": "35002", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1943, + "lotteryid": 22000007, + "description": "5星3系守护者自选箱碎片", + "type": 3, + "groupwt": 1, + "groupid": 1, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "11035004", + "n": 1 + }, + "itemdes": "35004", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1944, + "lotteryid": 22000007, + "description": "5星3系守护者自选箱碎片", + "type": 3, + "groupwt": 1, + "groupid": 1, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "11035005", + "n": 1 + }, + "itemdes": "35005", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 + }, + { + "id": 1945, + "lotteryid": 22000007, + "description": "5星3系守护者自选箱碎片", + "type": 3, + "groupwt": 1, + "groupid": 1, + "subtype": 1, + "groupnum": 1, + "itemid": { + "a": "item", + "t": "11035006", + "n": 1 + }, + "itemdes": "35006", + "itemwt": 1000, + "min": 1, + "max": 1, + "VIPmin": 0, + "VIPmax": 15, + "playerlvmin": 0, + "playerlvmax": 0, + "notice": 0 } ] \ No newline at end of file diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json index 91ce27a57..d51c01832 100644 --- a/bin/json/game_shop.json +++ b/bin/json/game_shop.json @@ -103,7 +103,8 @@ 13004, 13005, 13006, - 13007 + 13007, + 13008 ] }, { @@ -127,7 +128,9 @@ 14003, 14004, 14005, - 14006 + 14006, + 14007, + 14008 ] }, { diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json index 8e10aaf7e..16e883327 100644 --- a/bin/json/game_shopitem.json +++ b/bin/json/game_shopitem.json @@ -24306,7 +24306,7 @@ { "a": "item", "t": "17060009", - "n": 5 + "n": 4 } ], "preview": false, @@ -24377,8 +24377,8 @@ "iteminfo": [ { "a": "item", - "t": "10000001", - "n": 5 + "t": "10000034", + "n": 3 } ], "preview": false, @@ -24413,7 +24413,7 @@ "iteminfo": [ { "a": "item", - "t": "10000001", + "t": "10000021", "n": 1 } ], @@ -24449,7 +24449,79 @@ "iteminfo": [ { "a": "item", - "t": "10000013", + "t": "10000022", + "n": 1 + } + ], + "preview": false, + "probability": 1000, + "need": [ + { + "a": "attr", + "t": "guildcoin", + "n": 250 + } + ], + "sale": 1000, + "salelist": [ + 1000, + 1000, + 1000, + 1000, + 1000, + 1000 + ], + "buyminnum": 5, + "buymaxnum": 5, + "vip": 0, + "lvmin": 1, + "lvmax": 60, + "mapidmin": 101, + "mapidmax": 9999 + }, + { + "key": 697, + "id": 14006, + "iteminfo": [ + { + "a": "item", + "t": "10000023", + "n": 1 + } + ], + "preview": false, + "probability": 1000, + "need": [ + { + "a": "attr", + "t": "guildcoin", + "n": 250 + } + ], + "sale": 1000, + "salelist": [ + 1000, + 1000, + 1000, + 1000, + 1000, + 1000 + ], + "buyminnum": 5, + "buymaxnum": 5, + "vip": 0, + "lvmin": 1, + "lvmax": 60, + "mapidmin": 101, + "mapidmax": 9999 + }, + { + "key": 698, + "id": 14007, + "iteminfo": [ + { + "a": "item", + "t": "10000011", "n": 1 } ], @@ -24480,8 +24552,8 @@ "mapidmax": 9999 }, { - "key": 697, - "id": 14006, + "key": 699, + "id": 14008, "iteminfo": [ { "a": "item", @@ -24516,7 +24588,7 @@ "mapidmax": 9999 }, { - "key": 698, + "key": 700, "id": 15001, "iteminfo": [ { @@ -24552,7 +24624,7 @@ "mapidmax": 9999 }, { - "key": 699, + "key": 701, "id": 15001, "iteminfo": [ { @@ -24588,7 +24660,7 @@ "mapidmax": 9999 }, { - "key": 700, + "key": 702, "id": 15001, "iteminfo": [ { @@ -24624,7 +24696,7 @@ "mapidmax": 9999 }, { - "key": 701, + "key": 703, "id": 15002, "iteminfo": [ { @@ -24660,84 +24732,12 @@ "mapidmax": 9999 }, { - "key": 702, + "key": 704, "id": 15003, "iteminfo": [ { "a": "item", - "t": "10000001", - "n": 1 - } - ], - "preview": false, - "probability": 1000, - "need": [ - { - "a": "attr", - "t": "moongold", - "n": 250 - } - ], - "sale": 800, - "salelist": [ - 800, - 800, - 800, - 800, - 800, - 800 - ], - "buyminnum": 3, - "buymaxnum": 3, - "vip": 0, - "lvmin": 1, - "lvmax": 60, - "mapidmin": 101, - "mapidmax": 9999 - }, - { - "key": 703, - "id": 15004, - "iteminfo": [ - { - "a": "item", - "t": "10000001", - "n": 1 - } - ], - "preview": false, - "probability": 1000, - "need": [ - { - "a": "attr", - "t": "moongold", - "n": 250 - } - ], - "sale": 800, - "salelist": [ - 800, - 800, - 800, - 800, - 800, - 800 - ], - "buyminnum": 3, - "buymaxnum": 3, - "vip": 0, - "lvmin": 1, - "lvmax": 60, - "mapidmin": 101, - "mapidmax": 9999 - }, - { - "key": 704, - "id": 15005, - "iteminfo": [ - { - "a": "item", - "t": "10000001", + "t": "10000021", "n": 1 } ], @@ -24769,6 +24769,78 @@ }, { "key": 705, + "id": 15004, + "iteminfo": [ + { + "a": "item", + "t": "10000022", + "n": 1 + } + ], + "preview": false, + "probability": 1000, + "need": [ + { + "a": "attr", + "t": "moongold", + "n": 250 + } + ], + "sale": 800, + "salelist": [ + 800, + 800, + 800, + 800, + 800, + 800 + ], + "buyminnum": 3, + "buymaxnum": 3, + "vip": 0, + "lvmin": 1, + "lvmax": 60, + "mapidmin": 101, + "mapidmax": 9999 + }, + { + "key": 706, + "id": 15005, + "iteminfo": [ + { + "a": "item", + "t": "10000023", + "n": 1 + } + ], + "preview": false, + "probability": 1000, + "need": [ + { + "a": "attr", + "t": "moongold", + "n": 250 + } + ], + "sale": 800, + "salelist": [ + 800, + 800, + 800, + 800, + 800, + 800 + ], + "buyminnum": 3, + "buymaxnum": 3, + "vip": 0, + "lvmin": 1, + "lvmax": 60, + "mapidmin": 101, + "mapidmax": 9999 + }, + { + "key": 707, "id": 15006, "iteminfo": [ { @@ -24804,7 +24876,7 @@ "mapidmax": 9999 }, { - "key": 706, + "key": 708, "id": 15007, "iteminfo": [ { @@ -24840,7 +24912,7 @@ "mapidmax": 9999 }, { - "key": 707, + "key": 709, "id": 15008, "iteminfo": [ { @@ -24876,12 +24948,12 @@ "mapidmax": 9999 }, { - "key": 708, + "key": 710, "id": 15009, "iteminfo": [ { "a": "item", - "t": "10000013", + "t": "10000011", "n": 1 } ], @@ -24912,7 +24984,7 @@ "mapidmax": 9999 }, { - "key": 709, + "key": 711, "id": 13001, "iteminfo": [ { @@ -24948,7 +25020,7 @@ "mapidmax": 9999 }, { - "key": 710, + "key": 712, "id": 13002, "iteminfo": [ { @@ -24984,7 +25056,7 @@ "mapidmax": 9999 }, { - "key": 711, + "key": 713, "id": 13003, "iteminfo": [ { @@ -25020,7 +25092,7 @@ "mapidmax": 9999 }, { - "key": 712, + "key": 714, "id": 13004, "iteminfo": [ { @@ -25056,7 +25128,7 @@ "mapidmax": 9999 }, { - "key": 713, + "key": 715, "id": 13005, "iteminfo": [ { @@ -25092,7 +25164,7 @@ "mapidmax": 9999 }, { - "key": 714, + "key": 716, "id": 13006, "iteminfo": [ { @@ -25128,7 +25200,7 @@ "mapidmax": 9999 }, { - "key": 715, + "key": 717, "id": 13007, "iteminfo": [ { @@ -25164,7 +25236,7 @@ "mapidmax": 9999 }, { - "key": 716, + "key": 718, "id": 13008, "iteminfo": [ { diff --git a/comm/imodule.go b/comm/imodule.go index 5ad237f4b..decb699ae 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -652,5 +652,7 @@ type ( GetDragonList(uid string) (dragon []*pb.DBDragon, err error) // 创建坐骑 CreateDragon(session IUserSession, dragons map[string]int32, bPush bool) (errdata *pb.ErrorData) + // 机器人 坐骑 + CreateRobotDragon(dragonid string, lv int32) (dragon *pb.DBDragon, err error) } ) diff --git a/modules/dragon/api_train.go b/modules/dragon/api_train.go index 7ff77c534..704b4ac46 100644 --- a/modules/dragon/api_train.go +++ b/modules/dragon/api_train.go @@ -19,9 +19,9 @@ func (this *apiComp) TrainCheck(session comm.IUserSession, req *pb.DragonTrainRe func (this *apiComp) Train(session comm.IUserSession, req *pb.DragonTrainReq) (errdata *pb.ErrorData) { var ( - err error - dragon *pb.DBDragon - addExp int32 // 获得的训练值 + err error + dragon *pb.DBDragon + //addExp int32 // 获得的训练值 playConf *cfg.GameDragonPlayData update map[string]interface{} ) @@ -40,9 +40,9 @@ func (this *apiComp) Train(session comm.IUserSession, req *pb.DragonTrainReq) (e } if conf, err := this.module.configure.GetDragonConfById(dragon.Dragonid, dragon.Lv); err == nil { if playConf, err = this.module.configure.GetDragonPlayConfById(dragon.Dragonid, conf.Type, req.Ttype); err == nil { - addExp = playConf.Exp + //addExp = playConf.Exp // 校验消耗 - if errdata = this.module.CheckRes(session, []*cfg.Gameatn{playConf.Deplete}); errdata != nil { + if errdata = this.module.CheckRes(session, playConf.Deplete); errdata != nil { return } } else { @@ -65,7 +65,7 @@ func (this *apiComp) Train(session comm.IUserSession, req *pb.DragonTrainReq) (e dragon.Exp += conf.Exp break } - }else{ + } else { break } } diff --git a/modules/dragon/model_dragon.go b/modules/dragon/model_dragon.go index b0c18fde6..4b0ebc2ad 100644 --- a/modules/dragon/model_dragon.go +++ b/modules/dragon/model_dragon.go @@ -167,3 +167,8 @@ func (this *ModelDragon) GetDragonByOid(uid string, oid string) (dragon *pb.DBDr } return } + +func (this *ModelDragon) CreateAiDragon(dragonid string, lv int32) (dragon *pb.DBDragon, err error) { + + return +} diff --git a/modules/dragon/module.go b/modules/dragon/module.go index 3f799db51..d7f24e593 100644 --- a/modules/dragon/module.go +++ b/modules/dragon/module.go @@ -54,3 +54,7 @@ func (this *Dragon) GetDragonList(uid string) (list []*pb.DBDragon, err error) { func (this *Dragon) CreateDragon(session comm.IUserSession, dragons map[string]int32, bPush bool) (errdata *pb.ErrorData) { return this.modelDragon.CreateDragon(session, dragons) } + +func (this *Dragon) CreateRobotDragon(dragonid string, lv int32) (dragon *pb.DBDragon, err error) { + return this.modelDragon.CreateAiDragon(dragonid, lv) +} diff --git a/sys/configure/structs/Game.DragonPlayData.go b/sys/configure/structs/Game.DragonPlayData.go index e2625a02d..5571abcae 100644 --- a/sys/configure/structs/Game.DragonPlayData.go +++ b/sys/configure/structs/Game.DragonPlayData.go @@ -17,7 +17,8 @@ type GameDragonPlayData struct { Type int32 Exp int32 Time int32 - Deplete *Gameatn + Cd int32 + Deplete []*Gameatn Group int32 } @@ -34,7 +35,21 @@ func (_v *GameDragonPlayData)Deserialize(_buf map[string]interface{}) (err error { 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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["exp"].(float64); !_ok_ { err = errors.New("exp error"); return }; _v.Exp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) } - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["deplete"].(map[string]interface{}); !_ok_ { err = errors.New("deplete error"); return }; if _v.Deplete, err = DeserializeGameatn(_x_); err != nil { return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cd"].(float64); !_ok_ { err = errors.New("cd error"); return }; _v.Cd = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["deplete"].([]interface{}); !_ok_ { err = errors.New("deplete error"); return } + + _v.Deplete = 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.Deplete = append(_v.Deplete, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index c58d4697a..e71779fe7 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -280,6 +280,7 @@ type GameGlobalData struct { StonehengeKeyItemId string PsBuyGroup int32 ChangeName *Gameatn + DragonInteraction int32 } const TypeId_GameGlobalData = 477542761 @@ -1117,6 +1118,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.StonehengeKeyItemId, _ok_ = _buf["stonehenge_KeyItemId"].(string); !_ok_ { err = errors.New("stonehenge_KeyItemId error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ps_buyGroup"].(float64); !_ok_ { err = errors.New("ps_buyGroup error"); return }; _v.PsBuyGroup = int32(_tempNum_) } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["change_name"].(map[string]interface{}); !_ok_ { err = errors.New("change_name error"); return }; if _v.ChangeName, err = DeserializeGameatn(_x_); err != nil { return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dragon_interaction"].(float64); !_ok_ { err = errors.New("dragon_interaction error"); return }; _v.DragonInteraction = int32(_tempNum_) } return }