皮肤：关羽张飞物品表新增皮肤、时装表、商品表

shared/resource/jsons/dic_goods.json

@@ -47,7 +47,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "77|117|21|6",
+        "getWays": "77|117|21|6|162",
         "useWays": "31&",
         "value": 2000,
         "condition": 0,
@@ -1272,6 +1272,44 @@
         "randomShow": 1,
         "info": "琴瑟和鸣（周瑜）头像"
     },
+    {
+        "good_id": 11274,
+        "name": "酣饮豪乐头像",
+        "quality": 1,
+        "image_id": 41117,
+        "itid": 50,
+        "goodType": 9,
+        "redPoint": 0,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": "7&41117",
+        "timelimit": 0,
+        "gift": 0,
+        "randomShow": 1,
+        "info": "酣饮豪乐（张飞）的头像"
+    },
+    {
+        "good_id": 11275,
+        "name": "温酒斩将头像",
+        "quality": 1,
+        "image_id": 41118,
+        "itid": 50,
+        "goodType": 9,
+        "redPoint": 0,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": "7&41118",
+        "timelimit": 0,
+        "gift": 0,
+        "randomShow": 1,
+        "info": "温酒斩将（关羽）的头像"
+    },
     {
         "good_id": 11301,
         "name": "新人头像框",
@@ -2602,6 +2640,44 @@
         "randomShow": 1,
         "info": "琴瑟和鸣（周瑜）的形象"
     },
+    {
+        "good_id": 11474,
+        "name": "酣饮豪乐形象",
+        "quality": 1,
+        "image_id": 41117,
+        "itid": 52,
+        "goodType": 11,
+        "redPoint": 0,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": "7&41117",
+        "timelimit": 0,
+        "gift": 0,
+        "randomShow": 1,
+        "info": "酣饮豪乐（张飞）的形象"
+    },
+    {
+        "good_id": 11475,
+        "name": "温酒斩将形象",
+        "quality": 1,
+        "image_id": 41118,
+        "itid": 52,
+        "goodType": 11,
+        "redPoint": 0,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": "7&41118",
+        "timelimit": 0,
+        "gift": 0,
+        "randomShow": 1,
+        "info": "温酒斩将（关羽）的形象"
+    },
     {
         "good_id": 17001,
         "name": "觉醒石",
@@ -2612,7 +2688,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|87|152",
+        "getWays": "84|87|152|162",
         "useWays": "32&",
         "value": 0,
         "condition": 0,
@@ -3391,7 +3467,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|86|87|3",
+        "getWays": "84|86|87",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3429,7 +3505,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|89|150|81|6",
+        "getWays": "84|89|150|81|6|162",
         "useWays": "143&",
         "value": 0,
         "condition": 0,
@@ -3619,7 +3695,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "149|79|85|117|21",
+        "getWays": "149|79|81|85|117|21",
         "useWays": "36&",
         "value": 0,
         "condition": 0,
@@ -3638,7 +3714,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "149|84|89|117",
+        "getWays": "149|81|84|85|89|117|162",
         "useWays": "36&",
         "value": 0,
         "condition": 0,
@@ -4664,7 +4740,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|91|152",
+        "getWays": "84|91|152|162",
         "useWays": "13&",
         "value": 0,
         "condition": 0,
@@ -4740,7 +4816,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "93|6&2",
+        "getWays": "93|6&2|95|97",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -5481,7 +5557,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "6|152",
+        "getWays": "6|152|162",
         "useWays": "88&",
         "value": 0,
         "condition": 0,
@@ -6784,7 +6860,7 @@
     },
     {
         "good_id": 41117,
-        "name": "张飞-精",
+        "name": "酣饮豪乐",
         "quality": 3,
         "image_id": 1,
         "itid": 39,
@@ -6803,7 +6879,7 @@
     },
     {
         "good_id": 41118,
-        "name": "关羽-精",
+        "name": "温酒斩将",
         "quality": 3,
         "image_id": 1,
         "itid": 39,
@@ -7571,7 +7647,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&50",
         "hid": 0,
-        "getWays": "151&50001|81|90|87",
+        "getWays": "151&50001|81|90|87|162",
         "useWays": "140&",
         "value": 0,
         "condition": 0,
@@ -8369,7 +8445,7 @@
         "redPoint": 1,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "&",
+        "getWays": "162&",
         "useWays": "&",
         "value": 50,
         "condition": 0,
@@ -8837,8 +8913,8 @@
     {
         "good_id": 71027,
         "name": "传奇武将将魂随机宝箱II",
-        "quality": 2,
+        "quality": 3,
-        "image_id": "putongbaoxiang",
+        "image_id": "suijiwujiangbaoxiang",
         "itid": 24,
         "goodType": 1,
         "redPoint": 1,
@@ -9148,7 +9224,7 @@
         "redPoint": 1,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "&",
+        "getWays": "162&",
         "useWays": "&",
         "value": 0,
         "condition": 0,

shared/resource/jsons/dic_zyz_fashions.json

@@ -125,6 +125,15 @@
         "skinQuality": 0,
         "cv": "赵梓涵"
     },
+    {
+        "goodId": 41117,
+        "name": "酣饮豪乐",
+        "heroId": 41117,
+        "globalAttr": "1&0.5|2&0.5|4&0.5|5&0.5",
+        "actorId": 17,
+        "skinQuality": 1,
+        "cv": "赵梓涵"
+    },
     {
         "goodId": 41018,
         "name": "初出茅庐",
@@ -134,6 +143,15 @@
         "skinQuality": 0,
         "cv": "孟祥龙"
     },
+    {
+        "goodId": 41118,
+        "name": "温酒斩将",
+        "heroId": 41118,
+        "globalAttr": "1&0.5|2&0.5|4&0.5|5&0.5",
+        "actorId": 18,
+        "skinQuality": 1,
+        "cv": "孟祥龙"
+    },
     {
         "goodId": 41019,
         "name": "初出茅庐",

shared/resource/jsons/dic_zyz_shop.json

@@ -1205,6 +1205,42 @@
         "indirectId": 0,
         "vipPurchaseLimit": 0
     },
+    {
+        "id": 5603,
+        "goodId": 41117,
+        "goodName": "酣饮豪乐",
+        "num": 1,
+        "shop": 5,
+        "type": 7,
+        "guildLvLimit": 0,
+        "lvLimit": 0,
+        "ranklimit": 0,
+        "purchaseLimit": 1,
+        "refreshType": 4,
+        "money": 40006,
+        "price": "1&10",
+        "chosen": 0,
+        "indirectId": 0,
+        "vipPurchaseLimit": 0
+    },
+    {
+        "id": 5604,
+        "goodId": 41118,
+        "goodName": "温酒斩将",
+        "num": 1,
+        "shop": 5,
+        "type": 7,
+        "guildLvLimit": 0,
+        "lvLimit": 0,
+        "ranklimit": 0,
+        "purchaseLimit": 1,
+        "refreshType": 4,
+        "money": 40006,
+        "price": "1&10",
+        "chosen": 0,
+        "indirectId": 0,
+        "vipPurchaseLimit": 0
+    },
     {
         "id": 6001,
         "goodId": 17055,