diff --git a/bin/json/game_arenaactivereward.json b/bin/json/game_arenaactivereward.json index 0953fe604..9644852a6 100644 --- a/bin/json/game_arenaactivereward.json +++ b/bin/json/game_arenaactivereward.json @@ -8,6 +8,14 @@ "key": "arena_active_reward_name_1", "text": "黑铁" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 0, "win_reward": [ { "a": "attr", @@ -27,6 +35,14 @@ "key": "arena_active_reward_name_2", "text": "青铜" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 0, "win_reward": [ { "a": "attr", @@ -46,6 +62,14 @@ "key": "arena_active_reward_name_3", "text": "白银" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 800, "win_reward": [ { "a": "attr", @@ -65,6 +89,14 @@ "key": "arena_active_reward_name_4", "text": "黄金" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 1300, "win_reward": [ { "a": "attr", @@ -84,6 +116,14 @@ "key": "arena_active_reward_name_5", "text": "铂金" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 1600, "win_reward": [ { "a": "attr", @@ -103,6 +143,14 @@ "key": "arena_active_reward_name_6", "text": "钻石" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 2200, "win_reward": [ { "a": "attr", @@ -122,6 +170,14 @@ "key": "arena_active_reward_name_7", "text": "大师" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 2800, "win_reward": [ { "a": "attr", @@ -141,6 +197,14 @@ "key": "arena_active_reward_name_8", "text": "王者" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 3700, "win_reward": [ { "a": "attr", diff --git a/bin/json/game_arenarankreward.json b/bin/json/game_arenarankreward.json index 6543810aa..5572b26cb 100644 --- a/bin/json/game_arenarankreward.json +++ b/bin/json/game_arenarankreward.json @@ -1,6 +1,7 @@ [ { "id": 1, + "name": 1, "rank_low": 1, "rank_up": 1, "rank_display": { @@ -27,6 +28,7 @@ }, { "id": 2, + "name": 1, "rank_low": 2, "rank_up": 2, "rank_display": { @@ -53,6 +55,7 @@ }, { "id": 3, + "name": 1, "rank_low": 3, "rank_up": 3, "rank_display": { @@ -79,6 +82,7 @@ }, { "id": 4, + "name": 1, "rank_low": 4, "rank_up": 10, "rank_display": { @@ -105,6 +109,7 @@ }, { "id": 5, + "name": 1, "rank_low": 11, "rank_up": 20, "rank_display": { @@ -126,6 +131,7 @@ }, { "id": 6, + "name": 1, "rank_low": 21, "rank_up": 50, "rank_display": { @@ -147,6 +153,7 @@ }, { "id": 7, + "name": 1, "rank_low": 51, "rank_up": 100, "rank_display": { @@ -168,6 +175,7 @@ }, { "id": 8, + "name": 1, "rank_low": 101, "rank_up": 200, "rank_display": { @@ -189,6 +197,7 @@ }, { "id": 9, + "name": 1, "rank_low": 201, "rank_up": 500, "rank_display": { @@ -210,6 +219,7 @@ }, { "id": 10, + "name": 1, "rank_low": 501, "rank_up": 1000, "rank_display": { @@ -231,6 +241,7 @@ }, { "id": 11, + "name": 1, "rank_low": 1001, "rank_up": 2000, "rank_display": { @@ -252,6 +263,7 @@ }, { "id": 12, + "name": 1, "rank_low": 2001, "rank_up": 9999, "rank_display": { diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index e2040d316..2b121227d 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -3674,5 +3674,250 @@ "BlueAssistTeam": 0, "CanFriendHelp": true, "Numrounds": 0 + }, + { + "id": 10103101, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101612, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103102, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101622, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103103, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101632, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103104, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101642, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103105, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101652, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103106, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101662, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103107, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101672, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 } ] \ No newline at end of file diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 42cc158ca..ae4ea72dc 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -29341,9 +29341,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_957", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -29357,7 +29357,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20034 + ], "filter2": [] }, { @@ -29371,7 +29373,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_958", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29401,7 +29403,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_959", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29431,7 +29433,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_960", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29461,7 +29463,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_961", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29491,9 +29493,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_962", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第3章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -29507,7 +29509,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20261 + ], "filter2": [] }, { @@ -29521,9 +29525,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_963", - "text": "主角等级达到1级开启" + "text": "主角等级达到10开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -29537,7 +29541,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20034 + ], "filter2": [] }, { @@ -29551,7 +29557,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_964", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29581,9 +29587,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_965", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第1关开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -29597,7 +29603,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 1101000 + ], "filter2": [] }, { @@ -29611,9 +29619,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_966", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第8关开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -29627,7 +29635,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 1101016 + ], "filter2": [] }, { @@ -29641,7 +29651,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_967", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29671,7 +29681,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_968", - "text": "主角等级达到1级开启" + "text": "主角等级达到10开启" }, "type": 20, "valid": 0, @@ -29701,9 +29711,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_969", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -29717,7 +29727,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20050 + ], "filter2": [] }, { @@ -29731,9 +29743,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_970", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -29747,7 +29759,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 1101000 + ], "filter2": [] }, { @@ -29761,9 +29775,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_971", - "text": "主角等级达到1级开启" + "text": "继续完成更多主线任务开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -29777,7 +29791,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20030 + ], "filter2": [] }, { @@ -29791,9 +29807,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_972", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第1关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -29807,7 +29823,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20032 + ], "filter2": [] }, { @@ -29821,7 +29839,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_973", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29851,7 +29869,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_974", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第1关开启" }, "type": 20, "valid": 0, @@ -29881,7 +29899,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_975", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29911,7 +29929,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_976", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29941,7 +29959,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_977", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第4章的第4关开启" }, "type": 20, "valid": 0, @@ -29971,7 +29989,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_978", - "text": "主角等级达到1级开启" + "text": "主角等级达到999开启" }, "type": 20, "valid": 0, @@ -29987,7 +30005,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 9999 + ], "filter2": [] }, { @@ -30001,7 +30021,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_979", - "text": "主角等级达到1级开启" + "text": "主角等级达到999开启" }, "type": 20, "valid": 0, @@ -30017,7 +30037,9 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 9999 + ], "filter2": [] }, { @@ -30031,7 +30053,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_980", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第8关开启" }, "type": 20, "valid": 0, @@ -30061,7 +30083,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_981", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30091,7 +30113,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_982", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30121,7 +30143,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_983", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30151,7 +30173,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_984", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30166,7 +30188,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30181,7 +30203,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_985", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30196,7 +30218,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30211,9 +30233,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_986", - "text": "主角等级达到2级开启" + "text": "主线关卡通关达到第6章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -30226,8 +30248,10 @@ "key": "", "text": "" }, - "value": 2, - "filter": [], + "value": 1, + "filter": [ + 20130 + ], "filter2": [] }, { @@ -30241,7 +30265,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_987", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30256,7 +30280,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30271,7 +30295,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_988", - "text": "主角等级达到2级开启" + "text": "主线关卡通关达到第6章的第8关开启" }, "type": 20, "valid": 0, @@ -30286,7 +30310,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30301,7 +30325,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_989", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30316,7 +30340,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30331,7 +30355,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_990", - "text": "主角等级达到2级开启" + "text": "主线关卡通关达到第4章的第4关开启" }, "type": 20, "valid": 0, @@ -30346,7 +30370,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30361,7 +30385,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_991", - "text": "主角等级达到2级开启" + "text": "主线关卡通关达到第2章的第8关开启" }, "type": 20, "valid": 0, @@ -30376,7 +30400,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30391,9 +30415,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_992", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -30406,8 +30430,10 @@ "key": "", "text": "" }, - "value": 2, - "filter": [], + "value": 1, + "filter": [ + 20050 + ], "filter2": [] }, { @@ -30421,7 +30447,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_993", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30436,7 +30462,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30451,7 +30477,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_994", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第3章的第4关开启" }, "type": 252, "valid": 0, @@ -30467,9 +30493,7 @@ "text": "" }, "value": 1, - "filter": [ - 20364 - ], + "filter": [], "filter2": [] }, { @@ -30483,7 +30507,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_995", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30498,7 +30522,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30513,7 +30537,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_996", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30528,7 +30552,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30543,7 +30567,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_997", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30558,7 +30582,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30573,7 +30597,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_998", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第3章的第4关开启" }, "type": 252, "valid": 0, @@ -30590,7 +30614,7 @@ }, "value": 1, "filter": [ - 20364 + 20128 ], "filter2": [] }, @@ -30605,9 +30629,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_999", - "text": "主角等级达到2级开启" + "text": "主线关卡通关达到第5章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -30620,8 +30644,10 @@ "key": "", "text": "" }, - "value": 2, - "filter": [], + "value": 1, + "filter": [ + 20140 + ], "filter2": [] }, { @@ -30635,7 +30661,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1000", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30650,7 +30676,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30665,7 +30691,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1001", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30680,7 +30706,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30695,7 +30721,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1002", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30710,7 +30736,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30725,7 +30751,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1003", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30740,7 +30766,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30755,9 +30781,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1004", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -30770,8 +30796,10 @@ "key": "", "text": "" }, - "value": 2, - "filter": [], + "value": 1, + "filter": [ + 20020 + ], "filter2": [] }, { @@ -30785,9 +30813,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1005", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -30800,8 +30828,10 @@ "key": "", "text": "" }, - "value": 2, - "filter": [], + "value": 1, + "filter": [ + 20020 + ], "filter2": [] }, { @@ -30815,7 +30845,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1006", - "text": "主角等级达到2级开启" + "text": "主角等级达到50开启" }, "type": 20, "valid": 0, @@ -30830,7 +30860,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 70, "filter": [], "filter2": [] }, @@ -30845,7 +30875,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1007", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30860,7 +30890,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30875,7 +30905,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1008", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -30890,7 +30920,7 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, @@ -30905,7 +30935,671 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1009", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000054, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1010", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000055, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1011", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000056, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1012", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000057, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1013", + "text": "主角等级达到1开启" + }, + "type": 252, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [ + 20140 + ], + "filter2": [] + }, + { + "id": 18000058, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1014", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000059, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1015", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000060, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1016", + "text": "主角等级达到第4章的第8关开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000061, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1017", + "text": "主角等级达到1开启" + }, + "type": 252, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [ + 20033 + ], + "filter2": [] + }, + { + "id": 18000062, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1018", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000063, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1019", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000064, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1020", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000065, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1021", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000066, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1022", + "text": "主线关卡通关达到第1章的第7关开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000067, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1023", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000068, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1024", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000069, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1025", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000070, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1026", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000071, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1027", + "text": "主线关卡通关达到第3章的第8关开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000072, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1028", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000073, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1029", + "text": "主角等级达到6开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [], + "filter2": [] + }, + { + "id": 18000074, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1030", + "text": "主角等级达到10开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 10, + "filter": [], + "filter2": [] + }, + { + "id": 18000075, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1031", + "text": "主角等级达到2开启" }, "type": 20, "valid": 0, @@ -30924,666 +31618,6 @@ "filter": [], "filter2": [] }, - { - "id": 18000054, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1010", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000055, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1011", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000056, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1012", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000057, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1013", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000058, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1014", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000059, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1015", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000060, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1016", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000061, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1017", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000062, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1018", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000063, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1019", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000064, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1020", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000065, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1021", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000066, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1022", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000067, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1023", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000068, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1024", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000069, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1025", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000070, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1026", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000071, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1027", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000072, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1028", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000073, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1029", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000074, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1030", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000075, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1031", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, { "id": 18000076, "refresh": 0, @@ -31595,9 +31629,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1032", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第2章的第4关开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31610,8 +31644,10 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 1101012 + ], "filter2": [] }, { @@ -31625,7 +31661,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1033", - "text": "主角等级达到4级开启" + "text": "主角等级达到10开启" }, "type": 20, "valid": 0, @@ -31640,7 +31676,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 10, "filter": [], "filter2": [] }, @@ -31655,7 +31691,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1034", - "text": "主角等级达到4级开启" + "text": "主角等级达到70开启" }, "type": 20, "valid": 0, @@ -31670,7 +31706,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 70, "filter": [], "filter2": [] }, @@ -31685,7 +31721,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1035", - "text": "主角等级达到4级开启" + "text": "主角等级达到第8章的第8关开启" }, "type": 20, "valid": 0, @@ -31700,7 +31736,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -31715,7 +31751,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1036", - "text": "主角等级达到4级开启" + "text": "主角等级达到第12章的第8关开启" }, "type": 20, "valid": 0, @@ -31730,7 +31766,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -31745,7 +31781,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1037", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第6章的第4关开启" }, "type": 20, "valid": 0, @@ -31760,7 +31796,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -31775,9 +31811,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1038", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第1章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -31790,8 +31826,10 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 20050 + ], "filter2": [] }, { @@ -31805,7 +31843,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1039", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第5章的第4关开启" }, "type": 20, "valid": 0, @@ -31820,7 +31858,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -31835,7 +31873,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1040", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第1章的第8关开启" }, "type": 20, "valid": 0, @@ -31850,7 +31888,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -31865,9 +31903,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1041", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第6章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -31880,8 +31918,10 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 20250 + ], "filter2": [] }, { @@ -31895,9 +31935,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1042", - "text": "主角等级达到4级开启" + "text": "好友数量" }, - "type": 20, + "type": 10, "valid": 0, "head": { "a": "attr", @@ -31910,7 +31950,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 10, "filter": [], "filter2": [] }, @@ -31925,7 +31965,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1043", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第12章的第8关开启" }, "type": 20, "valid": 0, @@ -31940,7 +31980,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -31955,7 +31995,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1044", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第10章的第8关开启" }, "type": 20, "valid": 0, @@ -31970,7 +32010,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -31985,7 +32025,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1045", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第10章的第8关开启" }, "type": 20, "valid": 0, @@ -32000,7 +32040,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -32015,7 +32055,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1046", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第4章的第8关开启" }, "type": 20, "valid": 0, @@ -32030,7 +32070,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -32045,7 +32085,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1047", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第8章的第8关开启" }, "type": 20, "valid": 0, @@ -32060,7 +32100,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -32075,7 +32115,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1048", - "text": "主角等级达到4级开启" + "text": "主角等级达到10开启" }, "type": 20, "valid": 0, @@ -32090,7 +32130,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 40, "filter": [], "filter2": [] }, @@ -32105,9 +32145,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1049", - "text": "主角等级达到4级开启" + "text": "主角等级达到4开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -32120,8 +32160,10 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 20050 + ], "filter2": [] }, { @@ -32135,7 +32177,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1050", - "text": "主角等级达到4级开启" + "text": "主角等级达到10开启" }, "type": 20, "valid": 0, @@ -32150,7 +32192,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 10, "filter": [], "filter2": [] }, @@ -32165,9 +32207,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1051", - "text": "主角等级达到4级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -32180,8 +32222,10 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 1101000 + ], "filter2": [] }, { @@ -32195,9 +32239,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1052", - "text": "主角等级达到4级开启" + "text": "" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -32210,8 +32254,10 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 20140 + ], "filter2": [] }, { @@ -32225,7 +32271,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1053", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32240,7 +32286,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -32255,7 +32301,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1054", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32270,7 +32316,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -32285,7 +32331,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1055", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32300,7 +32346,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -32315,7 +32361,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1056", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32330,7 +32376,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -32345,7 +32391,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1057", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32360,7 +32406,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, @@ -32375,7 +32421,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1058", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32390,7 +32436,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 2, "filter": [], "filter2": [] }, @@ -32405,7 +32451,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1059", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32420,7 +32466,7 @@ "key": "", "text": "" }, - "value": 4, + "value": 3, "filter": [], "filter2": [] }, @@ -32435,9 +32481,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1060", - "text": "主角等级达到4级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -32450,8 +32496,10 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 1101017 + ], "filter2": [] }, { @@ -32465,9 +32513,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1061", - "text": "主角等级达到4级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -32480,8 +32528,10 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 1102020 + ], "filter2": [] }, { @@ -32495,9 +32545,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1062", - "text": "主角等级达到4级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -32510,8 +32560,10 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 1103015 + ], "filter2": [] }, { @@ -32525,9 +32577,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1063", - "text": "主角等级达到5级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -32540,8 +32592,10 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 1104031 + ], "filter2": [] }, { @@ -32555,7 +32609,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1064", - "text": "主角等级达到5级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32570,7 +32624,7 @@ "key": "", "text": "" }, - "value": 5, + "value": 70, "filter": [], "filter2": [] }, @@ -32585,7 +32639,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1065", - "text": "主角等级达到5级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32600,7 +32654,7 @@ "key": "", "text": "" }, - "value": 5, + "value": 71, "filter": [], "filter2": [] }, @@ -32615,7 +32669,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1066", - "text": "主角等级达到5级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32630,7 +32684,7 @@ "key": "", "text": "" }, - "value": 5, + "value": 72, "filter": [], "filter2": [] }, @@ -32645,7 +32699,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1067", - "text": "主角等级达到5级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32660,7 +32714,7 @@ "key": "", "text": "" }, - "value": 5, + "value": 73, "filter": [], "filter2": [] }, @@ -32675,9 +32729,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1068", - "text": "主角等级达到5级开启" + "text": "继续完成更多主线任务开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -32690,8 +32744,10 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 1101037 + ], "filter2": [] }, { @@ -32705,9 +32761,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1069", - "text": "主角等级达到5级开启" + "text": "继续完成更多主线任务开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -32720,8 +32776,10 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 1101004 + ], "filter2": [] }, { @@ -32735,9 +32793,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1070", - "text": "主角等级达到5级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -32750,8 +32808,10 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 1101012 + ], "filter2": [] }, { @@ -32765,9 +32825,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1071", - "text": "主角等级达到5级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -32780,8 +32840,10 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 1101018 + ], "filter2": [] }, { @@ -32795,9 +32857,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1072", - "text": "主角等级达到5级开启" + "text": "" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -32810,8 +32872,10 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 20250 + ], "filter2": [] }, { @@ -32825,7 +32889,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1073", - "text": "主角等级达到5级开启" + "text": "" }, "type": 20, "valid": 0, @@ -32840,7 +32904,7 @@ "key": "", "text": "" }, - "value": 5, + "value": 1, "filter": [], "filter2": [] }, @@ -32855,9 +32919,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1074", - "text": "主角等级达到6级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -32870,8 +32934,10 @@ "key": "", "text": "" }, - "value": 6, - "filter": [], + "value": 1, + "filter": [ + 1101012 + ], "filter2": [] }, { @@ -32885,9 +32951,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1075", - "text": "主角等级达到6级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -32900,8 +32966,10 @@ "key": "", "text": "" }, - "value": 6, - "filter": [], + "value": 1, + "filter": [ + 1102023 + ], "filter2": [] }, { @@ -32928,7 +32996,7 @@ "key": "", "text": "" }, - "value": 25, + "value": 1, "filter": [], "filter2": [] }, @@ -32956,7 +33024,7 @@ "key": "", "text": "" }, - "value": 30, + "value": 1, "filter": [], "filter2": [] }, @@ -32984,7 +33052,7 @@ "key": "", "text": "" }, - "value": 35, + "value": 1, "filter": [], "filter2": [] }, @@ -33012,7 +33080,7 @@ "key": "", "text": "" }, - "value": 40, + "value": 1, "filter": [], "filter2": [] }, @@ -33070,7 +33138,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 35002 ], @@ -33100,7 +33168,7 @@ "key": "", "text": "" }, - "value": 40, + "value": 1, "filter": [ 35002 ], @@ -33130,7 +33198,7 @@ "key": "", "text": "" }, - "value": 60, + "value": 1, "filter": [ 35002 ], @@ -33190,7 +33258,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 14003 ], @@ -33220,7 +33288,7 @@ "key": "", "text": "" }, - "value": 40, + "value": 1, "filter": [ 14003 ], @@ -33250,7 +33318,7 @@ "key": "", "text": "" }, - "value": 60, + "value": 1, "filter": [ 14003 ], @@ -33700,7 +33768,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 13004 ], @@ -33730,7 +33798,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 13005 ], @@ -33760,7 +33828,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 15002 ], @@ -33790,7 +33858,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 24001 ], @@ -33820,7 +33888,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 25001 ], @@ -33850,7 +33918,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 35001 ], @@ -33880,7 +33948,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 44004 ], @@ -33910,7 +33978,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 44006 ], @@ -33940,7 +34008,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 45003 ], @@ -33970,7 +34038,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 34007 ], @@ -34000,7 +34068,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 45004 ], @@ -34030,7 +34098,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 45001 ], @@ -34060,7 +34128,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 34006 ], @@ -34090,7 +34158,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 35003 ], diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index 420f633aa..4166ef3cc 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -791,16 +791,6 @@ }, { "id": 80, - "type": 4, - "text": { - "key": "GM_GM_text_120", - "text": "积分BOSS" - }, - "data": "11081", - "prefix": "" - }, - { - "id": 81, "type": 2, "text": { "key": "GM_GM_text_127", @@ -810,7 +800,7 @@ "prefix": "bingo:sociatybooslv,{0}" }, { - "id": 82, + "id": 81, "type": 2, "text": { "key": "GM_GM_text_128", @@ -820,7 +810,7 @@ "prefix": "bingo:create,{0}" }, { - "id": 83, + "id": 82, "type": 2, "text": { "key": "GM_GM_text_129", @@ -830,7 +820,7 @@ "prefix": "bingo:mainline,{0}" }, { - "id": 84, + "id": 83, "type": 2, "text": { "key": "GM_GM_text_130", @@ -840,7 +830,7 @@ "prefix": "" }, { - "id": 85, + "id": 84, "type": 2, "text": { "key": "GM_GM_text_131", @@ -850,7 +840,7 @@ "prefix": "bingo:moonlv,{0}" }, { - "id": 86, + "id": 85, "type": 2, "text": { "key": "GM_GM_text_132", @@ -860,7 +850,7 @@ "prefix": "" }, { - "id": 87, + "id": 86, "type": 1, "text": { "key": "GM_GM_text_133", @@ -868,5 +858,15 @@ }, "data": "7,1", "prefix": "bingo:bagtype,{0}" + }, + { + "id": 87, + "type": 4, + "text": { + "key": "GM_GM_text_120", + "text": "积分BOSS" + }, + "data": "11081", + "prefix": "" } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index b73754567..ef3185996 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -39925,7 +39925,7 @@ "progress": 0, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401000, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40006,7 +40006,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401010, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40074,8 +40074,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_261", + "text": "呃呃呃，好冷啊……！！" }, "animation": [], "prewarbubbletext": { @@ -40087,7 +40087,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401020, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40155,8 +40155,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_262", + "text": "吼吼吼——" }, "animation": [], "prewarbubbletext": { @@ -40168,7 +40168,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401050, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40236,8 +40236,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_263", + "text": "哦，我的奥丁神啊！！" }, "animation": [], "prewarbubbletext": { @@ -40249,7 +40249,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401060, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40317,8 +40317,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_264", + "text": "小嗝嗝，快来帮忙。" }, "animation": [], "prewarbubbletext": { @@ -40330,7 +40330,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401070, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40446,8 +40446,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_265", + "text": "好端端的，龙群怎么会感染瘟疫？" }, "animation": [], "prewarbubbletext": { @@ -40459,8 +40459,8 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 401090, + "afterstoryid": 401100, "maingroupName": { "key": "", "text": "" @@ -40704,8 +40704,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_266", + "text": "事关博克岛生存，必须谨慎处理。" }, "animation": [], "prewarbubbletext": { @@ -40717,7 +40717,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401110, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40962,8 +40962,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_268", + "text": "别打了，大家都冷静一下！" }, "animation": [], "prewarbubbletext": { @@ -40975,7 +40975,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401120, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41045,8 +41045,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_269", + "text": "这不是你的错，小嗝嗝。" }, "animation": [], "prewarbubbletext": { @@ -41058,8 +41058,8 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 401140, + "afterstoryid": 401150, "maingroupName": { "key": "", "text": "" @@ -41174,8 +41174,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_270", + "text": "终于又回到了这里。" }, "animation": [], "prewarbubbletext": { @@ -41187,7 +41187,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401160, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41255,8 +41255,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_271", + "text": "希卡普，我的儿子！！" }, "animation": [], "prewarbubbletext": { @@ -41268,7 +41268,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401170, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41349,7 +41349,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401180, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41420,8 +41420,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_273", + "text": "以爱回应忠诚，以荣誉回应英勇。" }, "animation": [], "prewarbubbletext": { @@ -41433,7 +41433,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401190, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41507,8 +41507,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_274", + "text": "是奥拉夫暴风雪！！" }, "animation": [], "prewarbubbletext": { @@ -41520,7 +41520,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401200, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41604,7 +41604,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401210, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41691,8 +41691,8 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 401220, + "afterstoryid": 401230, "maingroupName": { "key": "", "text": "" @@ -41807,8 +41807,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_277", + "text": "怎么办怎么办，暴风雪来了！" }, "animation": [], "prewarbubbletext": { @@ -41820,7 +41820,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401250, "afterstoryid": 0, "maingroupName": { "key": "", diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 7e193f44f..f53f9e9b6 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -3601,6 +3601,1406 @@ "speed": 58, "modelsize": 1 }, + { + "Id": 101611, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51006, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101611, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51006, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 150, + "modelsize": 1 + }, + { + "Id": 101611, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51006, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101611, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51006, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 110, + "modelsize": 1 + }, + { + "Id": 101611, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51006, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 115, + "modelsize": 1 + }, + { + "Id": 101612, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 1, + "atkpro": 2, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101612, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 1, + "atkpro": 2, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101612, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 1, + "atkpro": 2, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101612, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 1, + "atkpro": 2, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101612, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 1, + "atkpro": 2, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101621, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 53001, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101621, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101621, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101621, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101621, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101622, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101622, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101622, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101622, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101622, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101631, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 33005, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.4, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101631, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 24008, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.4, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101631, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 34008, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.4, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101631, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.4, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101631, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.4, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101632, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101632, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 14003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101632, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101632, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101632, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101641, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.6, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101641, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.6, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101641, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.6, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101641, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.6, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101641, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.6, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101642, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101642, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 14003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101642, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101642, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101642, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101651, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 53001, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.9, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101651, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.9, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101651, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.9, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101651, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.9, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101651, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.9, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101652, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101652, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 14003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101652, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101652, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101652, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101661, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 14003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101661, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101661, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101661, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101661, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101662, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101662, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101662, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101662, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101662, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101671, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101671, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 13001, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101671, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 13003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101671, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101671, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101672, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101672, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 14003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101672, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101672, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101672, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, { "Id": 102011, "pos": 1, @@ -127376,8 +128776,8 @@ "newskill": [], "lv": 65, "hppro": 20, - "atkpro": 3, - "defpro": 0.5, + "atkpro": 2.3, + "defpro": 0.6, "skill1": 1, "skill2": 1, "skill3": 1, @@ -244964,7 +246364,7 @@ ], "lv": 20, "hppro": 10, - "atkpro": 4, + "atkpro": 2, "defpro": 10, "skill1": 1, "skill2": 1, diff --git a/bin/json/game_plunderdevelop.json b/bin/json/game_plunderdevelop.json new file mode 100644 index 000000000..53903f5ec --- /dev/null +++ b/bin/json/game_plunderdevelop.json @@ -0,0 +1,363 @@ +[ + { + "id": 1001, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_01", + "text": "初级航海术" + }, + "open": [], + "last": [], + "icon": "jn_24004_1", + "place": 0, + "type": 101, + "buffID": 1, + "txt": { + "key": "plunder_plunder_develop_txt_01", + "text": "货船免费刷新次数+1" + } + }, + { + "id": 1002, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_02", + "text": "初级航海术" + }, + "open": [], + "last": [ + 1001 + ], + "icon": "jn_24004_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_02", + "text": "全队攻击增加3%" + } + }, + { + "id": 1003, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_03", + "text": "初级航海术" + }, + "open": [], + "last": [ + 1001 + ], + "icon": "jn_24004_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_03", + "text": "全队防御增加3%" + } + }, + { + "id": 1004, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_04", + "text": "初级航海术" + }, + "open": [], + "last": [ + 1002 + ], + "icon": "jn_24004_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_04", + "text": "全队生命增加3%" + } + }, + { + "id": 1005, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_05", + "text": "初级航海术" + }, + "open": [], + "last": [ + 1003 + ], + "icon": "jn_24004_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_05", + "text": "全队速度增加3%" + } + }, + { + "id": 1006, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_06", + "text": "初级航海术" + }, + "open": [], + "last": [ + 1004, + 1005 + ], + "icon": "jn_24004_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_06", + "text": "全队暴击率增加3%" + } + }, + { + "id": 1007, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_07", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1006 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 101, + "buffID": 1, + "txt": { + "key": "plunder_plunder_develop_txt_07", + "text": "货船免费刷新次数+1" + } + }, + { + "id": 1008, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_08", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1007 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_08", + "text": "全队攻击增加6%" + } + }, + { + "id": 1009, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_09", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1007 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_09", + "text": "全队防御增加6%" + } + }, + { + "id": 1010, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_10", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1008 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_10", + "text": "全队生命增加6%" + } + }, + { + "id": 1011, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_11", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1009 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_11", + "text": "全队速度增加6%" + } + }, + { + "id": 1012, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_12", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1010, + 1011 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_12", + "text": "全队暴击率增加6%" + } + }, + { + "id": 1013, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_13", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1012 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 101, + "buffID": 1, + "txt": { + "key": "plunder_plunder_develop_txt_13", + "text": "货船免费刷新次数+1" + } + }, + { + "id": 1014, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_14", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1013 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_14", + "text": "全队攻击增加9%" + } + }, + { + "id": 1015, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_15", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1013 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_15", + "text": "全队防御增加9%" + } + }, + { + "id": 1016, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_16", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1014 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_16", + "text": "全队生命增加3%" + } + }, + { + "id": 1017, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_17", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1015 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_17", + "text": "全队速度增加9%" + } + }, + { + "id": 1018, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_18", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1016, + 1018 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_18", + "text": "全队暴击伤害增加10%" + } + } +] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index c59d470cc..09d6160c7 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -24832,7 +24832,8 @@ 255007211, 255007212, 255007213, - 255007315 + 255007315, + 255007319 ] }, "passSkill": [], diff --git a/comm/const.go b/comm/const.go index 2a07312b4..debff5406 100644 --- a/comm/const.go +++ b/comm/const.go @@ -448,10 +448,10 @@ const ( TableIntegralRank = "integralrank" //排名 // 助战信息列表 - TableAssist = "assist" - TablePlunder = "plunder" // 掠夺 - TablePlunderLand = "plunderland" // 掠夺岛 - + TableAssist = "assist" + TablePlunder = "plunder" // 掠夺 + TablePlunderLand = "plunderland" // 掠夺岛 + TablePlunderRecord = "plunderrecord" // 掠夺岛记录 ///工会远征 TableExpedition = "expedition" ) diff --git a/comm/imodule.go b/comm/imodule.go index d4e44aec6..2183856e8 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -221,6 +221,8 @@ type ( PsConvertExp(ps int32) (res *cfg.Gameatn) CleanUserConsumeMoney(session IUserSession) (err error) + // 增加隐藏分 + AddUserHidenum(session IUserSession, score int32) (err error) } //武器模块 IEquipment interface { diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index e290f2de6..4e025a0a5 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -57,13 +57,7 @@ func (this *ModelHero) calFigthValue(hero *pb.DBHero) (addValue int32, err error skillStar *cfg.GameFightingSkillStarData ) tmpHero = new(pb.DBHero) - //tmpHero = this.copyPoint(hero) *tmpHero = *hero // 克隆一个对象 - // tmpHero.Property = make(map[int32]int32) - // tmpHero.AddProperty = make(map[int32]int32) - // tmpHero.JuexProperty = make(map[int32]int32) - // tmpHero.HoroscopeProperty = make(map[int32]int32) - // tmpHero.TalentProperty = make(map[int32]int32) tmpHero.Property = this.cloneTags(hero.Property) tmpHero.AddProperty = this.cloneTags(hero.AddProperty) tmpHero.JuexProperty = this.cloneTags(hero.JuexProperty) @@ -460,9 +454,11 @@ func (this *ModelHero) setEquipment(uid string, hero *pb.DBHero) (newHero *pb.DB func (this *ModelHero) mergeAddProperty(uid string, hero *pb.DBHero, data map[int32]int32, skills []*pb.SkillData) { hero.AddProperty = data + this.calFigthValue(hero) if err := this.ChangeList(uid, hero.Id, map[string]interface{}{ "addProperty": data, "equipSkill": skills, + "fightvalue": hero.Fightvalue, }); err != nil { this.module.Errorf("mergeAddProperty err %v", err) } diff --git a/modules/plunder/api_challengeover.go b/modules/plunder/api_challengeover.go index 1bf88e71e..fbbcfe397 100644 --- a/modules/plunder/api_challengeover.go +++ b/modules/plunder/api_challengeover.go @@ -221,6 +221,24 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha Atno: atno, Heroexp: changExp, }) + + // 运输记录 + var info []*pb.PlunderRecordData + info = append(info, &pb.PlunderRecordData{ + Itype: 1, // 1 出发 + P1: session.GetUserId(), + P2: "", + Cid: list.Source[req.Index], + Ctime: configure.Now().Unix(), + }) + info = append(info, &pb.PlunderRecordData{ + Itype: 3, // 3 到达 + P1: session.GetUserId(), + P2: "", + Cid: list.Source[req.Index], + Ctime: configure.Now().Unix() + int64(conf.Extime), + }) + err = this.module.modelRecord.AddRecordData(land.Id, info) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PlunderChallengeOverReq", atno) }) diff --git a/modules/plunder/api_develop.go b/modules/plunder/api_develop.go new file mode 100644 index 000000000..b4d15198f --- /dev/null +++ b/modules/plunder/api_develop.go @@ -0,0 +1,67 @@ +package plunder + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +func (this *apiComp) DevelopCheck(session comm.IUserSession, req *pb.PlunderDevelopReq) (errdata *pb.ErrorData) { + return +} + +// 获取基本信息 +func (this *apiComp) Develop(session comm.IUserSession, req *pb.PlunderDevelopReq) (errdata *pb.ErrorData) { + var ( + err error + list *pb.DBPlunder + update map[string]interface{} + conf *cfg.GamePlunderDevelopData + ) + if errdata = this.DevelopCheck(session, req); errdata != nil { + return + } + + update = make(map[string]interface{}) + if list, err = this.module.modelPlunder.getPlunderData(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + + if conf, err = this.module.configure.getPlunderDevelopById(req.Cid); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + if _, ok := list.Develop[conf.Itype]; ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_PlundeAlreadyLearn, + Title: pb.ErrorCode_PlundeAlreadyLearn.ToString(), + } + return + } + // 校验前置任务 + for _, v := range conf.Last { + if _, ok := list.Develop[v]; !ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_PlundeAlreadyLearn, + Title: pb.ErrorCode_PlundeAlreadyLearn.ToString(), + } + return + } + } + list.Develop[conf.Itype] = 1 + update["develop"] = list.Develop + this.module.modelPlunder.changePlunderData(session.GetUserId(), update) + + session.SendMsg(string(this.module.GetType()), "develop", &pb.PlunderDevelopResp{ + Develop: list.Develop, + }) + + return +} diff --git a/modules/plunder/api_pvpchallengeover.go b/modules/plunder/api_pvpchallengeover.go index 59d1c336d..5c53f1766 100644 --- a/modules/plunder/api_pvpchallengeover.go +++ b/modules/plunder/api_pvpchallengeover.go @@ -30,7 +30,10 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder users []string lock *redis.RedisMutex changeShip map[string]*pb.ShipData // 数据变化通知 + atno []*pb.UserAtno // 打赢奖励 + info []*pb.PlunderRecordData // 运输记录 ) + if errdata = this.PvpChallengeOverCheck(session, req); errdata != nil { return } @@ -96,21 +99,53 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{ Atno: []*pb.UserAtno{}, }) + + info = append(info, &pb.PlunderRecordData{ + Itype: 2, // 2 被战败 + P1: session.GetUserId(), + P2: land.Ship[req.Oid].Uid, + Cid: land.Ship[req.Oid].Line.Cid, + Ctime: configure.Now().Unix(), + }) + err = this.module.modelRecord.AddRecordData(land.Id, info) + return } land.Ship[req.Oid].Status = 3 + if errdata, atno = this.module.DispenseAtno(session, conf.Keepreward, true); errdata != nil { + return + } + if conf.Numitem.N > 0 { + atno = append(atno, &pb.UserAtno{ + A: conf.Numitem.A, + T: conf.Numitem.T, + N: conf.Numitem.N, + }) + list.Score += conf.Numitem.N + } // 修改状态 changeShip[req.Oid] = land.Ship[req.Oid] this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{ "ship": land.Ship, }) + + this.module.modelPlunder.changePlunderData(session.GetUserId(), map[string]interface{}{ + "score": list.Score, + }) // 通知大家 this.module.SendMsgToUsers(string(this.module.GetType()), "change", &pb.PlunderChangePush{ Ship: changeShip, }, users...) session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{ - Atno: []*pb.UserAtno{}, + Atno: atno, }) - + info = append(info, &pb.PlunderRecordData{ + Itype: 4, // 4 掠夺成功 + P1: session.GetUserId(), + P2: land.Ship[req.Oid].Uid, + Cid: land.Ship[req.Oid].Line.Cid, + Ctime: configure.Now().Unix(), + }) + err = this.module.modelRecord.AddRecordData(land.Id, info) return } diff --git a/modules/plunder/api_reach.go b/modules/plunder/api_reach.go index 8e3c96ff1..9615a4eaf 100644 --- a/modules/plunder/api_reach.go +++ b/modules/plunder/api_reach.go @@ -4,6 +4,8 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/redis" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" + cfg "go_dreamfactory/sys/configure/structs" ) // 参数校验 @@ -17,14 +19,20 @@ func (this *apiComp) ReachCheck(session comm.IUserSession, req *pb.PlunderReachR return } -// 船准备出发 +// 船到达 领奖 func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) (errdata *pb.ErrorData) { var ( err error list *pb.DBPlunder land *pb.DBPlunderLand // 岛屿数据 //changeShip map[string]*pb.ShipData // 变化的信息 - lock *redis.RedisMutex + lock *redis.RedisMutex + bPlunder bool // 到达检测 是否被掠夺 + cid int32 + conf *cfg.GamePlunderData + res []*cfg.Gameatn // 奖励 + bExReward bool // 是否是高级运输 + atno []*pb.UserAtno ) //changeShip = make(map[string]*pb.ShipData, 0) if errdata = this.ReachCheck(session, req); errdata != nil { @@ -62,17 +70,61 @@ func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) ( } return } else { + if land.Ship[oid].Line.Etime >= configure.Now().Unix() { // 还没到时间 船没到达 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + if land.Ship[oid].Line.Itype != 0 { + bExReward = true + if land.Ship[oid].Status == 3 { // 高级船 + bPlunder = true + } + } for _, v := range list.Line { if v.Oid == oid { v.Oid = "" } } + cid = land.Ship[oid].Line.Cid delete(land.Ship, oid) } } - + // 配置校验 + if conf, err = this.module.configure.getGamePlunderDataById(cid); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + if !bExReward { // 普通奖励 + res = append(res, conf.Keepreward...) + list.Score += conf.Numitem.N + } else { + res = append(res, conf.Exreward...) // 高级奖励 + } + if !bPlunder { // 掠夺成功 + res = append(res, conf.Keepreward...) + } + if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil { + return + } + if bExReward { + if conf.Numitem.N > 0 { + atno = append(atno, &pb.UserAtno{ + A: conf.Numitem.A, + T: conf.Numitem.T, + N: conf.Numitem.N, + }) + } + } this.module.modelPlunder.changePlunderData(session.GetUserId(), map[string]interface{}{ - "line": list.Line, + "line": list.Line, + "score": list.Score, }) this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{ "ship": land.Ship, @@ -80,6 +132,7 @@ func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) ( session.SendMsg(string(this.module.GetType()), "reach", &pb.PlunderReachResp{ Line: list.Line, Ship: land.Ship, + Atno: atno, }) return } diff --git a/modules/plunder/configure.go b/modules/plunder/configure.go index 521774aa1..cce394d36 100644 --- a/modules/plunder/configure.go +++ b/modules/plunder/configure.go @@ -8,8 +8,9 @@ import ( ) const ( - game_plunder = "game_plunder.json" - game_plunderbattle = "game_plunderbattle.json" + game_plunder = "game_plunder.json" + game_plunderbattle = "game_plunderbattle.json" + game_plunderdevelop = "game_plunderdevelop.json" ) type configureComp struct { @@ -22,8 +23,9 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp this.module = module.(*Plunder) //err = this.LoadConfigure(game_plunder, cfg.NewGamePlunder) err = this.LoadMultiConfigure(map[string]interface{}{ - game_plunder: cfg.NewGamePlunder, - game_plunderbattle: cfg.NewGamePlunderBattle, + game_plunder: cfg.NewGamePlunder, + game_plunderbattle: cfg.NewGamePlunderBattle, + game_plunderdevelop: cfg.NewGamePlunderDevelop, }) return } @@ -75,3 +77,19 @@ func (this *configureComp) getGameMonkeyRewardData(chapterid int32) (result []*c return } + +// 获取航海术相关 +func (this *configureComp) getPlunderDevelopById(id int32) (result *cfg.GamePlunderDevelopData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_plunderdevelop); err == nil { + if configure, ok := v.(*cfg.GamePlunderDevelop); ok { + if result = configure.Get(id); result != nil { + return + } + } + } + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_plunderdevelop, id) + return +} diff --git a/modules/plunder/model_land.go b/modules/plunder/model_land.go index 65556fffd..523775b97 100644 --- a/modules/plunder/model_land.go +++ b/modules/plunder/model_land.go @@ -71,7 +71,7 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand } uids = append(uids, uid) // 优先加入自己 uInfos = append(uInfos, comm.GetUserBaseInfo(user)) - cur, err := this.DB.Find(core.SqlTable(comm.TableUser), bson.M{"gold": bson.M{"$gte": limtSocre}, "name": bson.M{"$ne": ""}}, options.Find().SetSkip(int64(0)).SetLimit(int64(30))) + cur, err := this.DB.Find(core.SqlTable(comm.TableUser), bson.M{"plunder": bson.M{"$gte": limtSocre}, "name": bson.M{"$ne": ""}}, options.Find().SetSkip(int64(0)).SetLimit(int64(30))) for cur.Next(context.TODO()) { tmp := &pb.DBUser{} if err = cur.Decode(tmp); err == nil { @@ -104,7 +104,7 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand land.Uinfo[int32(sz[k])] = v } err = this.AddList(comm.RDS_EMPTY, land.Id, land) - + this.module.modelRecord.getPlunderRecordData(land.Id) // 创建一条记录数据 return } diff --git a/modules/plunder/model_plunder.go b/modules/plunder/model_plunder.go index 6d1adbb87..a2838c0f1 100644 --- a/modules/plunder/model_plunder.go +++ b/modules/plunder/model_plunder.go @@ -39,9 +39,10 @@ func (this *modelPlunder) getPlunderData(uid string) (info *pb.DBPlunder, err er } if err == mgo.MongodbNil { info = &pb.DBPlunder{ - Id: primitive.NewObjectID().Hex(), - Uid: uid, - Ctime: configure.Now().Unix(), + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Ctime: configure.Now().Unix(), + Develop: make(map[int32]int32), } for i := 0; i < 3; i++ { // 队列固定三条 @@ -135,7 +136,7 @@ func (this *modelPlunder) queryPlunderInfos(uids []string, landid string) (data results = make([]*pb.DBPlunder, 0) mp = make(map[string]struct{}) - if _, err = this.Gets(uids, &results); err != nil { + if _, err = this.GetByUids(uids, &results); err != nil { this.module.Errorln(err) return } diff --git a/modules/plunder/model_record.go b/modules/plunder/model_record.go new file mode 100644 index 000000000..2b3b3727b --- /dev/null +++ b/modules/plunder/model_record.go @@ -0,0 +1,45 @@ +package plunder + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/modules" + "go_dreamfactory/pb" +) + +type modelRecord struct { + modules.MCompModel + module *Plunder +} + +func (this *modelRecord) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompModel.Init(service, module, comp, options) + this.TableName = comm.TablePlunderRecord + this.module = module.(*Plunder) + return +} + +func (this *modelRecord) getPlunderRecordData(id string) (info *pb.DBPlunderRecord, err error) { + info = &pb.DBPlunderRecord{} + if err = this.Get(id, info); err == mgo.MongodbNil { + info.Id = id + err = this.Add(id, info) + return + } + return +} + +func (this *modelRecord) changePlunderRecordData(id string, update map[string]interface{}) (err error) { + err = this.Change(id, update) + return +} + +// 新增一条记录 +func (this *modelRecord) AddRecordData(id string, info []*pb.PlunderRecordData) (err error) { + if record, err := this.getPlunderRecordData(id); err == nil { + record.Data = append(record.Data, info...) + err = this.changePlunderRecordData(id, map[string]interface{}{"data": record.Data}) + } + return +} diff --git a/modules/plunder/module.go b/modules/plunder/module.go index badd148b7..498054b9d 100644 --- a/modules/plunder/module.go +++ b/modules/plunder/module.go @@ -23,6 +23,7 @@ type Plunder struct { modelPlunder *modelPlunder modelLand *modelLand battle comm.IBattle + modelRecord *modelRecord } // 模块名 @@ -56,6 +57,7 @@ func (this *Plunder) OnInstallComp() { this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.modelPlunder = this.RegisterComp(new(modelPlunder)).(*modelPlunder) this.modelLand = this.RegisterComp(new(modelLand)).(*modelLand) + this.modelRecord = this.RegisterComp(new(modelRecord)).(*modelRecord) } func (this *Plunder) CreatePlunderLand(uid string) (land *pb.DBPlunderLand, err error) { diff --git a/modules/plunder/plunder_test.go b/modules/plunder/plunder_test.go new file mode 100644 index 000000000..d17f6795a --- /dev/null +++ b/modules/plunder/plunder_test.go @@ -0,0 +1,26 @@ +package plunder + +import "sort" + +//根据value排序 +type Pair struct { + Key string + Value int +} + +type PairList []Pair + +func (p PairList) Swap(i, j int) { p[i], p[j] = p[j], p[i] } +func (p PairList) Len() int { return len(p) } +func (p PairList) Less(i, j int) bool { return p[i].Value < p[j].Value } + +func sortMap(m map[string]int) PairList { + p := make(PairList, len(m)) + i := 0 + for k, v := range m { + p[i] = Pair{k, v} + i++ + } + sort.Sort(p) + return p +} diff --git a/modules/user/model_user.go b/modules/user/model_user.go index 86012de06..566cc8865 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -45,6 +45,9 @@ func (this *ModelUser) Init(service core.IService, module core.IModule, comp cor this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ Keys: bsonx.Doc{{Key: "merchantmoney", Value: bsonx.Int32(1)}}, }) + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "plunder", Value: bsonx.Int32(1)}}, + }) return } @@ -420,3 +423,36 @@ func (this *ModelUser) CleanUserConsumeMoney(session comm.IUserSession) (err err } return } + +func (this *ModelUser) AddUserHidenum(uid string, score int32) (err error) { + var ( + user *pb.DBUser + ) + user = &pb.DBUser{} + + if this.module.IsCross() { + var model *db.DBModel + if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil { + this.module.Errorln(err) + } else { + if err = model.Get(uid, user); err != nil { + this.module.Errorf("uid:%s err:%v", uid, err) + } + if err = model.Change(uid, map[string]interface{}{ + "plunder": user.Plunder + score, + }); err != nil { + this.module.Errorf("uid:%s err:%v", uid, err) + } + } + } else { + if err = this.Get(uid, user); err != nil { + this.module.Errorf("uid:%s err:%v", uid, err) + } + if err = this.Change(uid, map[string]interface{}{ + "plunder": user.Plunder + score, + }); err != nil { + this.module.Errorf("uid:%s err:%v", uid, err) + } + } + return +} diff --git a/modules/user/module.go b/modules/user/module.go index 08bf331b5..34620324a 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -1476,3 +1476,6 @@ func (this *User) PsConvertExp(ps int32) (res *cfg.Gameatn) { func (this *User) CleanUserConsumeMoney(session comm.IUserSession) (err error) { return this.modelUser.CleanUserConsumeMoney(session) } +func (this *User) AddUserHidenum(session comm.IUserSession, score int32) (err error) { + return this.modelUser.AddUserHidenum(session.GetUserId(), score) +} diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 7382f3f35..05bbe4739 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -480,6 +480,7 @@ const ( ErrorCode_PlundeShipCDIng ErrorCode = 5406 //掠夺cd中 ErrorCode_PlundeShipRunning ErrorCode = 5407 //运输中 ErrorCode_PlundeUnlock ErrorCode = 5408 //已解锁 + ErrorCode_PlundeAlreadyLearn ErrorCode = 5409 //重复学习 ) // Enum value maps for ErrorCode. @@ -895,6 +896,7 @@ var ( 5406: "PlundeShipCDIng", 5407: "PlundeShipRunning", 5408: "PlundeUnlock", + 5409: "PlundeAlreadyLearn", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -1307,6 +1309,7 @@ var ( "PlundeShipCDIng": 5406, "PlundeShipRunning": 5407, "PlundeUnlock": 5408, + "PlundeAlreadyLearn": 5409, } ) @@ -1341,7 +1344,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xb4, 0x4c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xcd, 0x4c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, @@ -1952,8 +1955,10 @@ var file_errorcode_proto_rawDesc = []byte{ 0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, 0x10, 0x9e, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55, - 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x6c, 0x75, 0x6e, + 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0xa1, + 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pb/plunder_db.pb.go b/pb/plunder_db.pb.go index c6ba5bfcc..6659db1e0 100644 --- a/pb/plunder_db.pb.go +++ b/pb/plunder_db.pb.go @@ -26,17 +26,19 @@ type DBPlunder struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` // - Landid string `protobuf:"bytes,3,opt,name=landid,proto3" json:"landid"` //掠夺岛 oid - Line []*TransportLine `protobuf:"bytes,4,rep,name=line,proto3" json:"line"` // 运输队列 - Count int32 `protobuf:"varint,5,opt,name=count,proto3" json:"count"` // 运输次数 - Source []int32 `protobuf:"varint,6,rep,packed,name=source,proto3" json:"source"` // 货源列表 - Setout []int32 `protobuf:"varint,7,rep,packed,name=setout,proto3" json:"setout"` // 已经出发的列表 - Refresh int32 `protobuf:"varint,8,opt,name=refresh,proto3" json:"refresh"` // 刷新次数 - Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"` // 刷新时间 客户端不用 - Score int32 `protobuf:"varint,10,opt,name=score,proto3" json:"score"` // 当前赛季积分 - Etime int64 `protobuf:"varint,11,opt,name=etime,proto3" json:"etime"` // 结束时间 + 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"` // + Landid string `protobuf:"bytes,3,opt,name=landid,proto3" json:"landid"` //掠夺岛 oid + Line []*TransportLine `protobuf:"bytes,4,rep,name=line,proto3" json:"line"` // 运输队列 + Count int32 `protobuf:"varint,5,opt,name=count,proto3" json:"count"` // 运输次数 + Source []int32 `protobuf:"varint,6,rep,packed,name=source,proto3" json:"source"` // 货源列表 + Setout []int32 `protobuf:"varint,7,rep,packed,name=setout,proto3" json:"setout"` // 已经出发的列表 + Refresh int32 `protobuf:"varint,8,opt,name=refresh,proto3" json:"refresh"` // 刷新次数 + Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"` // 刷新时间 客户端不用 + Score int32 `protobuf:"varint,10,opt,name=score,proto3" json:"score"` // 当前赛季积分 + Etime int64 `protobuf:"varint,11,opt,name=etime,proto3" json:"etime"` // 结束时间 + Plunderexp int32 `protobuf:"varint,12,opt,name=plunderexp,proto3" json:"plunderexp"` // 积分 排行用 + Develop map[int32]int32 `protobuf:"bytes,13,rep,name=develop,proto3" json:"develop" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 海航术 } func (x *DBPlunder) Reset() { @@ -148,6 +150,20 @@ func (x *DBPlunder) GetEtime() int64 { return 0 } +func (x *DBPlunder) GetPlunderexp() int32 { + if x != nil { + return x.Plunderexp + } + return 0 +} + +func (x *DBPlunder) GetDevelop() map[int32]int32 { + if x != nil { + return x.Develop + } + return nil +} + type TransportLine struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -373,7 +389,8 @@ type DBPlunderLand struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Uinfo map[int32]*BaseUserInfo `protobuf:"bytes,2,rep,name=uinfo,proto3" json:"uinfo" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 成员信息 key 岛位置 Ship map[string]*ShipData `protobuf:"bytes,3,rep,name=ship,proto3" json:"ship" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 运输的船 key 唯一id - Etime int64 `protobuf:"varint,4,opt,name=etime,proto3" json:"etime"` // 结束时间 + //map score= 4;// 排行榜积分用 + Etime int64 `protobuf:"varint,4,opt,name=etime,proto3" json:"etime"` // 结束时间 } func (x *DBPlunderLand) Reset() { @@ -436,6 +453,141 @@ func (x *DBPlunderLand) GetEtime() int64 { return 0 } +type PlunderRecordData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Itype int32 `protobuf:"varint,1,opt,name=itype,proto3" json:"itype"` // + P1 string `protobuf:"bytes,2,opt,name=p1,proto3" json:"p1"` // 玩家1 + P2 string `protobuf:"bytes,3,opt,name=p2,proto3" json:"p2"` + Cid int32 `protobuf:"varint,4,opt,name=cid,proto3" json:"cid"` // 配置表id + Ctime int64 `protobuf:"varint,5,opt,name=ctime,proto3" json:"ctime"` //记录时间 +} + +func (x *PlunderRecordData) Reset() { + *x = PlunderRecordData{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_db_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderRecordData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderRecordData) ProtoMessage() {} + +func (x *PlunderRecordData) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_db_proto_msgTypes[5] + 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 PlunderRecordData.ProtoReflect.Descriptor instead. +func (*PlunderRecordData) Descriptor() ([]byte, []int) { + return file_plunder_plunder_db_proto_rawDescGZIP(), []int{5} +} + +func (x *PlunderRecordData) GetItype() int32 { + if x != nil { + return x.Itype + } + return 0 +} + +func (x *PlunderRecordData) GetP1() string { + if x != nil { + return x.P1 + } + return "" +} + +func (x *PlunderRecordData) GetP2() string { + if x != nil { + return x.P2 + } + return "" +} + +func (x *PlunderRecordData) GetCid() int32 { + if x != nil { + return x.Cid + } + return 0 +} + +func (x *PlunderRecordData) GetCtime() int64 { + if x != nil { + return x.Ctime + } + return 0 +} + +// 掠夺记录 +type DBPlunderRecord struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Data []*PlunderRecordData `protobuf:"bytes,2,rep,name=data,proto3" json:"data"` // 记录详情 +} + +func (x *DBPlunderRecord) Reset() { + *x = DBPlunderRecord{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_db_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBPlunderRecord) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBPlunderRecord) ProtoMessage() {} + +func (x *DBPlunderRecord) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_db_proto_msgTypes[6] + 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 DBPlunderRecord.ProtoReflect.Descriptor instead. +func (*DBPlunderRecord) Descriptor() ([]byte, []int) { + return file_plunder_plunder_db_proto_rawDescGZIP(), []int{6} +} + +func (x *DBPlunderRecord) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBPlunderRecord) GetData() []*PlunderRecordData { + if x != nil { + return x.Data + } + return nil +} + var File_plunder_plunder_db_proto protoreflect.FileDescriptor var file_plunder_plunder_db_proto_rawDesc = []byte{ @@ -443,7 +595,7 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{ 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x8b, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x74, 0x6f, 0x22, 0x9a, 0x03, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 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, 0x16, 0x0a, 0x06, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, @@ -460,47 +612,67 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{ 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, - 0x22, 0x3f, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, - 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, - 0x65, 0x22, 0x5d, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, - 0x63, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, - 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, - 0x22, 0xac, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, - 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, - 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, - 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6c, 0x69, - 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, - 0x74, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22, - 0xa1, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, - 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, - 0x2e, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69, 0x6e, - 0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x18, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, - 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, - 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, - 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 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, + 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x78, 0x70, 0x18, 0x0c, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x78, 0x70, + 0x12, 0x31, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x18, 0x0d, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65, + 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x65, 0x76, 0x65, + 0x6c, 0x6f, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, + 0x3f, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, + 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, + 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, + 0x22, 0x5d, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x63, + 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a, + 0x03, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, + 0xac, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, + 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, + 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, + 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, + 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6c, 0x69, 0x65, + 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, + 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22, 0xa1, + 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x2f, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x19, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e, + 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, + 0x6f, 0x12, 0x2c, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x18, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e, + 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12, + 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, + 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, + 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, + 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x22, 0x71, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, + 0x02, 0x70, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x70, 0x31, 0x12, 0x0e, 0x0a, + 0x02, 0x70, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x70, 0x32, 0x12, 0x10, 0x0a, + 0x03, 0x63, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, + 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x49, 0x0a, 0x0f, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -515,31 +687,36 @@ func file_plunder_plunder_db_proto_rawDescGZIP() []byte { return file_plunder_plunder_db_proto_rawDescData } -var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_plunder_plunder_db_proto_goTypes = []interface{}{ (*DBPlunder)(nil), // 0: DBPlunder (*TransportLine)(nil), // 1: TransportLine (*PlunderLine)(nil), // 2: PlunderLine (*ShipData)(nil), // 3: ShipData (*DBPlunderLand)(nil), // 4: DBPlunderLand - nil, // 5: DBPlunderLand.UinfoEntry - nil, // 6: DBPlunderLand.ShipEntry - (*DBPlayerBattleFormt)(nil), // 7: DBPlayerBattleFormt - (*BaseUserInfo)(nil), // 8: BaseUserInfo + (*PlunderRecordData)(nil), // 5: PlunderRecordData + (*DBPlunderRecord)(nil), // 6: DBPlunderRecord + nil, // 7: DBPlunder.DevelopEntry + nil, // 8: DBPlunderLand.UinfoEntry + nil, // 9: DBPlunderLand.ShipEntry + (*DBPlayerBattleFormt)(nil), // 10: DBPlayerBattleFormt + (*BaseUserInfo)(nil), // 11: BaseUserInfo } var file_plunder_plunder_db_proto_depIdxs = []int32{ - 1, // 0: DBPlunder.line:type_name -> TransportLine - 2, // 1: ShipData.line:type_name -> PlunderLine - 7, // 2: ShipData.defend:type_name -> DBPlayerBattleFormt - 5, // 3: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry - 6, // 4: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry - 8, // 5: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo - 3, // 6: DBPlunderLand.ShipEntry.value:type_name -> ShipData - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name + 1, // 0: DBPlunder.line:type_name -> TransportLine + 7, // 1: DBPlunder.develop:type_name -> DBPlunder.DevelopEntry + 2, // 2: ShipData.line:type_name -> PlunderLine + 10, // 3: ShipData.defend:type_name -> DBPlayerBattleFormt + 8, // 4: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry + 9, // 5: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry + 5, // 6: DBPlunderRecord.data:type_name -> PlunderRecordData + 11, // 7: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo + 3, // 8: DBPlunderLand.ShipEntry.value:type_name -> ShipData + 9, // [9:9] is the sub-list for method output_type + 9, // [9:9] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_plunder_plunder_db_proto_init() } @@ -610,6 +787,30 @@ func file_plunder_plunder_db_proto_init() { return nil } } + file_plunder_plunder_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderRecordData); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_plunder_plunder_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBPlunderRecord); 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{ @@ -617,7 +818,7 @@ func file_plunder_plunder_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_plunder_plunder_db_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/plunder_msg.pb.go b/pb/plunder_msg.pb.go index 91a946e32..9581d37ce 100644 --- a/pb/plunder_msg.pb.go +++ b/pb/plunder_msg.pb.go @@ -739,6 +739,7 @@ type PlunderReachResp struct { Line []*TransportLine `protobuf:"bytes,1,rep,name=line,proto3" json:"line"` // 运输队列 Ship map[string]*ShipData `protobuf:"bytes,2,rep,name=ship,proto3" json:"ship" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 运输的船 key 唯一id + Atno []*UserAtno `protobuf:"bytes,3,rep,name=atno,proto3" json:"atno"` // 奖励 } func (x *PlunderReachResp) Reset() { @@ -787,6 +788,13 @@ func (x *PlunderReachResp) GetShip() map[string]*ShipData { return nil } +func (x *PlunderReachResp) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + return nil +} + // 修改状态 type PlunderClientTagReq struct { state protoimpl.MessageState @@ -1025,6 +1033,185 @@ func (x *PlunderUnlockResp) GetLine() []*TransportLine { return nil } +type PlunderDevelopReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Cid int32 `protobuf:"varint,1,opt,name=cid,proto3" json:"cid"` // +} + +func (x *PlunderDevelopReq) Reset() { + *x = PlunderDevelopReq{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderDevelopReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderDevelopReq) ProtoMessage() {} + +func (x *PlunderDevelopReq) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_msg_proto_msgTypes[19] + 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 PlunderDevelopReq.ProtoReflect.Descriptor instead. +func (*PlunderDevelopReq) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{19} +} + +func (x *PlunderDevelopReq) GetCid() int32 { + if x != nil { + return x.Cid + } + return 0 +} + +type PlunderDevelopResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Develop map[int32]int32 `protobuf:"bytes,1,rep,name=develop,proto3" json:"develop" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 海航术 +} + +func (x *PlunderDevelopResp) Reset() { + *x = PlunderDevelopResp{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderDevelopResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderDevelopResp) ProtoMessage() {} + +func (x *PlunderDevelopResp) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_msg_proto_msgTypes[20] + 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 PlunderDevelopResp.ProtoReflect.Descriptor instead. +func (*PlunderDevelopResp) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{20} +} + +func (x *PlunderDevelopResp) GetDevelop() map[int32]int32 { + if x != nil { + return x.Develop + } + return nil +} + +type PlunderRecordReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *PlunderRecordReq) Reset() { + *x = PlunderRecordReq{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderRecordReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderRecordReq) ProtoMessage() {} + +func (x *PlunderRecordReq) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_msg_proto_msgTypes[21] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PlunderRecordReq.ProtoReflect.Descriptor instead. +func (*PlunderRecordReq) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{21} +} + +type PlunderRecordResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Info *DBPlunderRecord `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` // 航海要事 +} + +func (x *PlunderRecordResp) Reset() { + *x = PlunderRecordResp{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderRecordResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderRecordResp) ProtoMessage() {} + +func (x *PlunderRecordResp) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_msg_proto_msgTypes[22] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PlunderRecordResp.ProtoReflect.Descriptor instead. +func (*PlunderRecordResp) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{22} +} + +func (x *PlunderRecordResp) GetInfo() *DBPlunderRecord { + if x != nil { + return x.Info + } + return nil +} + var File_plunder_plunder_msg_proto protoreflect.FileDescriptor var file_plunder_plunder_msg_proto_rawDesc = []byte{ @@ -1109,45 +1296,63 @@ var file_plunder_plunder_msg_proto_rawDesc = []byte{ 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x23, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, - 0xab, 0x01, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, + 0xca, 0x01, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, - 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, - 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, - 0x67, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x8f, 0x01, 0x0a, 0x14, 0x50, 0x6c, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x33, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, + 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, + 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, + 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, + 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, - 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, - 0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x50, 0x6c, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x30, - 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x50, - 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, - 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, - 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, - 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x22, 0x24, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x55, - 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x37, 0x0a, 0x11, 0x50, 0x6c, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x22, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, - 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, - 0x69, 0x6e, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x8f, 0x01, 0x0a, 0x14, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x33, + 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x50, + 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, + 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, + 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x30, 0x0a, + 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x50, 0x6c, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, + 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x1a, + 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, + 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0x24, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x55, 0x6e, + 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x37, 0x0a, 0x11, 0x50, 0x6c, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, + 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x54, + 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x25, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x44, 0x65, 0x76, + 0x65, 0x6c, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x50, 0x6c, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x3a, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x20, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x44, 0x65, 0x76, 0x65, 0x6c, + 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, + 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x12, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x11, + 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x10, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1162,7 +1367,7 @@ func file_plunder_plunder_msg_proto_rawDescGZIP() []byte { return file_plunder_plunder_msg_proto_rawDescData } -var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 24) +var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 29) var file_plunder_plunder_msg_proto_goTypes = []interface{}{ (*PlunderGetListReq)(nil), // 0: PlunderGetListReq (*PlunderGetListResp)(nil), // 1: PlunderGetListResp @@ -1183,48 +1388,57 @@ var file_plunder_plunder_msg_proto_goTypes = []interface{}{ (*PlunderChangePush)(nil), // 16: PlunderChangePush (*PlunderUnlockReq)(nil), // 17: PlunderUnlockReq (*PlunderUnlockResp)(nil), // 18: PlunderUnlockResp - nil, // 19: PlunderChallengeOverResp.ShipEntry - nil, // 20: PlunderChallengeOverResp.HeroexpEntry - nil, // 21: PlunderReachResp.ShipEntry - nil, // 22: PlunderClientTagResp.ShipEntry - nil, // 23: PlunderChangePush.ShipEntry - (*DBPlunder)(nil), // 24: DBPlunder - (*DBPlunderLand)(nil), // 25: DBPlunderLand - (*BattleFormation)(nil), // 26: BattleFormation - (*BattleInfo)(nil), // 27: BattleInfo - (*BattleReport)(nil), // 28: BattleReport - (*TransportLine)(nil), // 29: TransportLine - (*UserAtno)(nil), // 30: UserAtno - (*ShipData)(nil), // 31: ShipData + (*PlunderDevelopReq)(nil), // 19: PlunderDevelopReq + (*PlunderDevelopResp)(nil), // 20: PlunderDevelopResp + (*PlunderRecordReq)(nil), // 21: PlunderRecordReq + (*PlunderRecordResp)(nil), // 22: PlunderRecordResp + nil, // 23: PlunderChallengeOverResp.ShipEntry + nil, // 24: PlunderChallengeOverResp.HeroexpEntry + nil, // 25: PlunderReachResp.ShipEntry + nil, // 26: PlunderClientTagResp.ShipEntry + nil, // 27: PlunderChangePush.ShipEntry + nil, // 28: PlunderDevelopResp.DevelopEntry + (*DBPlunder)(nil), // 29: DBPlunder + (*DBPlunderLand)(nil), // 30: DBPlunderLand + (*BattleFormation)(nil), // 31: BattleFormation + (*BattleInfo)(nil), // 32: BattleInfo + (*BattleReport)(nil), // 33: BattleReport + (*TransportLine)(nil), // 34: TransportLine + (*UserAtno)(nil), // 35: UserAtno + (*DBPlunderRecord)(nil), // 36: DBPlunderRecord + (*ShipData)(nil), // 37: ShipData } var file_plunder_plunder_msg_proto_depIdxs = []int32{ - 24, // 0: PlunderGetListResp.list:type_name -> DBPlunder - 25, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand - 26, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation - 27, // 3: PlunderChallengeResp.info:type_name -> BattleInfo - 28, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport - 29, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine - 19, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry - 30, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno - 20, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry - 26, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation - 27, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo - 28, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport - 30, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno - 29, // 13: PlunderReachResp.line:type_name -> TransportLine - 21, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry - 22, // 15: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry - 23, // 16: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry - 29, // 17: PlunderUnlockResp.line:type_name -> TransportLine - 31, // 18: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData - 31, // 19: PlunderReachResp.ShipEntry.value:type_name -> ShipData - 31, // 20: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData - 31, // 21: PlunderChangePush.ShipEntry.value:type_name -> ShipData - 22, // [22:22] is the sub-list for method output_type - 22, // [22:22] is the sub-list for method input_type - 22, // [22:22] is the sub-list for extension type_name - 22, // [22:22] is the sub-list for extension extendee - 0, // [0:22] is the sub-list for field type_name + 29, // 0: PlunderGetListResp.list:type_name -> DBPlunder + 30, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand + 31, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation + 32, // 3: PlunderChallengeResp.info:type_name -> BattleInfo + 33, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport + 34, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine + 23, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry + 35, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno + 24, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry + 31, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation + 32, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo + 33, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport + 35, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno + 34, // 13: PlunderReachResp.line:type_name -> TransportLine + 25, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry + 35, // 15: PlunderReachResp.atno:type_name -> UserAtno + 26, // 16: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry + 27, // 17: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry + 34, // 18: PlunderUnlockResp.line:type_name -> TransportLine + 28, // 19: PlunderDevelopResp.develop:type_name -> PlunderDevelopResp.DevelopEntry + 36, // 20: PlunderRecordResp.info:type_name -> DBPlunderRecord + 37, // 21: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData + 37, // 22: PlunderReachResp.ShipEntry.value:type_name -> ShipData + 37, // 23: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData + 37, // 24: PlunderChangePush.ShipEntry.value:type_name -> ShipData + 25, // [25:25] is the sub-list for method output_type + 25, // [25:25] is the sub-list for method input_type + 25, // [25:25] is the sub-list for extension type_name + 25, // [25:25] is the sub-list for extension extendee + 0, // [0:25] is the sub-list for field type_name } func init() { file_plunder_plunder_msg_proto_init() } @@ -1464,6 +1678,54 @@ func file_plunder_plunder_msg_proto_init() { return nil } } + file_plunder_plunder_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderDevelopReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_plunder_plunder_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderDevelopResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_plunder_plunder_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderRecordReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_plunder_plunder_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderRecordResp); 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{ @@ -1471,7 +1733,7 @@ func file_plunder_plunder_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_plunder_plunder_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 24, + NumMessages: 29, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.ArenaActiveRewardData.go b/sys/configure/structs/Game.ArenaActiveRewardData.go index 4984ba7ea..318d0da10 100644 --- a/sys/configure/structs/Game.ArenaActiveRewardData.go +++ b/sys/configure/structs/Game.ArenaActiveRewardData.go @@ -16,6 +16,8 @@ type GameArenaActiveRewardData struct { ScoreUp int32 HumanNum int32 Name string + ExReward []*Gameatn + ScoreReturn int32 WinReward []*Gameatn Png string KValue float32 @@ -33,6 +35,21 @@ func (_v *GameArenaActiveRewardData)Deserialize(_buf map[string]interface{}) (er { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score_up"].(float64); !_ok_ { err = errors.New("score_up error"); return }; _v.ScoreUp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["human_num"].(float64); !_ok_ { err = errors.New("human_num error"); return }; _v.HumanNum = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["ex_reward"].([]interface{}); !_ok_ { err = errors.New("ex_reward error"); return } + + _v.ExReward = 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.ExReward = append(_v.ExReward, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score_return"].(float64); !_ok_ { err = errors.New("score_return error"); return }; _v.ScoreReturn = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.ArenaRankRewardData.go b/sys/configure/structs/Game.ArenaRankRewardData.go index 780dcd7aa..f2d0c34ed 100644 --- a/sys/configure/structs/Game.ArenaRankRewardData.go +++ b/sys/configure/structs/Game.ArenaRankRewardData.go @@ -12,6 +12,7 @@ import "errors" type GameArenaRankRewardData struct { Id int32 + Name int32 RankLow int32 RankUp int32 RankDisplay string @@ -26,6 +27,7 @@ func (*GameArenaRankRewardData) GetTypeId() int32 { func (_v *GameArenaRankRewardData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["name"].(float64); !_ok_ { err = errors.New("name error"); return }; _v.Name = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_low"].(float64); !_ok_ { err = errors.New("rank_low error"); return }; _v.RankLow = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_up"].(float64); !_ok_ { err = errors.New("rank_up error"); return }; _v.RankUp = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["rank_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RankDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RankDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } diff --git a/sys/configure/structs/Game.PlunderDevelop.go b/sys/configure/structs/Game.PlunderDevelop.go new file mode 100644 index 000000000..2dc708beb --- /dev/null +++ b/sys/configure/structs/Game.PlunderDevelop.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GamePlunderDevelop struct { + _dataMap map[int32]*GamePlunderDevelopData + _dataList []*GamePlunderDevelopData +} + +func NewGamePlunderDevelop(_buf []map[string]interface{}) (*GamePlunderDevelop, error) { + _dataList := make([]*GamePlunderDevelopData, 0, len(_buf)) + dataMap := make(map[int32]*GamePlunderDevelopData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePlunderDevelopData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GamePlunderDevelop{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePlunderDevelop) GetDataMap() map[int32]*GamePlunderDevelopData { + return table._dataMap +} + +func (table *GamePlunderDevelop) GetDataList() []*GamePlunderDevelopData { + return table._dataList +} + +func (table *GamePlunderDevelop) Get(key int32) *GamePlunderDevelopData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PlunderDevelopData.go b/sys/configure/structs/Game.PlunderDevelopData.go new file mode 100644 index 000000000..ae5364013 --- /dev/null +++ b/sys/configure/structs/Game.PlunderDevelopData.go @@ -0,0 +1,79 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GamePlunderDevelopData struct { + Id int32 + Itype int32 + Name string + Open []int32 + Last []int32 + Icon string + Place int32 + Type int32 + BuffID int32 + Txt string +} + +const TypeId_GamePlunderDevelopData = -2120757465 + +func (*GamePlunderDevelopData) GetTypeId() int32 { + return -2120757465 +} + +func (_v *GamePlunderDevelopData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["itype"].(float64); !_ok_ { err = errors.New("itype error"); return }; _v.Itype = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["open"].([]interface{}); !_ok_ { err = errors.New("open error"); return } + + _v.Open = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Open = append(_v.Open, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["last"].([]interface{}); !_ok_ { err = errors.New("last error"); return } + + _v.Last = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Last = append(_v.Last, _list_v_) + } + } + + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["place"].(float64); !_ok_ { err = errors.New("place error"); return }; _v.Place = int32(_tempNum_) } + { 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["buffID"].(float64); !_ok_ { err = errors.New("buffID error"); return }; _v.BuffID = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + return +} + +func DeserializeGamePlunderDevelopData(_buf map[string]interface{}) (*GamePlunderDevelopData, error) { + v := &GamePlunderDevelopData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 74f89596a..648100bf5 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -346,6 +346,7 @@ type Tables struct { FightingSkill *GameFightingSkill FightingSkillStar *GameFightingSkillStar ExpeditionBoss *GameExpeditionBoss + PlunderDevelop *GamePlunderDevelop } func NewTables(loader JsonLoader) (*Tables, error) { @@ -2363,5 +2364,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.ExpeditionBoss, err = NewGameExpeditionBoss(buf) ; err != nil { return nil, err } + if buf, err = loader("game_plunderdevelop") ; err != nil { + return nil, err + } + if tables.PlunderDevelop, err = NewGamePlunderDevelop(buf) ; err != nil { + return nil, err + } return tables, nil }