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 70425c7a9..ae4ea72dc 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -31618,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,
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index b20f1fe15..ef3185996 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -40074,7 +40074,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
- "key": "main_stage_bubbletext_260",
+ "key": "main_stage_bubbletext_261",
"text": "呃呃呃，好冷啊……！！"
},
"animation": [],
@@ -40155,7 +40155,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
- "key": "main_stage_bubbletext_261",
+ "key": "main_stage_bubbletext_262",
"text": "吼吼吼——"
},
"animation": [],
@@ -40236,7 +40236,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
- "key": "main_stage_bubbletext_262",
+ "key": "main_stage_bubbletext_263",
"text": "哦，我的奥丁神啊！！"
},
"animation": [],
@@ -40317,7 +40317,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
- "key": "main_stage_bubbletext_263",
+ "key": "main_stage_bubbletext_264",
"text": "小嗝嗝，快来帮忙。"
},
"animation": [],
@@ -40446,7 +40446,7 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
- "key": "main_stage_bubbletext_264",
+ "key": "main_stage_bubbletext_265",
"text": "好端端的，龙群怎么会感染瘟疫？"
},
"animation": [],
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index 0ccf78645..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,
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/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/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_plunder.go b/modules/plunder/model_plunder.go
index 6d1adbb87..bbbbb732c 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++ { // 队列固定三条
diff --git a/pb/chat_db.pb.go b/pb/chat_db.pb.go
index d1c8b51a7..491fc39d9 100644
--- a/pb/chat_db.pb.go
+++ b/pb/chat_db.pb.go
@@ -87,7 +87,7 @@ const (
ChatType_ItemShare ChatType = 5 //道具分享
ChatType_Parkour ChatType = 6 //捕羊大赛邀请
ChatType_Questionnaire ChatType = 7 //问答分享
- ChatType_XxlRoom ChatType = 8 //三消房间分享类型
+ ChatType_XxlRoom ChatType = 8 // 三消房间分享类型
)
// Enum value maps for ChatType.
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 a0873ff13..8051063a7 100644
--- a/pb/plunder_db.pb.go
+++ b/pb/plunder_db.pb.go
@@ -26,18 +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"` // 结束时间
- Plunderexp int32 `protobuf:"varint,12,opt,name=plunderexp,proto3" json:"plunderexp"` // 积分 排行用
+ 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() {
@@ -156,6 +157,13 @@ func (x *DBPlunder) GetPlunderexp() int32 {
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
@@ -452,7 +460,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, 0xab, 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,
@@ -471,47 +479,54 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{
0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65,
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,
- 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, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x33,
}
var (
@@ -526,31 +541,33 @@ 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, 8)
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
+ nil, // 5: DBPlunder.DevelopEntry
+ nil, // 6: DBPlunderLand.UinfoEntry
+ nil, // 7: DBPlunderLand.ShipEntry
+ (*DBPlayerBattleFormt)(nil), // 8: DBPlayerBattleFormt
+ (*BaseUserInfo)(nil), // 9: 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
+ 5, // 1: DBPlunder.develop:type_name -> DBPlunder.DevelopEntry
+ 2, // 2: ShipData.line:type_name -> PlunderLine
+ 8, // 3: ShipData.defend:type_name -> DBPlayerBattleFormt
+ 6, // 4: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry
+ 7, // 5: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry
+ 9, // 6: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo
+ 3, // 7: DBPlunderLand.ShipEntry.value:type_name -> ShipData
+ 8, // [8:8] is the sub-list for method output_type
+ 8, // [8:8] is the sub-list for method input_type
+ 8, // [8:8] is the sub-list for extension type_name
+ 8, // [8:8] is the sub-list for extension extendee
+ 0, // [0:8] is the sub-list for field type_name
}
func init() { file_plunder_plunder_db_proto_init() }
@@ -628,7 +645,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: 8,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/plunder_msg.pb.go b/pb/plunder_msg.pb.go
index 795dd6b8a..e2f040037 100644
--- a/pb/plunder_msg.pb.go
+++ b/pb/plunder_msg.pb.go
@@ -1033,6 +1033,100 @@ 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
+}
+
var File_plunder_plunder_msg_proto protoreflect.FileDescriptor
var file_plunder_plunder_msg_proto_rawDesc = []byte{
@@ -1156,8 +1250,19 @@ var file_plunder_plunder_msg_proto_rawDesc = []byte{
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,
+ 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+ 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -1172,7 +1277,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, 27)
var file_plunder_plunder_msg_proto_goTypes = []interface{}{
(*PlunderGetListReq)(nil), // 0: PlunderGetListReq
(*PlunderGetListResp)(nil), // 1: PlunderGetListResp
@@ -1193,49 +1298,53 @@ 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
+ nil, // 21: PlunderChallengeOverResp.ShipEntry
+ nil, // 22: PlunderChallengeOverResp.HeroexpEntry
+ nil, // 23: PlunderReachResp.ShipEntry
+ nil, // 24: PlunderClientTagResp.ShipEntry
+ nil, // 25: PlunderChangePush.ShipEntry
+ nil, // 26: PlunderDevelopResp.DevelopEntry
+ (*DBPlunder)(nil), // 27: DBPlunder
+ (*DBPlunderLand)(nil), // 28: DBPlunderLand
+ (*BattleFormation)(nil), // 29: BattleFormation
+ (*BattleInfo)(nil), // 30: BattleInfo
+ (*BattleReport)(nil), // 31: BattleReport
+ (*TransportLine)(nil), // 32: TransportLine
+ (*UserAtno)(nil), // 33: UserAtno
+ (*ShipData)(nil), // 34: 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
- 30, // 15: PlunderReachResp.atno:type_name -> UserAtno
- 22, // 16: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry
- 23, // 17: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry
- 29, // 18: PlunderUnlockResp.line:type_name -> TransportLine
- 31, // 19: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData
- 31, // 20: PlunderReachResp.ShipEntry.value:type_name -> ShipData
- 31, // 21: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData
- 31, // 22: PlunderChangePush.ShipEntry.value:type_name -> ShipData
- 23, // [23:23] is the sub-list for method output_type
- 23, // [23:23] is the sub-list for method input_type
- 23, // [23:23] is the sub-list for extension type_name
- 23, // [23:23] is the sub-list for extension extendee
- 0, // [0:23] is the sub-list for field type_name
+ 27, // 0: PlunderGetListResp.list:type_name -> DBPlunder
+ 28, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand
+ 29, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation
+ 30, // 3: PlunderChallengeResp.info:type_name -> BattleInfo
+ 31, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport
+ 32, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine
+ 21, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry
+ 33, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno
+ 22, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry
+ 29, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation
+ 30, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo
+ 31, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport
+ 33, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno
+ 32, // 13: PlunderReachResp.line:type_name -> TransportLine
+ 23, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry
+ 33, // 15: PlunderReachResp.atno:type_name -> UserAtno
+ 24, // 16: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry
+ 25, // 17: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry
+ 32, // 18: PlunderUnlockResp.line:type_name -> TransportLine
+ 26, // 19: PlunderDevelopResp.develop:type_name -> PlunderDevelopResp.DevelopEntry
+ 34, // 20: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData
+ 34, // 21: PlunderReachResp.ShipEntry.value:type_name -> ShipData
+ 34, // 22: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData
+ 34, // 23: PlunderChangePush.ShipEntry.value:type_name -> ShipData
+ 24, // [24:24] is the sub-list for method output_type
+ 24, // [24:24] is the sub-list for method input_type
+ 24, // [24:24] is the sub-list for extension type_name
+ 24, // [24:24] is the sub-list for extension extendee
+ 0, // [0:24] is the sub-list for field type_name
}
func init() { file_plunder_plunder_msg_proto_init() }
@@ -1475,6 +1584,30 @@ 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
+ }
+ }
}
type x struct{}
out := protoimpl.TypeBuilder{
@@ -1482,7 +1615,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: 27,
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
}