diff --git a/bin/json/game_activeking.json b/bin/json/game_activeking.json
new file mode 100644
index 000000000..63a4d6a30
--- /dev/null
+++ b/bin/json/game_activeking.json
@@ -0,0 +1,82 @@
+[
+ {
+ "lv_id": 1,
+ "place": 300,
+ "name": {
+ "key": "arena_active_king_name_1",
+ "text": "王者一"
+ },
+ "png": "smithy_atk_5",
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 23
+ }
+ ]
+ },
+ {
+ "lv_id": 2,
+ "place": 250,
+ "name": {
+ "key": "arena_active_king_name_2",
+ "text": "王者二"
+ },
+ "png": "smithy_atk_5",
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 24
+ }
+ ]
+ },
+ {
+ "lv_id": 3,
+ "place": 200,
+ "name": {
+ "key": "arena_active_king_name_3",
+ "text": "王者三"
+ },
+ "png": "smithy_atk_5",
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 25
+ }
+ ]
+ },
+ {
+ "lv_id": 4,
+ "place": 100,
+ "name": {
+ "key": "arena_active_king_name_4",
+ "text": "王者四"
+ },
+ "png": "smithy_atk_5",
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 26
+ }
+ ]
+ },
+ {
+ "lv_id": 5,
+ "place": 50,
+ "name": {
+ "key": "arena_active_king_name_5",
+ "text": "王者五"
+ },
+ "png": "smithy_atk_5",
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 27
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_activereward.json b/bin/json/game_activereward.json
index b31f17e46..4db72bf9a 100644
--- a/bin/json/game_activereward.json
+++ b/bin/json/game_activereward.json
@@ -4,9 +4,9 @@
"active": 40,
"reword": [
{
- "a": "attr",
- "t": "diamond",
- "n": 150
+ "a": "item",
+ "t": "26000002",
+ "n": 1
}
],
"action": "main_weektask_action_1_act",
@@ -17,14 +17,9 @@
"active": 80,
"reword": [
{
- "a": "attr",
- "t": "diamond",
- "n": 150
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 500000
+ "a": "item",
+ "t": "26000003",
+ "n": 1
}
],
"action": "main_weektask_action_1_act",
@@ -35,14 +30,9 @@
"active": 120,
"reword": [
{
- "a": "attr",
- "t": "diamond",
- "n": 150
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 600000
+ "a": "item",
+ "t": "26000004",
+ "n": 1
}
],
"action": "main_weektask_action_1_act",
@@ -53,14 +43,9 @@
"active": 160,
"reword": [
{
- "a": "attr",
- "t": "diamond",
- "n": 150
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 600000
+ "a": "item",
+ "t": "26000005",
+ "n": 1
}
],
"action": "main_weektask_action_1_act",
diff --git a/bin/json/game_arenaactivereward.json b/bin/json/game_arenaactivereward.json
index 9644852a6..fa347656f 100644
--- a/bin/json/game_arenaactivereward.json
+++ b/bin/json/game_arenaactivereward.json
@@ -15,7 +15,14 @@
"n": 10
}
],
- "score_return": 0,
+ "score_return": -1,
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 10
+ }
+ ],
"win_reward": [
{
"a": "attr",
@@ -42,7 +49,14 @@
"n": 10
}
],
- "score_return": 0,
+ "score_return": -1,
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 12
+ }
+ ],
"win_reward": [
{
"a": "attr",
@@ -70,6 +84,13 @@
}
],
"score_return": 800,
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 14
+ }
+ ],
"win_reward": [
{
"a": "attr",
@@ -97,6 +118,13 @@
}
],
"score_return": 1300,
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 16
+ }
+ ],
"win_reward": [
{
"a": "attr",
@@ -124,6 +152,13 @@
}
],
"score_return": 1600,
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 18
+ }
+ ],
"win_reward": [
{
"a": "attr",
@@ -151,6 +186,13 @@
}
],
"score_return": 2200,
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 20
+ }
+ ],
"win_reward": [
{
"a": "attr",
@@ -178,6 +220,13 @@
}
],
"score_return": 2800,
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 22
+ }
+ ],
"win_reward": [
{
"a": "attr",
@@ -205,6 +254,13 @@
}
],
"score_return": 3700,
+ "reward_week": [
+ {
+ "a": "attr",
+ "t": "arenacoin",
+ "n": 22
+ }
+ ],
"win_reward": [
{
"a": "attr",
diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json
index 2b121227d..8dbe5d8a3 100644
--- a/bin/json/game_battleready.json
+++ b/bin/json/game_battleready.json
@@ -2291,6 +2291,41 @@
"CanFriendHelp": true,
"Numrounds": 0
},
+ {
+ "id": 10106003,
+ "PlayType": 1,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_05",
+ "battleScenes": [
+ "scenesfight_12"
+ ],
+ "BGMusic": "",
+ "LoadingId": 0,
+ "HideAlienSpace": false,
+ "HideFightUI": false,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "BattleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [],
+ "ScoreGroupID": 0,
+ "disableAiCamera": false,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 720008,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "RedAssistTeam": 0,
+ "BlueAssistTeam": 0,
+ "CanFriendHelp": true,
+ "Numrounds": 0
+ },
{
"id": 10104001,
"PlayType": 1,
@@ -3919,5 +3954,180 @@
"BlueAssistTeam": 0,
"CanFriendHelp": false,
"Numrounds": 0
+ },
+ {
+ "id": 10103201,
+ "PlayType": 1,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_03",
+ "battleScenes": [
+ "scenesfight_05_01"
+ ],
+ "BGMusic": "",
+ "LoadingId": 0,
+ "HideAlienSpace": false,
+ "HideFightUI": false,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "BattleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [],
+ "ScoreGroupID": 0,
+ "disableAiCamera": false,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 102611,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "RedAssistTeam": 0,
+ "BlueAssistTeam": 0,
+ "CanFriendHelp": false,
+ "Numrounds": 0
+ },
+ {
+ "id": 10103202,
+ "PlayType": 1,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_03",
+ "battleScenes": [
+ "scenesfight_05_01"
+ ],
+ "BGMusic": "",
+ "LoadingId": 0,
+ "HideAlienSpace": false,
+ "HideFightUI": false,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "BattleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [],
+ "ScoreGroupID": 0,
+ "disableAiCamera": false,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 102621,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "RedAssistTeam": 0,
+ "BlueAssistTeam": 0,
+ "CanFriendHelp": false,
+ "Numrounds": 0
+ },
+ {
+ "id": 10103203,
+ "PlayType": 1,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_03",
+ "battleScenes": [
+ "scenesfight_05_01"
+ ],
+ "BGMusic": "",
+ "LoadingId": 0,
+ "HideAlienSpace": false,
+ "HideFightUI": false,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "BattleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [],
+ "ScoreGroupID": 0,
+ "disableAiCamera": false,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 102631,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "RedAssistTeam": 0,
+ "BlueAssistTeam": 0,
+ "CanFriendHelp": false,
+ "Numrounds": 0
+ },
+ {
+ "id": 10103204,
+ "PlayType": 1,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_02",
+ "battleScenes": [
+ "bossfight_spinymandrilla_02"
+ ],
+ "BGMusic": "",
+ "LoadingId": 0,
+ "HideAlienSpace": false,
+ "HideFightUI": false,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "BattleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [],
+ "ScoreGroupID": 0,
+ "disableAiCamera": false,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 102641,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "RedAssistTeam": 0,
+ "BlueAssistTeam": 0,
+ "CanFriendHelp": false,
+ "Numrounds": 0
+ },
+ {
+ "id": 10103205,
+ "PlayType": 1,
+ "HeroCount": 5,
+ "readyScene": "scenesfight_role_interface_02",
+ "battleScenes": [
+ "bossfight_spinymandrilla_02"
+ ],
+ "BGMusic": "",
+ "LoadingId": 0,
+ "HideAlienSpace": false,
+ "HideFightUI": false,
+ "RuleTips": {
+ "key": "",
+ "text": ""
+ },
+ "BattleTips": {
+ "key": "",
+ "text": ""
+ },
+ "battleEvents": [],
+ "ScoreGroupID": 0,
+ "disableAiCamera": false,
+ "ChoseCamp": [],
+ "DisableCamp": [],
+ "DefaultHero": 102651,
+ "ChoseHero": [],
+ "DisableHero": [],
+ "LockSlots": [],
+ "HeroCheck": [],
+ "RedAssistTeam": 0,
+ "BlueAssistTeam": 0,
+ "CanFriendHelp": false,
+ "Numrounds": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_block.json b/bin/json/game_block.json
index 7ea8386a4..3c1308603 100644
--- a/bin/json/game_block.json
+++ b/bin/json/game_block.json
@@ -105,7 +105,9 @@
"key": 7,
"color": 1,
"excolor": 7,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 1,
"open": 2,
"icon": "sx_sjt_dhs",
@@ -139,7 +141,9 @@
"key": 9,
"color": 2,
"excolor": 7,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 1,
"open": 4,
"icon": "sx_sjt_ls",
@@ -173,7 +177,9 @@
"key": 11,
"color": 3,
"excolor": 7,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 1,
"open": 6,
"icon": "sx_sjt_lvs",
@@ -207,7 +213,9 @@
"key": 13,
"color": 4,
"excolor": 7,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 1,
"open": 8,
"icon": "sx_sjt_zs",
@@ -241,7 +249,9 @@
"key": 15,
"color": 5,
"excolor": 7,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 1,
"open": 10,
"icon": "sx_sjt_hs",
@@ -275,7 +285,9 @@
"key": 17,
"color": 6,
"excolor": 7,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 1,
"open": 12,
"icon": "sx_sjt_fhs",
@@ -547,7 +559,9 @@
"key": 33,
"color": 1,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 3
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_xyh_dhs",
@@ -564,7 +578,9 @@
"key": 34,
"color": 1,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_zyh_dhs",
@@ -581,7 +597,9 @@
"key": 35,
"color": 1,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 2
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_yyh_dhs",
@@ -615,7 +633,9 @@
"key": 37,
"color": 2,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 3
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_xyh_ls",
@@ -632,7 +652,9 @@
"key": 38,
"color": 2,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_zyh_ls",
@@ -649,7 +671,9 @@
"key": 39,
"color": 2,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 2
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_yyh_ls",
@@ -683,7 +707,9 @@
"key": 41,
"color": 3,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 3
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_xyh_lvs",
@@ -700,7 +726,9 @@
"key": 42,
"color": 3,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_zyh_lvs",
@@ -717,7 +745,9 @@
"key": 43,
"color": 3,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 2
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_yyh_lvs",
@@ -751,7 +781,9 @@
"key": 45,
"color": 4,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 3
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_xyh_zs",
@@ -768,7 +800,9 @@
"key": 46,
"color": 4,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_zyh_zs",
@@ -785,7 +819,9 @@
"key": 47,
"color": 4,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 2
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_yyh_zs",
@@ -819,7 +855,9 @@
"key": 49,
"color": 5,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 3
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_xyh_hs",
@@ -836,7 +874,9 @@
"key": 50,
"color": 5,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_zyh_hs",
@@ -853,7 +893,9 @@
"key": 51,
"color": 5,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 2
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_yyh_hs",
@@ -887,7 +929,9 @@
"key": 53,
"color": 6,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 3
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_xyh_fhs",
@@ -904,7 +948,9 @@
"key": 54,
"color": 6,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 1
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_zyh_fhs",
@@ -921,7 +967,9 @@
"key": 55,
"color": 6,
"excolor": 11,
- "direction": [],
+ "direction": [
+ 2
+ ],
"belongto": 4,
"open": 1,
"icon": "sx_yyh_fhs",
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index ae4ea72dc..0aaef03ce 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -30005,9 +30005,7 @@
"text": ""
},
"value": 1,
- "filter": [
- 9999
- ],
+ "filter": [],
"filter2": []
},
{
@@ -30037,9 +30035,7 @@
"text": ""
},
"value": 1,
- "filter": [
- 9999
- ],
+ "filter": [],
"filter2": []
},
{
@@ -30479,7 +30475,7 @@
"key": "buried_buried_condi_tasktxt_994",
"text": "主线关卡通关达到第3章的第4关开启"
},
- "type": 252,
+ "type": 20,
"valid": 0,
"head": {
"a": "attr",
diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index ad088a483..4e2b92a5e 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -1172,9 +1172,7 @@
{
"id": 206,
"insert": 2,
- "filter": [
- "eq"
- ]
+ "filter": []
},
{
"id": 207,
diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json
index bdf10a39b..e3473c7d0 100644
--- a/bin/json/game_combatmanster.json
+++ b/bin/json/game_combatmanster.json
@@ -406,7 +406,7 @@
"sencenstory": [],
"time": 0,
"clickstory": 0,
- "BattleReadyID": 10103001,
+ "BattleReadyID": 10106001,
"formatList": [
103051
],
@@ -418,7 +418,7 @@
"sencenstory": [],
"time": 0,
"clickstory": 0,
- "BattleReadyID": 10103001,
+ "BattleReadyID": 10106001,
"formatList": [
103061
],
diff --git a/bin/json/game_consumehero.json b/bin/json/game_consumehero.json
index 56b0a9355..5962cde07 100644
--- a/bin/json/game_consumehero.json
+++ b/bin/json/game_consumehero.json
@@ -17,7 +17,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_01",
- "text": "胡德的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "胡德的胜者为王守护者卡片。
获得守护者胡德后可以购买该桌游卡。
提升守护者胡德的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_01",
@@ -82,7 +82,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_02",
- "text": "匹诺曹的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "匹诺曹的胜者为王守护者卡片。
获得守护者匹诺曹后可以购买该桌游卡。
提升守护者匹诺曹的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_02",
@@ -147,7 +147,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_03",
- "text": "姜饼人的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "姜饼人的胜者为王守护者卡片。
获得守护者姜饼人后可以购买该桌游卡。
提升守护者姜饼人的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_03",
@@ -212,7 +212,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_04",
- "text": "法夸德勋爵的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "法夸德勋爵的胜者为王守护者卡片。
获得守护者法夸德勋爵后可以购买该桌游卡。
提升守护者法夸德勋爵的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_04",
@@ -283,7 +283,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_05",
- "text": "大大的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "大大的胜者为王守护者卡片。
获得守护者大大后可以购买该桌游卡。
提升守护者大大的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_05",
@@ -354,7 +354,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_06",
- "text": "船长的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "船长的胜者为王守护者卡片。
获得守护者船长后可以购买该桌游卡。
提升守护者船长的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_06",
@@ -425,7 +425,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_07",
- "text": "警长的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "警长的胜者为王守护者卡片。
获得守护者警长后可以购买该桌游卡。
提升守护者警长的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_07",
@@ -496,7 +496,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_08",
- "text": "阿宝的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "阿宝的胜者为王守护者卡片。
获得守护者阿宝后可以购买该桌游卡。
提升守护者阿宝的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_08",
@@ -567,7 +567,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_09",
- "text": "师父的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "师父的胜者为王守护者卡片。
获得守护者师父后可以购买该桌游卡。
提升守护者师父的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_09",
@@ -638,7 +638,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_10",
- "text": "骇客蛛的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "骇客蛛的胜者为王守护者卡片。
获得守护者骇客蛛后可以购买该桌游卡。
提升守护者骇客蛛的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_10",
@@ -709,7 +709,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_11",
- "text": "悍娇虎的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "悍娇虎的胜者为王守护者卡片。
获得守护者悍娇虎后可以购买该桌游卡。
提升守护者悍娇虎的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_11",
@@ -780,7 +780,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_12",
- "text": "盖的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "盖的胜者为王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_12",
@@ -851,7 +851,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_13",
- "text": "菲奥娜的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "菲奥娜的胜者为王守护者卡片。
获得守护者菲奥娜后可以购买该桌游卡。
提升守护者菲奥娜的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_13",
@@ -922,7 +922,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_14",
- "text": "穿靴子的猫的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "穿靴子的猫的胜者为王守护者卡片。
获得守护者穿靴子的猫后可以购买该桌游卡。
提升守护者穿靴子的猫的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_14",
@@ -993,7 +993,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_15",
- "text": "乌龟大师的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "乌龟大师的胜者为王守护者卡片。
获得守护者乌龟大师后可以购买该桌游卡。
提升守护者乌龟大师的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_15",
@@ -1064,7 +1064,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_16",
- "text": "冰霜杰克的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "冰霜杰克的胜者为王守护者卡片。
获得守护者冰霜杰克后可以购买该桌游卡。
提升守护者冰霜杰克的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_16",
@@ -1135,7 +1135,7 @@
},
"intr": {
"key": "consume_consume_hero_intr_17",
- "text": "漆黑的巅峰之王守护者卡片。
获得守护者盖后可以购买该桌游卡。
提升守护者盖的觉醒等级可以降低失败后的销毁概率。"
+ "text": "漆黑的胜者为王守护者卡片。
获得守护者漆黑后可以购买该桌游卡。
提升守护者漆黑的觉醒等级可以降低失败后的销毁概率。"
},
"skillname": {
"key": "consume_consume_hero_skillname_17",
diff --git a/bin/json/game_expeditionboss.json b/bin/json/game_expeditionboss.json
index 303cad2e4..03875a5e1 100644
--- a/bin/json/game_expeditionboss.json
+++ b/bin/json/game_expeditionboss.json
@@ -3,12 +3,12 @@
"boss_id": 50000001,
"boss_name": {
"key": "guild_guild_boss_boss_name_1",
- "text": "希卡普"
+ "text": "格里斯特王子"
},
"boss_lv": 1,
"serial": 1,
"fighting": 1000,
- "boss_img": 11009,
+ "boss_img": 14007,
"kill_reward": 1004,
"fail_reward": [
{
@@ -32,18 +32,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000002,
"boss_name": {
"key": "guild_guild_boss_boss_name_2",
- "text": "波比"
+ "text": "吉姆·莱克"
},
"boss_lv": 1,
"serial": 2,
"fighting": 1200,
- "boss_img": 11009,
+ "boss_img": 15001,
"kill_reward": 1005,
"fail_reward": [
{
@@ -67,18 +84,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000003,
"boss_name": {
"key": "guild_guild_boss_boss_name_3",
- "text": "阿宝"
+ "text": "船长"
},
"boss_lv": 1,
"serial": 3,
"fighting": 1440,
- "boss_img": 11009,
+ "boss_img": 15002,
"kill_reward": 1006,
"fail_reward": [
{
@@ -102,18 +136,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000004,
"boss_name": {
"key": "guild_guild_boss_boss_name_4",
- "text": "希卡普"
+ "text": "希沙窦斯"
},
"boss_lv": 1,
"serial": 4,
"fighting": 1728,
- "boss_img": 11009,
+ "boss_img": 15003,
"kill_reward": 1007,
"fail_reward": [
{
@@ -137,18 +188,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000005,
"boss_name": {
"key": "guild_guild_boss_boss_name_5",
- "text": "波比"
+ "text": "小欧"
},
"boss_lv": 1,
"serial": 5,
"fighting": 2073,
- "boss_img": 11009,
+ "boss_img": 15004,
"kill_reward": 1008,
"fail_reward": [
{
@@ -172,18 +240,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000006,
"boss_name": {
"key": "guild_guild_boss_boss_name_6",
- "text": "阿宝"
+ "text": "警长"
},
"boss_lv": 1,
"serial": 6,
"fighting": 2487,
- "boss_img": 11009,
+ "boss_img": 24001,
"kill_reward": 1009,
"fail_reward": [
{
@@ -207,18 +292,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000007,
"boss_name": {
"key": "guild_guild_boss_boss_name_7",
- "text": "希卡普"
+ "text": "牙仙"
},
"boss_lv": 1,
"serial": 7,
"fighting": 2984,
- "boss_img": 11009,
+ "boss_img": 24002,
"kill_reward": 1010,
"fail_reward": [
{
@@ -242,18 +344,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000008,
"boss_name": {
"key": "guild_guild_boss_boss_name_8",
- "text": "波比"
+ "text": "睡神沙人"
},
"boss_lv": 2,
"serial": 1,
"fighting": 3580,
- "boss_img": 11009,
+ "boss_img": 24003,
"kill_reward": 1011,
"fail_reward": [
{
@@ -277,18 +396,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000009,
"boss_name": {
"key": "guild_guild_boss_boss_name_9",
- "text": "阿宝"
+ "text": "邦尼兔"
},
"boss_lv": 2,
"serial": 2,
"fighting": 4296,
- "boss_img": 11009,
+ "boss_img": 24004,
"kill_reward": 1012,
"fail_reward": [
{
@@ -312,18 +448,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000010,
"boss_name": {
"key": "guild_guild_boss_boss_name_10",
- "text": "希卡普"
+ "text": "金猴"
},
"boss_lv": 2,
"serial": 3,
"fighting": 5155,
- "boss_img": 11009,
+ "boss_img": 24005,
"kill_reward": 1013,
"fail_reward": [
{
@@ -347,18 +500,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000011,
"boss_name": {
"key": "guild_guild_boss_boss_name_11",
- "text": "波比"
+ "text": "睡神沙人"
},
"boss_lv": 2,
"serial": 4,
"fighting": 6186,
- "boss_img": 11009,
+ "boss_img": 24003,
"kill_reward": 1014,
"fail_reward": [
{
@@ -382,18 +552,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000012,
"boss_name": {
"key": "guild_guild_boss_boss_name_12",
- "text": "阿宝"
+ "text": "邦尼兔"
},
"boss_lv": 2,
"serial": 5,
"fighting": 7423,
- "boss_img": 11009,
+ "boss_img": 24004,
"kill_reward": 1015,
"fail_reward": [
{
@@ -417,18 +604,35 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
},
{
"boss_id": 50000013,
"boss_name": {
"key": "guild_guild_boss_boss_name_13",
- "text": "希卡普"
+ "text": "金猴"
},
"boss_lv": 2,
"serial": 6,
"fighting": 8907,
- "boss_img": 11009,
+ "boss_img": 24005,
"kill_reward": 1016,
"fail_reward": [
{
@@ -452,6 +656,23 @@
4,
2
],
- "fight": 50
+ "fight": 50,
+ "preview_reward": [
+ {
+ "a": "item",
+ "t": "13000005",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "guildcoin",
+ "n": 1
+ },
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 7313d68b3..cec4fae93 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -195,7 +195,7 @@
},
"cops_MaxBuyNum": 10,
"ArenaTicket_PurchaseRrestrictions": 10,
- "arena_InitiaIntegral": 1000,
+ "arena_InitiaIntegral": 0,
"arena_RecordMax": 10,
"arena_RefreshCd": 10,
"show_male": [
@@ -794,6 +794,8 @@
"t": "plundercollege",
"n": 400
},
- "plunder_pvp_college_time": 7
+ "plunder_pvp_college_time": 7,
+ "pvp_endtime": 3,
+ "pvp_maintenancetime": 2
}
]
\ No newline at end of file
diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json
index 4166ef3cc..1e90d62da 100644
--- a/bin/json/game_gm.json
+++ b/bin/json/game_gm.json
@@ -868,5 +868,15 @@
},
"data": "11081",
"prefix": ""
+ },
+ {
+ "id": 88,
+ "type": 4,
+ "text": {
+ "key": "GM_GM_text_135",
+ "text": "打开海岛"
+ },
+ "data": "10070",
+ "prefix": ""
}
]
\ No newline at end of file
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index f6298727e..f504c37c7 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -1630,7 +1630,7 @@
"expitemnum": 7,
"herointr": {
"key": "hero_main_herointr_23003",
- "text": " 干草堆随着风吹过街道，生活还是一成不变，只有黛塔黛恩一如既往，在午后弹奏起她的民谣。荒野的西部，精灵一出生就要干活，一切都要靠双手获得。黛塔用她的歌声抚慰着精灵们的心，每一天都如此。
但，某一天，一群宛如被彩虹殴打过的精灵出现在黛塔的面前，将她的生活搅得天翻地覆。"
+ "text": " 干草堆随着风吹过街道，生活还是一成不变，只有黛塔黛恩一如既往，在午后弹奏起她的民谣。荒野的西部，精灵一出生就要干活，一切都要靠双手获得。黛塔用她的歌声抚慰着精灵们的心，每一天都如此。
但，某一天，一群宛如被彩虹殴打过的精灵出现在黛塔的面前，将她的生活搅得天翻地覆。"
}
},
{
@@ -2490,7 +2490,7 @@
"expitemnum": 7,
"herointr": {
"key": "hero_main_herointr_24008",
- "text": " 暴躁二人组中的姐姐，粗鲁，暴躁，追求危险和刺激，无论怎么看，暴芙纳特都和淑女这个词毫不沾边。但是身为维京人，她这种特质反而被视为合格的勇士，也是件奇事。
暴芙纳特非常自恋，一直梦想嫁一个强壮有力的如意郎君。她的弟弟对此十分不屑。"
+ "text": " 暴躁二人组中的姐姐，粗鲁，暴躁，追求危险和刺激，无论怎么看，暴芙纳特都和淑女这个词毫不沾边。但是身为维京人，她这种特质反而被视为合格的勇士，也是件奇事。
暴芙纳特非常自恋，一直梦想嫁一个强壮有力的如意郎君。她的弟弟对此十分不屑。"
}
},
{
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index c9cf45665..c64410ff6 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -20237,6 +20237,178 @@
],
"gm": 0
},
+ {
+ "id": "26000002",
+ "name": {
+ "key": "item_item_name_26000002",
+ "text": "初级周常任务宝箱"
+ },
+ "usetype": 5,
+ "color": 3,
+ "bagtype": 1,
+ "index": 1,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 180020010,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [
+ 904
+ ],
+ "use_skip": 0,
+ "upper_limit": 999,
+ "img": "item_17040001",
+ "intr": {
+ "key": "item_item_intr_26000002",
+ "text": "周常任务的进度礼包，里面有不少好东西。"
+ },
+ "describe": {
+ "key": "item_item_describe_26000002",
+ "text": "一点小心意，请笑纳。"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_26000002",
+ "text": "【礼轻情意重。】"
+ },
+ "sale": [],
+ "gm": 0
+ },
+ {
+ "id": "26000003",
+ "name": {
+ "key": "item_item_name_26000003",
+ "text": "中级周常任务宝箱"
+ },
+ "usetype": 5,
+ "color": 3,
+ "bagtype": 1,
+ "index": 1,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 180020020,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [
+ 904
+ ],
+ "use_skip": 0,
+ "upper_limit": 999,
+ "img": "item_17050002",
+ "intr": {
+ "key": "item_item_intr_26000003",
+ "text": "周常任务的进度礼包，据说平先生的很多食材都是从这里弄到。"
+ },
+ "describe": {
+ "key": "item_item_describe_26000003",
+ "text": "不可多得的宝物。"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_26000003",
+ "text": "【礼轻情意重。】"
+ },
+ "sale": [],
+ "gm": 0
+ },
+ {
+ "id": "26000004",
+ "name": {
+ "key": "item_item_name_26000004",
+ "text": "高级周常任务宝箱"
+ },
+ "usetype": 5,
+ "color": 3,
+ "bagtype": 1,
+ "index": 1,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 180020010,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [
+ 904
+ ],
+ "use_skip": 0,
+ "upper_limit": 999,
+ "img": "item_17020001",
+ "intr": {
+ "key": "item_item_intr_26000004",
+ "text": "周常任务的进度礼包，数量和质量都有所提升。"
+ },
+ "describe": {
+ "key": "item_item_describe_26000004",
+ "text": "好东西谁也不嫌多。"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_26000004",
+ "text": "【礼轻情意重。】"
+ },
+ "sale": [],
+ "gm": 0
+ },
+ {
+ "id": "26000005",
+ "name": {
+ "key": "item_item_name_26000005",
+ "text": "完美周常任务宝箱"
+ },
+ "usetype": 5,
+ "color": 3,
+ "bagtype": 1,
+ "index": 1,
+ "special_type": 0,
+ "hold": 0,
+ "time": 0,
+ "reddottype": 0,
+ "effects": "",
+ "modelName": "",
+ "box_id": 180020020,
+ "synthetize_num": 0,
+ "synthetize_deplete": [],
+ "synthetize_get": [],
+ "decompose_deplete": [],
+ "decompose_get": [],
+ "access": [
+ 904
+ ],
+ "use_skip": 0,
+ "upper_limit": 999,
+ "img": "item_17050001",
+ "intr": {
+ "key": "item_item_intr_26000005",
+ "text": "完美周常任务的进度礼包，这是守护者辛勤一周的最终嘉奖。"
+ },
+ "describe": {
+ "key": "item_item_describe_26000005",
+ "text": "守护者会需要这些的。"
+ },
+ "dialogue": {
+ "key": "item_item_dialogue_26000005",
+ "text": "【礼轻情意重。】"
+ },
+ "sale": [],
+ "gm": 0
+ },
{
"id": "27000001",
"name": {
diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json
index bc12e0017..ce7361bbc 100644
--- a/bin/json/game_lottery.json
+++ b/bin/json/game_lottery.json
@@ -98662,5 +98662,293 @@
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
+ },
+ {
+ "id": 4112,
+ "lotteryid": 180020010,
+ "description": "初级周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 50
+ },
+ "itemdes": "金币",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 4113,
+ "lotteryid": 180020010,
+ "description": "初级周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "gold",
+ "n": 200000
+ },
+ "itemdes": "钻石",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 4114,
+ "lotteryid": 180020010,
+ "description": "初级周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "17010000",
+ "n": 50
+ },
+ "itemdes": "大食盒",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 4115,
+ "lotteryid": 180020020,
+ "description": "中级周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ },
+ "itemdes": "金币",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 4116,
+ "lotteryid": 180020020,
+ "description": "中级周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "gold",
+ "n": 300000
+ },
+ "itemdes": "钻石",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 4117,
+ "lotteryid": 180020020,
+ "description": "中级周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "17010000",
+ "n": 100
+ },
+ "itemdes": "大食盒",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 4118,
+ "lotteryid": 180020030,
+ "description": "高级周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 150
+ },
+ "itemdes": "金币",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 4119,
+ "lotteryid": 180020030,
+ "description": "高级周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "gold",
+ "n": 400000
+ },
+ "itemdes": "钻石",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 4120,
+ "lotteryid": 180020030,
+ "description": "高级周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "17010000",
+ "n": 100
+ },
+ "itemdes": "大食盒",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 4121,
+ "lotteryid": 180020040,
+ "description": "完美周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ "itemdes": "金币",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 4122,
+ "lotteryid": 180020040,
+ "description": "完美周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "attr",
+ "t": "gold",
+ "n": 600000
+ },
+ "itemdes": "钻石",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
+ },
+ {
+ "id": 4123,
+ "lotteryid": 180020040,
+ "description": "完美周常任务宝箱",
+ "type": 2,
+ "groupwt": 1000,
+ "groupid": 1000,
+ "subtype": 2,
+ "groupnum": 1,
+ "itemid": {
+ "a": "item",
+ "t": "17010000",
+ "n": 100
+ },
+ "itemdes": "大食盒",
+ "itemwt": 1000,
+ "min": 1,
+ "max": 1,
+ "VIPmin": 0,
+ "VIPmax": 15,
+ "playerlvmin": 0,
+ "playerlvmax": 0,
+ "notice": 0
}
]
\ No newline at end of file
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index ef3185996..64e1e9d7e 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -2013,7 +2013,7 @@
"scene_effect": [
"miwu"
],
- "scene_effectfilter": "效果8",
+ "scene_effectfilter": "camera_filter_8",
"is_near": false,
"openlevel": 1,
"EditorStage": 0,
@@ -2096,7 +2096,7 @@
"scene_effect": [
"miwu"
],
- "scene_effectfilter": "效果8",
+ "scene_effectfilter": "camera_filter_8",
"is_near": false,
"openlevel": 1,
"EditorStage": 0,
@@ -2179,7 +2179,7 @@
"scene_effect": [
"miwu"
],
- "scene_effectfilter": "效果8",
+ "scene_effectfilter": "camera_filter_8",
"is_near": false,
"openlevel": 1,
"EditorStage": 0,
@@ -2273,7 +2273,7 @@
"scene_effect": [
"miwu"
],
- "scene_effectfilter": "效果8",
+ "scene_effectfilter": "camera_filter_8",
"is_near": false,
"openlevel": 1,
"EditorStage": 0,
@@ -2371,7 +2371,7 @@
"scene_effect": [
"miwu"
],
- "scene_effectfilter": "效果8",
+ "scene_effectfilter": "camera_filter_8",
"is_near": false,
"openlevel": 1,
"EditorStage": 0,
@@ -19889,8 +19889,8 @@
"herocolor": 1,
"heroimg": "",
"bubbletext": {
- "key": "",
- "text": ""
+ "key": "main_stage_bubbletext_177",
+ "text": "嘁嘁——嘁——"
},
"animation": [],
"prewarbubbletext": {
@@ -19964,7 +19964,7 @@
],
"BattleReadyID": 10106002,
"FormatList": [
- 103071
+ 103081
],
"helphero": [],
"banhero": [],
@@ -20020,8 +20020,8 @@
"herocolor": 1,
"heroimg": "",
"bubbletext": {
- "key": "",
- "text": ""
+ "key": "main_stage_bubbletext_177",
+ "text": "嘁嘁——嘁——"
},
"animation": [],
"prewarbubbletext": {
@@ -20095,7 +20095,7 @@
],
"BattleReadyID": 10106002,
"FormatList": [
- 103071
+ 103082
],
"helphero": [],
"banhero": [],
@@ -20151,8 +20151,8 @@
"herocolor": 1,
"heroimg": "",
"bubbletext": {
- "key": "",
- "text": ""
+ "key": "main_stage_bubbletext_177",
+ "text": "嘁嘁——嘁——"
},
"animation": [],
"prewarbubbletext": {
@@ -20226,7 +20226,7 @@
],
"BattleReadyID": 10106002,
"FormatList": [
- 103071
+ 103083
],
"helphero": [],
"banhero": [],
@@ -20355,9 +20355,9 @@
"n": 1
}
],
- "BattleReadyID": 10106002,
+ "BattleReadyID": 10106003,
"FormatList": [
- 103081
+ 103091
],
"helphero": [],
"banhero": [],
@@ -20404,7 +20404,7 @@
"venturetype": 0,
"ventureavatar": [],
"scene_effect": [],
- "scene_effectfilter": "效果8",
+ "scene_effectfilter": "camera_filter_8",
"is_near": false,
"openlevel": 1,
"EditorStage": 0,
@@ -39937,11 +39937,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_300",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_283",
"text": ""
},
"exp": 0,
@@ -40018,11 +40018,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_301",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_284",
"text": ""
},
"exp": 0,
@@ -40099,11 +40099,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_302",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_285",
"text": ""
},
"exp": 0,
@@ -40180,11 +40180,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_303",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_286",
"text": ""
},
"exp": 0,
@@ -40261,11 +40261,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_304",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_287",
"text": ""
},
"exp": 0,
@@ -40342,29 +40342,17 @@
"text": ""
},
"title": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_title_305",
+ "text": "受惊的羊群"
},
"desc": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_desc_288",
+ "text": "四溅的龙焰让博克岛羊群战栗不已，瞧，他们此刻正撒丫子狂奔，得尽快送他们回羊圈里去！"
},
"exp": 0,
"hero_exp": 800,
- "ps_consume": [
- {
- "a": "attr",
- "t": "ps",
- "n": 9
- }
- ],
- "ps_mg": [
- {
- "a": "attr",
- "t": "ps",
- "n": 1
- }
- ],
+ "ps_consume": [],
+ "ps_mg": [],
"firstaward": [
{
"a": "attr",
@@ -40390,9 +40378,9 @@
"n": 1
}
],
- "BattleReadyID": 116,
+ "BattleReadyID": 10103101,
"FormatList": [
- 102011
+ 101611
],
"helphero": [],
"banhero": [],
@@ -40471,29 +40459,17 @@
"text": ""
},
"title": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_title_306",
+ "text": "驱逐者"
},
"desc": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_desc_289",
+ "text": "酋长并不总有鲜花相迎，质疑是成长的必经之路。"
},
"exp": 0,
"hero_exp": 800,
- "ps_consume": [
- {
- "a": "attr",
- "t": "ps",
- "n": 9
- }
- ],
- "ps_mg": [
- {
- "a": "attr",
- "t": "ps",
- "n": 1
- }
- ],
+ "ps_consume": [],
+ "ps_mg": [],
"firstaward": [
{
"a": "attr",
@@ -40519,9 +40495,9 @@
"n": 1
}
],
- "BattleReadyID": 116,
+ "BattleReadyID": 10103102,
"FormatList": [
- 102011
+ 101621
],
"helphero": [],
"banhero": [],
@@ -40600,29 +40576,17 @@
"text": ""
},
"title": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_title_307",
+ "text": "捣蛋鬼"
},
"desc": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_desc_290",
+ "text": "看热闹不嫌事大，打架不怕人多，想要平息村民们的怒火，从管住鼻涕粗和暴芙那特开始！"
},
"exp": 0,
"hero_exp": 800,
- "ps_consume": [
- {
- "a": "attr",
- "t": "ps",
- "n": 9
- }
- ],
- "ps_mg": [
- {
- "a": "attr",
- "t": "ps",
- "n": 1
- }
- ],
+ "ps_consume": [],
+ "ps_mg": [],
"firstaward": [
{
"a": "attr",
@@ -40648,9 +40612,9 @@
"n": 1
}
],
- "BattleReadyID": 116,
+ "BattleReadyID": 10103103,
"FormatList": [
- 102011
+ 101631
],
"helphero": [],
"banhero": [],
@@ -40729,29 +40693,17 @@
"text": ""
},
"title": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_title_308",
+ "text": "埃雷特的怒火"
},
"desc": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_desc_291",
+ "text": "有时候固执的不是人，是生活，是活着，是博克岛无法躲过的凛冽严冬。"
},
"exp": 0,
"hero_exp": 800,
- "ps_consume": [
- {
- "a": "attr",
- "t": "ps",
- "n": 9
- }
- ],
- "ps_mg": [
- {
- "a": "attr",
- "t": "ps",
- "n": 1
- }
- ],
+ "ps_consume": [],
+ "ps_mg": [],
"firstaward": [
{
"a": "attr",
@@ -40777,9 +40729,9 @@
"n": 1
}
],
- "BattleReadyID": 116,
+ "BattleReadyID": 10103104,
"FormatList": [
- 102011
+ 101641
],
"helphero": [],
"banhero": [],
@@ -40858,29 +40810,17 @@
"text": ""
},
"title": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_title_309",
+ "text": "村民的发难"
},
"desc": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_desc_292",
+ "text": "质疑的浪潮一波接一波，正如眼前不断聚集的闹事村民，要如何从中寻找方向？"
},
"exp": 0,
"hero_exp": 800,
- "ps_consume": [
- {
- "a": "attr",
- "t": "ps",
- "n": 9
- }
- ],
- "ps_mg": [
- {
- "a": "attr",
- "t": "ps",
- "n": 1
- }
- ],
+ "ps_consume": [],
+ "ps_mg": [],
"firstaward": [
{
"a": "attr",
@@ -40906,9 +40846,9 @@
"n": 1
}
],
- "BattleReadyID": 116,
+ "BattleReadyID": 10103105,
"FormatList": [
- 102011
+ 101651
],
"helphero": [],
"banhero": [],
@@ -40987,11 +40927,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_310",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_293",
"text": ""
},
"exp": 0,
@@ -41070,29 +41010,17 @@
"text": ""
},
"title": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_title_311",
+ "text": "何谓理想"
},
"desc": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_desc_294",
+ "text": "放弃是怯懦者的墓志铭，无畏才是属于勇者的赞歌。"
},
"exp": 0,
"hero_exp": 800,
- "ps_consume": [
- {
- "a": "attr",
- "t": "ps",
- "n": 9
- }
- ],
- "ps_mg": [
- {
- "a": "attr",
- "t": "ps",
- "n": 1
- }
- ],
+ "ps_consume": [],
+ "ps_mg": [],
"firstaward": [
{
"a": "attr",
@@ -41118,9 +41046,9 @@
"n": 1
}
],
- "BattleReadyID": 116,
+ "BattleReadyID": 10103106,
"FormatList": [
- 102011
+ 101661
],
"helphero": [],
"banhero": [],
@@ -41199,11 +41127,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_312",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_295",
"text": ""
},
"exp": 0,
@@ -41280,11 +41208,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_313",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_296",
"text": ""
},
"exp": 0,
@@ -41361,11 +41289,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_314",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_297",
"text": ""
},
"exp": 0,
@@ -41445,11 +41373,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_315",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_298",
"text": ""
},
"exp": 0,
@@ -41532,11 +41460,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_316",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_299",
"text": ""
},
"exp": 0,
@@ -41616,11 +41544,11 @@
"text": ""
},
"title": {
- "key": "",
+ "key": "mainchapter_main_stage_title_317",
"text": ""
},
"desc": {
- "key": "",
+ "key": "mainchapter_main_stage_desc_300",
"text": ""
},
"exp": 0,
@@ -41703,29 +41631,17 @@
"text": ""
},
"title": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_title_318",
+ "text": "峰回路转"
},
"desc": {
- "key": "",
- "text": ""
+ "key": "mainchapter_main_stage_desc_301",
+ "text": "危机往往是转机的开始，直面它吧，路就在前方！"
},
"exp": 0,
"hero_exp": 800,
- "ps_consume": [
- {
- "a": "attr",
- "t": "ps",
- "n": 9
- }
- ],
- "ps_mg": [
- {
- "a": "attr",
- "t": "ps",
- "n": 1
- }
- ],
+ "ps_consume": [],
+ "ps_mg": [],
"firstaward": [
{
"a": "attr",
@@ -41751,9 +41667,9 @@
"n": 1
}
],
- "BattleReadyID": 116,
+ "BattleReadyID": 10103107,
"FormatList": [
- 102011
+ 101671
],
"helphero": [],
"banhero": [],
diff --git a/bin/json/game_model.json b/bin/json/game_model.json
index 55c7b71dd..3c4bc2e28 100644
--- a/bin/json/game_model.json
+++ b/bin/json/game_model.json
@@ -7663,5 +7663,40 @@
"y": 20,
"z": 1
}
+ },
+ {
+ "id": "54003",
+ "preson": "54003",
+ "presonshow": "54003_exhibition",
+ "presonstory": "54003_story",
+ "presondraw": "",
+ "height": 30,
+ "weight": 1,
+ "ico": "tx_js_54003",
+ "fight": "tx_js_55007",
+ "img": "sbkp_js_54003",
+ "heroimg": "hbkp_js_54003",
+ "portrait": "zm_img_54003",
+ "bust": "bust_55007",
+ "postxyz": [
+ 0,
+ 0,
+ 0
+ ],
+ "rotation": {
+ "x": 0,
+ "y": 180,
+ "z": 0
+ },
+ "boxPos": {
+ "x": 0,
+ "y": 16,
+ "z": 0
+ },
+ "boxSize": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
}
]
\ No newline at end of file
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index f53f9e9b6..7f72a8672 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -8004,6 +8004,1006 @@
"speed": -1,
"modelsize": 1
},
+ {
+ "Id": 102611,
+ "pos": 1,
+ "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": 130,
+ "modelsize": 1
+ },
+ {
+ "Id": 102611,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51012,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 60,
+ "hppro": 2,
+ "atkpro": 3,
+ "defpro": 0.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 150,
+ "modelsize": 1
+ },
+ {
+ "Id": 102611,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51012,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 60,
+ "hppro": 2,
+ "atkpro": 3,
+ "defpro": 0.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 132,
+ "modelsize": 1
+ },
+ {
+ "Id": 102611,
+ "pos": 4,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51012,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 60,
+ "hppro": 2,
+ "atkpro": 3,
+ "defpro": 0.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 110,
+ "modelsize": 1
+ },
+ {
+ "Id": 102611,
+ "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": 115,
+ "modelsize": 1
+ },
+ {
+ "Id": 102612,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 44005,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 60,
+ "hppro": 1,
+ "atkpro": 2,
+ "defpro": 1.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 133,
+ "modelsize": 1
+ },
+ {
+ "Id": 102612,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 45003,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 60,
+ "hppro": 1,
+ "atkpro": 2,
+ "defpro": 1.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 135,
+ "modelsize": 1
+ },
+ {
+ "Id": 102612,
+ "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": 102612,
+ "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": 102612,
+ "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": 102621,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 83008,
+ "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": 102621,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 83008,
+ "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": 102621,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 83008,
+ "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": 102621,
+ "pos": 4,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 83008,
+ "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": 102621,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 83008,
+ "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": 102622,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 44005,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 60,
+ "hppro": 2,
+ "atkpro": 3,
+ "defpro": 0.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 133,
+ "modelsize": 1
+ },
+ {
+ "Id": 102622,
+ "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": 102622,
+ "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": 102622,
+ "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": 102622,
+ "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": 102631,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 83008,
+ "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": 102631,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 83008,
+ "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": 102631,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 83008,
+ "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": 102631,
+ "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": 102631,
+ "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": 102632,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 45003,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 60,
+ "hppro": 2,
+ "atkpro": 3,
+ "defpro": 0.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 133,
+ "modelsize": 1
+ },
+ {
+ "Id": 102632,
+ "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": 102632,
+ "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": 102632,
+ "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": 102632,
+ "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": 102641,
+ "pos": 1,
+ "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": 130,
+ "modelsize": 1
+ },
+ {
+ "Id": 102641,
+ "pos": 2,
+ "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": 135,
+ "modelsize": 1
+ },
+ {
+ "Id": 102641,
+ "pos": 3,
+ "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": 132,
+ "modelsize": 1
+ },
+ {
+ "Id": 102641,
+ "pos": 4,
+ "captainId": 0,
+ "IsBoss": true,
+ "bossHpCnt": 0,
+ "heroid": 55002,
+ "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": 102641,
+ "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": 102642,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 45003,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 60,
+ "hppro": 2,
+ "atkpro": 3,
+ "defpro": 0.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 133,
+ "modelsize": 1
+ },
+ {
+ "Id": 102642,
+ "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": 102642,
+ "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": 102642,
+ "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": 102642,
+ "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": 102651,
+ "pos": 1,
+ "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": 130,
+ "modelsize": 1
+ },
+ {
+ "Id": 102651,
+ "pos": 2,
+ "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": 135,
+ "modelsize": 1
+ },
+ {
+ "Id": 102651,
+ "pos": 3,
+ "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": 132,
+ "modelsize": 1
+ },
+ {
+ "Id": 102651,
+ "pos": 4,
+ "captainId": 0,
+ "IsBoss": true,
+ "bossHpCnt": 0,
+ "heroid": 55002,
+ "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": 102651,
+ "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": 102652,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 45003,
+ "star": 6,
+ "equip": [],
+ "newskill": [],
+ "lv": 60,
+ "hppro": 2,
+ "atkpro": 3,
+ "defpro": 0.5,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 133,
+ "modelsize": 1
+ },
+ {
+ "Id": 102652,
+ "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": 102652,
+ "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": 102652,
+ "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": 102652,
+ "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": 103011,
"pos": 1,
@@ -10110,14 +11110,14 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": 43002,
+ "heroid": 51054,
"star": 3,
"equip": [],
"newskill": [],
"lv": 11,
- "hppro": 4,
- "atkpro": 0.98,
- "defpro": 0.89,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
@@ -10130,7 +11130,7 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": 51056,
+ "heroid": 51054,
"star": 3,
"equip": [],
"newskill": [],
@@ -10150,7 +11150,7 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": 51057,
+ "heroid": 51054,
"star": 3,
"equip": [],
"newskill": [],
@@ -10210,7 +11210,7 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51054,
"star": 3,
"equip": [],
"newskill": [],
@@ -10230,7 +11230,7 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51056,
"star": 3,
"equip": [],
"newskill": [],
@@ -10250,7 +11250,7 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51056,
"star": 3,
"equip": [],
"newskill": [],
@@ -10270,7 +11270,7 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51054,
"star": 3,
"equip": [],
"newskill": [],
@@ -10290,7 +11290,7 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51054,
"star": 3,
"equip": [],
"newskill": [],
@@ -10310,7 +11310,7 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51054,
"star": 3,
"equip": [],
"newskill": [],
@@ -10330,7 +11330,7 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51057,
"star": 3,
"equip": [],
"newskill": [],
@@ -10350,7 +11350,7 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51057,
"star": 3,
"equip": [],
"newskill": [],
@@ -10370,7 +11370,7 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": -1,
+ "heroid": 51054,
"star": 3,
"equip": [],
"newskill": [],
@@ -10390,6 +11390,306 @@
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
+ "heroid": 51054,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": -1,
+ "modelsize": 1
+ },
+ {
+ "Id": 103091,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51054,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": -1,
+ "modelsize": 1
+ },
+ {
+ "Id": 103091,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51056,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 63,
+ "modelsize": 1
+ },
+ {
+ "Id": 103091,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51056,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 61,
+ "modelsize": 1
+ },
+ {
+ "Id": 103091,
+ "pos": 4,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51057,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 62,
+ "modelsize": 1
+ },
+ {
+ "Id": 103091,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": 51057,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": 62,
+ "modelsize": 1
+ },
+ {
+ "Id": 103092,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": -1,
+ "modelsize": 1
+ },
+ {
+ "Id": 103092,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": -1,
+ "modelsize": 1
+ },
+ {
+ "Id": 103092,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": -1,
+ "modelsize": 1
+ },
+ {
+ "Id": 103092,
+ "pos": 4,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": -1,
+ "modelsize": 1
+ },
+ {
+ "Id": 103092,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": -1,
+ "modelsize": 1
+ },
+ {
+ "Id": 103093,
+ "pos": 1,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": -1,
+ "modelsize": 1
+ },
+ {
+ "Id": 103093,
+ "pos": 2,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": -1,
+ "modelsize": 1
+ },
+ {
+ "Id": 103093,
+ "pos": 3,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": -1,
+ "modelsize": 1
+ },
+ {
+ "Id": 103093,
+ "pos": 4,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
+ "heroid": -1,
+ "star": 3,
+ "equip": [],
+ "newskill": [],
+ "lv": 11,
+ "hppro": 1,
+ "atkpro": 1,
+ "defpro": 1,
+ "skill1": 1,
+ "skill2": 1,
+ "skill3": 1,
+ "speed": -1,
+ "modelsize": 1
+ },
+ {
+ "Id": 103093,
+ "pos": 5,
+ "captainId": 0,
+ "IsBoss": false,
+ "bossHpCnt": 0,
"heroid": -1,
"star": 3,
"equip": [],
@@ -245556,13 +246856,13 @@
"captainId": 1,
"IsBoss": false,
"bossHpCnt": 0,
- "heroid": -1,
- "star": 3,
+ "heroid": 24001,
+ "star": 6,
"equip": [],
"newskill": [],
"lv": 1,
- "hppro": 0.3,
- "atkpro": 0.5,
+ "hppro": 1,
+ "atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
diff --git a/bin/json/game_photofilter.json b/bin/json/game_photofilter.json
index 97ac5eef7..4411ec389 100644
--- a/bin/json/game_photofilter.json
+++ b/bin/json/game_photofilter.json
@@ -14,7 +14,7 @@
"key": "photoshop_filter_filtername_2",
"text": "功夫早晨"
},
- "filter": "效果3",
+ "filter": "camera_filter_3",
"img": "lj_img_04"
},
{
@@ -23,7 +23,7 @@
"key": "photoshop_filter_filtername_3",
"text": "史莱克回忆"
},
- "filter": "效果2",
+ "filter": "camera_filter_2",
"img": "lj_img_02"
},
{
@@ -32,7 +32,7 @@
"key": "photoshop_filter_filtername_4",
"text": "波比暖阳"
},
- "filter": "效果5",
+ "filter": "camera_filter_5",
"img": "lj_img_03"
},
{
@@ -41,7 +41,7 @@
"key": "photoshop_filter_filtername_5",
"text": "梦魇降临"
},
- "filter": "效果6",
+ "filter": "camera_filter_6",
"img": "lj_img_01"
}
]
\ No newline at end of file
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 1b9c572d5..b4e988dd9 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -30937,7 +30937,7 @@
"Argu": [
1,
4,
- 1600
+ 2000
],
"FollowSK": [
255007215
@@ -30945,10 +30945,13 @@
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
- "DpsRevisiType": 0,
+ "DpsRevisiType": 111,
"DpsCondition": "",
"RevisiCondition": "",
- "RevisiParams": []
+ "RevisiParams": [
+ 390001415,
+ 100
+ ]
},
{
"Id": 255007213,
@@ -31241,7 +31244,7 @@
"Argu": [
1,
4,
- 4500
+ 8000
],
"FollowSK": [],
"SucFollowSK": [],
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 09d6160c7..71887af09 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -19045,7 +19045,7 @@
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
- "CD": 0,
+ "CD": 2,
"Where": [],
"Target": 2,
"ChildSkill": {
@@ -19080,7 +19080,7 @@
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
- "CD": 0,
+ "CD": 2,
"Where": [],
"Target": 2,
"ChildSkill": {
@@ -19115,7 +19115,7 @@
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
- "CD": 0,
+ "CD": 2,
"Where": [],
"Target": 2,
"ChildSkill": {
@@ -19150,7 +19150,7 @@
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
- "CD": 0,
+ "CD": 2,
"Where": [],
"Target": 2,
"ChildSkill": {
@@ -19185,7 +19185,7 @@
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
- "CD": 0,
+ "CD": 2,
"Where": [],
"Target": 2,
"ChildSkill": {
@@ -24830,16 +24830,15 @@
"ChildSkill": {
"Id": [
255007211,
- 255007212,
- 255007213,
255007315,
- 255007319
+ 255007212,
+ 255007213
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_155007211_1",
- "text": "冰霜泰坦拥有[color=#37d8a9]霜盾冰晶[/color]时释放，驱散锁定目标身上的全部增益效果，并造成大量伤害，成功击败目标时，自身获得伤害提升。"
+ "text": "冰霜泰坦拥有[color=#37d8a9]霜盾冰晶[/color]时释放，驱散敌方全部增益效果，并对血量最高的目标造成大量伤害，成功击败目标时，自身获得伤害提升。"
},
"buffid": [
390001415
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 8a62672b4..816114164 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -4919,8 +4919,8 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_zhby",
- "buffeffect": "",
- "buffpos": "",
+ "buffeffect": "effect_55007_jdsh",
+ "buffpos": "根节点",
"AddTrigger": 0,
"TriggerEffect": "",
"TriggerPos": "",
diff --git a/bin/json/game_systemchattext.json b/bin/json/game_systemchattext.json
new file mode 100644
index 000000000..1cacfd7a8
--- /dev/null
+++ b/bin/json/game_systemchattext.json
@@ -0,0 +1,102 @@
+[
+ {
+ "id": 100001,
+ "talkhero": "44004",
+ "talktext": {
+ "key": "systemnotice_chattext_talktext_1",
+ "text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
+ },
+ "delay": 500,
+ "jumpid": 10001
+ },
+ {
+ "id": 100002,
+ "talkhero": "44005",
+ "talktext": {
+ "key": "systemnotice_chattext_talktext_2",
+ "text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
+ },
+ "delay": 501,
+ "jumpid": 10002
+ },
+ {
+ "id": 100003,
+ "talkhero": "44006",
+ "talktext": {
+ "key": "systemnotice_chattext_talktext_3",
+ "text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
+ },
+ "delay": 502,
+ "jumpid": 10003
+ },
+ {
+ "id": 100004,
+ "talkhero": "44007",
+ "talktext": {
+ "key": "systemnotice_chattext_talktext_4",
+ "text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
+ },
+ "delay": 503,
+ "jumpid": 10004
+ },
+ {
+ "id": 100005,
+ "talkhero": "44008",
+ "talktext": {
+ "key": "systemnotice_chattext_talktext_5",
+ "text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
+ },
+ "delay": 504,
+ "jumpid": 10005
+ },
+ {
+ "id": 100006,
+ "talkhero": "44009",
+ "talktext": {
+ "key": "systemnotice_chattext_talktext_6",
+ "text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
+ },
+ "delay": 505,
+ "jumpid": 10006
+ },
+ {
+ "id": 100007,
+ "talkhero": "44010",
+ "talktext": {
+ "key": "systemnotice_chattext_talktext_7",
+ "text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
+ },
+ "delay": 506,
+ "jumpid": 10007
+ },
+ {
+ "id": 100008,
+ "talkhero": "44011",
+ "talktext": {
+ "key": "systemnotice_chattext_talktext_8",
+ "text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
+ },
+ "delay": 507,
+ "jumpid": 10008
+ },
+ {
+ "id": 100009,
+ "talkhero": "44012",
+ "talktext": {
+ "key": "systemnotice_chattext_talktext_9",
+ "text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
+ },
+ "delay": 508,
+ "jumpid": 10009
+ },
+ {
+ "id": 100010,
+ "talkhero": "44013",
+ "talktext": {
+ "key": "systemnotice_chattext_talktext_10",
+ "text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
+ },
+ "delay": 509,
+ "jumpid": 10010
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_systemnotice.json b/bin/json/game_systemnotice.json
new file mode 100644
index 000000000..63f349089
--- /dev/null
+++ b/bin/json/game_systemnotice.json
@@ -0,0 +1,164 @@
+[
+ {
+ "id": 1,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 1,
+ "jumpid": 0,
+ "noticetext": [
+ 100001
+ ]
+ },
+ {
+ "id": 2,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 1,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 3,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 1,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 4,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 1,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 5,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 1,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 6,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 1,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 7,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 1,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 8,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 9,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 10,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 11,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 12,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 13,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 14,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 15,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 16,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 17,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 18,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 19,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ },
+ {
+ "id": 20,
+ "redid": 0,
+ "priority": 0,
+ "systemtype": 2,
+ "jumpid": 0,
+ "noticetext": []
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_systemstroytalk.json b/bin/json/game_systemstroytalk.json
new file mode 100644
index 000000000..9c4d48dcb
--- /dev/null
+++ b/bin/json/game_systemstroytalk.json
@@ -0,0 +1,68 @@
+[
+ {
+ "id": 1,
+ "opentime": 10000001,
+ "groupid": 0,
+ "herohead": "35002",
+ "heroname": {
+ "key": "heroname_1",
+ "text": "飞龙在天群组"
+ },
+ "storytalk": 100001
+ },
+ {
+ "id": 2,
+ "opentime": 10000002,
+ "groupid": 0,
+ "herohead": "35002",
+ "heroname": {
+ "key": "",
+ "text": ""
+ },
+ "storytalk": 100002
+ },
+ {
+ "id": 3,
+ "opentime": 10000003,
+ "groupid": 0,
+ "herohead": "35002",
+ "heroname": {
+ "key": "",
+ "text": ""
+ },
+ "storytalk": 100003
+ },
+ {
+ "id": 4,
+ "opentime": 10000004,
+ "groupid": 0,
+ "herohead": "35002",
+ "heroname": {
+ "key": "",
+ "text": ""
+ },
+ "storytalk": 0
+ },
+ {
+ "id": 5,
+ "opentime": 0,
+ "groupid": 0,
+ "herohead": "",
+ "heroname": {
+ "key": "",
+ "text": ""
+ },
+ "storytalk": 0
+ },
+ {
+ "id": 6,
+ "opentime": 0,
+ "groupid": 0,
+ "herohead": "",
+ "heroname": {
+ "key": "",
+ "text": ""
+ },
+ "storytalk": 0
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_taskactivereward.json b/bin/json/game_taskactivereward.json
index b31f17e46..4db72bf9a 100644
--- a/bin/json/game_taskactivereward.json
+++ b/bin/json/game_taskactivereward.json
@@ -4,9 +4,9 @@
"active": 40,
"reword": [
{
- "a": "attr",
- "t": "diamond",
- "n": 150
+ "a": "item",
+ "t": "26000002",
+ "n": 1
}
],
"action": "main_weektask_action_1_act",
@@ -17,14 +17,9 @@
"active": 80,
"reword": [
{
- "a": "attr",
- "t": "diamond",
- "n": 150
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 500000
+ "a": "item",
+ "t": "26000003",
+ "n": 1
}
],
"action": "main_weektask_action_1_act",
@@ -35,14 +30,9 @@
"active": 120,
"reword": [
{
- "a": "attr",
- "t": "diamond",
- "n": 150
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 600000
+ "a": "item",
+ "t": "26000004",
+ "n": 1
}
],
"action": "main_weektask_action_1_act",
@@ -53,14 +43,9 @@
"active": 160,
"reword": [
{
- "a": "attr",
- "t": "diamond",
- "n": 150
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 600000
+ "a": "item",
+ "t": "26000005",
+ "n": 1
}
],
"action": "main_weektask_action_1_act",
diff --git a/modules/arena/api_info.go b/modules/arena/api_info.go
index 639f63fde..bfd0a2897 100644
--- a/modules/arena/api_info.go
+++ b/modules/arena/api_info.go
@@ -74,7 +74,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
}
} else {
info.Uinfo = comm.GetUserBaseInfo(user)
- this.module.modelArena.weeksettlement(info)
+ this.module.modelArena.weeksettlement(session, info)
this.module.modelArena.recoverTicket(session, info)
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
errdata = &pb.ErrorData{
diff --git a/modules/arena/configure.go b/modules/arena/configure.go
index 7eff77ba1..e8c18c312 100644
--- a/modules/arena/configure.go
+++ b/modules/arena/configure.go
@@ -19,6 +19,7 @@ const (
game_monsterformat = "game_monsterformat.json" //整容表
game_monster = "game_monster.json" //怪物表
+ game_activeking = "game_activeking.json" //王者之上奖励
)
///竞技场配置管理组件
@@ -39,7 +40,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
configure.RegisterConfigure(game_arenarobot, cfg.NewGameArenaRobot, this.updateArenaRobot)
this.LoadConfigure(game_arenarankreward, cfg.NewGameArenaRankReward)
this.LoadConfigure(game_arenachallengenpc, cfg.NewGameArenaChallengeNpc)
-
+ this.LoadConfigure(game_activeking, cfg.NewGameActiveKing)
configure.RegisterConfigure(game_monsterformat, cfg.NewGameMonsterFormat, func() {
this.mformatlock.Lock()
if v, err := this.GetConfigure(game_monsterformat); err != nil {
@@ -204,3 +205,16 @@ func (this *configureComp) getChallengenpc(id int32) (result *cfg.GameArenaChall
}
return
}
+
+//查询剧情npc系统
+func (this *configureComp) getGameActiveKing() (confs []*cfg.GameActiveKingData, err error) {
+ var (
+ v interface{}
+ )
+ if v, err = this.GetConfigure(game_activeking); err != nil {
+ this.module.Errorln(err)
+ } else {
+ confs = v.(*cfg.GameActiveKing).GetDataList()
+ }
+ return
+}
diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go
index 94a6e7ab7..700adf365 100644
--- a/modules/arena/modelarena.go
+++ b/modules/arena/modelarena.go
@@ -49,6 +49,22 @@ func (this *modelArena) Init(service core.IService, module core.IModule, comp co
return
}
+//是否在维护中
+func (this *modelArena) isInMaintenance() (ok bool) {
+ var (
+ opentime time.Time
+ totalduration time.Duration
+ lefttime time.Duration
+ )
+ opentime = this.module.service.GetOpentime()
+ totalduration = configure.Now().Sub(opentime)
+ lefttime = totalduration % (time.Hour * 24 * 7)
+ if lefttime < time.Hour*2 {
+ return true
+ }
+ return
+}
+
// 查询用户装备数据
func (this *modelArena) queryPlayerInfo(uId string) (result *pb.DBArenaUser, err error) {
result = &pb.DBArenaUser{}
@@ -427,20 +443,56 @@ func (this *modelArena) getpandataModel() (model *arenaModel, err error) {
}
//周结算
-func (this *modelArena) weeksettlement(info *pb.DBArenaUser) {
+func (this *modelArena) weeksettlement(session comm.IUserSession, info *pb.DBArenaUser) {
var (
- conf *cfg.GameArenaActiveRewardData
- err error
+ conf *cfg.GameArenaActiveRewardData
+ confs []*cfg.GameActiveKingData
+ totalnum int64
+ rank int32
+ reward []*cfg.Gameatn
+ atno []*pb.UserAtno
+ errdata *pb.ErrorData
+ ok bool
+ err error
)
if utils.IsSameWeek(info.Lastweektime) { //跨周
if conf, err = this.module.configure.getMaxDanConf(); err != nil {
return
}
if info.Dan == conf.LvId { //最高段位
-
- } else { //非王者段位
-
+ if totalnum, err = this.module.modelRank.queryRankByScoreArea(conf.ScoreLow, -1); err != nil {
+ this.module.Errorln(err)
+ return
+ }
+ if info.Rank < int32(totalnum) { //存在于王者段位中
+ if confs, err = this.module.configure.getGameActiveKing(); err != nil {
+ this.module.Errorln(err)
+ return
+ }
+ for _, conf := range confs {
+ rank += int32(math.Floor(float64(conf.Place) * float64(totalnum) / float64(1000)))
+ if rank <= info.Dan {
+ reward = conf.RewardWeek
+ info.Dan2 = conf.LvId
+ ok = true
+ break
+ }
+ }
+ }
}
+ if !ok {
+ if conf, err = this.module.configure.getActiveRewardById(info.Dan); err != nil {
+ return
+ }
+ reward = conf.ExReward
+ info.Dan2 = 0
+ }
+
+ if errdata, atno = this.module.DispenseAtno(session, reward, true); errdata != nil {
+ this.module.Errorln(errdata)
+ return
+ }
+ session.SendMsg(string(this.module.GetType()), "settlementreward", &pb.ArenaSettlementRewardPush{Stype: 1, Award: atno})
}
}
diff --git a/modules/arena/modelrank.go b/modules/arena/modelrank.go
index e224d649b..f20e8aa17 100644
--- a/modules/arena/modelrank.go
+++ b/modules/arena/modelrank.go
@@ -8,8 +8,6 @@ import (
"go_dreamfactory/lego/sys/redis/pipe"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
- "go_dreamfactory/sys/configure"
- cfg "go_dreamfactory/sys/configure/structs"
"github.com/go-redis/redis/v8"
)
@@ -93,41 +91,41 @@ func (this *modelRank) queryRankUser() (ranks []string, err error) {
// 比赛结算
func (this *modelRank) raceSettlement() {
- var (
- reward *cfg.GameArenaRankReward
- result []string
- uids []string
- Items []*pb.UserAssets
- err error
- )
- if reward, err = this.module.configure.getRankReward(); err != nil {
- this.module.Errorln(err)
- return
- }
- for _, v := range reward.GetDataList() {
- if result, err = this.DBModel.Redis.ZRevRange(fmt.Sprintf("%s-%s", this.DBModel.ServiceId, this.TableName), int64(v.RankLow-1), int64(v.RankUp)).Result(); err != nil {
- this.module.Errorln(err)
- return
- }
- this.module.Debugf("uid:%v", uids)
+ // var (
+ // reward *cfg.GameArenaRankReward
+ // result []string
+ // uids []string
+ // Items []*pb.UserAssets
+ // err error
+ // )
+ // if reward, err = this.module.configure.getRankReward(); err != nil {
+ // this.module.Errorln(err)
+ // return
+ // }
+ // for _, v := range reward.GetDataList() {
+ // if result, err = this.DBModel.Redis.ZRevRange(fmt.Sprintf("%s-%s", this.DBModel.ServiceId, this.TableName), int64(v.RankLow-1), int64(v.RankUp)).Result(); err != nil {
+ // this.module.Errorln(err)
+ // return
+ // }
+ // this.module.Debugf("uid:%v", uids)
- Items = make([]*pb.UserAssets, len(v.RankReward))
- for i, v := range v.RankReward {
- Items[i] = &pb.UserAssets{
- A: v.A,
- T: v.T,
- N: v.N,
- }
- }
- for i := 0; i < len(result); i += 2 {
- // uids = append(uids, result[i])
- //发邮件
- this.module.mail.SendNewMail(&pb.DBMailData{
- Cid: "ArenaRankingReward",
- Param: []string{fmt.Sprintf("%d", v.RankLow+int32(i))},
- CreateTime: uint64(configure.Now().Unix()),
- Items: Items,
- }, result[i])
- }
- }
+ // Items = make([]*pb.UserAssets, len(v.RankReward))
+ // for i, v := range v.RankReward {
+ // Items[i] = &pb.UserAssets{
+ // A: v.A,
+ // T: v.T,
+ // N: v.N,
+ // }
+ // }
+ // for i := 0; i < len(result); i += 2 {
+ // // uids = append(uids, result[i])
+ // //发邮件
+ // this.module.mail.SendNewMail(&pb.DBMailData{
+ // Cid: "ArenaRankingReward",
+ // Param: []string{fmt.Sprintf("%d", v.RankLow+int32(i))},
+ // CreateTime: uint64(configure.Now().Unix()),
+ // Items: Items,
+ // }, result[i])
+ // }
+ // }
}
diff --git a/modules/sys/module.go b/modules/sys/module.go
index 8152d8148..a7aa287d6 100644
--- a/modules/sys/module.go
+++ b/modules/sys/module.go
@@ -198,7 +198,7 @@ func (this *ModuleSys) BuriedsNotify(session comm.IUserSession, condis []*pb.Con
confs map[string]*cfg.GameOpencondData = make(map[string]*cfg.GameOpencondData)
condlids []int32
condisSlice []*pb.ConIProgress
- condisMap map[int32]*pb.ConIProgress
+ condisMap map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress)
progress *pb.ConIProgress
notify []*cfg.GameOpencondData = make([]*cfg.GameOpencondData, 0)
ok bool
diff --git a/sys/configure/structs/Game.ActiveKing.go b/sys/configure/structs/Game.ActiveKing.go
new file mode 100644
index 000000000..dfdc778b4
--- /dev/null
+++ b/sys/configure/structs/Game.ActiveKing.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 GameActiveKing struct {
+ _dataMap map[int32]*GameActiveKingData
+ _dataList []*GameActiveKingData
+}
+
+func NewGameActiveKing(_buf []map[string]interface{}) (*GameActiveKing, error) {
+ _dataList := make([]*GameActiveKingData, 0, len(_buf))
+ dataMap := make(map[int32]*GameActiveKingData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameActiveKingData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.LvId] = _v
+ }
+ }
+ return &GameActiveKing{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameActiveKing) GetDataMap() map[int32]*GameActiveKingData {
+ return table._dataMap
+}
+
+func (table *GameActiveKing) GetDataList() []*GameActiveKingData {
+ return table._dataList
+}
+
+func (table *GameActiveKing) Get(key int32) *GameActiveKingData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.ActiveKingData.go b/sys/configure/structs/Game.ActiveKingData.go
new file mode 100644
index 000000000..ab5f3f8f7
--- /dev/null
+++ b/sys/configure/structs/Game.ActiveKingData.go
@@ -0,0 +1,56 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameActiveKingData struct {
+ LvId int32
+ Place int32
+ Name string
+ Png string
+ RewardWeek []*Gameatn
+}
+
+const TypeId_GameActiveKingData = 568211075
+
+func (*GameActiveKingData) GetTypeId() int32 {
+ return 568211075
+}
+
+func (_v *GameActiveKingData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv_id"].(float64); !_ok_ { err = errors.New("lv_id error"); return }; _v.LvId = int32(_tempNum_) }
+ { 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 __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.Png, _ok_ = _buf["png"].(string); !_ok_ { err = errors.New("png error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reward_week"].([]interface{}); !_ok_ { err = errors.New("reward_week error"); return }
+
+ _v.RewardWeek = 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.RewardWeek = append(_v.RewardWeek, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameActiveKingData(_buf map[string]interface{}) (*GameActiveKingData, error) {
+ v := &GameActiveKingData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.ArenaActiveRewardData.go b/sys/configure/structs/Game.ArenaActiveRewardData.go
index 318d0da10..1de06801c 100644
--- a/sys/configure/structs/Game.ArenaActiveRewardData.go
+++ b/sys/configure/structs/Game.ArenaActiveRewardData.go
@@ -18,6 +18,7 @@ type GameArenaActiveRewardData struct {
Name string
ExReward []*Gameatn
ScoreReturn int32
+ RewardWeek []*Gameatn
WinReward []*Gameatn
Png string
KValue float32
@@ -50,6 +51,20 @@ func (_v *GameArenaActiveRewardData)Deserialize(_buf map[string]interface{}) (er
}
{ 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
+ if _arr_, _ok_ = _buf["reward_week"].([]interface{}); !_ok_ { err = errors.New("reward_week error"); return }
+
+ _v.RewardWeek = 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.RewardWeek = append(_v.RewardWeek, _list_v_)
+ }
+ }
+
{
var _arr_ []interface{}
var _ok_ bool
diff --git a/sys/configure/structs/Game.ExpeditionBossData.go b/sys/configure/structs/Game.ExpeditionBossData.go
index 1990bba41..3b349319b 100644
--- a/sys/configure/structs/Game.ExpeditionBossData.go
+++ b/sys/configure/structs/Game.ExpeditionBossData.go
@@ -24,6 +24,7 @@ type GameExpeditionBossData struct {
Hid []string
Color []int32
Fight int32
+ PreviewReward []*Gameatn
}
const TypeId_GameExpeditionBossData = -271002540
@@ -111,6 +112,20 @@ func (_v *GameExpeditionBossData)Deserialize(_buf map[string]interface{}) (err e
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fight"].(float64); !_ok_ { err = errors.New("fight error"); return }; _v.Fight = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["preview_reward"].([]interface{}); !_ok_ { err = errors.New("preview_reward error"); return }
+
+ _v.PreviewReward = 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.PreviewReward = append(_v.PreviewReward, _list_v_)
+ }
+ }
+
return
}
diff --git a/sys/configure/structs/Game.SystemChatText.go b/sys/configure/structs/Game.SystemChatText.go
new file mode 100644
index 000000000..c30188a30
--- /dev/null
+++ b/sys/configure/structs/Game.SystemChatText.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 GameSystemChatText struct {
+ _dataMap map[int32]*GameSystemChatTextData
+ _dataList []*GameSystemChatTextData
+}
+
+func NewGameSystemChatText(_buf []map[string]interface{}) (*GameSystemChatText, error) {
+ _dataList := make([]*GameSystemChatTextData, 0, len(_buf))
+ dataMap := make(map[int32]*GameSystemChatTextData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSystemChatTextData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameSystemChatText{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSystemChatText) GetDataMap() map[int32]*GameSystemChatTextData {
+ return table._dataMap
+}
+
+func (table *GameSystemChatText) GetDataList() []*GameSystemChatTextData {
+ return table._dataList
+}
+
+func (table *GameSystemChatText) Get(key int32) *GameSystemChatTextData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SystemChatTextData.go b/sys/configure/structs/Game.SystemChatTextData.go
new file mode 100644
index 000000000..fb5e19245
--- /dev/null
+++ b/sys/configure/structs/Game.SystemChatTextData.go
@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameSystemChatTextData struct {
+ Id int32
+ Talkhero string
+ Talktext string
+ Delay int32
+ Jumpid int32
+}
+
+const TypeId_GameSystemChatTextData = -636092102
+
+func (*GameSystemChatTextData) GetTypeId() int32 {
+ return -636092102
+}
+
+func (_v *GameSystemChatTextData)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; if _v.Talkhero, _ok_ = _buf["talkhero"].(string); !_ok_ { err = errors.New("talkhero error"); return } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["talktext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Talktext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Talktext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["delay"].(float64); !_ok_ { err = errors.New("delay error"); return }; _v.Delay = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpid"].(float64); !_ok_ { err = errors.New("jumpid error"); return }; _v.Jumpid = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameSystemChatTextData(_buf map[string]interface{}) (*GameSystemChatTextData, error) {
+ v := &GameSystemChatTextData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.SystemNotice.go b/sys/configure/structs/Game.SystemNotice.go
new file mode 100644
index 000000000..e44d81bf3
--- /dev/null
+++ b/sys/configure/structs/Game.SystemNotice.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 GameSystemNotice struct {
+ _dataMap map[int32]*GameSystemNoticeData
+ _dataList []*GameSystemNoticeData
+}
+
+func NewGameSystemNotice(_buf []map[string]interface{}) (*GameSystemNotice, error) {
+ _dataList := make([]*GameSystemNoticeData, 0, len(_buf))
+ dataMap := make(map[int32]*GameSystemNoticeData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSystemNoticeData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameSystemNotice{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSystemNotice) GetDataMap() map[int32]*GameSystemNoticeData {
+ return table._dataMap
+}
+
+func (table *GameSystemNotice) GetDataList() []*GameSystemNoticeData {
+ return table._dataList
+}
+
+func (table *GameSystemNotice) Get(key int32) *GameSystemNoticeData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SystemNoticeData.go b/sys/configure/structs/Game.SystemNoticeData.go
new file mode 100644
index 000000000..27576690c
--- /dev/null
+++ b/sys/configure/structs/Game.SystemNoticeData.go
@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameSystemNoticeData struct {
+ Id int32
+ Redid int32
+ Priority int32
+ Systemtype int32
+ Jumpid int32
+ Noticetext []int32
+}
+
+const TypeId_GameSystemNoticeData = -1627931475
+
+func (*GameSystemNoticeData) GetTypeId() int32 {
+ return -1627931475
+}
+
+func (_v *GameSystemNoticeData)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["redid"].(float64); !_ok_ { err = errors.New("redid error"); return }; _v.Redid = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["priority"].(float64); !_ok_ { err = errors.New("priority error"); return }; _v.Priority = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["systemtype"].(float64); !_ok_ { err = errors.New("systemtype error"); return }; _v.Systemtype = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpid"].(float64); !_ok_ { err = errors.New("jumpid error"); return }; _v.Jumpid = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["noticetext"].([]interface{}); !_ok_ { err = errors.New("noticetext error"); return }
+
+ _v.Noticetext = 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.Noticetext = append(_v.Noticetext, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGameSystemNoticeData(_buf map[string]interface{}) (*GameSystemNoticeData, error) {
+ v := &GameSystemNoticeData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.SystemStroyTalk.go b/sys/configure/structs/Game.SystemStroyTalk.go
new file mode 100644
index 000000000..9b1e5dd45
--- /dev/null
+++ b/sys/configure/structs/Game.SystemStroyTalk.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 GameSystemStroyTalk struct {
+ _dataMap map[int32]*GameSystemStroyTalkData
+ _dataList []*GameSystemStroyTalkData
+}
+
+func NewGameSystemStroyTalk(_buf []map[string]interface{}) (*GameSystemStroyTalk, error) {
+ _dataList := make([]*GameSystemStroyTalkData, 0, len(_buf))
+ dataMap := make(map[int32]*GameSystemStroyTalkData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameSystemStroyTalkData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameSystemStroyTalk{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameSystemStroyTalk) GetDataMap() map[int32]*GameSystemStroyTalkData {
+ return table._dataMap
+}
+
+func (table *GameSystemStroyTalk) GetDataList() []*GameSystemStroyTalkData {
+ return table._dataList
+}
+
+func (table *GameSystemStroyTalk) Get(key int32) *GameSystemStroyTalkData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.SystemStroyTalkData.go b/sys/configure/structs/Game.SystemStroyTalkData.go
new file mode 100644
index 000000000..f1f4f76ed
--- /dev/null
+++ b/sys/configure/structs/Game.SystemStroyTalkData.go
@@ -0,0 +1,45 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameSystemStroyTalkData struct {
+ Id int32
+ Opentime int32
+ Groupid int32
+ Herohead string
+ Heroname string
+ Storytalk int32
+}
+
+const TypeId_GameSystemStroyTalkData = -2036264570
+
+func (*GameSystemStroyTalkData) GetTypeId() int32 {
+ return -2036264570
+}
+
+func (_v *GameSystemStroyTalkData)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["opentime"].(float64); !_ok_ { err = errors.New("opentime error"); return }; _v.Opentime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["groupid"].(float64); !_ok_ { err = errors.New("groupid error"); return }; _v.Groupid = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Herohead, _ok_ = _buf["herohead"].(string); !_ok_ { err = errors.New("herohead error"); return } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["heroname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Heroname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Heroname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["storytalk"].(float64); !_ok_ { err = errors.New("storytalk error"); return }; _v.Storytalk = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameSystemStroyTalkData(_buf map[string]interface{}) (*GameSystemStroyTalkData, error) {
+ v := &GameSystemStroyTalkData{}
+ 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 648100bf5..353e3e9a0 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -347,6 +347,10 @@ type Tables struct {
FightingSkillStar *GameFightingSkillStar
ExpeditionBoss *GameExpeditionBoss
PlunderDevelop *GamePlunderDevelop
+ SystemNotice *GameSystemNotice
+ SystemChatText *GameSystemChatText
+ SystemStroyTalk *GameSystemStroyTalk
+ ActiveKing *GameActiveKing
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -2370,5 +2374,29 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.PlunderDevelop, err = NewGamePlunderDevelop(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_systemnotice") ; err != nil {
+ return nil, err
+ }
+ if tables.SystemNotice, err = NewGameSystemNotice(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_systemchattext") ; err != nil {
+ return nil, err
+ }
+ if tables.SystemChatText, err = NewGameSystemChatText(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_systemstroytalk") ; err != nil {
+ return nil, err
+ }
+ if tables.SystemStroyTalk, err = NewGameSystemStroyTalk(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_activeking") ; err != nil {
+ return nil, err
+ }
+ if tables.ActiveKing, err = NewGameActiveKing(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 428c2c1c1..38774d387 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -284,6 +284,8 @@ type GameGlobalData struct {
PlunderPvpBattlereadyid int32
PlunderPvpCollegeNum *Gameatn
PlunderPvpCollegeTime int32
+ PvpEndtime int32
+ PvpMaintenancetime int32
}
const TypeId_GameGlobalData = 477542761
@@ -1099,6 +1101,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_battlereadyid"].(float64); !_ok_ { err = errors.New("plunder_pvp_battlereadyid error"); return }; _v.PlunderPvpBattlereadyid = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["plunder_pvp_college_num"].(map[string]interface{}); !_ok_ { err = errors.New("plunder_pvp_college_num error"); return }; if _v.PlunderPvpCollegeNum, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_time"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_time error"); return }; _v.PlunderPvpCollegeTime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_endtime"].(float64); !_ok_ { err = errors.New("pvp_endtime error"); return }; _v.PvpEndtime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_maintenancetime"].(float64); !_ok_ { err = errors.New("pvp_maintenancetime error"); return }; _v.PvpMaintenancetime = int32(_tempNum_) }
return
}