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..ea4ee6d63 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -3988,7 +3988,7 @@ "id": "12013003", "name": { "key": "item_item_name_87", - "text": "闪闪守护之心" + "text": "啊啊守护之心" }, "usetype": 3, "color": 2, @@ -4031,7 +4031,7 @@ "id": "12013004", "name": { "key": "item_item_name_88", - "text": "食人鱼先生守护之心" + "text": "法夸德勋爵守护之心" }, "usetype": 3, "color": 2, @@ -4074,7 +4074,7 @@ "id": "12013005", "name": { "key": "item_item_name_89", - "text": "闪闪守护之心" + "text": "大大守护之心" }, "usetype": 3, "color": 2, @@ -4117,7 +4117,7 @@ "id": "12014001", "name": { "key": "item_item_name_90", - "text": "食人鱼先生守护之心" + "text": "史图依克守护之心" }, "usetype": 3, "color": 2, @@ -4160,7 +4160,7 @@ "id": "12014002", "name": { "key": "item_item_name_91", - "text": "闪闪守护之心" + "text": "大龙守护之心" }, "usetype": 3, "color": 2, @@ -4203,7 +4203,7 @@ "id": "12014003", "name": { "key": "item_item_name_92", - "text": "食人鱼先生守护之心" + "text": "亚丝翠守护之心" }, "usetype": 3, "color": 2, @@ -4246,7 +4246,7 @@ "id": "12014004", "name": { "key": "item_item_name_93", - "text": "闪闪守护之心" + "text": "克莱尔·努涅斯守护之心" }, "usetype": 3, "color": 2, @@ -4289,7 +4289,7 @@ "id": "12014005", "name": { "key": "item_item_name_94", - "text": "食人鱼先生守护之心" + "text": "鹤大师守护之心" }, "usetype": 3, "color": 2, @@ -4332,7 +4332,7 @@ "id": "12014006", "name": { "key": "item_item_name_95", - "text": "闪闪守护之心" + "text": "布兰奇守护之心" }, "usetype": 3, "color": 2, @@ -4375,7 +4375,7 @@ "id": "12014007", "name": { "key": "item_item_name_96", - "text": "食人鱼先生守护之心" + "text": "格里斯特王子守护之心" }, "usetype": 3, "color": 2, @@ -4418,7 +4418,7 @@ "id": "12015001", "name": { "key": "item_item_name_97", - "text": "闪闪守护之心" + "text": "吉姆·莱克守护之心" }, "usetype": 3, "color": 2, @@ -4461,7 +4461,7 @@ "id": "12015002", "name": { "key": "item_item_name_98", - "text": "食人鱼先生守护之心" + "text": "船长守护之心" }, "usetype": 3, "color": 2, @@ -4504,7 +4504,7 @@ "id": "12015003", "name": { "key": "item_item_name_99", - "text": "闪闪守护之心" + "text": "希沙窦斯守护之心" }, "usetype": 3, "color": 2, @@ -4547,7 +4547,7 @@ "id": "12015004", "name": { "key": "item_item_name_100", - "text": "食人鱼先生守护之心" + "text": "小欧守护之心" }, "usetype": 3, "color": 2, @@ -4590,7 +4590,7 @@ "id": "12015005", "name": { "key": "item_item_name_101", - "text": "闪闪守护之心" + "text": "亚力克斯守护之心" }, "usetype": 3, "color": 2, @@ -4633,7 +4633,7 @@ "id": "12023001", "name": { "key": "item_item_name_102", - "text": "食人鱼先生守护之心" + "text": "斯梅克船长守护之心" }, "usetype": 3, "color": 2, @@ -4676,7 +4676,7 @@ "id": "12023002", "name": { "key": "item_item_name_103", - "text": "闪闪守护之心" + "text": "警卫队长守护之心" }, "usetype": 3, "color": 2, @@ -4719,7 +4719,7 @@ "id": "12023003", "name": { "key": "item_item_name_104", - "text": "食人鱼先生守护之心" + "text": "黛塔黛恩守护之心" }, "usetype": 3, "color": 2, @@ -4762,7 +4762,7 @@ "id": "12023004", "name": { "key": "item_item_name_105", - "text": "闪闪守护之心" + "text": "吉姆·普雷斯科特守护之心" }, "usetype": 3, "color": 2, @@ -4805,7 +4805,7 @@ "id": "12024001", "name": { "key": "item_item_name_106", - "text": "食人鱼先生守护之心" + "text": "警长守护之心" }, "usetype": 3, "color": 2, @@ -4848,7 +4848,7 @@ "id": "12024002", "name": { "key": "item_item_name_107", - "text": "闪闪守护之心" + "text": "牙仙守护之心" }, "usetype": 3, "color": 2, @@ -4891,7 +4891,7 @@ "id": "12024003", "name": { "key": "item_item_name_108", - "text": "食人鱼先生守护之心" + "text": "睡神沙人守护之心" }, "usetype": 3, "color": 2, @@ -4934,7 +4934,7 @@ "id": "12024004", "name": { "key": "item_item_name_109", - "text": "闪闪守护之心" + "text": "邦尼兔守护之心" }, "usetype": 3, "color": 2, @@ -4977,7 +4977,7 @@ "id": "12024005", "name": { "key": "item_item_name_110", - "text": "食人鱼先生守护之心" + "text": "金猴守护之心" }, "usetype": 3, "color": 2, @@ -5020,7 +5020,7 @@ "id": "12024006", "name": { "key": "item_item_name_111", - "text": "闪闪守护之心" + "text": "凯尔守护之心" }, "usetype": 3, "color": 2, @@ -5063,7 +5063,7 @@ "id": "12024007", "name": { "key": "item_item_name_112", - "text": "食人鱼先生守护之心" + "text": "小钱守护之心" }, "usetype": 3, "color": 2, @@ -5106,7 +5106,7 @@ "id": "12024008", "name": { "key": "item_item_name_113", - "text": "闪闪守护之心" + "text": "暴芙那特守护之心" }, "usetype": 3, "color": 2, @@ -5149,7 +5149,7 @@ "id": "12024009", "name": { "key": "item_item_name_114", - "text": "食人鱼先生守护之心" + "text": "云朵先生守护之心" }, "usetype": 3, "color": 2, @@ -5192,7 +5192,7 @@ "id": "12025001", "name": { "key": "item_item_name_115", - "text": "闪闪守护之心" + "text": "阿宝守护之心" }, "usetype": 3, "color": 2, @@ -5235,7 +5235,7 @@ "id": "12025002", "name": { "key": "item_item_name_116", - "text": "食人鱼先生守护之心" + "text": "沃尔夫先生守护之心" }, "usetype": 3, "color": 2, @@ -5278,7 +5278,7 @@ "id": "12025003", "name": { "key": "item_item_name_117", - "text": "闪闪守护之心" + "text": "羊仙姑守护之心" }, "usetype": 3, "color": 2, @@ -5321,7 +5321,7 @@ "id": "12025004", "name": { "key": "item_item_name_118", - "text": "食人鱼先生守护之心" + "text": "波比守护之心" }, "usetype": 3, "color": 2, @@ -5364,7 +5364,7 @@ "id": "12033001", "name": { "key": "item_item_name_119", - "text": "闪闪守护之心" + "text": "巫嘎守护之心" }, "usetype": 3, "color": 2, @@ -5407,7 +5407,7 @@ "id": "12033002", "name": { "key": "item_item_name_120", - "text": "食人鱼先生守护之心" + "text": "坦克守护之心" }, "usetype": 3, "color": 2, @@ -5450,7 +5450,7 @@ "id": "12033003", "name": { "key": "item_item_name_121", - "text": "闪闪守护之心" + "text": "胡德先生守护之心" }, "usetype": 3, "color": 2, @@ -5493,7 +5493,7 @@ "id": "12033004", "name": { "key": "item_item_name_122", - "text": "食人鱼先生守护之心" + "text": "普鲁格兰杰守护之心" }, "usetype": 3, "color": 2, @@ -5536,7 +5536,7 @@ "id": "12033005", "name": { "key": "item_item_name_123", - "text": "闪闪守护之心" + "text": "鼻涕粗守护之心" }, "usetype": 3, "color": 2, @@ -5579,7 +5579,7 @@ "id": "12033006", "name": { "key": "item_item_name_124", - "text": "食人鱼先生守护之心" + "text": "珍妮丝·邓普顿守护之心" }, "usetype": 3, "color": 2, @@ -5622,7 +5622,7 @@ "id": "12034001", "name": { "key": "item_item_name_125", - "text": "闪闪守护之心" + "text": "贫嘴驴守护之心" }, "usetype": 3, "color": 2, @@ -5665,7 +5665,7 @@ "id": "12034002", "name": { "key": "item_item_name_126", - "text": "食人鱼先生守护之心" + "text": "蒂姆·邓普顿守护之心" }, "usetype": 3, "color": 2, @@ -5708,7 +5708,7 @@ "id": "12034003", "name": { "key": "item_item_name_127", - "text": "闪闪守护之心" + "text": "圣诞老人守护之心" }, "usetype": 3, "color": 2, @@ -5751,7 +5751,7 @@ "id": "12034004", "name": { "key": "item_item_name_128", - "text": "食人鱼先生守护之心" + "text": "瓜哥守护之心" }, "usetype": 3, "color": 2, @@ -5794,7 +5794,7 @@ "id": "12034005", "name": { "key": "item_item_name_129", - "text": "闪闪守护之心" + "text": "沃尔特·史翠克勒守护之心" }, "usetype": 3, "color": 2, @@ -5837,7 +5837,7 @@ "id": "12034006", "name": { "key": "item_item_name_130", - "text": "食人鱼先生守护之心" + "text": "冰霜杰克守护之心" }, "usetype": 3, "color": 2, @@ -5880,7 +5880,7 @@ "id": "12034007", "name": { "key": "item_item_name_131", - "text": "闪闪守护之心" + "text": "菲奥娜守护之心" }, "usetype": 3, "color": 2, @@ -5923,7 +5923,7 @@ "id": "12034008", "name": { "key": "item_item_name_132", - "text": "食人鱼先生守护之心" + "text": "悍夫那特守护之心" }, "usetype": 3, "color": 2, @@ -5966,7 +5966,7 @@ "id": "12035001", "name": { "key": "item_item_name_133", - "text": "闪闪守护之心" + "text": "师父守护之心" }, "usetype": 3, "color": 2, @@ -6009,7 +6009,7 @@ "id": "12035002", "name": { "key": "item_item_name_134", - "text": "食人鱼先生守护之心" + "text": "希卡普守护之心" }, "usetype": 3, "color": 2, @@ -6052,7 +6052,7 @@ "id": "12035003", "name": { "key": "item_item_name_135", - "text": "闪闪守护之心" + "text": "漆黑守护之心" }, "usetype": 3, "color": 2, @@ -6095,7 +6095,7 @@ "id": "12035004", "name": { "key": "item_item_name_136", - "text": "食人鱼先生守护之心" + "text": "黛安·福克斯顿守护之心" }, "usetype": 3, "color": 2, @@ -6138,7 +6138,7 @@ "id": "12035005", "name": { "key": "item_item_name_137", - "text": "闪闪守护之心" + "text": "幸运·普雷斯科特守护之心" }, "usetype": 3, "color": 2, @@ -6181,7 +6181,7 @@ "id": "12035006", "name": { "key": "item_item_name_138", - "text": "食人鱼先生守护之心" + "text": "平先生守护之心" }, "usetype": 3, "color": 2, @@ -6224,7 +6224,7 @@ "id": "12043001", "name": { "key": "item_item_name_139", - "text": "闪闪守护之心" + "text": "阿比盖尔·斯通守护之心" }, "usetype": 3, "color": 2, @@ -6267,7 +6267,7 @@ "id": "12043002", "name": { "key": "item_item_name_140", - "text": "食人鱼先生守护之心" + "text": "果酱教授守护之心" }, "usetype": 3, "color": 2, @@ -6310,7 +6310,7 @@ "id": "12043003", "name": { "key": "item_item_name_141", - "text": "闪闪守护之心" + "text": "史蒂夫·帕丘克守护之心" }, "usetype": 3, "color": 2, @@ -6353,7 +6353,7 @@ "id": "12043004", "name": { "key": "item_item_name_142", - "text": "食人鱼先生守护之心" + "text": "姜饼人守护之心" }, "usetype": 3, "color": 2, @@ -6396,7 +6396,7 @@ "id": "12043005", "name": { "key": "item_item_name_143", - "text": "闪闪守护之心" + "text": "瓦希尔指挥官守护之心" }, "usetype": 3, "color": 2, @@ -6439,7 +6439,7 @@ "id": "12043006", "name": { "key": "item_item_name_144", - "text": "食人鱼先生守护之心" + "text": "布里奇特守护之心" }, "usetype": 3, "color": 2, @@ -6482,7 +6482,7 @@ "id": "12043007", "name": { "key": "item_item_name_145", - "text": "闪闪守护之心" + "text": "戈伯守护之心" }, "usetype": 3, "color": 2, @@ -6525,7 +6525,7 @@ "id": "12044001", "name": { "key": "item_item_name_146", - "text": "食人鱼先生守护之心" + "text": "美肚鲨守护之心" }, "usetype": 3, "color": 2, @@ -6568,7 +6568,7 @@ "id": "12044002", "name": { "key": "item_item_name_147", - "text": "闪闪守护之心" + "text": "蛇先生守护之心" }, "usetype": 3, "color": 2, @@ -6611,7 +6611,7 @@ "id": "12044003", "name": { "key": "item_item_name_148", - "text": "食人鱼先生守护之心" + "text": "匹诺曹守护之心" }, "usetype": 3, "color": 2, @@ -6654,7 +6654,7 @@ "id": "12044004", "name": { "key": "item_item_name_149", - "text": "闪闪守护之心" + "text": "骇客蛛守护之心" }, "usetype": 3, "color": 2, @@ -6697,7 +6697,7 @@ "id": "12044005", "name": { "key": "item_item_name_150", - "text": "食人鱼先生守护之心" + "text": "小伊守护之心" }, "usetype": 3, "color": 2, @@ -6740,7 +6740,7 @@ "id": "12044006", "name": { "key": "item_item_name_151", - "text": "闪闪守护之心" + "text": "悍娇虎守护之心" }, "usetype": 3, "color": 2, @@ -6783,7 +6783,7 @@ "id": "12045001", "name": { "key": "item_item_name_152", - "text": "食人鱼先生守护之心" + "text": "乌龟大师守护之心" }, "usetype": 3, "color": 2, @@ -6826,7 +6826,7 @@ "id": "12045002", "name": { "key": "item_item_name_153", - "text": "闪闪守护之心" + "text": "梅林守护之心" }, "usetype": 3, "color": 2, @@ -6869,7 +6869,7 @@ "id": "12045003", "name": { "key": "item_item_name_154", - "text": "食人鱼先生守护之心" + "text": "盖守护之心" }, "usetype": 3, "color": 2, @@ -6912,7 +6912,7 @@ "id": "12045004", "name": { "key": "item_item_name_155", - "text": "闪闪守护之心" + "text": "穿靴子的猫守护之心" }, "usetype": 3, "color": 2, @@ -8646,7 +8646,7 @@ "text": "苹果酒" }, "usetype": 2, - "color": 2, + "color": 3, "bagtype": 1, "index": 2, "special_type": 800, @@ -8689,7 +8689,7 @@ "text": "黄金饼" }, "usetype": 2, - "color": 2, + "color": 3, "bagtype": 1, "index": 3, "special_type": 750, @@ -8775,7 +8775,7 @@ "text": "蜜汁烤鸡" }, "usetype": 2, - "color": 2, + "color": 3, "bagtype": 1, "index": 5, "special_type": 650, @@ -8818,7 +8818,7 @@ "text": "培根馅饼" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 6, "special_type": 600, @@ -8861,7 +8861,7 @@ "text": "猪腰子派" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 7, "special_type": 550, @@ -8904,7 +8904,7 @@ "text": "烤乳猪" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 8, "special_type": 500, @@ -8947,7 +8947,7 @@ "text": "血煎饼" }, "usetype": 2, - "color": 2, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -8990,7 +8990,7 @@ "text": "蜂蜜蛋糕" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 1, "special_type": 0, @@ -9033,7 +9033,7 @@ "text": "肉菜大杂烩" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 1, "special_type": 0, @@ -9076,7 +9076,7 @@ "text": "玉米鱼排" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 1, "special_type": 0, @@ -9119,7 +9119,7 @@ "text": "风味肉丸" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 1, "special_type": 0, @@ -9162,7 +9162,7 @@ "text": "鱼丸粗面" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 1, "special_type": 0, @@ -9205,7 +9205,7 @@ "text": "黄金鸡蛋饼" }, "usetype": 2, - "color": 2, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -9248,7 +9248,7 @@ "text": "炸酱面" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 1, "special_type": 0, @@ -9291,7 +9291,7 @@ "text": "番茄肉酱面" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 1, "special_type": 0, @@ -9334,7 +9334,7 @@ "text": "猪肉玉米煎饺" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 1, "special_type": 0, @@ -9420,7 +9420,7 @@ "text": "沙漠风情鸡肉卷" }, "usetype": 2, - "color": 2, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -9463,7 +9463,7 @@ "text": "烟熏三文鱼" }, "usetype": 2, - "color": 2, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -9506,7 +9506,7 @@ "text": "黄金蛋挞" }, "usetype": 2, - "color": 2, + "color": 4, "bagtype": 1, "index": 1, "special_type": 0, @@ -9635,7 +9635,7 @@ "text": "暖心布丁" }, "usetype": 2, - "color": 2, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -9671,49 +9671,6 @@ } ] }, - { - "id": "14020027", - "name": { - "key": "item_item_name_220", - "text": "刺身拼盘" - }, - "usetype": 2, - "color": 2, - "bagtype": 1, - "index": 1, - "special_type": 0, - "time": 0, - "reddottype": 0, - "effects": "", - "modelName": "", - "box_id": 0, - "synthetize_num": 0, - "synthetize_deplete": [], - "synthetize_get": [], - "decompose_deplete": [], - "decompose_get": [], - "access": [ - 702 - ], - "use_skip": 166, - "upper_limit": 999, - "img": "item_14020027", - "intr": { - "key": "item_item_intr_229", - "text": "据说很久很久以前，四只企鹅手握钢刀跳进了海中，获得了这一家整整齐齐的鱼。" - }, - "describe": { - "key": "item_item_describe_229", - "text": "" - }, - "sale": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - } - ] - }, { "id": "14020028", "name": { @@ -9721,7 +9678,7 @@ "text": "玉米浓汤" }, "usetype": 2, - "color": 2, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -9757,49 +9714,6 @@ } ] }, - { - "id": "14020029", - "name": { - "key": "item_item_name_222", - "text": "蛋奶酒" - }, - "usetype": 2, - "color": 2, - "bagtype": 1, - "index": 1, - "special_type": 0, - "time": 0, - "reddottype": 0, - "effects": "", - "modelName": "", - "box_id": 0, - "synthetize_num": 0, - "synthetize_deplete": [], - "synthetize_get": [], - "decompose_deplete": [], - "decompose_get": [], - "access": [ - 702 - ], - "use_skip": 166, - "upper_limit": 999, - "img": "item_14020029", - "intr": { - "key": "item_item_intr_231", - "text": "只有节日期间才会见到的美酒，酒味浓郁而香甜，连小孩子都无法抗拒。" - }, - "describe": { - "key": "item_item_describe_231", - "text": "" - }, - "sale": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - } - ] - }, { "id": "14020030", "name": { @@ -9807,7 +9721,7 @@ "text": "黄油啤酒" }, "usetype": 2, - "color": 2, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -9850,7 +9764,7 @@ "text": "苹果派" }, "usetype": 2, - "color": 2, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -9936,7 +9850,7 @@ "text": "蜜汁萝卜" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -9979,7 +9893,7 @@ "text": "小麦牛奶粥" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -10022,7 +9936,7 @@ "text": "杏仁乳布丁" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -10065,7 +9979,7 @@ "text": "萝卜葛缕子汤" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 1, "index": 1, "special_type": 0, @@ -10237,7 +10151,7 @@ "text": "南瓜汁" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 1, "index": 1, "special_type": 0, @@ -10323,7 +10237,7 @@ "text": "奶油蘑菇汤" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -10366,7 +10280,7 @@ "text": "番茄培根卷" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -10452,7 +10366,7 @@ "text": "烤猪肘" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 1, "index": 1, "special_type": 0, @@ -10495,7 +10409,7 @@ "text": "大麦面包" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -10581,7 +10495,7 @@ "text": "香蕉冰沙" }, "usetype": 2, - "color": 4, + "color": 2, "bagtype": 1, "index": 1, "special_type": 0, @@ -10624,7 +10538,7 @@ "text": "小鸡炖蘑菇" }, "usetype": 2, - "color": 4, + "color": 3, "bagtype": 1, "index": 1, "special_type": 0, @@ -14215,7 +14129,7 @@ "id": "18000006", "name": { "key": "item_item_name_322", - "text": "公会挑战券" + "text": "俱乐部挑战券" }, "usetype": 2, "color": 2, @@ -14240,7 +14154,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_namelibrary.json b/bin/json/game_namelibrary.json index 7723b6555..f15dc93d7 100644 --- a/bin/json/game_namelibrary.json +++ b/bin/json/game_namelibrary.json @@ -511,7 +511,7 @@ }, "name": { "key": "name_name_name_43", - "text": "乔伊斯" + "text": "普莱斯" }, "sex": 2 }, 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_skillbuff.json b/bin/json/game_skillbuff.json index 48c7b8f31..e40e6c3f9 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -3990,11 +3990,11 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001446", - "text": "造成伤害提升50%。" + "text": "造成伤害提升。" }, "BuffType": 33, "EffectArgu": [ - 500 + 50 ], "BufParNum": 1, "RelyCheckArgu": [], @@ -4005,7 +4005,7 @@ "AddEffect": false, "RemoveType": false, "NotOverlay": 0, - "OverlayTimes": 3, + "OverlayTimes": 6, "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_shts15", 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..d0d3d15cc 100644 --- a/bin/json/game_uigamelattice.json +++ b/bin/json/game_uigamelattice.json @@ -2,155 +2,180 @@ { "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 - } + "openward": [] }, { "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 - } + "openward": [] }, { "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 - } + "openward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } + ] }, { "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 - } + "openward": [] }, { "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 - } + "openward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } + ] }, { "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 - } + "openward": [] }, { "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 - } + "openward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } + ] } ] \ 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/comm/const.go b/comm/const.go index 379de271b..b856d445f 100644 --- a/comm/const.go +++ b/comm/const.go @@ -103,7 +103,7 @@ const ( ModuleStoryLine core.M_Modules = "storyline" //剧情活动 ModuleDreamwarorder core.M_Modules = "dreamwarorder" //如梦战令 ModulePushgiftbag core.M_Modules = "pushgiftbag" //推送礼包 - ModulePuzzle core.M_Modules = "puzzle" //拼图小游戏 + ModulePuzzle core.M_Modules = "uigame" //小游戏 ) // 数据表名定义处 diff --git a/modules/activity/api_gethddata.go b/modules/activity/api_gethddata.go index bf5a96e04..63a1c77ff 100644 --- a/modules/activity/api_gethddata.go +++ b/modules/activity/api_gethddata.go @@ -3,8 +3,6 @@ package activity import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "go_dreamfactory/sys/configure" - "go_dreamfactory/utils" ) //参数校验 @@ -15,79 +13,8 @@ func (this *apiComp) GetHdDataCheck(session comm.IUserSession, req *pb.ActivityG // 活动活动 func (this *apiComp) GetHdData(session comm.IUserSession, req *pb.ActivityGetHdDataReq) (errdata *pb.ErrorData) { - var ( - result []*pb.DBActivityData - activity *pb.DBHuodong - err error - list *pb.DBActivityData - ) - curTime := configure.Now().Unix() - for _, id := range req.Oid { - if activity, err = this.module.modelhdList.getHdListByHdId(id); err != nil { - if activity.Stime > curTime || curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据 - continue - } - } - list, _ = this.module.modelhdData.getHddataByOid(session.GetUserId(), id) - if activity.Itype == comm.HdTypeSign && !utils.IsToday(list.Lasttime) { - list.Lasttime = curTime - list.Val += 1 - update := make(map[string]interface{}) - update["lasttime"] = list.Lasttime - update["val"] = list.Val - this.module.modelhdData.ModifyActivityList(session.GetUserId(), list.Id, update) - } - - // 开服等级活动 - if activity.Itype == comm.HdLevel { - if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { - if list.Val != user.Lv { - list.Val = user.Lv - list.Lasttime = curTime - update := make(map[string]interface{}) - update["lasttime"] = list.Lasttime - update["val"] = list.Val - this.module.modelhdData.ModifyActivityList(session.GetUserId(), list.Id, update) - } - } - } - - // 获取开服庆典活动 - if activity.Itype == comm.HdCelebration { - // key := fmt.Sprintf("%s-%s", session.GetUserId(), id) - if list, err = this.module.modelhdData.getHddataByOid(session.GetUserId(), id); err == nil { - - if !utils.IsToday(list.Lasttime) || list.Val == 0 { // 不是今天重置 - list.Lasttime = configure.Now().Unix() - list.Gotarr = make(map[int32]int32) - update := make(map[string]interface{}) - // 计算进度 - update["lasttime"] = list.Lasttime - - update["gotarr"] = list.Gotarr - - _days := this.module.configure.GetHDCelebrationData() - var pos int32 - _sub := int32((configure.Now().Unix()-activity.Stime)/(24*3600)) + 1 - for index, v := range _days { - for i := 0; i < int(v); i++ { - pos++ - if _sub == pos { - list.Val = int32(index) + 1 // 计算val 值 - update["val"] = list.Val - break - } - } - } - this.module.modelhdData.ModifyActivityList(session.GetUserId(), list.Id, update) - } - } - } - if list != nil { - result = append(result, list) - } - } + result := this.module.GetHdData(session, req.Oid) session.SendMsg(string(this.module.GetType()), "gethddata", &pb.ActivityGetHdDataResp{ Data: result, }) diff --git a/modules/activity/api_getlist.go b/modules/activity/api_getlist.go index e00f79394..666685db7 100644 --- a/modules/activity/api_getlist.go +++ b/modules/activity/api_getlist.go @@ -15,22 +15,19 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ActivityGet func (this *apiComp) GetList(session comm.IUserSession, req *pb.ActivityGetListReq) (errdata *pb.ErrorData) { var ( data []*pb.DBHuodong - hdlist []*pb.DBActivityData + hdlist []string + result []*pb.DBActivityData ) list := this.module.modelhdList.getHdInfo() for _, szhd := range list { - // for _, v := range szhd { data = append(data, szhd) - if c, err := this.module.modelhdData.getHddataByOid(session.GetUserId(), szhd.Id); err == nil { - hdlist = append(hdlist, c) - } - // } + hdlist = append(hdlist, szhd.Id) } - + result = this.module.GetHdData(session, hdlist) session.SendMsg(string(this.module.GetType()), "getlist", &pb.ActivityGetListResp{ Hddata: data, - Actdata: hdlist, + Actdata: result, }) return } diff --git a/modules/activity/module.go b/modules/activity/module.go index 42b1faf9a..1eeeda8e7 100644 --- a/modules/activity/module.go +++ b/modules/activity/module.go @@ -253,10 +253,11 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32, } data.Val = 1 } + if conf, err := this.configure.GetHDCelebration(data.Val); err == nil { if conf.Systemtype == systemtype { - data.Gotarr[systemtype] += 1 + data.Gotarr[bosstype] += 1 // 天数 var idays int32 for i, v1 := range conf.Bosstype { @@ -268,7 +269,7 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32, // 更新信息 update["gotarr"] = data.Gotarr bChange = true - if data.Gotarr[systemtype] <= idays { + if data.Gotarr[bosstype] <= idays { bDouble = true } } @@ -320,3 +321,78 @@ func (this *Activity) EventUserLogin(session comm.IUserSession) { } } } + +func (this *Activity) GetHdData(session comm.IUserSession, oids []string) (result []*pb.DBActivityData) { + var ( + activity *pb.DBHuodong + err error + list *pb.DBActivityData + ) + curTime := configure.Now().Unix() + for _, id := range oids { + if activity, err = this.modelhdList.getHdListByHdId(id); err != nil { + if activity.Stime > curTime || curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据 + continue + } + } + list, _ = this.modelhdData.getHddataByOid(session.GetUserId(), id) + if activity.Itype == comm.HdTypeSign && !utils.IsToday(list.Lasttime) { + list.Lasttime = curTime + list.Val += 1 + update := make(map[string]interface{}) + update["lasttime"] = list.Lasttime + update["val"] = list.Val + this.modelhdData.ModifyActivityList(session.GetUserId(), list.Id, update) + } + + // 开服等级活动 + if activity.Itype == comm.HdLevel { + if user := this.ModuleUser.GetUser(session.GetUserId()); user != nil { + if list.Val != user.Lv { + list.Val = user.Lv + list.Lasttime = curTime + update := make(map[string]interface{}) + update["lasttime"] = list.Lasttime + update["val"] = list.Val + this.modelhdData.ModifyActivityList(session.GetUserId(), list.Id, update) + } + } + } + + // 获取开服庆典活动 + if activity.Itype == comm.HdCelebration { + // key := fmt.Sprintf("%s-%s", session.GetUserId(), id) + if list, err = this.modelhdData.getHddataByOid(session.GetUserId(), id); err == nil { + + if !utils.IsToday(list.Lasttime) || list.Val == 0 { // 不是今天重置 + list.Lasttime = configure.Now().Unix() + list.Gotarr = make(map[int32]int32) + update := make(map[string]interface{}) + // 计算进度 + update["lasttime"] = list.Lasttime + + update["gotarr"] = list.Gotarr + + _days := this.configure.GetHDCelebrationData() + var pos int32 + _sub := int32((configure.Now().Unix()-activity.Stime)/(24*3600)) + 1 + for index, v := range _days { + for i := 0; i < int(v); i++ { + pos++ + if _sub == pos { + list.Val = int32(index) + 1 // 计算val 值 + update["val"] = list.Val + break + } + } + } + this.modelhdData.ModifyActivityList(session.GetUserId(), list.Id, update) + } + } + } + if list != nil { + result = append(result, list) + } + } + return +} diff --git a/modules/uigame/api_latticegrid.go b/modules/uigame/api_latticegrid.go new file mode 100644 index 000000000..b980488c6 --- /dev/null +++ b/modules/uigame/api_latticegrid.go @@ -0,0 +1,94 @@ +package uigame + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +//参数校验 +func (this *apiComp) LatticeGridCheck(session comm.IUserSession, req *pb.UiGameLatticeGridReq) (errdata *pb.ErrorData) { + if req.Hdid == "" { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + return + } + return +} + +// 走迷宫格子 +func (this *apiComp) LatticeGrid(session comm.IUserSession, req *pb.UiGameLatticeGridReq) (errdata *pb.ErrorData) { + if errdata = this.LatticeGridCheck(session, req); errdata != nil { + return // 参数校验失败直接返回 + } + var ( + consum *cfg.Gameatn // 获取消耗 + latticeConf *cfg.GameUiGameLatticeData + err error + atno []*pb.UserAtno + conf *cfg.GameUiGameConsumData + ) + update := make(map[string]interface{}, 0) + list, _ := this.module.modelLattice.getLatticeList(session.GetUserId(), req.Hdid) + + if _, ok := list.Gotarr[req.Grid]; ok { + session.SendMsg(string(this.module.GetType()), "latticegrid", &pb.UiGameLatticeGridResp{Data: list}) + return + } + // 校验消耗 + if conf, err = this.module.configure.GetLatticeConsumConf(); err != nil { + consum = &cfg.Gameatn{ + A: conf.Itemget.A, + T: conf.Itemget.T, + N: 1, + } + } + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{consum}, true); errdata != nil { + return + } + // 校验 是否是宝箱 + latticeConf, err = this.module.configure.GetLatticeConf(list.Val) + if err != nil { + return + } + for _, v := range latticeConf.Chestspos { + if v == req.Grid { // 发现是宝箱 + if errdata, atno = this.module.DispenseAtno(session, latticeConf.Chestsward, true); errdata != nil { + return + } + break + } + } + if len(atno) == 0 { // 普通格子奖励 + if len(conf.Costget) > 0 { + if errdata, atno = this.module.DispenseAtno(session, latticeConf.Chestsward, true); errdata != nil { + return + } + } + } + + // 如果是下一关 + if req.Grid == latticeConf.Outpos { + list.Val += 1 + // 校验是不是达到最大层数 + if _, e := this.module.configure.GetLatticeConf(list.Val); e == nil { + list.Val -= 1 + } + update["val"] = list.Val + if list.Total < list.Val { + list.Total = list.Val + update["total"] = list.Total + } + } + list.Gotarr[req.Grid] = 1 + + update["gotarr"] = list.Gotarr + this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度 + session.SendMsg(string(this.module.GetType()), "latticegrid", &pb.UiGameLatticeGridResp{ + Data: list, + Atno: atno, + }) + return +} diff --git a/modules/uigame/api_latticereward.go b/modules/uigame/api_latticereward.go new file mode 100644 index 000000000..b66bbc3a7 --- /dev/null +++ b/modules/uigame/api_latticereward.go @@ -0,0 +1,57 @@ +package uigame + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +//参数校验 +func (this *apiComp) LatticeRewardCheck(session comm.IUserSession, req *pb.UiGameLatticeRewardReq) (errdata *pb.ErrorData) { + if req.Hdid == "" || req.Id == 0 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + } + return +} + +// 点击某个格子进行拼图 +func (this *apiComp) LatticeReward(session comm.IUserSession, req *pb.UiGameLatticeRewardReq) (errdata *pb.ErrorData) { + if errdata = this.LatticeRewardCheck(session, req); errdata != nil { + return // 参数校验失败直接返回 + } + + var ( + atno []*pb.UserAtno + ) + list, _ := this.module.modelLattice.getLatticeList(session.GetUserId(), req.Hdid) + if conf, err := this.module.configure.GetLatticeConf(req.Id); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } else { + list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid) + if _, ok := list.Puzzle[req.Id]; ok { + return + } + + if errdata, atno = this.module.DispenseAtno(session, conf.Chestsward, true); errdata != nil { + return + } + // 记录数据 + list.Puzzle[req.Id] = 1 + update := make(map[string]interface{}, 0) + update["puzzle"] = list.Puzzle + this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度 + } + + session.SendMsg(string(this.module.GetType()), "latticereward", &pb.UiGameLatticeRewardResp{ + Data: list, + Atno: atno, + }) + return +} diff --git a/modules/uigame/api_puzzlegrid.go b/modules/uigame/api_puzzlegrid.go index 1ef68ca36..66dbf94d8 100644 --- a/modules/uigame/api_puzzlegrid.go +++ b/modules/uigame/api_puzzlegrid.go @@ -8,7 +8,13 @@ import ( //参数校验 func (this *apiComp) PuzzleGridCheck(session comm.IUserSession, req *pb.UiGamePuzzleGridReq) (errdata *pb.ErrorData) { - + if req.Hdid == "" { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + return + } return } @@ -21,11 +27,10 @@ func (this *apiComp) PuzzleGrid(session comm.IUserSession, req *pb.UiGamePuzzleG consum *cfg.Gameatn // 获取消耗 ) list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid) - if _, ok := list.Gotarr[req.Grid]; ok { // 重复拼图 + if _, ok := list.Puzzle[req.Grid]; ok { // 重复拼图 return } // 校验消耗 - if conf, err := this.module.configure.GetPuzzleConsumConf(); err != nil { consum = &cfg.Gameatn{ A: conf.Itemget.A, @@ -36,13 +41,10 @@ func (this *apiComp) PuzzleGrid(session comm.IUserSession, req *pb.UiGamePuzzleG if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{consum}, true); errdata != nil { return } - // list.Val -= 1 - // if list.Val < 0 { // 拼图数量不足 - // return - // } - list.Gotarr[req.Grid] = 1 + + list.Puzzle[req.Grid] = 1 update := make(map[string]interface{}, 0) - update["gotarr"] = list.Gotarr + update["puzzle"] = list.Puzzle this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度 session.SendMsg(string(this.module.GetType()), "puzzlegrid", &pb.UiGamePuzzleGridResp{Data: list}) return diff --git a/modules/uigame/api_puzzlereward.go b/modules/uigame/api_puzzlereward.go index 0854ed146..04b7baddd 100644 --- a/modules/uigame/api_puzzlereward.go +++ b/modules/uigame/api_puzzlereward.go @@ -11,7 +11,7 @@ func (this *apiComp) PuzzleRewardCheck(session comm.IUserSession, req *pb.UiGame return } -// 点击某个格子进行拼图 +// 获取奖励 func (this *apiComp) PuzzleReward(session comm.IUserSession, req *pb.UiGamePuzzleRewardReq) (errdata *pb.ErrorData) { if errdata = this.PuzzleRewardCheck(session, req); errdata != nil { return // 参数校验失败直接返回 @@ -30,7 +30,7 @@ func (this *apiComp) PuzzleReward(session comm.IUserSession, req *pb.UiGamePuzzl return } else { list, _ := this.module.modelPuzzle.getPuzzleList(session.GetUserId(), req.Hdid) - if _, ok := list.Puzzle[req.PuzzleId]; ok { // 重复拼图 + if _, ok := list.Gotarr[req.PuzzleId]; ok { return } @@ -38,9 +38,9 @@ func (this *apiComp) PuzzleReward(session comm.IUserSession, req *pb.UiGamePuzzl return } // 记录数据 - list.Puzzle[req.PuzzleId] = 1 + list.Gotarr[req.PuzzleId] = 1 update := make(map[string]interface{}, 0) - update["puzzle"] = list.Puzzle + update["gotarr"] = list.Gotarr this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度 } diff --git a/modules/uigame/comp_configure.go b/modules/uigame/comp_configure.go index 2f35ef1e9..b6978b491 100644 --- a/modules/uigame/comp_configure.go +++ b/modules/uigame/comp_configure.go @@ -12,8 +12,9 @@ import ( var moduleName = "viking" const ( - game_puzzle = "game_uigamepuzzle.json" - game_consum = "game_uigameconsum.json" + game_puzzle = "game_uigamepuzzle.json" + game_lattice = "game_uigamelattice.json" + game_consum = "game_uigameconsum.json" ) ///配置管理基础组件 @@ -28,8 +29,9 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*UiGame) err = this.LoadMultiConfigure(map[string]interface{}{ - game_puzzle: cfg.NewGameUiGamePuzzle, - game_consum: cfg.NewGameUiGameConsum, + game_puzzle: cfg.NewGameUiGamePuzzle, + game_lattice: cfg.NewGameUiGameLattice, + game_consum: cfg.NewGameUiGameConsum, }) return @@ -96,3 +98,17 @@ func (this *configureComp) GetLatticeConsumConf() (conf *cfg.GameUiGameConsumDat this.module.Errorf("GetLatticeConsumConf conf not found key :puzzle") return } +func (this *configureComp) GetLatticeConf(id int32) (conf *cfg.GameUiGameLatticeData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_lattice); err == nil { + if configure, ok := v.(*cfg.GameUiGameLattice); ok { + if conf = configure.Get(id); conf != nil { + return + } + } + } + this.module.Errorf("GetLatticeConf conf not found key :%d", id) + return +} diff --git a/modules/uigame/model_lattice.go b/modules/uigame/model_lattice.go index c61a6dc6e..de838f918 100644 --- a/modules/uigame/model_lattice.go +++ b/modules/uigame/model_lattice.go @@ -39,8 +39,8 @@ func (this *modelLattice) getLatticeList(uid string, hid string) (result *pb.DBL Gotarr: map[int32]int32{}, Lattice: map[int32]*pb.LatticeData{}, Lasttime: 0, - Val: 0, - Total: 0, + Val: 1, //默认1层 + Total: 1, } err = nil this.module.modelPuzzle.Add(uid, result) 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..6f8db25db 100644 --- a/sys/configure/structs/Game.UiGameLatticeData.go +++ b/sys/configure/structs/Game.UiGameLatticeData.go @@ -9,14 +9,15 @@ 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 + Openward []*Gameatn } const TypeId_GameUiGameLatticeData = -164420354 @@ -28,38 +29,48 @@ 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_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["openward"].([]interface{}); !_ok_ { err = errors.New("openward error"); return } + + _v.Openward = 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.Openward = append(_v.Openward, _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 }