diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 8b6e155b5..5fe739737 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -7,6 +7,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -22,6 +23,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -37,6 +39,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -52,6 +55,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -67,6 +71,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -82,6 +87,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -97,6 +103,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -112,6 +119,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -127,6 +135,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -142,6 +151,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -157,6 +167,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -172,6 +183,7 @@ "battleScenes": [ "scenesfight_07" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -187,6 +199,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -202,6 +215,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -217,6 +231,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -232,6 +247,7 @@ "battleScenes": [ "scenesfight_06" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -247,6 +263,7 @@ "battleScenes": [ "scenesfight_07" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -262,6 +279,7 @@ "battleScenes": [ "scenesfight_06" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -277,6 +295,7 @@ "battleScenes": [ "scenesfight_05_01" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -292,6 +311,7 @@ "battleScenes": [ "scenesfight_03_02" ], + "disableAiCamera": 0, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -307,6 +327,7 @@ "battleScenes": [ "bossfight_spinymandrilla_02" ], + "disableAiCamera": 1, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], @@ -322,6 +343,7 @@ "battleScenes": [ "bossfight_naturetitan_01" ], + "disableAiCamera": 1, "DefaultHero": 0, "DisableHero": [], "LockSlots": [], diff --git a/bin/json/game_breakingbad.json b/bin/json/game_breakingbad.json index 6045b627f..c92d28247 100644 --- a/bin/json/game_breakingbad.json +++ b/bin/json/game_breakingbad.json @@ -114,7 +114,7 @@ "n": 10 }, { - "a": "132008", + "a": "131002", "n": 5 } ], diff --git a/bin/json/game_dispatch_battle.json b/bin/json/game_dispatch_battle.json index b051a9cdd..ef01031f3 100644 --- a/bin/json/game_dispatch_battle.json +++ b/bin/json/game_dispatch_battle.json @@ -28,18 +28,6 @@ "n": 1 } ], - "story_award": [ - { - "a": "attr", - "t": "gold", - "n": 2640 - }, - { - "a": "item", - "t": "30001", - "n": 1 - } - ], "onlookers": [ "45003", "25001" @@ -82,18 +70,6 @@ "n": 2 } ], - "story_award": [ - { - "a": "attr", - "t": "gold", - "n": 6480 - }, - { - "a": "item", - "t": "30001", - "n": 2 - } - ], "onlookers": [ "45003", "25001" diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 175116a81..066aa7242 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -8,7 +8,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 63, + "tasktime": 111, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -56,7 +56,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 131, + "tasktime": 174, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -104,7 +104,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 64, + "tasktime": 100, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -152,7 +152,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 170, + "tasktime": 140, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -200,7 +200,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 169, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -248,7 +248,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 112, + "tasktime": 65, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -296,7 +296,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 89, + "tasktime": 124, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -344,7 +344,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 115, + "tasktime": 96, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -392,7 +392,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 91, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -440,7 +440,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 119, + "tasktime": 109, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -488,7 +488,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 71, + "tasktime": 92, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -536,7 +536,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 156, + "tasktime": 137, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -584,7 +584,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 96, + "tasktime": 109, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -632,7 +632,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 160, + "tasktime": 109, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -680,7 +680,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 175, + "tasktime": 107, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -728,7 +728,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 163, + "tasktime": 175, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -776,7 +776,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 63, + "tasktime": 142, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -824,7 +824,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 135, + "tasktime": 109, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -872,7 +872,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 60, + "tasktime": 61, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -920,7 +920,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 148, + "tasktime": 172, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -968,7 +968,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 101, + "tasktime": 120, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1016,7 +1016,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 61, + "tasktime": 64, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1064,7 +1064,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 129, + "tasktime": 103, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1112,7 +1112,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 154, + "tasktime": 140, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1160,7 +1160,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 87, + "tasktime": 124, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1208,7 +1208,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 157, + "tasktime": 147, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1256,7 +1256,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 147, + "tasktime": 120, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1304,7 +1304,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 62, + "tasktime": 137, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1352,7 +1352,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 163, + "tasktime": 90, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1400,7 +1400,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 114, + "tasktime": 158, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1448,7 +1448,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 148, + "tasktime": 104, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1496,7 +1496,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 83, + "tasktime": 158, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1544,7 +1544,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 88, + "tasktime": 92, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1592,7 +1592,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 85, + "tasktime": 83, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1640,7 +1640,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 153, + "tasktime": 60, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1688,7 +1688,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 169, + "tasktime": 152, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1736,7 +1736,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 119, + "tasktime": 88, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1784,7 +1784,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 171, + "tasktime": 156, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1832,7 +1832,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 166, + "tasktime": 153, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1880,7 +1880,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 128, + "tasktime": 110, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1928,7 +1928,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 162, + "tasktime": 127, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1976,7 +1976,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 117, + "tasktime": 115, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2024,7 +2024,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 106, + "tasktime": 109, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2072,7 +2072,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 162, + "tasktime": 174, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2120,7 +2120,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 81, + "tasktime": 79, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2168,7 +2168,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 64, + "tasktime": 70, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2216,7 +2216,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 113, + "tasktime": 103, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2264,7 +2264,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 71, + "tasktime": 143, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2312,7 +2312,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 75, + "tasktime": 123, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2360,7 +2360,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 157, + "tasktime": 65, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2408,7 +2408,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 97, + "tasktime": 171, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2456,7 +2456,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 148, + "tasktime": 150, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2504,7 +2504,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 129, + "tasktime": 90, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2552,7 +2552,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 144, + "tasktime": 163, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2600,7 +2600,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 169, + "tasktime": 87, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2648,7 +2648,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 112, + "tasktime": 100, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2696,7 +2696,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 173, + "tasktime": 154, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2744,7 +2744,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 133, + "tasktime": 167, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2792,7 +2792,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 127, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2840,7 +2840,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 98, + "tasktime": 64, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2888,7 +2888,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 169, + "tasktime": 157, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2936,7 +2936,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 82, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2984,7 +2984,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 79, + "tasktime": 166, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3032,7 +3032,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 164, + "tasktime": 100, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3080,7 +3080,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 95, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3128,7 +3128,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 84, + "tasktime": 137, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3176,7 +3176,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 176, + "tasktime": 70, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3224,7 +3224,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 129, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3272,7 +3272,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 141, + "tasktime": 83, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3320,7 +3320,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 169, + "tasktime": 163, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3368,7 +3368,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 163, + "tasktime": 91, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3416,7 +3416,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 141, + "tasktime": 73, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3464,7 +3464,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 156, + "tasktime": 151, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3512,7 +3512,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 75, + "tasktime": 115, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index 1c36a00d9..cff99b96c 100644 --- a/bin/json/game_drawcard.json +++ b/bin/json/game_drawcard.json @@ -4,8 +4,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool1", "star": 3, - "race": 1, - "id": "25001", + "rece": 1, + "id": "24001", "weight": 1000 }, { @@ -13,7 +13,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool1", "star": 4, - "race": 1, + "rece": 1, "id": "25001", "weight": 1000 }, @@ -22,7 +22,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool1", "star": 5, - "race": 1, + "rece": 1, "id": "25001", "weight": 1000 }, @@ -31,7 +31,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool2", "star": 3, - "race": 1, + "rece": 1, "id": "44006", "weight": 1000 }, @@ -40,7 +40,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool2", "star": 4, - "race": 1, + "rece": 1, "id": "44006", "weight": 1000 }, @@ -49,7 +49,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool2", "star": 5, - "race": 1, + "rece": 1, "id": "44006", "weight": 1000 }, @@ -58,7 +58,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool3", "star": 3, - "race": 1, + "rece": 1, "id": "14003", "weight": 1000 }, @@ -67,7 +67,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool3", "star": 4, - "race": 1, + "rece": 1, "id": "14003", "weight": 1000 }, @@ -76,7 +76,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool3", "star": 5, - "race": 1, + "rece": 1, "id": "14003", "weight": 1000 }, @@ -85,7 +85,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 3, - "race": 1, + "rece": 1, "id": "34006", "weight": 1000 }, @@ -94,7 +94,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 4, - "race": 1, + "rece": 1, "id": "34006", "weight": 1000 }, @@ -103,7 +103,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool4", "star": 5, - "race": 1, + "rece": 1, "id": "34006", "weight": 1000 }, @@ -112,7 +112,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool5", "star": 3, - "race": 1, + "rece": 1, "id": "24003", "weight": 1000 }, @@ -121,7 +121,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool5", "star": 4, - "race": 1, + "rece": 1, "id": "24003", "weight": 1000 }, @@ -130,7 +130,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool5", "star": 5, - "race": 1, + "rece": 1, "id": "24003", "weight": 1000 }, @@ -139,7 +139,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool6", "star": 3, - "race": 1, + "rece": 1, "id": "15005", "weight": 1000 }, @@ -148,7 +148,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool6", "star": 4, - "race": 1, + "rece": 1, "id": "15005", "weight": 1000 }, @@ -157,7 +157,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool6", "star": 5, - "race": 1, + "rece": 1, "id": "15005", "weight": 1000 }, @@ -166,7 +166,7 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 4, - "race": 2, + "rece": 2, "id": "24008", "weight": 1000 }, @@ -174,45 +174,45 @@ "key": 20, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 5, - "race": 1, - "id": "15005", + "star": 4, + "rece": 2, + "id": "24001", "weight": 1000 }, { "key": 21, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 4, - "race": 2, - "id": "24003", + "star": 3, + "rece": 4, + "id": "43006", "weight": 1000 }, { "key": 22, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 4, - "race": 3, - "id": "34006", + "star": 3, + "rece": 4, + "id": "43001", "weight": 1000 }, { "key": 23, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 5, - "race": 2, - "id": "35001", + "star": 4, + "rece": 3, + "id": "34008", "weight": 1000 }, { "key": 24, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 5, - "race": 1, - "id": "15004", + "star": 4, + "rece": 3, + "id": "34003", "weight": 1000 }, { @@ -220,35 +220,35 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 3, - "race": 2, - "id": "24002", + "rece": 1, + "id": "13001", "weight": 1000 }, { "key": 26, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 5, - "race": 4, - "id": "45003", + "star": 3, + "rece": 2, + "id": "33002", "weight": 1000 }, { "key": 27, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 5, - "race": 2, - "id": "25004", + "star": 4, + "rece": 2, + "id": "24009", "weight": 1000 }, { "key": 28, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 5, - "race": 3, - "id": "35002", + "star": 3, + "rece": 1, + "id": "13005", "weight": 1000 }, { @@ -256,8 +256,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 5, - "race": 2, - "id": "25001", + "rece": 1, + "id": "15005", "weight": 1000 }, { @@ -265,8 +265,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 4, - "race": 1, - "id": "14001", + "rece": 2, + "id": "24003", "weight": 1000 }, { @@ -274,8 +274,8 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 4, - "race": 4, - "id": "44006", + "rece": 3, + "id": "34006", "weight": 1000 }, { @@ -283,17 +283,17 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 5, - "race": 3, - "id": "35006", + "rece": 2, + "id": "35001", "weight": 1000 }, { "key": 33, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 4, - "race": 2, - "id": "24005", + "star": 5, + "rece": 1, + "id": "15004", "weight": 1000 }, { @@ -301,17 +301,17 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 3, - "race": 1, - "id": "13003", + "rece": 2, + "id": "24002", "weight": 1000 }, { "key": 35, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 4, - "race": 3, - "id": "34002", + "star": 5, + "rece": 4, + "id": "45003", "weight": 1000 }, { @@ -319,17 +319,17 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 5, - "race": 4, - "id": "45001", + "rece": 2, + "id": "25004", "weight": 1000 }, { "key": 37, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 4, - "race": 1, - "id": "14003", + "star": 5, + "rece": 3, + "id": "35002", "weight": 1000 }, { @@ -337,17 +337,17 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 5, - "race": 3, - "id": "35003", + "rece": 2, + "id": "25001", "weight": 1000 }, { "key": 39, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 5, - "race": 3, - "id": "35005", + "star": 4, + "rece": 1, + "id": "14001", "weight": 1000 }, { @@ -355,17 +355,17 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 4, - "race": 1, - "id": "14005", + "rece": 4, + "id": "44006", "weight": 1000 }, { "key": 41, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 4, - "race": 2, - "id": "24004", + "star": 5, + "rece": 3, + "id": "35006", "weight": 1000 }, { @@ -373,17 +373,17 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 4, - "race": 1, - "id": "14007", + "rece": 2, + "id": "24005", "weight": 1000 }, { "key": 43, "recruitment_type": 1, "card_pool_type": "base_pool7", - "star": 5, - "race": 1, - "id": "15002", + "star": 3, + "rece": 1, + "id": "13003", "weight": 1000 }, { @@ -391,619 +391,700 @@ "recruitment_type": 1, "card_pool_type": "base_pool7", "star": 4, - "race": 4, - "id": "44002", + "rece": 3, + "id": "34002", "weight": 1000 }, { "key": 45, - "recruitment_type": 2, - "card_pool_type": "camp1_pool", - "star": 3, - "race": 1, - "id": "13001", + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "rece": 4, + "id": "45001", "weight": 1000 }, { "key": 46, - "recruitment_type": 2, - "card_pool_type": "camp1_pool", - "star": 3, - "race": 1, - "id": "13002", - "weight": 1000 - }, - { - "key": 47, - "recruitment_type": 2, - "card_pool_type": "camp1_pool", - "star": 3, - "race": 1, - "id": "13003", - "weight": 1000 - }, - { - "key": 48, - "recruitment_type": 2, - "card_pool_type": "camp1_pool", - "star": 3, - "race": 1, - "id": "13004", - "weight": 1000 - }, - { - "key": 49, - "recruitment_type": 2, - "card_pool_type": "camp1_pool", - "star": 3, - "race": 1, - "id": "13005", - "weight": 1000 - }, - { - "key": 50, - "recruitment_type": 2, - "card_pool_type": "camp1_pool", + "recruitment_type": 1, + "card_pool_type": "base_pool7", "star": 4, - "race": 1, - "id": "14001", - "weight": 1000 - }, - { - "key": 51, - "recruitment_type": 2, - "card_pool_type": "camp1_pool", - "star": 4, - "race": 1, - "id": "14002", - "weight": 1000 - }, - { - "key": 52, - "recruitment_type": 2, - "card_pool_type": "camp1_pool", - "star": 4, - "race": 1, + "rece": 1, "id": "14003", "weight": 1000 }, { - "key": 53, - "recruitment_type": 2, - "card_pool_type": "camp1_pool", + "key": 47, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "rece": 3, + "id": "35003", + "weight": 1000 + }, + { + "key": 48, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "rece": 3, + "id": "35005", + "weight": 1000 + }, + { + "key": 49, + "recruitment_type": 1, + "card_pool_type": "base_pool7", "star": 4, - "race": 1, - "id": "14004", + "rece": 1, + "id": "14005", + "weight": 1000 + }, + { + "key": 50, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "rece": 2, + "id": "24004", + "weight": 1000 + }, + { + "key": 51, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "rece": 1, + "id": "14007", + "weight": 1000 + }, + { + "key": 52, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 5, + "rece": 1, + "id": "15002", + "weight": 1000 + }, + { + "key": 53, + "recruitment_type": 1, + "card_pool_type": "base_pool7", + "star": 4, + "rece": 4, + "id": "44002", "weight": 1000 }, { "key": 54, "recruitment_type": 2, "card_pool_type": "camp1_pool", - "star": 4, - "race": 1, - "id": "14005", + "star": 3, + "rece": 1, + "id": "13001", "weight": 1000 }, { "key": 55, "recruitment_type": 2, "card_pool_type": "camp1_pool", - "star": 4, - "race": 1, - "id": "14006", + "star": 3, + "rece": 1, + "id": "13002", "weight": 1000 }, { "key": 56, "recruitment_type": 2, "card_pool_type": "camp1_pool", - "star": 4, - "race": 1, - "id": "14007", + "star": 3, + "rece": 1, + "id": "13003", "weight": 1000 }, { "key": 57, "recruitment_type": 2, "card_pool_type": "camp1_pool", - "star": 5, - "race": 1, - "id": "15001", + "star": 3, + "rece": 1, + "id": "13004", "weight": 1000 }, { "key": 58, "recruitment_type": 2, "card_pool_type": "camp1_pool", - "star": 5, - "race": 1, - "id": "15002", + "star": 3, + "rece": 1, + "id": "13005", "weight": 1000 }, { "key": 59, "recruitment_type": 2, "card_pool_type": "camp1_pool", - "star": 5, - "race": 1, - "id": "15003", + "star": 4, + "rece": 1, + "id": "14001", "weight": 1000 }, { "key": 60, "recruitment_type": 2, "card_pool_type": "camp1_pool", - "star": 5, - "race": 1, - "id": "15004", + "star": 4, + "rece": 1, + "id": "14002", "weight": 1000 }, { "key": 61, "recruitment_type": 2, - "card_pool_type": "camp2_pool", - "star": 3, - "race": 2, - "id": "23001", + "card_pool_type": "camp1_pool", + "star": 4, + "rece": 1, + "id": "14003", "weight": 1000 }, { "key": 62, "recruitment_type": 2, - "card_pool_type": "camp2_pool", - "star": 3, - "race": 2, - "id": "23002", + "card_pool_type": "camp1_pool", + "star": 4, + "rece": 1, + "id": "14004", "weight": 1000 }, { "key": 63, "recruitment_type": 2, - "card_pool_type": "camp2_pool", - "star": 3, - "race": 2, - "id": "23003", + "card_pool_type": "camp1_pool", + "star": 4, + "rece": 1, + "id": "14005", "weight": 1000 }, { "key": 64, "recruitment_type": 2, - "card_pool_type": "camp2_pool", - "star": 3, - "race": 2, - "id": "23004", + "card_pool_type": "camp1_pool", + "star": 4, + "rece": 1, + "id": "14006", "weight": 1000 }, { "key": 65, "recruitment_type": 2, - "card_pool_type": "camp2_pool", + "card_pool_type": "camp1_pool", "star": 4, - "race": 2, - "id": "24001", + "rece": 1, + "id": "14007", "weight": 1000 }, { "key": 66, "recruitment_type": 2, - "card_pool_type": "camp2_pool", - "star": 3, - "race": 2, - "id": "24002", + "card_pool_type": "camp1_pool", + "star": 5, + "rece": 1, + "id": "15001", "weight": 1000 }, { "key": 67, "recruitment_type": 2, - "card_pool_type": "camp2_pool", - "star": 4, - "race": 2, - "id": "24003", + "card_pool_type": "camp1_pool", + "star": 5, + "rece": 1, + "id": "15002", "weight": 1000 }, { "key": 68, "recruitment_type": 2, - "card_pool_type": "camp2_pool", - "star": 4, - "race": 2, - "id": "24004", + "card_pool_type": "camp1_pool", + "star": 5, + "rece": 1, + "id": "15003", "weight": 1000 }, { "key": 69, "recruitment_type": 2, - "card_pool_type": "camp2_pool", - "star": 4, - "race": 2, - "id": "24005", + "card_pool_type": "camp1_pool", + "star": 5, + "rece": 1, + "id": "15004", "weight": 1000 }, { "key": 70, "recruitment_type": 2, "card_pool_type": "camp2_pool", - "star": 4, - "race": 2, - "id": "24006", + "star": 3, + "rece": 2, + "id": "23001", "weight": 1000 }, { "key": 71, "recruitment_type": 2, "card_pool_type": "camp2_pool", - "star": 4, - "race": 2, - "id": "24007", + "star": 3, + "rece": 2, + "id": "23002", "weight": 1000 }, { "key": 72, "recruitment_type": 2, "card_pool_type": "camp2_pool", - "star": 4, - "race": 2, - "id": "24008", + "star": 3, + "rece": 2, + "id": "23003", "weight": 1000 }, { "key": 73, "recruitment_type": 2, "card_pool_type": "camp2_pool", - "star": 4, - "race": 2, - "id": "24009", + "star": 3, + "rece": 2, + "id": "23004", "weight": 1000 }, { "key": 74, "recruitment_type": 2, "card_pool_type": "camp2_pool", - "star": 5, - "race": 2, - "id": "25001", + "star": 4, + "rece": 2, + "id": "24001", "weight": 1000 }, { "key": 75, "recruitment_type": 2, "card_pool_type": "camp2_pool", - "star": 5, - "race": 2, - "id": "25002", + "star": 3, + "rece": 2, + "id": "24002", "weight": 1000 }, { "key": 76, "recruitment_type": 2, "card_pool_type": "camp2_pool", - "star": 5, - "race": 2, - "id": "25003", + "star": 4, + "rece": 2, + "id": "24003", "weight": 1000 }, { "key": 77, "recruitment_type": 2, "card_pool_type": "camp2_pool", - "star": 5, - "race": 2, - "id": "25004", + "star": 4, + "rece": 2, + "id": "24004", "weight": 1000 }, { "key": 78, "recruitment_type": 2, - "card_pool_type": "camp3_pool", - "star": 3, - "race": 3, - "id": "33001", + "card_pool_type": "camp2_pool", + "star": 4, + "rece": 2, + "id": "24005", "weight": 1000 }, { "key": 79, "recruitment_type": 2, - "card_pool_type": "camp3_pool", - "star": 3, - "race": 3, - "id": "33002", + "card_pool_type": "camp2_pool", + "star": 4, + "rece": 2, + "id": "24006", "weight": 1000 }, { "key": 80, "recruitment_type": 2, - "card_pool_type": "camp3_pool", - "star": 3, - "race": 3, - "id": "33003", + "card_pool_type": "camp2_pool", + "star": 4, + "rece": 2, + "id": "24007", "weight": 1000 }, { "key": 81, "recruitment_type": 2, - "card_pool_type": "camp3_pool", - "star": 3, - "race": 3, - "id": "33004", + "card_pool_type": "camp2_pool", + "star": 4, + "rece": 2, + "id": "24008", "weight": 1000 }, { "key": 82, "recruitment_type": 2, - "card_pool_type": "camp3_pool", - "star": 3, - "race": 3, - "id": "33005", + "card_pool_type": "camp2_pool", + "star": 4, + "rece": 2, + "id": "24009", "weight": 1000 }, { "key": 83, "recruitment_type": 2, - "card_pool_type": "camp3_pool", - "star": 3, - "race": 3, - "id": "33006", + "card_pool_type": "camp2_pool", + "star": 5, + "rece": 2, + "id": "25001", "weight": 1000 }, { "key": 84, "recruitment_type": 2, - "card_pool_type": "camp3_pool", - "star": 4, - "race": 3, - "id": "34001", + "card_pool_type": "camp2_pool", + "star": 5, + "rece": 2, + "id": "25002", "weight": 1000 }, { "key": 85, "recruitment_type": 2, - "card_pool_type": "camp3_pool", - "star": 4, - "race": 3, - "id": "34002", + "card_pool_type": "camp2_pool", + "star": 5, + "rece": 2, + "id": "25003", "weight": 1000 }, { "key": 86, "recruitment_type": 2, - "card_pool_type": "camp3_pool", - "star": 4, - "race": 3, - "id": "34003", + "card_pool_type": "camp2_pool", + "star": 5, + "rece": 2, + "id": "25004", "weight": 1000 }, { "key": 87, "recruitment_type": 2, "card_pool_type": "camp3_pool", - "star": 4, - "race": 3, - "id": "34004", + "star": 3, + "rece": 3, + "id": "33001", "weight": 1000 }, { "key": 88, "recruitment_type": 2, "card_pool_type": "camp3_pool", - "star": 4, - "race": 3, - "id": "34005", + "star": 3, + "rece": 3, + "id": "33002", "weight": 1000 }, { "key": 89, "recruitment_type": 2, "card_pool_type": "camp3_pool", - "star": 4, - "race": 3, - "id": "34006", + "star": 3, + "rece": 3, + "id": "33003", "weight": 1000 }, { "key": 90, "recruitment_type": 2, "card_pool_type": "camp3_pool", - "star": 4, - "race": 3, - "id": "34007", + "star": 3, + "rece": 3, + "id": "33004", "weight": 1000 }, { "key": 91, "recruitment_type": 2, "card_pool_type": "camp3_pool", - "star": 4, - "race": 3, - "id": "34008", + "star": 3, + "rece": 3, + "id": "33005", "weight": 1000 }, { "key": 92, "recruitment_type": 2, "card_pool_type": "camp3_pool", - "star": 5, - "race": 3, - "id": "35002", + "star": 3, + "rece": 3, + "id": "33006", "weight": 1000 }, { "key": 93, "recruitment_type": 2, "card_pool_type": "camp3_pool", - "star": 5, - "race": 3, - "id": "35003", + "star": 4, + "rece": 3, + "id": "34001", "weight": 1000 }, { "key": 94, "recruitment_type": 2, "card_pool_type": "camp3_pool", - "star": 5, - "race": 3, - "id": "35004", + "star": 4, + "rece": 3, + "id": "34002", "weight": 1000 }, { "key": 95, "recruitment_type": 2, "card_pool_type": "camp3_pool", - "star": 5, - "race": 3, - "id": "35005", + "star": 4, + "rece": 3, + "id": "34003", "weight": 1000 }, { "key": 96, "recruitment_type": 2, "card_pool_type": "camp3_pool", - "star": 5, - "race": 3, - "id": "35006", + "star": 4, + "rece": 3, + "id": "34004", "weight": 1000 }, { "key": 97, "recruitment_type": 2, - "card_pool_type": "camp4_pool", - "star": 3, - "race": 4, - "id": "43001", + "card_pool_type": "camp3_pool", + "star": 4, + "rece": 3, + "id": "34005", "weight": 1000 }, { "key": 98, "recruitment_type": 2, - "card_pool_type": "camp4_pool", - "star": 3, - "race": 4, - "id": "43002", + "card_pool_type": "camp3_pool", + "star": 4, + "rece": 3, + "id": "34006", "weight": 1000 }, { "key": 99, "recruitment_type": 2, - "card_pool_type": "camp4_pool", - "star": 3, - "race": 4, - "id": "43003", + "card_pool_type": "camp3_pool", + "star": 4, + "rece": 3, + "id": "34007", "weight": 1000 }, { "key": 100, "recruitment_type": 2, - "card_pool_type": "camp4_pool", - "star": 3, - "race": 4, - "id": "43004", + "card_pool_type": "camp3_pool", + "star": 4, + "rece": 3, + "id": "34008", "weight": 1000 }, { "key": 101, "recruitment_type": 2, - "card_pool_type": "camp4_pool", - "star": 3, - "race": 4, - "id": "43005", + "card_pool_type": "camp3_pool", + "star": 5, + "rece": 3, + "id": "35002", "weight": 1000 }, { "key": 102, "recruitment_type": 2, - "card_pool_type": "camp4_pool", - "star": 3, - "race": 4, - "id": "43006", + "card_pool_type": "camp3_pool", + "star": 5, + "rece": 3, + "id": "35003", "weight": 1000 }, { "key": 103, "recruitment_type": 2, - "card_pool_type": "camp4_pool", - "star": 3, - "race": 4, - "id": "43007", + "card_pool_type": "camp3_pool", + "star": 5, + "rece": 3, + "id": "35004", "weight": 1000 }, { "key": 104, "recruitment_type": 2, - "card_pool_type": "camp4_pool", - "star": 4, - "race": 4, - "id": "44001", + "card_pool_type": "camp3_pool", + "star": 5, + "rece": 3, + "id": "35005", "weight": 1000 }, { "key": 105, "recruitment_type": 2, - "card_pool_type": "camp4_pool", - "star": 4, - "race": 4, - "id": "44002", + "card_pool_type": "camp3_pool", + "star": 5, + "rece": 3, + "id": "35006", "weight": 1000 }, { "key": 106, "recruitment_type": 2, "card_pool_type": "camp4_pool", - "star": 4, - "race": 4, - "id": "44003", + "star": 3, + "rece": 4, + "id": "43001", "weight": 1000 }, { "key": 107, "recruitment_type": 2, "card_pool_type": "camp4_pool", - "star": 4, - "race": 4, - "id": "44004", + "star": 3, + "rece": 4, + "id": "43002", "weight": 1000 }, { "key": 108, "recruitment_type": 2, "card_pool_type": "camp4_pool", - "star": 4, - "race": 4, - "id": "44006", + "star": 3, + "rece": 4, + "id": "43003", "weight": 1000 }, { "key": 109, "recruitment_type": 2, "card_pool_type": "camp4_pool", - "star": 4, - "race": 4, - "id": "45001", + "star": 3, + "rece": 4, + "id": "43004", "weight": 1000 }, { "key": 110, "recruitment_type": 2, "card_pool_type": "camp4_pool", - "star": 4, - "race": 4, - "id": "45002", + "star": 3, + "rece": 4, + "id": "43005", "weight": 1000 }, { "key": 111, "recruitment_type": 2, "card_pool_type": "camp4_pool", - "star": 4, - "race": 4, - "id": "45003", + "star": 3, + "rece": 4, + "id": "43006", "weight": 1000 }, { "key": 112, "recruitment_type": 2, "card_pool_type": "camp4_pool", + "star": 3, + "rece": 4, + "id": "43007", + "weight": 1000 + }, + { + "key": 113, + "recruitment_type": 2, + "card_pool_type": "camp4_pool", "star": 4, - "race": 4, + "rece": 4, + "id": "44001", + "weight": 1000 + }, + { + "key": 114, + "recruitment_type": 2, + "card_pool_type": "camp4_pool", + "star": 4, + "rece": 4, + "id": "44002", + "weight": 1000 + }, + { + "key": 115, + "recruitment_type": 2, + "card_pool_type": "camp4_pool", + "star": 4, + "rece": 4, + "id": "44003", + "weight": 1000 + }, + { + "key": 116, + "recruitment_type": 2, + "card_pool_type": "camp4_pool", + "star": 4, + "rece": 4, + "id": "44004", + "weight": 1000 + }, + { + "key": 117, + "recruitment_type": 2, + "card_pool_type": "camp4_pool", + "star": 4, + "rece": 4, + "id": "44006", + "weight": 1000 + }, + { + "key": 118, + "recruitment_type": 2, + "card_pool_type": "camp4_pool", + "star": 4, + "rece": 4, + "id": "45001", + "weight": 1000 + }, + { + "key": 119, + "recruitment_type": 2, + "card_pool_type": "camp4_pool", + "star": 4, + "rece": 4, + "id": "45002", + "weight": 1000 + }, + { + "key": 120, + "recruitment_type": 2, + "card_pool_type": "camp4_pool", + "star": 4, + "rece": 4, + "id": "45003", + "weight": 1000 + }, + { + "key": 121, + "recruitment_type": 2, + "card_pool_type": "camp4_pool", + "star": 4, + "rece": 4, "id": "45004", "weight": 1000 } diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 078637909..b810bdc20 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -575,7 +575,7 @@ "g": [ { "a": "item", - "t": "10006", + "t": "120003", "n": 1 }, { @@ -590,7 +590,7 @@ "g": [ { "a": "item", - "t": "10006", + "t": "120003", "n": 2 }, { @@ -605,7 +605,7 @@ "g": [ { "a": "item", - "t": "10006", + "t": "120003", "n": 4 } ] @@ -661,6 +661,27 @@ "Daily_Tips": 3, "Daily_Num": 2, "Week_Num": 2, - "fitnessModelId": "25001" + "fitnessModelId": "25001", + "business_ticket": 40, + "business_money": { + "a": "item", + "t": "141001", + "n": 1 + }, + "business_moneynum": 10000, + "business_minint_reward": { + "a": "attr", + "t": "gold", + "n": 1000 + }, + "business_maxint_reward": { + "a": "attr", + "t": "gold", + "n": 99999 + }, + "business_maxint": 1000, + "business_bag": 20, + "business_rewardday": 1, + "business_renovatething": 180 } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 1d2e79933..c77cd3e77 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -8070,10 +8070,10 @@ "z": 0 }, "capskillrule": 101, - "skill": 0, - "skill1": 155006111, - "skill2": 155006211, - "skill3": 155006311, + "skill": 111021011, + "skill1": 111021111, + "skill2": 111021211, + "skill3": 111021311, "txt": { "key": "atlas_11021", "text": "" diff --git a/bin/json/game_item.json b/bin/json/game_item.json index c6beb9285..037777912 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -8270,5 +8270,35 @@ ], "synthetize_deplete": [], "decompose_deplete": [] + }, + { + "id": "141001", + "name": { + "key": "item_name_141001", + "text": "流通货币" + }, + "usetype": 14, + "color": 4, + "bagtype": 0, + "index": 99, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "box_id": 0, + "synthetize_num": 0, + "access": [ + 107 + ], + "use_skip": 166, + "upper_limit": -1, + "img": "icon_mcs", + "intr": { + "key": "sd_ing_141001", + "text": "缺少流通货币" + }, + "sale": [], + "synthetize_deplete": [], + "decompose_deplete": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 7abfa7022..40b3d9ece 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -4176,10 +4176,10 @@ { "Id": 225001311, "EmitPR": 1000, - "From": 4, + "From": 2, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 3, "Type": 1, "Argu": [ @@ -4250,10 +4250,10 @@ { "Id": 225001321, "EmitPR": 1000, - "From": 4, + "From": 2, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 3, "Type": 1, "Argu": [ @@ -4276,10 +4276,10 @@ { "Id": 225001331, "EmitPR": 1000, - "From": 4, + "From": 2, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 3, "Type": 1, "Argu": [ @@ -4302,10 +4302,10 @@ { "Id": 225001341, "EmitPR": 1000, - "From": 4, + "From": 2, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 3, "Type": 1, "Argu": [ @@ -6472,59 +6472,34 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 244006111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1000 + ], + "FollowSK": [ + 244006112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 244006112, "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 500 - ], - "FollowSK": [ - 244006115 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 244006113, - "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 500 - ], - "FollowSK": [ - 244006114 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 244006114, - "EmitPR": 1000, "From": 3, "Where": [], "Order": "", @@ -6548,22 +6523,22 @@ "RevisiParams": [] }, { - "Id": 244006115, + "Id": 244006121, "EmitPR": 1000, - "From": 3, + "From": 4, "Where": [], "Order": "", "Limit": 1, "ExecuteCnt": 1, - "Type": 19, + "Type": 1, "Argu": [ - 390001112, - 1000, 1, - 2, - 500 + 4, + 1050 + ], + "FollowSK": [ + 244006122 ], - "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -6575,31 +6550,6 @@ { "Id": 244006122, "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 550 - ], - "FollowSK": [ - 244006125 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 244006125, - "EmitPR": 1000, "From": 3, "Where": [], "Order": "", @@ -6622,34 +6572,34 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 244006131, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1100 + ], + "FollowSK": [ + 244006132 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 244006132, "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 600 - ], - "FollowSK": [ - 244006135 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 244006135, - "EmitPR": 1000, "From": 3, "Where": [], "Order": "", @@ -6672,34 +6622,34 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 244006141, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1150 + ], + "FollowSK": [ + 244006142 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 244006142, "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 650 - ], - "FollowSK": [ - 244006145 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 244006145, - "EmitPR": 1000, "From": 3, "Where": [], "Order": "", @@ -6722,34 +6672,34 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 244006151, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1200 + ], + "FollowSK": [ + 244006152 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 244006152, "EmitPR": 1000, - "From": 4, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 1, - "Argu": [ - 1, - 4, - 700 - ], - "FollowSK": [ - 244006155 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 244006155, - "EmitPR": 1000, "From": 3, "Where": [], "Order": "", @@ -6773,7 +6723,7 @@ "RevisiParams": [] }, { - "Id": 244006162, + "Id": 244006161, "EmitPR": 1000, "From": 4, "Where": [], @@ -6784,10 +6734,10 @@ "Argu": [ 1, 4, - 800 + 1250 ], "FollowSK": [ - 244006165 + 244006162 ], "SucFollowSK": [], "FailFollowSK": [], @@ -6798,7 +6748,7 @@ "RevisiParams": [] }, { - "Id": 244006165, + "Id": 244006162, "EmitPR": 1000, "From": 3, "Where": [], @@ -9964,7 +9914,7 @@ "Type": 2, "Argu": [ 414007211, - 6, + -1, 1 ], "FollowSK": [], @@ -14365,7 +14315,7 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 2, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, @@ -28795,18 +28745,42 @@ "RevisiParams": [] }, { - "Id": 211021111, + "Id": 211021011, "EmitPR": 1000, - "From": 2, + "From": 3, "Where": [], "Order": "", "Limit": 10, "ExecuteCnt": 1, - "Type": 1, + "Type": 3, "Argu": [ + 390001116, + 1000, 1, - 4, - 1000 + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 211021111, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 411021111, + -1, + 1 ], "FollowSK": [ 211021112 @@ -28822,6 +28796,55 @@ { "Id": 211021112, "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001116, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 211021113, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 1000 + ], + "FollowSK": [ + 211021114 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 211021114, + "EmitPR": 1000, "From": 2, "Where": [], "Order": "", @@ -28881,7 +28904,7 @@ 390001105, 1000, 1, - 2 + 1 ], "FollowSK": [], "SucFollowSK": [], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 78443fa21..c8d0c4995 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -2610,7 +2610,9 @@ "Target": 2, "ChildSkill": { "Id": [ - 66 + 225001331, + 225001312, + 225001313 ] }, "Desc": { @@ -4518,8 +4520,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 244006112, - 244006113 + 244006111 ] }, "Desc": { @@ -4547,8 +4548,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 244006122, - 244006113 + 244006121 ] }, "Desc": { @@ -4576,8 +4576,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 244006132, - 244006113 + 244006131 ] }, "Desc": { @@ -4605,8 +4604,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 244006142, - 244006113 + 244006141 ] }, "Desc": { @@ -4634,8 +4632,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 244006152, - 244006113 + 244006151 ] }, "Desc": { @@ -4663,8 +4660,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 244006162, - 244006113 + 244006161 ] }, "Desc": { @@ -15201,6 +15197,34 @@ "buffid": [], "map": "" }, + { + "id": 111021011, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "Name": { + "key": "skillname_111021011", + "text": "友方无法受到控制" + }, + "ico": "jn_dzj_0021", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 3, + "CD": 0, + "Target": 1, + "ChildSkill": { + "Id": [ + 211021011 + ] + }, + "Desc": { + "key": "skill_1110210111", + "text": "友方无法受到控制" + }, + "buffid": [], + "map": "" + }, { "id": 111021111, "level": 1, @@ -15219,7 +15243,8 @@ "Target": 2, "ChildSkill": { "Id": [ - 211021111 + 211021111, + 211021113 ] }, "Desc": { diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 953e565de..bab91e10f 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -397,7 +397,7 @@ "key": "skill_buffdes_390001104", "text": "生命最低降为1" }, - "BuffType": 13, + "BuffType": 33, "EffectArgu": [ 1 ], @@ -458,8 +458,8 @@ "OverlayTimes": 1, "SameID": false, "buffIcon": "ty_zd_buff_j008", - "buffeffect": "", - "buffpos": "infopos" + "buffeffect": "effect_jiaoxia_jiaobing\u00A0", + "buffpos": "脚底" }, { "Id": 390001107, @@ -606,7 +606,7 @@ "OverlayTimes": 1, "SameID": false, "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", + "buffeffect": "effect_hudun_1", "buffpos": "infopos" }, { @@ -691,7 +691,7 @@ "key": "skill_buffdes_390001116", "text": "无法被附加任何控制效果" }, - "BuffType": 0, + "BuffType": 37, "EffectArgu": [], "BufParNum": 1, "RelyCheckArgu": [], diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 65a575e6f..d14fa6449 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -2340,5 +2340,21 @@ "Callback": [ 200001902 ] + }, + { + "Id": 411021111, + "When": 2, + "FromCheck": "Target=3", + "TargetCheck": "Target=3", + "MainSkillCheck": "", + "AfterSkillCheck": "", + "BuffCheck": "", + "AddCon": [], + "PasPr": 1000, + "Type": "CallSkillPas", + "MaxEmitTimes": 1, + "Callback": [ + 211021112 + ] } ] \ No newline at end of file diff --git a/modules/practice/api_npcdialog.go b/modules/practice/api_npcdialog.go index 49420f1e1..a480f6028 100644 --- a/modules/practice/api_npcdialog.go +++ b/modules/practice/api_npcdialog.go @@ -3,8 +3,6 @@ package practice import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "go_dreamfactory/sys/configure" - cfg "go_dreamfactory/sys/configure/structs" ) //参数校验 @@ -15,32 +13,32 @@ func (this *apiComp) NPCDialogCheck(session comm.IUserSession, req *pb.PracticeN ///npc 领取对白奖励 func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (code pb.ErrorCode, data *pb.ErrorData) { - var ( - err error - room *pb.DBPracticeRoom - conf *cfg.GameDispatch_BattleData - ) - if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError - return - } - if room.Npcstate != 2 { - code = pb.ErrorCode_ReqParameterError - return - } - if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { - code = pb.ErrorCode_ConfigNoFound - return - } - if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success { - return - } - room.Npcstate = 3 - room.Refresh = configure.Now().Unix() - this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ - "npcstate": room.Npcstate, - "refresh": room.Refresh, - }) + // var ( + // err error + // room *pb.DBPracticeRoom + // conf *cfg.GameDispatch_BattleData + // ) + // if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { + // code = pb.ErrorCode_DBError + // return + // } + // if room.Npcstate != 2 { + // code = pb.ErrorCode_ReqParameterError + // return + // } + // if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { + // code = pb.ErrorCode_ConfigNoFound + // return + // } + // if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success { + // return + // } + // room.Npcstate = 3 + // room.Refresh = configure.Now().Unix() + // this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ + // "npcstate": room.Npcstate, + // "refresh": room.Refresh, + // }) session.SendMsg(string(this.module.GetType()), "npcdialog", &pb.PracticeNPCDialogResp{Issucc: true}) return } diff --git a/pb/troll_db.pb.go b/pb/troll_db.pb.go index 6670f630d..ce75ec07c 100644 --- a/pb/troll_db.pb.go +++ b/pb/troll_db.pb.go @@ -300,6 +300,180 @@ func (x *DBTrollRecord) GetTime() int64 { return 0 } +type DBGoods struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Period int32 `protobuf:"varint,2,opt,name=period,proto3" json:"period"` // 变动周期 + CurPeriod int32 `protobuf:"varint,3,opt,name=curPeriod,proto3" json:"curPeriod"` // 当前变动周期 + Weight int32 `protobuf:"varint,4,opt,name=weight,proto3" json:"weight"` // 周期权重 + Price int32 `protobuf:"varint,5,opt,name=price,proto3" json:"price"` // 当前价格 + Time int32 `protobuf:"varint,6,opt,name=time,proto3" json:"time"` // 刷新时间 +} + +func (x *DBGoods) Reset() { + *x = DBGoods{} + if protoimpl.UnsafeEnabled { + mi := &file_troll_troll_db_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBGoods) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBGoods) ProtoMessage() {} + +func (x *DBGoods) ProtoReflect() protoreflect.Message { + mi := &file_troll_troll_db_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DBGoods.ProtoReflect.Descriptor instead. +func (*DBGoods) Descriptor() ([]byte, []int) { + return file_troll_troll_db_proto_rawDescGZIP(), []int{2} +} + +func (x *DBGoods) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBGoods) GetPeriod() int32 { + if x != nil { + return x.Period + } + return 0 +} + +func (x *DBGoods) GetCurPeriod() int32 { + if x != nil { + return x.CurPeriod + } + return 0 +} + +func (x *DBGoods) GetWeight() int32 { + if x != nil { + return x.Weight + } + return 0 +} + +func (x *DBGoods) GetPrice() int32 { + if x != nil { + return x.Price + } + return 0 +} + +func (x *DBGoods) GetTime() int32 { + if x != nil { + return x.Time + } + return 0 +} + +type DBTroll struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + UseCount int32 `protobuf:"varint,3,opt,name=useCount,proto3" json:"useCount"` // 当前背包使用的数量 + Items map[int32]int32 `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 背包数据 + Goods map[int32]*DBGoods `protobuf:"bytes,5,rep,name=goods,proto3" json:"goods" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 货物 key 货物ID + Lv int32 `protobuf:"varint,6,opt,name=lv,proto3" json:"lv"` // 商队等级 +} + +func (x *DBTroll) Reset() { + *x = DBTroll{} + if protoimpl.UnsafeEnabled { + mi := &file_troll_troll_db_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBTroll) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBTroll) ProtoMessage() {} + +func (x *DBTroll) ProtoReflect() protoreflect.Message { + mi := &file_troll_troll_db_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DBTroll.ProtoReflect.Descriptor instead. +func (*DBTroll) Descriptor() ([]byte, []int) { + return file_troll_troll_db_proto_rawDescGZIP(), []int{3} +} + +func (x *DBTroll) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBTroll) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBTroll) GetUseCount() int32 { + if x != nil { + return x.UseCount + } + return 0 +} + +func (x *DBTroll) GetItems() map[int32]int32 { + if x != nil { + return x.Items + } + return nil +} + +func (x *DBTroll) GetGoods() map[int32]*DBGoods { + if x != nil { + return x.Goods + } + return nil +} + +func (x *DBTroll) GetLv() int32 { + if x != nil { + return x.Lv + } + return 0 +} + var File_troll_troll_db_proto protoreflect.FileDescriptor var file_troll_troll_db_proto_rawDesc = []byte{ @@ -370,8 +544,36 @@ var file_troll_troll_db_proto_rawDesc = []byte{ 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x91, 0x01, 0x0a, 0x07, 0x44, 0x42, 0x47, + 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x1c, 0x0a, 0x09, + 0x63, 0x75, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x09, 0x63, 0x75, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xab, 0x02, 0x0a, + 0x07, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 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, 0x75, 0x73, + 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x75, 0x73, + 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, + 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x2e, + 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, + 0x73, 0x12, 0x29, 0x0a, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x13, 0x2e, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x0e, 0x0a, 0x02, + 0x6c, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x1a, 0x38, 0x0a, 0x0a, + 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x6f, 0x64, 0x73, 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 ( @@ -386,27 +588,34 @@ func file_troll_troll_db_proto_rawDescGZIP() []byte { return file_troll_troll_db_proto_rawDescData } -var file_troll_troll_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_troll_troll_db_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_troll_troll_db_proto_goTypes = []interface{}{ (*DBTrollTrain)(nil), // 0: DBTrollTrain (*DBTrollRecord)(nil), // 1: DBTrollRecord - nil, // 2: DBTrollTrain.ItemsEntry - nil, // 3: DBTrollTrain.PriceEntry - nil, // 4: DBTrollTrain.NpcRewardEntry - nil, // 5: DBTrollTrain.ShopEntry - nil, // 6: DBTrollTrain.SurpriseIDEntry + (*DBGoods)(nil), // 2: DBGoods + (*DBTroll)(nil), // 3: DBTroll + nil, // 4: DBTrollTrain.ItemsEntry + nil, // 5: DBTrollTrain.PriceEntry + nil, // 6: DBTrollTrain.NpcRewardEntry + nil, // 7: DBTrollTrain.ShopEntry + nil, // 8: DBTrollTrain.SurpriseIDEntry + nil, // 9: DBTroll.ItemsEntry + nil, // 10: DBTroll.GoodsEntry } var file_troll_troll_db_proto_depIdxs = []int32{ - 2, // 0: DBTrollTrain.items:type_name -> DBTrollTrain.ItemsEntry - 3, // 1: DBTrollTrain.price:type_name -> DBTrollTrain.PriceEntry - 4, // 2: DBTrollTrain.npcReward:type_name -> DBTrollTrain.NpcRewardEntry - 5, // 3: DBTrollTrain.shop:type_name -> DBTrollTrain.ShopEntry - 6, // 4: DBTrollTrain.surpriseID:type_name -> DBTrollTrain.SurpriseIDEntry - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 4, // 0: DBTrollTrain.items:type_name -> DBTrollTrain.ItemsEntry + 5, // 1: DBTrollTrain.price:type_name -> DBTrollTrain.PriceEntry + 6, // 2: DBTrollTrain.npcReward:type_name -> DBTrollTrain.NpcRewardEntry + 7, // 3: DBTrollTrain.shop:type_name -> DBTrollTrain.ShopEntry + 8, // 4: DBTrollTrain.surpriseID:type_name -> DBTrollTrain.SurpriseIDEntry + 9, // 5: DBTroll.items:type_name -> DBTroll.ItemsEntry + 10, // 6: DBTroll.goods:type_name -> DBTroll.GoodsEntry + 2, // 7: DBTroll.GoodsEntry.value:type_name -> DBGoods + 8, // [8:8] is the sub-list for method output_type + 8, // [8:8] is the sub-list for method input_type + 8, // [8:8] is the sub-list for extension type_name + 8, // [8:8] is the sub-list for extension extendee + 0, // [0:8] is the sub-list for field type_name } func init() { file_troll_troll_db_proto_init() } @@ -439,6 +648,30 @@ func file_troll_troll_db_proto_init() { return nil } } + file_troll_troll_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBGoods); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_troll_troll_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBTroll); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -446,7 +679,7 @@ func file_troll_troll_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_troll_troll_db_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 11, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go index 00b3ce40f..bbc4177c6 100644 --- a/sys/configure/structs/Game.BattleReadyData.go +++ b/sys/configure/structs/Game.BattleReadyData.go @@ -16,6 +16,7 @@ type GameBattleReadyData struct { HeroCount int32 ReadyScene string BattleScenes []string + DisableAiCamera int32 DefaultHero int32 DisableHero []string LockSlots []int32 @@ -49,6 +50,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.Dispatch_BattleData.go b/sys/configure/structs/Game.Dispatch_BattleData.go index 262f1a815..b60fb4117 100644 --- a/sys/configure/structs/Game.Dispatch_BattleData.go +++ b/sys/configure/structs/Game.Dispatch_BattleData.go @@ -22,7 +22,6 @@ type GameDispatch_BattleData struct { BattleReadyID int32 EventList []int32 Award []*Gameatn - StoryAward []*Gameatn Onlookers []string ChallengeOnlookers []string Onlookersstory []int32 @@ -72,20 +71,6 @@ func (_v *GameDispatch_BattleData)Deserialize(_buf map[string]interface{}) (err } } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["story_award"].([]interface{}); !_ok_ { err = errors.New("story_award error"); return } - - _v.StoryAward = 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.StoryAward = append(_v.StoryAward, _list_v_) - } - } - { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/game.drawCardData.go b/sys/configure/structs/game.drawCardData.go index b51cd8208..527423d57 100644 --- a/sys/configure/structs/game.drawCardData.go +++ b/sys/configure/structs/game.drawCardData.go @@ -15,7 +15,7 @@ type GameDrawCardData struct { RecruitmentType int32 CardPoolType string Star int32 - Race int32 + Rece int32 Id string Weight int32 } @@ -31,7 +31,7 @@ func (_v *GameDrawCardData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["recruitment_type"].(float64); !_ok_ { err = errors.New("recruitment_type error"); return }; _v.RecruitmentType = int32(_tempNum_) } { var _ok_ bool; if _v.CardPoolType, _ok_ = _buf["card_pool_type"].(string); !_ok_ { err = errors.New("card_pool_type error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rece"].(float64); !_ok_ { err = errors.New("rece error"); return }; _v.Rece = int32(_tempNum_) } { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) } return diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 6a1fd496f..5cc3afaef 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -203,6 +203,15 @@ type GameGlobalData struct { DailyNum int32 WeekNum int32 FitnessModelId string + BusinessTicket int32 + BusinessMoney *Gameatn + BusinessMoneynum int32 + BusinessMinintReward *Gameatn + BusinessMaxintReward *Gameatn + BusinessMaxint int32 + BusinessBag int32 + BusinessRewardday int32 + BusinessRenovatething int32 } const TypeId_GameGlobalData = 477542761 @@ -820,6 +829,15 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Daily_Num"].(float64); !_ok_ { err = errors.New("Daily_Num error"); return }; _v.DailyNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Week_Num"].(float64); !_ok_ { err = errors.New("Week_Num error"); return }; _v.WeekNum = int32(_tempNum_) } { var _ok_ bool; if _v.FitnessModelId, _ok_ = _buf["fitnessModelId"].(string); !_ok_ { err = errors.New("fitnessModelId error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_ticket"].(float64); !_ok_ { err = errors.New("business_ticket error"); return }; _v.BusinessTicket = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_money"].(map[string]interface{}); !_ok_ { err = errors.New("business_money error"); return }; if _v.BusinessMoney, err = DeserializeGameatn(_x_); err != nil { return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_moneynum"].(float64); !_ok_ { err = errors.New("business_moneynum error"); return }; _v.BusinessMoneynum = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_minint_reward"].(map[string]interface{}); !_ok_ { err = errors.New("business_minint_reward error"); return }; if _v.BusinessMinintReward, err = DeserializeGameatn(_x_); err != nil { return } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_maxint_reward"].(map[string]interface{}); !_ok_ { err = errors.New("business_maxint_reward error"); return }; if _v.BusinessMaxintReward, err = DeserializeGameatn(_x_); err != nil { return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_maxint"].(float64); !_ok_ { err = errors.New("business_maxint error"); return }; _v.BusinessMaxint = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_bag"].(float64); !_ok_ { err = errors.New("business_bag error"); return }; _v.BusinessBag = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_rewardday"].(float64); !_ok_ { err = errors.New("business_rewardday error"); return }; _v.BusinessRewardday = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_renovatething"].(float64); !_ok_ { err = errors.New("business_renovatething error"); return }; _v.BusinessRenovatething = int32(_tempNum_) } return }