config,rank，debug

src/api/config/ActivityConfigCategory.json

@@ -5,9 +5,9 @@
     "Type": 2,
     "ActivityId": 1,
     "Sort": 1,
-    "StartTime": "2025/5/16",
+    "StartTime": "2025/5/28",
     "EndTime": "2025/6/9",
-    "CloseTime": "2025/6/12",
+    "CloseTime": "2025/6/13",
     "Condition": 2,
     "ConditionNum": [
       100,
@@ -28,8 +28,19 @@
       100014
     ],
     "Group": 21,
+    "GameGroup": 26,
     "ChallengeCore": 100,
-    "DailyChange": true
+    "Core": [
+      100,
+      200,
+      300,
+      400,
+      500,
+      600,
+      700
+    ],
+    "DailyChange": true,
+    "SortOrder": false
   },
   {
     "Id": 103,
@@ -37,9 +48,9 @@
     "Type": 3,
     "ActivityId": 1,
     "Sort": 2,
-    "StartTime": "2025/5/16",
+    "StartTime": "2025/5/28",
     "EndTime": "2025/6/9",
-    "CloseTime": "2025/6/12",
+    "CloseTime": "2025/6/13",
     "Condition": 2,
     "ConditionNum": [
       100,
@@ -60,7 +71,18 @@
       100021
     ],
     "Group": 22,
+    "GameGroup": 27,
     "ChallengeCore": 100,
-    "DailyChange": true
+    "Core": [
+      100,
+      200,
+      300,
+      400,
+      500,
+      600,
+      700
+    ],
+    "DailyChange": true,
+    "SortOrder": true
   }
 ]

src/api/config/BeastTideConfigCategory.json

@@ -998,5 +998,505 @@
     "Id": 200,
     "Challenge": 10200,
     "ChallengeAward": 2200
+  },
+  {
+    "Id": 201,
+    "Challenge": 10201,
+    "ChallengeAward": 2201
+  },
+  {
+    "Id": 202,
+    "Challenge": 10202,
+    "ChallengeAward": 2202
+  },
+  {
+    "Id": 203,
+    "Challenge": 10203,
+    "ChallengeAward": 2203
+  },
+  {
+    "Id": 204,
+    "Challenge": 10204,
+    "ChallengeAward": 2204
+  },
+  {
+    "Id": 205,
+    "Challenge": 10205,
+    "ChallengeAward": 2205
+  },
+  {
+    "Id": 206,
+    "Challenge": 10206,
+    "ChallengeAward": 2206
+  },
+  {
+    "Id": 207,
+    "Challenge": 10207,
+    "ChallengeAward": 2207
+  },
+  {
+    "Id": 208,
+    "Challenge": 10208,
+    "ChallengeAward": 2208
+  },
+  {
+    "Id": 209,
+    "Challenge": 10209,
+    "ChallengeAward": 2209
+  },
+  {
+    "Id": 210,
+    "Challenge": 10210,
+    "ChallengeAward": 2210
+  },
+  {
+    "Id": 211,
+    "Challenge": 10211,
+    "ChallengeAward": 2211
+  },
+  {
+    "Id": 212,
+    "Challenge": 10212,
+    "ChallengeAward": 2212
+  },
+  {
+    "Id": 213,
+    "Challenge": 10213,
+    "ChallengeAward": 2213
+  },
+  {
+    "Id": 214,
+    "Challenge": 10214,
+    "ChallengeAward": 2214
+  },
+  {
+    "Id": 215,
+    "Challenge": 10215,
+    "ChallengeAward": 2215
+  },
+  {
+    "Id": 216,
+    "Challenge": 10216,
+    "ChallengeAward": 2216
+  },
+  {
+    "Id": 217,
+    "Challenge": 10217,
+    "ChallengeAward": 2217
+  },
+  {
+    "Id": 218,
+    "Challenge": 10218,
+    "ChallengeAward": 2218
+  },
+  {
+    "Id": 219,
+    "Challenge": 10219,
+    "ChallengeAward": 2219
+  },
+  {
+    "Id": 220,
+    "Challenge": 10220,
+    "ChallengeAward": 2220
+  },
+  {
+    "Id": 221,
+    "Challenge": 10221,
+    "ChallengeAward": 2221
+  },
+  {
+    "Id": 222,
+    "Challenge": 10222,
+    "ChallengeAward": 2222
+  },
+  {
+    "Id": 223,
+    "Challenge": 10223,
+    "ChallengeAward": 2223
+  },
+  {
+    "Id": 224,
+    "Challenge": 10224,
+    "ChallengeAward": 2224
+  },
+  {
+    "Id": 225,
+    "Challenge": 10225,
+    "ChallengeAward": 2225
+  },
+  {
+    "Id": 226,
+    "Challenge": 10226,
+    "ChallengeAward": 2226
+  },
+  {
+    "Id": 227,
+    "Challenge": 10227,
+    "ChallengeAward": 2227
+  },
+  {
+    "Id": 228,
+    "Challenge": 10228,
+    "ChallengeAward": 2228
+  },
+  {
+    "Id": 229,
+    "Challenge": 10229,
+    "ChallengeAward": 2229
+  },
+  {
+    "Id": 230,
+    "Challenge": 10230,
+    "ChallengeAward": 2230
+  },
+  {
+    "Id": 231,
+    "Challenge": 10231,
+    "ChallengeAward": 2231
+  },
+  {
+    "Id": 232,
+    "Challenge": 10232,
+    "ChallengeAward": 2232
+  },
+  {
+    "Id": 233,
+    "Challenge": 10233,
+    "ChallengeAward": 2233
+  },
+  {
+    "Id": 234,
+    "Challenge": 10234,
+    "ChallengeAward": 2234
+  },
+  {
+    "Id": 235,
+    "Challenge": 10235,
+    "ChallengeAward": 2235
+  },
+  {
+    "Id": 236,
+    "Challenge": 10236,
+    "ChallengeAward": 2236
+  },
+  {
+    "Id": 237,
+    "Challenge": 10237,
+    "ChallengeAward": 2237
+  },
+  {
+    "Id": 238,
+    "Challenge": 10238,
+    "ChallengeAward": 2238
+  },
+  {
+    "Id": 239,
+    "Challenge": 10239,
+    "ChallengeAward": 2239
+  },
+  {
+    "Id": 240,
+    "Challenge": 10240,
+    "ChallengeAward": 2240
+  },
+  {
+    "Id": 241,
+    "Challenge": 10241,
+    "ChallengeAward": 2241
+  },
+  {
+    "Id": 242,
+    "Challenge": 10242,
+    "ChallengeAward": 2242
+  },
+  {
+    "Id": 243,
+    "Challenge": 10243,
+    "ChallengeAward": 2243
+  },
+  {
+    "Id": 244,
+    "Challenge": 10244,
+    "ChallengeAward": 2244
+  },
+  {
+    "Id": 245,
+    "Challenge": 10245,
+    "ChallengeAward": 2245
+  },
+  {
+    "Id": 246,
+    "Challenge": 10246,
+    "ChallengeAward": 2246
+  },
+  {
+    "Id": 247,
+    "Challenge": 10247,
+    "ChallengeAward": 2247
+  },
+  {
+    "Id": 248,
+    "Challenge": 10248,
+    "ChallengeAward": 2248
+  },
+  {
+    "Id": 249,
+    "Challenge": 10249,
+    "ChallengeAward": 2249
+  },
+  {
+    "Id": 250,
+    "Challenge": 10250,
+    "ChallengeAward": 2250
+  },
+  {
+    "Id": 251,
+    "Challenge": 10251,
+    "ChallengeAward": 2251
+  },
+  {
+    "Id": 252,
+    "Challenge": 10252,
+    "ChallengeAward": 2252
+  },
+  {
+    "Id": 253,
+    "Challenge": 10253,
+    "ChallengeAward": 2253
+  },
+  {
+    "Id": 254,
+    "Challenge": 10254,
+    "ChallengeAward": 2254
+  },
+  {
+    "Id": 255,
+    "Challenge": 10255,
+    "ChallengeAward": 2255
+  },
+  {
+    "Id": 256,
+    "Challenge": 10256,
+    "ChallengeAward": 2256
+  },
+  {
+    "Id": 257,
+    "Challenge": 10257,
+    "ChallengeAward": 2257
+  },
+  {
+    "Id": 258,
+    "Challenge": 10258,
+    "ChallengeAward": 2258
+  },
+  {
+    "Id": 259,
+    "Challenge": 10259,
+    "ChallengeAward": 2259
+  },
+  {
+    "Id": 260,
+    "Challenge": 10260,
+    "ChallengeAward": 2260
+  },
+  {
+    "Id": 261,
+    "Challenge": 10261,
+    "ChallengeAward": 2261
+  },
+  {
+    "Id": 262,
+    "Challenge": 10262,
+    "ChallengeAward": 2262
+  },
+  {
+    "Id": 263,
+    "Challenge": 10263,
+    "ChallengeAward": 2263
+  },
+  {
+    "Id": 264,
+    "Challenge": 10264,
+    "ChallengeAward": 2264
+  },
+  {
+    "Id": 265,
+    "Challenge": 10265,
+    "ChallengeAward": 2265
+  },
+  {
+    "Id": 266,
+    "Challenge": 10266,
+    "ChallengeAward": 2266
+  },
+  {
+    "Id": 267,
+    "Challenge": 10267,
+    "ChallengeAward": 2267
+  },
+  {
+    "Id": 268,
+    "Challenge": 10268,
+    "ChallengeAward": 2268
+  },
+  {
+    "Id": 269,
+    "Challenge": 10269,
+    "ChallengeAward": 2269
+  },
+  {
+    "Id": 270,
+    "Challenge": 10270,
+    "ChallengeAward": 2270
+  },
+  {
+    "Id": 271,
+    "Challenge": 10271,
+    "ChallengeAward": 2271
+  },
+  {
+    "Id": 272,
+    "Challenge": 10272,
+    "ChallengeAward": 2272
+  },
+  {
+    "Id": 273,
+    "Challenge": 10273,
+    "ChallengeAward": 2273
+  },
+  {
+    "Id": 274,
+    "Challenge": 10274,
+    "ChallengeAward": 2274
+  },
+  {
+    "Id": 275,
+    "Challenge": 10275,
+    "ChallengeAward": 2275
+  },
+  {
+    "Id": 276,
+    "Challenge": 10276,
+    "ChallengeAward": 2276
+  },
+  {
+    "Id": 277,
+    "Challenge": 10277,
+    "ChallengeAward": 2277
+  },
+  {
+    "Id": 278,
+    "Challenge": 10278,
+    "ChallengeAward": 2278
+  },
+  {
+    "Id": 279,
+    "Challenge": 10279,
+    "ChallengeAward": 2279
+  },
+  {
+    "Id": 280,
+    "Challenge": 10280,
+    "ChallengeAward": 2280
+  },
+  {
+    "Id": 281,
+    "Challenge": 10281,
+    "ChallengeAward": 2281
+  },
+  {
+    "Id": 282,
+    "Challenge": 10282,
+    "ChallengeAward": 2282
+  },
+  {
+    "Id": 283,
+    "Challenge": 10283,
+    "ChallengeAward": 2283
+  },
+  {
+    "Id": 284,
+    "Challenge": 10284,
+    "ChallengeAward": 2284
+  },
+  {
+    "Id": 285,
+    "Challenge": 10285,
+    "ChallengeAward": 2285
+  },
+  {
+    "Id": 286,
+    "Challenge": 10286,
+    "ChallengeAward": 2286
+  },
+  {
+    "Id": 287,
+    "Challenge": 10287,
+    "ChallengeAward": 2287
+  },
+  {
+    "Id": 288,
+    "Challenge": 10288,
+    "ChallengeAward": 2288
+  },
+  {
+    "Id": 289,
+    "Challenge": 10289,
+    "ChallengeAward": 2289
+  },
+  {
+    "Id": 290,
+    "Challenge": 10290,
+    "ChallengeAward": 2290
+  },
+  {
+    "Id": 291,
+    "Challenge": 10291,
+    "ChallengeAward": 2291
+  },
+  {
+    "Id": 292,
+    "Challenge": 10292,
+    "ChallengeAward": 2292
+  },
+  {
+    "Id": 293,
+    "Challenge": 10293,
+    "ChallengeAward": 2293
+  },
+  {
+    "Id": 294,
+    "Challenge": 10294,
+    "ChallengeAward": 2294
+  },
+  {
+    "Id": 295,
+    "Challenge": 10295,
+    "ChallengeAward": 2295
+  },
+  {
+    "Id": 296,
+    "Challenge": 10296,
+    "ChallengeAward": 2296
+  },
+  {
+    "Id": 297,
+    "Challenge": 10297,
+    "ChallengeAward": 2297
+  },
+  {
+    "Id": 298,
+    "Challenge": 10298,
+    "ChallengeAward": 2298
+  },
+  {
+    "Id": 299,
+    "Challenge": 10299,
+    "ChallengeAward": 2299
+  },
+  {
+    "Id": 300,
+    "Challenge": 10300,
+    "ChallengeAward": 2300
   }
 ]

src/api/config/BuildFunctionConfigCategory.json

@@ -647,6 +647,17 @@
     "HatchNum": 2,
     "HatchTime": 2160
   },
+  {
+    "Id": 581,
+    "ResourcesPointId": 0,
+    "ItemConversion": [
+      0
+    ],
+    "LiveStockType": 2,
+    "PoultryNum": 5,
+    "FeedItem": 861,
+    "FeedStorage": 200
+  },
   {
     "Id": 582,
     "ResourcesPointId": 0,
@@ -661,6 +672,17 @@
     "HatchNum": 4,
     "HatchTime": 2160
   },
+  {
+    "Id": 583,
+    "ResourcesPointId": 0,
+    "ItemConversion": [
+      0
+    ],
+    "LiveStockType": 2,
+    "PoultryNum": 10,
+    "FeedItem": 861,
+    "FeedStorage": 400
+  },
   {
     "Id": 620,
     "ResourcesPointId": 301,
@@ -683,6 +705,14 @@
     ],
     "HoardMonster": 5
   },
+  {
+    "Id": 661,
+    "ResourcesPointId": 0,
+    "ItemConversion": [
+      0
+    ],
+    "SettleIn": 8
+  },
   {
     "Id": 664,
     "ResourcesPointId": 0,
@@ -720,6 +750,14 @@
       0
     ]
   },
+  {
+    "Id": 672,
+    "ResourcesPointId": 0,
+    "ItemConversion": [
+      0
+    ],
+    "SettleIn": 15
+  },
   {
     "Id": 1000,
     "ResourcesPointId": 210,
@@ -740,5 +778,12 @@
     "ItemConversion": [
       0
     ]
+  },
+  {
+    "Id": 1003,
+    "ResourcesPointId": 214,
+    "ItemConversion": [
+      0
+    ]
   }
 ]

src/api/config/BusinessManConfigCategory.json

@@ -461,6 +461,28 @@
     "ResetType": 3,
     "ResetTypeParameter": 500
   },
+  {
+    "Id": 2101,
+    "Name": "鲁明严选",
+    "Type": 2,
+    "TypeParameter": 2,
+    "ItemGroup": 407,
+    "ExtraItemGroup": 0,
+    "ExtraItemNum": 0,
+    "DiscountNum": 0,
+    "CommonRecycleItem": 0,
+    "RecycleItem": 0,
+    "RecycleItemNum": 0,
+    "HighPricedNum": 0,
+    "SaleRefreshTimes": 0,
+    "RecycleRefreshTimes": 0,
+    "ResetItem": 0,
+    "ResetItemNum": 0,
+    "Increment": 0,
+    "ResetLimited": 0,
+    "ResetType": 0,
+    "ResetTypeParameter": 500
+  },
   {
     "Id": 2201,
     "Name": "渔溪特产",

src/api/config/CommonShopConfigCategory.json

@@ -430,5 +430,29 @@
     "Discount": 80,
     "DiscountWeight": 10,
     "RefreshCycle": 1
+  },
+  {
+    "Id": 37,
+    "ItemId": 7076,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "Number": 1,
+    "Currency": 2,
+    "Price": 200,
+    "Discount": 80,
+    "DiscountWeight": 10,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 38,
+    "ItemId": 1201,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "Number": 20,
+    "Currency": 2,
+    "Price": 200,
+    "Discount": 80,
+    "DiscountWeight": 10,
+    "RefreshCycle": 1
   }
 ]

src/api/config/DialogueConfigCategory.json

@@ -8169,58 +8169,162 @@
   },
   {
     "Id": 220001,
-    "DialogueText": "乔河你看，那边有条小狗",
+    "DialogueText": "真的有蓝色小牛出现了！",
-    "IconFIle": "WarriorHead_yanggy_2",
+    "IconFIle": "WarriorHead_qiaodn_1",
-    "UIPrefabName": "UI_StoryCase_TaoXiaoQing",
+    "UIPrefabName": "UI_StoryCase_QiaoHe",
-    "NameFile": "陶小青",
+    "NameFile": "乔河",
     "Position": 2
   },
   {
     "Id": 220002,
-    "DialogueText": "走，我们过去看看！",
+    "DialogueText": "哞哞哞哞哞~（这些糖是给我的吗？）",
+    "IconFIle": "Niu",
+    "UIPrefabName": "UI_StoryCase_Niu",
+    "NameFile": "萌牛",
+    "Position": 2
+  },
+  {
+    "Id": 220003,
+    "DialogueText": "是的！都是特意给你准备的！你从哪里来呀？",
     "IconFIle": "WarriorHead_qiaodn_1",
     "UIPrefabName": "UI_StoryCase_QiaoHe",
     "NameFile": "乔河",
     "Position": 2
   },
   {
-    "Id": 220003,
+    "Id": 220004,
-    "DialogueText": "它看起来无家可归，不如我们把它带回去吧",
+    "DialogueText": "哞哞哞哞哞哞哞哞哞~（我来去自由，想去哪就去哪，已经忘了来时的路了）",
-    "IconFIle": "WarriorHead_yanggy_2",
+    "IconFIle": "Niu",
-    "UIPrefabName": "UI_StoryCase_TaoXiaoQing",
+    "UIPrefabName": "UI_StoryCase_Niu",
-    "NameFile": "陶小青",
+    "NameFile": "萌牛",
     "Position": 2
   },
   {
-    "Id": 220004,
+    "Id": 220005,
-    "DialogueText": "也行，可以训练它在兽潮来临前在城门处吠叫进行预警！",
+    "DialogueText": "那你要不要跟我回桃谷？我们桃谷有许多友善的人，还有好吃的果子！",
     "IconFIle": "WarriorHead_qiaodn_1",
     "UIPrefabName": "UI_StoryCase_QiaoHe",
     "NameFile": "乔河",
     "Position": 2
   },
   {
-    "Id": 220005,
+    "Id": 220006,
-    "DialogueText": "不错！那我们给它取个名吧？",
+    "DialogueText": "哞哞哞（真的吗？他们会带我一起玩吗？）",
-    "IconFIle": "WarriorHead_yanggy_2",
+    "IconFIle": "Niu",
-    "UIPrefabName": "UI_StoryCase_TaoXiaoQing",
+    "UIPrefabName": "UI_StoryCase_Niu",
-    "NameFile": "陶小青",
+    "NameFile": "萌牛",
     "Position": 2
   },
   {
-    "Id": 220006,
+    "Id": 220007,
-    "DialogueText": "它毛发雪白，不然就叫它小白吧！",
+    "DialogueText": "当然会啦！你有名字吗？",
     "IconFIle": "WarriorHead_qiaodn_1",
     "UIPrefabName": "UI_StoryCase_QiaoHe",
     "NameFile": "乔河",
     "Position": 2
   },
   {
-    "Id": 220007,
+    "Id": 220008,
-    "DialogueText": "好小白！",
+    "DialogueText": "哞哞（没有）",
-    "IconFIle": "WarriorHead_yanggy_2",
+    "IconFIle": "Niu",
-    "UIPrefabName": "UI_StoryCase_TaoXiaoQing",
+    "UIPrefabName": "UI_StoryCase_Niu",
-    "NameFile": "陶小青",
+    "NameFile": "萌牛",
+    "Position": 2
+  },
+  {
+    "Id": 220009,
+    "DialogueText": "那叫你萌牛好不好？",
+    "IconFIle": "WarriorHead_qiaodn_1",
+    "UIPrefabName": "UI_StoryCase_QiaoHe",
+    "NameFile": "乔河",
+    "Position": 2
+  },
+  {
+    "Id": 220010,
+    "DialogueText": "哞哞哞哞哞哞哞哞哞~（好呀，到了桃谷之后可以给我搭一个看得见星星的窝吗？）",
+    "IconFIle": "Niu",
+    "UIPrefabName": "UI_StoryCase_Niu",
+    "NameFile": "萌牛",
     "Position": 2
+  },
+  {
+    "Id": 220011,
+    "DialogueText": "好！",
+    "IconFIle": "WarriorHead_qiaodn_1",
+    "UIPrefabName": "UI_StoryCase_QiaoHe",
+    "NameFile": "乔河",
+    "Position": 2
+  },
+  {
+    "Id": 230001,
+    "DialogueText": "[color=#FFE791]{value}[/color]加油！你是最棒的!",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 230002,
+    "DialogueText": "齐心协力，龙舟飞驰！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 230003,
+    "DialogueText": "力拔山河，舟行天下！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 230004,
+    "DialogueText": "[color=#FFE791]{value}[/color]冲啊！终点有奖杯和掌声！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 230005,
+    "DialogueText": "加油！你们是最棒的龙舟勇士！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 230006,
+    "DialogueText": "[color=#FFE791]{value}[/color]划得快，帅过火箭！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 230007,
+    "DialogueText": "[color=#FFE791]{value}[/color]别停桨，观众在鼓掌！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 230008,
+    "DialogueText": "[color=#FFE791]{value}[/color]，我们在终点等着你！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 230009,
+    "DialogueText": "你们是浪花中的蛟龙！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
   }
 ]

src/api/config/DialogueGroupConfigCategory.json

@@ -2784,6 +2784,31 @@
   },
   {
     "Id": 143,
+    "GroupId": 41004,
+    "Type": 1,
+    "DialogueId": [
+      230001,
+      230002,
+      230003,
+      230004,
+      230005,
+      230006,
+      230007,
+      230008,
+      230009
+    ],
+    "RoleType": 2,
+    "DialogueParameter1": [
+      -1
+    ],
+    "DialogueParameter2": [],
+    "RoleType2": 0,
+    "Dialogue2Parameter1": [],
+    "Dialogue2Parameter2": [],
+    "DialogueOrder": []
+  },
+  {
+    "Id": 144,
     "GroupId": 60001,
     "Type": 1,
     "DialogueId": [
@@ -2804,7 +2829,7 @@
     "DialogueOrder": []
   },
   {
-    "Id": 144,
+    "Id": 145,
     "GroupId": 70001,
     "Type": 2,
     "DialogueId": [
@@ -2887,7 +2912,7 @@
     ]
   },
   {
-    "Id": 145,
+    "Id": 146,
     "GroupId": 70001,
     "Type": 2,
     "DialogueId": [
@@ -2924,7 +2949,7 @@
     ]
   },
   {
-    "Id": 146,
+    "Id": 147,
     "GroupId": 70001,
     "Type": 2,
     "DialogueId": [
@@ -2963,7 +2988,7 @@
     ]
   },
   {
-    "Id": 147,
+    "Id": 148,
     "GroupId": 70001,
     "Type": 2,
     "DialogueId": [
@@ -3002,7 +3027,7 @@
     ]
   },
   {
-    "Id": 148,
+    "Id": 149,
     "GroupId": 70001,
     "Type": 2,
     "DialogueId": [
@@ -3037,7 +3062,7 @@
     ]
   },
   {
-    "Id": 149,
+    "Id": 150,
     "GroupId": 70001,
     "Type": 2,
     "DialogueId": [
@@ -3076,7 +3101,7 @@
     ]
   },
   {
-    "Id": 150,
+    "Id": 151,
     "GroupId": 70001,
     "Type": 2,
     "DialogueId": [
@@ -3113,7 +3138,7 @@
     ]
   },
   {
-    "Id": 151,
+    "Id": 152,
     "GroupId": 80001,
     "Type": 2,
     "DialogueId": [
@@ -3147,7 +3172,7 @@
     "DialogueOrder": []
   },
   {
-    "Id": 152,
+    "Id": 153,
     "GroupId": 80001,
     "Type": 1,
     "DialogueId": [
@@ -3164,7 +3189,7 @@
     "DialogueOrder": []
   },
   {
-    "Id": 153,
+    "Id": 154,
     "GroupId": 80001,
     "Type": 2,
     "DialogueId": [
@@ -3182,7 +3207,7 @@
     "DialogueOrder": []
   },
   {
-    "Id": 154,
+    "Id": 155,
     "GroupId": 80001,
     "Type": 1,
     "DialogueId": [
@@ -3199,7 +3224,7 @@
     "DialogueOrder": []
   },
   {
-    "Id": 161,
+    "Id": 162,
     "GroupId": 80002,
     "Type": 2,
     "DialogueId": [
@@ -3223,7 +3248,7 @@
     "DialogueOrder": []
   },
   {
-    "Id": 162,
+    "Id": 163,
     "GroupId": 80003,
     "Type": 2,
     "DialogueId": [
@@ -3262,7 +3287,7 @@
     ]
   },
   {
-    "Id": 163,
+    "Id": 164,
     "GroupId": 80003,
     "Type": 2,
     "DialogueId": [
@@ -3301,7 +3326,7 @@
     ]
   },
   {
-    "Id": 164,
+    "Id": 165,
     "GroupId": 80003,
     "Type": 2,
     "DialogueId": [
@@ -3346,7 +3371,7 @@
     ]
   },
   {
-    "Id": 165,
+    "Id": 166,
     "GroupId": 80003,
     "Type": 2,
     "DialogueId": [
@@ -3381,7 +3406,7 @@
     ]
   },
   {
-    "Id": 166,
+    "Id": 167,
     "GroupId": 80003,
     "Type": 2,
     "DialogueId": [
@@ -3420,7 +3445,7 @@
     ]
   },
   {
-    "Id": 167,
+    "Id": 168,
     "GroupId": 80003,
     "Type": 2,
     "DialogueId": [
@@ -3453,7 +3478,7 @@
     ]
   },
   {
-    "Id": 168,
+    "Id": 169,
     "GroupId": 80003,
     "Type": 2,
     "DialogueId": [

src/api/config/ExploreEventConfigCategory.json

@@ -842,7 +842,7 @@
       1,
       1
     ],
-    "Weight": 1000,
+    "Weight": 1400,
     "Description": "破旧书页上，茶桌图纸线条清晰，工艺精湛"
   },
   {
@@ -857,6 +857,18 @@
     "Weight": 800,
     "Description": "残破纸页中，包子小摊图纸栩栩如生，烟火气十足"
   },
+  {
+    "Id": 144,
+    "GroupId": 2,
+    "DropType": 1,
+    "ItemId": 8525,
+    "VolumeRange": [
+      1,
+      1
+    ],
+    "Weight": 800,
+    "Description": "残破纸页中，包子小摊图纸栩栩如生，烟火气十足"
+  },
   {
     "Id": 201,
     "GroupId": 3,
@@ -1283,7 +1295,7 @@
       1,
       1
     ],
-    "Weight": 1000,
+    "Weight": 1400,
     "Description": "破旧书页上，茶桌图纸线条清晰，工艺精湛"
   },
   {
@@ -1298,6 +1310,18 @@
     "Weight": 800,
     "Description": "残破纸页中，包子小摊图纸栩栩如生，烟火气十足"
   },
+  {
+    "Id": 244,
+    "GroupId": 3,
+    "DropType": 1,
+    "ItemId": 8524,
+    "VolumeRange": [
+      1,
+      1
+    ],
+    "Weight": 800,
+    "Description": "残破纸页中，包子小摊图纸栩栩如生，烟火气十足"
+  },
   {
     "Id": 301,
     "GroupId": 4,
@@ -1724,7 +1748,7 @@
       1,
       1
     ],
-    "Weight": 1000,
+    "Weight": 1500,
     "Description": "破旧书页上，茶桌图纸线条清晰，工艺精湛"
   },
   {
@@ -2165,7 +2189,7 @@
       1,
       1
     ],
-    "Weight": 1000,
+    "Weight": 1400,
     "Description": "破旧书页上，茶桌图纸线条清晰，工艺精湛"
   },
   {

src/api/config/ExploreFixedNodeConfigCategory.json

@@ -253,7 +253,7 @@
     "Name": "土地祠",
     "ExplorationTimeCondition": 530,
     "ExplorationTime": 5,
-    "EventGroup": 1
+    "EventGroup": 4
   },
   {
     "Id": 212,
@@ -365,7 +365,7 @@
     "Name": "卢家湾",
     "ExplorationTimeCondition": 530,
     "ExplorationTime": 5,
-    "EventGroup": 1
+    "EventGroup": 5
   },
   {
     "Id": 312,

src/api/config/FamilyDinnerEventConfigCategory.json

@@ -20,7 +20,10 @@
       "玩得开心"
     ],
     "Interaction1": "盛饭",
-    "Expendable1": 2009,
+    "Expendable1": [
+      2309,
+      2009
+    ],
     "ReactionText1": [
       5011,
       5012
@@ -29,7 +32,10 @@
       "希望留下",
       "玩得开心"
     ],
-    "BaseValue1": 30,
+    "BaseValue1": [
+      72,
+      30
+    ],
     "Interaction2": "赠花",
     "Expendable2": 30,
     "BaseValue2": 20,

src/api/config/FoodConfigCategory.json

@@ -395,6 +395,15 @@
     "Buff": 0,
     "Description": ""
   },
+  {
+    "Id": 51,
+    "Name": "肉粽",
+    "Type": 1,
+    "NutritiveValue": 90,
+    "FoodNum": 100,
+    "Buff": 0,
+    "Description": ""
+  },
   {
     "Id": 203,
     "Name": "野菜汤",
@@ -763,5 +772,14 @@
     "FoodNum": 160,
     "Buff": 0,
     "Description": ""
+  },
+  {
+    "Id": 244,
+    "Name": "肉粽子",
+    "Type": 1,
+    "NutritiveValue": 100,
+    "FoodNum": 110,
+    "Buff": 0,
+    "Description": ""
   }
 ]

src/api/config/FoodTicketConfigCategory.json

@@ -349,5 +349,14 @@
     "ExchangeTimes": 6,
     "OrdinaryCurrencyNum": 20,
     "ExcellentCurrencyNum": 40
+  },
+  {
+    "Id": 40,
+    "Item": 2051,
+    "ItemNumber": 1,
+    "Currency": 701,
+    "ExchangeTimes": 6,
+    "OrdinaryCurrencyNum": 9,
+    "ExcellentCurrencyNum": 18
   }
 ]

src/api/config/FunctionItemConfigCategory.json

@@ -207,6 +207,14 @@
     "UseTypeParameter": 2025,
     "UseTypeParameter2": 0
   },
+  {
+    "Id": 34,
+    "Name": "食谱:粽子",
+    "UseType": 3,
+    "ScaleCondition": 7,
+    "UseTypeParameter": 2051,
+    "UseTypeParameter2": 0
+  },
   {
     "Id": 100,
     "Name": "精品食谱:野菜汤",
@@ -535,6 +543,14 @@
     "UseTypeParameter": 2543,
     "UseTypeParameter2": 0
   },
+  {
+    "Id": 142,
+    "Name": "精品食谱:肉粽子",
+    "UseType": 3,
+    "ScaleCondition": 7,
+    "UseTypeParameter": 2544,
+    "UseTypeParameter2": 0
+  },
   {
     "Id": 201,
     "Name": "图纸:雕像·1级",
@@ -1916,7 +1932,7 @@
     "Name": "精品原石",
     "UseType": 26,
     "ScaleCondition": 0,
-    "UseTypeParameter": 1,
+    "UseTypeParameter": 3,
     "UseTypeParameter2": 0
   },
   {
@@ -3047,6 +3063,22 @@
     "UseTypeParameter": 6055,
     "UseTypeParameter2": 0
   },
+  {
+    "Id": 12556,
+    "Name": "图纸:雕像·鲍小翠",
+    "UseType": 3,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 670,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 12557,
+    "Name": "图纸:雕像·乔河",
+    "UseType": 3,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 671,
+    "UseTypeParameter2": 0
+  },
   {
     "Id": 13001,
     "Name": "图纸残页:茅草木门",
@@ -3247,6 +3279,46 @@
     "UseTypeParameter": 8255,
     "UseTypeParameter2": 4
   },
+  {
+    "Id": 13026,
+    "Name": "图纸残页:雕像·鲍小翠",
+    "UseType": 25,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 8256,
+    "UseTypeParameter2": 4
+  },
+  {
+    "Id": 13027,
+    "Name": "图纸残页:雕像·乔河",
+    "UseType": 25,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 8257,
+    "UseTypeParameter2": 4
+  },
+  {
+    "Id": 13028,
+    "Name": "图纸残页:金·雕像·鲍小翠",
+    "UseType": 25,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 9010,
+    "UseTypeParameter2": 4
+  },
+  {
+    "Id": 13029,
+    "Name": "图纸残页:金·雕像·乔河",
+    "UseType": 25,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 9011,
+    "UseTypeParameter2": 4
+  },
+  {
+    "Id": 13030,
+    "Name": "图纸残页:金·雕像",
+    "UseType": 25,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 9012,
+    "UseTypeParameter2": 4
+  },
   {
     "Id": 14000,
     "Name": "血珀石碎片",
@@ -3391,6 +3463,182 @@
     "UseTypeParameter": 1007,
     "UseTypeParameter2": 0
   },
+  {
+    "Id": 30008,
+    "Name": "图纸:藤绕稻暖坞",
+    "UseType": 27,
+    "ScaleCondition": 0,
+    "UseTypeParameter": 1008,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 30009,
+    "Name": "图纸:金·雕像·鲍小翠",
+    "UseType": 27,
+    "ScaleCondition": 0,
+    "UseTypeParameter": 1009,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 30010,
+    "Name": "图纸:金·雕像·乔河",
+    "UseType": 27,
+    "ScaleCondition": 0,
+    "UseTypeParameter": 1010,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 30011,
+    "Name": "图纸:金·雕像",
+    "UseType": 27,
+    "ScaleCondition": 0,
+    "UseTypeParameter": 1011,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 30012,
+    "Name": "图纸:月露藤香阁",
+    "UseType": 27,
+    "ScaleCondition": 0,
+    "UseTypeParameter": 1014,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 30013,
+    "Name": "图纸:谷露春磨",
+    "UseType": 27,
+    "ScaleCondition": 0,
+    "UseTypeParameter": 1017,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 30014,
+    "Name": "图纸:百味炊烟",
+    "UseType": 27,
+    "ScaleCondition": 0,
+    "UseTypeParameter": 1019,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 30015,
+    "Name": "图纸:春意小窖",
+    "UseType": 27,
+    "ScaleCondition": 0,
+    "UseTypeParameter": 1024,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40001,
+    "Name": "蓝帘草庐",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7001,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40002,
+    "Name": "万斛阁",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7002,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40003,
+    "Name": "青枝小磨",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7003,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40004,
+    "Name": "山野小灶",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7004,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40005,
+    "Name": "骨头小窝",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7005,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40006,
+    "Name": "云雷缚龙鼎",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7006,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40007,
+    "Name": "筠篱浮雪",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7007,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40008,
+    "Name": "竹涧盐井",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7008,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40009,
+    "Name": "木篱咯咯窝",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7009,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40010,
+    "Name": "青石小井",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7010,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40011,
+    "Name": "木瓦栖春居",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7011,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40012,
+    "Name": "青石藤窖",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7012,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40013,
+    "Name": "青石篝火",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7013,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 40014,
+    "Name": "金·雕像",
+    "UseType": 13,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 7014,
+    "UseTypeParameter2": 0
+  },
   {
     "Id": 99000,
     "Name": "扬声笛",

src/api/config/GameAIConfigCategory.json

@@ -208,5 +208,12 @@
     "Order": 3,
     "Name": "AI_Pet_Idle",
     "NodeParams": []
+  },
+  {
+    "Id": 1401,
+    "AIConfigId": 14,
+    "Order": 1,
+    "Name": "AI_Check_Seed",
+    "NodeParams": []
   }
 ]

src/api/config/GameUnitSizeInfoConfigCategory.json

@@ -1044,6 +1044,13 @@
           "Height": 7
         }
       },
+      {
+        "ConfigId": 581,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 9
+        }
+      },
       {
         "ConfigId": 582,
         "PlaceSizeData": {
@@ -1051,6 +1058,13 @@
           "Height": 7
         }
       },
+      {
+        "ConfigId": 583,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 9
+        }
+      },
       {
         "ConfigId": 620,
         "PlaceSizeData": {
@@ -1163,6 +1177,27 @@
           "Height": 9
         }
       },
+      {
+        "ConfigId": 670,
+        "PlaceSizeData": {
+          "Width": 3,
+          "Height": 3
+        }
+      },
+      {
+        "ConfigId": 671,
+        "PlaceSizeData": {
+          "Width": 3,
+          "Height": 3
+        }
+      },
+      {
+        "ConfigId": 672,
+        "PlaceSizeData": {
+          "Width": 11,
+          "Height": 8
+        }
+      },
       {
         "ConfigId": 1000,
         "PlaceSizeData": {
@@ -1184,6 +1219,13 @@
           "Height": 8
         }
       },
+      {
+        "ConfigId": 1003,
+        "PlaceSizeData": {
+          "Width": 11,
+          "Height": 8
+        }
+      },
       {
         "ConfigId": 1100,
         "PlaceSizeData": {
@@ -5093,8 +5135,8 @@
       {
         "ConfigId": 3002018,
         "PlaceSizeData": {
-          "Width": 3,
+          "Width": 2,
-          "Height": 3
+          "Height": 2
         }
       },
       {

src/api/config/GemConfigCategory.json

@@ -110,7 +110,7 @@
     ],
     "ExtraAttributeGroup": 210601,
     "ExtraAttributeNum": 2,
-    "TreasureSynthesis": 0
+    "TreasureSynthesis": 11
   },
   {
     "Id": 1010,
@@ -149,6 +149,84 @@
     ],
     "ExtraAttributeGroup": 210611,
     "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 14
+  },
+  {
+    "Id": 1013,
+    "Name": "凡品变石",
+    "Type": 1,
+    "Lv": 7,
+    "FixedAttributeGroup": [
+      110701,
+      110702
+    ],
+    "ExtraAttributeGroup": 210701,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 12
+  },
+  {
+    "Id": 1014,
+    "Name": "精品变石",
+    "Type": 1,
+    "Lv": 8,
+    "FixedAttributeGroup": [
+      110801,
+      110802
+    ],
+    "ExtraAttributeGroup": 210801,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 13
+  },
+  {
+    "Id": 1015,
+    "Name": "极品变石",
+    "Type": 1,
+    "Lv": 9,
+    "FixedAttributeGroup": [
+      110901,
+      110902
+    ],
+    "ExtraAttributeGroup": 210901,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 0
+  },
+  {
+    "Id": 1016,
+    "Name": "凡品钻石",
+    "Type": 1,
+    "Lv": 7,
+    "FixedAttributeGroup": [
+      110711,
+      110712
+    ],
+    "ExtraAttributeGroup": 210711,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 15
+  },
+  {
+    "Id": 1017,
+    "Name": "精品钻石",
+    "Type": 1,
+    "Lv": 8,
+    "FixedAttributeGroup": [
+      110811,
+      110812
+    ],
+    "ExtraAttributeGroup": 210811,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 16
+  },
+  {
+    "Id": 1018,
+    "Name": "极品钻石",
+    "Type": 1,
+    "Lv": 9,
+    "FixedAttributeGroup": [
+      110911,
+      110912
+    ],
+    "ExtraAttributeGroup": 210911,
+    "ExtraAttributeNum": 2,
     "TreasureSynthesis": 0
   },
   {
@@ -260,7 +338,7 @@
     ],
     "ExtraAttributeGroup": 220601,
     "ExtraAttributeNum": 2,
-    "TreasureSynthesis": 0
+    "TreasureSynthesis": 1011
   },
   {
     "Id": 2010,
@@ -299,6 +377,84 @@
     ],
     "ExtraAttributeGroup": 220611,
     "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 1014
+  },
+  {
+    "Id": 2013,
+    "Name": "凡品玛瑙",
+    "Type": 2,
+    "Lv": 7,
+    "FixedAttributeGroup": [
+      120701,
+      120702
+    ],
+    "ExtraAttributeGroup": 220701,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 1012
+  },
+  {
+    "Id": 2014,
+    "Name": "精品玛瑙",
+    "Type": 2,
+    "Lv": 8,
+    "FixedAttributeGroup": [
+      120801,
+      120802
+    ],
+    "ExtraAttributeGroup": 220801,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 1013
+  },
+  {
+    "Id": 2015,
+    "Name": "极品玛瑙",
+    "Type": 2,
+    "Lv": 9,
+    "FixedAttributeGroup": [
+      120901,
+      120902
+    ],
+    "ExtraAttributeGroup": 220901,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 0
+  },
+  {
+    "Id": 2016,
+    "Name": "凡品珍珠",
+    "Type": 2,
+    "Lv": 7,
+    "FixedAttributeGroup": [
+      120711,
+      120712
+    ],
+    "ExtraAttributeGroup": 220711,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 1015
+  },
+  {
+    "Id": 2017,
+    "Name": "精品珍珠",
+    "Type": 2,
+    "Lv": 8,
+    "FixedAttributeGroup": [
+      120811,
+      120812
+    ],
+    "ExtraAttributeGroup": 220811,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 1016
+  },
+  {
+    "Id": 2018,
+    "Name": "极品珍珠",
+    "Type": 2,
+    "Lv": 9,
+    "FixedAttributeGroup": [
+      120911,
+      120912
+    ],
+    "ExtraAttributeGroup": 220911,
+    "ExtraAttributeNum": 2,
     "TreasureSynthesis": 0
   },
   {
@@ -338,7 +494,7 @@
     ],
     "ExtraAttributeGroup": 230601,
     "ExtraAttributeNum": 2,
-    "TreasureSynthesis": 0
+    "TreasureSynthesis": 3005
   },
   {
     "Id": 3004,
@@ -377,6 +533,84 @@
     ],
     "ExtraAttributeGroup": 230611,
     "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 3008
+  },
+  {
+    "Id": 3007,
+    "Name": "凡品绿松石",
+    "Type": 3,
+    "Lv": 7,
+    "FixedAttributeGroup": [
+      130701,
+      130702
+    ],
+    "ExtraAttributeGroup": 230701,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 3006
+  },
+  {
+    "Id": 3008,
+    "Name": "精品绿松石",
+    "Type": 3,
+    "Lv": 8,
+    "FixedAttributeGroup": [
+      130801,
+      130802
+    ],
+    "ExtraAttributeGroup": 230801,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 3007
+  },
+  {
+    "Id": 3009,
+    "Name": "极品绿松石",
+    "Type": 3,
+    "Lv": 9,
+    "FixedAttributeGroup": [
+      130901,
+      130902
+    ],
+    "ExtraAttributeGroup": 230901,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 0
+  },
+  {
+    "Id": 3010,
+    "Name": "凡品寿山石",
+    "Type": 3,
+    "Lv": 7,
+    "FixedAttributeGroup": [
+      130711,
+      130712
+    ],
+    "ExtraAttributeGroup": 230711,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 3009
+  },
+  {
+    "Id": 3011,
+    "Name": "精品寿山石",
+    "Type": 3,
+    "Lv": 8,
+    "FixedAttributeGroup": [
+      130811,
+      130812
+    ],
+    "ExtraAttributeGroup": 230811,
+    "ExtraAttributeNum": 2,
+    "TreasureSynthesis": 3010
+  },
+  {
+    "Id": 3012,
+    "Name": "极品寿山石",
+    "Type": 3,
+    "Lv": 9,
+    "FixedAttributeGroup": [
+      130911,
+      130912
+    ],
+    "ExtraAttributeGroup": 230911,
+    "ExtraAttributeNum": 2,
     "TreasureSynthesis": 0
   },
   {

src/api/config/GoodsForSaleConfigCategory.json

@@ -1121,6 +1121,28 @@
     "Specialty": 0,
     "RefreshCycle": 0
   },
+  {
+    "Id": 5020,
+    "GroupId": 101,
+    "Scale": 0,
+    "ItemId": 213,
+    "SaleNum": [
+      2000,
+      2000
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 2,
+    "SaleConditionParemeter": 8,
+    "SellingCurrencyType": 1,
+    "Price": 5,
+    "Discount": 90,
+    "DiscountWeight": 0,
+    "SaleMax": -1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
   {
     "Id": 5101,
     "GroupId": 102,
@@ -1391,8 +1413,8 @@
     "Scale": 0,
     "ItemId": 213,
     "SaleNum": [
-      500,
+      2000,
-      500
+      2000
     ],
     "Weight": 1,
     "OverlayWeight": 0,
@@ -1941,8 +1963,8 @@
     "Scale": 0,
     "ItemId": 213,
     "SaleNum": [
-      500,
+      2000,
-      500
+      2000
     ],
     "Weight": 1,
     "OverlayWeight": 0,
@@ -2447,8 +2469,8 @@
     "Scale": 0,
     "ItemId": 213,
     "SaleNum": [
-      500,
+      2000,
-      500
+      2000
     ],
     "Weight": 1,
     "OverlayWeight": 0,
@@ -3294,10 +3316,10 @@
     "Price": 1000,
     "Discount": 90,
     "DiscountWeight": 0,
-    "SaleMax": 1,
+    "SaleMax": 10,
     "DiscountMark": "",
     "Specialty": 0,
-    "RefreshCycle": 0
+    "RefreshCycle": 4
   },
   {
     "Id": 6214,
@@ -3316,10 +3338,10 @@
     "Price": 1000,
     "Discount": 90,
     "DiscountWeight": 0,
-    "SaleMax": 1,
+    "SaleMax": 10,
     "DiscountMark": "",
     "Specialty": 0,
-    "RefreshCycle": 0
+    "RefreshCycle": 4
   },
   {
     "Id": 6215,
@@ -3338,10 +3360,10 @@
     "Price": 1000,
     "Discount": 90,
     "DiscountWeight": 0,
-    "SaleMax": 1,
+    "SaleMax": 10,
     "DiscountMark": "",
     "Specialty": 0,
-    "RefreshCycle": 0
+    "RefreshCycle": 4
   },
   {
     "Id": 6216,
@@ -3827,6 +3849,28 @@
     "Specialty": 0,
     "RefreshCycle": 0
   },
+  {
+    "Id": 6238,
+    "GroupId": 204,
+    "Scale": 0,
+    "ItemId": 1026,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 7,
+    "Price": 5000,
+    "Discount": 90,
+    "DiscountWeight": 0,
+    "SaleMax": -1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
   {
     "Id": 7001,
     "GroupId": 202,
@@ -3844,7 +3888,7 @@
     "Price": 50,
     "Discount": 90,
     "DiscountWeight": 10,
-    "SaleMax": -1,
+    "SaleMax": 1000,
     "DiscountMark": "",
     "Specialty": 0,
     "RefreshCycle": 0
@@ -5697,6 +5741,28 @@
     "Specialty": 0,
     "RefreshCycle": 0
   },
+  {
+    "Id": 7086,
+    "GroupId": 202,
+    "Scale": 0,
+    "ItemId": 7213,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 100,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 1,
+    "Price": 10000,
+    "Discount": 90,
+    "DiscountWeight": 0,
+    "SaleMax": 2,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
   {
     "Id": 8001,
     "GroupId": 301,
@@ -6312,5 +6378,313 @@
     "DiscountMark": "",
     "Specialty": 0,
     "RefreshCycle": 2
+  },
+  {
+    "Id": 10000,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400000,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10001,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400001,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 2,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10002,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400002,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10003,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400003,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10004,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400004,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10005,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400005,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10006,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400006,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10007,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400007,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10008,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400008,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10009,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400009,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10010,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400010,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10011,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400011,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10012,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400012,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 1,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 10013,
+    "GroupId": 407,
+    "Scale": 0,
+    "ItemId": 400013,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 9,
+    "Price": 2,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
   }
 ]

src/api/config/HeadIconConfigCategory.json

@@ -179,6 +179,16 @@
     "Description": "可爱胖达",
     "GetMethod": "成就-人生七十古来稀"
   },
+  {
+    "ID": 1005,
+    "Type": 1,
+    "HeadIconName": "纸鸢",
+    "HeadIcon": "Head_ZhiYuan",
+    "RequirementTpye": 2,
+    "RequirementCondition": 100005,
+    "Description": "随风飘扬的纸鸢",
+    "GetMethod": "微风上纸鸢活动"
+  },
   {
     "ID": 2000,
     "Type": 2,

src/api/config/HelpConfigCategory.json

@@ -187,7 +187,7 @@
     "Page": 1,
     "Stencil": 3,
     "Picture1": "",
-    "Text1": "1、连续两天晚上都没有猪圈可住的猪将会逃跑\n2、若猪处于饥饿状态下，将有概率会逃跑，若成年猪处于饥饿状态的话将不会产仔\n2、猪圈损坏或被拆除时会将该猪圈中的猪分配至其他有空位的猪圈，若没有多余的位置则会变为无家可归的状态\n3、当一个猪圈中有2只成年猪未处于饥饿状态和无家可归状态时会产仔，产仔达到一定次数时将不再产蛋，当猪圈中的待收取猪仔数量达到上限时该猪圈中的猪将不会产仔",
+    "Text1": "1、连续两天晚上都没有猪圈可住的猪将会逃跑\n2、若猪处于饥饿状态下，将有概率会逃跑\n2、猪圈损坏或被拆除时会将该猪圈中的猪分配至其他有空位的猪圈，若没有多余的位置则会变为无家可归的状态\n3、当猪圈中的成年猪未处于饥饿状态、无家可归状态和可屠宰状态时会产仔，当猪圈中的待收取猪仔数量达到上限时该猪圈中的猪将不会产仔",
     "Picture2": "",
     "Text2": "",
     "Picture3": "",
@@ -239,7 +239,7 @@
     "Page": 1,
     "Stencil": 3,
     "Picture1": "",
-    "Text1": "1.拖动未分配的村民到房屋中即可入住\n2.在房屋列表点击有对象的村民会显示伴侣所在位置\n3.在房屋列表点击村民会显示该村民的所有近亲，左下角有“亲”字，近亲之间不可婚配。\n4.村民右下角的数字表示年龄\n5.非近亲，且年龄差不超过15的异性单身村民住一起会第二天会形成夫妻关系\n6.结为夫妻的男女在同一个屋子中第二天有概率捡到小孩\n7.一个女性村民只会触发2次捡小孩事件\n8.女性村民超过45岁后，不会触发捡小孩事件\n9.当村民数量超过不死树庇护等级后，一个女性村民只会触发1次捡小孩事件",
+    "Text1": "1.拖动未分配的村民到房屋中即可入住\n2.在房屋列表点击有对象的村民会显示伴侣所在位置\n3.在房屋列表点击村民会显示该村民的所有近亲，左下角有“亲”字，近亲之间不可婚配。\n4.村民右下角的数字表示年龄\n5.非近亲，且年龄差不超过15的异性单身村民住一起会第二天会形成夫妻关系\n6.结为夫妻的男女从第二天开始有概率捡到小孩\n7.一个女性村民只会触发2次捡小孩事件\n8.女性村民超过45岁后，不会触发捡小孩事件\n9.当村民数量超过不死树庇护等级后，一个女性村民只会触发1次捡小孩事件",
     "Picture2": "",
     "Text2": "",
     "Picture3": "",
@@ -271,5 +271,109 @@
     "Picture3": "",
     "Text3": "",
     "NextPage": 0
+  },
+  {
+    "id": 23,
+    "Group": 20,
+    "Page": 1,
+    "Stencil": 3,
+    "Picture1": "",
+    "Text1": "",
+    "Picture2": "",
+    "Text2": "",
+    "Picture3": "",
+    "Text3": "",
+    "NextPage": 0
+  },
+  {
+    "id": 24,
+    "Group": 21,
+    "Page": 1,
+    "Stencil": 3,
+    "Picture1": "",
+    "Text1": "1、活动时间：2025/5/30-2025/6/9 5:00\n2、活动界面关闭时间：2025/6/13 5:00\n3、活动期间每日会更新积分上限，完成挑战即可获得对应的活动积分。",
+    "Picture2": "",
+    "Text2": "",
+    "Picture3": "",
+    "Text3": "",
+    "NextPage": 0
+  },
+  {
+    "id": 26,
+    "Group": 22,
+    "Page": 1,
+    "Stencil": 3,
+    "Picture1": "",
+    "Text1": "1、活动时间：2025/5/30-2025/6/9 5:00\n2、活动界面关闭时间：2025/6/13 5:00\n3、活动期间每日会更新积分上限，完成挑战即可获得对应的活动积分。",
+    "Picture2": "",
+    "Text2": "",
+    "Picture3": "",
+    "Text3": "",
+    "NextPage": 0
+  },
+  {
+    "id": 28,
+    "Group": 23,
+    "Page": 1,
+    "Stencil": 3,
+    "Picture1": "",
+    "Text1": "1、需要先选择建筑，再在这个建筑已有的皮肤中选择一项进行研究\n2、桃源殿研究一旦开始就无法更改为其他科技，也无法中途取消\n3、科技研究会在夜间暂停\n",
+    "Picture2": "",
+    "Text2": "",
+    "Picture3": "",
+    "Text3": "",
+    "NextPage": 0
+  },
+  {
+    "id": 29,
+    "Group": 24,
+    "Page": 1,
+    "Stencil": 3,
+    "Picture1": "",
+    "Text1": "1、预设菜品功能：\n①设置预设菜品后每天晚上到点就会自动按照预设菜品举办家宴\n②设置预设菜品后会优先消耗预设菜品，直到菜品全部消耗完\n2、自动举办功能：勾选后会按照【优先选择每个种类的菜品1个，再按照营养值从高到低补充菜品直到菜品数量达到上限】的规则每天晚上自动举办家宴\n3、锁定菜品：在自动举办家宴时不会使用已经锁定的菜品",
+    "Picture2": "",
+    "Text2": "",
+    "Picture3": "",
+    "Text3": "",
+    "NextPage": 0
+  },
+  {
+    "id": 30,
+    "Group": 25,
+    "Page": 1,
+    "Stencil": 3,
+    "Picture1": "",
+    "Text1": "1、每天只能生产一个订单，订单可离线生产。\n2、实际酬劳、生产耗时与村民的数量、劳力、智慧都有关。\n3、“财源滚滚”的增幅效果对订单的报酬有效。\n4、生产订单期间不可切换模式。\n5、模式切换成功后，现实时间次日5:00才会生效。",
+    "Picture2": "",
+    "Text2": "",
+    "Picture3": "",
+    "Text3": "",
+    "NextPage": 0
+  },
+  {
+    "id": 31,
+    "Group": 26,
+    "Page": 1,
+    "Stencil": 5,
+    "Picture1": "Help_Picture_7",
+    "Text1": "",
+    "Picture2": "",
+    "Text2": "",
+    "Picture3": "",
+    "Text3": "",
+    "NextPage": 0
+  },
+  {
+    "id": 32,
+    "Group": 27,
+    "Page": 1,
+    "Stencil": 5,
+    "Picture1": "Help_Picture_8",
+    "Text1": "",
+    "Picture2": "",
+    "Text2": "",
+    "Picture3": "",
+    "Text3": "",
+    "NextPage": 0
   }
 ]

src/api/config/InitialDialogueConfigCategory.json

@@ -184,6 +184,11 @@
     "DialogueText": 71,
     "State": []
   },
+  {
+    "Id": 72,
+    "DialogueText": 72,
+    "State": []
+  },
   {
     "Id": 101,
     "DialogueText": 101,

src/api/config/InitialNpcCategory.json

@@ -180,6 +180,12 @@
       },
       {
         "NpcConfigId": 99004
+      },
+      {
+        "NpcConfigId": 99005
+      },
+      {
+        "NpcConfigId": 1072
       }
     ]
   }

src/api/config/KiteConfigCategory.json

@@ -2,11 +2,11 @@
   {
     "Id": 1,
     "BreezeTime": 4,
-    "BreezeNum": 5,
+    "BreezeNum": -5,
     "GaleTime": 4,
-    "GaleNum": -5,
+    "GaleNum": 5,
-    "PayoffNum": 8,
+    "PayoffNum": -8,
-    "TakeupNum": -8,
+    "TakeupNum": 8,
     "Min": 30,
     "Max": 70,
     "PayoffHeight": 30,

src/api/config/LingYuDongItemGroupConfigCategory.json

@@ -3,91 +3,106 @@
     "Id": 1,
     "GroupId": 101,
     "ItemId": 4203,
-    "Num": 5
+    "Num": 5,
+    "ScaleCondition": 0
   },
   {
     "Id": 2,
     "GroupId": 102,
     "ItemId": 7306,
-    "Num": 2
+    "Num": 2,
+    "ScaleCondition": 0
   },
   {
     "Id": 3,
     "GroupId": 103,
     "ItemId": 7308,
-    "Num": 5
+    "Num": 5,
+    "ScaleCondition": 0
   },
   {
     "Id": 4,
     "GroupId": 104,
     "ItemId": 7229,
-    "Num": 5
+    "Num": 5,
+    "ScaleCondition": 0
   },
   {
     "Id": 5,
     "GroupId": 105,
     "ItemId": 132,
-    "Num": 5
+    "Num": 5,
+    "ScaleCondition": 0
   },
   {
     "Id": 6,
     "GroupId": 106,
     "ItemId": 316,
-    "Num": 5
+    "Num": 5,
+    "ScaleCondition": 0
   },
   {
     "Id": 7,
     "GroupId": 201,
     "ItemId": 317,
-    "Num": 1
+    "Num": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 8,
     "GroupId": 202,
     "ItemId": 4204,
-    "Num": 5
+    "Num": 5,
+    "ScaleCondition": 0
   },
   {
     "Id": 9,
     "GroupId": 203,
     "ItemId": 7307,
-    "Num": 1
+    "Num": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 10,
     "GroupId": 204,
     "ItemId": 1900,
-    "Num": 3
+    "Num": 3,
+    "ScaleCondition": 0
   },
   {
     "Id": 11,
     "GroupId": 205,
     "ItemId": 143,
-    "Num": 3
+    "Num": 3,
+    "ScaleCondition": 0
   },
   {
     "Id": 12,
     "GroupId": 301,
     "ItemId": 4155,
-    "Num": 1
+    "Num": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 13,
     "GroupId": 302,
     "ItemId": 4154,
-    "Num": 1
+    "Num": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 14,
     "GroupId": 303,
     "ItemId": 4153,
-    "Num": 1
+    "Num": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 15,
     "GroupId": 304,
     "ItemId": 7302,
-    "Num": 2
+    "Num": 2,
+    "ScaleCondition": 0
   },
   {
     "Id": 16,
@@ -95,7 +110,8 @@
     "ItemId": 4150,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 17,
@@ -103,7 +119,8 @@
     "ItemId": 4151,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 18,
@@ -111,19 +128,22 @@
     "ItemId": 4152,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 19,
     "GroupId": 402,
     "ItemId": 1200,
-    "Num": 1
+    "Num": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 20,
     "GroupId": 403,
     "ItemId": 220000,
-    "Num": 40
+    "Num": 40,
+    "ScaleCondition": 0
   },
   {
     "Id": 21,
@@ -131,7 +151,8 @@
     "ItemId": 1300,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 22,
@@ -139,13 +160,15 @@
     "ItemId": 7311,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 3
+    "GroundCondition": 3,
+    "ScaleCondition": 0
   },
   {
     "Id": 23,
     "GroupId": 502,
     "ItemId": 701,
-    "Num": 20
+    "Num": 20,
+    "ScaleCondition": 0
   },
   {
     "Id": 24,
@@ -153,7 +176,8 @@
     "ItemId": 1901,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 25,
@@ -161,7 +185,8 @@
     "ItemId": 1902,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 26,
@@ -169,7 +194,8 @@
     "ItemId": 1903,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 27,
@@ -177,7 +203,8 @@
     "ItemId": 1904,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 28,
@@ -185,7 +212,8 @@
     "ItemId": 1905,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 29,
@@ -193,7 +221,8 @@
     "ItemId": 1906,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 30,
@@ -201,7 +230,8 @@
     "ItemId": 1907,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 31,
@@ -209,7 +239,8 @@
     "ItemId": 1908,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 1
+    "GroundCondition": 1,
+    "ScaleCondition": 0
   },
   {
     "Id": 32,
@@ -217,6 +248,16 @@
     "ItemId": 1301,
     "Num": 1,
     "Times": 10,
-    "GroundCondition": 6
+    "GroundCondition": 6,
+    "ScaleCondition": 0
+  },
+  {
+    "Id": 33,
+    "GroupId": 601,
+    "ItemId": 706,
+    "Num": 1,
+    "Times": 10,
+    "GroundCondition": 3,
+    "ScaleCondition": 20
   }
 ]

src/api/config/LiveStockConfigCategory.json

@@ -6,9 +6,12 @@
     "Egg": 110,
     "Variety": 1,
     "Life": 2,
+    "Meat": 0,
     "NextStage": 1002,
     "ConversionType": 111,
     "ConversionBaseNum": 1,
+    "StartTime": -1,
+    "EndTime": -1,
     "Output": 0,
     "OutputBaseNum": [
       0
@@ -18,8 +21,9 @@
     ],
     "OutputCD": 0,
     "FeedConsume": 5,
-    "MoveSpeed": 5,
+    "MoveSpeed": 3,
     "TransportSpeed": 0,
+    "Animate": "Eat",
     "MalePrefabName": "Livestock_1001",
     "FemalePrefabName": "Livestock_1001"
   },
@@ -30,9 +34,12 @@
     "Egg": -1,
     "Variety": 1,
     "Life": 10,
+    "Meat": 0,
     "NextStage": 0,
     "ConversionType": 111,
     "ConversionBaseNum": 1,
+    "StartTime": 1,
+    "EndTime": 10,
     "Output": 110,
     "OutputBaseNum": [
       2,
@@ -44,8 +51,9 @@
     ],
     "OutputCD": 2,
     "FeedConsume": 10,
-    "MoveSpeed": 10,
+    "MoveSpeed": 5,
     "TransportSpeed": 0,
+    "Animate": "Eat",
     "MalePrefabName": "Livestock_1002_M",
     "FemalePrefabName": "Livestock_1002_F"
   },
@@ -56,9 +64,12 @@
     "Egg": -1,
     "Variety": 2,
     "Life": 2,
+    "Meat": 0,
     "NextStage": 2002,
     "ConversionType": 111,
     "ConversionBaseNum": 1,
+    "StartTime": -1,
+    "EndTime": -1,
     "Output": 0,
     "OutputBaseNum": [
       0
@@ -68,8 +79,9 @@
     ],
     "OutputCD": 0,
     "FeedConsume": 5,
-    "MoveSpeed": 5,
+    "MoveSpeed": 3,
     "TransportSpeed": 0,
+    "Animate": "",
     "MalePrefabName": "Livestock_1001",
     "FemalePrefabName": "Livestock_1001"
   },
@@ -80,9 +92,12 @@
     "Egg": -1,
     "Variety": 2,
     "Life": 10,
+    "Meat": 0,
     "NextStage": 0,
     "ConversionType": 111,
     "ConversionBaseNum": 1,
+    "StartTime": -1,
+    "EndTime": -1,
     "Output": 110,
     "OutputBaseNum": [
       2,
@@ -94,8 +109,9 @@
     ],
     "OutputCD": 2,
     "FeedConsume": 10,
-    "MoveSpeed": 10,
+    "MoveSpeed": 5,
     "TransportSpeed": 0,
+    "Animate": "",
     "MalePrefabName": "Livestock_1002_M",
     "FemalePrefabName": "Livestock_1002_F"
   },
@@ -105,10 +121,13 @@
     "Type": 2,
     "Egg": -1,
     "Variety": 4,
-    "Life": 2,
+    "Life": 3,
+    "Meat": 0,
     "NextStage": 4002,
     "ConversionType": 101,
     "ConversionBaseNum": 1,
+    "StartTime": -1,
+    "EndTime": -1,
     "Output": 0,
     "OutputBaseNum": [
       0
@@ -117,11 +136,12 @@
       0
     ],
     "OutputCD": 0,
-    "FeedConsume": 5,
+    "FeedConsume": 1,
-    "MoveSpeed": 5,
+    "MoveSpeed": 3,
     "TransportSpeed": 0,
-    "MalePrefabName": "Livestock_1001",
+    "Animate": "Sleep",
-    "FemalePrefabName": "Livestock_1001"
+    "MalePrefabName": "Livestock_4001",
+    "FemalePrefabName": "Livestock_4001"
   },
   {
     "Id": 4002,
@@ -129,10 +149,13 @@
     "Type": 2,
     "Egg": -1,
     "Variety": 4,
-    "Life": 10,
+    "Life": 7,
+    "Meat": 1,
     "NextStage": 0,
     "ConversionType": 101,
-    "ConversionBaseNum": 12,
+    "ConversionBaseNum": 3,
+    "StartTime": 5,
+    "EndTime": 10,
     "Output": 8005,
     "OutputBaseNum": [
       1,
@@ -140,15 +163,16 @@
       3
     ],
     "OutputWeight": [
-      989,
+      20,
-      10,
+      5,
       1
     ],
-    "OutputCD": 7,
+    "OutputCD": 3,
-    "FeedConsume": 10,
+    "FeedConsume": 2,
-    "MoveSpeed": 8,
+    "MoveSpeed": 4,
     "TransportSpeed": 0,
-    "MalePrefabName": "Livestock_1002_M",
+    "Animate": "Casual",
-    "FemalePrefabName": "Livestock_1002_F"
+    "MalePrefabName": "Livestock_4002",
+    "FemalePrefabName": "Livestock_4002"
   }
 ]

src/api/config/LongZhouConfigCategory.json

@@ -1,45 +1,50 @@
 [
   {
     "Id": 1,
-    "StoneNum": 6,
+    "StoneNum": 12,
     "StoneProbability": [
       [
         0,
-        20
+        10
       ],
       [
         1,
-        50
+        30
       ],
       [
         2,
-        20
+        40
       ],
       [
         3,
-        10
+        20
       ]
     ],
     "ZongziProbability": [
       [
         0,
-        30
+        10
       ],
       [
         1,
-        40
+        20
       ],
       [
         2,
+        40
+      ],
+      [
+        3,
         30
       ]
     ],
     "AccelerationValue": 50,
     "AccelerationTime": 2,
+    "MapWidth": 8,
     "MapLength": 120,
-    "BasicLabor": 150,
+    "BasicLabor": 100,
     "LongZhouSpeed1": 3,
     "LongZhouSpeed2": 2,
-    "LongZhouSpeed": 2
+    "LongZhouSpeed": 1
   }
 ]

src/api/config/MainButtonConfigCategory.json

@@ -444,11 +444,11 @@
     "UIName": "AchievementBtn",
     "New": true,
     "DisplayType": 1,
-    "Parameter": 25,
+    "Parameter": 3,
     "Parameter2": 0,
     "ShowText": 0,
     "FatherButton": 0,
-    "UnlockCondition": "暂未开放"
+    "UnlockCondition": "达到规模3解锁"
   },
   {
     "Id": 1420,

src/api/config/MoneyConfigCategory.json

@@ -46,5 +46,11 @@
     "Name": "成就积分",
     "Enums": 8,
     "ItemId": 240000
+  },
+  {
+    "Id": 9,
+    "Name": "建设令",
+    "Enums": 9,
+    "ItemId": 706
   }
 ]

src/api/config/MonthlyCardConfigCategory.json

@@ -143,8 +143,8 @@
       2
     ],
     "ValleyEffect": 18,
-    "NotActivatedDescription": "桃谷货郎收购时[color=#626262]获得铜钱增加30%[/color]",
+    "NotActivatedDescription": "桃谷货郎收购时/订单完成时[color=#626262]获得铜钱增加30%[/color]",
-    "ActivatedDescription": "桃谷货郎收购时[color=#626262]获得铜钱增加30%[/color]",
+    "ActivatedDescription": "桃谷货郎收购/订单完成时[color=#626262]获得铜钱增加30%[/color]",
     "Tips": "获得铜钱增加30%"
   },
   {

src/api/config/NpcConfigCategory.json

@@ -1283,6 +1283,39 @@
     "Hide": false,
     "Description": "喜欢摆弄一些小玩意儿，虽然没什么用但是摆着好看呀！"
   },
+  {
+    "Id": 1072,
+    "Type": 6,
+    "Name": "鲁明",
+    "RelatedId": 2101,
+    "DialogueWithOptions": [
+      72
+    ],
+    "BubbleText": 1008,
+    "FixedPoint": false,
+    "MoveSpeed": 25,
+    "Area": 2004,
+    "CreateCondition1": 4,
+    "CreateParameter1": [
+      20
+    ],
+    "CreateCondition2": 0,
+    "CreateParameter2": [],
+    "DisappearCondition": 0,
+    "DisappearConditionParameter": [],
+    "AppearTime": [
+      600,
+      2359
+    ],
+    "VisitDisplay": false,
+    "Icon": "Head_M_5003",
+    "Prefab": "Village_Npc_1061",
+    "DialogueWay": false,
+    "Disappear": false,
+    "Repeat": false,
+    "Hide": false,
+    "Description": "鲁明严选，必是精选"
+  },
   {
     "Id": 3002009,
     "Type": 2,
@@ -1416,7 +1449,7 @@
     "AppearTime": [],
     "VisitDisplay": false,
     "Icon": "Item_Icon_7821",
-    "Prefab": "SceneInteractiveObj_tao",
+    "Prefab": "SceneInteractiveObj_YuXitao",
     "DialogueWay": false,
     "Disappear": true,
     "Repeat": false,

src/api/config/NpcPosInfoConfigCategory.json

@@ -616,6 +616,22 @@
           "y": 51.4
         },
         "IsFlip": false
+      },
+      {
+        "ConfigId": 99005,
+        "Pos": {
+          "x": 24.37,
+          "y": 51.4
+        },
+        "IsFlip": false
+      },
+      {
+        "ConfigId": 1072,
+        "Pos": {
+          "x": 153.85,
+          "y": 23.91
+        },
+        "IsFlip": false
       }
     ]
   }

src/api/config/OptionsBehaviourConfigCategory.json

@@ -188,6 +188,13 @@
       1069
     ]
   },
+  {
+    "Id": 2112,
+    "Type": 2,
+    "TypeParameter": [
+      1072
+    ]
+  },
   {
     "Id": 4001,
     "Type": 4,
@@ -316,6 +323,14 @@
       200
     ]
   },
+  {
+    "Id": 4017,
+    "Type": 4,
+    "TypeParameter": [
+      114,
+      1000
+    ]
+  },
   {
     "Id": 6000,
     "Type": 6,
@@ -433,6 +448,20 @@
       6
     ]
   },
+  {
+    "Id": 9007,
+    "Type": 9,
+    "TypeParameter": [
+      1037
+    ]
+  },
+  {
+    "Id": 9008,
+    "Type": 9,
+    "TypeParameter": [
+      1038
+    ]
+  },
   {
     "Id": 10001,
     "Type": 10,

src/api/config/OptionsConfigCategory.json

@@ -643,6 +643,15 @@
     ],
     "NextDialogue": 0
   },
+  {
+    "Id": 1112,
+    "RoleState": [],
+    "Name": "交易",
+    "OptionsBehaviour": [
+      2112
+    ],
+    "NextDialogue": 0
+  },
   {
     "Id": 2000,
     "RoleState": [],
@@ -1284,5 +1293,37 @@
       14051
     ],
     "NextDialogue": 0
+  },
+  {
+    "Id": 200000,
+    "RoleState": [],
+    "Name": "和她聊聊",
+    "OptionsBehaviour": [],
+    "NextDialogue": 10066
+  },
+  {
+    "Id": 200001,
+    "RoleState": [],
+    "Name": "小牛？",
+    "OptionsBehaviour": [],
+    "NextDialogue": 10067
+  },
+  {
+    "Id": 200002,
+    "RoleState": [],
+    "Name": "好！",
+    "OptionsBehaviour": [
+      9007
+    ],
+    "NextDialogue": 0
+  },
+  {
+    "Id": 200003,
+    "RoleState": [],
+    "Name": "放一些糖",
+    "OptionsBehaviour": [
+      4017
+    ],
+    "NextDialogue": 0
   }
 ]

src/api/config/OrderConfigCategory.json

@@ -8,8 +8,8 @@
     "Copper": 500000,
     "EngineeringQuantity": 5200000,
     "OrderDescribe": "七孤城的将士在前线抵御妖兽需要大量的兵器",
-    "NeedDescribe": "需求：制造10000件兵具供给七孤城的将士",
+    "NeedDescribe": "制造10000件兵具供给七孤城的将士",
-    "ExpendDescribe": "消耗：木材，布料，金属锭"
+    "ExpendDescribe": "木材，布料，金属锭"
   },
   {
     "Id": 2,
@@ -20,7 +20,7 @@
     "Copper": 500000,
     "EngineeringQuantity": 5200000,
     "OrderDescribe": "七孤城的将士在前线抵御妖兽需要大量军粮",
-    "NeedDescribe": "需求：制造10000件军粮供给七孤城的将士",
+    "NeedDescribe": "制造10000件军粮供给七孤城的将士",
-    "ExpendDescribe": "消耗：食材"
+    "ExpendDescribe": "食材"
   }
 ]

src/api/config/OrderMaterialsConfigCategory.json

@@ -3,61 +3,61 @@
     "Id": 1,
     "GroupId": 1,
     "ItemId": 802,
-    "ConversionValue": 8
+    "ConversionValue": 5
   },
   {
     "Id": 2,
     "GroupId": 1,
     "ItemId": 803,
-    "ConversionValue": 10
+    "ConversionValue": 5
   },
   {
     "Id": 3,
     "GroupId": 1,
     "ItemId": 804,
-    "ConversionValue": 12
+    "ConversionValue": 5
   },
   {
     "Id": 4,
     "GroupId": 1,
     "ItemId": 805,
-    "ConversionValue": 14
+    "ConversionValue": 10
   },
   {
     "Id": 5,
     "GroupId": 1,
     "ItemId": 815,
-    "ConversionValue": 20
+    "ConversionValue": 16
   },
   {
     "Id": 6,
     "GroupId": 1,
     "ItemId": 816,
-    "ConversionValue": 22
+    "ConversionValue": 18
   },
   {
     "Id": 7,
     "GroupId": 1,
     "ItemId": 819,
-    "ConversionValue": 24
+    "ConversionValue": 20
   },
   {
     "Id": 8,
     "GroupId": 1,
     "ItemId": 820,
-    "ConversionValue": 26
+    "ConversionValue": 22
   },
   {
     "Id": 9,
     "GroupId": 1,
     "ItemId": 821,
-    "ConversionValue": 28
+    "ConversionValue": 24
   },
   {
     "Id": 10,
     "GroupId": 1,
     "ItemId": 858,
-    "ConversionValue": 30
+    "ConversionValue": 26
   },
   {
     "Id": 11,
@@ -69,37 +69,37 @@
     "Id": 12,
     "GroupId": 1,
     "ItemId": 838,
-    "ConversionValue": 10
+    "ConversionValue": 8
   },
   {
     "Id": 13,
     "GroupId": 1,
     "ItemId": 839,
-    "ConversionValue": 12
+    "ConversionValue": 8
   },
   {
     "Id": 14,
     "GroupId": 1,
     "ItemId": 205,
-    "ConversionValue": 14
+    "ConversionValue": 10
   },
   {
     "Id": 15,
     "GroupId": 1,
     "ItemId": 206,
-    "ConversionValue": 16
+    "ConversionValue": 10
   },
   {
     "Id": 16,
     "GroupId": 1,
     "ItemId": 207,
-    "ConversionValue": 18
+    "ConversionValue": 10
   },
   {
     "Id": 201,
     "GroupId": 2,
     "ItemId": 860,
-    "ConversionValue": 50
+    "ConversionValue": 40
   },
   {
     "Id": 202,
@@ -148,5 +148,17 @@
     "GroupId": 2,
     "ItemId": 124,
     "ConversionValue": 2
+  },
+  {
+    "Id": 210,
+    "GroupId": 2,
+    "ItemId": 855,
+    "ConversionValue": 30
+  },
+  {
+    "Id": 211,
+    "GroupId": 2,
+    "ItemId": 856,
+    "ConversionValue": 30
   }
 ]

src/api/config/PackageConfigCategory.json

@@ -93,7 +93,7 @@
   {
     "Id": 10,
     "Name": "青岩方墙",
-    "Type": 2,
+    "Type": 4,
     "BuyType": 2,
     "Parameter": 5,
     "OriginalPrice": 8,
@@ -106,7 +106,7 @@
   {
     "Id": 11,
     "Name": "摇摇木马",
-    "Type": 2,
+    "Type": 4,
     "BuyType": 2,
     "Parameter": 5,
     "OriginalPrice": 8,
@@ -119,7 +119,7 @@
   {
     "Id": 12,
     "Name": "紫楹石居",
-    "Type": 2,
+    "Type": 4,
     "BuyType": 2,
     "Parameter": 12,
     "OriginalPrice": 30,
@@ -132,7 +132,7 @@
   {
     "Id": 13,
     "Name": "鹤池映月灯",
-    "Type": 2,
+    "Type": 4,
     "BuyType": 2,
     "Parameter": 30,
     "OriginalPrice": 68,
@@ -260,16 +260,159 @@
     "Award": 923
   },
   {
-    "Id": 313,
+    "Id": 314,
-    "Name": "五一福利",
+    "Name": "二维塔谢礼",
+    "Type": 3,
+    "BuyType": 4,
+    "Parameter": 1,
+    "OriginalPrice": 1,
+    "ShowCondition": 2,
+    "UnlockParameter": 5000,
+    "ResetType": 0,
+    "LimitNum": 1,
+    "Award": 925
+  },
+  {
+    "Id": 315,
+    "Name": "二维塔敬礼",
     "Type": 3,
     "BuyType": 4,
-    "Parameter": 66,
+    "Parameter": 1,
-    "OriginalPrice": 50000,
+    "OriginalPrice": 1,
+    "ShowCondition": 2,
+    "UnlockParameter": 10000,
+    "ResetType": 0,
+    "LimitNum": 1,
+    "Award": 926
+  },
+  {
+    "Id": 316,
+    "Name": "粽子",
+    "Type": 3,
+    "BuyType": 4,
+    "Parameter": 10000,
+    "OriginalPrice": 20000,
     "ShowCondition": 1,
-    "UnlockParameter": 0,
+    "UnlockParameter": 3,
-    "ResetType": 1,
+    "ResetType": 0,
+    "LimitNum": 1,
+    "Award": 929
+  },
+  {
+    "Id": 317,
+    "Name": "精品原石",
+    "Type": 3,
+    "BuyType": 2,
+    "Parameter": 220,
+    "OriginalPrice": 950,
+    "ShowCondition": 2,
+    "UnlockParameter": 2000,
+    "ResetType": 2,
+    "LimitNum": 1,
+    "Award": 930
+  },
+  {
+    "Id": 318,
+    "Name": "精品原石矿",
+    "Type": 3,
+    "BuyType": 2,
+    "Parameter": 390,
+    "OriginalPrice": 1750,
+    "ShowCondition": 2,
+    "UnlockParameter": 5000,
+    "ResetType": 2,
+    "LimitNum": 1,
+    "Award": 931
+  },
+  {
+    "Id": 401,
+    "Name": "金粟小仓",
+    "Type": 4,
+    "BuyType": 2,
+    "Parameter": 5,
+    "OriginalPrice": 12,
+    "ShowCondition": 1,
+    "UnlockParameter": 7,
+    "ResetType": 0,
+    "LimitNum": 1,
+    "Award": 927
+  },
+  {
+    "Id": 402,
+    "Name": "藤绕稻暖坞",
+    "Type": 4,
+    "BuyType": 2,
+    "Parameter": 5,
+    "OriginalPrice": 12,
+    "ShowCondition": 1,
+    "UnlockParameter": 10,
+    "ResetType": 0,
+    "LimitNum": 1,
+    "Award": 928
+  },
+  {
+    "Id": 403,
+    "Name": "漾春小井",
+    "Type": 4,
+    "BuyType": 2,
+    "Parameter": 5,
+    "OriginalPrice": 10,
+    "ShowCondition": 1,
+    "UnlockParameter": 10,
+    "ResetType": 0,
+    "LimitNum": 1,
+    "Award": 932
+  },
+  {
+    "Id": 404,
+    "Name": "月露藤香阁",
+    "Type": 4,
+    "BuyType": 2,
+    "Parameter": 8,
+    "OriginalPrice": 15,
+    "ShowCondition": 1,
+    "UnlockParameter": 7,
+    "ResetType": 0,
+    "LimitNum": 1,
+    "Award": 933
+  },
+  {
+    "Id": 405,
+    "Name": "谷露春磨",
+    "Type": 4,
+    "BuyType": 2,
+    "Parameter": 6,
+    "OriginalPrice": 12,
+    "ShowCondition": 1,
+    "UnlockParameter": 7,
+    "ResetType": 0,
+    "LimitNum": 1,
+    "Award": 934
+  },
+  {
+    "Id": 406,
+    "Name": "百味炊烟",
+    "Type": 4,
+    "BuyType": 2,
+    "Parameter": 8,
+    "OriginalPrice": 15,
+    "ShowCondition": 1,
+    "UnlockParameter": 7,
+    "ResetType": 0,
+    "LimitNum": 1,
+    "Award": 935
+  },
+  {
+    "Id": 407,
+    "Name": "春意小窖",
+    "Type": 4,
+    "BuyType": 2,
+    "Parameter": 8,
+    "OriginalPrice": 15,
+    "ShowCondition": 1,
+    "UnlockParameter": 10,
+    "ResetType": 0,
     "LimitNum": 1,
-    "Award": 924
+    "Award": 936
   }
 ]

src/api/config/PetConfigCategory.json

@@ -44,5 +44,38 @@
     "Speed": 20,
     "AIConfigId": 13,
     "SkillEffectPrefab": "FX_Skill_DangKang"
+  },
+  {
+    "Id": 1003,
+    "Name": "萌牛",
+    "Type": 3,
+    "PrefabName": "Pet_1003",
+    "IdleGroup": [
+      "Casual",
+      "Casual2"
+    ],
+    "MoveGroup": [
+      "Walk",
+      "Run"
+    ],
+    "ActionWeight": [
+      1,
+      30
+    ],
+    "Speed": 25,
+    "AIConfigId": 14,
+    "SkillEffectPrefab": "FX_SKill_MengNiu"
+  },
+  {
+    "Id": 1004,
+    "Name": "灵蛇",
+    "Type": 4,
+    "PrefabName": "Pet_1004",
+    "IdleGroup": [],
+    "MoveGroup": [],
+    "ActionWeight": [],
+    "Speed": 0,
+    "AIConfigId": 0,
+    "SkillEffectPrefab": ""
   }
 ]

src/api/config/RegionStructureConfigCategory.json

@@ -445,7 +445,7 @@
     "Type": 1,
     "Function": 5,
     "RegionBuildFunction": 1015,
-    "QuantityLimit": 0,
+    "QuantityLimit": 1,
     "DisplayCondition": 5,
     "DisplayConditionParameter": [
       1030
@@ -1163,7 +1163,7 @@
     "Type": 1,
     "Function": 5,
     "RegionBuildFunction": 2014,
-    "QuantityLimit": 0,
+    "QuantityLimit": 1,
     "DisplayCondition": 5,
     "DisplayConditionParameter": [
       2001
@@ -1817,7 +1817,7 @@
     "Type": 1,
     "Function": 5,
     "RegionBuildFunction": 3014,
-    "QuantityLimit": 0,
+    "QuantityLimit": 1,
     "DisplayCondition": 5,
     "DisplayConditionParameter": [
       3001
@@ -2564,7 +2564,7 @@
     "Type": 1,
     "Function": 5,
     "RegionBuildFunction": 4015,
-    "QuantityLimit": 0,
+    "QuantityLimit": 1,
     "DisplayCondition": 5,
     "DisplayConditionParameter": [
       4001
@@ -2874,7 +2874,7 @@
     "Type": 4,
     "Function": 3,
     "RegionBuildFunction": 4025,
-    "QuantityLimit": 0,
+    "QuantityLimit": 1,
     "DisplayCondition": 5,
     "DisplayConditionParameter": [
       4002

src/api/config/ReputationShopItemGroupConfigCategory.json

@@ -1103,7 +1103,7 @@
     "Id": 2011,
     "Region": 3004,
     "ItemId": 132,
-    "Number": 10,
+    "Number": 50,
     "Currency": 1,
     "Price": 1000,
     "ReputationConditon": 1000,
@@ -1319,6 +1319,17 @@
     "ScaleCondition": 16,
     "RefreshCycle": 1
   },
+  {
+    "Id": 2031,
+    "Region": 3004,
+    "ItemId": 7213,
+    "Number": 2,
+    "Currency": 1,
+    "Price": 10000,
+    "ReputationConditon": 6000,
+    "ScaleCondition": 16,
+    "RefreshCycle": 0
+  },
   {
     "Id": 3001,
     "Region": 3005,

src/api/config/ResourcesConfigCategory.json

@@ -1938,6 +1938,53 @@
     "MoonnightOut": 0,
     "MoonnightOutProbability": 0
   },
+  {
+    "Id": 214,
+    "BehaviourType": 7,
+    "ResourcesName": "打猎",
+    "MutexBehaviour": [
+      -1
+    ],
+    "WorkerNumber": 1,
+    "RebornCondition": 2,
+    "RebornConditionParameters": [
+      1,
+      3
+    ],
+    "ShowCondition": 0,
+    "ShowConditionParameter": [
+      2,
+      3
+    ],
+    "Disappear": false,
+    "InResource": false,
+    "BaseOut": 204,
+    "OutAmount": 3000,
+    "BaseEfficient": 1,
+    "OutInterval": 10,
+    "ExtraOut": 38,
+    "ExtraOutProbability": [
+      [
+        0,
+        40
+      ],
+      [
+        1,
+        50
+      ],
+      [
+        2,
+        10
+      ],
+      [
+        3,
+        0
+      ]
+    ],
+    "TriggerEvent": true,
+    "MoonnightOut": 0,
+    "MoonnightOutProbability": 0
+  },
   {
     "Id": 300,
     "BehaviourType": 1,

src/api/config/ResourcesPointConfigCategory.json

@@ -3,6 +3,7 @@
     "Id": 1,
     "ResourcesPointName": "杂草",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 0,
     "AccessableParameter": [],
     "WorkerType": [
@@ -31,6 +32,7 @@
     "Id": 2,
     "ResourcesPointName": "甘草",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 0,
     "AccessableParameter": [],
     "WorkerType": [
@@ -59,6 +61,7 @@
     "Id": 3,
     "ResourcesPointName": "浆果",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 0,
     "AccessableParameter": [],
     "WorkerType": [
@@ -87,6 +90,7 @@
     "Id": 4,
     "ResourcesPointName": "野菜",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       1
@@ -117,6 +121,7 @@
     "Id": 5,
     "ResourcesPointName": "葛草",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       1
@@ -147,6 +152,7 @@
     "Id": 6,
     "ResourcesPointName": "茅草",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       1
@@ -177,6 +183,7 @@
     "Id": 7,
     "ResourcesPointName": "亚麻",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 0,
     "AccessableParameter": [],
     "WorkerType": [
@@ -205,6 +212,7 @@
     "Id": 8,
     "ResourcesPointName": "竹子",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 3,
     "AccessableParameter": [
       1004
@@ -236,6 +244,7 @@
     "Id": 9,
     "ResourcesPointName": "树枝堆",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 0,
     "AccessableParameter": [],
     "WorkerType": [
@@ -264,6 +273,7 @@
     "Id": 10,
     "ResourcesPointName": "迷谷树",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       4
@@ -294,6 +304,7 @@
     "Id": 11,
     "ResourcesPointName": "桃树",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       1
@@ -325,6 +336,7 @@
     "Id": 12,
     "ResourcesPointName": "柳树",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       1
@@ -355,6 +367,7 @@
     "Id": 13,
     "ResourcesPointName": "桑树",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       2
@@ -386,6 +399,7 @@
     "Id": 14,
     "ResourcesPointName": "松树",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       3
@@ -416,6 +430,7 @@
     "Id": 16,
     "ResourcesPointName": "桢楠",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       4
@@ -446,6 +461,7 @@
     "Id": 17,
     "ResourcesPointName": "黏土",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       1
@@ -476,6 +492,7 @@
     "Id": 18,
     "ResourcesPointName": "碎石",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 3,
     "AccessableParameter": [
       1004
@@ -506,6 +523,7 @@
     "Id": 19,
     "ResourcesPointName": "石头",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       1
@@ -536,6 +554,7 @@
     "Id": 20,
     "ResourcesPointName": "石灰石",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       2
@@ -566,6 +585,7 @@
     "Id": 21,
     "ResourcesPointName": "青石",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       3
@@ -596,6 +616,7 @@
     "Id": 22,
     "ResourcesPointName": "花岗石",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       4
@@ -626,6 +647,7 @@
     "Id": 23,
     "ResourcesPointName": "杂草",
     "Type": 1,
+    "Type2": 2,
     "AccessableCondition": 0,
     "AccessableParameter": [],
     "WorkerType": [
@@ -654,6 +676,7 @@
     "Id": 24,
     "ResourcesPointName": "浆果丛",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 0,
     "AccessableParameter": [],
     "WorkerType": [
@@ -682,6 +705,7 @@
     "Id": 25,
     "ResourcesPointName": "金矿",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       3
@@ -712,6 +736,7 @@
     "Id": 26,
     "ResourcesPointName": "树枝堆",
     "Type": 1,
+    "Type2": 2,
     "AccessableCondition": 0,
     "AccessableParameter": [],
     "WorkerType": [
@@ -740,6 +765,7 @@
     "Id": 27,
     "ResourcesPointName": "桦树",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       2
@@ -770,6 +796,7 @@
     "Id": 28,
     "ResourcesPointName": "铁矿",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       2
@@ -800,6 +827,7 @@
     "Id": 29,
     "ResourcesPointName": "银矿",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       3
@@ -830,6 +858,7 @@
     "Id": 30,
     "ResourcesPointName": "亚麻",
     "Type": 1,
+    "Type2": 2,
     "AccessableCondition": 0,
     "AccessableParameter": [],
     "WorkerType": [
@@ -858,6 +887,7 @@
     "Id": 31,
     "ResourcesPointName": "梨树",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       3
@@ -888,6 +918,7 @@
     "Id": 32,
     "ResourcesPointName": "榕树",
     "Type": 1,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       4
@@ -918,6 +949,7 @@
     "Id": 200,
     "ResourcesPointName": "石矿洞",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       520
@@ -948,6 +980,7 @@
     "Id": 201,
     "ResourcesPointName": "青石洞",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       522
@@ -978,6 +1011,7 @@
     "Id": 202,
     "ResourcesPointName": "青石洞",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       524
@@ -1009,6 +1043,7 @@
     "Id": 203,
     "ResourcesPointName": "黏土矿",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       521
@@ -1039,6 +1074,7 @@
     "Id": 204,
     "ResourcesPointName": "黏土矿",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       523
@@ -1070,6 +1106,7 @@
     "Id": 205,
     "ResourcesPointName": "卤水",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       502
@@ -1100,6 +1137,7 @@
     "Id": 206,
     "ResourcesPointName": "鱼塘",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       340
@@ -1130,6 +1168,7 @@
     "Id": 207,
     "ResourcesPointName": "鱼塘",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       341
@@ -1160,6 +1199,7 @@
     "Id": 208,
     "ResourcesPointName": "鱼塘",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       342
@@ -1190,6 +1230,7 @@
     "Id": 209,
     "ResourcesPointName": "鱼塘",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       343
@@ -1220,6 +1261,7 @@
     "Id": 210,
     "ResourcesPointName": "伐木场",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       1000
@@ -1250,6 +1292,7 @@
     "Id": 211,
     "ResourcesPointName": "采集厅",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       1001
@@ -1280,6 +1323,7 @@
     "Id": 212,
     "ResourcesPointName": "猎人小屋",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       1002
@@ -1310,6 +1354,7 @@
     "Id": 213,
     "ResourcesPointName": "石矿洞",
     "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       526
@@ -1337,10 +1382,42 @@
     "FoundationPicture": "Foundation_Stone",
     "Description": ""
   },
+  {
+    "Id": 214,
+    "ResourcesPointName": "猎人小屋",
+    "Type": 2,
+    "Type2": 1,
+    "AccessableCondition": 1,
+    "AccessableParameter": [
+      1003
+    ],
+    "WorkerType": [
+      1,
+      2,
+      3
+    ],
+    "RelatedResources": [
+      214
+    ],
+    "DailyInteractDropGroup": 0,
+    "RootOut": false,
+    "SaplingItemId": 0,
+    "Enter": true,
+    "Disperse": false,
+    "DisperseRadius": 0,
+    "Prefab": "Resource_214",
+    "MoonnightPrefab": [
+      "Resource_214"
+    ],
+    "NamePicture": "Resources_Name_214",
+    "FoundationPicture": "Foundation_Tree",
+    "Description": ""
+  },
   {
     "Id": 300,
     "ResourcesPointName": "水井",
-    "Type": 3,
+    "Type": 2,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       560
@@ -1371,6 +1448,7 @@
     "Id": 301,
     "ResourcesPointName": "浆果园",
     "Type": 3,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       620
@@ -1401,6 +1479,7 @@
     "Id": 302,
     "ResourcesPointName": "野菜园",
     "Type": 3,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       621
@@ -1431,6 +1510,7 @@
     "Id": 304,
     "ResourcesPointName": "亚麻园",
     "Type": 3,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       667
@@ -1461,6 +1541,7 @@
     "Id": 305,
     "ResourcesPointName": "茅草园",
     "Type": 3,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       668
@@ -1491,6 +1572,7 @@
     "Id": 306,
     "ResourcesPointName": "葛草园",
     "Type": 3,
+    "Type2": 1,
     "AccessableCondition": 1,
     "AccessableParameter": [
       669

src/api/config/RewardGroupConfigCategory.json

@@ -1453,6 +1453,182 @@
       20000
     ]
   },
+  {
+    "Id": 925,
+    "ItemId": [
+      140010,
+      220000,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      666,
+      66666,
+      6
+    ]
+  },
+  {
+    "Id": 926,
+    "ItemId": [
+      140011,
+      220000,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      888,
+      88888,
+      8
+    ]
+  },
+  {
+    "Id": 927,
+    "ItemId": [
+      9008,
+      220000,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      50,
+      10000,
+      1
+    ]
+  },
+  {
+    "Id": 928,
+    "ItemId": [
+      9009,
+      220000,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      50,
+      10000,
+      1
+    ]
+  },
+  {
+    "Id": 929,
+    "ItemId": [
+      7075,
+      7321
+    ],
+    "Number": [
+      1,
+      2
+    ]
+  },
+  {
+    "Id": 930,
+    "ItemId": [
+      1201,
+      220000,
+      210000,
+      7321
+    ],
+    "Number": [
+      100,
+      888,
+      200000,
+      10
+    ]
+  },
+  {
+    "Id": 931,
+    "ItemId": [
+      1201,
+      220000,
+      210000,
+      7321
+    ],
+    "Number": [
+      250,
+      1888,
+      500000,
+      10
+    ]
+  },
+  {
+    "Id": 932,
+    "ItemId": [
+      9007,
+      220000,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      50,
+      10000,
+      1
+    ]
+  },
+  {
+    "Id": 933,
+    "ItemId": [
+      9013,
+      220000,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      80,
+      10000,
+      1
+    ]
+  },
+  {
+    "Id": 934,
+    "ItemId": [
+      9014,
+      220000,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      60,
+      10000,
+      1
+    ]
+  },
+  {
+    "Id": 935,
+    "ItemId": [
+      9015,
+      220000,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      80,
+      10000,
+      1
+    ]
+  },
+  {
+    "Id": 936,
+    "ItemId": [
+      9016,
+      220000,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      80,
+      10000,
+      1
+    ]
+  },
   {
     "Id": 1001,
     "ItemId": [
@@ -2413,6 +2589,30 @@
       1
     ]
   },
+  {
+    "Id": 4040,
+    "ItemId": [
+      210000,
+      316
+    ],
+    "Number": [
+      500,
+      1
+    ]
+  },
+  {
+    "Id": 4041,
+    "ItemId": [
+      210000,
+      316,
+      8052
+    ],
+    "Number": [
+      500,
+      1,
+      1
+    ]
+  },
   {
     "Id": 5001,
     "ItemId": [
@@ -4037,72 +4237,259 @@
   },
   {
     "Id": 100001,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      210000
+    ],
+    "Number": [
+      10
+    ]
   },
   {
     "Id": 100002,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      210000
+    ],
+    "Number": [
+      20
+    ]
   },
   {
     "Id": 100003,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      210000
+    ],
+    "Number": [
+      30
+    ]
   },
   {
     "Id": 100004,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      210000
+    ],
+    "Number": [
+      40
+    ]
   },
   {
     "Id": 100005,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      210000
+    ],
+    "Number": [
+      50
+    ]
   },
   {
     "Id": 100006,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      210000
+    ],
+    "Number": [
+      60
+    ]
   },
   {
     "Id": 100007,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      210000
+    ],
+    "Number": [
+      70
+    ]
   },
   {
     "Id": 100008,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      7842,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      10000,
+      1
+    ]
   },
   {
     "Id": 100009,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      7842,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      20000,
+      1
+    ]
   },
   {
     "Id": 100010,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      7842,
+      210000,
+      7321,
+      220000
+    ],
+    "Number": [
+      1,
+      30000,
+      1,
+      30
+    ]
   },
   {
     "Id": 100011,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      7862,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      40000,
+      1
+    ]
   },
   {
     "Id": 100012,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      7862,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      50000,
+      1
+    ]
   },
   {
     "Id": 100013,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      7862,
+      210000,
+      7321
+    ],
+    "Number": [
+      1,
+      60000,
+      1
+    ]
   },
   {
     "Id": 100014,
-    "ItemId": [],
+    "ItemId": [
-    "Number": []
+      100005,
+      7863,
+      210000,
+      7321,
+      220000
+    ],
+    "Number": [
+      1,
+      1,
+      70000,
+      1,
+      70
+    ]
+  },
+  {
+    "Id": 100015,
+    "ItemId": [
+      2051,
+      210000,
+      7321
+    ],
+    "Number": [
+      6,
+      10000,
+      1
+    ]
+  },
+  {
+    "Id": 100016,
+    "ItemId": [
+      2051,
+      210000,
+      7321
+    ],
+    "Number": [
+      7,
+      20000,
+      1
+    ]
+  },
+  {
+    "Id": 100017,
+    "ItemId": [
+      2051,
+      210000,
+      7321,
+      220000
+    ],
+    "Number": [
+      8,
+      30000,
+      1,
+      30
+    ]
+  },
+  {
+    "Id": 100018,
+    "ItemId": [
+      2051,
+      210000,
+      7321
+    ],
+    "Number": [
+      9,
+      40000,
+      1
+    ]
+  },
+  {
+    "Id": 100019,
+    "ItemId": [
+      2051,
+      210000,
+      7321
+    ],
+    "Number": [
+      10,
+      50000,
+      1
+    ]
+  },
+  {
+    "Id": 100020,
+    "ItemId": [
+      2051,
+      210000,
+      7321
+    ],
+    "Number": [
+      11,
+      60000,
+      1
+    ]
+  },
+  {
+    "Id": 100021,
+    "ItemId": [
+      140012,
+      2051,
+      210000,
+      7321,
+      220000
+    ],
+    "Number": [
+      1,
+      12,
+      70000,
+      1,
+      70
+    ]
   }
 ]

src/api/config/ScaleConfigCategory.json

@@ -428,7 +428,7 @@
     "BusinessMan": 1015,
     "MonsterWaves": [
       1601,
-      1700
+      1800
     ],
     "Challenge": 10017,
     "FourEvilsBoss": 20004,

src/api/config/ShiWeiTianExchageItemGroupConfigCategory.json

@@ -93,7 +93,7 @@
   {
     "Id": 14,
     "GroupId": 5,
-    "ItemId": 1204,
+    "ItemId": 1027,
     "ConsumeNum": 800,
     "ExchangeTimes": 2
   },

src/api/config/SkillConfigCategory.json

@@ -3927,7 +3927,7 @@
     "VisualEffectPrefab": "FX_Skill_LuLiu",
     "Icon": "Skill_Icon_321",
     "Sound": "",
-    "Describe": "免伤增加3%，免疫控制，攻击力增加50%。持续10秒",
+    "Describe": "立即回复20%血量，免伤增加5%，免疫控制，攻击力增加50%。持续10秒",
     "Introduction": ""
   },
   {
@@ -3966,7 +3966,7 @@
     "VisualEffectPrefab": "FX_Skill_LuLiu",
     "Icon": "Skill_Icon_321",
     "Sound": "",
-    "Describe": "免伤增加6%，免疫控制，攻击力增加55%。持续10秒",
+    "Describe": "立即回复20%血量，免伤增加10%，免疫控制，攻击力增加55%。持续10秒",
     "Introduction": ""
   },
   {
@@ -4005,7 +4005,7 @@
     "VisualEffectPrefab": "FX_Skill_LuLiu",
     "Icon": "Skill_Icon_321",
     "Sound": "",
-    "Describe": "免伤增加9%，免疫控制，攻击力增加60%。持续10秒",
+    "Describe": "立即回复20%血量，免伤增加15%，免疫控制，攻击力增加60%。持续10秒",
     "Introduction": ""
   },
   {
@@ -4044,7 +4044,7 @@
     "VisualEffectPrefab": "FX_Skill_LuLiu",
     "Icon": "Skill_Icon_321",
     "Sound": "",
-    "Describe": "免伤增加12%，免疫控制，攻击力增加65%。持续10秒",
+    "Describe": "立即回复20%血量，免伤增加20%，免疫控制，攻击力增加65%。持续10秒",
     "Introduction": ""
   },
   {
@@ -4083,7 +4083,7 @@
     "VisualEffectPrefab": "FX_Skill_LuLiu",
     "Icon": "Skill_Icon_321",
     "Sound": "",
-    "Describe": "免伤增加15%，免疫控制，攻击力增加70%。持续10秒",
+    "Describe": "立即回复20%血量，免伤增加25%，免疫控制，攻击力增加70%。持续10秒",
     "Introduction": ""
   },
   {
@@ -4122,7 +4122,7 @@
     "VisualEffectPrefab": "FX_Skill_LuLiu",
     "Icon": "Skill_Icon_321",
     "Sound": "",
-    "Describe": "免伤增加18%，免疫控制，攻击力增加75%。持续10秒",
+    "Describe": "立即回复20%血量，免伤增加30%，免疫控制，攻击力增加75%。持续10秒",
     "Introduction": ""
   },
   {
@@ -4161,7 +4161,7 @@
     "VisualEffectPrefab": "FX_Skill_LuLiu",
     "Icon": "Skill_Icon_321",
     "Sound": "",
-    "Describe": "免伤增加21%，免疫控制，攻击力增加80%。持续10秒",
+    "Describe": "立即回复20%血量，免伤增加35%，免疫控制，攻击力增加80%。持续10秒",
     "Introduction": ""
   },
   {
@@ -4200,7 +4200,7 @@
     "VisualEffectPrefab": "FX_Skill_LuLiu",
     "Icon": "Skill_Icon_321",
     "Sound": "",
-    "Describe": "免伤增加24%，免疫控制，攻击力增加85%。持续10秒",
+    "Describe": "立即回复20%血量，免伤增加40%，免疫控制，攻击力增加85%。持续10秒",
     "Introduction": ""
   },
   {
@@ -4239,7 +4239,7 @@
     "VisualEffectPrefab": "FX_Skill_LuLiu",
     "Icon": "Skill_Icon_321",
     "Sound": "",
-    "Describe": "免伤增加27%，免疫控制，攻击力增加90%。持续10秒",
+    "Describe": "立即回复20%血量，免伤增加45%，免疫控制，攻击力增加90%。持续10秒",
     "Introduction": ""
   },
   {
@@ -4278,7 +4278,7 @@
     "VisualEffectPrefab": "FX_Skill_LuLiu",
     "Icon": "Skill_Icon_321",
     "Sound": "",
-    "Describe": "免伤增加30%，免疫控制，攻击力增加95%。持续10秒",
+    "Describe": "立即回复20%血量，免伤增加50%，免疫控制，攻击力增加95%。持续10秒",
     "Introduction": ""
   },
   {
@@ -14997,7 +14997,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1601",
     "Sound": "",
-    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加10%",
+    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加15%",
     "Introduction": ""
   },
   {
@@ -15036,7 +15036,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1601",
     "Sound": "",
-    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加20%",
+    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加30%",
     "Introduction": ""
   },
   {
@@ -15075,7 +15075,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1601",
     "Sound": "",
-    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加30%",
+    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加45%",
     "Introduction": ""
   },
   {
@@ -15114,7 +15114,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1601",
     "Sound": "",
-    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加40%",
+    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加60%",
     "Introduction": ""
   },
   {
@@ -15153,7 +15153,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1601",
     "Sound": "",
-    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加50%",
+    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加75%",
     "Introduction": ""
   },
   {
@@ -15192,7 +15192,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1601",
     "Sound": "",
-    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加60%",
+    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加90%",
     "Introduction": ""
   },
   {
@@ -15231,7 +15231,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1601",
     "Sound": "",
-    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加70%",
+    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加105%",
     "Introduction": ""
   },
   {
@@ -15270,7 +15270,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1601",
     "Sound": "",
-    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加80%",
+    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加120%",
     "Introduction": ""
   },
   {
@@ -15309,7 +15309,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1601",
     "Sound": "",
-    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加90%",
+    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加135%",
     "Introduction": ""
   },
   {
@@ -15348,7 +15348,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1601",
     "Sound": "",
-    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加100%",
+    "Describe": "如果攻击被闪避，则下次命中率提升至100%。且伤害增加150%",
     "Introduction": ""
   },
   {
@@ -15755,7 +15755,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1641",
     "Sound": "",
-    "Describe": "生命值低于20%时，普通攻击有2%的概率，眩晕敌人1秒",
+    "Describe": "生命值低于30%时，普通攻击有2%的概率，眩晕敌人1秒",
     "Introduction": ""
   },
   {
@@ -15792,7 +15792,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1641",
     "Sound": "",
-    "Describe": "生命值低于20%时，普通攻击有4%的概率，眩晕敌人1秒",
+    "Describe": "生命值低于30%时，普通攻击有4%的概率，眩晕敌人1秒",
     "Introduction": ""
   },
   {
@@ -15829,7 +15829,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1641",
     "Sound": "",
-    "Describe": "生命值低于20%时，普通攻击有6%的概率，眩晕敌人1秒",
+    "Describe": "生命值低于30%时，普通攻击有6%的概率，眩晕敌人1秒",
     "Introduction": ""
   },
   {
@@ -15866,7 +15866,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1641",
     "Sound": "",
-    "Describe": "生命值低于20%时，普通攻击有8%的概率，眩晕敌人1秒",
+    "Describe": "生命值低于30%时，普通攻击有8%的概率，眩晕敌人1秒",
     "Introduction": ""
   },
   {
@@ -15903,7 +15903,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1641",
     "Sound": "",
-    "Describe": "生命值低于20%时，普通攻击有10%的概率，眩晕敌人1秒",
+    "Describe": "生命值低于30%时，普通攻击有10%的概率，眩晕敌人1秒",
     "Introduction": ""
   },
   {
@@ -15940,7 +15940,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1641",
     "Sound": "",
-    "Describe": "生命值低于20%时，普通攻击有12%的概率，眩晕敌人1秒",
+    "Describe": "生命值低于30%时，普通攻击有12%的概率，眩晕敌人1秒",
     "Introduction": ""
   },
   {
@@ -15977,7 +15977,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1641",
     "Sound": "",
-    "Describe": "生命值低于20%时，普通攻击有14%的概率，眩晕敌人1秒",
+    "Describe": "生命值低于30%时，普通攻击有14%的概率，眩晕敌人1秒",
     "Introduction": ""
   },
   {
@@ -16014,7 +16014,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1641",
     "Sound": "",
-    "Describe": "生命值低于20%时，普通攻击有16%的概率，眩晕敌人1秒",
+    "Describe": "生命值低于30%时，普通攻击有16%的概率，眩晕敌人1秒",
     "Introduction": ""
   },
   {
@@ -16051,7 +16051,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1641",
     "Sound": "",
-    "Describe": "生命值低于20%时，普通攻击有18%的概率，眩晕敌人1秒",
+    "Describe": "生命值低于30%时，普通攻击有18%的概率，眩晕敌人1秒",
     "Introduction": ""
   },
   {
@@ -16088,7 +16088,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1641",
     "Sound": "",
-    "Describe": "生命值低于20%时，普通攻击有20%的概率，眩晕敌人1秒",
+    "Describe": "生命值低于30%时，普通攻击有20%的概率，眩晕敌人1秒",
     "Introduction": ""
   },
   {

src/api/config/SkillEffectConfigCategory.json

@@ -2131,63 +2131,63 @@
     "Id": 1442,
     "EffectType": 1411,
     "EffectField": 1,
-    "NumericExpression": "4",
+    "NumericExpression": "6",
     "WhetherCrit": false
   },
   {
     "Id": 1443,
     "EffectType": 1411,
     "EffectField": 1,
-    "NumericExpression": "5",
+    "NumericExpression": "9",
     "WhetherCrit": false
   },
   {
     "Id": 1444,
     "EffectType": 1411,
     "EffectField": 1,
-    "NumericExpression": "6",
+    "NumericExpression": "12",
     "WhetherCrit": false
   },
   {
     "Id": 1445,
     "EffectType": 1411,
     "EffectField": 1,
-    "NumericExpression": "7",
+    "NumericExpression": "15",
     "WhetherCrit": false
   },
   {
     "Id": 1446,
     "EffectType": 1411,
     "EffectField": 1,
-    "NumericExpression": "8",
+    "NumericExpression": "18",
     "WhetherCrit": false
   },
   {
     "Id": 1447,
     "EffectType": 1411,
     "EffectField": 1,
-    "NumericExpression": "9",
+    "NumericExpression": "21",
     "WhetherCrit": false
   },
   {
     "Id": 1448,
     "EffectType": 1411,
     "EffectField": 1,
-    "NumericExpression": "10",
+    "NumericExpression": "24",
     "WhetherCrit": false
   },
   {
     "Id": 1449,
     "EffectType": 1411,
     "EffectField": 1,
-    "NumericExpression": "11",
+    "NumericExpression": "27",
     "WhetherCrit": false
   },
   {
     "Id": 1450,
     "EffectType": 1411,
     "EffectField": 1,
-    "NumericExpression": "12",
+    "NumericExpression": "30",
     "WhetherCrit": false
   },
   {
@@ -2761,70 +2761,70 @@
     "Id": 1611,
     "EffectType": 1432,
     "EffectField": 1,
-    "NumericExpression": "10",
+    "NumericExpression": "15",
     "WhetherCrit": false
   },
   {
     "Id": 1612,
     "EffectType": 1432,
     "EffectField": 1,
-    "NumericExpression": "20",
+    "NumericExpression": "30",
     "WhetherCrit": false
   },
   {
     "Id": 1613,
     "EffectType": 1432,
     "EffectField": 1,
-    "NumericExpression": "30",
+    "NumericExpression": "45",
     "WhetherCrit": false
   },
   {
     "Id": 1614,
     "EffectType": 1432,
     "EffectField": 1,
-    "NumericExpression": "40",
+    "NumericExpression": "60",
     "WhetherCrit": false
   },
   {
     "Id": 1615,
     "EffectType": 1432,
     "EffectField": 1,
-    "NumericExpression": "50",
+    "NumericExpression": "75",
     "WhetherCrit": false
   },
   {
     "Id": 1616,
     "EffectType": 1432,
     "EffectField": 1,
-    "NumericExpression": "60",
+    "NumericExpression": "90",
     "WhetherCrit": false
   },
   {
     "Id": 1617,
     "EffectType": 1432,
     "EffectField": 1,
-    "NumericExpression": "70",
+    "NumericExpression": "105",
     "WhetherCrit": false
   },
   {
     "Id": 1618,
     "EffectType": 1432,
     "EffectField": 1,
-    "NumericExpression": "80",
+    "NumericExpression": "120",
     "WhetherCrit": false
   },
   {
     "Id": 1619,
     "EffectType": 1432,
     "EffectField": 1,
-    "NumericExpression": "90",
+    "NumericExpression": "135",
     "WhetherCrit": false
   },
   {
     "Id": 1620,
     "EffectType": 1432,
     "EffectField": 1,
-    "NumericExpression": "100",
+    "NumericExpression": "150",
     "WhetherCrit": false
   },
   {
@@ -5554,70 +5554,70 @@
     "Id": 3211,
     "EffectType": 1433,
     "EffectField": 1,
-    "NumericExpression": "3",
+    "NumericExpression": "5",
     "WhetherCrit": false
   },
   {
     "Id": 3212,
     "EffectType": 1433,
     "EffectField": 1,
-    "NumericExpression": "6",
+    "NumericExpression": "10",
     "WhetherCrit": false
   },
   {
     "Id": 3213,
     "EffectType": 1433,
     "EffectField": 1,
-    "NumericExpression": "9",
+    "NumericExpression": "15",
     "WhetherCrit": false
   },
   {
     "Id": 3214,
     "EffectType": 1433,
     "EffectField": 1,
-    "NumericExpression": "12",
+    "NumericExpression": "20",
     "WhetherCrit": false
   },
   {
     "Id": 3215,
     "EffectType": 1433,
     "EffectField": 1,
-    "NumericExpression": "15",
+    "NumericExpression": "25",
     "WhetherCrit": false
   },
   {
     "Id": 3216,
     "EffectType": 1433,
     "EffectField": 1,
-    "NumericExpression": "18",
+    "NumericExpression": "30",
     "WhetherCrit": false
   },
   {
     "Id": 3217,
     "EffectType": 1433,
     "EffectField": 1,
-    "NumericExpression": "21",
+    "NumericExpression": "35",
     "WhetherCrit": false
   },
   {
     "Id": 3218,
     "EffectType": 1433,
     "EffectField": 1,
-    "NumericExpression": "24",
+    "NumericExpression": "40",
     "WhetherCrit": false
   },
   {
     "Id": 3219,
     "EffectType": 1433,
     "EffectField": 1,
-    "NumericExpression": "27",
+    "NumericExpression": "45",
     "WhetherCrit": false
   },
   {
     "Id": 3220,
     "EffectType": 1433,
     "EffectField": 1,
-    "NumericExpression": "30",
+    "NumericExpression": "50",
     "WhetherCrit": false
   },
   {
@@ -5697,6 +5697,13 @@
     "NumericExpression": "3221",
     "WhetherCrit": false
   },
+  {
+    "Id": 3232,
+    "EffectType": 1401,
+    "EffectField": 1,
+    "NumericExpression": "HpMax*0.2",
+    "WhetherCrit": false
+  },
   {
     "Id": 3411,
     "EffectType": 1401,

src/api/config/StoryAnimationConfigCategory.json

@@ -232,5 +232,18 @@
       0
     ],
     "Region": 1001
+  },
+  {
+    "Id": 22,
+    "TriggerCondition": 1,
+    "ConditionParameter": [
+      1038
+    ],
+    "AnimationName": "StoryCase_22",
+    "CloseWindow": true,
+    "RelatedTask": [
+      0
+    ],
+    "Region": 3002
   }
 ]

src/api/config/StructureFightConfigCategory.json

@@ -1967,6 +1967,22 @@
     "SonNum": 0,
     "Skill": 0
   },
+  {
+    "Id": 581,
+    "ATK": 0,
+    "DEF": 0,
+    "HP": 1000,
+    "HoldNum": 0,
+    "EquipType": 0,
+    "EquipNum": 0,
+    "AttackSpeed": 0,
+    "HitRate": 0,
+    "Hit": 0,
+    "DodgeRate": 0,
+    "Dodge": 0,
+    "SonNum": 0,
+    "Skill": 0
+  },
   {
     "Id": 620,
     "ATK": 0,
@@ -2079,6 +2095,22 @@
     "SonNum": 0,
     "Skill": 0
   },
+  {
+    "Id": 672,
+    "ATK": 0,
+    "DEF": 0,
+    "HP": 10000,
+    "HoldNum": 0,
+    "EquipType": 0,
+    "EquipNum": 0,
+    "AttackSpeed": 0,
+    "HitRate": 0,
+    "Hit": 0,
+    "DodgeRate": 0,
+    "Dodge": 0,
+    "SonNum": 0,
+    "Skill": 0
+  },
   {
     "Id": 1100,
     "ATK": 0,

src/api/config/StructureSkinConfigCategory.json

@@ -58,7 +58,7 @@
     "SkinName": "漾春小井",
     "SkinPrefab": "Structure_Skin_1006",
     "Picture": "Structure_Skin_Picture_1006",
-    "GetMethod": "未开放",
+    "GetMethod": "外观礼包",
     "ScienceId": 0,
     "Integral": 100
   },
@@ -67,8 +67,197 @@
     "SkinName": "金粟小仓",
     "SkinPrefab": "Structure_Skin_1007",
     "Picture": "Structure_Skin_Picture_1007",
-    "GetMethod": "未开放",
+    "GetMethod": "外观礼包",
     "ScienceId": 0,
     "Integral": 100
+  },
+  {
+    "Id": 1008,
+    "SkinName": "藤绕稻暖坞",
+    "SkinPrefab": "Structure_Skin_1008",
+    "Picture": "Structure_Skin_Picture_1008",
+    "GetMethod": "外观礼包",
+    "ScienceId": 0,
+    "Integral": 100
+  },
+  {
+    "Id": 1009,
+    "SkinName": "金·雕像·鲍小翠",
+    "SkinPrefab": "Structure_Skin_1009",
+    "Picture": "Structure_Skin_Picture_1009",
+    "GetMethod": "暂未开放",
+    "ScienceId": 0,
+    "Integral": 100
+  },
+  {
+    "Id": 1010,
+    "SkinName": "金·雕像·乔河",
+    "SkinPrefab": "Structure_Skin_1010",
+    "Picture": "Structure_Skin_Picture_1010",
+    "GetMethod": "暂未开放",
+    "ScienceId": 0,
+    "Integral": 100
+  },
+  {
+    "Id": 1011,
+    "SkinName": "金·雕像",
+    "SkinPrefab": "Structure_Skin_1011",
+    "Picture": "Structure_Skin_Picture_1011",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7014,
+    "Integral": 100
+  },
+  {
+    "Id": 1012,
+    "SkinName": "青石篝火",
+    "SkinPrefab": "Structure_Skin_1012",
+    "Picture": "Structure_Skin_Picture_1012",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7013,
+    "Integral": 100
+  },
+  {
+    "Id": 1013,
+    "SkinName": "蓝帘草庐",
+    "SkinPrefab": "Structure_Skin_1013",
+    "Picture": "Structure_Skin_Picture_1013",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7001,
+    "Integral": 100
+  },
+  {
+    "Id": 1014,
+    "SkinName": "月露藤香阁",
+    "SkinPrefab": "Structure_Skin_1014",
+    "Picture": "Structure_Skin_Picture_1014",
+    "GetMethod": "外观礼包",
+    "ScienceId": 0,
+    "Integral": 100
+  },
+  {
+    "Id": 1015,
+    "SkinName": "万斛阁",
+    "SkinPrefab": "Structure_Skin_1015",
+    "Picture": "Structure_Skin_Picture_1015",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7002,
+    "Integral": 100
+  },
+  {
+    "Id": 1016,
+    "SkinName": "青枝小磨",
+    "SkinPrefab": "Structure_Skin_1016",
+    "Picture": "Structure_Skin_Picture_1016",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7003,
+    "Integral": 100
+  },
+  {
+    "Id": 1017,
+    "SkinName": "谷露春磨",
+    "SkinPrefab": "Structure_Skin_1017",
+    "Picture": "Structure_Skin_Picture_1017",
+    "GetMethod": "外观礼包",
+    "ScienceId": 0,
+    "Integral": 100
+  },
+  {
+    "Id": 1018,
+    "SkinName": "山野小灶",
+    "SkinPrefab": "Structure_Skin_1018",
+    "Picture": "Structure_Skin_Picture_1018",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7004,
+    "Integral": 100
+  },
+  {
+    "Id": 1019,
+    "SkinName": "百味炊烟",
+    "SkinPrefab": "Structure_Skin_1019",
+    "Picture": "Structure_Skin_Picture_1019",
+    "GetMethod": "外观礼包",
+    "ScienceId": 0,
+    "Integral": 100
+  },
+  {
+    "Id": 1020,
+    "SkinName": "骨头小窝",
+    "SkinPrefab": "Structure_Skin_1020",
+    "Picture": "Structure_Skin_Picture_1020",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7005,
+    "Integral": 100
+  },
+  {
+    "Id": 1021,
+    "SkinName": "木篱咯咯窝",
+    "SkinPrefab": "Structure_Skin_1021",
+    "Picture": "Structure_Skin_Picture_1021",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7009,
+    "Integral": 100
+  },
+  {
+    "Id": 1022,
+    "SkinName": "青石小井",
+    "SkinPrefab": "Structure_Skin_1022",
+    "Picture": "Structure_Skin_Picture_1022",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7010,
+    "Integral": 100
+  },
+  {
+    "Id": 1023,
+    "SkinName": "青石藤窖",
+    "SkinPrefab": "Structure_Skin_1023",
+    "Picture": "Structure_Skin_Picture_1023",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7012,
+    "Integral": 100
+  },
+  {
+    "Id": 1024,
+    "SkinName": "春意小窖",
+    "SkinPrefab": "Structure_Skin_1024",
+    "Picture": "Structure_Skin_Picture_1024",
+    "GetMethod": "外观礼包",
+    "ScienceId": 0,
+    "Integral": 100
+  },
+  {
+    "Id": 1025,
+    "SkinName": "云雷缚龙鼎",
+    "SkinPrefab": "Structure_Skin_1025",
+    "Picture": "Structure_Skin_Picture_1025",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7006,
+    "Integral": 100
+  },
+  {
+    "Id": 1026,
+    "SkinName": "筠篱浮雪",
+    "SkinPrefab": "Structure_Skin_1026",
+    "Picture": "Structure_Skin_Picture_1026",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7007,
+    "Integral": 100
+  },
+  {
+    "Id": 1027,
+    "SkinName": "竹涧盐井",
+    "SkinPrefab": "Structure_Skin_1027",
+    "Picture": "Structure_Skin_Picture_1027",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7008,
+    "Integral": 100
+  },
+  {
+    "Id": 1028,
+    "SkinName": "木瓦栖春居",
+    "SkinPrefab": "Structure_Skin_1028",
+    "Picture": "Structure_Skin_Picture_1028",
+    "GetMethod": "鲁明处购买图纸后在桃源殿进行研究",
+    "ScienceId": 7011,
+    "Integral": 100
   }
 ]

src/api/config/StructureStrengthenConfigCategory.json

@@ -5099,6 +5099,40 @@
     "StrengIntegral2": 4,
     "StrengIntegral3": 8
   },
+  {
+    "Id": 581,
+    "Name": "猪圈",
+    "Schedule": 13,
+    "RepairItem1": 804,
+    "RepairItemNum1": 300,
+    "RepairItem2": 809,
+    "RepairItemNum2": 500,
+    "RepairItem3": 800,
+    "RepairItemNum3": 350,
+    "RepairItem4": 0,
+    "RepairItemNum4": 0,
+    "FirmCoinNum": 9200,
+    "StrengthenYesOrNo": true,
+    "Strengthen1Item1": 815,
+    "Strengthen1Item1Num": 80,
+    "Strengthen1Item2": 804,
+    "Strengthen1Item2Num": 10,
+    "Strengthen2Item1": 820,
+    "Strengthen2Item1Num": 78,
+    "Strengthen2Item2": 804,
+    "Strengthen2Item2Num": 20,
+    "Strengthen3Item1": 820,
+    "Strengthen3Item1Num": 156,
+    "Strengthen3Item2": 804,
+    "Strengthen3Item2Num": 50,
+    "StrengthenDurable1": 1500,
+    "StrengthenDurable2": 2100,
+    "StrengthenDurable3": 2700,
+    "Integral": 60,
+    "StrengIntegral1": 10,
+    "StrengIntegral2": 15,
+    "StrengIntegral3": 30
+  },
   {
     "Id": 582,
     "Name": "鸡窝",
@@ -5133,6 +5167,40 @@
     "StrengIntegral2": 8,
     "StrengIntegral3": 15
   },
+  {
+    "Id": 583,
+    "Name": "猪圈",
+    "Schedule": 17,
+    "RepairItem1": 805,
+    "RepairItemNum1": 300,
+    "RepairItem2": 810,
+    "RepairItemNum2": 500,
+    "RepairItem3": 800,
+    "RepairItemNum3": 350,
+    "RepairItem4": 0,
+    "RepairItemNum4": 0,
+    "FirmCoinNum": 14000,
+    "StrengthenYesOrNo": true,
+    "Strengthen1Item1": 821,
+    "Strengthen1Item1Num": 51,
+    "Strengthen1Item2": 805,
+    "Strengthen1Item2Num": 10,
+    "Strengthen2Item1": 821,
+    "Strengthen2Item1Num": 102,
+    "Strengthen2Item2": 805,
+    "Strengthen2Item2Num": 20,
+    "Strengthen3Item1": 821,
+    "Strengthen3Item1Num": 204,
+    "Strengthen3Item2": 805,
+    "Strengthen3Item2Num": 50,
+    "StrengthenDurable1": 1500,
+    "StrengthenDurable2": 2100,
+    "StrengthenDurable3": 2700,
+    "Integral": 80,
+    "StrengIntegral1": 14,
+    "StrengIntegral2": 20,
+    "StrengIntegral3": 40
+  },
   {
     "Id": 620,
     "Name": "浆果园",
@@ -5677,6 +5745,108 @@
     "StrengIntegral2": 8,
     "StrengIntegral3": 15
   },
+  {
+    "Id": 670,
+    "Name": "雕像·鲍小翠",
+    "Schedule": 20,
+    "RepairItem1": 807,
+    "RepairItemNum1": 80,
+    "RepairItem2": 0,
+    "RepairItemNum2": 0,
+    "RepairItem3": 0,
+    "RepairItemNum3": 0,
+    "RepairItem4": 0,
+    "RepairItemNum4": 820,
+    "FirmCoinNum": 400,
+    "StrengthenYesOrNo": false,
+    "Strengthen1Item1": 821,
+    "Strengthen1Item1Num": 54,
+    "Strengthen1Item2": 0,
+    "Strengthen1Item2Num": 0,
+    "Strengthen2Item1": 821,
+    "Strengthen2Item1Num": 108,
+    "Strengthen2Item2": 0,
+    "Strengthen2Item2Num": 0,
+    "Strengthen3Item1": 821,
+    "Strengthen3Item1Num": 216,
+    "Strengthen3Item2": 0,
+    "Strengthen3Item2Num": 0,
+    "StrengthenDurable1": 1500,
+    "StrengthenDurable2": 2100,
+    "StrengthenDurable3": 2700,
+    "Integral": 0,
+    "StrengIntegral1": 0,
+    "StrengIntegral2": 0,
+    "StrengIntegral3": 0
+  },
+  {
+    "Id": 671,
+    "Name": "雕像·乔河",
+    "Schedule": 20,
+    "RepairItem1": 807,
+    "RepairItemNum1": 80,
+    "RepairItem2": 0,
+    "RepairItemNum2": 0,
+    "RepairItem3": 0,
+    "RepairItemNum3": 0,
+    "RepairItem4": 0,
+    "RepairItemNum4": 820,
+    "FirmCoinNum": 400,
+    "StrengthenYesOrNo": false,
+    "Strengthen1Item1": 821,
+    "Strengthen1Item1Num": 54,
+    "Strengthen1Item2": 0,
+    "Strengthen1Item2Num": 0,
+    "Strengthen2Item1": 821,
+    "Strengthen2Item1Num": 108,
+    "Strengthen2Item2": 0,
+    "Strengthen2Item2Num": 0,
+    "Strengthen3Item1": 821,
+    "Strengthen3Item1Num": 216,
+    "Strengthen3Item2": 0,
+    "Strengthen3Item2Num": 0,
+    "StrengthenDurable1": 1500,
+    "StrengthenDurable2": 2100,
+    "StrengthenDurable3": 2700,
+    "Integral": 0,
+    "StrengIntegral1": 0,
+    "StrengIntegral2": 0,
+    "StrengIntegral3": 0
+  },
+  {
+    "Id": 672,
+    "Name": "兵工坊",
+    "Schedule": 20,
+    "RepairItem1": 811,
+    "RepairItemNum1": 1000,
+    "RepairItem2": 805,
+    "RepairItemNum2": 1000,
+    "RepairItem3": 828,
+    "RepairItemNum3": 1000,
+    "RepairItem4": 858,
+    "RepairItemNum4": 600,
+    "FirmCoinNum": 17800,
+    "StrengthenYesOrNo": false,
+    "Strengthen1Item1": 0,
+    "Strengthen1Item1Num": 0,
+    "Strengthen1Item2": 0,
+    "Strengthen1Item2Num": 0,
+    "Strengthen2Item1": 0,
+    "Strengthen2Item1Num": 0,
+    "Strengthen2Item2": 0,
+    "Strengthen2Item2Num": 0,
+    "Strengthen3Item1": 0,
+    "Strengthen3Item1Num": 0,
+    "Strengthen3Item2": 0,
+    "Strengthen3Item2Num": 0,
+    "StrengthenDurable1": -1,
+    "StrengthenDurable2": -1,
+    "StrengthenDurable3": -1,
+    "Integral": 0,
+    "StrengIntegral1": 0,
+    "StrengIntegral2": 0,
+    "StrengIntegral3": 0
+  },
   {
     "Id": 1000,
     "Name": "伐木场",

src/api/config/SynthesisConfigCategory.json

@@ -4108,7 +4108,7 @@
     "ItemId3": 0,
     "ItemNum3": 0,
     "ItemId4": 0,
-    "ItemNum4": 820,
+    "ItemNum4": 0,
     "DisplayCondition": 10,
     "DisplayParameter": [
       5001
@@ -4618,6 +4618,37 @@
     "NextLv": 0,
     "UpgradeItem": 0
   },
+  {
+    "Id": 581,
+    "Name": "猪圈",
+    "MixtureType": 1,
+    "MaterialType": 0,
+    "MixtureID": 581,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": -1,
+    "SingleMaxNumber": -1,
+    "ItemId1": 804,
+    "ItemNum1": 300,
+    "ItemId2": 809,
+    "ItemNum2": 500,
+    "ItemId3": 800,
+    "ItemNum3": 350,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      13
+    ],
+    "UnlockCondition": 1,
+    "UnlockParameter": [
+      13
+    ],
+    "Drawing": false,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
   {
     "Id": 582,
     "Name": "鸡窝",
@@ -4649,6 +4680,37 @@
     "NextLv": 0,
     "UpgradeItem": 0
   },
+  {
+    "Id": 583,
+    "Name": "猪圈",
+    "MixtureType": 1,
+    "MaterialType": 0,
+    "MixtureID": 583,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": -1,
+    "SingleMaxNumber": -1,
+    "ItemId1": 805,
+    "ItemNum1": 300,
+    "ItemId2": 810,
+    "ItemNum2": 500,
+    "ItemId3": 800,
+    "ItemNum3": 350,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      17
+    ],
+    "UnlockCondition": 1,
+    "UnlockParameter": [
+      17
+    ],
+    "Drawing": false,
+    "Display": false,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
   {
     "Id": 620,
     "Name": "浆果园",
@@ -5145,6 +5207,99 @@
     "NextLv": 0,
     "UpgradeItem": 0
   },
+  {
+    "Id": 670,
+    "Name": "雕像·鲍小翠",
+    "MixtureType": 1,
+    "MaterialType": 0,
+    "MixtureID": 670,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": -1,
+    "SingleMaxNumber": -1,
+    "ItemId1": 808,
+    "ItemNum1": 200,
+    "ItemId2": 0,
+    "ItemNum2": 0,
+    "ItemId3": 0,
+    "ItemNum3": 0,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 4,
+    "DisplayParameter": [
+      0
+    ],
+    "UnlockCondition": 4,
+    "UnlockParameter": [
+      0
+    ],
+    "Drawing": true,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
+  {
+    "Id": 671,
+    "Name": "雕像·乔河",
+    "MixtureType": 1,
+    "MaterialType": 0,
+    "MixtureID": 671,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": -1,
+    "SingleMaxNumber": -1,
+    "ItemId1": 808,
+    "ItemNum1": 200,
+    "ItemId2": 0,
+    "ItemNum2": 0,
+    "ItemId3": 0,
+    "ItemNum3": 0,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 4,
+    "DisplayParameter": [
+      0
+    ],
+    "UnlockCondition": 4,
+    "UnlockParameter": [
+      0
+    ],
+    "Drawing": true,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
+  {
+    "Id": 672,
+    "Name": "兵工坊",
+    "MixtureType": 1,
+    "MaterialType": 0,
+    "MixtureID": 672,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": -1,
+    "SingleMaxNumber": -1,
+    "ItemId1": 811,
+    "ItemNum1": 1000,
+    "ItemId2": 805,
+    "ItemNum2": 1000,
+    "ItemId3": 828,
+    "ItemNum3": 500,
+    "ItemId4": 858,
+    "ItemNum4": 600,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      20
+    ],
+    "UnlockCondition": 1,
+    "UnlockParameter": [
+      20
+    ],
+    "Drawing": false,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
   {
     "Id": 1000,
     "Name": "伐木场",
@@ -5238,6 +5393,37 @@
     "NextLv": 0,
     "UpgradeItem": 0
   },
+  {
+    "Id": 1003,
+    "Name": "猎人小屋",
+    "MixtureType": 1,
+    "MaterialType": 0,
+    "MixtureID": 1003,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": -1,
+    "SingleMaxNumber": -1,
+    "ItemId1": 804,
+    "ItemNum1": 200,
+    "ItemId2": 809,
+    "ItemNum2": 200,
+    "ItemId3": 800,
+    "ItemNum3": 200,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      13
+    ],
+    "UnlockCondition": 1,
+    "UnlockParameter": [
+      13
+    ],
+    "Drawing": false,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
   {
     "Id": 1100,
     "Name": "装备坊",
@@ -6824,6 +7010,35 @@
     "NextLv": 2543,
     "UpgradeItem": 7068
   },
+  {
+    "Id": 2051,
+    "Name": "肉粽子",
+    "MixtureType": 2,
+    "MaterialType": 0,
+    "MixtureID": 2051,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 10,
+    "SingleMaxNumber": -1,
+    "ItemId1": 101,
+    "ItemNum1": 1,
+    "ItemId2": 121,
+    "ItemNum2": 5,
+    "ItemId3": 832,
+    "ItemNum3": 1,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      7
+    ],
+    "UnlockCondition": 4,
+    "UnlockParameter": [],
+    "Drawing": true,
+    "Display": true,
+    "NextLv": 2544,
+    "UpgradeItem": 7076
+  },
   {
     "Id": 2502,
     "Name": "野菜汤",
@@ -8224,6 +8439,35 @@
     "NextLv": 0,
     "UpgradeItem": 0
   },
+  {
+    "Id": 2544,
+    "Name": "肉粽子",
+    "MixtureType": 2,
+    "MaterialType": 0,
+    "MixtureID": 2344,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 10,
+    "SingleMaxNumber": -1,
+    "ItemId1": 101,
+    "ItemNum1": 1,
+    "ItemId2": 121,
+    "ItemNum2": 5,
+    "ItemId3": 832,
+    "ItemNum3": 1,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 9,
+    "DisplayParameter": [
+      0
+    ],
+    "UnlockCondition": 4,
+    "UnlockParameter": [],
+    "Drawing": true,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
   {
     "Id": 3000,
     "Name": "茅草捆",
@@ -10130,6 +10374,37 @@
     "NextLv": 0,
     "UpgradeItem": 0
   },
+  {
+    "Id": 3065,
+    "Name": "饲料",
+    "MixtureType": 3,
+    "MaterialType": 4,
+    "MixtureID": 861,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 1,
+    "SingleMaxNumber": -1,
+    "ItemId1": 1,
+    "ItemNum1": 15,
+    "ItemId2": 2000,
+    "ItemNum2": 40,
+    "ItemId3": 0,
+    "ItemNum3": 0,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      13
+    ],
+    "UnlockCondition": 1,
+    "UnlockParameter": [
+      13
+    ],
+    "Drawing": false,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
   {
     "Id": 4000,
     "Name": "葛布春服",
@@ -12618,12 +12893,12 @@
     "Copies": 1,
     "TimeConsume": 30,
     "SingleMaxNumber": -1,
-    "ItemId1": 801,
+    "ItemId1": 838,
-    "ItemNum1": 2,
+    "ItemNum1": 10,
-    "ItemId2": 838,
+    "ItemId2": 801,
-    "ItemNum2": 5,
+    "ItemNum2": 10,
-    "ItemId3": 0,
+    "ItemId3": 213,
-    "ItemNum3": 0,
+    "ItemNum3": 20,
     "ItemId4": 0,
     "ItemNum4": 0,
     "DisplayCondition": 4,
@@ -13200,17 +13475,17 @@
     "Copies": 1,
     "TimeConsume": 30,
     "SingleMaxNumber": -1,
-    "ItemId1": 801,
+    "ItemId1": 838,
-    "ItemNum1": 2,
+    "ItemNum1": 10,
-    "ItemId2": 838,
+    "ItemId2": 801,
-    "ItemNum2": 5,
+    "ItemNum2": 10,
-    "ItemId3": 0,
+    "ItemId3": 213,
-    "ItemNum3": 0,
+    "ItemNum3": 20,
     "ItemId4": 0,
     "ItemNum4": 0,
-    "DisplayCondition": 1,
+    "DisplayCondition": 4,
     "DisplayParameter": [
-      6
+      0
     ],
     "UnlockCondition": 4,
     "UnlockParameter": [
@@ -13231,17 +13506,17 @@
     "Copies": 1,
     "TimeConsume": 30,
     "SingleMaxNumber": -1,
-    "ItemId1": 801,
+    "ItemId1": 838,
-    "ItemNum1": 2,
+    "ItemNum1": 10,
-    "ItemId2": 838,
+    "ItemId2": 801,
-    "ItemNum2": 5,
+    "ItemNum2": 10,
-    "ItemId3": 0,
+    "ItemId3": 213,
-    "ItemNum3": 0,
+    "ItemNum3": 20,
     "ItemId4": 0,
     "ItemNum4": 0,
-    "DisplayCondition": 1,
+    "DisplayCondition": 4,
     "DisplayParameter": [
-      6
+      0
     ],
     "UnlockCondition": 4,
     "UnlockParameter": [

src/api/config/SystemConditionsConfigCategory.json

@@ -34,13 +34,6 @@
     "OpenConditionType": 2,
     "ConditionParameter": 1021
   },
-  {
-    "Id": 6,
-    "OpenSystem": 6,
-    "Name": "家宴自动一键",
-    "OpenConditionType": 3,
-    "ConditionParameter": 42
-  },
   {
     "Id": 7,
     "OpenSystem": 7,
@@ -116,13 +109,20 @@
     "OpenSystem": 18,
     "Name": "成就系统",
     "OpenConditionType": 4,
-    "ConditionParameter": 16
+    "ConditionParameter": 3
   },
   {
     "Id": 19,
     "OpenSystem": 19,
     "Name": "称号系统",
     "OpenConditionType": 4,
-    "ConditionParameter": 1
+    "ConditionParameter": 3
+  },
+  {
+    "Id": 20,
+    "OpenSystem": 20,
+    "Name": "资源一览功能",
+    "OpenConditionType": 4,
+    "ConditionParameter": 8
   }
 ]

src/api/config/TaskConfigCategory.json

@@ -149,11 +149,8 @@
     "Parameter1": [
       1031
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3002,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -184,11 +181,8 @@
     "Parameter1": [
       1031
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3002,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -219,11 +213,8 @@
     "Parameter1": [
       1031
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3002,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -254,11 +245,8 @@
     "Parameter1": [
       2001
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3003,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -289,11 +277,8 @@
     "Parameter1": [
       2001
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3003,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -324,11 +309,8 @@
     "Parameter1": [
       2001
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3003,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -359,11 +341,8 @@
     "Parameter1": [
       3001
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3004,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -394,11 +373,8 @@
     "Parameter1": [
       3001
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3004,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -429,11 +405,8 @@
     "Parameter1": [
       3001
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3004,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -464,11 +437,8 @@
     "Parameter1": [
       4001
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3005,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -499,11 +469,8 @@
     "Parameter1": [
       4001
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3005,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -534,11 +501,8 @@
     "Parameter1": [
       4001
     ],
-    "ConditionType2": 28,
+    "ConditionType2": 0,
-    "Parameter2": [
+    "Parameter2": [],
-      3005,
-      6000
-    ],
     "ConditionType3": 0,
     "Parameter3": [],
     "ConditionType4": 0,
@@ -1722,7 +1686,7 @@
     "Id": 1036,
     "Name": "更多的农田",
     "Type": 2,
-    "Describe": "建造四块农田",
+    "Describe": "建造四块农田。",
     "MainLine": 0,
     "ConditionType1": 1,
     "Parameter1": [
@@ -1750,6 +1714,70 @@
     "AddNpc": [],
     "AddMonster": []
   },
+  {
+    "Id": 1037,
+    "Name": "渔溪村奇遇(一)",
+    "Type": 2,
+    "Describe": "和渔溪村的杂货商交流之后得知最近有怪事发生。",
+    "MainLine": 0,
+    "ConditionType1": 1,
+    "Parameter1": [
+      1031
+    ],
+    "ConditionType2": 0,
+    "Parameter2": [],
+    "ConditionType3": 0,
+    "Parameter3": [],
+    "ConditionType4": 0,
+    "Parameter4": [],
+    "ReleaseType": 3,
+    "ReleaseTypeParameter": [],
+    "TaskStep": [
+      1037
+    ],
+    "GiveUp": false,
+    "Repeat": false,
+    "CD": 0,
+    "ReAccess": false,
+    "TimeLimit": 0,
+    "Award": 4040,
+    "AddVillager": [],
+    "AddWarrior": [],
+    "AddNpc": [],
+    "AddMonster": []
+  },
+  {
+    "Id": 1038,
+    "Name": "渔溪村奇遇(二)",
+    "Type": 2,
+    "Describe": "在渔溪村西边的桃花树下放一些糖。",
+    "MainLine": 0,
+    "ConditionType1": 1,
+    "Parameter1": [
+      1037
+    ],
+    "ConditionType2": 0,
+    "Parameter2": [],
+    "ConditionType3": 0,
+    "Parameter3": [],
+    "ConditionType4": 0,
+    "Parameter4": [],
+    "ReleaseType": 3,
+    "ReleaseTypeParameter": [],
+    "TaskStep": [
+      1038
+    ],
+    "GiveUp": false,
+    "Repeat": false,
+    "CD": 0,
+    "ReAccess": false,
+    "TimeLimit": 0,
+    "Award": 4041,
+    "AddVillager": [],
+    "AddWarrior": [],
+    "AddNpc": [],
+    "AddMonster": []
+  },
   {
     "Id": 2001,
     "Name": "解锁赤丘山",

src/api/config/TaskDialogueConfigCategory.json

@@ -405,6 +405,17 @@
       7
     ]
   },
+  {
+    "Id": 72,
+    "DialogueRole": 3,
+    "RoleParameter": 1072,
+    "Content": "鲁明严选，必是精品",
+    "NextDialogue": 0,
+    "NextOptions": [
+      1112,
+      7
+    ]
+  },
   {
     "Id": 101,
     "DialogueRole": 3,
@@ -1007,7 +1018,7 @@
   {
     "Id": 10023,
     "DialogueRole": 4,
-    "Content": "一棵桃树",
+    "Content": "在树下放一些糖试试吧",
     "NextDialogue": 0,
     "NextOptions": [
       7
@@ -1401,5 +1412,30 @@
     "NextOptions": [
       7
     ]
+  },
+  {
+    "Id": 10066,
+    "DialogueRole": 4,
+    "Content": "这几日总见一头蓝色小牛在村西头转悠，毛色油亮得像抹了层月光，可神气！",
+    "NextDialogue": 0,
+    "NextOptions": [
+      200001
+    ]
+  },
+  {
+    "Id": 10067,
+    "DialogueRole": 4,
+    "Content": "我瞧它似乎有灵智。且它一直围着桃花树转悠，怕不是被桃花的香甜气息吸引了。",
+    "NextDialogue": 10068,
+    "NextOptions": []
+  },
+  {
+    "Id": 10068,
+    "DialogueRole": 4,
+    "Content": "或许你可以在我这买些糖放到渔溪村西边的那棵桃花树下试试那小牛会不会出现。",
+    "NextDialogue": 0,
+    "NextOptions": [
+      200002
+    ]
   }
 ]

src/api/config/TaskStepConfigCategory.json

@@ -1168,6 +1168,41 @@
     "TargetDescribe": "建造{0}",
     "Number": true
   },
+  {
+    "Id": 1037,
+    "Describe": "和渔溪村杂货商对话",
+    "TargetType1": 16,
+    "TargetParameter1": [
+      1060,
+      200000
+    ],
+    "TargetType2": 0,
+    "TargetParameter2": [],
+    "TargetType3": 0,
+    "TargetParameter3": [],
+    "TargetType4": 0,
+    "TargetParameter4": [],
+    "TargetDescribe": "对话渔溪杂货商",
+    "Number": false
+  },
+  {
+    "Id": 1038,
+    "Describe": "在渔溪村西边的桃花树下放一些糖",
+    "TargetType1": 7,
+    "TargetParameter1": [
+      3002018,
+      4017,
+      200003
+    ],
+    "TargetType2": 0,
+    "TargetParameter2": [],
+    "TargetType3": 0,
+    "TargetParameter3": [],
+    "TargetType4": 0,
+    "TargetParameter4": [],
+    "TargetDescribe": "西边桃树下放糖",
+    "Number": false
+  },
   {
     "Id": 2001,
     "Describe": "打败[color=#009a04]赤丘山妖兽[/color]",

src/api/config/TextConfigCategory.json

@@ -891,7 +891,7 @@
   },
   {
     "Id": 1179,
-    "Text": "当前猪圈没有两只成年猪！",
+    "Text": "当前没有可选择的猪圈！",
     "Value": ""
   },
   {
@@ -1064,6 +1064,56 @@
     "Text": "兑换成功！请在邮件中领取！",
     "Value": ""
   },
+  {
+    "Id": 1214,
+    "Text": "保存蓝图将覆盖上一份，您确定要保存当前的蓝图吗？",
+    "Value": ""
+  },
+  {
+    "Id": 1215,
+    "Text": "该谷主未开通蓝图保存权限",
+    "Value": ""
+  },
+  {
+    "Id": 1216,
+    "Text": "已将当前设置的菜品存为预设",
+    "Value": ""
+  },
+  {
+    "Id": 1217,
+    "Text": "还未设置预设菜品",
+    "Value": ""
+  },
+  {
+    "Id": 1218,
+    "Text": "请选择村民！",
+    "Value": ""
+  },
+  {
+    "Id": 1219,
+    "Text": "需要长按图标并拖动以回收装饰品",
+    "Value": ""
+  },
+  {
+    "Id": 1220,
+    "Text": "当前没有预设菜品",
+    "Value": ""
+  },
+  {
+    "Id": 1221,
+    "Text": "已清空预设菜品",
+    "Value": ""
+  },
+  {
+    "Id": 1222,
+    "Text": "已将皮肤应用到所有同类建筑",
+    "Value": ""
+  },
+  {
+    "Id": 1223,
+    "Text": "只能选择3名勇士",
+    "Value": ""
+  },
   {
     "Id": 2001,
     "Text": "抵达中",
@@ -3101,7 +3151,7 @@
   },
   {
     "Id": 2409,
-    "Text": "您当前正在注销您的账号，请务必仔细阅读该文本后再执行操作！<br/>请注意，这不是重开，这不是重开，这不是重开，重要的事情说三遍！！！<br/>1.您当前正在注销的账号为当前正在登录的账号，注销后您将无法登录、使用该账号<br/>2.注销账号后，该账号及其关联的所有信息将会从数据库中彻底删除，包括但不限于以下零列的数据：<br/>      同一账号所有区服内的游戏记录与存档。<br/>      同一账号所有区服内的充值记录。<br/>3.当您注销成功后，系统将立即为您执行账号的删除，所有数据均无法再次恢复<br/>4.当您注销成功后，即使使用同样的方式再次执行注册，此时系统会将该账号视为新的用户账号，不会保留注销前账号的任何内容。",
+    "Text": "您当前正在注销您的账号，请务必仔细阅读该文本后再执行操作！<br/>请注意，这不是重开，这不是重开，这不是重开，重要的事情说三遍！！！<br/>1.您当前正在注销的账号为当前正在登录的账号，注销后您将无法登录、使用该账号<br/>2.注销账号后，该账号及其关联的所有信息将会从数据库中彻底删除，包括但不限于以下零列的数据：<br/>      所在区服内的游戏记录与存档。<br/>      所在区服内的充值记录。<br/>3.当您注销成功后，系统将立即为您执行账号的删除，所有数据均无法再次恢复<br/>4.当您注销成功后，即使使用同样的方式再次执行注册，此时系统会将该账号视为新的用户账号，不会保留注销前账号的任何内容。",
     "Value": ""
   },
   {
@@ -3109,6 +3159,21 @@
     "Text": "首充礼包改为这里了",
     "Value": ""
   },
+  {
+    "Id": 2411,
+    "Text": "注：设置预设菜品后勾选自动则每天会自动按照预设的菜品举办家宴",
+    "Value": ""
+  },
+  {
+    "Id": 2412,
+    "Text": "当前正在使用自动举办功能",
+    "Value": ""
+  },
+  {
+    "Id": 2413,
+    "Text": "当前正在使用预设菜品功能",
+    "Value": ""
+  },
   {
     "Id": 2901,
     "Text": "图鉴积分包括以下四个要素：<br/>建筑积分：包括建造建筑的积分和加固建筑的积分<br/>宝物积分：建筑上装备的宝物所提供的积分<br/>装饰品积分：解锁装饰品提供的积分<br/>皮肤积分：解锁建筑皮肤提供的积分<br/>当图鉴积分相同时，先上榜的人排在前面<br/>每日排行榜于每天晚上12点结算并发放奖励。",
@@ -3286,7 +3351,7 @@
   },
   {
     "Id": 2936,
-    "Text": "点击选择称号",
+    "Text": "未佩戴称号",
     "Value": ""
   },
   {
@@ -3414,6 +3479,121 @@
     "Text": "加固建筑和学习维修费用相关科技,可以大幅度降低维修费用",
     "Value": ""
   },
+  {
+    "Id": 2962,
+    "Text": "山谷安静的发展，物品自产自销。",
+    "Value": ""
+  },
+  {
+    "Id": 2963,
+    "Text": "生产物资支援七孤城的将士抵抗妖兽入侵。",
+    "Value": ""
+  },
+  {
+    "Id": 2964,
+    "Text": "获取方式：桃谷货郎定期来收购物品<br/>最大收益：每日预计50万<br/>获取难度：难<br/>该模式下：兵工坊不再产生订单",
+    "Value": ""
+  },
+  {
+    "Id": 2965,
+    "Text": "获取方式：每日生产订单(可离线）<br/>最大收益：每日预计50万<br/>获取难度：简单<br/>该模式下：桃谷货郎不再收购物品",
+    "Value": ""
+  },
+  {
+    "Id": 2966,
+    "Text": "您确定要切换到{【模式名称】}模式吗，切换后次日5:00生效",
+    "Value": ""
+  },
+  {
+    "Id": 2967,
+    "Text": "可添加木材，布料和金属锭类材料",
+    "Value": ""
+  },
+  {
+    "Id": 2968,
+    "Text": "可添加食物材料",
+    "Value": ""
+  },
+  {
+    "Id": 2969,
+    "Text": "今日已完成订单，明日5:00点刷新",
+    "Value": ""
+  },
+  {
+    "Id": 2970,
+    "Text": "材料已经足够生产订单需求，不需要再添加了",
+    "Value": ""
+  },
+  {
+    "Id": 2971,
+    "Text": "材料不足生产该订单，请补足材料",
+    "Value": ""
+  },
+  {
+    "Id": 2972,
+    "Text": "立绘还在优化中，请期待",
+    "Value": ""
+  },
+  {
+    "Id": 2973,
+    "Text": "选择劳力高的村民有利于比赛~",
+    "Value": ""
+  },
+  {
+    "Id": 2974,
+    "Text": "选择直系亲人有利于村民更好地比赛~",
+    "Value": ""
+  },
+  {
+    "Id": 2975,
+    "Text": "选择药品进行自动喂药",
+    "Value": ""
+  },
+  {
+    "Id": 2976,
+    "Text": "山谷有危险，请解除危险后再布局",
+    "Value": ""
+  },
+  {
+    "Id": 2977,
+    "Text": "此次操作会导致兵工坊生产订单的村民减少，将大幅度提升订单的耗时和降低订单的收益，您确定吗？",
+    "Value": ""
+  },
+  {
+    "Id": 2978,
+    "Text": "当前处于支援前线模式，货郎不再收购物品",
+    "Value": ""
+  },
+  {
+    "Id": 2979,
+    "Text": "村民数量不足15个，会影响生产订单的速度和最终的铜钱收益，您确定要开始生产订单吗？",
+    "Value": ""
+  },
+  {
+    "Id": 2980,
+    "Text": "山谷中出现危险，无法传送",
+    "Value": ""
+  },
+  {
+    "Id": 2981,
+    "Text": "您山谷的建筑已有{Num1}已经超过系统最大{Num2}的负荷，请拆除无用的建筑",
+    "Value": ""
+  },
+  {
+    "Id": 2982,
+    "Text": "您山谷的装饰物已有{Num1}已经超过系统最大{Num2}的负荷，请移除一些装饰物",
+    "Value": ""
+  },
+  {
+    "Id": 2983,
+    "Text": "您山谷的资源已有{Num1}已经超过系统最大{Num2}的负荷，请移除一些杂草",
+    "Value": ""
+  },
+  {
+    "Id": 2984,
+    "Text": "建造和装饰自由，一直是桃源记的特色。我们会持续优化存储方式，提高上限。",
+    "Value": ""
+  },
   {
     "Id": 3001,
     "Text": "撤销建造将返还所有材料，是否撤销建造该建筑？",
@@ -3551,7 +3731,7 @@
   },
   {
     "Id": 3028,
-    "Text": "20秒后兽潮将发起攻城，请做好准准备",
+    "Text": "20秒后兽潮将发起攻城，请做好准备",
     "Value": ""
   },
   {
@@ -3679,6 +3859,16 @@
     "Text": "使用成功，双倍已生效",
     "Value": ""
   },
+  {
+    "Id": 3054,
+    "Text": "勾选自动后将自动填充菜品并举办家宴，无法使用预设菜品功能",
+    "Value": ""
+  },
+  {
+    "Id": 3055,
+    "Text": "是否取消自动举办家宴，使用预设菜品功能？<br>注：设置预设菜品后将按照预设的方案自动举办家宴，若预设菜品全部消耗完后将停止举办家宴。",
+    "Value": ""
+  },
   {
     "Id": 4001,
     "Text": "你的鱼饵用完了",
@@ -4048,5 +4238,15 @@
     "Id": 7050,
     "Text": "低保已收到",
     "Value": ""
+  },
+  {
+    "Id": 8000,
+    "Text": "微风上纸鸢活动已结束！以下是谷主未领取的奖励~",
+    "Value": ""
+  },
+  {
+    "Id": 8001,
+    "Text": "桃谷龙舟赛活动已结束！以下是谷主未领取的奖励~",
+    "Value": ""
   }
 ]

src/api/config/TitleConfigCategory.json

@@ -1,110 +1,123 @@
 [
   {
-    "Id": 201,
+    "Id": 101,
     "Name": "四海为家",
-    "Requirement": "成就:四海皆闻桃源名",
+    "Requirement": "成就-四海皆闻桃源名",
     "RequirementTpye": 31,
     "IdAndType": [
       140000,
       1
     ],
     "Time": false,
-    "Level": 2,
+    "Level": 1,
-    "Skin": "Tiltle_Pictrue_201"
+    "Skin": "Tiltle_Pictrue_101"
   },
   {
-    "Id": 202,
+    "Id": 102,
     "Name": "大家族",
-    "Requirement": "成就:百家灯火续长明",
+    "Requirement": "成就-百家灯火续长明",
     "RequirementTpye": 31,
     "IdAndType": [
       140001,
       1
     ],
     "Time": false,
-    "Level": 2,
+    "Level": 1,
-    "Skin": "Tiltle_Pictrue_202"
+    "Skin": "Tiltle_Pictrue_102"
   },
   {
-    "Id": 203,
+    "Id": 103,
     "Name": "美食家",
-    "Requirement": "成就:千券化作炊烟去",
+    "Requirement": "成就-千券化作炊烟去",
     "RequirementTpye": 31,
     "IdAndType": [
       140007,
       1
     ],
     "Time": false,
-    "Level": 2,
+    "Level": 1,
-    "Skin": "Tiltle_Pictrue_203"
+    "Skin": "Tiltle_Pictrue_103"
   },
   {
-    "Id": 301,
+    "Id": 201,
     "Name": "捕鱼达人",
-    "Requirement": "成就:一竿钓尽武陵春",
+    "Requirement": "成就-一竿钓尽武陵春",
     "RequirementTpye": 31,
     "IdAndType": [
       140002,
       1
     ],
     "Time": false,
-    "Level": 3,
+    "Level": 2,
-    "Skin": "Tiltle_Pictrue_301"
+    "Skin": "Tiltle_Pictrue_201"
   },
   {
-    "Id": 401,
+    "Id": 202,
+    "Name": "粽横四海",
+    "Requirement": "桃谷龙舟赛活动获得",
+    "RequirementTpye": 31,
+    "IdAndType": [
+      140012,
+      1
+    ],
+    "Time": false,
+    "Level": 2,
+    "Skin": "Tiltle_Pictrue_202"
+  },
+  {
+    "Id": 301,
     "Name": "歌唱家",
-    "Requirement": "成就:比翼楼前拾遗羽",
+    "Requirement": "成就-比翼楼前拾遗羽",
     "RequirementTpye": 31,
     "IdAndType": [
       140003,
       1
     ],
     "Time": false,
-    "Level": 4,
+    "Level": 3,
-    "Skin": "Tiltle_Pictrue_401"
+    "Skin": "Tiltle_Pictrue_301"
   },
   {
-    "Id": 402,
+    "Id": 302,
     "Name": "满庭芳",
-    "Requirement": "成就:半百檐铃缀桃源",
+    "Requirement": "成就-半百檐铃缀桃源",
     "RequirementTpye": 31,
     "IdAndType": [
       140004,
       1
     ],
     "Time": false,
-    "Level": 4,
+    "Level": 3,
-    "Skin": "Tiltle_Pictrue_402"
+    "Skin": "Tiltle_Pictrue_302"
   },
   {
-    "Id": 403,
+    "Id": 303,
     "Name": "亿万富翁",
-    "Requirement": "成就:万贯春风扫落英",
+    "Requirement": "成就-万贯春风扫落英",
     "RequirementTpye": 31,
     "IdAndType": [
       140005,
       1
     ],
     "Time": false,
-    "Level": 4,
+    "Level": 3,
-    "Skin": "Tiltle_Pictrue_403"
+    "Skin": "Tiltle_Pictrue_303"
   },
   {
-    "Id": 404,
+    "Id": 304,
     "Name": "资深商人",
-    "Requirement": "成就:夜市点石成金手",
+    "Requirement": "成就-夜市点石成金手",
     "RequirementTpye": 31,
     "IdAndType": [
       140006,
       1
     ],
     "Time": false,
-    "Level": 4,
+    "Level": 3,
-    "Skin": "Tiltle_Pictrue_404"
+    "Skin": "Tiltle_Pictrue_304"
   },
   {
-    "Id": 501,
+    "Id": 401,
     "Name": "大佬",
     "Requirement": "累充2000元获得",
     "RequirementTpye": 31,
@@ -113,6 +126,45 @@
       1
     ],
     "Time": false,
+    "Level": 4,
+    "Skin": "Tiltle_Pictrue_401"
+  },
+  {
+    "Id": 402,
+    "Name": "龙的传人",
+    "Requirement": "成就-千姓共织桃源梦",
+    "RequirementTpye": 31,
+    "IdAndType": [
+      140009,
+      1
+    ],
+    "Time": false,
+    "Level": 4,
+    "Skin": "Tiltle_Pictrue_402"
+  },
+  {
+    "Id": 403,
+    "Name": "桃谷地仙",
+    "Requirement": "累充5000元答谢礼包",
+    "RequirementTpye": 31,
+    "IdAndType": [
+      140010,
+      1
+    ],
+    "Time": false,
+    "Level": 4,
+    "Skin": "Tiltle_Pictrue_403"
+  },
+  {
+    "Id": 501,
+    "Name": "桃谷天尊",
+    "Requirement": "累充10000元答谢礼包",
+    "RequirementTpye": 31,
+    "IdAndType": [
+      140011,
+      1
+    ],
+    "Time": false,
     "Level": 5,
     "Skin": "Tiltle_Pictrue_501"
   }

src/api/config/TreasureGenerationConfigCategory.json

@@ -82,5 +82,107 @@
     "GroupId": 2,
     "ItemId": 1205,
     "Weight": 1
+  },
+  {
+    "Id": 303,
+    "GroupId": 3,
+    "ItemId": 1007,
+    "Weight": 55
+  },
+  {
+    "Id": 304,
+    "GroupId": 3,
+    "ItemId": 1008,
+    "Weight": 20
+  },
+  {
+    "Id": 305,
+    "GroupId": 3,
+    "ItemId": 1009,
+    "Weight": 10
+  },
+  {
+    "Id": 306,
+    "GroupId": 3,
+    "ItemId": 1010,
+    "Weight": 55
+  },
+  {
+    "Id": 307,
+    "GroupId": 3,
+    "ItemId": 1011,
+    "Weight": 20
+  },
+  {
+    "Id": 308,
+    "GroupId": 3,
+    "ItemId": 1012,
+    "Weight": 10
+  },
+  {
+    "Id": 311,
+    "GroupId": 3,
+    "ItemId": 1019,
+    "Weight": 55
+  },
+  {
+    "Id": 312,
+    "GroupId": 3,
+    "ItemId": 1020,
+    "Weight": 20
+  },
+  {
+    "Id": 313,
+    "GroupId": 3,
+    "ItemId": 1021,
+    "Weight": 10
+  },
+  {
+    "Id": 314,
+    "GroupId": 3,
+    "ItemId": 1022,
+    "Weight": 55
+  },
+  {
+    "Id": 315,
+    "GroupId": 3,
+    "ItemId": 1023,
+    "Weight": 20
+  },
+  {
+    "Id": 316,
+    "GroupId": 3,
+    "ItemId": 1024,
+    "Weight": 10
+  },
+  {
+    "Id": 317,
+    "GroupId": 3,
+    "ItemId": 1025,
+    "Weight": 2
+  },
+  {
+    "Id": 318,
+    "GroupId": 3,
+    "ItemId": 1026,
+    "Weight": 1
+  },
+  {
+    "Id": 319,
+    "GroupId": 3,
+    "ItemId": 1028,
+    "Weight": 3
+  },
+  {
+    "Id": 320,
+    "GroupId": 3,
+    "ItemId": 1029,
+    "Weight": 2
+  },
+  {
+    "Id": 321,
+    "GroupId": 3,
+    "ItemId": 1204,
+    "Weight": 1
   }
 ]

src/api/config/TreasureSynthesisConfigCategory.json

@@ -69,6 +69,48 @@
     "ItemId": 1011,
     "Num": 3
   },
+  {
+    "Id": 11,
+    "Name": "凡品变石",
+    "MixtureId": 1031,
+    "ItemId": 1009,
+    "Num": 4
+  },
+  {
+    "Id": 12,
+    "Name": "精品变石",
+    "MixtureId": 1032,
+    "ItemId": 1031,
+    "Num": 4
+  },
+  {
+    "Id": 13,
+    "Name": "极品变石",
+    "MixtureId": 1033,
+    "ItemId": 1032,
+    "Num": 4
+  },
+  {
+    "Id": 14,
+    "Name": "凡品钻石",
+    "MixtureId": 1034,
+    "ItemId": 1012,
+    "Num": 4
+  },
+  {
+    "Id": 15,
+    "Name": "精品钻石",
+    "MixtureId": 1035,
+    "ItemId": 1034,
+    "Num": 4
+  },
+  {
+    "Id": 16,
+    "Name": "极品钻石",
+    "MixtureId": 1036,
+    "ItemId": 1035,
+    "Num": 4
+  },
   {
     "Id": 1001,
     "Name": "精品鸡血石",
@@ -139,6 +181,48 @@
     "ItemId": 1023,
     "Num": 3
   },
+  {
+    "Id": 1011,
+    "Name": "凡品玛瑙",
+    "MixtureId": 1037,
+    "ItemId": 1021,
+    "Num": 4
+  },
+  {
+    "Id": 1012,
+    "Name": "精品玛瑙",
+    "MixtureId": 1038,
+    "ItemId": 1037,
+    "Num": 4
+  },
+  {
+    "Id": 1013,
+    "Name": "极品玛瑙",
+    "MixtureId": 1039,
+    "ItemId": 1038,
+    "Num": 4
+  },
+  {
+    "Id": 1014,
+    "Name": "凡品珍珠",
+    "MixtureId": 1040,
+    "ItemId": 1024,
+    "Num": 4
+  },
+  {
+    "Id": 1015,
+    "Name": "精品珍珠",
+    "MixtureId": 1041,
+    "ItemId": 1040,
+    "Num": 4
+  },
+  {
+    "Id": 1016,
+    "Name": "极品珍珠",
+    "MixtureId": 1042,
+    "ItemId": 1041,
+    "Num": 4
+  },
   {
     "Id": 3001,
     "Name": "精品翡翠",
@@ -167,6 +251,48 @@
     "ItemId": 1029,
     "Num": 3
   },
+  {
+    "Id": 3005,
+    "Name": "凡品绿松石",
+    "MixtureId": 1043,
+    "ItemId": 1027,
+    "Num": 4
+  },
+  {
+    "Id": 3006,
+    "Name": "精品绿松石",
+    "MixtureId": 1044,
+    "ItemId": 1043,
+    "Num": 4
+  },
+  {
+    "Id": 3007,
+    "Name": "极品绿松石",
+    "MixtureId": 1045,
+    "ItemId": 1044,
+    "Num": 4
+  },
+  {
+    "Id": 3008,
+    "Name": "凡品寿山石",
+    "MixtureId": 1046,
+    "ItemId": 1030,
+    "Num": 4
+  },
+  {
+    "Id": 3009,
+    "Name": "精品寿山石",
+    "MixtureId": 1047,
+    "ItemId": 1046,
+    "Num": 4
+  },
+  {
+    "Id": 3010,
+    "Name": "极品寿山石",
+    "MixtureId": 1048,
+    "ItemId": 1047,
+    "Num": 4
+  },
   {
     "Id": 4001,
     "Name": "精品寻木枝",

src/api/config/TreasureSynthesisGroupConfigCategory.json

@@ -110,5 +110,65 @@
       5001,
       5002
     ]
+  },
+  {
+    "Id": 13,
+    "Name": "变石",
+    "Type": 1,
+    "SubFormula": [
+      11,
+      12,
+      13
+    ]
+  },
+  {
+    "Id": 14,
+    "Name": "钻石",
+    "Type": 1,
+    "SubFormula": [
+      14,
+      15,
+      16
+    ]
+  },
+  {
+    "Id": 15,
+    "Name": "玛瑙",
+    "Type": 2,
+    "SubFormula": [
+      1011,
+      1012,
+      1013
+    ]
+  },
+  {
+    "Id": 16,
+    "Name": "珍珠",
+    "Type": 2,
+    "SubFormula": [
+      1014,
+      1015,
+      1016
+    ]
+  },
+  {
+    "Id": 17,
+    "Name": "绿松石",
+    "Type": 3,
+    "SubFormula": [
+      3005,
+      3006,
+      3007
+    ]
+  },
+  {
+    "Id": 18,
+    "Name": "寿山石",
+    "Type": 3,
+    "SubFormula": [
+      3008,
+      3009,
+      3010
+    ]
   }
 ]

src/api/config/ValleyEffectConfigCategory.json

@@ -268,7 +268,7 @@
     "EffectParm": [],
     "NeedShow": true,
     "IconFile": "Valley_Effect_18",
-    "Description": "桃谷货郎收购时获得铜钱提升30%"
+    "Description": "桃谷货郎收购/订单完成时获得铜钱提升30%"
   },
   {
     "Id": 19,
@@ -345,7 +345,7 @@
     "EffectParm": [],
     "NeedShow": true,
     "IconFile": "Valley_Effect_18",
-    "Description": "桃谷货郎收购时获得铜钱提升70%"
+    "Description": "桃谷货郎收购/订单完成时获得铜钱提升70%"
   },
   {
     "Id": 30,
@@ -361,23 +361,7 @@
     "EffectParm": [],
     "NeedShow": true,
     "IconFile": "Valley_Effect_18",
-    "Description": "桃谷货郎收购时获得铜钱提升110%"
+    "Description": "桃谷货郎收购/订单完成时获得铜钱提升110%"
-  },
-  {
-    "Id": 31,
-    "Name": "财源滚滚",
-    "EffectSource": 6,
-    "Enable": true,
-    "Gain": 1,
-    "Level": 4,
-    "Group": 18,
-    "EffectType": 35,
-    "CalType": 2,
-    "Parameter": 250,
-    "EffectParm": [],
-    "NeedShow": true,
-    "IconFile": "Valley_Effect_18",
-    "Description": "桃谷货郎收购时获得铜钱提升150%"
   },
   {
     "Id": 101,

src/api/config/WarriorConfigCategory.json

@@ -50,6 +50,7 @@
     "HeadIcon": "WarriorHead_qiaodn_1",
     "PrefabName": "Warrior_Lead_M",
     "Picture": "Warrior_Picture_1",
+    "Open": true,
     "DefaultWeaponSkin": "weapon_dajian_0",
     "Introduce": "出身在小渔村的寻常渔民家，从小就活泼好动，主意多。是不折不扣孩子王。曾经和青梅竹马的陶小青一起吃下不死树的果子，变成不会死亡的勇士。"
   },
@@ -106,6 +107,7 @@
     "HeadIcon": "WarriorHead_yanggy_2",
     "PrefabName": "Warrior_Lead_F",
     "Picture": "Warrior_Picture_2",
+    "Open": false,
     "DefaultWeaponSkin": "weapon_feibiao_0",
     "Introduce": "出身于小渔村的寻常渔民家，与乔河是青梅竹马。很喜欢在溪边和乔河用石头打水漂嬉闹。一次外出和大家分散后进入了妖云密布的山谷，饥肠辘辘，孤立无援，在一棵树下捡到了果子并吃下想要恢复体力，意外成为了不会死亡的勇士。"
   },
@@ -160,6 +162,7 @@
     "HeadIcon": "WarriorHead_liler_3",
     "PrefabName": "Warrior_4",
     "Picture": "Warrior_Picture_3",
+    "Open": false,
     "DefaultWeaponSkin": "weapon_gongjian_0",
     "Introduce": "出身猎户家，从小跟着父辈打猎为生。拥有出众的弓射技巧，少年时期就能击杀比她大好几倍的妖兽。在一次妖兽袭击中，和家人分散以后便四处流浪。"
   },
@@ -214,6 +217,7 @@
     "HeadIcon": "WarriorHead_mengh_5",
     "PrefabName": "Warrior_1",
     "Picture": "Warrior_Picture_4",
+    "Open": true,
     "DefaultWeaponSkin": "weapon_chuizi_0",
     "Introduce": "原本是小镇上一家铁匠铺的学徒，有助人为乐的热心肠。妖兽乱世后，独自一人走上斩妖屠魔的道路。"
   },
@@ -268,6 +272,7 @@
     "HeadIcon": "WarriorHead_hanf_6",
     "PrefabName": "Warrior_3",
     "Picture": "Warrior_Picture_5",
+    "Open": false,
     "DefaultWeaponSkin": "weapon_gun_0",
     "Introduce": "原本是个驯兽师，常年和食铁兽为伴。妖兽乱世后，食铁兽牺牲了。她凭借长期和各种野兽搏斗的技巧，独自一人走上屠妖的旅途。"
   },
@@ -322,6 +327,7 @@
     "HeadIcon": "WarriorHead_murongw_7",
     "PrefabName": "Warrior_2",
     "Picture": "Warrior_Picture_6",
+    "Open": false,
     "DefaultWeaponSkin": "weapon_shangdao_0",
     "Introduce": "慕容家世代经营药铺，并行医。家乡被妖兽毁坏后，被迫四处流浪。精通各种草药知识，并拥有很精湛的医术。"
   },
@@ -376,6 +382,7 @@
     "HeadIcon": "WarriorHead_luliu",
     "PrefabName": "Warrior_5",
     "Picture": "Warrior_Picture_7",
+    "Open": true,
     "DefaultWeaponSkin": "weapon_chanzhang_0",
     "Introduce": "身份不明的小沙弥，似乎和拥有不老不死能力的轩辕国有莫大的关系。妖兽乱世后，心地善良的他四处救助受难的人们，被称为“童菩萨”。"
   },
@@ -384,7 +391,7 @@
     "FirstName": "啾",
     "Name": "啾",
     "ArmsLimit": 9,
-    "Gender": 2,
+    "Gender": 1,
     "CombatPower": 2000,
     "Age": 11,
     "Labor": 2,
@@ -430,6 +437,7 @@
     "HeadIcon": "WarriorHead_Jiu",
     "PrefabName": "Warrior_6",
     "Picture": "Warrior_Picture_8",
+    "Open": true,
     "DefaultWeaponSkin": "weapon_quantao_0",
     "Introduce": "出生时因形貌怪异被遗弃，后被猴群养育长大。吃了一种有别于不死果的物品，也拥有不死的能力。在一次与妖兽搏斗中受伤，被陶先生所救。"
   },
@@ -484,6 +492,7 @@
     "HeadIcon": "WarriorHead_xiaogui",
     "PrefabName": "Warrior_9",
     "Picture": "Warrior_Picture_9",
+    "Open": true,
     "DefaultWeaponSkin": "weapon_bangchui_0",
     "Introduce": ""
   }

src/api/config/WorldParametersConfigCategory.json

@@ -281,7 +281,8 @@
     "VisitorGenderRateIncrease": 25,
     "MarketOpenTime": 1830,
     "TeamSkillCD": 60,
-    "TeamSkillVal": 100000000,
+    "TeamSkillVal": 650000,
+    "TeamSkillRange": 20,
     "DrugSupply": 4,
     "NewVilliagePos": {
       "x": -46,
@@ -358,9 +359,9 @@
       "Sound_Dog"
     ],
     "DogSoundInterval": 5,
-    "PigMaximmums": 5,
+    "PigMaximmums": 3,
     "RefineInterval": 0.3,
-    "DmgReduceLimit": 50,
+    "DmgReduceLimit": 95,
     "DodgeLimit": 140,
     "CritRateLimit": 50,
     "DmgReboundLimit": 50,
@@ -372,12 +373,15 @@
     "CoinIncomeCap": 500000,
     "TaohuashiIncomCap": 100,
     "DaijinquanIncomCap": 10,
-    "BlueprintCap": 3,
+    "BlueprintCap": 1,
-    "BlueprintPurchaseLimit": 3,
+    "BlueprintPurchaseLimit": 1,
     "NormalSweep": 4,
     "VipSweep": 1,
     "RenameMoney": 500,
     "ConversionCost": 100,
-    "DiscountItemNum": 1
+    "DiscountItemNum": 1,
+    "BuildNumMax": 1500,
+    "DecorationNumMax": 5000,
+    "ResourcesNumMax": 1500
   }
 ]

src/api/game/index.ts

@@ -131,14 +131,6 @@ export function gameSetclientgm(params: object) {
     params: params,
   });
 }
-//
-// export function gameListGm(params: object) {
-//   return request({
-//     url: '/api/v1/game/mange/listgm',
-//     method: 'get',
-//     params: params,
-//   });
-// }
 
 export function gameDeposit(params: object) {
   return request({
@@ -957,7 +949,6 @@ export function getTransactionId(params: object) {
   });
 }
 
-
 export function getGameRank(params: object) {
   return request({
     url: '/api/v1/game/rank/getGameRank',
@@ -965,3 +956,11 @@ export function getGameRank(params: object) {
     params: params,
   });
 }
+
+export function setOpenId(params: object) {
+  return request({
+    url: '/frontApi/game/setOpenId',
+    method: 'get',
+    params: params,
+  });
+}

src/views/gameCCD/version/index.vue

@@ -43,6 +43,7 @@
         <el-row justify="space-evenly">
           <el-pagination :hide-on-single-page="true" v-model:page-size="tableData.search.pageSize" :pager-count="5"
                          layout="total, prev, pager, next" :total="tableData.total"
+                         v-model:page-count="tableData.search.pageNum"
                          @current-change="handleCurrentChange"/>
         </el-row>
       </div>

src/views/gameManage/gm/index.vue

@@ -66,12 +66,24 @@
 				</el-form>
 			</div>
 		</el-card>
+		<el-card shadow="hover" header="添加先行服账号白名单">
+			<div class="game-order-search mb15">
+				<el-form label-position="right" label-width="300px" style="max-width: 800px">
+					<el-form-item label="账号">
+						<el-input v-model="tableData.queryOpenIds" type="textarea" placeholder="填写openId,封号';'隔开" class="w-50 m-2" size="large" clearable />
+					</el-form-item>
+					<el-form-item>
+						<el-button size="large" type="primary" class="ml10" @click="setOpenIds">添加</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</el-card>
 	</div>
 </template>
 
 <script lang="ts">
 import { toRefs, reactive, onMounted, defineComponent } from 'vue';
-import { gameChangeGm, gameGmSearch, gameSetclientgm } from '/@/api/game';
+import { gameChangeGm, gameGmSearch, gameSetclientgm, setOpenId } from '/@/api/game';
 import { channelList, ServerCategorize, serverList } from '/@/utils/game';
 import { gSwitchServer } from '/@/utils/utils';
 import { ElMessage } from 'element-plus/es';
@@ -103,6 +115,7 @@ interface TableDataState {
 		data: TableData;
 		list: object[];
 		blackList: object[];
+		queryOpenIds: string;
 	};
 	servers: object;
 	channels: object;
@@ -186,6 +199,13 @@ export default defineComponent({
 				})
 				.finally(() => {});
 		};
+		const setOpenIds = () => {
+			setOpenId({ openId: state.tableData.queryOpenIds, initUnit: 3 })
+				.then(() => {
+					ElMessage.success('修改成功');
+				})
+				.finally(() => {});
+		};
 
 		const blacklist = (val: number) => {
 			state.tableData.blackQuerys.pageNum = val;
@@ -207,6 +227,7 @@ export default defineComponent({
 			switchServer,
 			gmSearch,
 			gmChange,
+			setOpenIds,
 			setclientgm,
 			blacklist,
 			...toRefs(state),

src/views/gameNotice/pop/index.vue

@@ -6,14 +6,14 @@
 					<el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
 						<el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value" />
 					</el-select>
-					<el-select v-model="tableData.param.servers" class="m-2" placeholder="选择服务器" size="large" multiple clearable>
+					<el-select v-model="tableData.param.servers"  class="m-2" placeholder="选择服务器" size="large" multiple collapse-tags clearable>
 						<el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id" />
 					</el-select>
 				</el-form-item>
 			</el-form>
 			<el-form label-width="90px">
-				<el-form-item label="类型：" style="width: 25%">
+				<el-form-item label="类型：" style="max-width: 800px">
-					<el-radio-group v-model="tableData.param.popType">
+					<el-radio-group v-model="tableData.param.popType"  style="max-width: 800px">
 						<el-radio :label="1">普通弹窗</el-radio>
 						<el-radio :label="2">强制退到登录</el-radio>
 						<el-radio :label="3">强制退到公告</el-radio>

src/views/gameOrder/rechargeControl/index.vue

@@ -8,15 +8,24 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="seven" label="支付">
+					<template #header>
+						支付
+						<el-button type="info" size="small" plain @click="add(-1)">全部关闭</el-button>
+						<el-button type="success" size="small" @click="del(-1)">全部打开</el-button>
+					</template>
 					<template #default="scope">
-            <div v-if="!tableData.data.find(r=>r.channel == scope.row.value)">
+						<div v-if="!tableData.data.find((r) => r.channel == scope.row.value)">
 							<el-button type="success" size="small" circle @click="add(scope.row.value)">
-                <el-icon><ele-Check/></el-icon>
+								<el-icon>
+									<ele-Check />
+								</el-icon>
 							</el-button>
 						</div>
-            <div v-if="tableData.data.find(r=>r.channel == scope.row.value)">
+						<div v-if="tableData.data.find((r) => r.channel == scope.row.value)">
 							<el-button type="info" size="small" circle plain @click="del(scope.row.value)">
-                <el-icon><ele-Close/></el-icon>
+								<el-icon>
+									<ele-Close />
+								</el-icon>
 							</el-button>
 						</div>
 					</template>
@@ -27,14 +36,11 @@
 </template>
 
 <script lang="ts">
-import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
+import { toRefs, reactive, onMounted, defineComponent } from 'vue';
-import {
+import { gameRechargeControlAdd, gameRechargeControlDelete, gameRechargeControlList } from '/@/api/game/index';
-  gameRechargeControlAdd,
+import { channelList, ChannelList } from '/@/utils/game';
-  gameRechargeControlDelete,
+
-  gameRechargeControlList
+// import {ElMessageBox} from "element-plus/es";
-} from "/@/api/game/index";
-import {channelList, ChannelList} from "/@/utils/game";
-import {ElMessageBox} from "element-plus/es";
 
 interface TableData {
 	id: number;
@@ -53,50 +59,72 @@ export default defineComponent({
 	setup() {
 		const state = reactive<TableDataState>({
 			tableData: {
-        data: []
+				data: [],
 			},
 			channels: ChannelList,
 		});
 
 		const getRemain = () => {
-      gameRechargeControlList({}).then(res => {
+			gameRechargeControlList({}).then((res) => {
 				console.log(res);
-        state.tableData.data = res.data.list || []
+				state.tableData.data = res.data.list || [];
-      })
+			});
 		};
 		const add = (value: any) => {
-
+			// ElMessageBox.confirm("是否确认添加充值拦截？", '提示', {
-      ElMessageBox.confirm("是否确认添加充值拦截？", '提示', {
+			//   confirmButtonText: '确认',
-        confirmButtonText: '确认',
+			//   cancelButtonText: '取消',
-        cancelButtonText: '取消',
+			//   type: 'warning',
-        type: 'warning',
+			// }).then(() => {
-      }).then(() => {
+			if (value == -1) {
-        gameRechargeControlAdd({channel: value}).then(res => {
+				for (let i in state.channels) {
-          console.log(res)
+					gameRechargeControlAdd({ channel: state.channels[i].value })
+						.then((res) => {
+							console.log(res);
 							getRemain();
-        }).finally(() => {
+						})
-        });
+						.finally(() => {});
-      });
+				}
+				return;
+			}
+			gameRechargeControlAdd({ channel: value })
+				.then((res) => {
+					console.log(res);
+					getRemain();
+				})
+				.finally(() => {});
+			// });
 		};
 		const del = (value: any) => {
-      ElMessageBox.confirm("是否确认去除充值拦截？", '提示', {
+			// ElMessageBox.confirm("是否确认去除充值拦截？", '提示', {
-        confirmButtonText: '确认',
+			//   confirmButtonText: '确认',
-        cancelButtonText: '取消',
+			//   cancelButtonText: '取消',
-        type: 'warning',
+			//   type: 'warning',
-      }).then(() => {
+			// }).then(() => {
-        gameRechargeControlDelete({channel: value}).then(res => {
+			if (value == -1) {
-          console.log(res)
+				for (let i in state.channels) {
+					gameRechargeControlDelete({ channel: state.channels[i].value })
+						.then((res) => {
+							console.log(res);
 							getRemain();
-        }).finally(() => {
+						})
-        });
+						.finally(() => {});
-      });
+				}
+				return;
+			}
+			gameRechargeControlDelete({ channel: value })
+				.then((res) => {
+					console.log(res);
+					getRemain();
+				})
+				.finally(() => {});
+			// });
 		};
 		onMounted(function () {
-
 			channelList().then((res) => {
-        state.channels = res
+				state.channels = res;
-      })
+			});
-      getRemain()
+			getRemain();
 		});
 
 		return {

src/views/gameRole/rank/index.vue

@@ -1,7 +1,7 @@
 <template>
-	<div class="system-edit-post-container">
+	<div class="game-maintenance-container">
-		<el-form ref="formRef" size="default" label-width="90px">
+		<el-form shadow="hover" label-width="90px">
-			<el-card shadow="hover" header="排行榜">
+			<el-card header="排行榜">
 				<el-form :inline="true">
 					<el-form-item label="选择服务器" prop="serverId">
 						<el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
@@ -17,7 +17,7 @@
 						</el-select>
 					</el-form-item>
 					<el-form-item>
-						<el-button size="default" type="primary" class="ml10" @click="onSubmit">
+						<el-button size="default" type="primary" class="ml10" @click="onList">
 							<el-icon>
 								<ele-Search />
 							</el-icon>
@@ -25,19 +25,21 @@
 						</el-button>
 					</el-form-item>
 				</el-form>
-				<el-table :data="tableData.data" style="width: 100%">
+				<el-table :data="tableData.data" style="width: 100%" stripe border>
-					<el-table-column type="index" label="序号" width="60" />
+					<el-table-column type="index" label="序号" width="80" />
-					<el-table-column prop="id" label="UnitId" show-overflow-tooltip></el-table-column>
+					<el-table-column prop="uid" label="uid" show-overflow-tooltip></el-table-column>
-					<el-table-column prop="Name" label="Name" show-overflow-tooltip></el-table-column>
+					<el-table-column prop="StringId" label="id" show-overflow-tooltip></el-table-column>
-					<el-table-column prop="Scale" label="Scale" show-overflow-tooltip></el-table-column>
+					<el-table-column prop="UnitId" label="id" show-overflow-tooltip></el-table-column>
-					<el-table-column prop="Value" label="Value" show-overflow-tooltip></el-table-column>
+					<el-table-column prop="Name" label="名称" show-overflow-tooltip></el-table-column>
+					<el-table-column prop="Scale" label="规模" show-overflow-tooltip></el-table-column>
+					<el-table-column prop="Value" label="数值" show-overflow-tooltip></el-table-column>
 				</el-table>
 			</el-card>
 		</el-form>
 	</div>
 </template>
 <script lang="ts">
-import { reactive, toRefs, defineComponent, ref, unref, onMounted } from 'vue';
+import { reactive, toRefs, defineComponent, onMounted } from 'vue';
 import { getGameRank } from '/@/api/game';
 import { ElMessage, ElLoading } from 'element-plus';
 import { serverList, ServerCategorize } from '/@/utils/game';
@@ -59,9 +61,8 @@ interface TableDataState {
 }
 
 export default defineComponent({
-	name: 'apiV1GameRankGameRank',
+	name: 'apiV1GameRoleRank',
 	setup: function () {
-		const formRef = ref<HTMLElement | null>(null);
 		const state = reactive<TableDataState>({
 			tableData: {
 				param: {
@@ -76,20 +77,12 @@ export default defineComponent({
 			serverCategorize: ServerCategorize,
 		});
 
-		const onSubmit = () => {
+		const onList = () => {
 			const loading = ElLoading.service({
 				lock: true,
 				text: 'Loading',
 				background: 'rgba(0, 0, 0, 0.7)',
 			});
-			const formWrap = unref(formRef) as any;
-			if (!formWrap) return;
-			formWrap.validate((valid: boolean) => {
-				if (!valid) {
-					ElMessage.error('还有配置未填写');
-					loading.close();
-					return;
-				}
 
 			getGameRank(state.tableData.param)
 				.then((res) => {
@@ -98,21 +91,18 @@ export default defineComponent({
 						ElMessage.success('排行榜获取失败');
 						return;
 					}
-						state.tableData.data = res.data.list[0].Children;
+					state.tableData.data = res.data.list[0].Children.filter(r => r._t.indexOf('Rank') > -1);
 					state.tableData.data.sort((a, b) => {
-							a.Value - b.Value;
+						return b.Value - a.Value;
 					});
 				})
 				.finally(() => {
 					loading.close();
 				});
-				return;
-			});
 		};
 		// 页面加载时
 		onMounted(() => {
 			serverList().then((res) => {
-				// console.log(res);
 				state.servers = res;
 			});
 		});
@@ -121,8 +111,7 @@ export default defineComponent({
 		};
 		return {
 			switchServer,
-			onSubmit,
+      onList,
-			formRef,
 			...toRefs(state),
 		};
 	},

src/views/gameRole/role/index.vue

@@ -351,7 +351,7 @@
               v-model:page-size="queryParams.itemPageSize"
               v-model:current-page="queryParams.itemPageNum"
               :pager-count="5"
-              @current-change="itemPage"
+              @current-change="itemRecord"
               layout="total, prev, pager, next"
               :total="queryParams.itemTotal"
           />