diff --git a/bin/json/game_cardpool.json b/bin/json/game_cardpool.json index e294e3f94..e428ceb0f 100644 --- a/bin/json/game_cardpool.json +++ b/bin/json/game_cardpool.json @@ -2,7 +2,7 @@ { "key": 1, "card_pool_type": "inevitable_20001", - "id": "24001", + "id": "24004", "weight": 1000 }, { diff --git a/bin/json/game_drawpool.json b/bin/json/game_drawpool.json index 217cac18c..dcd8056b5 100644 --- a/bin/json/game_drawpool.json +++ b/bin/json/game_drawpool.json @@ -357,5 +357,27 @@ "consumeA10": [], "consumeB": [], "consumeB10": [] + }, + { + "key": 9, + "recruitment_type": [], + "star3w": 940, + "star4w": 52, + "star5w": 8, + "protect": 100, + "p3pool": "pro_pool20003", + "p4pool": "pro_pool20004", + "p5pool": "pro_pool20005", + "n3pool": "base_pool20003", + "n4pool": "base_pool20004", + "n5pool": "base_pool20005", + "baodi4": 10, + "baidi5": 100, + "etime": -1, + "permission": 1, + "consumeA": [], + "consumeA10": [], + "consumeB": [], + "consumeB10": [] } ] \ No newline at end of file diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json index fb8aa16a2..3dcd0d818 100644 --- a/bin/json/game_guide.json +++ b/bin/json/game_guide.json @@ -615,5 +615,118 @@ "skip": 0, "skipgroup": 0, "reward": [] + }, + { + "id": 1000401, + "group": 4, + "type": 3, + "startPar": "StopTime", + "parameter": "", + "interface": "", + "condition": "flytrigger_Guide1", + "followtj": "", + "followguide": 1000402, + "finger": [ + "flymain", + "btn_left$" + ], + "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": 1000402, + "group": 4, + "type": 1, + "startPar": "", + "parameter": "ResiveTime", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 0, + "finger": [ + "flymain", + "speed$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.3, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 1, + "lock": 0, + "uishow": 0, + "skiptime": 5000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 1000403, + "group": 4, + "type": 3, + "startPar": "StopTime", + "parameter": "ResiveTime", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 0, + "finger": [ + "GRoot" + ], + "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": 5001, + "skip": 0, + "skipgroup": 0, + "reward": [] } ] \ No newline at end of file diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index b0d1c8307..d130faae1 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -42,7 +42,7 @@ { "id": 1005, "scene": "ParkourScene", - "image": "loading_2", + "image": "ld_mh_bg_fc", "icon": "loading_icon_gfxm", "prompt": { "key": "loading_Sheet1_prompt_5", diff --git a/bin/json/game_pandamasjx.json b/bin/json/game_pandamasjx.json index d755930bf..2fc2ba55e 100644 --- a/bin/json/game_pandamasjx.json +++ b/bin/json/game_pandamasjx.json @@ -542,7 +542,7 @@ "type": 2, "name": { "key": "item_pandamas_jx_name_14", - "text": "双头空竹" + "text": "狼牙棒" }, "color": 3, "effects": "", @@ -551,7 +551,7 @@ "img": "panda_20002", "intr": { "key": "item_pandamas_jx_intr_14", - "text": "形如腰鼓,腹内空空,抖动时隐有嗡嗡声响。两只细杆抖动翻转,可腾飞三丈高。师傅用它来训练徒弟们的轻功。" + "text": "细长一根棍棒,浑如灌铅一样沉重。师傅扬言擅长此棍者才算合格的徒弟。悍娇虎为了师傅的认可,勤加苦练,已将其舞得虎虎生风。" }, "standard_text": 0, "special_text": 0, @@ -579,7 +579,7 @@ "type": 2, "name": { "key": "item_pandamas_jx_name_15", - "text": "木爬架" + "text": "不倒翁" }, "color": 3, "effects": "", @@ -588,7 +588,7 @@ "img": "panda_20003", "intr": { "key": "item_pandamas_jx_intr_15", - "text": "木制的爬架,外表看似简单,实则纵横交错,层层叠叠,攀爬中稍有不慎便会坠入陷阱。师傅用它来训练徒弟们的身手。" + "text": "憨态可掬,左右摇摆,看似人畜无害,反弹的后劲能将人弹进墙壁。于摇摆中感受气与力的变化,师傅用它来训练徒弟们的招式。" }, "standard_text": 0, "special_text": 0, @@ -616,7 +616,7 @@ "type": 2, "name": { "key": "item_pandamas_jx_name_16", - "text": "不倒翁" + "text": "双截棍" }, "color": 3, "effects": "", @@ -625,7 +625,7 @@ "img": "panda_20004", "intr": { "key": "item_pandamas_jx_intr_16", - "text": "憨态可掬,左右摇摆,看似人畜无害,反弹的后劲能将人弹进墙壁。于摇摆中感受气与力的变化,师傅用它来训练徒弟们的招式。" + "text": "短小精悍,威力巨大,熟练掌握后犹如腋生双臂,变化无穷。是练习近身格斗公认的好武器。" }, "standard_text": 0, "special_text": 0, @@ -653,7 +653,7 @@ "type": 2, "name": { "key": "item_pandamas_jx_name_17", - "text": "棒槌" + "text": "穿云箭" }, "color": 4, "effects": "", @@ -662,7 +662,7 @@ "img": "panda_20005", "intr": { "key": "item_pandamas_jx_intr_17", - "text": "细长一根棍棒,浑如灌铅一样沉重。师傅扬言擅长此棍者才算合格的徒弟。悍娇虎为了师傅的认可,勤加苦练,已将其舞得虎虎生风。" + "text": "弹指之间,穿破云霄。出匣迅猛,劲道敏捷,仙鹤常用它来练习反应力。" }, "standard_text": 0, "special_text": 0, @@ -701,7 +701,7 @@ "type": 2, "name": { "key": "item_pandamas_jx_name_18", - "text": "铜铃" + "text": "尖刺吊环" }, "color": 4, "effects": "", @@ -710,7 +710,7 @@ "img": "panda_20006", "intr": { "key": "item_pandamas_jx_intr_18", - "text": "娇小玲珑的铜铃,系在白丝带上。叮叮作响,忽急忽缓,如同乐曲一般。但铃铛击中穴位时,却会令人动弹不得,瘙痒难耐。" + "text": "铁制吊环上满是狰狞的尖刺,尖刺上更有无数细小的倒刺。训练时稍不注意,便会连皮带肉被剜下一块。但金猴总能毫发无损。" }, "standard_text": 0, "special_text": 0, @@ -749,7 +749,7 @@ "type": 2, "name": { "key": "item_pandamas_jx_name_19", - "text": "尖刺吊环" + "text": "飞天彩带" }, "color": 4, "effects": "", @@ -758,7 +758,7 @@ "img": "panda_20007", "intr": { "key": "item_pandamas_jx_intr_19", - "text": "铁制吊环上满是狰狞的尖刺,尖刺上更有无数细小的倒刺。训练时稍不注意,便会连皮带肉被剜下一块。但金猴总能毫发无损。" + "text": "华美纤巧的彩带,看似柔弱无力,却能以弱克刚,叫人动弹不得。灵蛇和熊猫美美都喜欢用这个来练习。" }, "standard_text": 0, "special_text": 0, @@ -797,7 +797,7 @@ "type": 2, "name": { "key": "item_pandamas_jx_name_20", - "text": "陀螺" + "text": "孔雀镖" }, "color": 4, "effects": "", @@ -806,7 +806,7 @@ "img": "panda_20008", "intr": { "key": "item_pandamas_jx_intr_20", - "text": "滴溜溜的陀螺,灵动而狡黠,它时刻保持着高速旋转,如何才能让它停止转动呢?阿宝冥思苦想。" + "text": "银白如雪,锋利胜刀,形似羽毛的独门暗器,为武林正道所不齿,但拿来训练徒弟正好。" }, "standard_text": 0, "special_text": 0, @@ -816,7 +816,7 @@ ], "description": { "key": "item_pandamas_jx_description_20", - "text": "训练包容之水守护者,可得2个初级荣耀之光回响材料" + "text": "训练荣耀之光守护者,可得2个初级荣耀之光回响材料" }, "duration": 0, "exp": 0, @@ -845,7 +845,7 @@ "type": 2, "name": { "key": "item_pandamas_jx_name_21", - "text": "大转轮" + "text": "踢板" }, "color": 4, "effects": "", diff --git a/bin/json/game_pricegroup.json b/bin/json/game_pricegroup.json index 7d660281a..db8227060 100644 --- a/bin/json/game_pricegroup.json +++ b/bin/json/game_pricegroup.json @@ -271,5 +271,79 @@ "n": 200 } ] + }, + { + "id": 22, + "pricegroupId": 2001, + "purchasemin": 1, + "purchasemax": 1, + "cost": [] + }, + { + "id": 23, + "pricegroupId": 2001, + "purchasemin": 2, + "purchasemax": 2, + "cost": [] + }, + { + "id": 24, + "pricegroupId": 2001, + "purchasemin": 3, + "purchasemax": 3, + "cost": [] + }, + { + "id": 25, + "pricegroupId": 2001, + "purchasemin": 4, + "purchasemax": 4, + "cost": [] + }, + { + "id": 26, + "pricegroupId": 2001, + "purchasemin": 5, + "purchasemax": 5, + "cost": [] + }, + { + "id": 27, + "pricegroupId": 2001, + "purchasemin": 6, + "purchasemax": 6, + "cost": [ + { + "a": "attr", + "t": "diamond", + "n": 1 + } + ] + }, + { + "id": 28, + "pricegroupId": 2001, + "purchasemin": 7, + "purchasemax": 7, + "cost": [ + { + "a": "attr", + "t": "diamond", + "n": 2 + } + ] + }, + { + "id": 29, + "pricegroupId": 2001, + "purchasemin": 8, + "purchasemax": 8, + "cost": [ + { + "a": "attr", + "t": "diamond", + "n": 200 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_puggsyevent.json b/bin/json/game_puggsyevent.json index 74efb5bc0..cf1ea3874 100644 --- a/bin/json/game_puggsyevent.json +++ b/bin/json/game_puggsyevent.json @@ -3,7 +3,7 @@ "event": 1001, "node_id": 1, "type": 1, - "value": 0, + "value": 200520, "reward": [ { "a": "attr", @@ -15,8 +15,8 @@ { "event": 1002, "node_id": 1, - "type": 2, - "value": 0, + "type": 1, + "value": 200520, "reward": [ { "a": "attr", @@ -28,8 +28,8 @@ { "event": 1003, "node_id": 1, - "type": 2, - "value": 0, + "type": 1, + "value": 200520, "reward": [ { "a": "attr", @@ -41,21 +41,33 @@ { "event": 1004, "node_id": 1, - "type": 3, + "type": 2, "value": 0, - "reward": [] + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] }, { "event": 1005, "node_id": 1, - "type": 4, + "type": 2, "value": 0, - "reward": [] + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] }, { "event": 1006, "node_id": 1, - "type": 1, + "type": 2, "value": 0, "reward": [ { @@ -68,19 +80,59 @@ { "event": 1007, "node_id": 1, - "type": 2, - "value": 0, - "reward": [ - { - "a": "attr", - "t": "starcoin", - "n": 1 - } - ] + "type": 3, + "value": 810301, + "reward": [] }, { "event": 1008, "node_id": 1, + "type": 4, + "value": 1, + "reward": [] + }, + { + "event": 2001, + "node_id": 2, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 2002, + "node_id": 2, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 2003, + "node_id": 2, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 2004, + "node_id": 2, "type": 2, "value": 0, "reward": [ @@ -92,9 +144,9 @@ ] }, { - "event": 1009, - "node_id": 1, - "type": 3, + "event": 2005, + "node_id": 2, + "type": 2, "value": 0, "reward": [ { @@ -105,9 +157,9 @@ ] }, { - "event": 1010, - "node_id": 1, - "type": 4, + "event": 2006, + "node_id": 2, + "type": 2, "value": 0, "reward": [ { @@ -116,5 +168,387 @@ "n": 1 } ] + }, + { + "event": 2007, + "node_id": 2, + "type": 3, + "value": 810301, + "reward": [] + }, + { + "event": 2008, + "node_id": 2, + "type": 4, + "value": 1, + "reward": [] + }, + { + "event": 3001, + "node_id": 3, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 3002, + "node_id": 3, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 3003, + "node_id": 3, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 3004, + "node_id": 3, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 3005, + "node_id": 3, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 3006, + "node_id": 3, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 3007, + "node_id": 3, + "type": 3, + "value": 810301, + "reward": [] + }, + { + "event": 3008, + "node_id": 3, + "type": 4, + "value": 1, + "reward": [] + }, + { + "event": 4001, + "node_id": 4, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 4002, + "node_id": 4, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 4003, + "node_id": 4, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 4004, + "node_id": 4, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 4005, + "node_id": 4, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 4006, + "node_id": 4, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 4007, + "node_id": 4, + "type": 3, + "value": 810301, + "reward": [] + }, + { + "event": 4008, + "node_id": 4, + "type": 4, + "value": 1, + "reward": [] + }, + { + "event": 5001, + "node_id": 5, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 5002, + "node_id": 5, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 5003, + "node_id": 5, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 5004, + "node_id": 5, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 5005, + "node_id": 5, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 5006, + "node_id": 5, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 5007, + "node_id": 5, + "type": 3, + "value": 810301, + "reward": [] + }, + { + "event": 5008, + "node_id": 5, + "type": 4, + "value": 1, + "reward": [] + }, + { + "event": 6001, + "node_id": 6, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 6002, + "node_id": 6, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 6003, + "node_id": 6, + "type": 1, + "value": 200520, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 6004, + "node_id": 6, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 6005, + "node_id": 6, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 6006, + "node_id": 6, + "type": 2, + "value": 0, + "reward": [ + { + "a": "attr", + "t": "starcoin", + "n": 1 + } + ] + }, + { + "event": 6007, + "node_id": 6, + "type": 3, + "value": 810301, + "reward": [] + }, + { + "event": 6008, + "node_id": 6, + "type": 4, + "value": 1, + "reward": [] } ] \ No newline at end of file diff --git a/bin/json/game_puggsyisland.json b/bin/json/game_puggsyisland.json index c9c9a62b9..d3ad7efcd 100644 --- a/bin/json/game_puggsyisland.json +++ b/bin/json/game_puggsyisland.json @@ -16,7 +16,7 @@ "key": "guild_guild_boss_boss_name_1", "text": "航行抵达伯克岛" }, - "scene": "", + "scene": 10008, "png": [] }, { @@ -36,7 +36,7 @@ "key": "guild_guild_boss_boss_name_2", "text": "航行抵达战栗海岸" }, - "scene": "", + "scene": 10008, "png": [] }, { @@ -56,7 +56,7 @@ "key": "guild_guild_boss_boss_name_3", "text": "航行抵达西西伯利亚" }, - "scene": "", + "scene": 10008, "png": [] }, { @@ -76,7 +76,7 @@ "key": "guild_guild_boss_boss_name_4", "text": "航行抵达巴尔干半岛" }, - "scene": "", + "scene": 10008, "png": [] }, { @@ -96,7 +96,7 @@ "key": "guild_guild_boss_boss_name_5", "text": "航行抵达新加坡海峡" }, - "scene": "", + "scene": 10008, "png": [] }, { @@ -116,7 +116,7 @@ "key": "guild_guild_boss_boss_name_6", "text": "航行抵达马奇洛" }, - "scene": "", + "scene": 10008, "png": [] } ] \ No newline at end of file diff --git a/bin/json/game_puggsymake.json b/bin/json/game_puggsymake.json index 4309a3e9e..885c9447b 100644 --- a/bin/json/game_puggsymake.json +++ b/bin/json/game_puggsymake.json @@ -1,10 +1,10 @@ [ { "id": 1, - "make_id": 10, + "make_id": 1, "position": 1, "make_text": { - "key": "guild_guild_boss_boss_name_1", + "key": "puggsy_puggsy_make_make_text_1", "text": "拉胚" }, "subitem": 1, @@ -13,10 +13,10 @@ }, { "id": 2, - "make_id": 10, + "make_id": 1, "position": 1, "make_text": { - "key": "guild_guild_boss_boss_name_2", + "key": "puggsy_puggsy_make_make_text_1", "text": "拉胚" }, "subitem": 2, @@ -25,10 +25,10 @@ }, { "id": 3, - "make_id": 10, + "make_id": 1, "position": 1, "make_text": { - "key": "guild_guild_boss_boss_name_3", + "key": "puggsy_puggsy_make_make_text_1", "text": "拉胚" }, "subitem": 3, @@ -37,10 +37,10 @@ }, { "id": 4, - "make_id": 10, + "make_id": 1, "position": 1, "make_text": { - "key": "guild_guild_boss_boss_name_4", + "key": "puggsy_puggsy_make_make_text_1", "text": "拉胚" }, "subitem": 4, @@ -49,10 +49,10 @@ }, { "id": 5, - "make_id": 10, + "make_id": 1, "position": 1, "make_text": { - "key": "guild_guild_boss_boss_name_5", + "key": "puggsy_puggsy_make_make_text_1", "text": "拉胚" }, "subitem": 5, @@ -61,10 +61,10 @@ }, { "id": 6, - "make_id": 10, + "make_id": 1, "position": 1, "make_text": { - "key": "guild_guild_boss_boss_name_6", + "key": "puggsy_puggsy_make_make_text_1", "text": "拉胚" }, "subitem": 6, @@ -73,14 +73,362 @@ }, { "id": 7, - "make_id": 10, + "make_id": 1, "position": 2, "make_text": { - "key": "guild_guild_boss_boss_name_7", + "key": "puggsy_puggsy_make_make_text_2", "text": "器刃" }, "subitem": 1, "png": "", "value": 0 + }, + { + "id": 8, + "make_id": 1, + "position": 2, + "make_text": { + "key": "puggsy_puggsy_make_make_text_2", + "text": "器刃" + }, + "subitem": 2, + "png": "", + "value": 0 + }, + { + "id": 9, + "make_id": 1, + "position": 2, + "make_text": { + "key": "puggsy_puggsy_make_make_text_2", + "text": "器刃" + }, + "subitem": 3, + "png": "", + "value": 0 + }, + { + "id": 10, + "make_id": 1, + "position": 2, + "make_text": { + "key": "puggsy_puggsy_make_make_text_2", + "text": "器刃" + }, + "subitem": 4, + "png": "", + "value": 500 + }, + { + "id": 11, + "make_id": 1, + "position": 2, + "make_text": { + "key": "puggsy_puggsy_make_make_text_2", + "text": "器刃" + }, + "subitem": 5, + "png": "", + "value": 500 + }, + { + "id": 12, + "make_id": 1, + "position": 2, + "make_text": { + "key": "puggsy_puggsy_make_make_text_2", + "text": "器刃" + }, + "subitem": 6, + "png": "", + "value": 1000 + }, + { + "id": 13, + "make_id": 1, + "position": 3, + "make_text": { + "key": "puggsy_puggsy_make_make_text_3", + "text": "傍身" + }, + "subitem": 1, + "png": "", + "value": 0 + }, + { + "id": 14, + "make_id": 1, + "position": 3, + "make_text": { + "key": "puggsy_puggsy_make_make_text_3", + "text": "傍身" + }, + "subitem": 2, + "png": "", + "value": 0 + }, + { + "id": 15, + "make_id": 1, + "position": 3, + "make_text": { + "key": "puggsy_puggsy_make_make_text_3", + "text": "傍身" + }, + "subitem": 3, + "png": "", + "value": 0 + }, + { + "id": 16, + "make_id": 1, + "position": 3, + "make_text": { + "key": "puggsy_puggsy_make_make_text_3", + "text": "傍身" + }, + "subitem": 4, + "png": "", + "value": 500 + }, + { + "id": 17, + "make_id": 1, + "position": 3, + "make_text": { + "key": "puggsy_puggsy_make_make_text_3", + "text": "傍身" + }, + "subitem": 5, + "png": "", + "value": 500 + }, + { + "id": 18, + "make_id": 1, + "position": 3, + "make_text": { + "key": "puggsy_puggsy_make_make_text_3", + "text": "傍身" + }, + "subitem": 6, + "png": "", + "value": 1000 + }, + { + "id": 19, + "make_id": 1, + "position": 4, + "make_text": { + "key": "puggsy_puggsy_make_make_text_4", + "text": "器身" + }, + "subitem": 1, + "png": "", + "value": 0 + }, + { + "id": 20, + "make_id": 1, + "position": 4, + "make_text": { + "key": "puggsy_puggsy_make_make_text_4", + "text": "器身" + }, + "subitem": 2, + "png": "", + "value": 0 + }, + { + "id": 21, + "make_id": 1, + "position": 4, + "make_text": { + "key": "puggsy_puggsy_make_make_text_4", + "text": "器身" + }, + "subitem": 3, + "png": "", + "value": 0 + }, + { + "id": 22, + "make_id": 1, + "position": 4, + "make_text": { + "key": "puggsy_puggsy_make_make_text_4", + "text": "器身" + }, + "subitem": 4, + "png": "", + "value": 500 + }, + { + "id": 23, + "make_id": 1, + "position": 4, + "make_text": { + "key": "puggsy_puggsy_make_make_text_4", + "text": "器身" + }, + "subitem": 5, + "png": "", + "value": 500 + }, + { + "id": 24, + "make_id": 1, + "position": 4, + "make_text": { + "key": "puggsy_puggsy_make_make_text_4", + "text": "器身" + }, + "subitem": 6, + "png": "", + "value": 1000 + }, + { + "id": 25, + "make_id": 1, + "position": 5, + "make_text": { + "key": "puggsy_puggsy_make_make_text_5", + "text": "涂装" + }, + "subitem": 1, + "png": "", + "value": 0 + }, + { + "id": 26, + "make_id": 1, + "position": 5, + "make_text": { + "key": "puggsy_puggsy_make_make_text_5", + "text": "涂装" + }, + "subitem": 2, + "png": "", + "value": 0 + }, + { + "id": 27, + "make_id": 1, + "position": 5, + "make_text": { + "key": "puggsy_puggsy_make_make_text_5", + "text": "涂装" + }, + "subitem": 3, + "png": "", + "value": 0 + }, + { + "id": 28, + "make_id": 1, + "position": 5, + "make_text": { + "key": "puggsy_puggsy_make_make_text_5", + "text": "涂装" + }, + "subitem": 4, + "png": "", + "value": 500 + }, + { + "id": 29, + "make_id": 1, + "position": 5, + "make_text": { + "key": "puggsy_puggsy_make_make_text_5", + "text": "涂装" + }, + "subitem": 5, + "png": "", + "value": 500 + }, + { + "id": 30, + "make_id": 1, + "position": 5, + "make_text": { + "key": "puggsy_puggsy_make_make_text_5", + "text": "涂装" + }, + "subitem": 6, + "png": "", + "value": 1000 + }, + { + "id": 31, + "make_id": 1, + "position": 6, + "make_text": { + "key": "puggsy_puggsy_make_make_text_6", + "text": "刻纹" + }, + "subitem": 1, + "png": "", + "value": 0 + }, + { + "id": 32, + "make_id": 1, + "position": 6, + "make_text": { + "key": "puggsy_puggsy_make_make_text_6", + "text": "刻纹" + }, + "subitem": 2, + "png": "", + "value": 0 + }, + { + "id": 33, + "make_id": 1, + "position": 6, + "make_text": { + "key": "puggsy_puggsy_make_make_text_6", + "text": "刻纹" + }, + "subitem": 3, + "png": "", + "value": 0 + }, + { + "id": 34, + "make_id": 1, + "position": 6, + "make_text": { + "key": "puggsy_puggsy_make_make_text_6", + "text": "刻纹" + }, + "subitem": 4, + "png": "", + "value": 500 + }, + { + "id": 35, + "make_id": 1, + "position": 6, + "make_text": { + "key": "puggsy_puggsy_make_make_text_6", + "text": "刻纹" + }, + "subitem": 5, + "png": "", + "value": 500 + }, + { + "id": 36, + "make_id": 1, + "position": 6, + "make_text": { + "key": "puggsy_puggsy_make_make_text_6", + "text": "刻纹" + }, + "subitem": 6, + "png": "", + "value": 1000 } ] \ No newline at end of file diff --git a/bin/json/game_tdreward.json b/bin/json/game_tdreward.json index e9ce873ed..3bdb04320 100644 --- a/bin/json/game_tdreward.json +++ b/bin/json/game_tdreward.json @@ -7,6 +7,13 @@ "t": "gold", "n": 1000 } + ], + "firstreward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } ] }, { @@ -17,6 +24,13 @@ "t": "gold", "n": 1200 } + ], + "firstreward": [ + { + "a": "item", + "t": "10000001", + "n": 2 + } ] }, { @@ -27,6 +41,13 @@ "t": "gold", "n": 1400 } + ], + "firstreward": [ + { + "a": "item", + "t": "10000001", + "n": 3 + } ] }, { @@ -37,6 +58,13 @@ "t": "gold", "n": 1600 } + ], + "firstreward": [ + { + "a": "item", + "t": "10000001", + "n": 4 + } ] }, { @@ -47,6 +75,13 @@ "t": "gold", "n": 1800 } + ], + "firstreward": [ + { + "a": "item", + "t": "10000001", + "n": 5 + } ] }, { @@ -57,6 +92,13 @@ "t": "gold", "n": 2000 } + ], + "firstreward": [ + { + "a": "item", + "t": "10000001", + "n": 6 + } ] } ] \ No newline at end of file diff --git a/sys/configure/structs/Game.PuggsyIsLandData.go b/sys/configure/structs/Game.PuggsyIsLandData.go index 147ac36cf..c4e70ebf5 100644 --- a/sys/configure/structs/Game.PuggsyIsLandData.go +++ b/sys/configure/structs/Game.PuggsyIsLandData.go @@ -16,7 +16,7 @@ type GamePuggsyIsLandData struct { Time []int32 Unlock string Introduce string - Scene string + Scene int32 Png []string } @@ -45,7 +45,7 @@ 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 _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["scene"].(float64); !_ok_ { err = errors.New("scene error"); return }; _v.Scene = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.TDRewardData.go b/sys/configure/structs/Game.TDRewardData.go index 4ec0d8474..a1b9552a4 100644 --- a/sys/configure/structs/Game.TDRewardData.go +++ b/sys/configure/structs/Game.TDRewardData.go @@ -13,6 +13,7 @@ import "errors" type GameTDRewardData struct { Id int32 Reward []*Gameatn + Firstreward []*Gameatn } const TypeId_GameTDRewardData = 8107621 @@ -37,6 +38,20 @@ func (_v *GameTDRewardData)Deserialize(_buf map[string]interface{}) (err error) } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["firstreward"].([]interface{}); !_ok_ { err = errors.New("firstreward error"); return } + + _v.Firstreward = 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.Firstreward = append(_v.Firstreward, _list_v_) + } + } + return }