diff --git a/bin/json/game_item.json b/bin/json/game_item.json index fe737b133..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, 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_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_uigamelattice.json b/bin/json/game_uigamelattice.json index 45dd6c2ee..d0d3d15cc 100644 --- a/bin/json/game_uigamelattice.json +++ b/bin/json/game_uigamelattice.json @@ -19,7 +19,8 @@ "t": "10000001", "n": 1 } - ] + ], + "openward": [] }, { "latticekey": 2, @@ -41,7 +42,8 @@ "t": "10000001", "n": 1 } - ] + ], + "openward": [] }, { "latticekey": 3, @@ -63,6 +65,13 @@ "t": "10000001", "n": 1 } + ], + "openward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } ] }, { @@ -85,7 +94,8 @@ "t": "10000001", "n": 1 } - ] + ], + "openward": [] }, { "latticekey": 5, @@ -107,6 +117,13 @@ "t": "10000001", "n": 1 } + ], + "openward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } ] }, { @@ -129,7 +146,8 @@ "t": "10000001", "n": 1 } - ] + ], + "openward": [] }, { "latticekey": 7, @@ -151,6 +169,13 @@ "t": "10000001", "n": 1 } + ], + "openward": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } ] } ] \ No newline at end of file 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/uigame/api_latticegrid.go b/modules/uigame/api_latticegrid.go index e9f13b094..b980488c6 100644 --- a/modules/uigame/api_latticegrid.go +++ b/modules/uigame/api_latticegrid.go @@ -24,14 +24,21 @@ func (this *apiComp) LatticeGrid(session comm.IUserSession, req *pb.UiGameLattic return // 参数校验失败直接返回 } var ( - consum *cfg.Gameatn // 获取消耗 + 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.GetPuzzleConsumConf(); err != nil { + if conf, err = this.module.configure.GetLatticeConsumConf(); err != nil { consum = &cfg.Gameatn{ A: conf.Itemget.A, T: conf.Itemget.T, @@ -41,11 +48,47 @@ func (this *apiComp) LatticeGrid(session comm.IUserSession, req *pb.UiGameLattic 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 := make(map[string]interface{}, 0) + update["gotarr"] = list.Gotarr this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), update) // 修改进度 - session.SendMsg(string(this.module.GetType()), "latticegrid", &pb.UiGameLatticeGridResp{Data: list}) + 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 index d031545f7..b66bbc3a7 100644 --- a/modules/uigame/api_latticereward.go +++ b/modules/uigame/api_latticereward.go @@ -7,7 +7,12 @@ import ( //参数校验 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 } @@ -21,7 +26,7 @@ func (this *apiComp) LatticeReward(session comm.IUserSession, req *pb.UiGameLatt atno []*pb.UserAtno ) list, _ := this.module.modelLattice.getLatticeList(session.GetUserId(), req.Hdid) - if _, err := this.module.configure.GetLatticeConf(req.Id); err != nil { + if conf, err := this.module.configure.GetLatticeConf(req.Id); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, Title: pb.ErrorCode_ConfigNoFound.ToString(), @@ -34,9 +39,9 @@ func (this *apiComp) LatticeReward(session comm.IUserSession, req *pb.UiGameLatt return } - // if errdata, atno = this.module.DispenseAtno(session, conf.Puzzleward, true); errdata != nil { - // 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) diff --git a/modules/uigame/api_puzzlegrid.go b/modules/uigame/api_puzzlegrid.go index 81cc82dab..66dbf94d8 100644 --- a/modules/uigame/api_puzzlegrid.go +++ b/modules/uigame/api_puzzlegrid.go @@ -27,7 +27,7 @@ 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 } // 校验消耗 @@ -42,9 +42,9 @@ func (this *apiComp) PuzzleGrid(session comm.IUserSession, req *pb.UiGamePuzzleG 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/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.UiGameLatticeData.go b/sys/configure/structs/Game.UiGameLatticeData.go index dd3b95bfa..6f8db25db 100644 --- a/sys/configure/structs/Game.UiGameLatticeData.go +++ b/sys/configure/structs/Game.UiGameLatticeData.go @@ -17,6 +17,7 @@ type GameUiGameLatticeData struct { Chestspos []int32 Outpos int32 Chestsward []*Gameatn + Openward []*Gameatn } const TypeId_GameUiGameLatticeData = -164420354 @@ -58,6 +59,20 @@ func (_v *GameUiGameLatticeData)Deserialize(_buf map[string]interface{}) (err er } } + { + 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 }