🔧 build(资源): 新皮肤表

shared/resource/jsons/dic_goods.json

@@ -1541,7 +1541,7 @@
     },
     {
         "good_id": 11276,
-        "name": "冰心寒枪形象",
+        "name": "冰心寒枪头像",
         "quality": 1,
         "image_id": 41127,
         "itid": 50,
@@ -1563,7 +1563,7 @@
     },
     {
         "good_id": 11277,
-        "name": "红梅胜雪形象",
+        "name": "红梅胜雪头像",
         "quality": 1,
         "image_id": 41141,
         "itid": 50,
@@ -1575,7 +1575,7 @@
         "getWays": "&",
         "addGetWay": "&",
         "useWays": "&",
-        "value": 1,
+        "value": 0,
         "condition": "7&41141",
         "timelimit": 0,
         "gift": 0,
@@ -1585,7 +1585,7 @@
     },
     {
         "good_id": 11278,
-        "name": "凌波剑意形象",
+        "name": "凌波剑意头像",
         "quality": 1,
         "image_id": 41201,
         "itid": 50,
@@ -1597,7 +1597,7 @@
         "getWays": "&",
         "addGetWay": "&",
         "useWays": "&",
-        "value": 2,
+        "value": 0,
         "condition": "7&41201",
         "timelimit": 0,
         "gift": 0,
@@ -1607,7 +1607,7 @@
     },
     {
         "good_id": 11279,
-        "name": "顾鉴媚影形象",
+        "name": "顾鉴媚影头像",
         "quality": 1,
         "image_id": 41256,
         "itid": 50,
@@ -1619,7 +1619,7 @@
         "getWays": "&",
         "addGetWay": "&",
         "useWays": "&",
-        "value": 3,
+        "value": 0,
         "condition": "7&41256",
         "timelimit": 0,
         "gift": 0,
@@ -1627,6 +1627,50 @@
         "seasonNum": 2,
         "info": "顾鉴媚影（貂蝉）头像"
     },
+    {
+        "good_id": 11280,
+        "name": "虎女娇心头像",
+        "quality": 1,
+        "image_id": 41126,
+        "itid": 50,
+        "goodType": 9,
+        "urType": 0,
+        "redPoint": 0,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "addGetWay": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": "7&41126",
+        "timelimit": 0,
+        "gift": 0,
+        "randomShow": 1,
+        "seasonNum": 0,
+        "info": "虎女娇心（关银屏）头像"
+    },
+    {
+        "good_id": 11281,
+        "name": "浮华玩世头像",
+        "quality": 1,
+        "image_id": 41105,
+        "itid": 50,
+        "goodType": 9,
+        "urType": 0,
+        "redPoint": 0,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "addGetWay": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": "7&41105",
+        "timelimit": 0,
+        "gift": 0,
+        "randomShow": 1,
+        "seasonNum": 0,
+        "info": "浮华玩世（郭嘉）头像"
+    },
     {
         "good_id": 11301,
         "name": "新人头像框",
@@ -3335,7 +3379,7 @@
         "getWays": "&",
         "addGetWay": "&",
         "useWays": "&",
-        "value": 1,
+        "value": 0,
         "condition": "7&41141",
         "timelimit": 0,
         "gift": 0,
@@ -3357,7 +3401,7 @@
         "getWays": "&",
         "addGetWay": "&",
         "useWays": "&",
-        "value": 2,
+        "value": 0,
         "condition": "7&41201",
         "timelimit": 0,
         "gift": 0,
@@ -3379,7 +3423,7 @@
         "getWays": "&",
         "addGetWay": "&",
         "useWays": "&",
-        "value": 3,
+        "value": 0,
         "condition": "7&41256",
         "timelimit": 0,
         "gift": 0,
@@ -3387,6 +3431,50 @@
         "seasonNum": 2,
         "info": "顾鉴媚影（貂蝉）形象"
     },
+    {
+        "good_id": 11480,
+        "name": "虎女娇心形象",
+        "quality": 1,
+        "image_id": 41126,
+        "itid": 52,
+        "goodType": 11,
+        "urType": 0,
+        "redPoint": 0,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "addGetWay": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": "7&41126",
+        "timelimit": 0,
+        "gift": 0,
+        "randomShow": 1,
+        "seasonNum": 0,
+        "info": "虎女娇心（关银屏）形象"
+    },
+    {
+        "good_id": 11481,
+        "name": "浮华玩世形象",
+        "quality": 1,
+        "image_id": 41105,
+        "itid": 52,
+        "goodType": 11,
+        "urType": 0,
+        "redPoint": 0,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "addGetWay": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": "7&41105",
+        "timelimit": 0,
+        "gift": 0,
+        "randomShow": 1,
+        "seasonNum": 0,
+        "info": "浮华玩世（郭嘉）形象"
+    },
     {
         "good_id": 12465,
         "name": "陈宫形象",
@@ -4705,7 +4793,7 @@
         "gift": 0,
         "randomShow": 0,
         "seasonNum": 0,
-        "info": "可代替1-4品训练丹"
+        "info": "玄鼎炼北斗，奇丹蕴春秋。奇人左慈以北斗灵气炼化而成，可代替1-4品职业丹"
     },
     {
         "good_id": 17060,
@@ -4727,7 +4815,7 @@
         "gift": 0,
         "randomShow": 0,
         "seasonNum": 0,
-        "info": "可代替5-8品训练丹"
+        "info": "玄鼎炼北斗，奇丹蕴春秋。奇人左慈以北斗灵气炼化而成，可代替5-8品职业丹"
     },
     {
         "good_id": 21001,
@@ -8293,6 +8381,28 @@
         "seasonNum": 0,
         "info": "XX武将的皮肤，穿戴增强属性并获得新技能"
     },
+    {
+        "good_id": 41105,
+        "name": "浮华玩世",
+        "quality": 3,
+        "image_id": 1,
+        "itid": 39,
+        "goodType": 13,
+        "urType": 0,
+        "redPoint": 0,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "88&",
+        "addGetWay": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 0,
+        "randomShow": 0,
+        "seasonNum": 0,
+        "info": "袨服华妆着处逢，六街灯火闹儿童。独行我亦何饮乐，笑看良辰美景年。百姓的笑语欢乐，才是我和孟德最期盼的画面啊。"
+    },
     {
         "good_id": 41107,
         "name": "典韦-精",
@@ -8449,7 +8559,7 @@
     },
     {
         "good_id": 41126,
-        "name": "关银屏-精",
+        "name": "虎女娇心",
         "quality": 3,
         "image_id": 1,
         "itid": 39,
@@ -8458,7 +8568,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "&",
+        "getWays": "88&",
         "addGetWay": "&",
         "useWays": "&",
         "value": 0,
@@ -8467,7 +8577,7 @@
         "gift": 0,
         "randomShow": 0,
         "seasonNum": 0,
-        "info": "XX武将的皮肤，穿戴增强属性并获得新技能"
+        "info": "白日冷眸舞霜刀，风神偏带淡淡香。谁能想到白日里冷艳严肃的将门虎女，晚上会在屋中偷偷试穿可爱的兔耳呢？"
     },
     {
         "good_id": 41127,

shared/resource/jsons/dic_zyz_auctionReward.json

@@ -1,322 +1,92 @@
 [
     {
         "poolId": 1,
-        "rewardId": "17&8|18&10|19&10|20&6|22&4|23&4|24&4|25&4|26&8|27&8|28&6|29&7|32&1|33&1|34&1",
+        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|24&4|25&4|26&8|27&8|28&6|29&1|29&7|30&1|31&1|32&1|33&1",
-        "desc": "演武台-军团7~10级"
+        "desc": "演武台3"
     },
     {
         "poolId": 2,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|24&4|26&8|27&8|28&6|29&7|32&1|33&1|34&1",
+        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|24&3|25&3|26&7|27&7|28&3|29&1|29&6|30&1|31&1|32&1",
-        "desc": "演武台-军团5~6级"
+        "desc": "演武台2"
     },
     {
         "poolId": 3,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|26&8|27&8|28&6|29&7|31&1|32&1|33&1",
+        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&3|24&3|25&3|26&6|27&6|29&1|29&5|30&1|31&1",
-        "desc": "演武台-军团3~4级"
+        "desc": "演武台1"
     },
     {
         "poolId": 4,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|26&8|27&8|28&6|29&7|30&1|31&1|32&1",
+        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|24&4|25&4|26&8|27&8|28&6|29&1|29&7|30&1|31&1|32&1|33&1",
-        "desc": "演武台-军团1~2级"
+        "desc": "蛮夷入侵3"
     },
     {
         "poolId": 5,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|26&8|27&8|28&6|29&7|30&1|31&1|32&1",
+        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|24&3|25&3|26&7|27&7|28&3|29&1|29&6|30&1|31&1|32&1",
-        "desc": "蛮夷入侵-军团1~2级-第1名"
+        "desc": "蛮夷入侵2"
     },
     {
         "poolId": 6,
-        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|26&7|27&7|28&3|29&6|30&1|31&1|32&1",
+        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&3|24&3|25&3|26&6|27&6|29&1|29&5|30&1|31&1",
-        "desc": "蛮夷入侵-军团1~2级-第2~3名"
+        "desc": "蛮夷入侵1"
     },
     {
         "poolId": 7,
-        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|26&6|27&6|28&1|29&5|30&1|31&1",
+        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|24&4|25&4|26&8|27&8|28&6|29&1|29&7|30&1|31&1|32&1|33&1",
-        "desc": "蛮夷入侵-军团1~2级-第4~99名"
+        "desc": "诸侯混战-小城3"
     },
     {
         "poolId": 8,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|26&8|27&8|28&6|29&7|31&1|32&1|33&1",
+        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|24&3|25&3|26&7|27&7|28&3|29&1|29&6|30&1|31&1|32&1",
-        "desc": "蛮夷入侵-军团3~4级-第1名"
+        "desc": "诸侯混战-小城2"
     },
     {
         "poolId": 9,
-        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|26&7|27&7|28&3|29&6|30&1|31&1|32&1",
+        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&3|24&3|25&3|26&6|27&6|29&1|29&5|30&1|31&1",
-        "desc": "蛮夷入侵-军团3~4级-第2~3名"
+        "desc": "诸侯混战-小城1"
     },
     {
         "poolId": 10,
-        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&4|26&6|27&6|28&1|29&5|30&1|31&1|32&1",
+        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|24&4|25&4|26&8|27&8|28&6|29&1|29&7|30&1|31&1|32&1|33&1",
-        "desc": "蛮夷入侵-军团3~4级-第4~99名"
+        "desc": "粮草先行3"
     },
     {
         "poolId": 11,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|24&4|26&8|27&8|28&6|29&7|32&1|33&1|34&1",
+        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|24&3|25&3|26&7|27&7|28&3|29&1|29&6|30&1|31&1|32&1",
-        "desc": "蛮夷入侵-军团5~6级-第1名"
+        "desc": "粮草先行2"
     },
     {
         "poolId": 12,
-        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|24&4|26&7|27&7|28&3|29&6|31&1|32&1|33&1",
+        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&3|24&3|25&3|26&6|27&6|29&1|29&5|30&1|31&1",
-        "desc": "蛮夷入侵-军团5~6级-第2~3名"
+        "desc": "粮草先行1"
     },
     {
         "poolId": 13,
-        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&4|24&4|26&6|27&6|28&1|29&5|31&1|32&1|33&1",
+        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|24&4|25&4|26&8|27&8|28&6|29&1|29&7|30&1|31&1|32&1|33&1",
-        "desc": "蛮夷入侵-军团5~6级-第4~99名"
+        "desc": "诸侯混战-中城3"
     },
     {
         "poolId": 14,
-        "rewardId": "17&8|18&10|19&10|20&6|22&4|23&4|24&4|25&4|26&8|27&8|28&6|29&7|32&1|33&1|34&1",
+        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|24&3|25&3|26&7|27&7|28&3|29&1|29&6|30&1|31&1|32&1|33&1",
-        "desc": "蛮夷入侵-军团7~10级-第1名"
+        "desc": "诸侯混战-中城2"
     },
     {
         "poolId": 15,
-        "rewardId": "17&7|18&9|19&9|20&5|22&4|23&4|24&4|25&4|26&7|27&7|28&3|29&6|31&1|32&1|33&1",
+        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&3|24&3|25&3|26&6|27&6|28&4|29&1|29&5|30&1|31&1",
-        "desc": "蛮夷入侵-军团7~10级-第2~3名"
+        "desc": "诸侯混战-中城1"
     },
     {
         "poolId": 16,
-        "rewardId": "17&6|18&8|19&8|20&4|22&3|23&4|24&4|25&4|26&6|27&6|28&1|29&5|31&1|32&1|33&1",
+        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|24&4|25&4|26&8|27&8|28&10|29&1|29&7|30&2|31&2|32&2|33&2",
-        "desc": "蛮夷入侵-军团7~10级-第4~99名"
+        "desc": "诸侯混战-大城3"
     },
     {
         "poolId": 17,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|26&8|27&8|28&6|29&7|30&1|31&1|32&1",
+        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|24&3|25&3|26&7|27&7|28&8|29&1|29&6|30&1|31&1|32&1|33&1",
-        "desc": "粮草先行-军团1~2级-第1名"
+        "desc": "诸侯混战-大城2"
     },
     {
         "poolId": 18,
-        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|26&7|27&7|28&3|29&6|30&1|31&1|32&1",
+        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&3|24&3|25&3|26&6|27&6|28&6|29&1|29&5|30&1|31&1",
-        "desc": "粮草先行-军团1~2级-第2~3名"
+        "desc": "诸侯混战-大城1"
-    },
-    {
-        "poolId": 19,
-        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|26&6|27&6|28&1|29&5|30&1|31&1",
-        "desc": "粮草先行-军团1~2级-第4~99名"
-    },
-    {
-        "poolId": 20,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|26&8|27&8|28&6|29&7|31&1|32&1|33&1",
-        "desc": "粮草先行-军团3~4级-第1名"
-    },
-    {
-        "poolId": 21,
-        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|26&7|27&7|28&3|29&6|30&1|31&1|32&1",
-        "desc": "粮草先行-军团3~4级-第2~3名"
-    },
-    {
-        "poolId": 22,
-        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&4|26&6|27&6|28&1|29&5|30&1|31&1|32&1",
-        "desc": "粮草先行-军团3~4级-第4~99名"
-    },
-    {
-        "poolId": 23,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|24&4|26&8|27&8|28&6|29&7|32&1|33&1|34&1",
-        "desc": "粮草先行-军团5~6级-第1名"
-    },
-    {
-        "poolId": 24,
-        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|24&4|26&7|27&7|28&3|29&6|31&1|32&1|33&1",
-        "desc": "粮草先行-军团5~6级-第2~3名"
-    },
-    {
-        "poolId": 25,
-        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&4|24&4|26&6|27&6|28&1|29&5|31&1|32&1|33&1",
-        "desc": "粮草先行-军团5~6级-第4~99名"
-    },
-    {
-        "poolId": 26,
-        "rewardId": "17&8|18&10|19&10|20&6|22&4|23&4|24&4|25&4|26&8|27&8|28&6|29&7|32&1|33&1|34&1",
-        "desc": "粮草先行-军团7~10级-第1名"
-    },
-    {
-        "poolId": 27,
-        "rewardId": "17&7|18&9|19&9|20&5|22&4|23&4|24&4|25&4|26&7|27&7|28&3|29&6|31&1|32&1|33&1",
-        "desc": "粮草先行-军团7~10级-第2~3名"
-    },
-    {
-        "poolId": 28,
-        "rewardId": "17&6|18&8|19&8|20&4|22&3|23&4|24&4|25&4|26&6|27&6|28&1|29&5|31&1|32&1|33&1",
-        "desc": "粮草先行-军团7~10级-第4~99名"
-    },
-    {
-        "poolId": 29,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|26&8|27&8|28&6|29&7|30&1|31&1|32&1",
-        "desc": "诸侯混战-小城-军团1~2级-第1名"
-    },
-    {
-        "poolId": 30,
-        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|26&7|27&7|28&3|29&6|30&1|31&1|32&1",
-        "desc": "诸侯混战-小城-军团1~2级-第2~3名"
-    },
-    {
-        "poolId": 31,
-        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|26&6|27&6|28&1|29&5|30&1|31&1",
-        "desc": "诸侯混战-小城-军团1~2级-第4~99名"
-    },
-    {
-        "poolId": 32,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|26&8|27&8|28&6|29&7|31&1|32&1|33&1",
-        "desc": "诸侯混战-小城-军团3~4级-第1名"
-    },
-    {
-        "poolId": 33,
-        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|26&7|27&7|28&3|29&6|30&1|31&1|32&1",
-        "desc": "诸侯混战-小城-军团3~4级-第2~3名"
-    },
-    {
-        "poolId": 34,
-        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&4|26&6|27&6|28&1|29&5|30&1|31&1|32&1",
-        "desc": "诸侯混战-小城-军团3~4级-第4~99名"
-    },
-    {
-        "poolId": 35,
-        "rewardId": "17&8|18&10|19&10|20&6|21&4|22&4|23&4|24&4|26&8|27&8|28&6|29&7|32&1|33&1|34&1",
-        "desc": "诸侯混战-小城-军团5~6级-第1名"
-    },
-    {
-        "poolId": 36,
-        "rewardId": "17&7|18&9|19&9|20&5|21&4|22&4|23&4|24&4|26&7|27&7|28&3|29&6|31&1|32&1|33&1",
-        "desc": "诸侯混战-小城-军团5~6级-第2~3名"
-    },
-    {
-        "poolId": 37,
-        "rewardId": "17&6|18&8|19&8|20&4|21&4|22&3|23&4|24&4|26&6|27&6|28&1|29&5|31&1|32&1|33&1",
-        "desc": "诸侯混战-小城-军团5~6级-第4~99名"
-    },
-    {
-        "poolId": 38,
-        "rewardId": "17&8|18&10|19&10|20&6|22&4|23&4|24&4|25&4|26&8|27&8|28&6|29&7|32&1|33&1|34&1",
-        "desc": "诸侯混战-小城-军团7~10级-第1名"
-    },
-    {
-        "poolId": 39,
-        "rewardId": "17&7|18&9|19&9|20&5|22&4|23&4|24&4|25&4|26&7|27&7|28&3|29&6|31&1|32&1|33&1",
-        "desc": "诸侯混战-小城-军团7~10级-第2~3名"
-    },
-    {
-        "poolId": 40,
-        "rewardId": "17&6|18&8|19&8|20&4|22&3|23&4|24&4|25&4|26&6|27&6|28&1|29&5|31&1|32&1|33&1",
-        "desc": "诸侯混战-小城-军团7~10级-第4~99名"
-    },
-    {
-        "poolId": 41,
-        "rewardId": "17&9|18&10|19&10|20&6|21&4|22&4|26&8|27&8|28&6|29&7|30&1|31&1|32&1",
-        "desc": "诸侯混战-中城-军团1~2级-第1名"
-    },
-    {
-        "poolId": 42,
-        "rewardId": "17&8|18&9|19&9|20&5|21&4|22&4|26&7|27&7|28&4|29&6|30&1|31&1|32&1",
-        "desc": "诸侯混战-中城-军团1~2级-第2~3名"
-    },
-    {
-        "poolId": 43,
-        "rewardId": "17&7|18&8|19&8|20&4|21&4|22&3|26&6|27&6|28&2|29&5|30&1|31&1",
-        "desc": "诸侯混战-中城-军团1~2级-第4~99名"
-    },
-    {
-        "poolId": 44,
-        "rewardId": "17&9|18&10|19&10|20&6|21&4|22&4|23&4|26&8|27&8|28&6|29&7|31&1|32&1|33&1",
-        "desc": "诸侯混战-中城-军团3~4级-第1名"
-    },
-    {
-        "poolId": 45,
-        "rewardId": "17&8|18&9|19&9|20&5|21&4|22&4|23&4|26&7|27&7|28&4|29&6|30&1|31&1|32&1",
-        "desc": "诸侯混战-中城-军团3~4级-第2~3名"
-    },
-    {
-        "poolId": 46,
-        "rewardId": "17&7|18&8|19&8|20&4|21&4|22&3|23&4|26&6|27&6|28&2|29&5|30&1|31&1|32&1",
-        "desc": "诸侯混战-中城-军团3~4级-第4~99名"
-    },
-    {
-        "poolId": 47,
-        "rewardId": "17&9|18&10|19&10|20&6|21&4|22&4|23&4|24&4|26&8|27&8|28&6|29&7|32&1|33&1|34&1",
-        "desc": "诸侯混战-中城-军团5~6级-第1名"
-    },
-    {
-        "poolId": 48,
-        "rewardId": "17&8|18&9|19&9|20&5|21&4|22&4|23&4|24&4|26&7|27&7|28&4|29&6|31&1|32&1|33&1",
-        "desc": "诸侯混战-中城-军团5~6级-第2~3名"
-    },
-    {
-        "poolId": 49,
-        "rewardId": "17&7|18&8|19&8|20&4|21&4|22&3|23&4|24&4|26&6|27&6|28&2|29&5|31&1|32&1|33&1",
-        "desc": "诸侯混战-中城-军团5~6级-第4~99名"
-    },
-    {
-        "poolId": 50,
-        "rewardId": "17&9|18&10|19&10|20&6|22&4|23&4|24&4|25&4|26&8|27&8|28&6|29&7|32&1|33&1|34&1",
-        "desc": "诸侯混战-中城-军团7~10级-第1名"
-    },
-    {
-        "poolId": 51,
-        "rewardId": "17&8|18&9|19&9|20&5|22&4|23&4|24&4|25&4|26&7|27&7|28&4|29&6|31&1|32&1|33&1",
-        "desc": "诸侯混战-中城-军团7~10级-第2~3名"
-    },
-    {
-        "poolId": 52,
-        "rewardId": "17&7|18&8|19&8|20&4|22&3|23&4|24&4|25&4|26&6|27&6|28&2|29&5|31&1|32&1|33&1",
-        "desc": "诸侯混战-中城-军团7~10级-第4~99名"
-    },
-    {
-        "poolId": 53,
-        "rewardId": "17&9|18&10|19&10|20&6|21&4|22&4|26&8|27&8|28&8|29&7|30&1|31&1|32&2",
-        "desc": "诸侯混战-大城-军团1~2级-第1名"
-    },
-    {
-        "poolId": 54,
-        "rewardId": "17&8|18&9|19&9|20&5|21&4|22&4|26&7|27&7|28&6|29&6|30&1|31&1|32&1",
-        "desc": "诸侯混战-大城-军团1~2级-第2~3名"
-    },
-    {
-        "poolId": 55,
-        "rewardId": "17&7|18&8|19&8|20&4|21&4|22&3|26&6|27&6|28&4|29&5|30&1|31&1",
-        "desc": "诸侯混战-大城-军团1~2级-第4~99名"
-    },
-    {
-        "poolId": 56,
-        "rewardId": "17&9|18&10|19&10|20&6|21&4|22&4|23&4|26&8|27&8|28&8|29&7|31&1|32&1|33&2",
-        "desc": "诸侯混战-大城-军团3~4级-第1名"
-    },
-    {
-        "poolId": 57,
-        "rewardId": "17&8|18&9|19&9|20&5|21&4|22&4|23&4|26&7|27&7|28&6|29&6|31&1|32&1|33&1",
-        "desc": "诸侯混战-大城-军团3~4级-第2~3名"
-    },
-    {
-        "poolId": 58,
-        "rewardId": "17&7|18&8|19&8|20&4|21&4|22&3|23&4|26&6|27&6|28&4|29&5|30&1|31&1|32&1",
-        "desc": "诸侯混战-大城-军团3~4级-第4~99名"
-    },
-    {
-        "poolId": 59,
-        "rewardId": "17&9|18&10|19&10|20&6|21&4|22&4|23&4|24&4|26&8|27&8|28&8|29&7|32&1|33&1|34&2",
-        "desc": "诸侯混战-大城-军团5~6级-第1名"
-    },
-    {
-        "poolId": 60,
-        "rewardId": "17&8|18&9|19&9|20&5|21&4|22&4|23&4|24&4|26&7|27&7|28&6|29&6|32&1|33&1|34&1",
-        "desc": "诸侯混战-大城-军团5~6级-第2~3名"
-    },
-    {
-        "poolId": 61,
-        "rewardId": "17&7|18&8|19&8|20&4|21&4|22&3|23&4|24&4|26&6|27&6|28&4|29&5|31&1|32&1|33&1",
-        "desc": "诸侯混战-大城-军团5~6级-第4~99名"
-    },
-    {
-        "poolId": 62,
-        "rewardId": "17&9|18&10|19&10|20&6|22&4|23&4|24&4|25&4|26&8|27&8|28&8|29&7|32&1|33&1|34&2",
-        "desc": "诸侯混战-大城-军团7~10级-第1名"
-    },
-    {
-        "poolId": 63,
-        "rewardId": "17&8|18&9|19&9|20&5|22&4|23&4|24&4|25&4|26&7|27&7|28&6|29&6|32&1|33&1|34&1",
-        "desc": "诸侯混战-大城-军团7~10级-第2~3名"
-    },
-    {
-        "poolId": 64,
-        "rewardId": "17&7|18&8|19&8|20&4|22&3|23&4|24&4|25&4|26&6|27&6|28&4|29&5|31&1|32&1|33&1",
-        "desc": "诸侯混战-大城-军团7~10级-第4~99名"
     }
 ]

shared/resource/jsons/dic_zyz_auctionType.json

@@ -5,7 +5,7 @@
         "auctionName": "军团",
         "tab": 1,
         "tabName": "演武台",
-        "itid": "25&28&38&41&59&60&61&62&63"
+        "itid": "25&28&38&41&59&60&61&62"
     },
     {
         "id": 2,
@@ -13,7 +13,7 @@
         "auctionName": "军团",
         "tab": 2,
         "tabName": "蛮夷入侵",
-        "itid": "25&28&38&41&59&60&61&62&63"
+        "itid": "25&28&38&41&59&60&61&62"
     },
     {
         "id": 3,
@@ -21,7 +21,7 @@
         "auctionName": "军团",
         "tab": 3,
         "tabName": "诸侯混战",
-        "itid": "25&28&38&41&59&60&61&62&63"
+        "itid": "25&28&38&41&59&60&61&62"
     },
     {
         "id": 4,
@@ -29,7 +29,7 @@
         "auctionName": "军团",
         "tab": 4,
         "tabName": "粮草先行",
-        "itid": "25&28&38&41&59&60&61&62&63"
+        "itid": "25&28&38&41"
     },
     {
         "id": 5,
@@ -45,7 +45,7 @@
         "auctionName": "世界",
         "tab": 2,
         "tabName": "天晶",
-        "itid": "28&59&60&61&62&63"
+        "itid": "28&59&60&61&62"
     },
     {
         "id": 7,

shared/resource/jsons/dic_zyz_auction_basicPool.json

@@ -168,15 +168,5 @@
         "basePrice": "31002&2000",
         "maxPrice": "31002&3600",
         "sort": 8
-    },
-    {
-        "id": 34,
-        "name": "五阶天晶藏宝图",
-        "rewardBasicPool": "33005&1&1|33014&1&1|33023&1&1|33032&1&1",
-        "totalCount": 1,
-        "itid": 63,
-        "basePrice": "31002&4000",
-        "maxPrice": "31002&7200",
-        "sort": 7
     }
 ]

shared/resource/jsons/dic_zyz_fashions.json

@@ -44,6 +44,15 @@
         "skinQuality": 0,
         "cv": "林景"
     },
+    {
+        "goodId": 41105,
+        "name": "浮华玩世",
+        "heroId": 41105,
+        "globalAttr": "1&0.5|2&0.5|4&0.5|5&0.5",
+        "actorId": 5,
+        "skinQuality": 0,
+        "cv": "林景"
+    },
     {
         "goodId": 41007,
         "name": "初出茅庐",
@@ -233,6 +242,15 @@
         "skinQuality": 0,
         "cv": "溯浔"
     },
+    {
+        "goodId": 41126,
+        "name": "虎女娇心",
+        "heroId": 41126,
+        "globalAttr": "1&0.5|2&0.5|4&0.5|5&0.5",
+        "actorId": 26,
+        "skinQuality": 0,
+        "cv": "溯浔"
+    },
     {
         "goodId": 41027,
         "name": "初出茅庐",

shared/resource/jsons/dic_zyz_gacha.json

@@ -67,8 +67,8 @@
         "count": "1&5",
         "free": "1&1",
         "cost": "22002&1",
-        "percent": "4&5|20&5|19&10|18&15|26&15|33&15|10&20|11&15",
+        "percent": "4&5|5&5|6&10|7&20|10&10|9&15|8&20|11&15",
-        "percentShow": "1&5|3&5&15&71002|3&10&10&71002|3&15&5&71002|3&15&15&71004|3&15&20&71006|3&20&5&71008|3&15&20&17052",
+        "percentShow": "1&5|3&5&5&71001|3&10&10&71003|3&20&20&71005|3&10&3&71009|3&15&2&71009|3&20&1&71009|3&15&5&17052",
         "isTask": 1,
         "gachaCnt": "1&-1",
         "indirectId": 0,

shared/resource/jsons/dic_zyz_gachaPlan.json

@@ -553,41 +553,41 @@
         "id": 17001,
         "planId": 8,
         "type": 4,
-        "content": 71008,
+        "content": 71009,
         "count": 1,
         "weight": 1,
         "heroQuality": 0,
-        "备注": "任选1级地玉*1"
+        "备注": "随机1级地玉*1"
     },
     {
         "id": 18001,
         "planId": 9,
         "type": 4,
-        "content": 71008,
+        "content": 71009,
-        "count": 3,
+        "count": 2,
         "weight": 1,
         "heroQuality": 0,
-        "备注": "任选1级地玉*3"
+        "备注": "随机1级地玉*2"
     },
     {
         "id": 19001,
         "planId": 10,
         "type": 4,
-        "content": 71008,
+        "content": 71009,
-        "count": 5,
+        "count": 3,
         "weight": 1,
         "heroQuality": 0,
-        "备注": "任选1级地玉*5"
+        "备注": "随机1级地玉*3"
     },
     {
         "id": 20001,
         "planId": 11,
         "type": 4,
         "content": 17052,
-        "count": 20,
+        "count": 5,
         "weight": 1,
         "heroQuality": 0,
-        "备注": "玉石*20"
+        "备注": "玉石*5"
     },
     {
         "id": 21001,
@@ -648,185 +648,5 @@
         "weight": 1,
         "heroQuality": 2,
         "备注": "新手第2抽，关银屏"
-    },
-    {
-        "id": 27001,
-        "planId": 18,
-        "type": 4,
-        "content": 71002,
-        "count": 5,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "传奇武将任选将魂*5"
-    },
-    {
-        "id": 27002,
-        "planId": 19,
-        "type": 4,
-        "content": 71002,
-        "count": 10,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "传奇武将任选将魂*10"
-    },
-    {
-        "id": 27003,
-        "planId": 20,
-        "type": 4,
-        "content": 71002,
-        "count": 15,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "传奇武将任选将魂*15"
-    },
-    {
-        "id": 27004,
-        "planId": 21,
-        "type": 4,
-        "content": 71002,
-        "count": 20,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "传奇武将任选将魂*20"
-    },
-    {
-        "id": 27005,
-        "planId": 22,
-        "type": 4,
-        "content": 71002,
-        "count": 40,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "传奇武将任选将魂*40"
-    },
-    {
-        "id": 27006,
-        "planId": 23,
-        "type": 4,
-        "content": 71002,
-        "count": 80,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "传奇武将任选将魂*80"
-    },
-    {
-        "id": 28001,
-        "planId": 24,
-        "type": 4,
-        "content": 71004,
-        "count": 5,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "国士武将任选将魂*5"
-    },
-    {
-        "id": 28002,
-        "planId": 25,
-        "type": 4,
-        "content": 71004,
-        "count": 10,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "国士武将任选将魂*10"
-    },
-    {
-        "id": 28003,
-        "planId": 26,
-        "type": 4,
-        "content": 71004,
-        "count": 15,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "国士武将任选将魂*15"
-    },
-    {
-        "id": 28004,
-        "planId": 27,
-        "type": 4,
-        "content": 71004,
-        "count": 20,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "国士武将任选将魂*20"
-    },
-    {
-        "id": 28005,
-        "planId": 28,
-        "type": 4,
-        "content": 71004,
-        "count": 40,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "国士武将任选将魂*40"
-    },
-    {
-        "id": 28006,
-        "planId": 29,
-        "type": 4,
-        "content": 71004,
-        "count": 80,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "国士武将任选将魂*80"
-    },
-    {
-        "id": 29001,
-        "planId": 30,
-        "type": 4,
-        "content": 71006,
-        "count": 5,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "名将武将任选将魂*5"
-    },
-    {
-        "id": 29002,
-        "planId": 31,
-        "type": 4,
-        "content": 71006,
-        "count": 10,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "名将武将任选将魂*10"
-    },
-    {
-        "id": 29003,
-        "planId": 32,
-        "type": 4,
-        "content": 71006,
-        "count": 15,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "名将武将任选将魂*15"
-    },
-    {
-        "id": 29004,
-        "planId": 33,
-        "type": 4,
-        "content": 71006,
-        "count": 20,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "名将武将任选将魂*20"
-    },
-    {
-        "id": 29005,
-        "planId": 34,
-        "type": 4,
-        "content": 71006,
-        "count": 40,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "名将武将任选将魂*40"
-    },
-    {
-        "id": 29006,
-        "planId": 35,
-        "type": 4,
-        "content": 71006,
-        "count": 80,
-        "weight": 1,
-        "heroQuality": 0,
-        "备注": "名将武将任选将魂*80"
     }
 ]

shared/resource/jsons/dic_zyz_hero.json

@@ -2215,10 +2215,10 @@
         "jobClass": 7,
         "skill": 65,
         "pieceId": 21065,
-        "hp": 4320,
+        "hp": 3860,
-        "atk": 1260,
+        "atk": 1300,
-        "def": 800,
+        "def": 720,
-        "mdef": 740,
+        "mdef": 920,
         "hp_up": 0,
         "atk_up": 0,
         "def_up": 0,
@@ -22599,6 +22599,46 @@
         "heroChainId": 3,
         "urType": 0
     },
+    {
+        "heroId": 41105,
+        "spineName": "guojia_fuhuawanshi",
+        "rSpineName": "LH_guojia_fuhuawanshi",
+        "name": "郭嘉",
+        "actorId": 5,
+        "face_id": "gj_fuhuawanshi",
+        "quality": 3,
+        "initialStars": 3,
+        "pieceCount": 80,
+        "camp": 1,
+        "area": 0,
+        "jobid": 600,
+        "jobClass": 6,
+        "skill": 5,
+        "pieceId": 21005,
+        "hp": 3740,
+        "atk": 1380,
+        "def": 700,
+        "mdef": 900,
+        "hp_up": 0,
+        "atk_up": 0,
+        "def_up": 0,
+        "mdef_up": 0,
+        "info": "郭嘉，字奉孝，法家寒门奇才，曹操最为倚重的智囊，总能在曹操迷茫时给予他方向。虽然平时肆意洒脱，但在评判美酒衡量律法时却格外严格。",
+        "actorinfo": "&",
+        "skillScroll": "&",
+        "initialSkin": 41005,
+        "gender": 1,
+        "atkSpineEffect": "faqi",
+        "probation": 9905,
+        "center_y": 0,
+        "show_animation": "&",
+        "isdeath": 1,
+        "talentId": 1006,
+        "recommendId": "501&502",
+        "aiPlan": 1,
+        "heroChainId": 5,
+        "urType": 0
+    },
     {
         "heroId": 41107,
         "spineName": "dianwei",
@@ -22881,11 +22921,11 @@
     },
     {
         "heroId": 41126,
-        "spineName": "guanyinping",
+        "spineName": "guanyinping_hunvjiaoxin",
-        "rSpineName": "LH_guanyinping",
+        "rSpineName": "LH_guanyinping_hunvjiaoxin",
         "name": "关银屏",
         "actorId": 26,
-        "face_id": "guanyinping",
+        "face_id": "gyp_hunvjiaoxin",
         "quality": 2,
         "initialStars": 2,
         "pieceCount": 40,
@@ -22903,18 +22943,18 @@
         "atk_up": 0,
         "def_up": 0,
         "mdef_up": 0,
-        "info": "关银屏，关羽之女，黄月英的弟子，但却没有继承黄月英的机关之术，反而和其父一样成为了墨侠，与马云禄并称蜀汉双英。肉盾型骑兵，擅长降低敌军命中率，可对敌军造成定身，对男性敌军伤害加深。",
+        "info": "关银屏，关羽之女，和其父一样成为了墨侠，性格也和父亲一样沉稳，对父亲有着无限的敬爱和崇拜。虽然无法理解父亲斩杀同门之举，但一直坚信着父亲有其苦衷。",
         "actorinfo": "&",
         "skillScroll": "&",
-        "initialSkin": 41027,
+        "initialSkin": 41026,
         "gender": 2,
         "atkSpineEffect": "liqi",
-        "probation": 9922,
+        "probation": 9926,
         "center_y": 0,
-        "show_animation": 0,
+        "show_animation": "&",
         "isdeath": 1,
         "talentId": 1003,
-        "recommendId": 0,
+        "recommendId": "2601&2602",
         "aiPlan": 1,
         "heroChainId": 26,
         "urType": 0

shared/resource/jsons/dic_zyz_shop.json

@@ -1367,6 +1367,120 @@
         "vipPurchaseLimit": 0,
         "seasonNum": 3
     },
+    {
+        "id": 5607,
+        "goodId": 41126,
+        "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,
+        "seasonNum": 0
+    },
+    {
+        "id": 5608,
+        "goodId": 41105,
+        "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,
+        "seasonNum": 0
+    },
+    {
+        "id": 6002,
+        "goodId": 17044,
+        "goodName": "洗练石",
+        "num": 1,
+        "shop": 6,
+        "type": 19,
+        "guildLvLimit": 0,
+        "lvLimit": 0,
+        "ranklimit": 0,
+        "purchaseLimit": 9999,
+        "refreshType": 2,
+        "money": 40002,
+        "price": "1&200",
+        "chosen": 0,
+        "indirectId": 0,
+        "vipPurchaseLimit": 0,
+        "seasonNum": 0
+    },
+    {
+        "id": 6003,
+        "goodId": 17057,
+        "goodName": "淬炼石",
+        "num": 1,
+        "shop": 6,
+        "type": 19,
+        "guildLvLimit": 0,
+        "lvLimit": 0,
+        "ranklimit": 0,
+        "purchaseLimit": 9999,
+        "refreshType": 2,
+        "money": 40002,
+        "price": "1&800",
+        "chosen": 0,
+        "indirectId": 0,
+        "vipPurchaseLimit": 0,
+        "seasonNum": 0
+    },
+    {
+        "id": 6004,
+        "goodId": 17045,
+        "goodName": "乾坤锁",
+        "num": 1,
+        "shop": 6,
+        "type": 19,
+        "guildLvLimit": 0,
+        "lvLimit": 0,
+        "ranklimit": 0,
+        "purchaseLimit": 9999,
+        "refreshType": 2,
+        "money": 40002,
+        "price": "1&400",
+        "chosen": 0,
+        "indirectId": 0,
+        "vipPurchaseLimit": 0,
+        "seasonNum": 0
+    },
+    {
+        "id": 6005,
+        "goodId": 17056,
+        "goodName": "息壤",
+        "num": 1,
+        "shop": 6,
+        "type": 19,
+        "guildLvLimit": 0,
+        "lvLimit": 0,
+        "ranklimit": 0,
+        "purchaseLimit": 9999,
+        "refreshType": 2,
+        "money": 40002,
+        "price": "1&5000",
+        "chosen": 0,
+        "indirectId": 0,
+        "vipPurchaseLimit": 0,
+        "seasonNum": 0
+    },
     {
         "id": 6006,
         "goodId": 33001,