diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 2e42506a5..504eafb8d 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -2085,7 +2085,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_74", - "text": "加入{0}次公会" + "text": "加入{0}次俱乐部" }, "type": 109, "valid": 0, @@ -9960,7 +9960,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_359", - "text": "创建公会" + "text": "创建俱乐部" }, "type": 188, "valid": 0, @@ -18687,7 +18687,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_658", - "text": "加入{0}次公会" + "text": "加入{0}次俱乐部" }, "type": 109, "valid": 0, @@ -19620,7 +19620,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_691", - "text": "狩猎掉落{0}个觉醒材料" + "text": "猎魂掉落{0}个觉醒材料" }, "type": 154, "valid": 0, @@ -21400,7 +21400,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_754", - "text": "调查一下公会" + "text": "调查一下俱乐部" }, "type": 70, "valid": 0, @@ -22678,7 +22678,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_798", - "text": "加入任意公会" + "text": "加入任意俱乐部" }, "type": 109, "valid": 0, @@ -23365,7 +23365,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_822", - "text": "冒险关卡困难1-3" + "text": "冒险之旅困难1-3" }, "type": 61, "valid": 0, @@ -23394,7 +23394,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_823", - "text": "冒险关卡困难1-6" + "text": "冒险之旅困难1-6" }, "type": 61, "valid": 0, @@ -23423,7 +23423,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_824", - "text": "冒险关卡困难2-3" + "text": "冒险之旅困难2-3" }, "type": 61, "valid": 0, @@ -23452,7 +23452,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_825", - "text": "冒险关卡困难2-6" + "text": "冒险之旅困难2-6" }, "type": 61, "valid": 0, @@ -23481,7 +23481,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_826", - "text": "冒险关卡困难3-3" + "text": "冒险之旅困难3-3" }, "type": 61, "valid": 0, @@ -23510,7 +23510,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_827", - "text": "冒险关卡困难3-6" + "text": "冒险之旅困难3-6" }, "type": 61, "valid": 0, @@ -23539,7 +23539,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_828", - "text": "冒险关卡困难4-3" + "text": "冒险之旅困难4-3" }, "type": 61, "valid": 0, @@ -23568,7 +23568,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_829", - "text": "冒险关卡困难4-6" + "text": "冒险之旅困难4-6" }, "type": 61, "valid": 0, @@ -23597,7 +23597,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_830", - "text": "冒险关卡困难5-3" + "text": "冒险之旅困难5-3" }, "type": 61, "valid": 0, @@ -23626,7 +23626,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_831", - "text": "冒险关卡困难5-6" + "text": "冒险之旅困难5-6" }, "type": 61, "valid": 0, @@ -23655,7 +23655,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_832", - "text": "冒险关卡困难6-3" + "text": "冒险之旅困难6-3" }, "type": 61, "valid": 0, @@ -23684,7 +23684,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_833", - "text": "冒险关卡困难6-6" + "text": "冒险之旅困难6-6" }, "type": 61, "valid": 0, @@ -23713,7 +23713,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_834", - "text": "冒险关卡困难7-3" + "text": "冒险之旅困难7-3" }, "type": 61, "valid": 0, @@ -23742,7 +23742,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_835", - "text": "冒险关卡困难7-6" + "text": "冒险之旅困难7-6" }, "type": 61, "valid": 0, @@ -23771,7 +23771,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_836", - "text": "冒险关卡困难8-3" + "text": "冒险之旅困难8-3" }, "type": 61, "valid": 0, @@ -23800,7 +23800,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_837", - "text": "冒险关卡困难8-6" + "text": "冒险之旅困难8-6" }, "type": 61, "valid": 0, @@ -23829,7 +23829,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_838", - "text": "冒险关卡困难9-3" + "text": "冒险之旅困难9-3" }, "type": 61, "valid": 0, @@ -23858,7 +23858,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_839", - "text": "冒险关卡困难9-6" + "text": "冒险之旅困难9-6" }, "type": 61, "valid": 0, @@ -23887,7 +23887,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_840", - "text": "冒险关卡困难10-3" + "text": "冒险之旅困难10-3" }, "type": 61, "valid": 0, @@ -23916,7 +23916,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_841", - "text": "冒险关卡困难10-6" + "text": "冒险之旅困难10-6" }, "type": 61, "valid": 0, @@ -23945,7 +23945,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_842", - "text": "冒险关卡困难11-3" + "text": "冒险之旅困难11-3" }, "type": 61, "valid": 0, @@ -23974,7 +23974,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_843", - "text": "冒险关卡困难11-6" + "text": "冒险之旅困难11-6" }, "type": 61, "valid": 0, @@ -24003,7 +24003,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_844", - "text": "冒险关卡困难12-3" + "text": "冒险之旅困难12-3" }, "type": 61, "valid": 0, @@ -24032,7 +24032,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_845", - "text": "冒险关卡困难12-6" + "text": "冒险之旅困难12-6" }, "type": 61, "valid": 0, @@ -24193,7 +24193,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_852", - "text": "本周累计经验副本消耗300体力" + "text": "本周累计梦境回廊消耗300体力" }, "type": 201, "valid": 0, @@ -24215,7 +24215,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_853", - "text": "本周累计经验副本消耗600体力" + "text": "本周累计梦境回廊消耗600体力" }, "type": 201, "valid": 0, @@ -24237,7 +24237,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_854", - "text": "本周累计经验副本消耗1000体力" + "text": "本周累计梦境回廊消耗1000体力" }, "type": 201, "valid": 0, @@ -24921,7 +24921,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_878", - "text": "挑战3次“狩猎”副本" + "text": "挑战3次“猎魂”副本" }, "type": 200, "valid": 0, @@ -26125,7 +26125,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_930", - "text": "[挑战任务]狩猎挑战5次" + "text": "[挑战任务]猎魂挑战5次" }, "type": 200, "valid": 0, diff --git a/bin/json/game_celebration.json b/bin/json/game_celebration.json index 7dd3db67b..37bb10f8f 100644 --- a/bin/json/game_celebration.json +++ b/bin/json/game_celebration.json @@ -12,7 +12,7 @@ "days": 2, "tipstxt": { "key": "celebration_celebration_tipstxt_1", - "text": "每日前{0}次挑战狩猎任意boss,可以获得双倍奖励" + "text": "每日前{0}次挑战猎魂任意boss,可以获得双倍奖励" } }, { @@ -28,7 +28,7 @@ "days": 2, "tipstxt": { "key": "celebration_celebration_tipstxt_2", - "text": "每日前{0}次挑战经验副本,可以获得双倍奖励" + "text": "每日前{0}次挑战梦境回廊,可以获得双倍奖励" } }, { @@ -48,7 +48,7 @@ "days": 2, "tipstxt": { "key": "celebration_celebration_tipstxt_3", - "text": "每日前{0}次挑战坍台,可以获得双倍奖励,每名boss每日分别只能挑战{1}次" + "text": "每日前{0}次挑战维京远征,可以获得双倍奖励,每名boss每日分别只能挑战{1}次" } } ] \ No newline at end of file diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json index fc7b1b24d..0a729e50b 100644 --- a/bin/json/game_gamesummarytab.json +++ b/bin/json/game_gamesummarytab.json @@ -132,7 +132,7 @@ "scale": 0.65, "usetext": { "key": "gamesummary_fathernode_usetext_8", - "text": "" + "text": "这里传说拥有无穷无尽的战斗!同样的,奖励也是无穷无尽的!" } }, { @@ -149,7 +149,7 @@ "scale": 0.65, "usetext": { "key": "gamesummary_fathernode_usetext_9", - "text": "" + "text": "万物相生,万物相克。使用克制属性去获取更高的排名与更好的奖励吧!" } }, { diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 386b1b462..fe737b133 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -14215,7 +14215,7 @@ "id": "18000006", "name": { "key": "item_item_name_322", - "text": "公会挑战券" + "text": "俱乐部挑战券" }, "usetype": 2, "color": 2, @@ -14240,7 +14240,7 @@ "img": "wp_icon_jjcq", "intr": { "key": "item_item_intr_331", - "text": "公会挑战券,是进入公会BOSS的凭证。" + "text": "俱乐部挑战券,是进入俱乐部BOSS的凭证。" }, "describe": { "key": "item_item_describe_331", diff --git a/bin/json/game_itemlink.json b/bin/json/game_itemlink.json index d63e493b5..99415727d 100644 --- a/bin/json/game_itemlink.json +++ b/bin/json/game_itemlink.json @@ -71,11 +71,11 @@ "id": 126, "title": { "key": "itemlink_itemlink_title_5", - "text": "公会商店" + "text": "俱乐部商店" }, "desc": { "key": "itemlink_itemlink_desc_5", - "text": "用公会币可兑换" + "text": "用俱乐部币可兑换" }, "jumpid": 11009, "btnTitle": { @@ -173,11 +173,11 @@ "id": 157, "title": { "key": "itemlink_itemlink_title_11", - "text": "公会" + "text": "俱乐部" }, "desc": { "key": "itemlink_itemlink_desc_11", - "text": "完成公会任务或公会签到获得" + "text": "完成俱乐部任务或俱乐部签到获得" }, "jumpid": 157, "btnTitle": { @@ -258,11 +258,11 @@ "id": 10005, "title": { "key": "itemlink_itemlink_title_16", - "text": "前往经验副本" + "text": "前往梦境回廊" }, "desc": { "key": "itemlink_itemlink_desc_16", - "text": "经验副本中可大量获得" + "text": "梦境回廊中可大量获得" }, "jumpid": 10013, "btnTitle": { @@ -326,11 +326,11 @@ "id": 168, "title": { "key": "itemlink_itemlink_title_20", - "text": "前往狩猎副本" + "text": "前往猎魂副本" }, "desc": { "key": "itemlink_itemlink_desc_20", - "text": "通过挑战各种狩猎头目获得" + "text": "通过挑战各种猎魂头目获得" }, "jumpid": 168, "btnTitle": { @@ -428,11 +428,11 @@ "id": 10019, "title": { "key": "itemlink_itemlink_title_26", - "text": "前往狩猎副本" + "text": "前往猎魂副本" }, "desc": { "key": "itemlink_itemlink_desc_26", - "text": "挑战狩猎头目,消耗体力,升级角色可以获得" + "text": "挑战猎魂头目,消耗体力,升级角色可以获得" }, "jumpid": 168, "btnTitle": { diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index 9958b3bc2..ba3473d25 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -56,7 +56,7 @@ "icon": "loading_icon_gh", "prompt": { "key": "loading_Sheet1_prompt_6", - "text": "公会是一处和其他守护者拉近距离的好地方呢。" + "text": "俱乐部是一处和其他守护者拉近距离的好地方呢。" } }, { diff --git a/bin/json/game_mail.json b/bin/json/game_mail.json index 75ec2edae..93f898f0b 100644 --- a/bin/json/game_mail.json +++ b/bin/json/game_mail.json @@ -3,7 +3,7 @@ "id": "GuildDissolution", "title": { "key": "mail_mail_title_1", - "text": "公会解散" + "text": "俱乐部解散" }, "recipient": { "key": "mail_mail_recipient_1", @@ -11,7 +11,7 @@ }, "content": { "key": "mail_mail_content_1", - "text": "您加入的{0}公会已被会长解散。" + "text": "您加入的{0}俱乐部已被会长解散。" }, "sender": { "key": "mail_mail_sender_1", @@ -24,7 +24,7 @@ "id": "GuildExpel", "title": { "key": "mail_mail_title_2", - "text": "移出公会" + "text": "移出俱乐部" }, "recipient": { "key": "mail_mail_recipient_2", @@ -32,7 +32,7 @@ }, "content": { "key": "mail_mail_content_2", - "text": "您加入的{0}公会已将您移除公会。" + "text": "您加入的{0}俱乐部已将您移除俱乐部。" }, "sender": { "key": "mail_mail_sender_2", @@ -45,7 +45,7 @@ "id": "GuildApproved", "title": { "key": "mail_mail_title_3", - "text": "加入公会" + "text": "加入俱乐部" }, "recipient": { "key": "mail_mail_recipient_3", @@ -53,7 +53,7 @@ }, "content": { "key": "mail_mail_content_3", - "text": "{0}公会已经通过您的加入申请。" + "text": "{0}俱乐部已经通过您的加入申请。" }, "sender": { "key": "mail_mail_sender_3", @@ -282,7 +282,7 @@ "id": "Guild_Boss", "title": { "key": "mail_mail_title_14", - "text": "公会演练击杀奖励" + "text": "俱乐部演练击杀奖励" }, "recipient": { "key": "mail_mail_recipient_14", @@ -290,7 +290,7 @@ }, "content": { "key": "mail_mail_content_14", - "text": "这是公会演练的boss击杀奖励,恭喜你啦!" + "text": "这是俱乐部演练的boss击杀奖励,恭喜你啦!" }, "sender": { "key": "mail_mail_sender_14", @@ -303,7 +303,7 @@ "id": "GuildBoss_Rank", "title": { "key": "mail_mail_title_15", - "text": "公会演练排名奖励" + "text": "俱乐部演练排名奖励" }, "recipient": { "key": "mail_mail_recipient_15", @@ -311,7 +311,7 @@ }, "content": { "key": "mail_mail_content_15", - "text": "这是公会演练的赛季排行奖励,恭喜你啦!" + "text": "这是俱乐部演练的赛季排行奖励,恭喜你啦!" }, "sender": { "key": "mail_mail_sender_15", diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 9e6db7219..c5da36ce6 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -534,10 +534,8 @@ "openlevel": 1, "EditorStage": 0, "venturemodel": "", - "venturetype": 1, - "ventureavatar": [ - "Person/44005/44005_q.prefab" - ], + "venturetype": 0, + "ventureavatar": [], "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { @@ -634,11 +632,11 @@ "Episodetype": 3, "openlevel": 1, "EditorStage": 0, - "venturemodel": "Person/44005/44005_q.prefab", + "venturemodel": "Person/34004/34004_q.prefab", "venturetype": 0, "ventureavatar": [], "herocolor": 1, - "heroimg": "zxgq_qp_icon_it", + "heroimg": "zxgq_qp_icon_gth", "bubbletext": { "key": "main_stage_bubbletext_7", "text": "就快到了!那猩猩怪太可怕了,那天要不是盖......" @@ -698,7 +696,7 @@ "Episodetype": 7, "openlevel": 1, "EditorStage": 0, - "venturemodel": "Person/44005/44005_q.prefab", + "venturemodel": "Person/34004/34004_q.prefab", "venturetype": 0, "ventureavatar": [], "herocolor": 1, @@ -762,7 +760,7 @@ "Episodetype": 7, "openlevel": 1, "EditorStage": 0, - "venturemodel": "Person/44005/44005_q.prefab", + "venturemodel": "Person/34004/34004_q.prefab", "venturetype": 0, "ventureavatar": [], "herocolor": 1, @@ -826,7 +824,7 @@ "Episodetype": 7, "openlevel": 1, "EditorStage": 0, - "venturemodel": "Person/44005/44005_q.prefab", + "venturemodel": "Person/34004/34004_q.prefab", "venturetype": 0, "ventureavatar": [], "herocolor": 1, @@ -1111,7 +1109,7 @@ "venturetype": 0, "ventureavatar": [], "herocolor": 1, - "heroimg": "zxgq_qp_icon_wh", + "heroimg": "zxgq_qp_icon_zd", "bubbletext": { "key": "main_stage_bubbletext_14", "text": "呀嗷嗷——" diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json index 7807aa9ef..d7a66c2cc 100644 --- a/bin/json/game_navigation.json +++ b/bin/json/game_navigation.json @@ -81,7 +81,7 @@ "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_Sheet1_functionname_5", - "text": "公会" + "text": "俱乐部" }, "npcName": [ "功能入口-工会申请" @@ -99,7 +99,7 @@ "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_Sheet1_functionname_6", - "text": "公会" + "text": "俱乐部" }, "npcName": [ "传送点-公会" @@ -297,10 +297,10 @@ "sceneicon": "ty_qp_zhb", "functionname": { "key": "navigation_Sheet1_functionname_17", - "text": "护符水晶" + "text": "月光护符" }, "npcName": [ - "功能入口——护符水晶" + "功能入口_护符水晶" ], "functionicon": "cgt_icon_hfsj", "jumpId": 10019 diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index fcb846eaa..eb88c25a3 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -463,7 +463,7 @@ "id": "hjeart demon tower", "name": { "key": "opencond_opencond_name_20", - "text": "功夫大师挑战塔" + "text": "炼金塔" }, "main": [ { @@ -796,7 +796,7 @@ "id": "channel_lock_guild", "name": { "key": "opencond_opencond_name_34", - "text": "公会聊天" + "text": "俱乐部聊天" }, "main": [], "wkqbx": 0, @@ -883,7 +883,7 @@ "id": "guild", "name": { "key": "opencond_opencond_name_38", - "text": "公会" + "text": "俱乐部" }, "main": [ { @@ -1442,7 +1442,7 @@ "id": "GuildBoss", "name": { "key": "opencond_opencond_name_62", - "text": "公会BOSS入口" + "text": "俱乐部BOSS入口" }, "main": [ { @@ -1534,7 +1534,7 @@ "id": "Master_challenges_the_tower", "name": { "key": "opencond_opencond_name_66", - "text": "功夫大师挑战塔" + "text": "炼金塔" }, "main": [ { @@ -1655,7 +1655,7 @@ "id": "vikingexpedition_experience", "name": { "key": "opencond_opencond_name_71", - "text": "经验副本" + "text": "梦境回廊" }, "main": [ { @@ -1935,7 +1935,7 @@ "id": "RacePagoda", "name": { "key": "opencond_opencond_name_82", - "text": "阵营塔" + "text": "六合塔" }, "main": [ { @@ -1962,7 +1962,7 @@ "id": "circularcamptower", "name": { "key": "opencond_opencond_name_83", - "text": "循环塔" + "text": "无极塔" }, "main": [], "wkqbx": 0, @@ -1980,7 +1980,7 @@ "id": "passon", "name": { "key": "opencond_opencond_name_84", - "text": "护符水晶" + "text": "月光护符" }, "main": [ { diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index bf0006e10..034ab7aec 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -17472,7 +17472,7 @@ "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_747", - "text": "功夫大师挑战塔3层" + "text": "炼金塔3层" }, "type": 168, "valid": 0, @@ -18172,7 +18172,7 @@ "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_776", - "text": "功夫大师挑战塔5层" + "text": "炼金塔5层" }, "type": 168, "valid": 0, @@ -18506,7 +18506,7 @@ "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_790", - "text": "功夫大师挑战塔10层" + "text": "炼金塔10层" }, "type": 168, "valid": 0, @@ -18908,7 +18908,7 @@ "type_sp": 1, "tasktxt": { "key": "taskcond_rdtask_condi_tasktxt_807", - "text": "功夫大师挑战塔20层" + "text": "炼金塔20层" }, "type": 168, "valid": 0, diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json index 6f152e4e2..8522ea819 100644 --- a/bin/json/game_ruledesc.json +++ b/bin/json/game_ruledesc.json @@ -223,22 +223,22 @@ "id": 10021, "title": { "key": "ruledesc_ruledesc_title_21", - "text": "公会申请说明" + "text": "俱乐部申请说明" }, "content": { "key": "ruledesc_ruledesc_content_21", - "text": "这里可以加入其他人的公会。" + "text": "这里可以加入其他人的俱乐部。" } }, { "id": 10022, "title": { "key": "ruledesc_ruledesc_title_22", - "text": "公会创建说明" + "text": "俱乐部创建说明" }, "content": { "key": "ruledesc_ruledesc_content_22", - "text": "这里可以创建属于自己的公会。" + "text": "这里可以创建属于自己的俱乐部。" } }, { @@ -498,7 +498,7 @@ "id": 10046, "title": { "key": "ruledesc_ruledesc_title_46", - "text": "护符水晶说明" + "text": "月光护符说明" }, "content": { "key": "ruledesc_ruledesc_content_46", diff --git a/bin/json/game_shopcentercontrol.json b/bin/json/game_shopcentercontrol.json index dbb7b5931..72a0488b9 100644 --- a/bin/json/game_shopcentercontrol.json +++ b/bin/json/game_shopcentercontrol.json @@ -12,6 +12,7 @@ "type": 1, "index": 1, "banner": "hd_jj_pt", + "bg": "hd_gwzx_bg", "slogan": { "key": "supermarket_overall_slogan_1", "text": "[color=#ffffff]购买礼包并通关所有简单模式主线[/color]
总计可获得超值[color=#2bb496][size=62]3000%[/size][/color]奖励!" @@ -39,6 +40,7 @@ "type": 1, "index": 2, "banner": "hd_jj_kn", + "bg": "hd_gwzx_bg", "slogan": { "key": "supermarket_overall_slogan_2", "text": "购买礼包并通关所有困难模式主线,总计可获得超值1200%奖励!" @@ -66,6 +68,7 @@ "type": 1, "index": 3, "banner": "hd_jj_dy", + "bg": "hd_gwzx_bg", "slogan": { "key": "supermarket_overall_slogan_3", "text": "购买礼包并通关所有地狱模式主线,总计可获得超值1200%奖励!" @@ -93,6 +96,7 @@ "type": 2, "index": 0, "banner": "hd_jj_kn", + "bg": "hd_gwzx_bg", "slogan": { "key": "supermarket_overall_slogan_4", "text": "购买礼包并达到相应的守护者等级,总计可获得超值1800%奖励!" @@ -120,6 +124,7 @@ "type": 3, "index": 0, "banner": "hd_jj_dy", + "bg": "hd_gwzx_bg", "slogan": { "key": "supermarket_overall_slogan_5", "text": "购买礼包累计登录游戏,总计可获得超值3000%奖励!" @@ -147,6 +152,7 @@ "type": 4, "index": 0, "banner": "hd_jj_kn", + "bg": "hd_gwzx_bg", "slogan": { "key": "supermarket_overall_slogan_6", "text": "购买礼包累计登录游戏,总计可获得超值3000%奖励!" @@ -174,6 +180,7 @@ "type": 5, "index": 0, "banner": "hd_jj_pt", + "bg": "hd_gwzx_bg", "slogan": { "key": "supermarket_overall_slogan_7", "text": "购买礼包累计登录游戏,总计可获得超值3000%奖励!" @@ -201,6 +208,7 @@ "type": 6, "index": 1, "banner": "hd_jj_pt", + "bg": "hd_gwzx_bg", "slogan": { "key": "supermarket_overall_slogan_8", "text": "购买首充礼包,累计返利4888%" @@ -234,6 +242,7 @@ "type": 6, "index": 2, "banner": "hd_jj_kn", + "bg": "hd_gwzx_bg", "slogan": { "key": "supermarket_overall_slogan_9", "text": "购买首充礼包,累计返利1688%" @@ -267,6 +276,7 @@ "type": 6, "index": 3, "banner": "hd_jj_dy", + "bg": "hd_gwzx_bg", "slogan": { "key": "supermarket_overall_slogan_10", "text": "购买首充礼包,累计返利1088%" diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json index 3156cd3b7..9c9149a38 100644 --- a/bin/json/game_taskround.json +++ b/bin/json/game_taskround.json @@ -168,7 +168,7 @@ "open": "", "task_display": { "key": "task_task_round_task_display_7", - "text": "本周累计经验副本消耗300体力" + "text": "本周累计梦境回廊消耗300体力" }, "type_id": 13000007, "active": 10, @@ -195,7 +195,7 @@ "open": "", "task_display": { "key": "task_task_round_task_display_8", - "text": "本周累计经验副本消耗600体力" + "text": "本周累计梦境回廊消耗600体力" }, "type_id": 13000008, "active": 10, @@ -222,7 +222,7 @@ "open": "", "task_display": { "key": "task_task_round_task_display_9", - "text": "本周累计经验副本消耗1000体力" + "text": "本周累计梦境回廊消耗1000体力" }, "type_id": 13000009, "active": 10, @@ -330,7 +330,7 @@ "open": "", "task_display": { "key": "task_task_round_task_display_13", - "text": "本周累计装备副本消耗300体力" + "text": "本周累计维京远征消耗300体力" }, "type_id": 13000013, "active": 10, @@ -357,7 +357,7 @@ "open": "", "task_display": { "key": "task_task_round_task_display_14", - "text": "本周累计装备副本消耗600体力" + "text": "本周累计维京远征消耗600体力" }, "type_id": 13000014, "active": 10, @@ -384,7 +384,7 @@ "open": "", "task_display": { "key": "task_task_round_task_display_15", - "text": "本周累计装备副本消耗1000体力" + "text": "本周累计维京远征消耗1000体力" }, "type_id": 13000015, "active": 10, @@ -411,7 +411,7 @@ "open": "", "task_display": { "key": "task_task_round_task_display_16", - "text": "本周累计回响副本消耗300体力" + "text": "本周累计猎魂挑战消耗300体力" }, "type_id": 13000016, "active": 10, @@ -438,7 +438,7 @@ "open": "", "task_display": { "key": "task_task_round_task_display_17", - "text": "本周累计回响副本消耗600体力" + "text": "本周累计猎魂挑战消耗600体力" }, "type_id": 13000017, "active": 10, @@ -465,7 +465,7 @@ "open": "", "task_display": { "key": "task_task_round_task_display_18", - "text": "本周累计回响副本消耗1000体力" + "text": "本周累计猎魂挑战消耗1000体力" }, "type_id": 13000018, "active": 10, diff --git a/bin/json/game_uigameconsum.json b/bin/json/game_uigameconsum.json index 624eed8e8..5c070b3af 100644 --- a/bin/json/game_uigameconsum.json +++ b/bin/json/game_uigameconsum.json @@ -7,7 +7,19 @@ "t": "23000002", "n": 1 }, - "getmax": 3 + "getmax": 3, + "cost": { + "a": "item", + "t": "23000002", + "n": 1 + }, + "costget": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] }, { "gameid": 2, @@ -17,7 +29,19 @@ "t": "23000003", "n": 1 }, - "getmax": 15 + "getmax": 15, + "cost": { + "a": "item", + "t": "23000003", + "n": 1 + }, + "costget": [ + { + "a": "attr", + "t": "gold", + "n": 100 + } + ] }, { "gameid": 3, @@ -27,6 +51,12 @@ "t": "23000004", "n": 1 }, - "getmax": 6 + "getmax": 6, + "cost": { + "a": "item", + "t": "23000004", + "n": 1 + }, + "costget": [] } ] \ No newline at end of file diff --git a/bin/json/game_uigamelattice.json b/bin/json/game_uigamelattice.json index 93722dfdc..45dd6c2ee 100644 --- a/bin/json/game_uigamelattice.json +++ b/bin/json/game_uigamelattice.json @@ -2,155 +2,155 @@ { "latticekey": 1, "layers": 1, - "bornpos": { - "x": 1, - "y": 1 - }, + "bornpos": 1, "chestspos": [ + 4, + 9 + ], + "outpos": 25, + "chestsward": [ { - "x": 2, - "y": 2 + "a": "item", + "t": "10000001", + "n": 1 }, { - "x": 3, - "y": 3 + "a": "item", + "t": "10000001", + "n": 1 } - ], - "outpos": { - "x": 5, - "y": 5 - } + ] }, { "latticekey": 2, "layers": 2, - "bornpos": { - "x": 5, - "y": 5 - }, + "bornpos": 25, "chestspos": [ + 4, + 9 + ], + "outpos": 1, + "chestsward": [ { - "x": 2, - "y": 2 + "a": "item", + "t": "10000001", + "n": 1 }, { - "x": 3, - "y": 3 + "a": "item", + "t": "10000001", + "n": 1 } - ], - "outpos": { - "x": 1, - "y": 1 - } + ] }, { "latticekey": 3, "layers": 3, - "bornpos": { - "x": 1, - "y": 1 - }, + "bornpos": 1, "chestspos": [ + 4, + 9 + ], + "outpos": 25, + "chestsward": [ { - "x": 2, - "y": 2 + "a": "item", + "t": "10000001", + "n": 1 }, { - "x": 3, - "y": 3 + "a": "item", + "t": "10000001", + "n": 1 } - ], - "outpos": { - "x": 5, - "y": 5 - } + ] }, { "latticekey": 4, "layers": 4, - "bornpos": { - "x": 5, - "y": 5 - }, + "bornpos": 25, "chestspos": [ + 4, + 9 + ], + "outpos": 1, + "chestsward": [ { - "x": 2, - "y": 2 + "a": "item", + "t": "10000001", + "n": 1 }, { - "x": 3, - "y": 3 + "a": "item", + "t": "10000001", + "n": 1 } - ], - "outpos": { - "x": 1, - "y": 1 - } + ] }, { "latticekey": 5, "layers": 5, - "bornpos": { - "x": 1, - "y": 1 - }, + "bornpos": 1, "chestspos": [ + 4, + 9 + ], + "outpos": 25, + "chestsward": [ { - "x": 2, - "y": 2 + "a": "item", + "t": "10000001", + "n": 1 }, { - "x": 3, - "y": 3 + "a": "item", + "t": "10000001", + "n": 1 } - ], - "outpos": { - "x": 5, - "y": 5 - } + ] }, { "latticekey": 6, "layers": 6, - "bornpos": { - "x": 5, - "y": 5 - }, + "bornpos": 25, "chestspos": [ + 4, + 9 + ], + "outpos": 1, + "chestsward": [ { - "x": 2, - "y": 2 + "a": "item", + "t": "10000001", + "n": 1 }, { - "x": 3, - "y": 3 + "a": "item", + "t": "10000001", + "n": 1 } - ], - "outpos": { - "x": 1, - "y": 1 - } + ] }, { "latticekey": 7, "layers": 7, - "bornpos": { - "x": 1, - "y": 1 - }, + "bornpos": 1, "chestspos": [ + 4, + 9 + ], + "outpos": 25, + "chestsward": [ { - "x": 2, - "y": 2 + "a": "item", + "t": "10000001", + "n": 1 }, { - "x": 3, - "y": 3 + "a": "item", + "t": "10000001", + "n": 1 } - ], - "outpos": { - "x": 5, - "y": 5 - } + ] } ] \ No newline at end of file diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index 034872162..a01b3c5d0 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -3795,7 +3795,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_57", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 1, "BattleReadyID": 117, @@ -3862,7 +3862,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_58", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 2, "BattleReadyID": 117, @@ -3929,7 +3929,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_59", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 3, "BattleReadyID": 117, @@ -3996,7 +3996,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_60", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 4, "BattleReadyID": 117, @@ -4063,7 +4063,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_61", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 5, "BattleReadyID": 117, @@ -4130,7 +4130,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_62", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 6, "BattleReadyID": 117, @@ -4197,7 +4197,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_63", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 7, "BattleReadyID": 117, @@ -4264,7 +4264,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_64", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 8, "BattleReadyID": 117, @@ -4331,7 +4331,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_65", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 9, "BattleReadyID": 117, @@ -4403,7 +4403,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_66", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 10, "BattleReadyID": 117, @@ -4475,7 +4475,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_67", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 11, "BattleReadyID": 117, @@ -4547,7 +4547,7 @@ "bossid": 31, "name": { "key": "vikingexpedition_boss_name_68", - "text": "经验副本" + "text": "梦境回廊" }, "difficulty": 12, "BattleReadyID": 117, diff --git a/bin/json/game_vikingbossskill.json b/bin/json/game_vikingbossskill.json index 38ccd940f..d956d5106 100644 --- a/bin/json/game_vikingbossskill.json +++ b/bin/json/game_vikingbossskill.json @@ -104,12 +104,12 @@ "copytype": 4, "name": { "key": "vikingexpedition_bossskill_name_6", - "text": "经验副本" + "text": "梦境回廊" }, "back_png": "xmwg_jyfb_boss1", "introduce": { "key": "vikingexpedition_bossskill_introduce_6", - "text": "经验副本,产出经验材料" + "text": "梦境回廊,产出经验材料" }, "icon": "ytx_js_25001", "guardskill": [ diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index f8a9fd077..25cc50129 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -1165,11 +1165,11 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_26", - "text": "功夫大师挑战塔" + "text": "炼金塔" }, "task_details": { "key": "worldtask_world_task_task_details_26", - "text": "据说功夫大师挑战塔里有很多厉害的守护者,是拜师学艺的绝佳场所,如果挑战成功,还能邀请守护者当自己的教习。" + "text": "据说炼金塔里有很多厉害的守护者,是拜师学艺的绝佳场所,如果挑战成功,还能邀请守护者当自己的教习。" }, "npctxt": { "key": "worldtask_world_task_npctxt_26", @@ -1412,7 +1412,7 @@ }, "task_details": { "key": "worldtask_world_task_task_details_31", - "text": "前往熊猫武馆、铁匠铺和公会调查监控显示异常情况。" + "text": "前往熊猫武馆、铁匠铺和俱乐部调查监控显示异常情况。" }, "npctxt": { "key": "worldtask_world_task_npctxt_31", @@ -2472,15 +2472,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_55", - "text": "功夫大师挑战塔5层" + "text": "炼金塔5层" }, "task_details": { "key": "worldtask_world_task_task_details_55", - "text": "功夫大师挑战塔5层" + "text": "炼金塔5层" }, "npctxt": { "key": "worldtask_world_task_npctxt_55", - "text": "功夫大师挑战塔5层" + "text": "炼金塔5层" }, "get_item": [], "trigger": 0, @@ -3082,15 +3082,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_69", - "text": "功夫大师挑战塔10层" + "text": "炼金塔10层" }, "task_details": { "key": "worldtask_world_task_task_details_69", - "text": "功夫大师挑战塔10层" + "text": "炼金塔10层" }, "npctxt": { "key": "worldtask_world_task_npctxt_69", - "text": "功夫大师挑战塔10层" + "text": "炼金塔10层" }, "get_item": [], "trigger": 0, @@ -3307,15 +3307,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_74", - "text": "加入任意公会" + "text": "加入任意俱乐部" }, "task_details": { "key": "worldtask_world_task_task_details_74", - "text": "加入任意公会" + "text": "加入任意俱乐部" }, "npctxt": { "key": "worldtask_world_task_npctxt_74", - "text": "加入任意公会" + "text": "加入任意俱乐部" }, "get_item": [], "trigger": 0, @@ -3833,15 +3833,15 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_86", - "text": "功夫大师挑战塔20层" + "text": "炼金塔20层" }, "task_details": { "key": "worldtask_world_task_task_details_86", - "text": "功夫大师挑战塔20层" + "text": "炼金塔20层" }, "npctxt": { "key": "worldtask_world_task_npctxt_86", - "text": "功夫大师挑战塔20层" + "text": "炼金塔20层" }, "get_item": [], "trigger": 0, diff --git a/sys/configure/structs/Game.ShopCenterControlData.go b/sys/configure/structs/Game.ShopCenterControlData.go index 0b655ccb7..650073183 100644 --- a/sys/configure/structs/Game.ShopCenterControlData.go +++ b/sys/configure/structs/Game.ShopCenterControlData.go @@ -17,6 +17,7 @@ type GameShopCenterControlData struct { Type int32 Index int32 Banner string + Bg string Slogan string Point string Props []*Gameatn @@ -42,6 +43,7 @@ func (_v *GameShopCenterControlData)Deserialize(_buf map[string]interface{}) (er { 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["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) } { var _ok_ bool; if _v.Banner, _ok_ = _buf["banner"].(string); !_ok_ { err = errors.New("banner error"); return } } + { var _ok_ bool; if _v.Bg, _ok_ = _buf["bg"].(string); !_ok_ { err = errors.New("bg error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["slogan"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Slogan error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Slogan, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } } { diff --git a/sys/configure/structs/Game.UiGameConsumData.go b/sys/configure/structs/Game.UiGameConsumData.go index 460b29cc3..638ac9eac 100644 --- a/sys/configure/structs/Game.UiGameConsumData.go +++ b/sys/configure/structs/Game.UiGameConsumData.go @@ -15,6 +15,8 @@ type GameUiGameConsumData struct { Usepawer int32 Itemget *Gameatn Getmax int32 + Cost *Gameatn + Costget []*Gameatn } const TypeId_GameUiGameConsumData = 380347541 @@ -28,6 +30,21 @@ func (_v *GameUiGameConsumData)Deserialize(_buf map[string]interface{}) (err err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["usepawer"].(float64); !_ok_ { err = errors.New("usepawer error"); return }; _v.Usepawer = int32(_tempNum_) } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["itemget"].(map[string]interface{}); !_ok_ { err = errors.New("itemget error"); return }; if _v.Itemget, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["getmax"].(float64); !_ok_ { err = errors.New("getmax error"); return }; _v.Getmax = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["cost"].(map[string]interface{}); !_ok_ { err = errors.New("cost error"); return }; if _v.Cost, err = DeserializeGameatn(_x_); err != nil { return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["costget"].([]interface{}); !_ok_ { err = errors.New("costget error"); return } + + _v.Costget = 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.Costget = append(_v.Costget, _list_v_) + } + } + return } diff --git a/sys/configure/structs/Game.UiGameLatticeData.go b/sys/configure/structs/Game.UiGameLatticeData.go index 4d25d2d90..dd3b95bfa 100644 --- a/sys/configure/structs/Game.UiGameLatticeData.go +++ b/sys/configure/structs/Game.UiGameLatticeData.go @@ -9,14 +9,14 @@ package cfg import "errors" -import "bright/serialization" type GameUiGameLatticeData struct { Latticekey int32 Layers int32 - Bornpos serialization.Vector2 - Chestspos []serialization.Vector2 - Outpos serialization.Vector2 + Bornpos int32 + Chestspos []int32 + Outpos int32 + Chestsward []*Gameatn } const TypeId_GameUiGameLatticeData = -164420354 @@ -28,38 +28,34 @@ func (*GameUiGameLatticeData) GetTypeId() int32 { func (_v *GameUiGameLatticeData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["latticekey"].(float64); !_ok_ { err = errors.New("latticekey error"); return }; _v.Latticekey = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["layers"].(float64); !_ok_ { err = errors.New("layers error"); return }; _v.Layers = int32(_tempNum_) } - { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["bornpos"].(map[string]interface{}); !_ok_ { err = errors.New("bornpos error"); return } - var _x_, _y_ float32; - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } - _v.Bornpos = serialization.NewVector2(_x_, _y_) - } - + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bornpos"].(float64); !_ok_ { err = errors.New("bornpos error"); return }; _v.Bornpos = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool if _arr_, _ok_ = _buf["chestspos"].([]interface{}); !_ok_ { err = errors.New("chestspos error"); return } - _v.Chestspos = make([]serialization.Vector2, 0, len(_arr_)) + _v.Chestspos = make([]int32, 0, len(_arr_)) for _, _e_ := range _arr_ { - var _list_v_ serialization.Vector2 - { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return } - var _x_, _y_ float32; - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } - _list_v_ = serialization.NewVector2(_x_, _y_) - } - + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } _v.Chestspos = append(_v.Chestspos, _list_v_) } } - { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["outpos"].(map[string]interface{}); !_ok_ { err = errors.New("outpos error"); return } - var _x_, _y_ float32; - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } - _v.Outpos = serialization.NewVector2(_x_, _y_) + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["outpos"].(float64); !_ok_ { err = errors.New("outpos error"); return }; _v.Outpos = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["chestsward"].([]interface{}); !_ok_ { err = errors.New("chestsward error"); return } + + _v.Chestsward = 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.Chestsward = append(_v.Chestsward, _list_v_) + } } return diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 2a1652dd3..fcd6ad8b5 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -242,6 +242,7 @@ type Tables struct { UiGameLattice *GameUiGameLattice UiGameMiner *GameUiGameMiner PushGift *GamePushGift + UiGameConsum *GameUiGameConsum } func NewTables(loader JsonLoader) (*Tables, error) { @@ -1635,5 +1636,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.PushGift, err = NewGamePushGift(buf) ; err != nil { return nil, err } + if buf, err = loader("game_uigameconsum") ; err != nil { + return nil, err + } + if tables.UiGameConsum, err = NewGameUiGameConsum(buf) ; err != nil { + return nil, err + } return tables, nil }