diff --git a/bin/json/game_askedrecruit.json b/bin/json/game_askedrecruit.json
index e30c84192..c5328c783 100644
--- a/bin/json/game_askedrecruit.json
+++ b/bin/json/game_askedrecruit.json
@@ -3,7 +3,7 @@
"key": 0,
"type": 0,
"storyText": {
- "key": "（乌龟大师）：我在预兆中见过你的身影。",
+ "key": "drawcard_asked_storyText_1",
"text": "（乌龟大师）：我在预兆中见过你的身影。"
},
"optionText1": {
@@ -19,15 +19,15 @@
"key": 1,
"type": 1,
"storyText": {
- "key": "（乌龟大师）：孩子，你是追逐名誉至此的勇士。",
- "text": "（乌龟大师）：孩子，你是追逐名誉至此的勇士。"
+ "key": "drawcard_asked_storyText_2",
+ "text": "（乌龟大师）：孩子，你是追逐命运至此的勇士，还是身沐月光的传承之人？"
},
"optionText1": {
- "key": "1.是主角没错",
+ "key": "drawcard_asked_optionText1_2",
"text": "1.是主角没错"
},
"optionText2": {
- "key": "2.只是普通肥宅",
+ "key": "drawcard_asked_optionText3",
"text": "2.只是普通肥宅"
}
},
@@ -35,8 +35,8 @@
"key": 2,
"type": 0,
"storyText": {
- "key": "（乌龟大师）：我在预兆中见过你的身影。",
- "text": "（乌龟大师）：我在预兆中见过你的身影。"
+ "key": "drawcard_asked_storyText_3",
+ "text": "（乌龟大师）：他决意召你前来"
},
"optionText1": {
"key": "",
@@ -49,27 +49,91 @@
},
{
"key": 3,
- "type": 1,
+ "type": 0,
"storyText": {
- "key": "（乌龟大师）：孩子，你是追逐名誉至此的勇士。",
- "text": "（乌龟大师）：孩子，你是追逐名誉至此的勇士。"
+ "key": "drawcard_asked_storyText_4",
+ "text": "（乌龟大师）：却无法束缚你的言行。"
},
"optionText1": {
- "key": "1.是主角没错",
- "text": "1.是主角没错"
+ "key": "",
+ "text": ""
},
"optionText2": {
- "key": "2.只是普通肥宅",
- "text": "2.只是普通肥宅"
+ "key": "",
+ "text": ""
}
},
{
"key": 4,
+ "type": 1,
+ "storyText": {
+ "key": "drawcard_asked_storyText_5",
+ "text": "（乌龟大师）：你如今身在阴影下，还是藏在月光中？"
+ },
+ "optionText1": {
+ "key": "drawcard_asked_optionText1_5",
+ "text": "1.在你眼前啊"
+ },
+ "optionText2": {
+ "key": "drawcard_asked_optionText6",
+ "text": "2.在家打游戏呢"
+ }
+ },
+ {
+ "key": 5,
"type": 0,
"storyText": {
- "key": "有趣",
+ "key": "drawcard_asked_storyText_6",
+ "text": "（乌龟大师）：黑暗终将吞没一切"
+ },
+ "optionText1": {
+ "key": "",
"text": ""
},
+ "optionText2": {
+ "key": "",
+ "text": ""
+ }
+ },
+ {
+ "key": 6,
+ "type": 0,
+ "storyText": {
+ "key": "drawcard_asked_storyText_7",
+ "text": "（乌龟大师）：只留一线生机……"
+ },
+ "optionText1": {
+ "key": "",
+ "text": ""
+ },
+ "optionText2": {
+ "key": "",
+ "text": ""
+ }
+ },
+ {
+ "key": 7,
+ "type": 1,
+ "storyText": {
+ "key": "drawcard_asked_storyText_8",
+ "text": "（乌龟大师）：你来见证终局，还是来博取这一线生机？"
+ },
+ "optionText1": {
+ "key": "drawcard_asked_optionText1_8",
+ "text": "1.只能二选一吗？"
+ },
+ "optionText2": {
+ "key": "drawcard_asked_optionText9",
+ "text": "2.我来过新手教程"
+ }
+ },
+ {
+ "key": 8,
+ "type": 0,
+ "storyText": {
+ "key": "drawcard_asked_storyText_9",
+ "text": "（乌龟大师）：有趣！"
+ },
"optionText1": {
"key": "",
"text": ""
diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json
index f94dbeaca..b6ade8f68 100644
--- a/bin/json/game_battleready.json
+++ b/bin/json/game_battleready.json
@@ -957,7 +957,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
- "HideFightUI": 0,
+ "HideFightUI": 1,
"RuleTips": {
"key": "",
"text": ""
@@ -1449,7 +1449,7 @@
},
{
"id": 201,
- "PlayType": 0,
+ "PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_04",
"battleScenes": [
@@ -1458,7 +1458,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
- "HideFightUI": 0,
+ "HideFightUI": 1,
"RuleTips": {
"key": "",
"text": ""
@@ -1486,7 +1486,7 @@
},
{
"id": 202,
- "PlayType": 0,
+ "PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_04",
"battleScenes": [
@@ -1495,7 +1495,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
- "HideFightUI": 0,
+ "HideFightUI": 1,
"RuleTips": {
"key": "",
"text": ""
@@ -1523,7 +1523,7 @@
},
{
"id": 203,
- "PlayType": 0,
+ "PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"battleScenes": [
@@ -2045,7 +2045,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
- "HideFightUI": 0,
+ "HideFightUI": 1,
"RuleTips": {
"key": "",
"text": ""
diff --git a/bin/json/game_bufflottery.json b/bin/json/game_bufflottery.json
index d5739b56f..4374fdc34 100644
--- a/bin/json/game_bufflottery.json
+++ b/bin/json/game_bufflottery.json
@@ -2567,38 +2567,6 @@
"BuffWt": 50,
"TypeWt": 75
},
- {
- "Id": 322,
- "GroupId": 100009,
- "buffID": 770076113,
- "GroupNum": 3,
- "BuffWt": 50,
- "TypeWt": 75
- },
- {
- "Id": 323,
- "GroupId": 100009,
- "buffID": 770077113,
- "GroupNum": 3,
- "BuffWt": 50,
- "TypeWt": 75
- },
- {
- "Id": 324,
- "GroupId": 100009,
- "buffID": 770070113,
- "GroupNum": 3,
- "BuffWt": 50,
- "TypeWt": 75
- },
- {
- "Id": 325,
- "GroupId": 100009,
- "buffID": 770071113,
- "GroupNum": 3,
- "BuffWt": 50,
- "TypeWt": 75
- },
{
"Id": 326,
"GroupId": 100010,
@@ -4231,38 +4199,6 @@
"BuffWt": 50,
"TypeWt": 75
},
- {
- "Id": 530,
- "GroupId": 100023,
- "buffID": 770076113,
- "GroupNum": 3,
- "BuffWt": 50,
- "TypeWt": 75
- },
- {
- "Id": 531,
- "GroupId": 100023,
- "buffID": 770077113,
- "GroupNum": 3,
- "BuffWt": 50,
- "TypeWt": 75
- },
- {
- "Id": 532,
- "GroupId": 100023,
- "buffID": 770070113,
- "GroupNum": 3,
- "BuffWt": 50,
- "TypeWt": 75
- },
- {
- "Id": 533,
- "GroupId": 100023,
- "buffID": 770071113,
- "GroupNum": 3,
- "BuffWt": 50,
- "TypeWt": 75
- },
{
"Id": 534,
"GroupId": 100024,
diff --git a/bin/json/game_bukashiai.json b/bin/json/game_bukashiai.json
index 655cd1742..4bc6bb78f 100644
--- a/bin/json/game_bukashiai.json
+++ b/bin/json/game_bukashiai.json
@@ -11,7 +11,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -39,7 +40,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -67,7 +69,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -95,7 +98,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -123,7 +127,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -151,7 +156,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -179,7 +185,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -207,7 +214,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -235,7 +243,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -263,7 +272,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -291,7 +301,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -319,7 +330,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -347,7 +359,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -375,7 +388,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -403,7 +417,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@@ -431,7 +446,8 @@
20,
30,
40,
- 50
+ 50,
+ 60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index d503507a3..40a72ca6d 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -24146,8 +24146,8 @@
"Npc_event_type": 0,
"NPC": 10014,
"tipstxt": {
- "key": "",
- "text": ""
+ "key": "提示话语",
+ "text": "tipstxt_01"
},
"value": 1,
"filter": [
@@ -24168,7 +24168,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_723",
- "text": "和邦尼兔聊聊"
+ "text": "和梅林聊聊"
},
"type": 20001,
"valid": 1,
@@ -24180,8 +24180,8 @@
"Npc_event_type": 0,
"NPC": 10015,
"tipstxt": {
- "key": "",
- "text": ""
+ "key": "提示话语",
+ "text": "tipstxt_02"
},
"value": 1,
"filter": [
@@ -24260,7 +24260,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_727",
- "text": "性别选择成功"
+ "text": "见证传承者诞生"
},
"type": 72,
"valid": 0,
@@ -24292,7 +24292,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_728",
- "text": "这里收拾收拾"
+ "text": "清扫枯枝"
},
"type": 20001,
"valid": 1,
@@ -24321,7 +24321,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_729",
- "text": "那里收拾收拾"
+ "text": "清扫落叶"
},
"type": 20001,
"valid": 1,
@@ -24366,7 +24366,9 @@
"text": ""
},
"value": 1,
- "filter": [],
+ "filter": [
+ 10021
+ ],
"filter2": []
},
{
@@ -24377,7 +24379,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_731",
- "text": "找乌龟创招募"
+ "text": "迎接新的伙伴吧"
},
"type": 14,
"valid": 0,
@@ -24404,7 +24406,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_732",
- "text": "吃面战斗2场+起名"
+ "text": "平息这场纷争"
},
"type": 70,
"valid": 0,
diff --git a/bin/json/game_buzkashitrack.json b/bin/json/game_buzkashitrack.json
index 6618566d8..f37041af3 100644
--- a/bin/json/game_buzkashitrack.json
+++ b/bin/json/game_buzkashitrack.json
@@ -1,7 +1,7 @@
[
{
"id": 100001,
- "track": "Track",
+ "track": 1,
"type": 0,
"startPos": 1,
"endPos": 2,
@@ -9,7 +9,7 @@
},
{
"id": 100002,
- "track": "Track",
+ "track": 1,
"type": 1,
"startPos": 2,
"endPos": 3,
@@ -17,7 +17,7 @@
},
{
"id": 100003,
- "track": "Track",
+ "track": 1,
"type": 0,
"startPos": 3,
"endPos": 4,
@@ -25,7 +25,7 @@
},
{
"id": 100004,
- "track": "Track",
+ "track": 1,
"type": 1,
"startPos": 4,
"endPos": 5,
@@ -33,7 +33,7 @@
},
{
"id": 100005,
- "track": "Track",
+ "track": 1,
"type": 1,
"startPos": 8,
"endPos": 9,
@@ -41,7 +41,7 @@
},
{
"id": 100006,
- "track": "Track",
+ "track": 1,
"type": 0,
"startPos": 8,
"endPos": 9,
@@ -49,7 +49,7 @@
},
{
"id": 100007,
- "track": "Track",
+ "track": 1,
"type": 0,
"startPos": 10,
"endPos": 11,
@@ -57,7 +57,7 @@
},
{
"id": 100008,
- "track": "Track",
+ "track": 1,
"type": 1,
"startPos": 10,
"endPos": 11,
@@ -65,7 +65,7 @@
},
{
"id": 100009,
- "track": "Track",
+ "track": 1,
"type": 0,
"startPos": 14,
"endPos": 15,
@@ -73,7 +73,7 @@
},
{
"id": 100010,
- "track": "Track",
+ "track": 1,
"type": 1,
"startPos": 14,
"endPos": 15,
@@ -81,7 +81,7 @@
},
{
"id": 100011,
- "track": "Track",
+ "track": 1,
"type": 0,
"startPos": 15,
"endPos": 16,
@@ -89,7 +89,7 @@
},
{
"id": 100012,
- "track": "Track",
+ "track": 1,
"type": 0,
"startPos": 19,
"endPos": 20,
@@ -97,7 +97,7 @@
},
{
"id": 100013,
- "track": "Track",
+ "track": 1,
"type": 0,
"startPos": 20,
"endPos": 21,
@@ -105,7 +105,7 @@
},
{
"id": 100014,
- "track": "Track",
+ "track": 1,
"type": 0,
"startPos": 22,
"endPos": 23,
@@ -113,10 +113,106 @@
},
{
"id": 100015,
- "track": "Track",
+ "track": 1,
"type": 1,
"startPos": 22,
"endPos": 23,
"local": 0
+ },
+ {
+ "id": 100016,
+ "track": 2,
+ "type": 0,
+ "startPos": 5,
+ "endPos": 7,
+ "local": 0
+ },
+ {
+ "id": 100017,
+ "track": 2,
+ "type": 0,
+ "startPos": 5,
+ "endPos": 7,
+ "local": 1
+ },
+ {
+ "id": 100018,
+ "track": 2,
+ "type": 0,
+ "startPos": 5,
+ "endPos": 7,
+ "local": 2
+ },
+ {
+ "id": 100019,
+ "track": 2,
+ "type": 1,
+ "startPos": 11,
+ "endPos": 12,
+ "local": 0
+ },
+ {
+ "id": 100020,
+ "track": 2,
+ "type": 1,
+ "startPos": 11,
+ "endPos": 12,
+ "local": 2
+ },
+ {
+ "id": 100021,
+ "track": 2,
+ "type": 1,
+ "startPos": 11,
+ "endPos": 12,
+ "local": 1
+ },
+ {
+ "id": 100022,
+ "track": 2,
+ "type": 1,
+ "startPos": 16,
+ "endPos": 17,
+ "local": 0
+ },
+ {
+ "id": 100023,
+ "track": 2,
+ "type": 0,
+ "startPos": 17,
+ "endPos": 18,
+ "local": 1
+ },
+ {
+ "id": 100024,
+ "track": 2,
+ "type": 1,
+ "startPos": 17,
+ "endPos": 18,
+ "local": 2
+ },
+ {
+ "id": 100025,
+ "track": 2,
+ "type": 0,
+ "startPos": 18,
+ "endPos": 20,
+ "local": 1
+ },
+ {
+ "id": 100026,
+ "track": 2,
+ "type": 0,
+ "startPos": 18,
+ "endPos": 20,
+ "local": 0
+ },
+ {
+ "id": 100027,
+ "track": 2,
+ "type": 0,
+ "startPos": 18,
+ "endPos": 20,
+ "local": 2
}
]
\ No newline at end of file
diff --git a/bin/json/game_effect.json b/bin/json/game_effect.json
index 5ae1eeabf..396bba9f7 100644
--- a/bin/json/game_effect.json
+++ b/bin/json/game_effect.json
@@ -22,5 +22,13 @@
{
"key": "character_move_brakeOnRunning",
"path": "Effect/Character/effect_character_move_brakeOnRunning.prefab"
+ },
+ {
+ "key": "loading_loop",
+ "path": "Effect/Scenario/effect_openshow_fly_tunnel_01.prefab"
+ },
+ {
+ "key": "loading_blackScreen",
+ "path": "Effect/Scene/Loading/effect_scene_load_blackScreen.prefab"
}
]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 297853c37..d19fb28fb 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -452,7 +452,7 @@
"t": "ps",
"n": 50
},
- "Inletopening": 1,
+ "Inletopening": 0,
"gold": {
"a": "attr",
"t": "gold",
diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json
index 7ee0c6e59..fb8aa16a2 100644
--- a/bin/json/game_guide.json
+++ b/bin/json/game_guide.json
@@ -32,7 +32,7 @@
"mask": 0,
"lock": 0,
"uishow": 0,
- "skiptime": 1000,
+ "skiptime": 10000,
"skip": 0,
"skipgroup": 0,
"reward": []
@@ -102,33 +102,114 @@
"x": 0,
"y": 0
},
- "txt": "1000201",
+ "txt": "1000103",
"speakerface": 0,
"sound": "",
"mask": 1,
"lock": 1,
"uishow": 0,
- "skiptime": 5000,
+ "skiptime": 10000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
- "id": 1000501,
- "group": 5,
+ "id": 1000201,
+ "group": 2,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
- "condition": "funcopen_mail",
- "followtj": "",
- "followguide": 0,
- "finger": [],
+ "condition": "funcopen_hero",
+ "followtj": "OpenHeroCard",
+ "followguide": 1000202,
+ "finger": [
+ "maininterface",
+ "btn_card$"
+ ],
"offset": {
"x": 0,
"y": 0
},
- "fingerTime": 0,
+ "fingerTime": 0.5,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "1000104",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 0,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 10000,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000202,
+ "group": 2,
+ "type": 3,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "",
+ "followtj": "",
+ "followguide": 1000203,
+ "finger": [
+ "herocard",
+ "upbtn$"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0.5,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "1000105",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 0,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 10000,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000203,
+ "group": 2,
+ "type": 3,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "",
+ "followtj": "",
+ "followguide": 1000204,
+ "finger": [
+ "herocard",
+ "roleinformation$.upgrade materials$.list_select",
+ "0",
+ "ItemMaterial$"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0.1,
"objSize": {
"x": 0,
"y": 0
@@ -143,7 +224,394 @@
"mask": 0,
"lock": 0,
"uishow": 0,
- "skiptime": 0,
+ "skiptime": 10000,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000204,
+ "group": 2,
+ "type": 3,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "",
+ "followtj": "",
+ "followguide": 0,
+ "finger": [
+ "herocard",
+ "upbtn$"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0.1,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 0,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 10000,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000301,
+ "group": 3,
+ "type": 3,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "worldtaskexit_accept_20034",
+ "followtj": "",
+ "followguide": 1000302,
+ "finger": [
+ "taskDedailsPopup",
+ "btn_star$"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0.3,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 0,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 5000,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000302,
+ "group": 3,
+ "type": 3,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "",
+ "followtj": "OpenBattleready",
+ "followguide": 1000303,
+ "finger": [
+ "maininterface",
+ "mainCom$.optionList$",
+ "0"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0.3,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 0,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 5000,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000303,
+ "group": 3,
+ "type": 3,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "",
+ "followtj": "",
+ "followguide": 1000304,
+ "finger": [
+ "battleready",
+ "rolelist$",
+ "0"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0.3,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "1000106",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 0,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 5000,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000304,
+ "group": 3,
+ "type": 3,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "",
+ "followtj": "",
+ "followguide": 1000305,
+ "finger": [
+ "battleready",
+ "herolist$",
+ "0"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0.3,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "1000107",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 0,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 5000,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000305,
+ "group": 3,
+ "type": 3,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "",
+ "followtj": "",
+ "followguide": 1000306,
+ "finger": [
+ "battleready",
+ "rolelist$",
+ "0"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0.3,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 0,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 5000,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000306,
+ "group": 3,
+ "type": 3,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "",
+ "followtj": "OpenFight",
+ "followguide": 1000307,
+ "finger": [
+ "battleready",
+ "btn_start$",
+ "0"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0.3,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "1000108",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 0,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 5000,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000307,
+ "group": 3,
+ "type": 1,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "",
+ "followtj": "",
+ "followguide": 1000308,
+ "finger": [
+ "zhandou",
+ "battleactionaxis.herolist$.n2"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "1000109",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 1,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 5001,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000308,
+ "group": 3,
+ "type": 1,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "",
+ "followtj": "",
+ "followguide": 1000309,
+ "finger": [
+ "GRoot",
+ "FloatRoot.InfoRoot.roleinfo_2100.campicon"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "1000110",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 1,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 5002,
+ "skip": 0,
+ "skipgroup": 0,
+ "reward": []
+ },
+ {
+ "id": 1000309,
+ "group": 3,
+ "type": 3,
+ "startPar": "",
+ "parameter": "",
+ "interface": "",
+ "condition": "",
+ "followtj": "",
+ "followguide": 0,
+ "finger": [
+ "zhandou",
+ "skilllist$",
+ "2",
+ "skillbtn"
+ ],
+ "offset": {
+ "x": 0,
+ "y": 0
+ },
+ "fingerTime": 0.3,
+ "objSize": {
+ "x": 0,
+ "y": 0
+ },
+ "objOffset": {
+ "x": 0,
+ "y": 0
+ },
+ "txt": "1000111",
+ "speakerface": 0,
+ "sound": "",
+ "mask": 0,
+ "lock": 0,
+ "uishow": 0,
+ "skiptime": 5000,
"skip": 0,
"skipgroup": 0,
"reward": []
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 5382b3ba4..e04d67217 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -99,7 +99,7 @@
},
"venturetype": 1,
"ventureavatar": [
- "Person/24004/24004_q.prefab"
+ "Person/24004/24005_q.prefab"
],
"scene_effect": [
"miwu"
@@ -216,7 +216,7 @@
},
"venturetype": 1,
"ventureavatar": [
- "Person/24004/24004_q.prefab"
+ "Person/24004/24006_q.prefab"
],
"scene_effect": [
"miwu"
@@ -295,7 +295,7 @@
},
"venturetype": 1,
"ventureavatar": [
- "Person/24004/24004_q.prefab"
+ "Person/24004/24007_q.prefab"
],
"scene_effect": [
"miwu"
@@ -8382,7 +8382,7 @@
"chapterid": 11001,
"group_id": 1001591,
"previous_group_id": [
- 100117
+ 100118
],
"previoustage": 0,
"buried_type": 0,
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index 52b2bcf83..37bd9f979 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -239367,12 +239367,12 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
- "heroid": 44004,
+ "heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
"lv": 1,
- "hppro": 0.2,
+ "hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 75beca9d9..1444e0cbd 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -12,7 +12,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "ty_icon_shz",
"prompt": {
"key": "opencond_opencond_prompt_1",
"text": "主角等级达到1开启"
@@ -20,10 +20,11 @@
"uiid": 0,
"activateType": 0,
"notify": [],
- "kqbx": 0,
+ "kqbx": 1,
+ "kqbx_ui": "btn_card",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_1",
- "text": "主角等级达到1开启"
+ "text": "守护者养成，战力提升"
}
},
{
@@ -39,7 +40,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_1",
"text": "主线关卡通关达到第3章的第8关开启"
@@ -48,6 +49,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_2",
"text": "主线关卡通关达到第3章的第8关开启"
@@ -66,7 +68,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "zc_icon_08_ct",
"prompt": {
"key": "opencond_opencond_prompt_2",
"text": "主角等级达到10开启"
@@ -75,9 +77,10 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_3",
- "text": "主角等级达到10开启"
+ "text": "背包开启"
}
},
{
@@ -93,7 +96,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sd",
"prompt": {
"key": "opencond_opencond_prompt_3",
"text": "主角等级达到1开启"
@@ -102,6 +105,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_4",
"text": "主角等级达到1开启"
@@ -120,7 +124,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "zc_shuru02",
"prompt": {
"key": "opencond_opencond_prompt_4",
"text": "主线关卡通关达到第1章的第1关开启"
@@ -129,6 +133,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_5",
"text": "主线关卡通关达到第1章的第1关开启"
@@ -147,7 +152,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_5",
"text": "主线关卡通关达到第1章的第8关开启"
@@ -156,9 +161,10 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_6",
- "text": "主线关卡通关达到第1章的第8关开启"
+ "text": "商店开启"
}
},
{
@@ -174,7 +180,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_6",
"text": "主角等级达到1开启"
@@ -183,6 +189,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_7",
"text": "主角等级达到1开启"
@@ -201,7 +208,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_7",
"text": "主角等级达到10开启"
@@ -210,6 +217,7 @@
"activateType": 1,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_8",
"text": "主角等级达到10开启"
@@ -228,7 +236,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_8",
"text": "主线关卡通关达到第1章的第8关开启"
@@ -237,6 +245,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_9",
"text": "主线关卡通关达到第1章的第8关开启"
@@ -255,7 +264,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_rw",
"prompt": {
"key": "opencond_opencond_prompt_9",
"text": "主角等级达到1开启"
@@ -264,6 +273,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_10",
"text": "主角等级达到1开启"
@@ -282,7 +292,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "zc_icon_05_ct",
"prompt": {
"key": "opencond_opencond_prompt_10",
"text": "继续完成更多主线任务开启"
@@ -291,6 +301,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_11",
"text": "继续完成更多主线任务开启"
@@ -309,7 +320,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "ty_icon_zh",
"prompt": {
"key": "opencond_opencond_prompt_11",
"text": "主线关卡通关达到第1章的第1关开启"
@@ -317,10 +328,11 @@
"uiid": 0,
"activateType": 0,
"notify": [],
- "kqbx": 0,
+ "kqbx": 1,
+ "kqbx_ui": "btn_recruit",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_12",
- "text": "主线关卡通关达到第1章的第1关开启"
+ "text": "月光的指引，汇聚招募守护者"
}
},
{
@@ -336,7 +348,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_12",
"text": "主角等级达到1开启"
@@ -345,6 +357,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_13",
"text": "主角等级达到1开启"
@@ -363,7 +376,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_13",
"text": "主线关卡通关达到第1章的第1关开启"
@@ -372,6 +385,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_14",
"text": "主线关卡通关达到第1章的第1关开启"
@@ -390,7 +404,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_14",
"text": "主角等级达到1开启"
@@ -399,6 +413,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_15",
"text": "主角等级达到1开启"
@@ -417,7 +432,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_15",
"text": "主角等级达到1开启"
@@ -426,6 +441,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_16",
"text": "主角等级达到1开启"
@@ -444,7 +460,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_16",
"text": "主线关卡通关达到第4章的第4关开启"
@@ -453,6 +469,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_17",
"text": "主线关卡通关达到第4章的第4关开启"
@@ -471,7 +488,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_17",
"text": "主角等级达到999开启"
@@ -480,6 +497,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_18",
"text": "主角等级达到999开启"
@@ -498,7 +516,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_18",
"text": "主角等级达到999开启"
@@ -507,6 +525,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_19",
"text": "主角等级达到999开启"
@@ -525,7 +544,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "zc_icon_05_ct",
"prompt": {
"key": "opencond_opencond_prompt_19",
"text": "主线关卡通关达到第1章的第8关开启"
@@ -534,6 +553,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_20",
"text": "主线关卡通关达到第1章的第8关开启"
@@ -552,7 +572,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_20",
"text": "主角等级达到1开启"
@@ -561,6 +581,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_21",
"text": "主角等级达到1开启"
@@ -579,7 +600,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_21",
"text": "主角等级达到1开启"
@@ -588,6 +609,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_22",
"text": "主角等级达到1开启"
@@ -606,7 +628,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_22",
"text": "主角等级达到1开启"
@@ -615,6 +637,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_23",
"text": "主角等级达到1开启"
@@ -633,7 +656,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_23",
"text": "主角等级达到1开启"
@@ -642,6 +665,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_24",
"text": "主角等级达到1开启"
@@ -660,7 +684,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_24",
"text": "主角等级达到1开启"
@@ -669,6 +693,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_25",
"text": "主角等级达到1开启"
@@ -687,7 +712,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_25",
"text": "主线关卡通关达到第6章的第8关开启"
@@ -696,6 +721,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_26",
"text": "主线关卡通关达到第6章的第8关开启"
@@ -714,7 +740,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_26",
"text": "主角等级达到1开启"
@@ -723,6 +749,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_27",
"text": "主角等级达到1开启"
@@ -741,7 +768,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_27",
"text": "主线关卡通关达到第6章的第8关开启"
@@ -750,6 +777,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_28",
"text": "主线关卡通关达到第6章的第8关开启"
@@ -768,7 +796,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_28",
"text": "主角等级达到1开启"
@@ -777,6 +805,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_29",
"text": "主角等级达到1开启"
@@ -795,7 +824,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_29",
"text": "主线关卡通关达到第4章的第4关开启"
@@ -804,6 +833,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_30",
"text": "主线关卡通关达到第4章的第4关开启"
@@ -822,7 +852,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_30",
"text": "主线关卡通关达到第2章的第8关开启"
@@ -831,6 +861,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_31",
"text": "主线关卡通关达到第2章的第8关开启"
@@ -849,7 +880,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_31",
"text": "主角等级达到1开启"
@@ -858,6 +889,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_32",
"text": "主角等级达到1开启"
@@ -876,7 +908,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_32",
"text": "主角等级达到1开启"
@@ -885,6 +917,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_33",
"text": "主角等级达到1开启"
@@ -903,7 +936,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_33",
"text": "主线关卡通关达到第3章的第4关开启"
@@ -912,6 +945,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_34",
"text": "主线关卡通关达到第3章的第4关开启"
@@ -930,7 +964,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_34",
"text": "主角等级达到1开启"
@@ -939,6 +973,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_35",
"text": "主角等级达到1开启"
@@ -957,7 +992,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_35",
"text": "主角等级达到1开启"
@@ -966,6 +1001,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_36",
"text": "主角等级达到1开启"
@@ -984,7 +1020,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_36",
"text": "主角等级达到1开启"
@@ -993,6 +1029,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_37",
"text": "主角等级达到1开启"
@@ -1011,7 +1048,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_37",
"text": "主线关卡通关达到第3章的第4关开启"
@@ -1020,6 +1057,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_38",
"text": "主线关卡通关达到第3章的第4关开启"
@@ -1038,7 +1076,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_38",
"text": "主线关卡通关达到第5章的第8关开启"
@@ -1047,6 +1085,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_39",
"text": "主线关卡通关达到第5章的第8关开启"
@@ -1065,7 +1104,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_39",
"text": "主角等级达到1开启"
@@ -1074,6 +1113,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_40",
"text": "主角等级达到1开启"
@@ -1092,7 +1132,7 @@
}
],
"wkqbx": 1,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_40",
"text": "主角等级达到1开启"
@@ -1101,6 +1141,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_41",
"text": "主角等级达到1开启"
@@ -1119,7 +1160,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_41",
"text": "主角等级达到1开启"
@@ -1128,6 +1169,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_42",
"text": "主角等级达到1开启"
@@ -1146,7 +1188,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_42",
"text": "主角等级达到1开启"
@@ -1155,6 +1197,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_43",
"text": "主角等级达到1开启"
@@ -1173,7 +1216,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_43",
"text": "主角等级达到1开启"
@@ -1182,6 +1225,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_44",
"text": "主角等级达到1开启"
@@ -1200,7 +1244,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_44",
"text": "主角等级达到50开启"
@@ -1209,6 +1253,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_45",
"text": "主角等级达到50开启"
@@ -1227,7 +1272,7 @@
}
],
"wkqbx": 1,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_45",
"text": "主角等级达到1开启"
@@ -1236,6 +1281,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_46",
"text": "主角等级达到1开启"
@@ -1254,7 +1300,7 @@
}
],
"wkqbx": 1,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_46",
"text": "主角等级达到1开启"
@@ -1263,6 +1309,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_47",
"text": "主角等级达到1开启"
@@ -1281,7 +1328,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_47",
"text": "主角等级达到1开启"
@@ -1290,6 +1337,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_48",
"text": "主角等级达到1开启"
@@ -1308,7 +1356,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_48",
"text": "主角等级达到1开启"
@@ -1317,6 +1365,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_49",
"text": "主角等级达到1开启"
@@ -1335,7 +1384,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_49",
"text": "主角等级达到1开启"
@@ -1344,6 +1393,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_50",
"text": "主角等级达到1开启"
@@ -1362,7 +1412,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_50",
"text": "主角等级达到1开启"
@@ -1371,6 +1421,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_51",
"text": "主角等级达到1开启"
@@ -1389,7 +1440,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_51",
"text": "主角等级达到1开启"
@@ -1398,6 +1449,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_52",
"text": "主角等级达到1开启"
@@ -1416,7 +1468,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_52",
"text": "主角等级达到1开启"
@@ -1425,6 +1477,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_53",
"text": "主角等级达到1开启"
@@ -1443,7 +1496,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_53",
"text": "主角等级达到1开启"
@@ -1452,6 +1505,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_54",
"text": "主角等级达到1开启"
@@ -1470,7 +1524,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_54",
"text": "主角等级达到第4章的第8关开启"
@@ -1479,6 +1533,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_55",
"text": "主角等级达到第4章的第8关开启"
@@ -1497,7 +1552,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "zc_shuru01",
"prompt": {
"key": "opencond_opencond_prompt_55",
"text": "主角等级达到1开启"
@@ -1505,10 +1560,11 @@
"uiid": 0,
"activateType": 0,
"notify": [],
- "kqbx": 0,
+ "kqbx": 1,
+ "kqbx_ui": "btn_email",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_56",
- "text": "主角等级达到1开启"
+ "text": "月中人也要与时俱进收发邮件的拉"
}
},
{
@@ -1524,7 +1580,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_56",
"text": "主角等级达到1开启"
@@ -1533,6 +1589,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_57",
"text": "主角等级达到1开启"
@@ -1551,7 +1608,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_57",
"text": "主角等级达到1开启"
@@ -1560,6 +1617,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_58",
"text": "主角等级达到1开启"
@@ -1578,7 +1636,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_58",
"text": "主角等级达到1开启"
@@ -1587,6 +1645,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_59",
"text": "主角等级达到1开启"
@@ -1605,7 +1664,7 @@
}
],
"wkqbx": 1,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_59",
"text": "主角等级达到1开启"
@@ -1614,6 +1673,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_60",
"text": "主角等级达到1开启"
@@ -1627,7 +1687,7 @@
},
"main": [],
"wkqbx": 1,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_60",
"text": "主线关卡通关达到第1章的第7关开启"
@@ -1636,6 +1696,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_61",
"text": "主线关卡通关达到第1章的第7关开启"
@@ -1654,7 +1715,7 @@
}
],
"wkqbx": 1,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_61",
"text": "主角等级达到1开启"
@@ -1663,6 +1724,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_62",
"text": "主角等级达到1开启"
@@ -1681,7 +1743,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_62",
"text": "主角等级达到1开启"
@@ -1690,6 +1752,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_63",
"text": "主角等级达到1开启"
@@ -1708,7 +1771,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_63",
"text": "主角等级达到1开启"
@@ -1717,6 +1780,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_64",
"text": "主角等级达到1开启"
@@ -1735,7 +1799,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_64",
"text": "主角等级达到1开启"
@@ -1744,6 +1808,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_65",
"text": "主角等级达到1开启"
@@ -1762,7 +1827,7 @@
}
],
"wkqbx": 1,
- "img": "",
+ "img": "ty_qp_tzt",
"prompt": {
"key": "opencond_opencond_prompt_65",
"text": "主线关卡通关达到第3章的第8关开启"
@@ -1771,6 +1836,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_66",
"text": "主线关卡通关达到第3章的第8关开启"
@@ -1789,7 +1855,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_66",
"text": "主角等级达到1开启"
@@ -1800,6 +1866,7 @@
"practice"
],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_67",
"text": "主角等级达到1开启"
@@ -1818,7 +1885,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_67",
"text": "主角等级达到6开启"
@@ -1829,6 +1896,7 @@
"practice"
],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_68",
"text": "主角等级达到6开启"
@@ -1847,7 +1915,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_68",
"text": "主角等级达到10开启"
@@ -1858,6 +1926,7 @@
"practice"
],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_69",
"text": "主角等级达到10开启"
@@ -1876,7 +1945,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_69",
"text": "主角等级达到2开启"
@@ -1885,6 +1954,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_70",
"text": "主角等级达到2开启"
@@ -1903,7 +1973,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_70",
"text": "主线关卡通关达到第2章的第4关开启"
@@ -1912,6 +1982,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_71",
"text": "主线关卡通关达到第2章的第4关开启"
@@ -1930,7 +2001,7 @@
}
],
"wkqbx": 3,
- "img": "",
+ "img": "ty_qp_jx",
"prompt": {
"key": "opencond_opencond_prompt_71",
"text": "主角等级达到10开启"
@@ -1939,6 +2010,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_72",
"text": "主角等级达到10开启"
@@ -1957,7 +2029,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_72",
"text": "主角等级达到70开启"
@@ -1966,6 +2038,7 @@
"activateType": 2,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_73",
"text": "主角等级达到70开启"
@@ -1984,7 +2057,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_73",
"text": "主角等级达到第8章的第8关开启"
@@ -1993,6 +2066,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_74",
"text": "主角等级达到第8章的第8关开启"
@@ -2011,7 +2085,7 @@
}
],
"wkqbx": 0,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_74",
"text": "主角等级达到第12章的第8关开启"
@@ -2020,6 +2094,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_75",
"text": "主角等级达到第12章的第8关开启"
@@ -2038,7 +2113,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "ty_qp_jy",
"prompt": {
"key": "opencond_opencond_prompt_75",
"text": "主线关卡通关达到第6章的第4关开启"
@@ -2047,6 +2122,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_76",
"text": "主线关卡通关达到第6章的第4关开启"
@@ -2065,7 +2141,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "ty_qp_mryj",
"prompt": {
"key": "opencond_opencond_prompt_76",
"text": "主线关卡通关达到第1章的第8关开启"
@@ -2074,6 +2150,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_77",
"text": "主线关卡通关达到第1章的第8关开启"
@@ -2092,7 +2169,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "ty_qp_gsb",
"prompt": {
"key": "opencond_opencond_prompt_77",
"text": "主线关卡通关达到第5章的第4关开启"
@@ -2101,6 +2178,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_78",
"text": "主线关卡通关达到第5章的第4关开启"
@@ -2119,7 +2197,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "icon_qd",
"prompt": {
"key": "opencond_opencond_prompt_78",
"text": "主线关卡通关达到第1章的第8关开启"
@@ -2128,6 +2206,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_79",
"text": "主线关卡通关达到第1章的第8关开启"
@@ -2141,7 +2220,7 @@
},
"main": [],
"wkqbx": 0,
- "img": "",
+ "img": "ty_qp_pr",
"prompt": {
"key": "opencond_opencond_prompt_79",
"text": "主线关卡通关达到第6章的第8关开启"
@@ -2150,6 +2229,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_80",
"text": "主线关卡通关达到第6章的第8关开启"
@@ -2168,7 +2248,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_80",
"text": "好友数量"
@@ -2177,6 +2257,7 @@
"activateType": 2,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_81",
"text": "好友数量"
@@ -2195,7 +2276,7 @@
}
],
"wkqbx": 0,
- "img": "",
+ "img": "ty_icon_lht",
"prompt": {
"key": "opencond_opencond_prompt_81",
"text": "主线关卡通关达到第12章的第8关开启"
@@ -2204,6 +2285,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "opencond_opencond_kqbx_text_82",
"text": "主线关卡通关达到第12章的第8关开启"
@@ -2217,7 +2299,7 @@
},
"main": [],
"wkqbx": 0,
- "img": "",
+ "img": "ty_icon_wjt",
"prompt": {
"key": "opencond_opencond_prompt_82",
"text": "主线关卡通关达到第10章的第8关开启"
@@ -2226,6 +2308,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2244,7 +2327,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "cgt_icon_hfsj",
"prompt": {
"key": "opencond_opencond_prompt_83",
"text": "主线关卡通关达到第10章的第8关开启"
@@ -2253,6 +2336,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2271,7 +2355,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_84",
"text": "主线关卡通关达到第4章的第8关开启"
@@ -2280,6 +2364,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2298,7 +2383,7 @@
}
],
"wkqbx": 2,
- "img": "zc_icon_01",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_84",
"text": "主线关卡通关达到第8章的第8关开启"
@@ -2307,6 +2392,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2325,7 +2411,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_85",
"text": "主角等级达到10开启"
@@ -2336,6 +2422,7 @@
"dailytask"
],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2354,7 +2441,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_86",
"text": "主角等级达到4开启"
@@ -2363,6 +2450,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2381,7 +2469,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "opencond_opencond_prompt_87",
"text": "主角等级达到10开启"
@@ -2390,6 +2478,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2408,7 +2497,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2417,6 +2506,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2435,7 +2525,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2444,6 +2534,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2462,7 +2553,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2471,6 +2562,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2489,7 +2581,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2498,6 +2590,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2516,7 +2609,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2525,6 +2618,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2543,7 +2637,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2552,6 +2646,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2570,7 +2665,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2579,6 +2674,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2597,7 +2693,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2606,6 +2702,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2624,7 +2721,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2633,6 +2730,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2651,7 +2749,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2660,6 +2758,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2678,7 +2777,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2687,6 +2786,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2705,7 +2805,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2714,6 +2814,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2732,7 +2833,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2741,6 +2842,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2759,7 +2861,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2768,6 +2870,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2786,7 +2889,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2795,6 +2898,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2813,7 +2917,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2822,6 +2926,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
@@ -2840,7 +2945,7 @@
}
],
"wkqbx": 2,
- "img": "",
+ "img": "icon_sytj",
"prompt": {
"key": "",
"text": ""
@@ -2849,6 +2954,7 @@
"activateType": 0,
"notify": [],
"kqbx": 0,
+ "kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
diff --git a/bin/json/game_puggsyisland.json b/bin/json/game_puggsyisland.json
index 169275263..c9c9a62b9 100644
--- a/bin/json/game_puggsyisland.json
+++ b/bin/json/game_puggsyisland.json
@@ -10,191 +10,113 @@
],
"unlock": {
"key": "guild_guild_boss_boss_name_1",
- "text": "{0}可航行至伯克岛"
+ "text": "{0}天后可航行至伯克岛"
},
"introduce": {
"key": "guild_guild_boss_boss_name_1",
"text": "航行抵达伯克岛"
- }
+ },
+ "scene": "",
+ "png": []
},
{
"node_id": 2,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_2",
- "text": "伯克岛"
+ "text": "战栗海岸"
},
"time": [
- 0
+ 2
],
"unlock": {
"key": "guild_guild_boss_boss_name_2",
- "text": "{0}可航行至伯克岛"
+ "text": "{0}天后可航行至战栗海岸"
},
"introduce": {
"key": "guild_guild_boss_boss_name_2",
- "text": "航行抵达伯克岛"
- }
+ "text": "航行抵达战栗海岸"
+ },
+ "scene": "",
+ "png": []
},
{
"node_id": 3,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_3",
- "text": "伯克岛"
+ "text": "西西伯利亚"
},
"time": [
- 0
+ 4
],
"unlock": {
"key": "guild_guild_boss_boss_name_3",
- "text": "{0}可航行至伯克岛"
+ "text": "{0}天后可航行至西西伯利亚"
},
"introduce": {
"key": "guild_guild_boss_boss_name_3",
- "text": "航行抵达伯克岛"
- }
+ "text": "航行抵达西西伯利亚"
+ },
+ "scene": "",
+ "png": []
},
{
"node_id": 4,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_4",
- "text": "伯克岛"
+ "text": "巴尔干半岛"
},
"time": [
- 0
+ 6
],
"unlock": {
"key": "guild_guild_boss_boss_name_4",
- "text": "{0}可航行至伯克岛"
+ "text": "{0}天后可航行至巴尔干半岛"
},
"introduce": {
"key": "guild_guild_boss_boss_name_4",
- "text": "航行抵达伯克岛"
- }
+ "text": "航行抵达巴尔干半岛"
+ },
+ "scene": "",
+ "png": []
},
{
"node_id": 5,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_5",
- "text": "伯克岛"
+ "text": "新加坡海峡"
},
"time": [
- 0
+ 8
],
"unlock": {
"key": "guild_guild_boss_boss_name_5",
- "text": "{0}可航行至伯克岛"
+ "text": "{0}天后可航行至新加坡海峡"
},
"introduce": {
"key": "guild_guild_boss_boss_name_5",
- "text": "航行抵达伯克岛"
- }
+ "text": "航行抵达新加坡海峡"
+ },
+ "scene": "",
+ "png": []
},
{
"node_id": 6,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_6",
- "text": "战栗海岸"
+ "text": "马奇洛"
},
"time": [
- 3
+ 10
],
"unlock": {
"key": "guild_guild_boss_boss_name_6",
- "text": "{0}可航行至战栗海岸"
+ "text": "{0}天后可航行至马奇洛"
},
"introduce": {
"key": "guild_guild_boss_boss_name_6",
- "text": "航行抵达战栗海岸"
- }
- },
- {
- "node_id": 7,
- "puggsy_name": {
- "key": "guild_guild_boss_boss_name_7",
- "text": "战栗海岸"
+ "text": "航行抵达马奇洛"
},
- "time": [
- 3
- ],
- "unlock": {
- "key": "guild_guild_boss_boss_name_7",
- "text": "{0}可航行至战栗海岸"
- },
- "introduce": {
- "key": "guild_guild_boss_boss_name_7",
- "text": "航行抵达战栗海岸"
- }
- },
- {
- "node_id": 8,
- "puggsy_name": {
- "key": "guild_guild_boss_boss_name_8",
- "text": "战栗海岸"
- },
- "time": [
- 3
- ],
- "unlock": {
- "key": "guild_guild_boss_boss_name_8",
- "text": "{0}可航行至战栗海岸"
- },
- "introduce": {
- "key": "guild_guild_boss_boss_name_8",
- "text": "航行抵达战栗海岸"
- }
- },
- {
- "node_id": 9,
- "puggsy_name": {
- "key": "guild_guild_boss_boss_name_9",
- "text": "维京海峡"
- },
- "time": [
- 6
- ],
- "unlock": {
- "key": "guild_guild_boss_boss_name_9",
- "text": "{0}可航行至维京海峡"
- },
- "introduce": {
- "key": "guild_guild_boss_boss_name_9",
- "text": "航行抵达维京海峡"
- }
- },
- {
- "node_id": 10,
- "puggsy_name": {
- "key": "guild_guild_boss_boss_name_10",
- "text": "维京海峡"
- },
- "time": [
- 6
- ],
- "unlock": {
- "key": "guild_guild_boss_boss_name_10",
- "text": "{0}可航行至维京海峡"
- },
- "introduce": {
- "key": "guild_guild_boss_boss_name_10",
- "text": "航行抵达维京海峡"
- }
- },
- {
- "node_id": 11,
- "puggsy_name": {
- "key": "guild_guild_boss_boss_name_11",
- "text": "维京海峡"
- },
- "time": [
- 6
- ],
- "unlock": {
- "key": "guild_guild_boss_boss_name_11",
- "text": "{0}可航行至维京海峡"
- },
- "introduce": {
- "key": "guild_guild_boss_boss_name_11",
- "text": "航行抵达维京海峡"
- }
+ "scene": "",
+ "png": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_puggsymake.json b/bin/json/game_puggsymake.json
new file mode 100644
index 000000000..4309a3e9e
--- /dev/null
+++ b/bin/json/game_puggsymake.json
@@ -0,0 +1,86 @@
+[
+ {
+ "id": 1,
+ "make_id": 10,
+ "position": 1,
+ "make_text": {
+ "key": "guild_guild_boss_boss_name_1",
+ "text": "拉胚"
+ },
+ "subitem": 1,
+ "png": "",
+ "value": 0
+ },
+ {
+ "id": 2,
+ "make_id": 10,
+ "position": 1,
+ "make_text": {
+ "key": "guild_guild_boss_boss_name_2",
+ "text": "拉胚"
+ },
+ "subitem": 2,
+ "png": "",
+ "value": 0
+ },
+ {
+ "id": 3,
+ "make_id": 10,
+ "position": 1,
+ "make_text": {
+ "key": "guild_guild_boss_boss_name_3",
+ "text": "拉胚"
+ },
+ "subitem": 3,
+ "png": "",
+ "value": 0
+ },
+ {
+ "id": 4,
+ "make_id": 10,
+ "position": 1,
+ "make_text": {
+ "key": "guild_guild_boss_boss_name_4",
+ "text": "拉胚"
+ },
+ "subitem": 4,
+ "png": "",
+ "value": 500
+ },
+ {
+ "id": 5,
+ "make_id": 10,
+ "position": 1,
+ "make_text": {
+ "key": "guild_guild_boss_boss_name_5",
+ "text": "拉胚"
+ },
+ "subitem": 5,
+ "png": "",
+ "value": 500
+ },
+ {
+ "id": 6,
+ "make_id": 10,
+ "position": 1,
+ "make_text": {
+ "key": "guild_guild_boss_boss_name_6",
+ "text": "拉胚"
+ },
+ "subitem": 6,
+ "png": "",
+ "value": 1000
+ },
+ {
+ "id": 7,
+ "make_id": 10,
+ "position": 2,
+ "make_text": {
+ "key": "guild_guild_boss_boss_name_7",
+ "text": "器刃"
+ },
+ "subitem": 1,
+ "png": "",
+ "value": 0
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_puggsystar.json b/bin/json/game_puggsystar.json
new file mode 100644
index 000000000..e68d0c6db
--- /dev/null
+++ b/bin/json/game_puggsystar.json
@@ -0,0 +1,164 @@
+[
+ {
+ "make_id": 1,
+ "make_title": {
+ "key": "puggsy_puggsy_star_make_title_1",
+ "text": "蛋糕工坊"
+ },
+ "make_text": {
+ "key": "puggsy_puggsy_star_make_text_1",
+ "text": "走过路过不要错过，买不了吃亏买不了上当"
+ },
+ "condition_text": {
+ "key": "puggsy_puggsy_star_condition_text_1",
+ "text": "奖励条件：制作出{0}星以上的遗器"
+ },
+ "png": "",
+ "star": 4,
+ "score": 4000,
+ "fire": 1,
+ "value": 1000,
+ "drop": [
+ {
+ "a": "attr",
+ "t": "starcoin",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "make_id": 2,
+ "make_title": {
+ "key": "puggsy_puggsy_star_make_title_2",
+ "text": "玉米工坊"
+ },
+ "make_text": {
+ "key": "puggsy_puggsy_star_make_text_2",
+ "text": "走过路过不要错过，买不了吃亏买不了上当"
+ },
+ "condition_text": {
+ "key": "puggsy_puggsy_star_condition_text_2",
+ "text": "奖励条件：制作出{0}星以上的遗器"
+ },
+ "png": "",
+ "star": 4,
+ "score": 4000,
+ "fire": 2,
+ "value": 1000,
+ "drop": [
+ {
+ "a": "attr",
+ "t": "starcoin",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "make_id": 3,
+ "make_title": {
+ "key": "puggsy_puggsy_star_make_title_3",
+ "text": "香蕉工坊"
+ },
+ "make_text": {
+ "key": "puggsy_puggsy_star_make_text_3",
+ "text": "走过路过不要错过，买不了吃亏买不了上当"
+ },
+ "condition_text": {
+ "key": "puggsy_puggsy_star_condition_text_3",
+ "text": "奖励条件：制作出{0}星以上的遗器"
+ },
+ "png": "",
+ "star": 4,
+ "score": 4000,
+ "fire": 3,
+ "value": 1000,
+ "drop": [
+ {
+ "a": "attr",
+ "t": "starcoin",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "make_id": 4,
+ "make_title": {
+ "key": "puggsy_puggsy_star_make_title_4",
+ "text": "西瓜工坊"
+ },
+ "make_text": {
+ "key": "puggsy_puggsy_star_make_text_4",
+ "text": "走过路过不要错过，买不了吃亏买不了上当"
+ },
+ "condition_text": {
+ "key": "puggsy_puggsy_star_condition_text_4",
+ "text": "奖励条件：制作出{0}星以上的遗器"
+ },
+ "png": "",
+ "star": 4,
+ "score": 4000,
+ "fire": 1,
+ "value": 1000,
+ "drop": [
+ {
+ "a": "attr",
+ "t": "starcoin",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "make_id": 5,
+ "make_title": {
+ "key": "puggsy_puggsy_star_make_title_5",
+ "text": "冰淇淋工坊"
+ },
+ "make_text": {
+ "key": "puggsy_puggsy_star_make_text_5",
+ "text": "走过路过不要错过，买不了吃亏买不了上当"
+ },
+ "condition_text": {
+ "key": "puggsy_puggsy_star_condition_text_5",
+ "text": "奖励条件：制作出{0}星以上的遗器"
+ },
+ "png": "",
+ "star": 5,
+ "score": 5000,
+ "fire": 2,
+ "value": 1000,
+ "drop": [
+ {
+ "a": "attr",
+ "t": "starcoin",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "make_id": 6,
+ "make_title": {
+ "key": "puggsy_puggsy_star_make_title_6",
+ "text": "番茄工坊"
+ },
+ "make_text": {
+ "key": "puggsy_puggsy_star_make_text_6",
+ "text": "走过路过不要错过，买不了吃亏买不了上当"
+ },
+ "condition_text": {
+ "key": "puggsy_puggsy_star_condition_text_6",
+ "text": "奖励条件：制作出{0}星以上的遗器"
+ },
+ "png": "",
+ "star": 5,
+ "score": 5000,
+ "fire": 3,
+ "value": 1000,
+ "drop": [
+ {
+ "a": "attr",
+ "t": "starcoin",
+ "n": 1
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_repeatall.json b/bin/json/game_repeatall.json
index b8dfd0609..7cfbc67d1 100644
--- a/bin/json/game_repeatall.json
+++ b/bin/json/game_repeatall.json
@@ -2,16 +2,16 @@
{
"key": 1,
"optionName": {
- "key": "111",
+ "key": "achieve_achieve_all_achieve_group_id_02",
"text": "清扫场地"
},
- "model": "组件名称",
- "actionType": 5,
- "actionParam": "5#timeline_target",
- "num": 2,
+ "model": "20030_扫地点1号",
+ "actionType": 1,
+ "actionParam": "3#camerapose_2",
+ "num": 1,
"triggerWeight": [
- 90,
- 10
+ 100,
+ 0
],
"triggerOne": [
7000050
@@ -23,6 +23,7 @@
"n": 5
}
],
+ "triggerThree": 0,
"cdText": {
"key": "repeat_repeat_all_cdtxt_01",
"text": "地面干净了不少。"
diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json
index 21b366c12..8d45403e3 100644
--- a/bin/json/game_shop.json
+++ b/bin/json/game_shop.json
@@ -10,6 +10,7 @@
"key": "",
"text": ""
},
+ "opencond": "shop1",
"rtype": 1,
"rtime": 8,
"rnum": 8,
@@ -42,6 +43,7 @@
"key": "",
"text": ""
},
+ "opencond": "shop2",
"rtype": 2,
"rtime": 1,
"rnum": -1,
@@ -67,6 +69,7 @@
"key": "shop_shop_upper_shop_3",
"text": "奇趣商店"
},
+ "opencond": "shop3",
"rtype": 2,
"rtime": 1,
"rnum": -1,
@@ -91,6 +94,7 @@
"key": "shop_shop_upper_shop_4",
"text": "奇趣商店"
},
+ "opencond": "shop4",
"rtype": 2,
"rtime": 7,
"rnum": -1,
@@ -117,6 +121,7 @@
"key": "shop_shop_upper_shop_5",
"text": "奇趣商店"
},
+ "opencond": "shop5",
"rtype": 2,
"rtime": 7,
"rnum": -1,
@@ -143,6 +148,7 @@
"key": "shop_shop_upper_shop_6",
"text": "奇趣商店"
},
+ "opencond": "shop6",
"rtype": 2,
"rtime": 21,
"rnum": -1,
@@ -170,6 +176,7 @@
"key": "shop_shop_upper_shop_7",
"text": "主线商店"
},
+ "opencond": "shop7",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@@ -197,6 +204,7 @@
"key": "shop_shop_upper_shop_8",
"text": "主线商店"
},
+ "opencond": "shop8",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@@ -227,6 +235,7 @@
"key": "shop_shop_upper_shop_9",
"text": "主线商店"
},
+ "opencond": "shop9",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@@ -257,6 +266,7 @@
"key": "shop_shop_upper_shop_10",
"text": "主线商店"
},
+ "opencond": "shop10",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@@ -287,6 +297,7 @@
"key": "shop_shop_upper_shop_11",
"text": "主线商店"
},
+ "opencond": "shop11",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@@ -314,6 +325,7 @@
"key": "shop_shop_upper_shop_12",
"text": "主线商店"
},
+ "opencond": "shop12",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@@ -344,6 +356,7 @@
"key": "shop_shop_upper_shop_13",
"text": "主线商店"
},
+ "opencond": "shop13",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@@ -374,6 +387,7 @@
"key": "shop_shop_upper_shop_14",
"text": "主线商店"
},
+ "opencond": "shop14",
"rtype": -1,
"rtime": 0,
"rnum": -1,
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 529929b1c..9e87e2bce 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -16525,7 +16525,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
- "Type": 12,
+ "Type": 1,
"Argu": [
2,
2,
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 514fec7bd..d233aacc0 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -9164,8 +9164,8 @@
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
- "Type": 1,
- "CD": 4,
+ "Type": 2,
+ "CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
@@ -9200,8 +9200,8 @@
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
- "Type": 1,
- "CD": 4,
+ "Type": 2,
+ "CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
@@ -9236,8 +9236,8 @@
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
- "Type": 1,
- "CD": 4,
+ "Type": 2,
+ "CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
@@ -9272,8 +9272,8 @@
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
- "Type": 1,
- "CD": 4,
+ "Type": 2,
+ "CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
@@ -9308,7 +9308,7 @@
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
- "Type": 1,
+ "Type": 2,
"CD": 4,
"Where": [],
"Target": 2,
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 1346c7c37..8a1dc41a6 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -12019,7 +12019,9 @@
"text": "减少40%受到的暴击伤害和会心伤害。"
},
"BuffType": 135,
- "EffectArgu": [],
+ "EffectArgu": [
+ 400
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -12247,7 +12249,10 @@
"text": "受到治疗效果降低50%，造成伤害降低30%。"
},
"BuffType": 137,
- "EffectArgu": [],
+ "EffectArgu": [
+ 500,
+ 300
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@@ -12277,8 +12282,13 @@
"key": "skill_skill_buff_Desc_391000107",
"text": "【攻击提升】、【防御提升】、【速度提升】效果提升35%。"
},
- "BuffType": 0,
- "EffectArgu": [],
+ "BuffType": 141,
+ "EffectArgu": [
+ 350,
+ 390001001,
+ 390001002,
+ 390001003
+ ],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
diff --git a/bin/json/game_stonebuff.json b/bin/json/game_stonebuff.json
index dabc5aa57..102422d65 100644
--- a/bin/json/game_stonebuff.json
+++ b/bin/json/game_stonebuff.json
@@ -4938,109 +4938,5 @@
"n": 0
},
"DeleteWt": 40
- },
- {
- "BuffId": 770076113,
- "Type": 999,
- "SkillId": 770076111,
- "BuffLevel": 1,
- "Quality": 5,
- "BuffIcon": "stonehengebuff_770076111",
- "TargetType": 2,
- "CampType": 0,
- "TakeDataType": 0,
- "BuffStory": {
- "key": "stonehenge_buffconfig_BuffStory_191",
- "text": "快睡吧快睡吧，外婆不战而胜的秘诀，可以让敌人至少三天不醒。"
- },
- "BuffUpgradeCost": {
- "a": "item",
- "t": "10000036",
- "n": 0
- },
- "BuffSell": {
- "a": "item",
- "t": "10000036",
- "n": 0
- },
- "DeleteWt": 60
- },
- {
- "BuffId": 770077113,
- "Type": 999,
- "SkillId": 770077111,
- "BuffLevel": 1,
- "Quality": 5,
- "BuffIcon": "stonehengebuff_770077111",
- "TargetType": 2,
- "CampType": 0,
- "TakeDataType": 0,
- "BuffStory": {
- "key": "stonehenge_buffconfig_BuffStory_192",
- "text": "快睡吧快睡吧，外婆不战而胜的秘诀，可以让敌人至少三天不醒。"
- },
- "BuffUpgradeCost": {
- "a": "item",
- "t": "10000036",
- "n": 0
- },
- "BuffSell": {
- "a": "item",
- "t": "10000036",
- "n": 0
- },
- "DeleteWt": 60
- },
- {
- "BuffId": 770070113,
- "Type": 999,
- "SkillId": 770070111,
- "BuffLevel": 1,
- "Quality": 5,
- "BuffIcon": "stonehengebuff_770070111",
- "TargetType": 2,
- "CampType": 0,
- "TakeDataType": 0,
- "BuffStory": {
- "key": "stonehenge_buffconfig_BuffStory_193",
- "text": "沼泽之水的觉醒！霍普挡在众人身前，挡住了铺天盖地的火焰攻击。"
- },
- "BuffUpgradeCost": {
- "a": "item",
- "t": "10000036",
- "n": 0
- },
- "BuffSell": {
- "a": "item",
- "t": "10000036",
- "n": 0
- },
- "DeleteWt": 60
- },
- {
- "BuffId": 770071113,
- "Type": 999,
- "SkillId": 770071111,
- "BuffLevel": 1,
- "Quality": 5,
- "BuffIcon": "stonehengebuff_770071111",
- "TargetType": 1,
- "CampType": 0,
- "TakeDataType": 0,
- "BuffStory": {
- "key": "stonehenge_buffconfig_BuffStory_194",
- "text": "沼泽之水的觉醒！霍普挡在众人身前，挡住了铺天盖地的火焰攻击。"
- },
- "BuffUpgradeCost": {
- "a": "item",
- "t": "10000036",
- "n": 0
- },
- "BuffSell": {
- "a": "item",
- "t": "10000036",
- "n": 0
- },
- "DeleteWt": 60
}
]
\ No newline at end of file
diff --git a/bin/json/game_stoneevent.json b/bin/json/game_stoneevent.json
index ca85cbdf2..2e19a5b55 100644
--- a/bin/json/game_stoneevent.json
+++ b/bin/json/game_stoneevent.json
@@ -271,7 +271,7 @@
"EventId": 16010101,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_14",
- "text": "打开"
+ "text": "拾取"
},
"EventType": 16,
"EventResource": "event_rewardbox_1",
@@ -287,7 +287,7 @@
"EventId": 17002003,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_15",
- "text": "打开"
+ "text": "拾取"
},
"EventType": 17,
"EventResource": "event_rewardbox_2",
@@ -369,7 +369,7 @@
"EventId": 14110101,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_19",
- "text": "战斗"
+ "text": "进入战斗"
},
"EventType": 14,
"EventResource": "event_battle_51004",
@@ -385,7 +385,7 @@
"EventId": 14110102,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_20",
- "text": "战斗"
+ "text": "进入战斗"
},
"EventType": 14,
"EventResource": "event_battle_51002",
@@ -401,7 +401,7 @@
"EventId": 14110103,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_21",
- "text": "战斗"
+ "text": "进入战斗"
},
"EventType": 14,
"EventResource": "event_battle_51003",
@@ -417,7 +417,7 @@
"EventId": 14110104,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_22",
- "text": "战斗"
+ "text": "进入战斗"
},
"EventType": 14,
"EventResource": "event_battle_51005",
@@ -433,7 +433,7 @@
"EventId": 14110105,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_23",
- "text": "战斗"
+ "text": "进入战斗"
},
"EventType": 14,
"EventResource": "event_battle_51002",
@@ -465,7 +465,7 @@
"EventId": 28110501,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_25",
- "text": "首领"
+ "text": "首领战斗"
},
"EventType": 28,
"EventResource": "event_boss_1",
@@ -481,7 +481,7 @@
"EventId": 12100001,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_26",
- "text": "剧情（首领战必出）"
+ "text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@@ -497,7 +497,7 @@
"EventId": 12100002,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_27",
- "text": "剧情（常规）"
+ "text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@@ -513,7 +513,7 @@
"EventId": 12100003,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_28",
- "text": "剧情（常规）"
+ "text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@@ -529,7 +529,7 @@
"EventId": 12100004,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_29",
- "text": "剧情（常规）"
+ "text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@@ -545,7 +545,7 @@
"EventId": 12100005,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_30",
- "text": "剧情（常规）"
+ "text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@@ -561,7 +561,7 @@
"EventId": 12100006,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_31",
- "text": "剧情（常规）"
+ "text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@@ -577,7 +577,7 @@
"EventId": 12100007,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_32",
- "text": "剧情（常规）"
+ "text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@@ -593,7 +593,7 @@
"EventId": 12100008,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_33",
- "text": "剧情（常规）"
+ "text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@@ -609,7 +609,7 @@
"EventId": 12100009,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_34",
- "text": "剧情（常规）"
+ "text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@@ -625,7 +625,7 @@
"EventId": 12100010,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_35",
- "text": "剧情（常规）"
+ "text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@@ -641,7 +641,7 @@
"EventId": 12100011,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_36",
- "text": "剧情（常规）"
+ "text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
diff --git a/bin/json/game_tipstxtmain.json b/bin/json/game_tipstxtmain.json
new file mode 100644
index 000000000..1753d3e33
--- /dev/null
+++ b/bin/json/game_tipstxtmain.json
@@ -0,0 +1,18 @@
+[
+ {
+ "id": 20042,
+ "topname": {
+ "key": "topname_01",
+ "text": "第一章"
+ },
+ "name": {
+ "key": "name_01",
+ "text": "驯龙高手"
+ },
+ "txt": {
+ "key": "txt_01",
+ "text": "这就是驯龙高手"
+ },
+ "map": ""
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_tipstxtsence.json b/bin/json/game_tipstxtsence.json
new file mode 100644
index 000000000..9b7c41b06
--- /dev/null
+++ b/bin/json/game_tipstxtsence.json
@@ -0,0 +1,10 @@
+[
+ {
+ "id": 1,
+ "topname": "GameMain",
+ "name": {
+ "key": "tipstxt_tipstxt_sence_name_01",
+ "text": "中轴城"
+ }
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_topuiconfig.json b/bin/json/game_topuiconfig.json
index 00c825805..0f68650c1 100644
--- a/bin/json/game_topuiconfig.json
+++ b/bin/json/game_topuiconfig.json
@@ -306,6 +306,94 @@
}
]
},
+ {
+ "id": "store",
+ "subId": "7",
+ "currencyField": [
+ {
+ "a": "item",
+ "t": "24011001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": "store",
+ "subId": "8",
+ "currencyField": [
+ {
+ "a": "item",
+ "t": "24021001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": "store",
+ "subId": "9",
+ "currencyField": [
+ {
+ "a": "item",
+ "t": "24031001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": "store",
+ "subId": "10",
+ "currencyField": [
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": "store",
+ "subId": "11",
+ "currencyField": [
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": "store",
+ "subId": "12",
+ "currencyField": [
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": "store",
+ "subId": "13",
+ "currencyField": [
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 1
+ }
+ ]
+ },
+ {
+ "id": "store",
+ "subId": "14",
+ "currencyField": [
+ {
+ "a": "item",
+ "t": "24041001",
+ "n": 1
+ }
+ ]
+ },
{
"id": "storebuypopup",
"subId": "",
diff --git a/bin/json/game_tracktype.json b/bin/json/game_tracktype.json
new file mode 100644
index 000000000..76571ecce
--- /dev/null
+++ b/bin/json/game_tracktype.json
@@ -0,0 +1,12 @@
+[
+ {
+ "Id": 1,
+ "TrackType": 1,
+ "TrackName": "track_1"
+ },
+ {
+ "Id": 2,
+ "TrackType": 2,
+ "TrackName": "track_story"
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 3d32bba49..495179cef 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -12,15 +12,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_1",
- "text": "星空指挥部"
+ "text": "月中人的传承到底在哪里"
},
"task_details": {
"key": "worldtask_world_task_task_details_1",
- "text": "星空指挥部"
+ "text": "所有高深的大师都预言会有一场危机，而我们需要找到月中人的传承。所以，这个“传承”究竟在哪里？"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_1",
- "text": "星空指挥部"
+ "text": "难道世界就没有救世主存在吗"
},
"get_item": [],
"trigger": 0,
@@ -33,24 +33,15 @@
"taskend_removeitem": [],
"auto_accept": 1,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [
3,
- 101
- ],
- "finishparameter": "timeline_target_cut01",
- "fnishipoint": [
- "GameMain",
- "出生点-指挥部",
- "901"
- ],
- "reword": [
- {
- "a": "attr",
- "t": "gold",
- "n": 10000
- }
+ 103
],
+ "finishparameter": "timeline_target_openshow",
+ "fnishipoint": [],
+ "reword": [],
"module": []
},
{
@@ -66,15 +57,15 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_2",
- "text": "中轴城2战斗"
+ "text": "中轴城危机"
},
"task_details": {
"key": "worldtask_world_task_task_details_2",
- "text": "中轴城2战斗"
+ "text": "中轴城几乎被黑沙笼罩，没想到黑暗的力量居然找到了这里。在见乌龟大师之前，先解决这些麻烦吧。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_2",
- "text": "中轴城2战斗"
+ "text": "顺便展示盖世大侠的强大"
},
"get_item": [],
"trigger": 0,
@@ -87,6 +78,7 @@
"taskend_removeitem": [],
"auto_accept": 1,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -107,15 +99,15 @@
"icon": "25002",
"task_name": {
"key": "worldtask_world_task_task_name_3",
- "text": "找乌龟创性别"
+ "text": "石头里蹦出来的人？"
},
"task_details": {
"key": "worldtask_world_task_task_details_3",
- "text": "找乌龟创性别"
+ "text": "阿宝把神秘的水晶石头带回中轴城，乌龟大师能从中看出什么玄机吗？我们寻找的传承者究竟在哪里呢？"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_3",
- "text": "找乌龟创性别"
+ "text": "和乌龟大师聊聊"
},
"get_item": [],
"trigger": 0,
@@ -123,10 +115,11 @@
"completetask": [
12070030
],
- "deliver_npc": 0,
+ "deliver_npc": 100109,
"taskend_removeitem": [],
- "auto_accept": 0,
+ "auto_accept": 1,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -147,15 +140,15 @@
"icon": "25003",
"task_name": {
"key": "worldtask_world_task_task_name_4",
- "text": "主角打扫"
+ "text": "炼就钢铁般的灵魂"
},
"task_details": {
"key": "worldtask_world_task_task_details_4",
- "text": "主角打扫"
+ "text": "据说扫地就能成就钢铁般的灵魂？\n“加油，大概也就扫九个世纪吧！”\n什么？！\n我是谁，我在哪儿，我该……打扫？好吧，这好歹我目前唯一感到亲切熟悉的事情。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_4",
- "text": "主角打扫"
+ "text": "说不定有意外惊喜哦"
},
"get_item": [],
"trigger": 0,
@@ -166,8 +159,9 @@
],
"deliver_npc": 0,
"taskend_removeitem": [],
- "auto_accept": 0,
+ "auto_accept": 1,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -194,15 +188,15 @@
"icon": "25005",
"task_name": {
"key": "worldtask_world_task_task_name_5",
- "text": "打扫完获得阿宝"
+ "text": "圣桃树下的灵枝"
},
"task_details": {
"key": "worldtask_world_task_task_details_5",
- "text": "打扫完获得阿宝"
+ "text": "打扫过程中竟意外收获一根神奇的树枝！不过更重要的收获是我有了一位并肩作战的伙伴——阿宝。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_5",
- "text": "打扫完获得阿宝"
+ "text": "和阿宝聊聊"
},
"get_item": [],
"trigger": 0,
@@ -212,6 +206,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -253,15 +248,15 @@
"icon": "25005",
"task_name": {
"key": "worldtask_world_task_task_name_6",
- "text": "找乌龟创招募"
+ "text": "寻龟问道"
},
"task_details": {
"key": "worldtask_world_task_task_details_6",
- "text": "找乌龟创招募"
+ "text": "乌龟大师说：“我们称之为开始的往往意味着结束 而宣告结束也就是着手开始。”\n难怪阿宝总说大师说话玄乎，真的很难懂啊！"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_6",
- "text": "找乌龟创招募"
+ "text": "聆听龟言龟语"
},
"get_item": [],
"trigger": 0,
@@ -273,6 +268,46 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
+ "lock_add": 0,
+ "finish": [],
+ "finishparameter": "",
+ "fnishipoint": [],
+ "reword": [],
+ "module": []
+ },
+ {
+ "key": 20033,
+ "opencond": "",
+ "lock": 1,
+ "lockend": 999,
+ "ontxe": 20032,
+ "id_after": 20034,
+ "group": 10,
+ "exgroup": 210,
+ "des": 2,
+ "icon": "25005",
+ "task_name": {
+ "key": "worldtask_world_task_task_name_7",
+ "text": "吃饭得花钱"
+ },
+ "task_details": {
+ "key": "worldtask_world_task_task_details_7",
+ "text": "白吃白喝不太好，还是自己付钱吧，但是钱从哪里来呢，咦？"
+ },
+ "npctxt": {
+ "key": "worldtask_world_task_npctxt_7",
+ "text": "和阿宝聊聊"
+ },
+ "get_item": [],
+ "trigger": 0,
+ "npc": 200331,
+ "completetask": [],
+ "deliver_npc": 0,
+ "taskend_removeitem": [],
+ "auto_accept": 1,
+ "tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -296,44 +331,6 @@
],
"module": []
},
- {
- "key": 20033,
- "opencond": "",
- "lock": 1,
- "lockend": 999,
- "ontxe": 20032,
- "id_after": 20034,
- "group": 10,
- "exgroup": 210,
- "des": 2,
- "icon": "25005",
- "task_name": {
- "key": "worldtask_world_task_task_name_7",
- "text": "饭后战斗消化"
- },
- "task_details": {
- "key": "worldtask_world_task_task_details_7",
- "text": "饭前邮件取钱"
- },
- "npctxt": {
- "key": "worldtask_world_task_npctxt_7",
- "text": "饭前邮件取钱"
- },
- "get_item": [],
- "trigger": 0,
- "npc": 200331,
- "completetask": [],
- "deliver_npc": 0,
- "taskend_removeitem": [],
- "auto_accept": 0,
- "tasktips": 0,
- "lock_add": 0,
- "finish": [],
- "finishparameter": "",
- "fnishipoint": [],
- "reword": [],
- "module": []
- },
{
"key": 20034,
"opencond": "",
@@ -347,15 +344,15 @@
"icon": "25005",
"task_name": {
"key": "worldtask_world_task_task_name_8",
- "text": "饭后战斗消化"
+ "text": "一“面”之交"
},
"task_details": {
"key": "worldtask_world_task_task_details_8",
- "text": "饭后战斗消化"
+ "text": "和阿宝相邀去鹅爹面摊吃阳春面，没想到吃面之前还得活动活动筋骨。想跟大家混熟，可不是一件轻松的事情呢。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_8",
- "text": "饭后战斗消化"
+ "text": "吃饱了才有力气干活"
},
"get_item": [],
"trigger": 0,
@@ -367,6 +364,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -407,6 +405,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -463,6 +462,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -529,6 +529,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -569,6 +570,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -609,6 +611,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -649,6 +652,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -689,6 +693,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -729,6 +734,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -769,6 +775,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -809,6 +816,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -849,6 +857,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -889,6 +898,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -929,6 +939,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -969,6 +980,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1009,6 +1021,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1049,6 +1062,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1089,6 +1103,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1150,6 +1165,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1211,6 +1227,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1251,6 +1268,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1291,6 +1309,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1331,6 +1350,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1371,6 +1391,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1411,6 +1432,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1451,6 +1473,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1491,6 +1514,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1552,6 +1576,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1613,6 +1638,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1653,6 +1679,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1693,6 +1720,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1733,6 +1761,7 @@
"taskend_removeitem": [],
"auto_accept": 2,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1773,6 +1802,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1829,6 +1859,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1890,6 +1921,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -1944,6 +1976,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2005,6 +2038,7 @@
"taskend_removeitem": [],
"auto_accept": 1,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2061,6 +2095,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2122,6 +2157,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2178,6 +2214,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2237,6 +2274,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2291,6 +2329,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2352,6 +2391,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2408,6 +2448,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2469,6 +2510,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2525,6 +2567,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2586,6 +2629,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2642,6 +2686,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2703,6 +2748,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2759,6 +2805,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2820,6 +2867,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2874,6 +2922,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2935,6 +2984,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -2991,6 +3041,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3052,6 +3103,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3108,6 +3160,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3169,6 +3222,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3225,6 +3279,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3286,6 +3341,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3342,6 +3398,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3403,6 +3460,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3459,6 +3517,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3520,6 +3579,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3576,6 +3636,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3637,6 +3698,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3693,6 +3755,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3754,6 +3817,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3810,6 +3874,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3871,6 +3936,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3927,6 +3993,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -3988,6 +4055,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4044,6 +4112,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4105,6 +4174,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4161,6 +4231,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4222,6 +4293,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4278,6 +4350,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4339,6 +4412,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4395,6 +4469,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4456,6 +4531,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4512,6 +4588,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4573,6 +4650,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4629,6 +4707,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4690,6 +4769,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4746,6 +4826,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4807,6 +4888,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4863,6 +4945,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4919,6 +5002,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -4980,6 +5064,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5036,6 +5121,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5097,6 +5183,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5153,6 +5240,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5214,6 +5302,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5260,6 +5349,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5306,6 +5396,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5352,6 +5443,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5398,6 +5490,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5444,6 +5537,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5490,6 +5584,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5536,6 +5631,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5582,6 +5678,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5628,6 +5725,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5674,6 +5772,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5720,6 +5819,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5766,6 +5866,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5812,6 +5913,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5858,6 +5960,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5904,6 +6007,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5950,6 +6054,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -5996,6 +6101,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -6042,6 +6148,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6100,6 +6207,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6158,6 +6266,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6216,6 +6325,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6272,6 +6382,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6316,6 +6427,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6368,6 +6480,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6412,6 +6525,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6458,6 +6572,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6504,6 +6619,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6550,6 +6666,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6596,6 +6713,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6640,6 +6758,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6684,6 +6803,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6728,6 +6848,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6772,6 +6893,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6824,6 +6946,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6870,6 +6993,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6916,6 +7040,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -6968,6 +7093,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7014,6 +7140,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7060,6 +7187,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7104,6 +7232,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7148,6 +7277,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7192,6 +7322,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7238,6 +7369,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7284,6 +7416,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7330,6 +7463,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7374,6 +7508,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7418,6 +7553,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7462,6 +7598,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7506,6 +7643,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7550,6 +7688,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7594,6 +7733,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7638,6 +7778,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 2,
"finish": [],
"finishparameter": "",
@@ -7682,6 +7823,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7726,6 +7868,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7772,6 +7915,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
+ "deliver_task": 0,
"lock_add": 1,
"finish": [],
"finishparameter": "",
@@ -7818,6 +7962,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -7879,6 +8024,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -7940,6 +8086,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8001,6 +8148,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8062,6 +8210,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8123,6 +8272,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8184,6 +8334,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8245,6 +8396,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8306,6 +8458,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8367,6 +8520,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8428,6 +8582,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8489,6 +8644,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8550,6 +8706,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8611,6 +8768,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8672,6 +8830,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8733,6 +8892,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8794,6 +8954,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8855,6 +9016,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8916,6 +9078,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -8977,6 +9140,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9038,6 +9202,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9099,6 +9264,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9162,6 +9328,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9225,6 +9392,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9288,6 +9456,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9351,6 +9520,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9414,6 +9584,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9473,6 +9644,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9534,6 +9706,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9593,6 +9766,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9654,6 +9828,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9713,6 +9888,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9774,6 +9950,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9835,6 +10012,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9894,6 +10072,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -9955,6 +10134,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -10016,6 +10196,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -10065,6 +10246,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -10111,6 +10293,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
@@ -10157,6 +10340,7 @@
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
+ "deliver_task": 0,
"lock_add": 0,
"finish": [],
"finishparameter": "",
diff --git a/modules/island/api_complete.go b/modules/island/api_complete.go
index b52da4c3d..97513ae68 100644
--- a/modules/island/api_complete.go
+++ b/modules/island/api_complete.go
@@ -18,7 +18,8 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR
var (
info *pb.DBIsland
conf *cfg.GamePuggsyEventData
- sconf *cfg.GamePuggsyScoreData
+ sconf []*cfg.GamePuggsyScoreData
+ conf4 *cfg.GamePuggsyStarData
item *pb.DBIslandItem
award []*pb.UserAtno
ok bool
@@ -52,7 +53,6 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR
Level: make(map[int32]int32),
}
info.Islands[conf.NodeId] = item
- return
}
if _, ok = item.Level[req.Level]; ok {
@@ -64,11 +64,11 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR
return
}
- if conf.Type == 2 { //战斗管卡
+ if conf.Type == 3 { //战斗管卡
if errdata, _ = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
return
}
- if sconf, err = this.module.configure.getGamePuggsyScoreData(req.Report.Harm); err != nil {
+ if sconf, err = this.module.configure.getGamePuggsyScoreDatas(item.Level[req.Level], req.Report.Harm); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
@@ -76,8 +76,25 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR
}
return
}
- item.Level[req.Level] = 1
- if errdata, award = this.module.DispenseAtno(session, sconf.Reward, true); errdata != nil {
+ item.Level[req.Level] = req.Report.Harm
+ reward := []*cfg.Gameatn{}
+ for _, v := range sconf {
+ reward = append(reward, v.Reward...)
+ }
+ if errdata, award = this.module.DispenseAtno(session, reward, true); errdata != nil {
+ return
+ }
+ } else if conf.Type == 4 {
+ if conf4, err = this.module.configure.getGamePuggsyStarData(req.AwardId); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Title: pb.ErrorCode_ConfigNoFound.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ item.Level[req.Level] = req.AwardId
+ if errdata, award = this.module.DispenseAtno(session, conf4.Drop, true); errdata != nil {
return
}
} else {
diff --git a/modules/island/configure.go b/modules/island/configure.go
index c825f1b41..baf064bb3 100644
--- a/modules/island/configure.go
+++ b/modules/island/configure.go
@@ -15,6 +15,7 @@ const (
game_puggsyfight = "game_puggsyfight.json"
game_puggsyscore = "game_puggsyscore.json"
game_puggsypasscheck = "game_puggsypasscheck.json"
+ game_puggsystar = "game_puggsystar.json"
)
// /背包配置管理组件
@@ -32,6 +33,7 @@ func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp
err = this.LoadConfigure(game_puggsyfight, cfg.NewGamePuggsyFight)
err = this.LoadConfigure(game_puggsyscore, cfg.NewGamePuggsyScore)
err = this.LoadConfigure(game_puggsypasscheck, cfg.NewGamePuggsyPasscheck)
+ err = this.LoadConfigure(game_puggsystar, cfg.NewGamePuggsyStar)
return
}
@@ -132,6 +134,26 @@ func (this *ConfigureComp) getGamePuggsyScoreData(harm int32) (results *cfg.Game
return
}
+// 获取伤害对应的评分组
+func (this *ConfigureComp) getGamePuggsyScoreDatas(min, max int32) (confs []*cfg.GamePuggsyScoreData, err error) {
+ var (
+ v interface{}
+ )
+
+ if v, err = this.GetConfigure(game_puggsyscore); err != nil {
+ return
+ } else {
+ for _, v := range v.(*cfg.GamePuggsyScore).GetDataList() {
+ if v.RankUp > min && v.RankUp <= max {
+ confs = append(confs, v)
+ }
+ }
+ err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_puggsyscore, fmt.Sprintf("%d-%d", min, max))
+ this.module.Errorf("err:%v", err)
+ }
+ return
+}
+
// 获取伤害对应的评分组
func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePuggsyPasscheckData, err error) {
var (
@@ -144,3 +166,22 @@ func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePugg
}
return
}
+
+// 获取伤害对应的评分组
+func (this *ConfigureComp) getGamePuggsyStarData(id int32) (conf *cfg.GamePuggsyStarData, err error) {
+ var (
+ v interface{}
+ ok bool
+ )
+
+ if v, err = this.GetConfigure(game_puggsystar); err != nil {
+ return
+ } else {
+ if conf, ok = v.(*cfg.GamePuggsyStar).GetDataMap()[id]; !ok {
+ err = fmt.Errorf("no found Material:%d configure", id)
+ this.module.Errorf("err:%v", err)
+ return
+ }
+ }
+ return
+}
diff --git a/pb/island_msg.pb.go b/pb/island_msg.pb.go
index a6cdc7309..50846fd93 100644
--- a/pb/island_msg.pb.go
+++ b/pb/island_msg.pb.go
@@ -232,9 +232,10 @@ type IsLandCompleteReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"`
- Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报 打怪事件完成需要提交战报
- Pos string `protobuf:"bytes,4,opt,name=pos,proto3" json:"pos"`
+ Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"`
+ AwardId int32 `protobuf:"varint,2,opt,name=awardId,proto3" json:"awardId"`
+ Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报 打怪事件完成需要提交战报
+ Pos string `protobuf:"bytes,4,opt,name=pos,proto3" json:"pos"`
}
func (x *IsLandCompleteReq) Reset() {
@@ -276,6 +277,13 @@ func (x *IsLandCompleteReq) GetLevel() int32 {
return 0
}
+func (x *IsLandCompleteReq) GetAwardId() int32 {
+ if x != nil {
+ return x.AwardId
+ }
+ return 0
+}
+
func (x *IsLandCompleteReq) GetReport() *BattleReport {
if x != nil {
return x.Report
@@ -296,8 +304,9 @@ type IsLandCompleteResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"`
- Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励
+ Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"`
+ AwardId int32 `protobuf:"varint,2,opt,name=awardId,proto3" json:"awardId"`
+ Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励
}
func (x *IsLandCompleteResp) Reset() {
@@ -339,6 +348,13 @@ func (x *IsLandCompleteResp) GetLevel() int32 {
return 0
}
+func (x *IsLandCompleteResp) GetAwardId() int32 {
+ if x != nil {
+ return x.AwardId
+ }
+ return 0
+}
+
func (x *IsLandCompleteResp) GetAward() []*UserAtno {
if x != nil {
return x.Award
@@ -751,42 +767,45 @@ var file_island_island_msg_proto_rawDesc = []byte{
0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49,
- 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x62, 0x0a, 0x11, 0x49, 0x73, 0x4c,
+ 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x7c, 0x0a, 0x11, 0x49, 0x73, 0x4c,
0x61, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14,
0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c,
- 0x65, 0x76, 0x65, 0x6c, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
- 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x70,
- 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x4b, 0x0a,
- 0x12, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52,
- 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61,
- 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
- 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x49, 0x73,
- 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68,
- 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x18, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52,
- 0x65, 0x66, 0x72, 0x65, 0x73, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x73,
- 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x18, 0x01, 0x20,
- 0x03, 0x28, 0x05, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x22, 0x22, 0x0a,
- 0x0c, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a,
- 0x04, 0x63, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x63, 0x69, 0x64,
- 0x73, 0x22, 0x30, 0x0a, 0x0d, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x75, 0x79, 0x52, 0x65,
- 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77,
- 0x61, 0x72, 0x64, 0x22, 0x24, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x55, 0x70, 0x67,
- 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x69, 0x64, 0x22, 0x35, 0x0a, 0x11, 0x49, 0x73, 0x4c,
- 0x61, 0x6e, 0x64, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10,
- 0x0a, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x69, 0x64,
- 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76,
- 0x22, 0x12, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
- 0x65, 0x52, 0x65, 0x71, 0x22, 0x53, 0x0a, 0x11, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65,
- 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x69, 0x6e, 0x66,
- 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61,
- 0x6e, 0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72,
- 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
- 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
- 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x61, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x12, 0x25,
+ 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
+ 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72,
+ 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x65, 0x0a, 0x12, 0x49, 0x73, 0x4c, 0x61, 0x6e,
+ 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
+ 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65,
+ 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x61, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x12, 0x1f, 0x0a,
+ 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55,
+ 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x19,
+ 0x0a, 0x17, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x48, 0x65,
+ 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x18, 0x49, 0x73, 0x4c,
+ 0x61, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f,
+ 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f,
+ 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f,
+ 0x70, 0x22, 0x22, 0x0a, 0x0c, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x75, 0x79, 0x52, 0x65,
+ 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52,
+ 0x04, 0x63, 0x69, 0x64, 0x73, 0x22, 0x30, 0x0a, 0x0d, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42,
+ 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18,
+ 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f,
+ 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x24, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e,
+ 0x64, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6e,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x69, 0x64, 0x22, 0x35, 0x0a,
+ 0x11, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65,
+ 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x03, 0x6e, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x02, 0x6c, 0x76, 0x22, 0x12, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65,
+ 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x22, 0x53, 0x0a, 0x11, 0x49, 0x73, 0x4c, 0x61,
+ 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a,
+ 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42,
+ 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x05,
+ 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73,
+ 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a,
+ 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/sys/configure/structs/Game.BuzkashiTrackData.go b/sys/configure/structs/Game.BuzkashiTrackData.go
index fbab37c70..0e9755b6a 100644
--- a/sys/configure/structs/Game.BuzkashiTrackData.go
+++ b/sys/configure/structs/Game.BuzkashiTrackData.go
@@ -12,7 +12,7 @@ import "errors"
type GameBuzkashiTrackData struct {
Id int32
- Track string
+ Track int32
Type int32
StartPos int32
EndPos int32
@@ -27,7 +27,7 @@ func (*GameBuzkashiTrackData) GetTypeId() int32 {
func (_v *GameBuzkashiTrackData)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.Track, _ok_ = _buf["track"].(string); !_ok_ { err = errors.New("track error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["track"].(float64); !_ok_ { err = errors.New("track error"); return }; _v.Track = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["startPos"].(float64); !_ok_ { err = errors.New("startPos error"); return }; _v.StartPos = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endPos"].(float64); !_ok_ { err = errors.New("endPos error"); return }; _v.EndPos = int32(_tempNum_) }
diff --git a/sys/configure/structs/Game.PuggsyIsLandData.go b/sys/configure/structs/Game.PuggsyIsLandData.go
index 498a47672..147ac36cf 100644
--- a/sys/configure/structs/Game.PuggsyIsLandData.go
+++ b/sys/configure/structs/Game.PuggsyIsLandData.go
@@ -16,6 +16,8 @@ type GamePuggsyIsLandData struct {
Time []int32
Unlock string
Introduce string
+ Scene string
+ Png []string
}
const TypeId_GamePuggsyIsLandData = 36699942
@@ -43,6 +45,21 @@ func (_v *GamePuggsyIsLandData)Deserialize(_buf map[string]interface{}) (err err
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["unlock"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Unlock error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Unlock, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["introduce"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Introduce error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Introduce, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["png"].([]interface{}); !_ok_ { err = errors.New("png error"); return }
+
+ _v.Png = make([]string, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ string
+ { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
+ _v.Png = append(_v.Png, _list_v_)
+ }
+ }
+
return
}
diff --git a/sys/configure/structs/Game.PuggsyMake.go b/sys/configure/structs/Game.PuggsyMake.go
new file mode 100644
index 000000000..7c0023da4
--- /dev/null
+++ b/sys/configure/structs/Game.PuggsyMake.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 GamePuggsyMake struct {
+ _dataMap map[int32]*GamePuggsyMakeData
+ _dataList []*GamePuggsyMakeData
+}
+
+func NewGamePuggsyMake(_buf []map[string]interface{}) (*GamePuggsyMake, error) {
+ _dataList := make([]*GamePuggsyMakeData, 0, len(_buf))
+ dataMap := make(map[int32]*GamePuggsyMakeData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGamePuggsyMakeData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GamePuggsyMake{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GamePuggsyMake) GetDataMap() map[int32]*GamePuggsyMakeData {
+ return table._dataMap
+}
+
+func (table *GamePuggsyMake) GetDataList() []*GamePuggsyMakeData {
+ return table._dataList
+}
+
+func (table *GamePuggsyMake) Get(key int32) *GamePuggsyMakeData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.PuggsyMakeData.go b/sys/configure/structs/Game.PuggsyMakeData.go
new file mode 100644
index 000000000..978d98aee
--- /dev/null
+++ b/sys/configure/structs/Game.PuggsyMakeData.go
@@ -0,0 +1,47 @@
+//------------------------------------------------------------------------------
+//
+// 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 GamePuggsyMakeData struct {
+ Id int32
+ MakeId int32
+ Position int32
+ MakeText string
+ Subitem int32
+ Png string
+ Value int32
+}
+
+const TypeId_GamePuggsyMakeData = 1897320479
+
+func (*GamePuggsyMakeData) GetTypeId() int32 {
+ return 1897320479
+}
+
+func (_v *GamePuggsyMakeData)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["make_id"].(float64); !_ok_ { err = errors.New("make_id error"); return }; _v.MakeId = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["position"].(float64); !_ok_ { err = errors.New("position error"); return }; _v.Position = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["make_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MakeText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MakeText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subitem"].(float64); !_ok_ { err = errors.New("subitem error"); return }; _v.Subitem = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Png, _ok_ = _buf["png"].(string); !_ok_ { err = errors.New("png error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGamePuggsyMakeData(_buf map[string]interface{}) (*GamePuggsyMakeData, error) {
+ v := &GamePuggsyMakeData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.PuggsyStar.go b/sys/configure/structs/Game.PuggsyStar.go
new file mode 100644
index 000000000..f30625755
--- /dev/null
+++ b/sys/configure/structs/Game.PuggsyStar.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 GamePuggsyStar struct {
+ _dataMap map[int32]*GamePuggsyStarData
+ _dataList []*GamePuggsyStarData
+}
+
+func NewGamePuggsyStar(_buf []map[string]interface{}) (*GamePuggsyStar, error) {
+ _dataList := make([]*GamePuggsyStarData, 0, len(_buf))
+ dataMap := make(map[int32]*GamePuggsyStarData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGamePuggsyStarData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.MakeId] = _v
+ }
+ }
+ return &GamePuggsyStar{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GamePuggsyStar) GetDataMap() map[int32]*GamePuggsyStarData {
+ return table._dataMap
+}
+
+func (table *GamePuggsyStar) GetDataList() []*GamePuggsyStarData {
+ return table._dataList
+}
+
+func (table *GamePuggsyStar) Get(key int32) *GamePuggsyStarData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.PuggsyStarData.go b/sys/configure/structs/Game.PuggsyStarData.go
new file mode 100644
index 000000000..a855282bf
--- /dev/null
+++ b/sys/configure/structs/Game.PuggsyStarData.go
@@ -0,0 +1,66 @@
+//------------------------------------------------------------------------------
+//
+// 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 GamePuggsyStarData struct {
+ MakeId int32
+ MakeTitle string
+ MakeText string
+ ConditionText string
+ Png string
+ Star int32
+ Score int32
+ Fire int32
+ Value int32
+ Drop []*Gameatn
+}
+
+const TypeId_GamePuggsyStarData = -1122304381
+
+func (*GamePuggsyStarData) GetTypeId() int32 {
+ return -1122304381
+}
+
+func (_v *GamePuggsyStarData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["make_id"].(float64); !_ok_ { err = errors.New("make_id error"); return }; _v.MakeId = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["make_title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MakeTitle error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MakeTitle, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["make_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MakeText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MakeText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["condition_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ConditionText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ConditionText, _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 _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fire"].(float64); !_ok_ { err = errors.New("fire error"); return }; _v.Fire = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["drop"].([]interface{}); !_ok_ { err = errors.New("drop error"); return }
+
+ _v.Drop = 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.Drop = append(_v.Drop, _list_v_)
+ }
+ }
+
+ return
+}
+
+func DeserializeGamePuggsyStarData(_buf map[string]interface{}) (*GamePuggsyStarData, error) {
+ v := &GamePuggsyStarData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.RepeatAllData.go b/sys/configure/structs/Game.RepeatAllData.go
index 2c362c959..029b92708 100644
--- a/sys/configure/structs/Game.RepeatAllData.go
+++ b/sys/configure/structs/Game.RepeatAllData.go
@@ -20,6 +20,7 @@ type GameRepeatAllData struct {
TriggerWeight []int32
TriggerOne []int32
TriggerTwo []*Gameatn
+ TriggerThree int32
CdText string
Cdtime int32
}
@@ -79,6 +80,7 @@ func (_v *GameRepeatAllData)Deserialize(_buf map[string]interface{}) (err error)
}
}
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["triggerThree"].(float64); !_ok_ { err = errors.New("triggerThree error"); return }; _v.TriggerThree = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["cdText"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.CdText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.CdText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cdtime"].(float64); !_ok_ { err = errors.New("cdtime error"); return }; _v.Cdtime = int32(_tempNum_) }
return
diff --git a/sys/configure/structs/Game.TipstxtMain.go b/sys/configure/structs/Game.TipstxtMain.go
new file mode 100644
index 000000000..f5999ad65
--- /dev/null
+++ b/sys/configure/structs/Game.TipstxtMain.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 GameTipstxtMain struct {
+ _dataMap map[int32]*GameTipstxtMainData
+ _dataList []*GameTipstxtMainData
+}
+
+func NewGameTipstxtMain(_buf []map[string]interface{}) (*GameTipstxtMain, error) {
+ _dataList := make([]*GameTipstxtMainData, 0, len(_buf))
+ dataMap := make(map[int32]*GameTipstxtMainData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameTipstxtMainData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameTipstxtMain{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameTipstxtMain) GetDataMap() map[int32]*GameTipstxtMainData {
+ return table._dataMap
+}
+
+func (table *GameTipstxtMain) GetDataList() []*GameTipstxtMainData {
+ return table._dataList
+}
+
+func (table *GameTipstxtMain) Get(key int32) *GameTipstxtMainData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.TipstxtMainData.go b/sys/configure/structs/Game.TipstxtMainData.go
new file mode 100644
index 000000000..b1f0fb436
--- /dev/null
+++ b/sys/configure/structs/Game.TipstxtMainData.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 GameTipstxtMainData struct {
+ Id int32
+ Topname string
+ Name string
+ Txt string
+ Map string
+}
+
+const TypeId_GameTipstxtMainData = 1396868959
+
+func (*GameTipstxtMainData) GetTypeId() int32 {
+ return 1396868959
+}
+
+func (_v *GameTipstxtMainData)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 __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["topname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Topname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Topname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {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; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.Map, _ok_ = _buf["map"].(string); !_ok_ { err = errors.New("map error"); return } }
+ return
+}
+
+func DeserializeGameTipstxtMainData(_buf map[string]interface{}) (*GameTipstxtMainData, error) {
+ v := &GameTipstxtMainData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.TipstxtSence.go b/sys/configure/structs/Game.TipstxtSence.go
new file mode 100644
index 000000000..42d7df679
--- /dev/null
+++ b/sys/configure/structs/Game.TipstxtSence.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 GameTipstxtSence struct {
+ _dataMap map[int32]*GameTipstxtSenceData
+ _dataList []*GameTipstxtSenceData
+}
+
+func NewGameTipstxtSence(_buf []map[string]interface{}) (*GameTipstxtSence, error) {
+ _dataList := make([]*GameTipstxtSenceData, 0, len(_buf))
+ dataMap := make(map[int32]*GameTipstxtSenceData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameTipstxtSenceData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameTipstxtSence{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameTipstxtSence) GetDataMap() map[int32]*GameTipstxtSenceData {
+ return table._dataMap
+}
+
+func (table *GameTipstxtSence) GetDataList() []*GameTipstxtSenceData {
+ return table._dataList
+}
+
+func (table *GameTipstxtSence) Get(key int32) *GameTipstxtSenceData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.TipstxtSenceData.go b/sys/configure/structs/Game.TipstxtSenceData.go
new file mode 100644
index 000000000..581db8d7d
--- /dev/null
+++ b/sys/configure/structs/Game.TipstxtSenceData.go
@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameTipstxtSenceData struct {
+ Id int32
+ Topname string
+ Name string
+}
+
+const TypeId_GameTipstxtSenceData = 631971756
+
+func (*GameTipstxtSenceData) GetTypeId() int32 {
+ return 631971756
+}
+
+func (_v *GameTipstxtSenceData)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.Topname, _ok_ = _buf["topname"].(string); !_ok_ { err = errors.New("topname error"); return } }
+ {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 } } }
+ return
+}
+
+func DeserializeGameTipstxtSenceData(_buf map[string]interface{}) (*GameTipstxtSenceData, error) {
+ v := &GameTipstxtSenceData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.TrackType.go b/sys/configure/structs/Game.TrackType.go
new file mode 100644
index 000000000..736799397
--- /dev/null
+++ b/sys/configure/structs/Game.TrackType.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 GameTrackType struct {
+ _dataMap map[int32]*GameTrackTypeData
+ _dataList []*GameTrackTypeData
+}
+
+func NewGameTrackType(_buf []map[string]interface{}) (*GameTrackType, error) {
+ _dataList := make([]*GameTrackTypeData, 0, len(_buf))
+ dataMap := make(map[int32]*GameTrackTypeData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameTrackTypeData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameTrackType{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameTrackType) GetDataMap() map[int32]*GameTrackTypeData {
+ return table._dataMap
+}
+
+func (table *GameTrackType) GetDataList() []*GameTrackTypeData {
+ return table._dataList
+}
+
+func (table *GameTrackType) Get(key int32) *GameTrackTypeData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.TrackTypeData.go b/sys/configure/structs/Game.TrackTypeData.go
new file mode 100644
index 000000000..654fb10ce
--- /dev/null
+++ b/sys/configure/structs/Game.TrackTypeData.go
@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+//
+// 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 GameTrackTypeData struct {
+ Id int32
+ TrackType int32
+ TrackName string
+}
+
+const TypeId_GameTrackTypeData = -1868610701
+
+func (*GameTrackTypeData) GetTypeId() int32 {
+ return -1868610701
+}
+
+func (_v *GameTrackTypeData)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["TrackType"].(float64); !_ok_ { err = errors.New("TrackType error"); return }; _v.TrackType = int32(_tempNum_) }
+ { var _ok_ bool; if _v.TrackName, _ok_ = _buf["TrackName"].(string); !_ok_ { err = errors.New("TrackName error"); return } }
+ return
+}
+
+func DeserializeGameTrackTypeData(_buf map[string]interface{}) (*GameTrackTypeData, error) {
+ v := &GameTrackTypeData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go
index 47a1e209c..15ee30194 100644
--- a/sys/configure/structs/Game.WorldTaskData.go
+++ b/sys/configure/structs/Game.WorldTaskData.go
@@ -32,6 +32,7 @@ type GameWorldTaskData struct {
TaskendRemoveitem []*Gameatn
AutoAccept int32
Tasktips int32
+ DeliverTask int32
LockAdd int32
Finish []int32
Finishparameter string
@@ -107,6 +108,7 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tasktips"].(float64); !_ok_ { err = errors.New("tasktips error"); return }; _v.Tasktips = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deliver_task"].(float64); !_ok_ { err = errors.New("deliver_task error"); return }; _v.DeliverTask = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock_add"].(float64); !_ok_ { err = errors.New("lock_add error"); return }; _v.LockAdd = int32(_tempNum_) }
{
var _arr_ []interface{}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index cadf8a4a6..f80f00491 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -304,6 +304,11 @@ type Tables struct {
MoonLv *GameMoonLv
MoonTask *GameMoonTask
AskedRecruit *GameAskedRecruit
+ TipstxtMain *GameTipstxtMain
+ TipstxtSence *GameTipstxtSence
+ TrackType *GameTrackType
+ PuggsyStar *GamePuggsyStar
+ PuggsyMake *GamePuggsyMake
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -2069,5 +2074,35 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.AskedRecruit, err = NewGameAskedRecruit(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_tipstxtmain") ; err != nil {
+ return nil, err
+ }
+ if tables.TipstxtMain, err = NewGameTipstxtMain(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_tipstxtsence") ; err != nil {
+ return nil, err
+ }
+ if tables.TipstxtSence, err = NewGameTipstxtSence(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_tracktype") ; err != nil {
+ return nil, err
+ }
+ if tables.TrackType, err = NewGameTrackType(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_puggsystar") ; err != nil {
+ return nil, err
+ }
+ if tables.PuggsyStar, err = NewGamePuggsyStar(buf) ; err != nil {
+ return nil, err
+ }
+ if buf, err = loader("game_puggsymake") ; err != nil {
+ return nil, err
+ }
+ if tables.PuggsyMake, err = NewGamePuggsyMake(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
diff --git a/sys/configure/structs/game.opencondData.go b/sys/configure/structs/game.opencondData.go
index cc36be3df..0b3eb53df 100644
--- a/sys/configure/structs/game.opencondData.go
+++ b/sys/configure/structs/game.opencondData.go
@@ -21,6 +21,7 @@ type GameOpencondData struct {
ActivateType int32
Notify []string
Kqbx int32
+ KqbxUi string
KqbxText string
}
@@ -67,6 +68,7 @@ func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error)
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["kqbx"].(float64); !_ok_ { err = errors.New("kqbx error"); return }; _v.Kqbx = int32(_tempNum_) }
+ { var _ok_ bool; if _v.KqbxUi, _ok_ = _buf["kqbx_ui"].(string); !_ok_ { err = errors.New("kqbx_ui error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["kqbx_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.KqbxText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.KqbxText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
diff --git a/sys/configure/structs/game.shopData.go b/sys/configure/structs/game.shopData.go
index 0adcf9629..a3e762950 100644
--- a/sys/configure/structs/game.shopData.go
+++ b/sys/configure/structs/game.shopData.go
@@ -15,6 +15,7 @@ type GameShopData struct {
Tab int32
Shopname string
UpperShop string
+ Opencond string
Rtype int32
Rtime int32
Rnum int32
@@ -33,6 +34,7 @@ func (_v *GameShopData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tab"].(float64); !_ok_ { err = errors.New("tab error"); return }; _v.Tab = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["shopname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Shopname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Shopname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["upper_shop"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.UpperShop error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.UpperShop, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ { var _ok_ bool; if _v.Opencond, _ok_ = _buf["opencond"].(string); !_ok_ { err = errors.New("opencond error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rtype"].(float64); !_ok_ { err = errors.New("rtype error"); return }; _v.Rtype = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rtime"].(float64); !_ok_ { err = errors.New("rtime error"); return }; _v.Rtime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rnum"].(float64); !_ok_ { err = errors.New("rnum error"); return }; _v.Rnum = int32(_tempNum_) }