config

src/api/config/AchievementsConfigCategory.json

@@ -247,6 +247,63 @@
     "RewareId4": 0,
     "RewardNumber4": 0
   },
+  {
+    "AchievementsId": 14,
+    "AchievementsName": "桃源宴宴庆良缘",
+    "AchievementsType": 1,
+    "IsProgress": true,
+    "Describe": "举办喜宴{0}次",
+    "RequirementTpye": 46,
+    "TargetType": [
+      99
+    ],
+    "RewareId1": 210000,
+    "RewardNumber1": 20000,
+    "RewareId2": 140013,
+    "RewardNumber2": 1,
+    "RewareId3": 0,
+    "RewardNumber3": 0,
+    "RewareId4": 0,
+    "RewardNumber4": 0
+  },
+  {
+    "AchievementsId": 15,
+    "AchievementsName": "十方共济庆同舟",
+    "AchievementsType": 1,
+    "IsProgress": true,
+    "Describe": "举办同济宴{0}次",
+    "RequirementTpye": 47,
+    "TargetType": [
+      10
+    ],
+    "RewareId1": 210000,
+    "RewardNumber1": 20000,
+    "RewareId2": 0,
+    "RewardNumber2": 0,
+    "RewareId3": 0,
+    "RewardNumber3": 0,
+    "RewareId4": 0,
+    "RewardNumber4": 0
+  },
+  {
+    "AchievementsId": 16,
+    "AchievementsName": "火树银花落桃川",
+    "AchievementsType": 1,
+    "IsProgress": true,
+    "Describe": "燃放烟花{0}次",
+    "RequirementTpye": 48,
+    "TargetType": [
+      100
+    ],
+    "RewareId1": 210000,
+    "RewardNumber1": 20000,
+    "RewareId2": 0,
+    "RewardNumber2": 0,
+    "RewareId3": 0,
+    "RewardNumber3": 0,
+    "RewareId4": 0,
+    "RewardNumber4": 0
+  },
   {
     "AchievementsId": 2001,
     "AchievementsName": "桃谷春秋贮万粟",

src/api/config/ArtResourcesConfigCategory.json

@@ -504,5 +504,38 @@
       "Resource_31_1",
       "Resource_31_1"
     ]
+  },
+  {
+    "Id": 59,
+    "ParentId": 10,
+    "Shape": "Resource_10",
+    "SeasonShape": [
+      "Resource_10",
+      "Resource_10",
+      "Resource_10",
+      "Resource_10"
+    ]
+  },
+  {
+    "Id": 60,
+    "ParentId": 28,
+    "Shape": "Resource_28",
+    "SeasonShape": [
+      "Resource_28",
+      "Resource_28",
+      "Resource_28",
+      "Resource_28"
+    ]
+  },
+  {
+    "Id": 61,
+    "ParentId": 29,
+    "Shape": "Resource_29",
+    "SeasonShape": [
+      "Resource_29",
+      "Resource_29",
+      "Resource_29",
+      "Resource_29"
+    ]
   }
 ]

src/api/config/AttributesConfigCategory.json

@@ -494,6 +494,15 @@
     "ChangeSpecialEffects": false,
     "ShowType": 1
   },
+  {
+    "Id": 1502,
+    "Name": "设置生命",
+    "Field": "SetHp",
+    "IsFloat": false,
+    "IsNumeric": false,
+    "ChangeSpecialEffects": false,
+    "ShowType": 1
+  },
   {
     "Id": 2000,
     "Name": "攻击下限",
@@ -1150,5 +1159,59 @@
     "IsNumeric": false,
     "ChangeSpecialEffects": false,
     "ShowType": 1
+  },
+  {
+    "Id": 30001,
+    "Name": "远程伤害",
+    "Field": "RangedDMG",
+    "IsFloat": true,
+    "IsNumeric": true,
+    "ChangeSpecialEffects": false,
+    "ShowType": 2
+  },
+  {
+    "Id": 30002,
+    "Name": "近战伤害",
+    "Field": "MeleeDMG",
+    "IsFloat": true,
+    "IsNumeric": true,
+    "ChangeSpecialEffects": false,
+    "ShowType": 2
+  },
+  {
+    "Id": 33001,
+    "Name": "受到暴击伤害提高",
+    "Field": "CritBeHurt",
+    "IsFloat": true,
+    "IsNumeric": true,
+    "ChangeSpecialEffects": false,
+    "ShowType": 2
+  },
+  {
+    "Id": 33002,
+    "Name": "受到远程攻击伤害提高",
+    "Field": "RangedBeHurt",
+    "IsFloat": true,
+    "IsNumeric": true,
+    "ChangeSpecialEffects": false,
+    "ShowType": 2
+  },
+  {
+    "Id": 33003,
+    "Name": "受到近战攻击伤害提高",
+    "Field": "MeleeBeHurt",
+    "IsFloat": true,
+    "IsNumeric": true,
+    "ChangeSpecialEffects": false,
+    "ShowType": 2
+  },
+  {
+    "Id": 33004,
+    "Name": "召唤怪物组",
+    "Field": "SummonMonster",
+    "IsFloat": false,
+    "IsNumeric": false,
+    "ChangeSpecialEffects": false,
+    "ShowType": 1
   }
 ]

src/api/config/BuildFunctionConfigCategory.json

@@ -78,6 +78,15 @@
     "DwellNumber": 0,
     "Impression": 100
   },
+  {
+    "Id": 85,
+    "ResourcesPointId": 0,
+    "ItemConversion": [
+      0
+    ],
+    "DwellNumber": 20,
+    "LifeExp": 80
+  },
   {
     "Id": 105,
     "ResourcesPointId": 0,
@@ -559,7 +568,9 @@
     "Id": 500,
     "ResourcesPointId": 0,
     "ItemConversion": [
-      3030
+      3030,
+      2052,
+      2053
     ]
   },
   {
@@ -780,6 +791,13 @@
       0
     ]
   },
+  {
+    "Id": 676,
+    "ResourcesPointId": 0,
+    "ItemConversion": [
+      0
+    ]
+  },
   {
     "Id": 1000,
     "ResourcesPointId": 210,

src/api/config/CommonShopConfigCategory.json

@@ -490,5 +490,17 @@
     "Discount": 80,
     "DiscountWeight": 10,
     "RefreshCycle": 1
+  },
+  {
+    "Id": 42,
+    "ItemId": 7079,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "Number": 1,
+    "Currency": 2,
+    "Price": 200,
+    "Discount": 80,
+    "DiscountWeight": 10,
+    "RefreshCycle": 0
   }
 ]

src/api/config/DailyTaskConfigCategory.json

@@ -61,5 +61,14 @@
     "TargetParameter": 1,
     "PointGet": 20,
     "UnlockScale": 4
+  },
+  {
+    "Id": 13,
+    "TaskName": "举办一次喜宴",
+    "Description": "举办喜宴",
+    "TargetType": 17,
+    "TargetParameter": 1,
+    "PointGet": 20,
+    "UnlockScale": 21
   }
 ]

src/api/config/DecorationsConfigCategory.json

@@ -2,6 +2,8 @@
   {
     "Id": 1,
     "Name": "青石踏",
+    "FunctionType": 1,
+    "TabType": 1,
     "Type": 2,
     "Manual": true,
     "Order": 2,
@@ -28,6 +30,8 @@
   {
     "Id": 2,
     "Name": "碎石手推车",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 3,
@@ -47,6 +51,8 @@
   {
     "Id": 3,
     "Name": "结实手推车",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 4,
@@ -67,6 +73,8 @@
   {
     "Id": 4,
     "Name": "青木桩",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 5,
@@ -85,6 +93,8 @@
   {
     "Id": 5,
     "Name": "木篱笆",
+    "FunctionType": 1,
+    "TabType": 4,
     "Type": 2,
     "Manual": true,
     "Order": 6,
@@ -105,6 +115,8 @@
   {
     "Id": 6,
     "Name": "素陶瓮",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 7,
@@ -123,6 +135,8 @@
   {
     "Id": 7,
     "Name": "柴火堆",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 8,
@@ -141,6 +155,8 @@
   {
     "Id": 8,
     "Name": "木门",
+    "FunctionType": 1,
+    "TabType": 4,
     "Type": 1,
     "Manual": true,
     "Order": 9,
@@ -159,6 +175,8 @@
   {
     "Id": 9,
     "Name": "茅草木门",
+    "FunctionType": 1,
+    "TabType": 4,
     "Type": 1,
     "Manual": true,
     "Order": 10,
@@ -180,6 +198,8 @@
   {
     "Id": 10,
     "Name": "小水缸",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 11,
@@ -198,6 +218,8 @@
   {
     "Id": 11,
     "Name": "素木案",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 2,
     "Manual": true,
     "Order": 12,
@@ -220,6 +242,8 @@
   {
     "Id": 12,
     "Name": "木板凳",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 2,
     "Manual": true,
     "Order": 13,
@@ -238,6 +262,8 @@
   {
     "Id": 13,
     "Name": "小木盆",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 14,
@@ -256,6 +282,8 @@
   {
     "Id": 14,
     "Name": "竹制晾衣架",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 15,
@@ -274,6 +302,8 @@
   {
     "Id": 15,
     "Name": "药香泥炉",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 16,
@@ -293,6 +323,8 @@
   {
     "Id": 16,
     "Name": "青岩矮墙",
+    "FunctionType": 1,
+    "TabType": 4,
     "Type": 2,
     "Manual": true,
     "Order": 17,
@@ -311,6 +343,8 @@
   {
     "Id": 17,
     "Name": "夜引灯",
+    "FunctionType": 1,
+    "TabType": 3,
     "Type": 2,
     "Manual": true,
     "Order": 18,
@@ -329,6 +363,8 @@
   {
     "Id": 18,
     "Name": "圆顶茅草伞",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 19,
@@ -347,6 +383,8 @@
   {
     "Id": 19,
     "Name": "竹制晾晒架",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 20,
@@ -365,6 +403,8 @@
   {
     "Id": 20,
     "Name": "手编竹篮",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 21,
@@ -384,6 +424,8 @@
   {
     "Id": 21,
     "Name": "年轮落英桩",
+    "FunctionType": 1,
+    "TabType": 1,
     "Type": 2,
     "Manual": true,
     "Order": 1,
@@ -407,6 +449,8 @@
   {
     "Id": 22,
     "Name": "青篱笆",
+    "FunctionType": 1,
+    "TabType": 4,
     "Type": 2,
     "Manual": true,
     "Order": 22,
@@ -426,6 +470,8 @@
   {
     "Id": 23,
     "Name": "青岩方墙",
+    "FunctionType": 1,
+    "TabType": 4,
     "Type": 2,
     "Manual": true,
     "Order": 23,
@@ -444,6 +490,8 @@
   {
     "Id": 24,
     "Name": "靠背竹椅",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 2,
     "Manual": true,
     "Order": 24,
@@ -462,6 +510,8 @@
   {
     "Id": 25,
     "Name": "竹制矮凳",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 2,
     "Manual": true,
     "Order": 25,
@@ -480,6 +530,8 @@
   {
     "Id": 26,
     "Name": "矮竹桌",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 2,
     "Manual": true,
     "Order": 26,
@@ -504,6 +556,8 @@
   {
     "Id": 27,
     "Name": "翠蔓竹门",
+    "FunctionType": 1,
+    "TabType": 4,
     "Type": 1,
     "Manual": true,
     "Order": 27,
@@ -525,6 +579,8 @@
   {
     "Id": 28,
     "Name": "青石桌",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 2,
     "Manual": true,
     "Order": 28,
@@ -549,6 +605,8 @@
   {
     "Id": 29,
     "Name": "圆石墩",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 2,
     "Manual": true,
     "Order": 29,
@@ -569,6 +627,8 @@
   {
     "Id": 30,
     "Name": "稻草人",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 30,
@@ -588,6 +648,8 @@
   {
     "Id": 31,
     "Name": "木制晾衣架",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 31,
@@ -606,6 +668,8 @@
   {
     "Id": 32,
     "Name": "采花篮",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 32,
@@ -624,6 +688,8 @@
   {
     "Id": 33,
     "Name": "草垛",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 33,
@@ -642,6 +708,8 @@
   {
     "Id": 34,
     "Name": "纸云鸢",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 1,
     "Manual": true,
     "Order": 34,
@@ -660,6 +728,8 @@
   {
     "Id": 35,
     "Name": "鼓",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 35,
@@ -678,6 +748,8 @@
   {
     "Id": 36,
     "Name": "守夜火盆",
+    "FunctionType": 1,
+    "TabType": 3,
     "Type": 2,
     "Manual": true,
     "Order": 36,
@@ -696,6 +768,8 @@
   {
     "Id": 37,
     "Name": "枯木逢春·玫瑰",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 37,
@@ -714,6 +788,8 @@
   {
     "Id": 38,
     "Name": "摇摇木马",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 38,
@@ -732,6 +808,8 @@
   {
     "Id": 39,
     "Name": "藤萝秋千架",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 39,
@@ -750,6 +828,8 @@
   {
     "Id": 40,
     "Name": "木制晒药篮",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 40,
@@ -768,6 +848,8 @@
   {
     "Id": 41,
     "Name": "青石灯",
+    "FunctionType": 1,
+    "TabType": 3,
     "Type": 2,
     "Manual": true,
     "Order": 41,
@@ -786,6 +868,8 @@
   {
     "Id": 42,
     "Name": "青岩方墙·角",
+    "FunctionType": 1,
+    "TabType": 4,
     "Type": 1,
     "Manual": true,
     "Order": 42,
@@ -806,6 +890,8 @@
   {
     "Id": 43,
     "Name": "水桶",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 2,
     "Manual": true,
     "Order": 43,
@@ -824,6 +910,8 @@
   {
     "Id": 44,
     "Name": "小太湖石",
+    "FunctionType": 1,
+    "TabType": 5,
     "Type": 2,
     "Manual": true,
     "Order": 44,
@@ -842,6 +930,8 @@
   {
     "Id": 45,
     "Name": "大太湖石",
+    "FunctionType": 1,
+    "TabType": 5,
     "Type": 2,
     "Manual": true,
     "Order": 45,
@@ -860,6 +950,8 @@
   {
     "Id": 46,
     "Name": "桃花太湖石",
+    "FunctionType": 1,
+    "TabType": 5,
     "Type": 2,
     "Manual": true,
     "Order": 46,
@@ -878,6 +970,8 @@
   {
     "Id": 47,
     "Name": "拱形竹篱",
+    "FunctionType": 1,
+    "TabType": 4,
     "Type": 1,
     "Manual": true,
     "Order": 47,
@@ -896,6 +990,8 @@
   {
     "Id": 48,
     "Name": "拱形竹篱·角",
+    "FunctionType": 1,
+    "TabType": 4,
     "Type": 1,
     "Manual": true,
     "Order": 48,
@@ -916,6 +1012,8 @@
   {
     "Id": 49,
     "Name": "青篱笆·角",
+    "FunctionType": 1,
+    "TabType": 4,
     "Type": 1,
     "Manual": true,
     "Order": 49,
@@ -936,6 +1034,8 @@
   {
     "Id": 50,
     "Name": "草卷",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 1,
     "Manual": true,
     "Order": 50,
@@ -954,6 +1054,8 @@
   {
     "Id": 51,
     "Name": "立木明灯",
+    "FunctionType": 1,
+    "TabType": 3,
     "Type": 1,
     "Manual": true,
     "Order": 51,
@@ -972,6 +1074,8 @@
   {
     "Id": 52,
     "Name": "浮世不夜灯",
+    "FunctionType": 1,
+    "TabType": 3,
     "Type": 1,
     "Manual": true,
     "Order": 52,
@@ -990,6 +1094,8 @@
   {
     "Id": 53,
     "Name": "香案",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 1,
     "Manual": true,
     "Order": 53,
@@ -1008,6 +1114,8 @@
   {
     "Id": 54,
     "Name": "金鲤纸鸢",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 1,
     "Manual": true,
     "Order": 54,
@@ -1026,6 +1134,8 @@
   {
     "Id": 55,
     "Name": "彩蝶纸鸢",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 1,
     "Manual": true,
     "Order": 55,
@@ -1044,6 +1154,8 @@
   {
     "Id": 56,
     "Name": "枯木逢春·绣球",
+    "FunctionType": 1,
+    "TabType": 6,
     "Type": 1,
     "Manual": true,
     "Order": 56,
@@ -1062,6 +1174,8 @@
   {
     "Id": 57,
     "Name": "锦鲤跃波灯",
+    "FunctionType": 1,
+    "TabType": 3,
     "Type": 1,
     "Manual": true,
     "Order": 57,
@@ -1080,6 +1194,8 @@
   {
     "Id": 58,
     "Name": "林间鹿灯",
+    "FunctionType": 1,
+    "TabType": 3,
     "Type": 1,
     "Manual": true,
     "Order": 58,
@@ -1098,6 +1214,8 @@
   {
     "Id": 59,
     "Name": "茶歇木案",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 1,
     "Manual": true,
     "Order": 59,
@@ -1116,6 +1234,8 @@
   {
     "Id": 60,
     "Name": "蒸云包子铺",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 1,
     "Manual": true,
     "Order": 60,
@@ -1134,6 +1254,8 @@
   {
     "Id": 61,
     "Name": "茶寮摊",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 1,
     "Manual": true,
     "Order": 61,
@@ -1152,6 +1274,8 @@
   {
     "Id": 62,
     "Name": "墨香书画摊",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 1,
     "Manual": true,
     "Order": 62,
@@ -1170,6 +1294,8 @@
   {
     "Id": 63,
     "Name": "歇脚棚子",
+    "FunctionType": 1,
+    "TabType": 2,
     "Type": 1,
     "Manual": true,
     "Order": 63,
@@ -1188,6 +1314,8 @@
   {
     "Id": 64,
     "Name": "芳茵毯",
+    "FunctionType": 1,
+    "TabType": 1,
     "Type": 2,
     "Manual": true,
     "Order": 64,
@@ -1209,6 +1337,8 @@
   {
     "Id": 65,
     "Name": "鹤池映月灯",
+    "FunctionType": 1,
+    "TabType": 3,
     "Type": 1,
     "Manual": true,
     "Order": 65,
@@ -1227,6 +1357,8 @@
   {
     "Id": 66,
     "Name": "明灯挂树",
+    "FunctionType": 1,
+    "TabType": 3,
     "Type": 1,
     "Manual": true,
     "Order": 66,
@@ -1245,6 +1377,8 @@
   {
     "Id": 67,
     "Name": "武陵溪",
+    "FunctionType": 1,
+    "TabType": 1,
     "Type": 2,
     "Manual": true,
     "Order": 67,
@@ -1279,10 +1413,12 @@
   {
     "Id": 68,
     "Name": "武陵溪·角",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 2,
     "Manual": false,
     "Order": 68,
-    "score": 15,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_68"
@@ -1300,10 +1436,12 @@
   {
     "Id": 69,
     "Name": "武陵溪·水",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 1,
     "Manual": false,
     "Order": 69,
-    "score": 15,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_69"
@@ -1318,10 +1456,12 @@
   {
     "Id": 70,
     "Name": "烟波径",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 2,
     "Manual": false,
     "Order": 70,
-    "score": 15,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_70"
@@ -1339,10 +1479,12 @@
   {
     "Id": 1000,
     "Name": "观赏桃树",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 1,
     "Manual": false,
     "Order": 51,
-    "score": 30,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_1000"
@@ -1355,10 +1497,12 @@
   {
     "Id": 1001,
     "Name": "观赏柳树",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 1,
     "Manual": false,
     "Order": 52,
-    "score": 30,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_1001"
@@ -1371,10 +1515,12 @@
   {
     "Id": 1002,
     "Name": "观赏梨树",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 1,
     "Manual": false,
     "Order": 53,
-    "score": 30,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_1002"
@@ -1387,10 +1533,12 @@
   {
     "Id": 1003,
     "Name": "观赏松树",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 1,
     "Manual": false,
     "Order": 54,
-    "score": 30,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_1003"
@@ -1403,10 +1551,12 @@
   {
     "Id": 1004,
     "Name": "观赏桦树",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 1,
     "Manual": false,
     "Order": 55,
-    "score": 30,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_1004"
@@ -1419,10 +1569,12 @@
   {
     "Id": 1005,
     "Name": "观赏桑树",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 1,
     "Manual": false,
     "Order": 56,
-    "score": 30,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_1005"
@@ -1435,10 +1587,12 @@
   {
     "Id": 1006,
     "Name": "观赏榕树",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 1,
     "Manual": false,
     "Order": 57,
-    "score": 30,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_1006"
@@ -1451,10 +1605,12 @@
   {
     "Id": 1007,
     "Name": "观赏竹子",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 1,
     "Manual": false,
     "Order": 58,
-    "score": 30,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_1007"
@@ -1467,10 +1623,12 @@
   {
     "Id": 1008,
     "Name": "观赏集市",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 1,
     "Manual": false,
     "Order": 59,
-    "score": 30,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_1008"
@@ -1483,10 +1641,12 @@
   {
     "Id": 1009,
     "Name": "观赏蘑菇",
+    "FunctionType": 1,
+    "TabType": 0,
     "Type": 1,
     "Manual": false,
     "Order": 60,
-    "score": 30,
+    "score": 0,
     "Preview": false,
     "CommonPrefab": [
       "Decoration_1009"
@@ -1495,5 +1655,25 @@
     "AccessoriesFile": [],
     "DismantleType": 7,
     "DismantleParameter": 7830
+  },
+  {
+    "Id": 5000,
+    "Name": "烟花",
+    "FunctionType": 2,
+    "TabType": 7,
+    "Type": 1,
+    "Manual": false,
+    "Order": 61,
+    "score": 0,
+    "Preview": false,
+    "CommonPrefab": [
+      "Prop_5000"
+    ],
+    "MainBodyFile": [
+      "Prop_5000"
+    ],
+    "AccessoriesFile": [],
+    "DismantleType": 7,
+    "DismantleParameter": 7324
   }
 ]

src/api/config/DialogueConfigCategory.json

@@ -159,6 +159,22 @@
     "NameFile": "",
     "Position": 0
   },
+  {
+    "Id": 116,
+    "DialogueText": "村中朱门悬彩灯，新人笑靥染红绸。乡邻举盏祝三愿，宴酣时暖意温身。大家聚在一起吃吃喝喝，均获得体质经验:[color=#009a04]{体质经验}[/color]。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 117,
+    "DialogueText": "村中朱门悬彩灯，新人笑靥染红绸。乡邻举盏祝三愿，宴酣时暖意温身。大家聚在一起吃吃喝喝，均获得体质经验:[color=#009a04]{体质经验}[/color]，寿命经验:[color=#009a04]{寿命经验}[/color]。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
   {
     "Id": 201,
     "DialogueText": "{村民名字1}和{村民名字2}润了润嗓子，一起唱了一首歌。",
@@ -6015,6 +6031,46 @@
     "NameFile": "",
     "Position": 0
   },
+  {
+    "Id": 5021,
+    "DialogueText": "宾客入席——美酒家宴齐欢笑！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 5022,
+    "DialogueText": "一拜天地——天佑良缘日月长！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 5023,
+    "DialogueText": "二拜高堂——父母开颜福满堂！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 5024,
+    "DialogueText": "夫妻对拜——相视一笑甜如蜜！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 5025,
+    "DialogueText": "共饮喜酒——交杯共饮百年好！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
   {
     "Id": 6001,
     "DialogueText": "您是从哪里来的呢",
@@ -8462,5 +8518,197 @@
     "UIPrefabName": "UI_StoryCase_QiaoHe",
     "NameFile": "乔河",
     "Position": 2
+  },
+  {
+    "Id": 250001,
+    "DialogueText": "人潮从田埂上漫了过来",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250002,
+    "DialogueText": "座前簇集着四野乡亲",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250003,
+    "DialogueText": "舞台上的戏班开始唱了起来",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250004,
+    "DialogueText": "清音袅袅，如月华流转",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250005,
+    "DialogueText": "惊起檐角铜铃三两声",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250006,
+    "DialogueText": "一曲终了，醉了满座宾朋",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250007,
+    "DialogueText": "老生用烟杆丈量台毯的皱褶",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250008,
+    "DialogueText": "琴师试弦惊飞檐角麻雀",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250009,
+    "DialogueText": "海岛冰轮初转腾，见玉兔，玉兔又早东升。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250010,
+    "DialogueText": "人生在世如春梦，且自开怀饮几盅。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250011,
+    "DialogueText": "只盼那君王回宫来，我与他叙一叙当年情意浓。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250012,
+    "DialogueText": "唉！花开花落终有时，人聚人散总关情。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250013,
+    "DialogueText": "天上掉下个林妹妹，似一朵轻云刚出岫。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250014,
+    "DialogueText": "花落花飞飞满天，红消香断有谁怜？",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250015,
+    "DialogueText": "如今是知音已绝诗稿怎存？把断肠文章付火焚！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250016,
+    "DialogueText": "到如今，人面不知何处去，空留下素烛白帷伴灵前。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250017,
+    "DialogueText": "山边枫叶红似染，不堪回首忆旧游。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250018,
+    "DialogueText": "许郎他，负心忘情抛却了，这冤仇，叫我如何消？",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250019,
+    "DialogueText": "娘子你情深义重胜天高，我却听信谗言将你抛。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250020,
+    "DialogueText": "秃驴休要逞凶狂，欺我姐姐太猖狂！",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250021,
+    "DialogueText": "有缘千里来相会，得遇仁兄心欢喜。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250022,
+    "DialogueText": "良朋难得知心友，金兰结义胜兄弟。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250023,
+    "DialogueText": "彩虹万里百花开，花间蝴蝶成双对。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
+  },
+  {
+    "Id": 250024,
+    "DialogueText": "千年万代不分开，梁山伯与祝英台。",
+    "IconFIle": "",
+    "UIPrefabName": "",
+    "NameFile": "",
+    "Position": 0
   }
 ]

src/api/config/DialogueGroupConfigCategory.json

@@ -3503,5 +3503,39 @@
       2,
       2
     ]
+  },
+  {
+    "Id": 1000,
+    "GroupId": 1101,
+    "Type": 1,
+    "DialogueId": [
+      116
+    ],
+    "RoleType": 0,
+    "DialogueParameter1": [
+      0
+    ],
+    "DialogueParameter2": [],
+    "RoleType2": 0,
+    "Dialogue2Parameter1": [],
+    "Dialogue2Parameter2": [],
+    "DialogueOrder": []
+  },
+  {
+    "Id": 1001,
+    "GroupId": 1102,
+    "Type": 1,
+    "DialogueId": [
+      117
+    ],
+    "RoleType": 0,
+    "DialogueParameter1": [
+      0
+    ],
+    "DialogueParameter2": [],
+    "RoleType2": 0,
+    "Dialogue2Parameter1": [],
+    "Dialogue2Parameter2": [],
+    "DialogueOrder": []
   }
 ]

src/api/config/FeastTextConfigCategory.json

@@ -1,6 +1,7 @@
 [
   {
     "Id": 1001,
+    "Type": 1,
     "Scale": [
       1,
       2
@@ -15,6 +16,7 @@
   },
   {
     "Id": 1002,
+    "Type": 1,
     "Scale": [
       3,
       4,
@@ -40,6 +42,7 @@
   },
   {
     "Id": 1003,
+    "Type": 1,
     "Scale": [
       3,
       4,
@@ -57,7 +60,8 @@
       16,
       17,
       18,
-      19
+      19,
+      20
     ],
     "Order": 3,
     "Text": [
@@ -66,5 +70,20 @@
       5017,
       5018
     ]
+  },
+  {
+    "Id": 2000,
+    "Type": 2,
+    "Scale": [
+      21
+    ],
+    "Order": 1,
+    "Text": [
+      5021,
+      5022,
+      5023,
+      5024,
+      5025
+    ]
   }
 ]

src/api/config/FoodConfigCategory.json

@@ -404,6 +404,33 @@
     "Buff": 0,
     "Description": ""
   },
+  {
+    "Id": 52,
+    "Name": "果酒",
+    "Type": 3,
+    "NutritiveValue": 20,
+    "FoodNum": 5,
+    "Buff": 0,
+    "Description": ""
+  },
+  {
+    "Id": 53,
+    "Name": "杜康",
+    "Type": 3,
+    "NutritiveValue": 20,
+    "FoodNum": 5,
+    "Buff": 0,
+    "Description": ""
+  },
+  {
+    "Id": 54,
+    "Name": "炭烤鱼干",
+    "Type": 2,
+    "NutritiveValue": 50,
+    "FoodNum": 40,
+    "Buff": 0,
+    "Description": ""
+  },
   {
     "Id": 203,
     "Name": "野菜汤",
@@ -781,5 +808,14 @@
     "FoodNum": 110,
     "Buff": 0,
     "Description": ""
+  },
+  {
+    "Id": 245,
+    "Name": "炭烤鱼干",
+    "Type": 2,
+    "NutritiveValue": 60,
+    "FoodNum": 50,
+    "Buff": 0,
+    "Description": ""
   }
 ]

src/api/config/FoodTicketConfigCategory.json

@@ -358,5 +358,14 @@
     "ExchangeTimes": 6,
     "OrdinaryCurrencyNum": 9,
     "ExcellentCurrencyNum": 18
+  },
+  {
+    "Id": 41,
+    "Item": 2054,
+    "ItemNumber": 1,
+    "Currency": 701,
+    "ExchangeTimes": 2,
+    "OrdinaryCurrencyNum": 4,
+    "ExcellentCurrencyNum": 8
   }
 ]

src/api/config/FunctionItemConfigCategory.json

@@ -215,6 +215,30 @@
     "UseTypeParameter": 2051,
     "UseTypeParameter2": 0
   },
+  {
+    "Id": 35,
+    "Name": "食谱:果酒",
+    "UseType": 3,
+    "ScaleCondition": 7,
+    "UseTypeParameter": 2052,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 36,
+    "Name": "食谱:杜康",
+    "UseType": 3,
+    "ScaleCondition": 7,
+    "UseTypeParameter": 2053,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 37,
+    "Name": "食谱:炭烤鱼干",
+    "UseType": 3,
+    "ScaleCondition": 8,
+    "UseTypeParameter": 2054,
+    "UseTypeParameter2": 0
+  },
   {
     "Id": 100,
     "Name": "精品食谱:野菜汤",
@@ -551,6 +575,14 @@
     "UseTypeParameter": 2544,
     "UseTypeParameter2": 0
   },
+  {
+    "Id": 143,
+    "Name": "精品食谱:炭烤鱼干",
+    "UseType": 3,
+    "ScaleCondition": 8,
+    "UseTypeParameter": 2545,
+    "UseTypeParameter2": 0
+  },
   {
     "Id": 201,
     "Name": "图纸:雕像·1级",
@@ -1039,6 +1071,22 @@
     "UseTypeParameter": 674,
     "UseTypeParameter2": 0
   },
+  {
+    "Id": 270,
+    "Name": "图纸:土楼",
+    "UseType": 3,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 85,
+    "UseTypeParameter2": 0
+  },
+  {
+    "Id": 271,
+    "Name": "图纸:宴楼",
+    "UseType": 3,
+    "ScaleCondition": 20,
+    "UseTypeParameter": 676,
+    "UseTypeParameter2": 0
+  },
   {
     "Id": 301,
     "Name": "农学:种植大豆",
@@ -1711,6 +1759,14 @@
     "UseTypeParameter": 9,
     "UseTypeParameter2": 0
   },
+  {
+    "Id": 814,
+    "Name": "烟花",
+    "UseType": 12,
+    "ScaleCondition": 0,
+    "UseTypeParameter": 5000,
+    "UseTypeParameter2": 0
+  },
   {
     "Id": 1001,
     "Name": "浆果苗",
@@ -3625,7 +3681,7 @@
   },
   {
     "Id": 30020,
-    "Name": "图纸:幽篁渡·三",
+    "Name": "图纸:扶疏栈·一",
     "UseType": 27,
     "ScaleCondition": 0,
     "UseTypeParameter": 1033,
@@ -3633,7 +3689,7 @@
   },
   {
     "Id": 30021,
-    "Name": "图纸:幽篁渡·四",
+    "Name": "图纸:扶疏栈·二",
     "UseType": 27,
     "ScaleCondition": 0,
     "UseTypeParameter": 1034,
@@ -3641,7 +3697,7 @@
   },
   {
     "Id": 30022,
-    "Name": "图纸:幽篁渡·五",
+    "Name": "图纸:扶疏栈·三",
     "UseType": 27,
     "ScaleCondition": 0,
     "UseTypeParameter": 1035,
@@ -3649,7 +3705,7 @@
   },
   {
     "Id": 30023,
-    "Name": "图纸:幽篁渡·六",
+    "Name": "图纸:扶疏栈·四",
     "UseType": 27,
     "ScaleCondition": 0,
     "UseTypeParameter": 1036,

src/api/config/GameUnitSizeInfoConfigCategory.json

@@ -190,6 +190,13 @@
           "Height": 9
         }
       },
+      {
+        "ConfigId": 85,
+        "PlaceSizeData": {
+          "Width": 10,
+          "Height": 10
+        }
+      },
       {
         "ConfigId": 100,
         "PlaceSizeData": {
@@ -1212,6 +1219,13 @@
           "Height": 7
         }
       },
+      {
+        "ConfigId": 676,
+        "PlaceSizeData": {
+          "Width": 11,
+          "Height": 11
+        }
+      },
       {
         "ConfigId": 1000,
         "PlaceSizeData": {
@@ -1885,6 +1899,83 @@
           "Height": 4
         }
       },
+      {
+        "ConfigId": 1101,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 1102,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 1103,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 1104,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 1105,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 1106,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 1107,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 1108,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 1109,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 1110,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 1200,
+        "PlaceSizeData": {
+          "Width": 11,
+          "Height": 11
+        }
+      },
       {
         "ConfigId": 2001,
         "PlaceSizeData": {
@@ -2032,6 +2123,83 @@
           "Height": 4
         }
       },
+      {
+        "ConfigId": 2101,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 2102,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 2103,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 2104,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 2105,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 2106,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 2107,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 2108,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 2109,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 2110,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 2200,
+        "PlaceSizeData": {
+          "Width": 11,
+          "Height": 11
+        }
+      },
       {
         "ConfigId": 3001,
         "PlaceSizeData": {
@@ -2193,6 +2361,83 @@
           "Height": 4
         }
       },
+      {
+        "ConfigId": 3101,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 3102,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 3103,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 3104,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 3105,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 3106,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 3107,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 3108,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 3109,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 3110,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 3200,
+        "PlaceSizeData": {
+          "Width": 11,
+          "Height": 11
+        }
+      },
       {
         "ConfigId": 4001,
         "PlaceSizeData": {
@@ -2367,6 +2612,83 @@
           "Width": 12,
           "Height": 10
         }
+      },
+      {
+        "ConfigId": 4101,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 4102,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 4103,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 4104,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 4105,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 4106,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 4107,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 4108,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 4109,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 4110,
+        "PlaceSizeData": {
+          "Width": 8,
+          "Height": 10
+        }
+      },
+      {
+        "ConfigId": 4200,
+        "PlaceSizeData": {
+          "Width": 11,
+          "Height": 11
+        }
       }
     ],
     "RegionResPointSizeInfos": [
@@ -5157,6 +5479,13 @@
           "Width": 3,
           "Height": 1
         }
+      },
+      {
+        "ConfigId": 5000,
+        "PlaceSizeData": {
+          "Width": 1,
+          "Height": 1
+        }
       }
     ],
     "NpcSizeInfos": [

src/api/config/GoodsForSaleConfigCategory.json

@@ -703,6 +703,28 @@
     "Specialty": 0,
     "RefreshCycle": 0
   },
+  {
+    "Id": 33,
+    "GroupId": 4,
+    "Scale": 18,
+    "ItemId": 147,
+    "SaleNum": [
+      200,
+      200
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 1,
+    "Price": 100,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": -1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
   {
     "Id": 5001,
     "GroupId": 101,
@@ -5785,6 +5807,28 @@
     "Specialty": 0,
     "RefreshCycle": 0
   },
+  {
+    "Id": 7087,
+    "GroupId": 202,
+    "Scale": 0,
+    "ItemId": 7078,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 50,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 1,
+    "Price": 50000,
+    "Discount": 90,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
   {
     "Id": 8001,
     "GroupId": 301,
@@ -5895,6 +5939,160 @@
     "Specialty": 0,
     "RefreshCycle": 0
   },
+  {
+    "Id": 18006,
+    "GroupId": 302,
+    "Scale": 0,
+    "ItemId": 30001,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 4,
+    "Price": 2,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 18007,
+    "GroupId": 302,
+    "Scale": 0,
+    "ItemId": 30101,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 4,
+    "Price": 2,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 18008,
+    "GroupId": 302,
+    "Scale": 0,
+    "ItemId": 30201,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 4,
+    "Price": 2,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 18009,
+    "GroupId": 302,
+    "Scale": 0,
+    "ItemId": 30301,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 4,
+    "Price": 2,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 18010,
+    "GroupId": 302,
+    "Scale": 0,
+    "ItemId": 30401,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 4,
+    "Price": 2,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 18011,
+    "GroupId": 302,
+    "Scale": 0,
+    "ItemId": 30601,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 4,
+    "Price": 2,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 18012,
+    "GroupId": 302,
+    "Scale": 0,
+    "ItemId": 30701,
+    "SaleNum": [
+      1,
+      1
+    ],
+    "Weight": 1,
+    "OverlayWeight": 0,
+    "SaleCondition": 0,
+    "SaleConditionParemeter": 0,
+    "SellingCurrencyType": 4,
+    "Price": 2,
+    "Discount": 0,
+    "DiscountWeight": 0,
+    "SaleMax": 1,
+    "DiscountMark": "",
+    "Specialty": 0,
+    "RefreshCycle": 0
+  },
   {
     "Id": 8006,
     "GroupId": 303,

src/api/config/GuideStepConfigCategory.json

@@ -1592,5 +1592,95 @@
     "Delay": false,
     "NextStepOpration": 2,
     "Text": "在桃谷有个习俗，会将离世之人的衣物与他埋在一起，似伴其踏上新程<br>因此，柳大富离世后他的衣物也会消失"
+  },
+  {
+    "Id": 59001,
+    "DisplayType": 2,
+    "TextPosition": 1,
+    "Highlight": 5132,
+    "HighlightPosition": 2,
+    "Delay": false,
+    "NextStepOpration": 2,
+    "Text": "点击[color=#009a04]【戏目】[/color]，选择戏目进行开戏"
+  },
+  {
+    "Id": 59002,
+    "DisplayType": 2,
+    "TextPosition": 6,
+    "Highlight": 5133,
+    "HighlightPosition": 2,
+    "Delay": false,
+    "NextStepOpration": 2,
+    "Text": "点击[color=#009a04]【登记列表】[/color]，可以查看该村落看戏村民的人员，并进行招婿娶亲"
+  },
+  {
+    "Id": 59003,
+    "DisplayType": 2,
+    "TextPosition": 7,
+    "Highlight": 5134,
+    "HighlightPosition": 2,
+    "Delay": false,
+    "NextStepOpration": 2,
+    "Text": "点击[color=#009a04]【升级】[/color]按钮，可以升级戏楼，升级后戏楼会容纳更多村民"
+  },
+  {
+    "Id": 60000,
+    "DisplayType": 2,
+    "TextPosition": 8,
+    "Highlight": 5135,
+    "HighlightPosition": 2,
+    "Delay": true,
+    "NextStepOpration": 1,
+    "Text": "谷内有喜事发生，今日可以举办喜宴。点击[color=#009a04]【喜宴】[/color]按钮，打开喜宴界面"
+  },
+  {
+    "Id": 60001,
+    "DisplayType": 2,
+    "TextPosition": 7,
+    "Highlight": 5136,
+    "HighlightPosition": 2,
+    "Delay": false,
+    "NextStepOpration": 2,
+    "Text": "点击[color=#009a04]【邀请】[/color]按钮打开邀请界面，可以消耗喜礼邀请其他人来桃谷参加喜宴，第二天会收到他们赠送的回礼<br>注：开宴之后无法再邀请客人"
+  },
+  {
+    "Id": 60002,
+    "DisplayType": 2,
+    "TextPosition": 8,
+    "Highlight": 5137,
+    "HighlightPosition": 2,
+    "Delay": false,
+    "NextStepOpration": 2,
+    "Text": "点击[color=#009a04]【祝福】[/color]按钮打开祝福界面，给新人赠送羽毛会让他们受到神鸟的祝福增加寿命经验<br>注：开宴之后无法再祝福新人"
+  },
+  {
+    "Id": 60003,
+    "DisplayType": 2,
+    "TextPosition": 8,
+    "Highlight": 5138,
+    "HighlightPosition": 2,
+    "Delay": false,
+    "NextStepOpration": 2,
+    "Text": "点击[color=#009a04]【选菜】[/color]按钮打开选择菜品界面，菜品会继承家宴中的菜品设置"
+  },
+  {
+    "Id": 60004,
+    "DisplayType": 2,
+    "TextPosition": 2,
+    "Highlight": 5139,
+    "HighlightPosition": 6,
+    "Delay": false,
+    "NextStepOpration": 2,
+    "Text": "在喜宴上食用的菜品将会受到新人增幅的加成~"
+  },
+  {
+    "Id": 60005,
+    "DisplayType": 2,
+    "TextPosition": 5,
+    "Highlight": 1,
+    "HighlightPosition": 0,
+    "Delay": false,
+    "NextStepOpration": 2,
+    "Text": "邀请客人、祝福新人、设置菜品等一系列操作结束后，在夜晚时段点击[color=#009a04]【举办】[/color]按钮就可以举办喜宴啦~"
   }
 ]

src/api/config/GuideTriggerConfigCategory.json

@@ -488,5 +488,32 @@
     ],
     "CanPass": true,
     "DropItemGroup": 0
+  },
+  {
+    "Id": 1031,
+    "TriggerType": 3,
+    "TypeParameter": "TheaterMainWindow",
+    "GuideStep": [
+      59001,
+      59002,
+      59003
+    ],
+    "CanPass": true,
+    "DropItemGroup": 0
+  },
+  {
+    "Id": 1032,
+    "TriggerType": 19,
+    "TypeParameter": "",
+    "GuideStep": [
+      60000,
+      60001,
+      60002,
+      60003,
+      60004,
+      60005
+    ],
+    "CanPass": true,
+    "DropItemGroup": 0
   }
 ]

src/api/config/HelpConfigCategory.json

@@ -401,5 +401,44 @@
     "Picture3": "",
     "Text3": "",
     "NextPage": 0
+  },
+  {
+    "id": 35,
+    "Group": 30,
+    "Page": 1,
+    "Stencil": 3,
+    "Picture1": "",
+    "Text1": "1. 不同村落的戏楼相互独立\n2. 每个戏楼每天(现实时间)只需要上演一次戏目\n3. 戏楼的工作时间为桃谷时间7：00-20:00\n4. 每个戏楼的工作人员每日只可帮人下2次聘礼\n5. 礼厅会收到村落送来的聘礼。\n6. 求亲成功的村民当天会加入山谷，次日可以在宴楼举办喜宴\n7. 每日只可出嫁10次村民\n8. 每日5点(现实时间)重置村民列表、下聘数量和出嫁数量",
+    "Picture2": "",
+    "Text2": "",
+    "Picture3": "",
+    "Text3": "",
+    "NextPage": 0
+  },
+  {
+    "id": 36,
+    "Group": 31,
+    "Page": 1,
+    "Stencil": 3,
+    "Picture1": "",
+    "Text1": "1、与村落联姻成功且谷外的村民嫁入或者/入赘桃谷的第二天晚上才能举办喜宴\n2、可在喜宴上消耗喜礼邀请新人所属村落的村民和陶渊明先生前来参加，第二天将会在礼厅收到他们的回礼\n3、可在喜宴上给新人送上羽毛，新人将会得到神鸟的祝福增加寿命经验\n4、举办喜宴之后将无法邀请村民和祝福新人\n5、喜宴上的菜品将会继承家宴菜品的设置，但是在喜宴上食用的菜品将会受到额外的新人增幅\n\n",
+    "Picture2": "",
+    "Text2": "",
+    "Picture3": "",
+    "Text3": "",
+    "NextPage": 0
+  },
+  {
+    "id": 37,
+    "Group": 32,
+    "Page": 1,
+    "Stencil": 3,
+    "Picture1": "",
+    "Text1": "1、村落建造宴楼后，只要村落中有菜品就会自动举办同济宴\n2、举办同济宴将会得到村民的回馈——铜钱\n3、每天晚上可举办一次同济宴，每个村落最多可举办十次同济宴，次日重置可举办次数\n4、村落村民的嫁娶会影响该村落的体质和寿命等级",
+    "Picture2": "",
+    "Text2": "",
+    "Picture3": "",
+    "Text3": "",
+    "NextPage": 0
   }
 ]

src/api/config/HighlightConfigCategory.json

@@ -1739,6 +1739,114 @@
       "w": 0
     }
   },
+  {
+    "Id": 5132,
+    "Type": 5,
+    "Name": "TheaterMainWindow.MunuBtn",
+    "HighlightCircle": 0,
+    "Offset": {
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 0
+    }
+  },
+  {
+    "Id": 5133,
+    "Type": 5,
+    "Name": "TheaterMainWindow.ListBtn",
+    "HighlightCircle": 0,
+    "Offset": {
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 0
+    }
+  },
+  {
+    "Id": 5134,
+    "Type": 5,
+    "Name": "TheaterMainWindow.UpgradeBtn",
+    "HighlightCircle": 0,
+    "Offset": {
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 0
+    }
+  },
+  {
+    "Id": 5135,
+    "Type": 5,
+    "Name": "Main.FeastButton",
+    "HighlightCircle": 0,
+    "Offset": {
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 0
+    }
+  },
+  {
+    "Id": 5136,
+    "Type": 5,
+    "Name": "SpecialFeastWindow.InviteButton",
+    "HighlightCircle": 0,
+    "Offset": {
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 0
+    }
+  },
+  {
+    "Id": 5137,
+    "Type": 5,
+    "Name": "SpecialFeastWindow.BlessButton",
+    "HighlightCircle": 0,
+    "Offset": {
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 0
+    }
+  },
+  {
+    "Id": 5138,
+    "Type": 5,
+    "Name": "SpecialFeastWindow.FoodMenuButton",
+    "HighlightCircle": 0,
+    "Offset": {
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 0
+    }
+  },
+  {
+    "Id": 5139,
+    "Type": 5,
+    "Name": "SpecialFeastWindow.CoupleNum",
+    "HighlightCircle": 0,
+    "Offset": {
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 0
+    }
+  },
+  {
+    "Id": 5140,
+    "Type": 5,
+    "Name": "SpecialFeastWindow.StartButton",
+    "HighlightCircle": 0,
+    "Offset": {
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 0
+    }
+  },
   {
     "Id": 6001,
     "Type": 6,

src/api/config/MailConfigCategory.json

@@ -26,7 +26,7 @@
     "OverdueType": 2,
     "Greetings": "",
     "Sender": "陶先生",
-    "Content": "在四凶兽：{Name}的挑战中，您的排名为{名次}，以下是您的奖励。",
+    "Content": "在四凶兽：{0}的挑战中，您的排名为{1}，以下是您的奖励。",
     "Reward": 0
   },
   {
@@ -36,7 +36,7 @@
     "OverdueType": 2,
     "Greetings": "",
     "Sender": "陶先生",
-    "Content": "    尊敬的勇士，感谢您守护{村落名称}，免受妖兽的侵袭。您的努力在众多守护者中，排名第{名次}。以下是老朽给您准备的一份厚礼，请笑纳！",
+    "Content": "    尊敬的勇士，感谢您守护{0}，免受妖兽的侵袭。您的努力在众多守护者中，排名第{1}。以下是老朽给您准备的一份厚礼，请笑纳！",
     "Reward": 0
   },
   {
@@ -46,7 +46,7 @@
     "OverdueType": 2,
     "Greetings": "",
     "Sender": "陶先生",
-    "Content": "尊敬的勇士，您昨日的图鉴积分排名为{名次}，以下是您的奖励",
+    "Content": "尊敬的勇士，您昨日的图鉴积分排名为{0}，以下是您的奖励",
     "Reward": 0
   },
   {
@@ -56,7 +56,7 @@
     "OverdueType": 2,
     "Greetings": "",
     "Sender": "陶先生",
-    "Content": "尊敬的勇士，您上期的图鉴积分排名为{名次}，以下是您的奖励",
+    "Content": "尊敬的勇士，您上期的图鉴积分排名为{0}，以下是您的奖励",
     "Reward": 0
   },
   {
@@ -66,7 +66,7 @@
     "OverdueType": 1,
     "Greetings": "",
     "Sender": "桃源记2开发组",
-    "Content": "尊敬的谷主，感谢您在内测期间对桃源记2的支持\n您在内测期间累计充值了{金额}元，为您返还{代金券数额}代金券\n请查收您的内测返利，祝游戏愉快！",
+    "Content": "尊敬的谷主，感谢您在内测期间对桃源记2的支持\n您在内测期间累计充值了{0}元，为您返还{1}代金券\n请查收您的内测返利，祝游戏愉快！",
     "Reward": 0
   },
   {
@@ -76,7 +76,7 @@
     "OverdueType": 2,
     "Greetings": "",
     "Sender": "陶先生",
-    "Content": "尊敬的勇士，您昨日的战力排名为{名次}，以下是您的奖励",
+    "Content": "尊敬的勇士，您昨日的战力排名为{0}，以下是您的奖励",
     "Reward": 0
   },
   {
@@ -86,7 +86,7 @@
     "OverdueType": 2,
     "Greetings": "",
     "Sender": "陶先生",
-    "Content": "尊敬的勇士，您上期的战力排名为{名次}，以下是您的奖励",
+    "Content": "尊敬的勇士，您上期的战力排名为{0}，以下是您的奖励",
     "Reward": 0
   },
   {
@@ -96,7 +96,7 @@
     "OverdueType": 2,
     "Greetings": "",
     "Sender": "陶先生",
-    "Content": "尊敬的勇士，您昨日的装饰品积分排名为{名次}，以下是您的奖励",
+    "Content": "尊敬的勇士，您昨日的装饰品积分排名为{0}，以下是您的奖励",
     "Reward": 0
   },
   {
@@ -106,7 +106,7 @@
     "OverdueType": 2,
     "Greetings": "",
     "Sender": "陶先生",
-    "Content": "尊敬的勇士，您上期的装饰品积分排名为{名次}，以下是您的奖励",
+    "Content": "尊敬的勇士，您上期的装饰品积分排名为{0}，以下是您的奖励",
     "Reward": 0
   },
   {
@@ -116,7 +116,7 @@
     "OverdueType": 1,
     "Greetings": "",
     "Sender": "陶先生",
-    "Content": "尊重的谷主，您的兑换码{兑换码编号}奖励已经发放，请查收",
+    "Content": "尊重的谷主，您的兑换码{0}奖励已经发放，请查收",
     "Reward": 0
   },
   {
@@ -126,7 +126,7 @@
     "OverdueType": 2,
     "Greetings": "",
     "Sender": "陶先生",
-    "Content": "尊敬的勇士，您昨日的兽潮积分排名为{名次}，以下是您的奖励",
+    "Content": "尊敬的勇士，您昨日的兽潮积分排名为{0}，以下是您的奖励",
     "Reward": 0
   },
   {
@@ -136,7 +136,7 @@
     "OverdueType": 2,
     "Greetings": "",
     "Sender": "陶先生",
-    "Content": "尊敬的勇士，您上期的兽潮积分排名为{名次}，以下是您的奖励",
+    "Content": "尊敬的勇士，您上期的兽潮积分排名为{0}，以下是您的奖励",
     "Reward": 0
   }
 ]

src/api/config/MessageTipsConfigCategory.json

@@ -111,22 +111,6 @@
     "ButtonText": "",
     "MsgIcon": "Msg_Icon_8"
   },
-  {
-    "Id": 9,
-    "MsgTitle": "村落礼物",
-    "Type": 9,
-    "Priority": 60,
-    "IsShake": true,
-    "Refresh": false,
-    "IsDisplay": true,
-    "Clear": false,
-    "HintType": 2,
-    "DisplayText": "村落礼物",
-    "MsgText": "礼厅收到了来自谷外村落的礼物",
-    "HasButton": true,
-    "ButtonText": "查看",
-    "MsgIcon": "Msg_Icon_9"
-  },
   {
     "Id": 10,
     "MsgTitle": "陵陵来啦",

src/api/config/MonthlyCardConfigCategory.json

@@ -6,8 +6,8 @@
       2
     ],
     "ValleyEffect": 1,
-    "NotActivatedDescription": "每日领取：[color=#626262]桃花石*50；仙露*5[/color]",
-    "ActivatedDescription": "每日领取：[color=#009a04]桃花石*50；仙露*5[/color]",
+    "NotActivatedDescription": "每日领取：[color=#626262]桃花石*100；仙露*5；桃花鱼*10[/color]",
+    "ActivatedDescription": "每日领取：[color=#009a04]桃花石*100；仙露*5；桃花鱼*10[/color]",
     "Tips": ""
   },
   {

src/api/config/NightEventConfigCategory.json

@@ -255,5 +255,31 @@
     "AdditionalEffects": 0,
     "AdditionalEffectsValue": 0,
     "DialogueGroupId": 205
+  },
+  {
+    "Id": 1101,
+    "Type": 11,
+    "EventName": "喜宴",
+    "TriggerCondition": 0,
+    "ConditionParameter": [],
+    "EventWeight": 1,
+    "DropGroup": 0,
+    "Priority": 1,
+    "AdditionalEffects": 0,
+    "AdditionalEffectsValue": 0,
+    "DialogueGroupId": 1101
+  },
+  {
+    "Id": 1102,
+    "Type": 11,
+    "EventName": "喜宴",
+    "TriggerCondition": 0,
+    "ConditionParameter": [],
+    "EventWeight": 1,
+    "DropGroup": 0,
+    "Priority": 1,
+    "AdditionalEffects": 0,
+    "AdditionalEffectsValue": 0,
+    "DialogueGroupId": 1102
   }
 ]

src/api/config/NpcConfigCategory.json

@@ -1316,6 +1316,122 @@
     "Hide": false,
     "Description": "鲁明严选，必是精选"
   },
+  {
+    "Id": 1073,
+    "Type": 7,
+    "Name": "豆豆",
+    "RelatedId": 0,
+    "DialogueWithOptions": [],
+    "BubbleText": 0,
+    "FixedPoint": true,
+    "MoveSpeed": 25,
+    "Area": 3002,
+    "CreateCondition1": 0,
+    "CreateParameter1": [],
+    "CreateCondition2": 0,
+    "CreateParameter2": [],
+    "DisappearCondition": 0,
+    "DisappearConditionParameter": [],
+    "AppearTime": [
+      700,
+      2000
+    ],
+    "VisitDisplay": false,
+    "Icon": "",
+    "Prefab": "",
+    "DialogueWay": true,
+    "Disappear": false,
+    "Repeat": false,
+    "Hide": true,
+    "Description": "戏楼最小的\"账房先生\",专管登记来客"
+  },
+  {
+    "Id": 1074,
+    "Type": 7,
+    "Name": "糖糖",
+    "RelatedId": 0,
+    "DialogueWithOptions": [],
+    "BubbleText": 0,
+    "FixedPoint": true,
+    "MoveSpeed": 25,
+    "Area": 3003,
+    "CreateCondition1": 0,
+    "CreateParameter1": [],
+    "CreateCondition2": 0,
+    "CreateParameter2": [],
+    "DisappearCondition": 0,
+    "DisappearConditionParameter": [],
+    "AppearTime": [
+      700,
+      2000
+    ],
+    "VisitDisplay": false,
+    "Icon": "",
+    "Prefab": "",
+    "DialogueWay": true,
+    "Disappear": false,
+    "Repeat": false,
+    "Hide": true,
+    "Description": "戏楼最小的\"账房先生\",专管登记来客"
+  },
+  {
+    "Id": 1075,
+    "Type": 7,
+    "Name": "乐乐",
+    "RelatedId": 0,
+    "DialogueWithOptions": [],
+    "BubbleText": 0,
+    "FixedPoint": true,
+    "MoveSpeed": 25,
+    "Area": 3004,
+    "CreateCondition1": 0,
+    "CreateParameter1": [],
+    "CreateCondition2": 0,
+    "CreateParameter2": [],
+    "DisappearCondition": 0,
+    "DisappearConditionParameter": [],
+    "AppearTime": [
+      700,
+      2000
+    ],
+    "VisitDisplay": false,
+    "Icon": "",
+    "Prefab": "",
+    "DialogueWay": true,
+    "Disappear": false,
+    "Repeat": false,
+    "Hide": true,
+    "Description": "戏楼最小的\"账房先生\",专管登记来客"
+  },
+  {
+    "Id": 1076,
+    "Type": 7,
+    "Name": "果果",
+    "RelatedId": 0,
+    "DialogueWithOptions": [],
+    "BubbleText": 0,
+    "FixedPoint": true,
+    "MoveSpeed": 25,
+    "Area": 3005,
+    "CreateCondition1": 0,
+    "CreateParameter1": [],
+    "CreateCondition2": 0,
+    "CreateParameter2": [],
+    "DisappearCondition": 0,
+    "DisappearConditionParameter": [],
+    "AppearTime": [
+      700,
+      2000
+    ],
+    "VisitDisplay": false,
+    "Icon": "",
+    "Prefab": "",
+    "DialogueWay": true,
+    "Disappear": false,
+    "Repeat": false,
+    "Hide": true,
+    "Description": "戏楼最小的\"账房先生\",专管登记来客"
+  },
   {
     "Id": 3002009,
     "Type": 2,

src/api/config/PackageConfigCategory.json

@@ -508,5 +508,20 @@
     "ResetType": 0,
     "LimitNum": 1,
     "Award": 938
+  },
+  {
+    "Id": 409,
+    "Name": "扶疏栈",
+    "Type": 4,
+    "BuyType": 3,
+    "Parameter": 640,
+    "OriginalPrice": 840,
+    "ShowCondition": 1,
+    "UnlockParameter": 15,
+    "DisplayCondition": 1,
+    "DisplayParameter": 0,
+    "ResetType": 0,
+    "LimitNum": 1,
+    "Award": 939
   }
 ]

src/api/config/RegionBuildFunctionConfigCategory.json

@@ -29,6 +29,60 @@
     "TransportSpeed": 50,
     "TransportItemNum": 99999
   },
+  {
+    "Id": 1101,
+    "ResourcesPointId": 0,
+    "VillagerNum": 20
+  },
+  {
+    "Id": 1102,
+    "ResourcesPointId": 0,
+    "VillagerNum": 22
+  },
+  {
+    "Id": 1103,
+    "ResourcesPointId": 0,
+    "VillagerNum": 24
+  },
+  {
+    "Id": 1104,
+    "ResourcesPointId": 0,
+    "VillagerNum": 26
+  },
+  {
+    "Id": 1105,
+    "ResourcesPointId": 0,
+    "VillagerNum": 28
+  },
+  {
+    "Id": 1106,
+    "ResourcesPointId": 0,
+    "VillagerNum": 30
+  },
+  {
+    "Id": 1107,
+    "ResourcesPointId": 0,
+    "VillagerNum": 32
+  },
+  {
+    "Id": 1108,
+    "ResourcesPointId": 0,
+    "VillagerNum": 34
+  },
+  {
+    "Id": 1109,
+    "ResourcesPointId": 0,
+    "VillagerNum": 36
+  },
+  {
+    "Id": 1110,
+    "ResourcesPointId": 0,
+    "VillagerNum": 38
+  },
+  {
+    "Id": 1200,
+    "ResourcesPointId": 0
+  },
   {
     "Id": 2004,
     "ResourcesPointId": 1003
@@ -55,6 +109,60 @@
     "TransportSpeed": 50,
     "TransportItemNum": 99999
   },
+  {
+    "Id": 2101,
+    "ResourcesPointId": 0,
+    "VillagerNum": 20
+  },
+  {
+    "Id": 2102,
+    "ResourcesPointId": 0,
+    "VillagerNum": 22
+  },
+  {
+    "Id": 2103,
+    "ResourcesPointId": 0,
+    "VillagerNum": 24
+  },
+  {
+    "Id": 2104,
+    "ResourcesPointId": 0,
+    "VillagerNum": 26
+  },
+  {
+    "Id": 2105,
+    "ResourcesPointId": 0,
+    "VillagerNum": 28
+  },
+  {
+    "Id": 2106,
+    "ResourcesPointId": 0,
+    "VillagerNum": 30
+  },
+  {
+    "Id": 2107,
+    "ResourcesPointId": 0,
+    "VillagerNum": 32
+  },
+  {
+    "Id": 2108,
+    "ResourcesPointId": 0,
+    "VillagerNum": 34
+  },
+  {
+    "Id": 2109,
+    "ResourcesPointId": 0,
+    "VillagerNum": 36
+  },
+  {
+    "Id": 2110,
+    "ResourcesPointId": 0,
+    "VillagerNum": 38
+  },
+  {
+    "Id": 2200,
+    "ResourcesPointId": 0
+  },
   {
     "Id": 3004,
     "ResourcesPointId": 1004
@@ -81,6 +189,60 @@
     "TransportSpeed": 50,
     "TransportItemNum": 99999
   },
+  {
+    "Id": 3101,
+    "ResourcesPointId": 0,
+    "VillagerNum": 20
+  },
+  {
+    "Id": 3102,
+    "ResourcesPointId": 0,
+    "VillagerNum": 22
+  },
+  {
+    "Id": 3103,
+    "ResourcesPointId": 0,
+    "VillagerNum": 24
+  },
+  {
+    "Id": 3104,
+    "ResourcesPointId": 0,
+    "VillagerNum": 26
+  },
+  {
+    "Id": 3105,
+    "ResourcesPointId": 0,
+    "VillagerNum": 28
+  },
+  {
+    "Id": 3106,
+    "ResourcesPointId": 0,
+    "VillagerNum": 30
+  },
+  {
+    "Id": 3107,
+    "ResourcesPointId": 0,
+    "VillagerNum": 32
+  },
+  {
+    "Id": 3108,
+    "ResourcesPointId": 0,
+    "VillagerNum": 34
+  },
+  {
+    "Id": 3109,
+    "ResourcesPointId": 0,
+    "VillagerNum": 36
+  },
+  {
+    "Id": 3110,
+    "ResourcesPointId": 0,
+    "VillagerNum": 38
+  },
+  {
+    "Id": 3200,
+    "ResourcesPointId": 0
+  },
   {
     "Id": 4004,
     "ResourcesPointId": 1005
@@ -115,5 +277,59 @@
   {
     "Id": 4025,
     "ResourcesPointId": 1007
+  },
+  {
+    "Id": 4101,
+    "ResourcesPointId": 0,
+    "VillagerNum": 20
+  },
+  {
+    "Id": 4102,
+    "ResourcesPointId": 0,
+    "VillagerNum": 22
+  },
+  {
+    "Id": 4103,
+    "ResourcesPointId": 0,
+    "VillagerNum": 24
+  },
+  {
+    "Id": 4104,
+    "ResourcesPointId": 0,
+    "VillagerNum": 26
+  },
+  {
+    "Id": 4105,
+    "ResourcesPointId": 0,
+    "VillagerNum": 28
+  },
+  {
+    "Id": 4106,
+    "ResourcesPointId": 0,
+    "VillagerNum": 30
+  },
+  {
+    "Id": 4107,
+    "ResourcesPointId": 0,
+    "VillagerNum": 32
+  },
+  {
+    "Id": 4108,
+    "ResourcesPointId": 0,
+    "VillagerNum": 34
+  },
+  {
+    "Id": 4109,
+    "ResourcesPointId": 0,
+    "VillagerNum": 36
+  },
+  {
+    "Id": 4110,
+    "ResourcesPointId": 0,
+    "VillagerNum": 38
+  },
+  {
+    "Id": 4200,
+    "ResourcesPointId": 0
   }
 ]

src/api/config/RegionGiftConfigCategory.json

@@ -1,7 +1,9 @@
 [
   {
     "Id": 1,
+    "Type": 1,
     "RegionId": 3002,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       1000
@@ -16,7 +18,9 @@
   },
   {
     "Id": 2,
+    "Type": 1,
     "RegionId": 3002,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       2000
@@ -31,7 +35,9 @@
   },
   {
     "Id": 3,
+    "Type": 1,
     "RegionId": 3002,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       3000
@@ -46,7 +52,9 @@
   },
   {
     "Id": 4,
+    "Type": 1,
     "RegionId": 3003,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       1000
@@ -61,7 +69,9 @@
   },
   {
     "Id": 5,
+    "Type": 1,
     "RegionId": 3003,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       2000
@@ -76,7 +86,9 @@
   },
   {
     "Id": 6,
+    "Type": 1,
     "RegionId": 3003,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       3000
@@ -91,7 +103,9 @@
   },
   {
     "Id": 7,
+    "Type": 1,
     "RegionId": 3004,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       1000
@@ -106,7 +120,9 @@
   },
   {
     "Id": 8,
+    "Type": 1,
     "RegionId": 3004,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       2000
@@ -121,7 +137,9 @@
   },
   {
     "Id": 9,
+    "Type": 1,
     "RegionId": 3004,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       3000
@@ -136,7 +154,9 @@
   },
   {
     "Id": 10,
+    "Type": 1,
     "RegionId": 3005,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       1000
@@ -151,7 +171,9 @@
   },
   {
     "Id": 11,
+    "Type": 1,
     "RegionId": 3005,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       2000
@@ -166,7 +188,9 @@
   },
   {
     "Id": 12,
+    "Type": 1,
     "RegionId": 3005,
+    "Wedding": -1,
     "Condition": 3,
     "ConditionParameter": [
       3000
@@ -178,5 +202,770 @@
     "LetterBegin": "桃谷的大家，",
     "LetterContent": "遥想吾友，不知近况如何。山清水秀，还望山谷的各位常到青山镇瞧瞧！\\n恰逢丰收，随信为山谷寄去了一些食材与种子，藉表敬意。",
     "LetterEnd": "青山镇"
+  },
+  {
+    "Id": 1000,
+    "Type": 2,
+    "RegionId": 2004,
+    "Wedding": -1,
+    "Condition": 6,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 4,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 14001,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "得赴鸾凤和鸣之盛典，幸甚至哉。婚礼之上，新人之情意如春风化雨，润泽心田，满堂祥和喜悦之气。\\n备下薄礼，祈纳福泽。",
+    "LetterEnd": "陶渊明"
+  },
+  {
+    "Id": 1001,
+    "Type": 2,
+    "RegionId": 3002,
+    "Wedding": -1,
+    "Condition": 6,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 4,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 14002,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "昨日有幸受邀，赴桃谷共贺新婚之喜！新人佳偶天成，礼宴热闹非凡，渔溪村众人皆感喜气撞满怀！席间美酒佳肴，欢声笑语，至今回味。\\n为表庆贺，特备薄礼奉上。",
+    "LetterEnd": "渔溪村"
+  },
+  {
+    "Id": 1002,
+    "Type": 2,
+    "RegionId": 3003,
+    "Wedding": -1,
+    "Condition": 6,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 4,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 14003,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "昨日婚礼热闹红火，新人的笑容如同最明亮的炉火，温暖了在座每一位宾客的心。大家的热情款待，我们铭记于心。\\n特此送上贺礼，望不嫌弃。",
+    "LetterEnd": "赤丘山"
+  },
+  {
+    "Id": 1003,
+    "Type": 2,
+    "RegionId": 3004,
+    "Wedding": -1,
+    "Condition": 6,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 4,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 14004,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "昨日婚宴，好酒好肉，欢歌笑语，新娘子俊，新郎官棒，真是天造地设的一对儿！咱们虽然嘴笨了些，但心里是真替你们高兴！\\n没啥贵重东西，一点心意，望收下。",
+    "LetterEnd": "太姥村"
+  },
+  {
+    "Id": 1004,
+    "Type": 2,
+    "RegionId": 3005,
+    "Wedding": -1,
+    "Condition": 6,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 4,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 14005,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "承蒙盛情相邀，得以见证良缘缔结，深感荣幸。婚礼典雅温馨，新人间情意缱绻，如清风拂过竹林，令人心旷神怡。\\n谨奉贺仪，聊表心意。",
+    "LetterEnd": "青山镇"
+  },
+  {
+    "Id": 2001,
+    "Type": 3,
+    "RegionId": 3002,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "承蒙贵村厚爱，惠允缔结两姓之好。所赠聘礼已如数敬领，今谨备奁赀若干随函奉上，惟愿永结朱陈之好，共谱姻娅之欢。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 2002,
+    "Type": 3,
+    "RegionId": 3002,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "荷蒙贵村垂青，慨允两姓联姻。聘礼已虔诚拜受，兹具奁赀若干恭呈，冀望永缔秦晋之盟，长续门楣之庆。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 2003,
+    "Type": 3,
+    "RegionId": 3002,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵村雅意，玉成儿女姻缘。聘仪已恭谨收纳，今特备奁赀若干奉上，愿结两姓百年之好，共襄宗族之荣。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 2004,
+    "Type": 3,
+    "RegionId": 3002,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "幸蒙贵村厚赐，允诺朱陈之约。聘礼已虔心领受，随函谨呈奁赀若干，但求永固姻亲之谊，同享瓜瓞之绵。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 2005,
+    "Type": 3,
+    "RegionId": 3002,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "伏承贵村隆情，惠允缔结婚盟。聘物已如礼敬收，今备奁赀若干附呈，惟祈永结两姓之欢，长保门庭之睦。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 2006,
+    "Type": 3,
+    "RegionId": 3002,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12101,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "承蒙贵村厚爱，许{0}{1}{2}门庭。今依礼呈送聘礼，以表诚敬之心。日后必当勤勉持家，和睦乡里，不负众望。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 2007,
+    "Type": 3,
+    "RegionId": 3002,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12101,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "荷蒙贵宅垂青，许{0}{1}{2}家门。兹依礼奉上聘礼，聊表寸心。日后必当同心协力，光耀门楣，以报知遇之恩。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 2008,
+    "Type": 3,
+    "RegionId": 3002,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12101,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵村高义，允我村{2}与贵村{0}缔缘。现循旧俗纳聘，虽礼薄而情真。此后当以勤勉立户，以和睦持村，共护两境安康。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 2009,
+    "Type": 3,
+    "RegionId": 3002,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12101,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "幸得贵府厚待，准{0}与{2}共结秦晋。今依俗纳聘，虔具薄仪，伏祈笑纳。来日定当互敬互爱，敦亲睦邻，以慰高堂之望。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 2010,
+    "Type": 3,
+    "RegionId": 3002,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12101,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵宅雅意，允{0}{1}{2}宗族。现依礼呈递聘书，并奉微礼，以彰诚意。嗣后必当勤俭持家，和睦邻里，不负两家之托。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 3001,
+    "Type": 3,
+    "RegionId": 3003,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "承蒙贵村厚爱，惠允缔结两姓之好。所赠聘礼已如数敬领，今谨备奁赀若干随函奉上，惟愿永结朱陈之好，共谱姻娅之欢。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 3002,
+    "Type": 3,
+    "RegionId": 3003,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "荷蒙贵村垂青，慨允两姓联姻。聘礼已虔诚拜受，兹具奁赀若干恭呈，冀望永缔秦晋之盟，长续门楣之庆。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 3003,
+    "Type": 3,
+    "RegionId": 3003,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵村雅意，玉成儿女姻缘。聘仪已恭谨收纳，今特备奁赀若干奉上，愿结两姓百年之好，共襄宗族之荣。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 3004,
+    "Type": 3,
+    "RegionId": 3003,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "幸蒙贵村厚赐，允诺朱陈之约。聘礼已虔心领受，随函谨呈奁赀若干，但求永固姻亲之谊，同享瓜瓞之绵。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 3005,
+    "Type": 3,
+    "RegionId": 3003,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "伏承贵村隆情，惠允缔结婚盟。聘物已如礼敬收，今备奁赀若干附呈，惟祈永结两姓之欢，长保门庭之睦。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 3006,
+    "Type": 3,
+    "RegionId": 3003,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12102,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "承蒙贵村厚爱，许{0}{1}{2}门庭。今依礼呈送聘礼，以表诚敬之心。日后必当勤勉持家，和睦乡里，不负众望。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 3007,
+    "Type": 3,
+    "RegionId": 3003,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12102,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "荷蒙贵宅垂青，许{0}{1}{2}家门。兹依礼奉上聘礼，聊表寸心。日后必当同心协力，光耀门楣，以报知遇之恩。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 3008,
+    "Type": 3,
+    "RegionId": 3003,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12102,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵村高义，允我村{2}与贵村{0}缔缘。现循旧俗纳聘，虽礼薄而情真。此后当以勤勉立户，以和睦持村，共护两境安康。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 3009,
+    "Type": 3,
+    "RegionId": 3003,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12102,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "幸得贵府厚待，准{0}与{2}共结秦晋。今依俗纳聘，虔具薄仪，伏祈笑纳。来日定当互敬互爱，敦亲睦邻，以慰高堂之望。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 3010,
+    "Type": 3,
+    "RegionId": 3003,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12102,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵宅雅意，允{0}{1}{2}宗族。现依礼呈递聘书，并奉微礼，以彰诚意。嗣后必当勤俭持家，和睦邻里，不负两家之托。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 4001,
+    "Type": 3,
+    "RegionId": 3004,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "承蒙贵村厚爱，惠允缔结两姓之好。所赠聘礼已如数敬领，今谨备奁赀若干随函奉上，惟愿永结朱陈之好，共谱姻娅之欢。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 4002,
+    "Type": 3,
+    "RegionId": 3004,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "荷蒙贵村垂青，慨允两姓联姻。聘礼已虔诚拜受，兹具奁赀若干恭呈，冀望永缔秦晋之盟，长续门楣之庆。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 4003,
+    "Type": 3,
+    "RegionId": 3004,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵村雅意，玉成儿女姻缘。聘仪已恭谨收纳，今特备奁赀若干奉上，愿结两姓百年之好，共襄宗族之荣。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 4004,
+    "Type": 3,
+    "RegionId": 3004,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "幸蒙贵村厚赐，允诺朱陈之约。聘礼已虔心领受，随函谨呈奁赀若干，但求永固姻亲之谊，同享瓜瓞之绵。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 4005,
+    "Type": 3,
+    "RegionId": 3004,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "伏承贵村隆情，惠允缔结婚盟。聘物已如礼敬收，今备奁赀若干附呈，惟祈永结两姓之欢，长保门庭之睦。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 4006,
+    "Type": 3,
+    "RegionId": 3004,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12103,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "承蒙贵村厚爱，许{0}{1}{2}门庭。今依礼呈送聘礼，以表诚敬之心。日后必当勤勉持家，和睦乡里，不负众望。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 4007,
+    "Type": 3,
+    "RegionId": 3004,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12103,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "荷蒙贵宅垂青，许{0}{1}{2}家门。兹依礼奉上聘礼，聊表寸心。日后必当同心协力，光耀门楣，以报知遇之恩。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 4008,
+    "Type": 3,
+    "RegionId": 3004,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12103,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵村高义，允我村{2}与贵村{0}缔缘。现循旧俗纳聘，虽礼薄而情真。此后当以勤勉立户，以和睦持村，共护两境安康。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 4009,
+    "Type": 3,
+    "RegionId": 3004,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12103,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "幸得贵府厚待，准{0}与{2}共结秦晋。今依俗纳聘，虔具薄仪，伏祈笑纳。来日定当互敬互爱，敦亲睦邻，以慰高堂之望。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 4010,
+    "Type": 3,
+    "RegionId": 3004,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12103,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵宅雅意，允{0}{1}{2}宗族。现依礼呈递聘书，并奉微礼，以彰诚意。嗣后必当勤俭持家，和睦邻里，不负两家之托。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 5001,
+    "Type": 3,
+    "RegionId": 3005,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "承蒙贵村厚爱，惠允缔结两姓之好。所赠聘礼已如数敬领，今谨备奁赀若干随函奉上，惟愿永结朱陈之好，共谱姻娅之欢。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 5002,
+    "Type": 3,
+    "RegionId": 3005,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "荷蒙贵村垂青，慨允两姓联姻。聘礼已虔诚拜受，兹具奁赀若干恭呈，冀望永缔秦晋之盟，长续门楣之庆。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 5003,
+    "Type": 3,
+    "RegionId": 3005,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵村雅意，玉成儿女姻缘。聘仪已恭谨收纳，今特备奁赀若干奉上，愿结两姓百年之好，共襄宗族之荣。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 5004,
+    "Type": 3,
+    "RegionId": 3005,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "幸蒙贵村厚赐，允诺朱陈之约。聘礼已虔心领受，随函谨呈奁赀若干，但求永固姻亲之谊，同享瓜瓞之绵。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 5005,
+    "Type": 3,
+    "RegionId": 3005,
+    "Wedding": 2,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12100,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "伏承贵村隆情，惠允缔结婚盟。聘物已如礼敬收，今备奁赀若干附呈，惟祈永结两姓之欢，长保门庭之睦。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 5006,
+    "Type": 3,
+    "RegionId": 3005,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12104,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "承蒙贵村厚爱，许{0}{1}{2}门庭。今依礼呈送聘礼，以表诚敬之心。日后必当勤勉持家，和睦乡里，不负众望。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 5007,
+    "Type": 3,
+    "RegionId": 3005,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12104,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "荷蒙贵宅垂青，许{0}{1}{2}家门。兹依礼奉上聘礼，聊表寸心。日后必当同心协力，光耀门楣，以报知遇之恩。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 5008,
+    "Type": 3,
+    "RegionId": 3005,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12104,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵村高义，允我村{2}与贵村{0}缔缘。现循旧俗纳聘，虽礼薄而情真。此后当以勤勉立户，以和睦持村，共护两境安康。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 5009,
+    "Type": 3,
+    "RegionId": 3005,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12104,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "幸得贵府厚待，准{0}与{2}共结秦晋。今依俗纳聘，虔具薄仪，伏祈笑纳。来日定当互敬互爱，敦亲睦邻，以慰高堂之望。",
+    "LetterEnd": "{0}{1}的亲属"
+  },
+  {
+    "Id": 5010,
+    "Type": 3,
+    "RegionId": 3005,
+    "Wedding": 1,
+    "Condition": 7,
+    "ConditionParameter": [
+      0
+    ],
+    "GiftBagLevel": 2,
+    "SendTimes": -1,
+    "GiftBagIcon": "",
+    "GiftBagItem": 12104,
+    "LetterBegin": "桃谷的大家，",
+    "LetterContent": "仰承贵宅雅意，允{0}{1}{2}宗族。现依礼呈递聘书，并奉微礼，以彰诚意。嗣后必当勤俭持家，和睦邻里，不负两家之托。",
+    "LetterEnd": "{0}{1}的亲属"
   }
 ]

src/api/config/ReputationShopItemGroupConfigCategory.json

@@ -538,6 +538,28 @@
     "ScaleCondition": 10,
     "RefreshCycle": 0
   },
+  {
+    "Id": 50,
+    "Region": 3002,
+    "ItemId": 7077,
+    "Number": 1,
+    "Currency": 1,
+    "Price": 10000,
+    "ReputationConditon": 6000,
+    "ScaleCondition": 18,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 51,
+    "Region": 3002,
+    "ItemId": 7080,
+    "Number": 1,
+    "Currency": 1,
+    "Price": 20000,
+    "ReputationConditon": 3000,
+    "ScaleCondition": 8,
+    "RefreshCycle": 0
+  },
   {
     "Id": 1002,
     "Region": 3003,
@@ -1341,6 +1363,28 @@
     "ScaleCondition": 16,
     "RefreshCycle": 1
   },
+  {
+    "Id": 2033,
+    "Region": 3004,
+    "ItemId": 7167,
+    "Number": 1,
+    "Currency": 1,
+    "Price": 100000,
+    "ReputationConditon": 6000,
+    "ScaleCondition": 21,
+    "RefreshCycle": 0
+  },
+  {
+    "Id": 2034,
+    "Region": 3004,
+    "ItemId": 7522,
+    "Number": 1,
+    "Currency": 1,
+    "Price": 2000000,
+    "ReputationConditon": 6000,
+    "ScaleCondition": 16,
+    "RefreshCycle": 0
+  },
   {
     "Id": 3001,
     "Region": 3005,
@@ -1350,7 +1394,7 @@
     "Price": 2000,
     "ReputationConditon": 1000,
     "ScaleCondition": 16,
-    "RefreshCycle": 1
+    "RefreshCycle": 3
   },
   {
     "Id": 3002,
@@ -1595,14 +1639,14 @@
     "RefreshCycle": 0
   },
   {
-    "Id": 3024,
+    "Id": 3025,
     "Region": 3005,
-    "ItemId": 7522,
+    "ItemId": 7168,
     "Number": 1,
     "Currency": 1,
-    "Price": 2000000,
+    "Price": 200000,
     "ReputationConditon": 6000,
-    "ScaleCondition": 20,
+    "ScaleCondition": 21,
     "RefreshCycle": 0
   }
 ]

src/api/config/RewardGroupConfigCategory.json

@@ -1670,6 +1670,21 @@
       1
     ]
   },
+  {
+    "Id": 939,
+    "ItemId": [
+      9021,
+      9022,
+      9023,
+      9024
+    ],
+    "Number": [
+      1,
+      1,
+      1,
+      1
+    ]
+  },
   {
     "Id": 1001,
     "ItemId": [
@@ -1870,6 +1885,15 @@
       6600
     ]
   },
+  {
+    "Id": 2020,
+    "ItemId": [
+      706
+    ],
+    "Number": [
+      1
+    ]
+  },
   {
     "Id": 3001,
     "ItemId": [
@@ -2669,6 +2693,19 @@
       1
     ]
   },
+  {
+    "Id": 4043,
+    "ItemId": [
+      210000,
+      316,
+      7324
+    ],
+    "Number": [
+      500,
+      1,
+      1
+    ]
+  },
   {
     "Id": 5001,
     "ItemId": [
@@ -3801,6 +3838,71 @@
       66
     ]
   },
+  {
+    "Id": 12100,
+    "ItemId": [
+      112,
+      701,
+      2053
+    ],
+    "Number": [
+      10,
+      5,
+      1
+    ]
+  },
+  {
+    "Id": 12101,
+    "ItemId": [
+      113,
+      701,
+      2053
+    ],
+    "Number": [
+      10,
+      5,
+      1
+    ]
+  },
+  {
+    "Id": 12102,
+    "ItemId": [
+      129,
+      701,
+      2053
+    ],
+    "Number": [
+      20,
+      5,
+      1
+    ]
+  },
+  {
+    "Id": 12103,
+    "ItemId": [
+      143,
+      701,
+      2053
+    ],
+    "Number": [
+      10,
+      5,
+      1
+    ]
+  },
+  {
+    "Id": 12104,
+    "ItemId": [
+      112,
+      701,
+      2053
+    ],
+    "Number": [
+      10,
+      5,
+      1
+    ]
+  },
   {
     "Id": 13001,
     "ItemId": [
@@ -3837,6 +3939,61 @@
       5
     ]
   },
+  {
+    "Id": 14001,
+    "ItemId": [
+      7324,
+      7321
+    ],
+    "Number": [
+      1,
+      1
+    ]
+  },
+  {
+    "Id": 14002,
+    "ItemId": [
+      7324,
+      113
+    ],
+    "Number": [
+      1,
+      10
+    ]
+  },
+  {
+    "Id": 14003,
+    "ItemId": [
+      7324,
+      129
+    ],
+    "Number": [
+      1,
+      10
+    ]
+  },
+  {
+    "Id": 14004,
+    "ItemId": [
+      7324,
+      143
+    ],
+    "Number": [
+      1,
+      10
+    ]
+  },
+  {
+    "Id": 14005,
+    "ItemId": [
+      7324,
+      112
+    ],
+    "Number": [
+      1,
+      10
+    ]
+  },
   {
     "Id": 20000,
     "ItemId": [

src/api/config/ScaleConfigCategory.json

@@ -423,7 +423,7 @@
       110003,
       1000
     ],
-    "RewardGroup": 0,
+    "RewardGroup": 2020,
     "Nomad": 10,
     "BusinessMan": 1015,
     "MonsterWaves": [
@@ -437,5 +437,23 @@
     "OrdinaryAward": 16,
     "ChallengeAward": 2016,
     "MassacreBoss": 21017
+  },
+  {
+    "Id": 21,
+    "ScaleName": "无忧",
+    "Prosperity": 75000,
+    "Copper": 1000000,
+    "Structure": 0,
+    "PrestigeCondition": [],
+    "RewardGroup": 0,
+    "Nomad": 10,
+    "BusinessMan": 1015,
+    "MonsterWaves": [],
+    "Challenge": 0,
+    "FourEvilsBoss": 20004,
+    "EarlyStageWar": 0,
+    "OrdinaryAward": 0,
+    "ChallengeAward": 0,
+    "MassacreBoss": 0
   }
 ]

src/api/config/ScaleLimitConfigCategory.json

@@ -43,5 +43,10 @@
     "Id": 9,
     "Day": 15,
     "ScaleName": 20
+  },
+  {
+    "Id": 10,
+    "Day": 19,
+    "ScaleName": 21
   }
 ]

src/api/config/ShiWeiTianExchageItemGroupConfigCategory.json

@@ -102,6 +102,6 @@
     "GroupId": 5,
     "ItemId": 705,
     "ConsumeNum": 1000,
-    "ExchangeTimes": 1
+    "ExchangeTimes": 2
   }
 ]

src/api/config/SkillBuffConfigCategory.json

@@ -302,7 +302,7 @@
   {
     "Id": 13,
     "Name": "还阳",
-    "TriggerTime": 7,
+    "TriggerTime": 1,
     "TriggerParameter": 0,
     "Gain": 1,
     "Immunity": false,
@@ -317,13 +317,36 @@
     "Overlay": false,
     "OverlayMax": 0,
     "BarShow": false,
-    "BattleShow": true,
+    "BattleShow": false,
     "SpecialStatus": 0,
     "DisplayLocation": 0,
     "Icon": "Skill_Icon_9",
     "BuffEffectPrefab": "",
     "Describe": "死亡后，立刻复活，并恢复50%血量"
   },
+  {
+    "Id": 14,
+    "Name": "还阳",
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
+    "Gain": 1,
+    "Immunity": false,
+    "Disperse": false,
+    "CanBringInBoss": false,
+    "BuffProbability": 100,
+    "LinkEffect": [],
+    "ContinuedType": 2,
+    "ContinuedParameter": 1,
+    "Overlay": false,
+    "OverlayMax": 0,
+    "BarShow": false,
+    "BattleShow": false,
+    "SpecialStatus": 0,
+    "DisplayLocation": 0,
+    "Icon": "Skill_Icon_9",
+    "BuffEffectPrefab": "FX_Talent_XiaoGui",
+    "Describe": ""
+  },
   {
     "Id": 101,
     "Name": "跌打散",
@@ -14050,7 +14073,7 @@
   },
   {
     "Id": 1781,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "TriggerTime": 1,
     "TriggerParameter": 0,
     "Gain": 1,
@@ -14073,11 +14096,11 @@
     "DisplayLocation": 0,
     "Icon": "Skill_Icon_1781",
     "BuffEffectPrefab": "",
-    "Describe": "免伤提升6%"
+    "Describe": "攻击力提升1%"
   },
   {
     "Id": 1782,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "TriggerTime": 1,
     "TriggerParameter": 0,
     "Gain": 1,
@@ -14100,11 +14123,11 @@
     "DisplayLocation": 0,
     "Icon": "Skill_Icon_1781",
     "BuffEffectPrefab": "",
-    "Describe": "免伤提升7%"
+    "Describe": "攻击力提升2%"
   },
   {
     "Id": 1783,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "TriggerTime": 1,
     "TriggerParameter": 0,
     "Gain": 1,
@@ -14127,11 +14150,11 @@
     "DisplayLocation": 0,
     "Icon": "Skill_Icon_1781",
     "BuffEffectPrefab": "",
-    "Describe": "免伤提升8%"
+    "Describe": "攻击力提升3%"
   },
   {
     "Id": 1784,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "TriggerTime": 1,
     "TriggerParameter": 0,
     "Gain": 1,
@@ -14154,11 +14177,11 @@
     "DisplayLocation": 0,
     "Icon": "Skill_Icon_1781",
     "BuffEffectPrefab": "",
-    "Describe": "免伤提升9%"
+    "Describe": "攻击力提升4%"
   },
   {
     "Id": 1785,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "TriggerTime": 1,
     "TriggerParameter": 0,
     "Gain": 1,
@@ -14181,11 +14204,11 @@
     "DisplayLocation": 0,
     "Icon": "Skill_Icon_1781",
     "BuffEffectPrefab": "",
-    "Describe": "免伤提升10%"
+    "Describe": "攻击力提升5%"
   },
   {
     "Id": 1786,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "TriggerTime": 1,
     "TriggerParameter": 0,
     "Gain": 1,
@@ -14208,11 +14231,11 @@
     "DisplayLocation": 0,
     "Icon": "Skill_Icon_1781",
     "BuffEffectPrefab": "",
-    "Describe": "免伤提升11%"
+    "Describe": "攻击力提升6%"
   },
   {
     "Id": 1787,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "TriggerTime": 1,
     "TriggerParameter": 0,
     "Gain": 1,
@@ -14235,11 +14258,11 @@
     "DisplayLocation": 0,
     "Icon": "Skill_Icon_1781",
     "BuffEffectPrefab": "",
-    "Describe": "免伤提升12%"
+    "Describe": "攻击力提升7%"
   },
   {
     "Id": 1788,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "TriggerTime": 1,
     "TriggerParameter": 0,
     "Gain": 1,
@@ -14262,11 +14285,11 @@
     "DisplayLocation": 0,
     "Icon": "Skill_Icon_1781",
     "BuffEffectPrefab": "",
-    "Describe": "免伤提升13%"
+    "Describe": "攻击力提升8%"
   },
   {
     "Id": 1789,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "TriggerTime": 1,
     "TriggerParameter": 0,
     "Gain": 1,
@@ -14289,11 +14312,11 @@
     "DisplayLocation": 0,
     "Icon": "Skill_Icon_1781",
     "BuffEffectPrefab": "",
-    "Describe": "免伤提升14%"
+    "Describe": "攻击力提升9%"
   },
   {
     "Id": 1790,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "TriggerTime": 1,
     "TriggerParameter": 0,
     "Gain": 1,
@@ -14316,7 +14339,7 @@
     "DisplayLocation": 0,
     "Icon": "Skill_Icon_1781",
     "BuffEffectPrefab": "",
-    "Describe": "免伤提升15%"
+    "Describe": "攻击力提升10%"
   },
   {
     "Id": 1801,
@@ -21366,8 +21389,8 @@
   {
     "Id": 3612,
     "Name": "",
-    "TriggerTime": 3,
-    "TriggerParameter": 1,
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
     "Gain": 0,
     "Immunity": false,
     "Disperse": false,
@@ -21391,8 +21414,8 @@
   {
     "Id": 3613,
     "Name": "",
-    "TriggerTime": 3,
-    "TriggerParameter": 1,
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
     "Gain": 0,
     "Immunity": false,
     "Disperse": false,
@@ -21416,8 +21439,8 @@
   {
     "Id": 3614,
     "Name": "",
-    "TriggerTime": 3,
-    "TriggerParameter": 1,
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
     "Gain": 0,
     "Immunity": false,
     "Disperse": false,
@@ -21441,8 +21464,8 @@
   {
     "Id": 3615,
     "Name": "",
-    "TriggerTime": 3,
-    "TriggerParameter": 1,
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
     "Gain": 0,
     "Immunity": false,
     "Disperse": false,
@@ -21466,8 +21489,8 @@
   {
     "Id": 3616,
     "Name": "",
-    "TriggerTime": 3,
-    "TriggerParameter": 1,
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
     "Gain": 0,
     "Immunity": false,
     "Disperse": false,
@@ -21491,8 +21514,8 @@
   {
     "Id": 3617,
     "Name": "",
-    "TriggerTime": 3,
-    "TriggerParameter": 1,
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
     "Gain": 0,
     "Immunity": false,
     "Disperse": false,
@@ -21516,8 +21539,8 @@
   {
     "Id": 3618,
     "Name": "",
-    "TriggerTime": 3,
-    "TriggerParameter": 1,
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
     "Gain": 0,
     "Immunity": false,
     "Disperse": false,
@@ -21541,8 +21564,8 @@
   {
     "Id": 3619,
     "Name": "",
-    "TriggerTime": 3,
-    "TriggerParameter": 1,
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
     "Gain": 0,
     "Immunity": false,
     "Disperse": false,
@@ -21566,8 +21589,8 @@
   {
     "Id": 3620,
     "Name": "",
-    "TriggerTime": 3,
-    "TriggerParameter": 1,
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
     "Gain": 0,
     "Immunity": false,
     "Disperse": false,
@@ -21593,7 +21616,7 @@
     "Name": "",
     "TriggerTime": 1,
     "TriggerParameter": 0,
-    "Gain": 0,
+    "Gain": 2,
     "Immunity": false,
     "Disperse": false,
     "CanBringInBoss": false,
@@ -21618,7 +21641,7 @@
     "Name": "",
     "TriggerTime": 1,
     "TriggerParameter": 0,
-    "Gain": 0,
+    "Gain": 2,
     "Immunity": false,
     "Disperse": false,
     "CanBringInBoss": false,
@@ -21643,7 +21666,7 @@
     "Name": "",
     "TriggerTime": 1,
     "TriggerParameter": 0,
-    "Gain": 0,
+    "Gain": 2,
     "Immunity": false,
     "Disperse": false,
     "CanBringInBoss": false,
@@ -21668,7 +21691,7 @@
     "Name": "",
     "TriggerTime": 1,
     "TriggerParameter": 0,
-    "Gain": 0,
+    "Gain": 2,
     "Immunity": false,
     "Disperse": false,
     "CanBringInBoss": false,
@@ -21693,7 +21716,7 @@
     "Name": "",
     "TriggerTime": 1,
     "TriggerParameter": 0,
-    "Gain": 0,
+    "Gain": 2,
     "Immunity": false,
     "Disperse": false,
     "CanBringInBoss": false,
@@ -21718,7 +21741,7 @@
     "Name": "",
     "TriggerTime": 1,
     "TriggerParameter": 0,
-    "Gain": 0,
+    "Gain": 2,
     "Immunity": false,
     "Disperse": false,
     "CanBringInBoss": false,
@@ -21743,7 +21766,7 @@
     "Name": "",
     "TriggerTime": 1,
     "TriggerParameter": 0,
-    "Gain": 0,
+    "Gain": 2,
     "Immunity": false,
     "Disperse": false,
     "CanBringInBoss": false,
@@ -21768,7 +21791,7 @@
     "Name": "",
     "TriggerTime": 1,
     "TriggerParameter": 0,
-    "Gain": 0,
+    "Gain": 2,
     "Immunity": false,
     "Disperse": false,
     "CanBringInBoss": false,
@@ -21793,7 +21816,7 @@
     "Name": "",
     "TriggerTime": 1,
     "TriggerParameter": 0,
-    "Gain": 0,
+    "Gain": 2,
     "Immunity": false,
     "Disperse": false,
     "CanBringInBoss": false,
@@ -21818,7 +21841,7 @@
     "Name": "",
     "TriggerTime": 1,
     "TriggerParameter": 0,
-    "Gain": 0,
+    "Gain": 2,
     "Immunity": false,
     "Disperse": false,
     "CanBringInBoss": false,
@@ -21861,6 +21884,32 @@
     "BuffEffectPrefab": "",
     "Describe": "无法移动"
   },
+  {
+    "Id": 4061,
+    "Name": "",
+    "TriggerTime": 31,
+    "TriggerParameter": 0,
+    "Gain": 1,
+    "Immunity": false,
+    "Disperse": false,
+    "CanBringInBoss": false,
+    "BuffProbability": 100,
+    "LinkEffect": [
+      4061,
+      4062
+    ],
+    "ContinuedType": 14,
+    "ContinuedParameter": 0,
+    "Overlay": false,
+    "OverlayMax": 0,
+    "BarShow": false,
+    "BattleShow": false,
+    "SpecialStatus": 0,
+    "DisplayLocation": 0,
+    "Icon": "Buff_Icon_4061",
+    "BuffEffectPrefab": "",
+    "Describe": "攻击被闪避时，回复1点能量，回复1%最大生命值"
+  },
   {
     "Id": 8001,
     "Name": "童智",
@@ -28779,5 +28828,86 @@
     "Icon": "Buff_Icon_134103",
     "BuffEffectPrefab": "",
     "Describe": "吸收1500点伤害"
+  },
+  {
+    "Id": 150010,
+    "Name": "生命之力-1级",
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
+    "Gain": 1,
+    "Immunity": false,
+    "Disperse": false,
+    "CanBringInBoss": false,
+    "BuffProbability": 100,
+    "LinkEffect": [
+      150010
+    ],
+    "ContinuedType": 3,
+    "ContinuedParameter": 0,
+    "Overlay": false,
+    "OverlayMax": 0,
+    "SequenceId": 150010,
+    "SequenceLv": 1,
+    "BarShow": true,
+    "BattleShow": false,
+    "SpecialStatus": 0,
+    "DisplayLocation": 0,
+    "Icon": "Buff_Icon_150010",
+    "BuffEffectPrefab": "",
+    "Describe": "勇士生命提升5%"
+  },
+  {
+    "Id": 150011,
+    "Name": "生命之力-2级",
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
+    "Gain": 1,
+    "Immunity": false,
+    "Disperse": false,
+    "CanBringInBoss": false,
+    "BuffProbability": 100,
+    "LinkEffect": [
+      150011
+    ],
+    "ContinuedType": 3,
+    "ContinuedParameter": 0,
+    "Overlay": false,
+    "OverlayMax": 0,
+    "SequenceId": 150010,
+    "SequenceLv": 2,
+    "BarShow": true,
+    "BattleShow": false,
+    "SpecialStatus": 0,
+    "DisplayLocation": 0,
+    "Icon": "Buff_Icon_150011",
+    "BuffEffectPrefab": "",
+    "Describe": "勇士生命提升10%"
+  },
+  {
+    "Id": 150012,
+    "Name": "生命之力-3级",
+    "TriggerTime": 1,
+    "TriggerParameter": 0,
+    "Gain": 1,
+    "Immunity": false,
+    "Disperse": false,
+    "CanBringInBoss": false,
+    "BuffProbability": 100,
+    "LinkEffect": [
+      150012
+    ],
+    "ContinuedType": 3,
+    "ContinuedParameter": 0,
+    "Overlay": false,
+    "OverlayMax": 0,
+    "SequenceId": 150010,
+    "SequenceLv": 3,
+    "BarShow": true,
+    "BattleShow": false,
+    "SpecialStatus": 0,
+    "DisplayLocation": 0,
+    "Icon": "Buff_Icon_150012",
+    "BuffEffectPrefab": "",
+    "Describe": "勇士生命提升15%"
   }
 ]

src/api/config/SkillConfigCategory.json

@@ -343,7 +343,8 @@
     "Bullet": [],
     "RelatedSkillId": [],
     "Buff": [
-      13
+      13,
+      14
     ],
     "TargetBuff": [],
     "ImmortalTreeLv": 0,
@@ -357,7 +358,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_9",
     "Sound": "",
-    "Describe": "死亡后，立刻复活，并恢复50%血量，每2分钟只能触发一次",
+    "Describe": "受到致命伤害时，不会死亡，并且生命值立刻恢复到最大生命的50%，每2分钟可以触发一次",
     "Introduction": ""
   },
   {
@@ -1053,7 +1054,7 @@
     "VisualEffectPrefab": "FX_Skill_Lead_M",
     "Icon": "Skill_Icon_201",
     "Sound": "Sound_QiaoHe_Skill",
-    "Describe": "大力挥舞大剑，对周围敌人造5段、每段2.1倍攻击力的伤害,并有30%的概率降低目标40点攻击，持续5秒",
+    "Describe": "大力挥舞大剑，对周围敌人造5段、每段2.1倍攻击力的伤害,并有100%的概率降低目标40点攻击，持续0秒",
     "Introduction": ""
   },
   {
@@ -1102,7 +1103,7 @@
     "VisualEffectPrefab": "FX_Skill_Lead_M",
     "Icon": "Skill_Icon_201",
     "Sound": "Sound_QiaoHe_Skill",
-    "Describe": "大力挥舞大剑，对周围敌人造5段、每段2.1倍攻击力的伤害,并有30%的概率降低目标55点攻击，持续5秒",
+    "Describe": "大力挥舞大剑，对周围敌人造5段、每段2.1倍攻击力的伤害,并有100%的概率降低目标55点攻击，持续0秒",
     "Introduction": ""
   },
   {
@@ -1151,7 +1152,7 @@
     "VisualEffectPrefab": "FX_Skill_Lead_M",
     "Icon": "Skill_Icon_201",
     "Sound": "Sound_QiaoHe_Skill",
-    "Describe": "大力挥舞大剑，对周围敌人造5段、每段2.1倍攻击力的伤害,并有30%的概率降低目标70点攻击，持续5秒",
+    "Describe": "大力挥舞大剑，对周围敌人造5段、每段2.1倍攻击力的伤害,并有100%的概率降低目标70点攻击，持续0秒",
     "Introduction": ""
   },
   {
@@ -1200,7 +1201,7 @@
     "VisualEffectPrefab": "FX_Skill_Lead_M",
     "Icon": "Skill_Icon_201",
     "Sound": "Sound_QiaoHe_Skill",
-    "Describe": "大力挥舞大剑，对周围敌人造5段、每段2.1倍攻击力的伤害,并有30%的概率降低目标85点攻击，持续5秒",
+    "Describe": "大力挥舞大剑，对周围敌人造5段、每段2.1倍攻击力的伤害,并有100%的概率降低目标85点攻击，持续0秒",
     "Introduction": ""
   },
   {
@@ -1249,7 +1250,7 @@
     "VisualEffectPrefab": "FX_Skill_Lead_M",
     "Icon": "Skill_Icon_201",
     "Sound": "Sound_QiaoHe_Skill",
-    "Describe": "大力挥舞大剑，对周围敌人造5段、每段2.1倍攻击力的伤害,并有30%的概率降低目标100点攻击，持续5秒",
+    "Describe": "大力挥舞大剑，对周围敌人造5段、每段2.1倍攻击力的伤害,并有100%的概率降低目标100点攻击，持续0秒",
     "Introduction": ""
   },
   {
@@ -1597,7 +1598,7 @@
     "VisualEffectPrefab": "FX_Skill_Lead_F",
     "Icon": "Skill_Icon_221",
     "Sound": "Sound_TaoXiaoqing_Skill",
-    "Describe": "向前方射出三道暗器，造成3段、平均每段2.6倍攻击力的伤害，并降低目标10%的命中率，持续5秒",
+    "Describe": "向前方射出三道暗器，造成3段、平均每段2.6倍攻击力的伤害，并降低目标10%的命中率，持续0秒",
     "Introduction": ""
   },
   {
@@ -1655,7 +1656,7 @@
     "VisualEffectPrefab": "FX_Skill_Lead_F",
     "Icon": "Skill_Icon_221",
     "Sound": "Sound_TaoXiaoqing_Skill",
-    "Describe": "向前方射出三道暗器，造成3段、平均每段3倍攻击力的伤害，并降低目标15%的命中率，持续5秒",
+    "Describe": "向前方射出三道暗器，造成3段、平均每段3倍攻击力的伤害，并降低目标15%的命中率，持续0秒",
     "Introduction": ""
   },
   {
@@ -1713,7 +1714,7 @@
     "VisualEffectPrefab": "FX_Skill_Lead_F",
     "Icon": "Skill_Icon_221",
     "Sound": "Sound_TaoXiaoqing_Skill",
-    "Describe": "向前方射出三道暗器，造成3段、平均每段3.4倍攻击力的伤害，并降低目标20%的命中率，持续5秒",
+    "Describe": "向前方射出三道暗器，造成3段、平均每段3.4倍攻击力的伤害，并降低目标20%的命中率，持续0秒",
     "Introduction": ""
   },
   {
@@ -1771,7 +1772,7 @@
     "VisualEffectPrefab": "FX_Skill_Lead_F",
     "Icon": "Skill_Icon_221",
     "Sound": "Sound_TaoXiaoqing_Skill",
-    "Describe": "向前方射出三道暗器，造成3段、平均每段3.9倍攻击力的伤害，并降低目标25%的命中率，持续5秒",
+    "Describe": "向前方射出三道暗器，造成3段、平均每段3.9倍攻击力的伤害，并降低目标25%的命中率，持续0秒",
     "Introduction": ""
   },
   {
@@ -1829,7 +1830,7 @@
     "VisualEffectPrefab": "FX_Skill_Lead_F",
     "Icon": "Skill_Icon_221",
     "Sound": "Sound_TaoXiaoqing_Skill",
-    "Describe": "向前方射出三道暗器，造成3段、平均每段4.5倍攻击力的伤害，并降低目标30%的命中率，持续5秒",
+    "Describe": "向前方射出三道暗器，造成3段、平均每段4.5倍攻击力的伤害，并降低目标30%的命中率，持续0秒",
     "Introduction": ""
   },
   {
@@ -1889,7 +1890,7 @@
     "VisualEffectPrefab": "FX_Skill_Li",
     "Icon": "Skill_Icon_241",
     "Sound": "Sound_LiLinger_Skill",
-    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段1.5倍攻击力的伤害，并增加自身3%的攻击速度，持续10秒",
+    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段1.5倍攻击力的伤害，并增加自身3%的攻击速度，持续0秒",
     "Introduction": ""
   },
   {
@@ -1949,7 +1950,7 @@
     "VisualEffectPrefab": "FX_Skill_Li",
     "Icon": "Skill_Icon_241",
     "Sound": "Sound_LiLinger_Skill",
-    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段2倍攻击力的伤害，并增加自身6%的攻击速度，持续10秒",
+    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段2倍攻击力的伤害，并增加自身6%的攻击速度，持续0秒",
     "Introduction": ""
   },
   {
@@ -2009,7 +2010,7 @@
     "VisualEffectPrefab": "FX_Skill_Li",
     "Icon": "Skill_Icon_241",
     "Sound": "Sound_LiLinger_Skill",
-    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段2.5倍攻击力的伤害，并增加自身9%的攻击速度，持续10秒",
+    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段2.5倍攻击力的伤害，并增加自身9%的攻击速度，持续0秒",
     "Introduction": ""
   },
   {
@@ -2069,7 +2070,7 @@
     "VisualEffectPrefab": "FX_Skill_Li",
     "Icon": "Skill_Icon_241",
     "Sound": "Sound_LiLinger_Skill",
-    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段3倍攻击力的伤害，并增加自身12%的攻击速度，持续10秒",
+    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段3倍攻击力的伤害，并增加自身12%的攻击速度，持续0秒",
     "Introduction": ""
   },
   {
@@ -2129,7 +2130,7 @@
     "VisualEffectPrefab": "FX_Skill_Li",
     "Icon": "Skill_Icon_241",
     "Sound": "Sound_LiLinger_Skill",
-    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段3.5倍攻击力的伤害，并增加自身15%的攻击速度，持续10秒",
+    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段3.5倍攻击力的伤害，并增加自身15%的攻击速度，持续0秒",
     "Introduction": ""
   },
   {
@@ -2189,7 +2190,7 @@
     "VisualEffectPrefab": "FX_Skill_Li",
     "Icon": "Skill_Icon_241",
     "Sound": "Sound_LiLinger_Skill",
-    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段4倍攻击力的伤害，并增加自身18%的攻击速度，持续10秒",
+    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段4倍攻击力的伤害，并增加自身18%的攻击速度，持续0秒",
     "Introduction": ""
   },
   {
@@ -2249,7 +2250,7 @@
     "VisualEffectPrefab": "FX_Skill_Li",
     "Icon": "Skill_Icon_241",
     "Sound": "Sound_LiLinger_Skill",
-    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段4.5倍攻击力的伤害，并增加自身21%的攻击速度，持续10秒",
+    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段4.5倍攻击力的伤害，并增加自身21%的攻击速度，持续0秒",
     "Introduction": ""
   },
   {
@@ -2309,7 +2310,7 @@
     "VisualEffectPrefab": "FX_Skill_Li",
     "Icon": "Skill_Icon_241",
     "Sound": "Sound_LiLinger_Skill",
-    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段5倍攻击力的伤害，并增加自身24%的攻击速度，持续10秒",
+    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段5倍攻击力的伤害，并增加自身24%的攻击速度，持续0秒",
     "Introduction": ""
   },
   {
@@ -2369,7 +2370,7 @@
     "VisualEffectPrefab": "FX_Skill_Li",
     "Icon": "Skill_Icon_241",
     "Sound": "Sound_LiLinger_Skill",
-    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段5.5倍攻击力的伤害，并增加自身27%的攻击速度，持续10秒",
+    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段5.5倍攻击力的伤害，并增加自身27%的攻击速度，持续0秒",
     "Introduction": ""
   },
   {
@@ -2429,7 +2430,7 @@
     "VisualEffectPrefab": "FX_Skill_Li",
     "Icon": "Skill_Icon_241",
     "Sound": "Sound_LiLinger_Skill",
-    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段6倍攻击力的伤害，并增加自身30%的攻击速度，持续10秒",
+    "Describe": "凌空飞起，向前方一片敌人射出箭雨，造成平均每段6倍攻击力的伤害，并增加自身30%的攻击速度，持续0秒",
     "Introduction": ""
   },
   {
@@ -2486,7 +2487,7 @@
     "VisualEffectPrefab": "FX_Skill_MengHe",
     "Icon": "Skill_Icon_261",
     "Sound": "Sound_MengHe_Skill",
-    "Describe": "高速旋转手中的大锤，对周围的敌人共造成5段、每段1倍攻击力伤害，并降低目标5%的移动速度和攻击速度，持续5秒",
+    "Describe": "高速旋转手中的大锤，对周围的敌人共造成5段、每段1倍攻击力伤害，并降低目标5%的移动速度和攻击速度，持续0秒",
     "Introduction": ""
   },
   {
@@ -3048,7 +3049,7 @@
     "VisualEffectPrefab": "FX_Skill_HanFei",
     "Icon": "Skill_Icon_281",
     "Sound": "Sound_HanFei_Skill",
-    "Describe": "以迅雷不及掩耳之势，向敌人快速挥舞棍子，造成5段、每段1倍攻击力的伤害，并降低目标3%的防御，持续5秒",
+    "Describe": "以迅雷不及掩耳之势，向敌人快速挥舞棍子，造成5段、每段1倍攻击力的伤害，并降低目标3%的防御，持续0秒",
     "Introduction": ""
   },
   {
@@ -3728,7 +3729,7 @@
     "VisualEffectPrefab": "FX_Skill_MuRongWan",
     "Icon": "Skill_Icon_301",
     "Sound": "Sound_MurongWan_Skill",
-    "Describe": "治疗全队1300生命值，并增加每3秒恢复其60点生命值的效果，持续30秒",
+    "Describe": "治疗全队1300生命值，并增加每0秒恢复其60点生命值的效果，持续0秒",
     "Introduction": ""
   },
   {
@@ -4325,7 +4326,7 @@
     "VisualEffectPrefab": "FX_Skill_JiuJiu",
     "Icon": "Skill_Icon_341",
     "Sound": "",
-    "Describe": "对前方造成3段、每段.2倍攻击力的伤害，并获得-ATK_P*6.3%的吸血，持续10秒",
+    "Describe": "对前方造成3段、每段1.8倍攻击力的伤害，并获得10%的吸血，持续0秒",
     "Introduction": ""
   },
   {
@@ -4372,7 +4373,7 @@
     "VisualEffectPrefab": "FX_Skill_JiuJiu",
     "Icon": "Skill_Icon_341",
     "Sound": "",
-    "Describe": "对前方造成3段、每段1.8倍攻击力的伤害，并获得10%的吸血，持续10秒",
+    "Describe": "对前方造成3段、每段2.3倍攻击力的伤害，并获得10%的吸血，持续10秒",
     "Introduction": ""
   },
   {
@@ -4419,7 +4420,7 @@
     "VisualEffectPrefab": "FX_Skill_JiuJiu",
     "Icon": "Skill_Icon_341",
     "Sound": "",
-    "Describe": "对前方造成3段、每段2.3倍攻击力的伤害，并获得10%的吸血，持续10秒",
+    "Describe": "对前方造成3段、每段2.8倍攻击力的伤害，并获得10%的吸血，持续10秒",
     "Introduction": ""
   },
   {
@@ -4466,7 +4467,7 @@
     "VisualEffectPrefab": "FX_Skill_JiuJiu",
     "Icon": "Skill_Icon_341",
     "Sound": "",
-    "Describe": "对前方造成3段、每段2.8倍攻击力的伤害，并获得10%的吸血，持续10秒",
+    "Describe": "对前方造成3段、每段3.3倍攻击力的伤害，并获得10%的吸血，持续10秒",
     "Introduction": ""
   },
   {
@@ -4513,7 +4514,7 @@
     "VisualEffectPrefab": "FX_Skill_JiuJiu",
     "Icon": "Skill_Icon_341",
     "Sound": "",
-    "Describe": "对前方造成3段、每段3.3倍攻击力的伤害，并获得10%的吸血，持续10秒",
+    "Describe": "对前方造成3段、每段3.8倍攻击力的伤害，并获得10%的吸血，持续10秒",
     "Introduction": ""
   },
   {
@@ -4560,7 +4561,7 @@
     "VisualEffectPrefab": "FX_Skill_JiuJiu",
     "Icon": "Skill_Icon_341",
     "Sound": "",
-    "Describe": "对前方造成3段、每段3.8倍攻击力的伤害，并获得10%的吸血，持续10秒",
+    "Describe": "对前方造成3段、每段4.3倍攻击力的伤害，并获得10%的吸血，持续10秒",
     "Introduction": ""
   },
   {
@@ -4607,7 +4608,7 @@
     "VisualEffectPrefab": "FX_Skill_JiuJiu",
     "Icon": "Skill_Icon_341",
     "Sound": "",
-    "Describe": "对前方造成3段、每段4.3倍攻击力的伤害，并获得10%的吸血，持续10秒",
+    "Describe": "对前方造成3段、每段4.8倍攻击力的伤害，并获得10%的吸血，持续10秒",
     "Introduction": ""
   },
   {
@@ -4654,7 +4655,7 @@
     "VisualEffectPrefab": "FX_Skill_JiuJiu",
     "Icon": "Skill_Icon_341",
     "Sound": "",
-    "Describe": "对前方造成3段、每段4.8倍攻击力的伤害，并获得10%的吸血，持续10秒",
+    "Describe": "对前方造成3段、每段5.3倍攻击力的伤害，并获得10%的吸血，持续10秒",
     "Introduction": ""
   },
   {
@@ -4701,7 +4702,7 @@
     "VisualEffectPrefab": "FX_Skill_JiuJiu",
     "Icon": "Skill_Icon_341",
     "Sound": "",
-    "Describe": "对前方造成3段、每段5.3倍攻击力的伤害，并获得10%的吸血，持续10秒",
+    "Describe": "对前方造成3段、每段5.8倍攻击力的伤害，并获得10%的吸血，持续10秒",
     "Introduction": ""
   },
   {
@@ -4748,7 +4749,7 @@
     "VisualEffectPrefab": "FX_Skill_JiuJiu",
     "Icon": "Skill_Icon_341",
     "Sound": "",
-    "Describe": "对前方造成3段、每段5.8倍攻击力的伤害，并获得10%的吸血，持续10秒",
+    "Describe": "对前方造成3段、每段6.3倍攻击力的伤害，并获得10%的吸血，持续10秒",
     "Introduction": ""
   },
   {
@@ -4779,9 +4780,7 @@
     "Buff": [
       3621
     ],
-    "TargetBuff": [
-      3631
-    ],
+    "TargetBuff": [],
     "ImmortalTreeLv": 0,
     "Time": 0,
     "Interrupt": false,
@@ -4793,7 +4792,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_361",
     "Sound": "",
-    "Describe": "禁锢范围内所有的敌人，并每秒造成X点伤害。持续10秒，持续期间自身攻击力降低90%",
+    "Describe": "禁锢范围内所有的敌人，并每秒造成1倍攻击力点伤害。持续10秒，持续期间自身攻击力降低90%",
     "Introduction": ""
   },
   {
@@ -4824,9 +4823,7 @@
     "Buff": [
       3622
     ],
-    "TargetBuff": [
-      3631
-    ],
+    "TargetBuff": [],
     "ImmortalTreeLv": 5,
     "Time": 60,
     "Interrupt": false,
@@ -4838,7 +4835,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_361",
     "Sound": "",
-    "Describe": "禁锢范围内所有的敌人，并每秒造成X点伤害。持续10秒，持续期间自身攻击力降低90%",
+    "Describe": "禁锢范围内所有的敌人，并每秒造成1.2倍攻击力点伤害。持续10秒，持续期间自身攻击力降低90%",
     "Introduction": ""
   },
   {
@@ -4869,9 +4866,7 @@
     "Buff": [
       3623
     ],
-    "TargetBuff": [
-      3631
-    ],
+    "TargetBuff": [],
     "ImmortalTreeLv": 10,
     "Time": 600,
     "Interrupt": false,
@@ -4883,7 +4878,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_361",
     "Sound": "",
-    "Describe": "禁锢范围内所有的敌人，并每秒造成X点伤害。持续10秒，持续期间自身攻击力降低90%",
+    "Describe": "禁锢范围内所有的敌人，并每秒造成1.4倍攻击力点伤害。持续10秒，持续期间自身攻击力降低90%",
     "Introduction": ""
   },
   {
@@ -4914,9 +4909,7 @@
     "Buff": [
       3624
     ],
-    "TargetBuff": [
-      3631
-    ],
+    "TargetBuff": [],
     "ImmortalTreeLv": 15,
     "Time": 1800,
     "Interrupt": false,
@@ -4928,7 +4921,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_361",
     "Sound": "",
-    "Describe": "禁锢范围内所有的敌人，并每秒造成X点伤害。持续10秒，持续期间自身攻击力降低90%",
+    "Describe": "禁锢范围内所有的敌人，并每秒造成1.6倍攻击力点伤害。持续10秒，持续期间自身攻击力降低90%",
     "Introduction": ""
   },
   {
@@ -4959,9 +4952,7 @@
     "Buff": [
       3625
     ],
-    "TargetBuff": [
-      3631
-    ],
+    "TargetBuff": [],
     "ImmortalTreeLv": 20,
     "Time": 3600,
     "Interrupt": false,
@@ -4973,7 +4964,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_361",
     "Sound": "",
-    "Describe": "禁锢范围内所有的敌人，并每秒造成X点伤害。持续10秒，持续期间自身攻击力降低90%",
+    "Describe": "禁锢范围内所有的敌人，并每秒造成1.8倍攻击力点伤害。持续10秒，持续期间自身攻击力降低90%",
     "Introduction": ""
   },
   {
@@ -5004,9 +4995,7 @@
     "Buff": [
       3626
     ],
-    "TargetBuff": [
-      3631
-    ],
+    "TargetBuff": [],
     "ImmortalTreeLv": 25,
     "Time": 7200,
     "Interrupt": false,
@@ -5018,7 +5007,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_361",
     "Sound": "",
-    "Describe": "禁锢范围内所有的敌人，并每秒造成X点伤害。持续10秒，持续期间自身攻击力降低90%",
+    "Describe": "禁锢范围内所有的敌人，并每秒造成2倍攻击力点伤害。持续10秒，持续期间自身攻击力降低90%",
     "Introduction": ""
   },
   {
@@ -5049,9 +5038,7 @@
     "Buff": [
       3627
     ],
-    "TargetBuff": [
-      3631
-    ],
+    "TargetBuff": [],
     "ImmortalTreeLv": 30,
     "Time": 14400,
     "Interrupt": false,
@@ -5063,7 +5050,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_361",
     "Sound": "",
-    "Describe": "禁锢范围内所有的敌人，并每秒造成X点伤害。持续10秒，持续期间自身攻击力降低90%",
+    "Describe": "禁锢范围内所有的敌人，并每秒造成2.2倍攻击力点伤害。持续10秒，持续期间自身攻击力降低90%",
     "Introduction": ""
   },
   {
@@ -5094,9 +5081,7 @@
     "Buff": [
       3628
     ],
-    "TargetBuff": [
-      3631
-    ],
+    "TargetBuff": [],
     "ImmortalTreeLv": 35,
     "Time": 28800,
     "Interrupt": false,
@@ -5108,7 +5093,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_361",
     "Sound": "",
-    "Describe": "禁锢范围内所有的敌人，并每秒造成X点伤害。持续10秒，持续期间自身攻击力降低90%",
+    "Describe": "禁锢范围内所有的敌人，并每秒造成2.4倍攻击力点伤害。持续10秒，持续期间自身攻击力降低90%",
     "Introduction": ""
   },
   {
@@ -5139,9 +5124,7 @@
     "Buff": [
       3629
     ],
-    "TargetBuff": [
-      3631
-    ],
+    "TargetBuff": [],
     "ImmortalTreeLv": 40,
     "Time": 57600,
     "Interrupt": false,
@@ -5153,7 +5136,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_361",
     "Sound": "",
-    "Describe": "禁锢范围内所有的敌人，并每秒造成X点伤害。持续10秒，持续期间自身攻击力降低90%",
+    "Describe": "禁锢范围内所有的敌人，并每秒造成2.6倍攻击力点伤害。持续10秒，持续期间自身攻击力降低90%",
     "Introduction": ""
   },
   {
@@ -5184,9 +5167,7 @@
     "Buff": [
       3630
     ],
-    "TargetBuff": [
-      3631
-    ],
+    "TargetBuff": [],
     "ImmortalTreeLv": 45,
     "Time": 115200,
     "Interrupt": false,
@@ -5198,7 +5179,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_361",
     "Sound": "",
-    "Describe": "禁锢范围内所有的敌人，并每秒造成X点伤害。持续10秒，持续期间自身攻击力降低90%",
+    "Describe": "禁锢范围内所有的敌人，并每秒造成2.8倍攻击力点伤害。持续10秒，持续期间自身攻击力降低90%",
     "Introduction": ""
   },
   {
@@ -6726,7 +6707,7 @@
     "Id": 1070,
     "Name": "凝神",
     "SkillLv": 10,
-    "NextLvId": 1071,
+    "NextLvId": 0,
     "SkillBaseId": 1061,
     "CD": 0,
     "SkillType": 1,
@@ -7116,7 +7097,7 @@
     "Id": 1110,
     "Name": "稳健",
     "SkillLv": 10,
-    "NextLvId": 1111,
+    "NextLvId": 0,
     "SkillBaseId": 1101,
     "CD": 0,
     "SkillType": 1,
@@ -18353,7 +18334,7 @@
   },
   {
     "Id": 1781,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "SkillLv": 1,
     "NextLvId": 1782,
     "SkillBaseId": 1781,
@@ -18362,7 +18343,8 @@
     "CastType": 2,
     "TargetNeed": true,
     "EffectObject": [
-      3
+      3,
+      4
     ],
     "IsEffectToBuilding": true,
     "Distance": 0,
@@ -18375,7 +18357,9 @@
     "Buff": [
       1781
     ],
-    "TargetBuff": [],
+    "TargetBuff": [
+      1781
+    ],
     "ImmortalTreeLv": 0,
     "Time": 0,
     "Interrupt": false,
@@ -18387,12 +18371,12 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1781",
     "Sound": "",
-    "Describe": "免伤提升6%",
+    "Describe": "全队攻击力提升1%",
     "Introduction": ""
   },
   {
     "Id": 1782,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "SkillLv": 2,
     "NextLvId": 1783,
     "SkillBaseId": 1781,
@@ -18401,7 +18385,8 @@
     "CastType": 2,
     "TargetNeed": true,
     "EffectObject": [
-      3
+      3,
+      4
     ],
     "IsEffectToBuilding": true,
     "Distance": 0,
@@ -18414,7 +18399,9 @@
     "Buff": [
       1782
     ],
-    "TargetBuff": [],
+    "TargetBuff": [
+      1782
+    ],
     "ImmortalTreeLv": 5,
     "Time": 60,
     "Interrupt": false,
@@ -18426,12 +18413,12 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1781",
     "Sound": "",
-    "Describe": "免伤提升7%",
+    "Describe": "全队攻击力提升2%",
     "Introduction": ""
   },
   {
     "Id": 1783,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "SkillLv": 3,
     "NextLvId": 1784,
     "SkillBaseId": 1781,
@@ -18440,7 +18427,8 @@
     "CastType": 2,
     "TargetNeed": true,
     "EffectObject": [
-      3
+      3,
+      4
     ],
     "IsEffectToBuilding": true,
     "Distance": 0,
@@ -18453,7 +18441,9 @@
     "Buff": [
       1783
     ],
-    "TargetBuff": [],
+    "TargetBuff": [
+      1783
+    ],
     "ImmortalTreeLv": 10,
     "Time": 600,
     "Interrupt": false,
@@ -18465,12 +18455,12 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1781",
     "Sound": "",
-    "Describe": "免伤提升8%",
+    "Describe": "全队攻击力提升3%",
     "Introduction": ""
   },
   {
     "Id": 1784,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "SkillLv": 4,
     "NextLvId": 1785,
     "SkillBaseId": 1781,
@@ -18479,7 +18469,8 @@
     "CastType": 2,
     "TargetNeed": true,
     "EffectObject": [
-      3
+      3,
+      4
     ],
     "IsEffectToBuilding": true,
     "Distance": 0,
@@ -18492,7 +18483,9 @@
     "Buff": [
       1784
     ],
-    "TargetBuff": [],
+    "TargetBuff": [
+      1784
+    ],
     "ImmortalTreeLv": 15,
     "Time": 1800,
     "Interrupt": false,
@@ -18504,12 +18497,12 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1781",
     "Sound": "",
-    "Describe": "免伤提升9%",
+    "Describe": "全队攻击力提升4%",
     "Introduction": ""
   },
   {
     "Id": 1785,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "SkillLv": 5,
     "NextLvId": 1786,
     "SkillBaseId": 1781,
@@ -18518,7 +18511,8 @@
     "CastType": 2,
     "TargetNeed": true,
     "EffectObject": [
-      3
+      3,
+      4
     ],
     "IsEffectToBuilding": true,
     "Distance": 0,
@@ -18531,7 +18525,9 @@
     "Buff": [
       1785
     ],
-    "TargetBuff": [],
+    "TargetBuff": [
+      1785
+    ],
     "ImmortalTreeLv": 20,
     "Time": 3600,
     "Interrupt": false,
@@ -18543,12 +18539,12 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1781",
     "Sound": "",
-    "Describe": "免伤提升10%",
+    "Describe": "全队攻击力提升5%",
     "Introduction": ""
   },
   {
     "Id": 1786,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "SkillLv": 6,
     "NextLvId": 1787,
     "SkillBaseId": 1781,
@@ -18557,7 +18553,8 @@
     "CastType": 2,
     "TargetNeed": true,
     "EffectObject": [
-      3
+      3,
+      4
     ],
     "IsEffectToBuilding": true,
     "Distance": 0,
@@ -18570,7 +18567,9 @@
     "Buff": [
       1786
     ],
-    "TargetBuff": [],
+    "TargetBuff": [
+      1786
+    ],
     "ImmortalTreeLv": 25,
     "Time": 7200,
     "Interrupt": false,
@@ -18582,12 +18581,12 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1781",
     "Sound": "",
-    "Describe": "免伤提升11%",
+    "Describe": "全队攻击力提升6%",
     "Introduction": ""
   },
   {
     "Id": 1787,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "SkillLv": 7,
     "NextLvId": 1788,
     "SkillBaseId": 1781,
@@ -18596,7 +18595,8 @@
     "CastType": 2,
     "TargetNeed": true,
     "EffectObject": [
-      3
+      3,
+      4
     ],
     "IsEffectToBuilding": true,
     "Distance": 0,
@@ -18609,7 +18609,9 @@
     "Buff": [
       1787
     ],
-    "TargetBuff": [],
+    "TargetBuff": [
+      1787
+    ],
     "ImmortalTreeLv": 30,
     "Time": 14400,
     "Interrupt": false,
@@ -18621,12 +18623,12 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1781",
     "Sound": "",
-    "Describe": "免伤提升12%",
+    "Describe": "全队攻击力提升7%",
     "Introduction": ""
   },
   {
     "Id": 1788,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "SkillLv": 8,
     "NextLvId": 1789,
     "SkillBaseId": 1781,
@@ -18635,7 +18637,8 @@
     "CastType": 2,
     "TargetNeed": true,
     "EffectObject": [
-      3
+      3,
+      4
     ],
     "IsEffectToBuilding": true,
     "Distance": 0,
@@ -18648,7 +18651,9 @@
     "Buff": [
       1788
     ],
-    "TargetBuff": [],
+    "TargetBuff": [
+      1788
+    ],
     "ImmortalTreeLv": 35,
     "Time": 28800,
     "Interrupt": false,
@@ -18660,12 +18665,12 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1781",
     "Sound": "",
-    "Describe": "免伤提升13%",
+    "Describe": "全队攻击力提升8%",
     "Introduction": ""
   },
   {
     "Id": 1789,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "SkillLv": 9,
     "NextLvId": 1790,
     "SkillBaseId": 1781,
@@ -18674,7 +18679,8 @@
     "CastType": 2,
     "TargetNeed": true,
     "EffectObject": [
-      3
+      3,
+      4
     ],
     "IsEffectToBuilding": true,
     "Distance": 0,
@@ -18687,7 +18693,9 @@
     "Buff": [
       1789
     ],
-    "TargetBuff": [],
+    "TargetBuff": [
+      1789
+    ],
     "ImmortalTreeLv": 40,
     "Time": 57600,
     "Interrupt": false,
@@ -18699,12 +18707,12 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1781",
     "Sound": "",
-    "Describe": "免伤提升14%",
+    "Describe": "全队攻击力提升9%",
     "Introduction": ""
   },
   {
     "Id": 1790,
-    "Name": "铁尸罡",
+    "Name": "阴煞阵",
     "SkillLv": 10,
     "NextLvId": 0,
     "SkillBaseId": 1781,
@@ -18713,7 +18721,8 @@
     "CastType": 2,
     "TargetNeed": true,
     "EffectObject": [
-      3
+      3,
+      4
     ],
     "IsEffectToBuilding": true,
     "Distance": 0,
@@ -18726,7 +18735,9 @@
     "Buff": [
       1790
     ],
-    "TargetBuff": [],
+    "TargetBuff": [
+      1790
+    ],
     "ImmortalTreeLv": 45,
     "Time": 115200,
     "Interrupt": false,
@@ -18738,7 +18749,7 @@
     "VisualEffectPrefab": "",
     "Icon": "Skill_Icon_1781",
     "Sound": "",
-    "Describe": "免伤提升15%",
+    "Describe": "全队攻击力提升10%",
     "Introduction": ""
   },
   {

src/api/config/SkillEffectConfigCategory.json

@@ -85,9 +85,16 @@
   },
   {
     "Id": 13,
-    "EffectType": 1500,
+    "EffectType": 1502,
     "EffectField": 5,
-    "NumericExpression": "50",
+    "NumericExpression": "0.5*HpMax",
+    "WhetherCrit": false
+  },
+  {
+    "Id": 14,
+    "EffectType": 9998,
+    "EffectField": 1,
+    "NumericExpression": "14",
     "WhetherCrit": false
   },
   {
@@ -3627,72 +3634,72 @@
   },
   {
     "Id": 1781,
-    "EffectType": 1433,
-    "EffectField": 1,
-    "NumericExpression": "6",
+    "EffectType": 1403,
+    "EffectField": 2,
+    "NumericExpression": "1",
     "WhetherCrit": false
   },
   {
     "Id": 1782,
-    "EffectType": 1433,
-    "EffectField": 1,
-    "NumericExpression": "7",
+    "EffectType": 1403,
+    "EffectField": 2,
+    "NumericExpression": "2",
     "WhetherCrit": false
   },
   {
     "Id": 1783,
-    "EffectType": 1433,
-    "EffectField": 1,
-    "NumericExpression": "8",
+    "EffectType": 1403,
+    "EffectField": 2,
+    "NumericExpression": "3",
     "WhetherCrit": false
   },
   {
     "Id": 1784,
-    "EffectType": 1433,
-    "EffectField": 1,
-    "NumericExpression": "9",
+    "EffectType": 1403,
+    "EffectField": 2,
+    "NumericExpression": "4",
     "WhetherCrit": false
   },
   {
     "Id": 1785,
-    "EffectType": 1433,
-    "EffectField": 1,
-    "NumericExpression": "10",
+    "EffectType": 1403,
+    "EffectField": 2,
+    "NumericExpression": "5",
     "WhetherCrit": false
   },
   {
     "Id": 1786,
-    "EffectType": 1433,
-    "EffectField": 1,
-    "NumericExpression": "11",
+    "EffectType": 1403,
+    "EffectField": 2,
+    "NumericExpression": "6",
     "WhetherCrit": false
   },
   {
     "Id": 1787,
-    "EffectType": 1433,
-    "EffectField": 1,
-    "NumericExpression": "12",
+    "EffectType": 1403,
+    "EffectField": 2,
+    "NumericExpression": "7",
     "WhetherCrit": false
   },
   {
     "Id": 1788,
-    "EffectType": 1433,
-    "EffectField": 1,
-    "NumericExpression": "13",
+    "EffectType": 1403,
+    "EffectField": 2,
+    "NumericExpression": "8",
     "WhetherCrit": false
   },
   {
     "Id": 1789,
-    "EffectType": 1433,
-    "EffectField": 1,
-    "NumericExpression": "14",
+    "EffectType": 1403,
+    "EffectField": 2,
+    "NumericExpression": "9",
     "WhetherCrit": false
   },
   {
     "Id": 1790,
-    "EffectType": 1433,
-    "EffectField": 1,
-    "NumericExpression": "15",
+    "EffectType": 1403,
+    "EffectField": 2,
+    "NumericExpression": "10",
     "WhetherCrit": false
   },
   {
@@ -5778,79 +5785,100 @@
     "Id": 3611,
     "EffectType": 1401,
     "EffectField": 1,
-    "NumericExpression": "-ATK_P*1.8",
+    "NumericExpression": "-ATK_P*1",
     "WhetherCrit": true
   },
   {
     "Id": 3612,
     "EffectType": 1401,
     "EffectField": 1,
-    "NumericExpression": "-ATK_P*2",
+    "NumericExpression": "-ATK_P*1.2",
     "WhetherCrit": true
   },
   {
     "Id": 3613,
     "EffectType": 1401,
     "EffectField": 1,
-    "NumericExpression": "-ATK_P*2.2",
+    "NumericExpression": "-ATK_P*1.4",
     "WhetherCrit": true
   },
   {
     "Id": 3614,
     "EffectType": 1401,
     "EffectField": 1,
-    "NumericExpression": "-ATK_P*2.4",
+    "NumericExpression": "-ATK_P*1.6",
     "WhetherCrit": true
   },
   {
     "Id": 3615,
     "EffectType": 1401,
     "EffectField": 1,
-    "NumericExpression": "-ATK_P*2.6",
+    "NumericExpression": "-ATK_P*1.8",
     "WhetherCrit": true
   },
   {
     "Id": 3616,
     "EffectType": 1401,
     "EffectField": 1,
-    "NumericExpression": "-ATK_P*2.8",
+    "NumericExpression": "-ATK_P*2",
     "WhetherCrit": true
   },
   {
     "Id": 3617,
     "EffectType": 1401,
     "EffectField": 1,
-    "NumericExpression": "-ATK_P*3",
+    "NumericExpression": "-ATK_P*2.2",
     "WhetherCrit": true
   },
   {
     "Id": 3618,
     "EffectType": 1401,
     "EffectField": 1,
-    "NumericExpression": "-ATK_P*3.2",
+    "NumericExpression": "-ATK_P*2.4",
     "WhetherCrit": true
   },
   {
     "Id": 3619,
     "EffectType": 1401,
     "EffectField": 1,
-    "NumericExpression": "-ATK_P*3.4",
+    "NumericExpression": "-ATK_P*2.6",
     "WhetherCrit": true
   },
   {
     "Id": 3620,
     "EffectType": 1401,
     "EffectField": 1,
-    "NumericExpression": "-ATK_P*3.6",
+    "NumericExpression": "-ATK_P*2.8",
     "WhetherCrit": true
   },
   {
     "Id": 3621,
     "EffectType": 1403,
-    "EffectField": 2,
+    "EffectField": 4,
     "NumericExpression": "-90",
     "WhetherCrit": false
   },
+  {
+    "Id": 3622,
+    "EffectType": 9999,
+    "EffectField": 5,
+    "NumericExpression": "3631",
+    "WhetherCrit": false
+  },
+  {
+    "Id": 4061,
+    "EffectType": 1405,
+    "EffectField": 1,
+    "NumericExpression": "1",
+    "WhetherCrit": false
+  },
+  {
+    "Id": 4062,
+    "EffectType": 1401,
+    "EffectField": 1,
+    "NumericExpression": "HpMax*0.01",
+    "WhetherCrit": false
+  },
   {
     "Id": 5001,
     "EffectType": 3126,
@@ -7747,5 +7775,26 @@
     "EffectField": 1,
     "NumericExpression": "1500",
     "WhetherCrit": false
+  },
+  {
+    "Id": 150010,
+    "EffectType": 1402,
+    "EffectField": 2,
+    "NumericExpression": "5",
+    "WhetherCrit": false
+  },
+  {
+    "Id": 150011,
+    "EffectType": 1402,
+    "EffectField": 2,
+    "NumericExpression": "10",
+    "WhetherCrit": false
+  },
+  {
+    "Id": 150012,
+    "EffectType": 1402,
+    "EffectField": 2,
+    "NumericExpression": "15",
+    "WhetherCrit": false
   }
 ]

src/api/config/StructureConfigCategory.json

@@ -718,7 +718,7 @@
     "NamePicture": "Structure_Name_65",
     "Sound": "",
     "InteractiveAnimations": [],
-    "Describe": "用比较好的木板和瓦片搭建的居所有较好的遮风挡雨的作用",
+    "Describe": "用比较好的石头和瓦片搭建的居所有较好的遮风挡雨的作用",
     "Record": false,
     "RecordText": ""
   },
@@ -756,7 +756,7 @@
     "NamePicture": "Structure_Name_65",
     "Sound": "",
     "InteractiveAnimations": [],
-    "Describe": "用比较好的木板和瓦片搭建的居所有较好的遮风挡雨的作用",
+    "Describe": "用比较好的石头和瓦片搭建的居所有较好的遮风挡雨的作用",
     "Record": false,
     "RecordText": ""
   },
@@ -968,6 +968,40 @@
     "Record": false,
     "RecordText": ""
   },
+  {
+    "Id": 85,
+    "Name": "土楼",
+    "LvMark": -1,
+    "Type": 3,
+    "Schedule": 21,
+    "ScaleUp": true,
+    "FixedPoint": false,
+    "EngineeringQuantity": 1000000,
+    "Durable": 900,
+    "NunLimit": 1,
+    "ShapeId": 85,
+    "Special": 0,
+    "BuildFunctionId": 85,
+    "Boom": 1000,
+    "CanMove": true,
+    "Remove": true,
+    "RemoveAll": false,
+    "Science": false,
+    "Fight": 0,
+    "RegionId": 1001,
+    "UpgradeId": 0,
+    "StrengthenId": 85,
+    "ShowOccupyPlace": true,
+    "Prefab": "Structure_85",
+    "SkinConfigIds": [],
+    "Picture": "Structure_Picture_85",
+    "NamePicture": "Structure_Name_85",
+    "Sound": "",
+    "InteractiveAnimations": [],
+    "Describe": "土楼，家家门户独通，又共聚一堂，居住在其中极大提升了村民的幸福感",
+    "Record": true,
+    "RecordText": "土楼落成，族人们住到了一起。新居亮堂又暖和，刮风下雨的日子，聚在楼里说说话，感觉格外安心。"
+  },
   {
     "Id": 100,
     "Name": "粗布坊",
@@ -4075,7 +4109,9 @@
     "StrengthenId": 300,
     "ShowOccupyPlace": false,
     "Prefab": "Structure_300",
-    "SkinConfigIds": [],
+    "SkinConfigIds": [
+      1033
+    ],
     "Picture": "Structure_Picture_300",
     "NamePicture": "Structure_Name_300",
     "Sound": "",
@@ -4109,7 +4145,9 @@
     "StrengthenId": 301,
     "ShowOccupyPlace": false,
     "Prefab": "Structure_301",
-    "SkinConfigIds": [],
+    "SkinConfigIds": [
+      1035
+    ],
     "Picture": "Structure_Picture_301",
     "NamePicture": "Structure_Name_301",
     "Sound": "",
@@ -4179,7 +4217,9 @@
     "StrengthenId": 303,
     "ShowOccupyPlace": false,
     "Prefab": "Structure_303",
-    "SkinConfigIds": [],
+    "SkinConfigIds": [
+      1036
+    ],
     "Picture": "Structure_Picture_303",
     "NamePicture": "Structure_Name_303",
     "Sound": "",
@@ -4213,7 +4253,9 @@
     "StrengthenId": 305,
     "ShowOccupyPlace": false,
     "Prefab": "Structure_305",
-    "SkinConfigIds": [],
+    "SkinConfigIds": [
+      1034
+    ],
     "Picture": "Structure_Picture_305",
     "NamePicture": "Structure_Name_305",
     "Sound": "",
@@ -5725,7 +5767,7 @@
     "NamePicture": "Structure_Name_665",
     "Sound": "",
     "InteractiveAnimations": [],
-    "Describe": "桃源先祖的坟墓，承载着村民的思念。",
+    "Describe": "桃源先祖的坟墓，承载着村民的思念",
     "Record": false,
     "RecordText": ""
   },
@@ -6042,6 +6084,40 @@
     "Record": false,
     "RecordText": ""
   },
+  {
+    "Id": 676,
+    "Name": "宴楼",
+    "LvMark": 1,
+    "Type": 4,
+    "Schedule": 21,
+    "ScaleUp": true,
+    "FixedPoint": false,
+    "EngineeringQuantity": 1000000,
+    "Durable": -1,
+    "NunLimit": 1,
+    "ShapeId": 676,
+    "Special": 33,
+    "BuildFunctionId": 676,
+    "Boom": 1000,
+    "CanMove": true,
+    "Remove": false,
+    "RemoveAll": false,
+    "Science": false,
+    "Fight": 0,
+    "RegionId": 1001,
+    "UpgradeId": 0,
+    "StrengthenId": 676,
+    "ShowOccupyPlace": true,
+    "Prefab": "Structure_676",
+    "SkinConfigIds": [],
+    "Picture": "Structure_Picture_676",
+    "NamePicture": "Structure_Name_676",
+    "Sound": "",
+    "InteractiveAnimations": [],
+    "Describe": "此楼纳尽桃源春秋事——笙歌绕梁贺新禧，松柏垂影送故人。百味穿肠过，悲喜入烟尘。",
+    "Record": false,
+    "RecordText": "村子里终于有了举办喜宴的场所，桃花映衬，朱楼焕彩。良辰吉时，新人盟誓，亲朋醉宴凭栏，丝竹声中纳福瑞，共证桃源好合。"
+  },
   {
     "Id": 1000,
     "Name": "伐木场",

src/api/config/StructureSkinConfigCategory.json

@@ -296,6 +296,42 @@
     "ScienceId": 0,
     "Integral": 100
   },
+  {
+    "Id": 1033,
+    "SkinName": "扶疏栈·一",
+    "SkinPrefab": "Structure_Skin_1033",
+    "Picture": "Structure_Skin_Picture_1033",
+    "GetMethod": "外观礼包",
+    "ScienceId": 0,
+    "Integral": 100
+  },
+  {
+    "Id": 1034,
+    "SkinName": "扶疏栈·二",
+    "SkinPrefab": "Structure_Skin_1034",
+    "Picture": "Structure_Skin_Picture_1034",
+    "GetMethod": "外观礼包",
+    "ScienceId": 0,
+    "Integral": 100
+  },
+  {
+    "Id": 1035,
+    "SkinName": "扶疏栈·三",
+    "SkinPrefab": "Structure_Skin_1035",
+    "Picture": "Structure_Skin_Picture_1035",
+    "GetMethod": "外观礼包",
+    "ScienceId": 0,
+    "Integral": 100
+  },
+  {
+    "Id": 1036,
+    "SkinName": "扶疏栈·四",
+    "SkinPrefab": "Structure_Skin_1036",
+    "Picture": "Structure_Skin_Picture_1036",
+    "GetMethod": "外观礼包",
+    "ScienceId": 0,
+    "Integral": 100
+  },
   {
     "Id": 1037,
     "SkinName": "藤月观畦庐",

src/api/config/StructureStrengthenConfigCategory.json

@@ -917,6 +917,40 @@
     "StrengIntegral2": 25,
     "StrengIntegral3": 50
   },
+  {
+    "Id": 85,
+    "Name": "土楼",
+    "Schedule": 20,
+    "RepairItem1": 805,
+    "RepairItemNum1": 1000,
+    "RepairItem2": 810,
+    "RepairItemNum2": 2000,
+    "RepairItem3": 827,
+    "RepairItemNum3": 1000,
+    "RepairItem4": 825,
+    "RepairItemNum4": 500,
+    "FirmCoinNum": 20000,
+    "StrengthenYesOrNo": true,
+    "Strengthen1Item1": 858,
+    "Strengthen1Item1Num": 100,
+    "Strengthen1Item2": 805,
+    "Strengthen1Item2Num": 200,
+    "Strengthen2Item1": 858,
+    "Strengthen2Item1Num": 200,
+    "Strengthen2Item2": 805,
+    "Strengthen2Item2Num": 300,
+    "Strengthen3Item1": 858,
+    "Strengthen3Item1Num": 300,
+    "Strengthen3Item2": 805,
+    "Strengthen3Item2Num": 400,
+    "StrengthenDurable1": 1500,
+    "StrengthenDurable2": 2100,
+    "StrengthenDurable3": 2700,
+    "Integral": 250,
+    "StrengIntegral1": 50,
+    "StrengIntegral2": 90,
+    "StrengIntegral3": 130
+  },
   {
     "Id": 100,
     "Name": "粗布坊",
@@ -5915,6 +5949,40 @@
     "StrengIntegral2": 0,
     "StrengIntegral3": 0
   },
+  {
+    "Id": 676,
+    "Name": "宴楼",
+    "Schedule": 20,
+    "RepairItem1": 805,
+    "RepairItemNum1": 1000,
+    "RepairItem2": 810,
+    "RepairItemNum2": 1000,
+    "RepairItem3": 827,
+    "RepairItemNum3": 1000,
+    "RepairItem4": 825,
+    "RepairItemNum4": 500,
+    "FirmCoinNum": 20000,
+    "StrengthenYesOrNo": true,
+    "Strengthen1Item1": 858,
+    "Strengthen1Item1Num": 100,
+    "Strengthen1Item2": 805,
+    "Strengthen1Item2Num": 200,
+    "Strengthen2Item1": 858,
+    "Strengthen2Item1Num": 200,
+    "Strengthen2Item2": 805,
+    "Strengthen2Item2Num": 300,
+    "Strengthen3Item1": 858,
+    "Strengthen3Item1Num": 300,
+    "Strengthen3Item2": 805,
+    "Strengthen3Item2Num": 400,
+    "StrengthenDurable1": 1500,
+    "StrengthenDurable2": 2100,
+    "StrengthenDurable3": 1700,
+    "Integral": 250,
+    "StrengIntegral1": 50,
+    "StrengIntegral2": 90,
+    "StrengIntegral3": 130
+  },
   {
     "Id": 1000,
     "Name": "伐木场",

src/api/config/SynthesisConfigCategory.json

@@ -836,6 +836,37 @@
     "NextLv": 0,
     "UpgradeItem": 0
   },
+  {
+    "Id": 85,
+    "Name": "土楼",
+    "MixtureType": 1,
+    "MaterialType": 0,
+    "MixtureID": 85,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": -1,
+    "SingleMaxNumber": -1,
+    "ItemId1": 805,
+    "ItemNum1": 1000,
+    "ItemId2": 810,
+    "ItemNum2": 2000,
+    "ItemId3": 827,
+    "ItemNum3": 1000,
+    "ItemId4": 825,
+    "ItemNum4": 500,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      20
+    ],
+    "UnlockCondition": 4,
+    "UnlockParameter": [
+      0
+    ],
+    "Drawing": true,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
   {
     "Id": 100,
     "Name": "粗布坊",
@@ -5362,6 +5393,37 @@
     "NextLv": 0,
     "UpgradeItem": 0
   },
+  {
+    "Id": 676,
+    "Name": "宴楼",
+    "MixtureType": 1,
+    "MaterialType": 0,
+    "MixtureID": 676,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": -1,
+    "SingleMaxNumber": -1,
+    "ItemId1": 805,
+    "ItemNum1": 1000,
+    "ItemId2": 810,
+    "ItemNum2": 1000,
+    "ItemId3": 827,
+    "ItemNum3": 1000,
+    "ItemId4": 825,
+    "ItemNum4": 500,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      20
+    ],
+    "UnlockCondition": 4,
+    "UnlockParameter": [
+      0
+    ],
+    "Drawing": true,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
   {
     "Id": 1000,
     "Name": "伐木场",
@@ -7169,6 +7231,102 @@
     "NextLv": 2544,
     "UpgradeItem": 7076
   },
+  {
+    "Id": 2052,
+    "Name": "果酒",
+    "MixtureType": 2,
+    "MaterialType": 0,
+    "MixtureID": 2052,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 15,
+    "SingleMaxNumber": 100,
+    "ItemId1": 2001,
+    "ItemNum1": 100,
+    "ItemId2": 147,
+    "ItemNum2": 10,
+    "ItemId3": 0,
+    "ItemNum3": 0,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      18
+    ],
+    "UnlockCondition": 8,
+    "UnlockParameter": [
+      500
+    ],
+    "Drawing": true,
+    "Display": false,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
+  {
+    "Id": 2053,
+    "Name": "杜康",
+    "MixtureType": 2,
+    "MaterialType": 0,
+    "MixtureID": 2053,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 15,
+    "SingleMaxNumber": 100,
+    "ItemId1": 121,
+    "ItemNum1": 100,
+    "ItemId2": 147,
+    "ItemNum2": 10,
+    "ItemId3": 0,
+    "ItemNum3": 0,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      18
+    ],
+    "UnlockCondition": 8,
+    "UnlockParameter": [
+      500
+    ],
+    "Drawing": true,
+    "Display": false,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
+  {
+    "Id": 2054,
+    "Name": "炭烤鱼干",
+    "MixtureType": 2,
+    "MaterialType": 0,
+    "MixtureID": 2054,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 10,
+    "SingleMaxNumber": -1,
+    "ItemId1": 847,
+    "ItemNum1": 1,
+    "ItemId2": 832,
+    "ItemNum2": 1,
+    "ItemId3": 3,
+    "ItemNum3": 2,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      8
+    ],
+    "UnlockCondition": 8,
+    "UnlockParameter": [
+      42,
+      43,
+      44,
+      45
+    ],
+    "Drawing": true,
+    "Display": true,
+    "NextLv": 2545,
+    "UpgradeItem": 7079
+  },
   {
     "Id": 2502,
     "Name": "野菜汤",
@@ -8604,6 +8762,41 @@
     "NextLv": 0,
     "UpgradeItem": 0
   },
+  {
+    "Id": 2545,
+    "Name": "炭烤鱼干",
+    "MixtureType": 2,
+    "MaterialType": 0,
+    "MixtureID": 2345,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 10,
+    "SingleMaxNumber": -1,
+    "ItemId1": 847,
+    "ItemNum1": 1,
+    "ItemId2": 832,
+    "ItemNum2": 1,
+    "ItemId3": 3,
+    "ItemNum3": 2,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 9,
+    "DisplayParameter": [
+      0
+    ],
+    "UnlockCondition": 8,
+    "UnlockParameter": [
+      41,
+      42,
+      43,
+      44,
+      45
+    ],
+    "Drawing": true,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
   {
     "Id": 3000,
     "Name": "茅草捆",
@@ -10541,6 +10734,223 @@
     "NextLv": 0,
     "UpgradeItem": 0
   },
+  {
+    "Id": 3501,
+    "Name": "白木板",
+    "MixtureType": 3,
+    "MaterialType": 6,
+    "MixtureID": 803,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 10,
+    "SingleMaxNumber": -1,
+    "ItemId1": 802,
+    "ItemNum1": 3,
+    "ItemId2": 0,
+    "ItemNum2": 0,
+    "ItemId3": 0,
+    "ItemNum3": 0,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      16
+    ],
+    "UnlockCondition": 8,
+    "UnlockParameter": [
+      4
+    ],
+    "Drawing": false,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
+  {
+    "Id": 3502,
+    "Name": "硬木板",
+    "MixtureType": 3,
+    "MaterialType": 6,
+    "MixtureID": 804,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 10,
+    "SingleMaxNumber": -1,
+    "ItemId1": 803,
+    "ItemNum1": 3,
+    "ItemId2": 0,
+    "ItemNum2": 0,
+    "ItemId3": 0,
+    "ItemNum3": 0,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      16
+    ],
+    "UnlockCondition": 8,
+    "UnlockParameter": [
+      4
+    ],
+    "Drawing": false,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
+  {
+    "Id": 3503,
+    "Name": "楠木板",
+    "MixtureType": 3,
+    "MaterialType": 6,
+    "MixtureID": 805,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 10,
+    "SingleMaxNumber": -1,
+    "ItemId1": 804,
+    "ItemNum1": 3,
+    "ItemId2": 0,
+    "ItemNum2": 0,
+    "ItemId3": 0,
+    "ItemNum3": 0,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      16
+    ],
+    "UnlockCondition": 8,
+    "UnlockParameter": [
+      4
+    ],
+    "Drawing": false,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
+  {
+    "Id": 3504,
+    "Name": "石灰石块",
+    "MixtureType": 3,
+    "MaterialType": 6,
+    "MixtureID": 808,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 10,
+    "SingleMaxNumber": -1,
+    "ItemId1": 807,
+    "ItemNum1": 3,
+    "ItemId2": 0,
+    "ItemNum2": 0,
+    "ItemId3": 0,
+    "ItemNum3": 0,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      16
+    ],
+    "UnlockCondition": 8,
+    "UnlockParameter": [
+      23
+    ],
+    "Drawing": false,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
+  {
+    "Id": 3505,
+    "Name": "青石块",
+    "MixtureType": 3,
+    "MaterialType": 6,
+    "MixtureID": 809,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 10,
+    "SingleMaxNumber": -1,
+    "ItemId1": 808,
+    "ItemNum1": 3,
+    "ItemId2": 0,
+    "ItemNum2": 0,
+    "ItemId3": 0,
+    "ItemNum3": 0,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      16
+    ],
+    "UnlockCondition": 8,
+    "UnlockParameter": [
+      23
+    ],
+    "Drawing": false,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
+  {
+    "Id": 3506,
+    "Name": "花岗石块",
+    "MixtureType": 3,
+    "MaterialType": 6,
+    "MixtureID": 810,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 10,
+    "SingleMaxNumber": -1,
+    "ItemId1": 809,
+    "ItemNum1": 3,
+    "ItemId2": 0,
+    "ItemNum2": 0,
+    "ItemId3": 0,
+    "ItemNum3": 0,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      16
+    ],
+    "UnlockCondition": 8,
+    "UnlockParameter": [
+      23
+    ],
+    "Drawing": false,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
+  {
+    "Id": 3507,
+    "Name": "喜礼",
+    "MixtureType": 3,
+    "MaterialType": 4,
+    "MixtureID": 863,
+    "QualityMixtureID": 0,
+    "Copies": 1,
+    "TimeConsume": 5,
+    "SingleMaxNumber": -1,
+    "ItemId1": 2052,
+    "ItemNum1": 6,
+    "ItemId2": 110,
+    "ItemNum2": 6,
+    "ItemId3": 838,
+    "ItemNum3": 6,
+    "ItemId4": 0,
+    "ItemNum4": 0,
+    "DisplayCondition": 1,
+    "DisplayParameter": [
+      21
+    ],
+    "UnlockCondition": 1,
+    "UnlockParameter": [
+      21
+    ],
+    "Drawing": false,
+    "Display": true,
+    "NextLv": 0,
+    "UpgradeItem": 0
+  },
   {
     "Id": 4000,
     "Name": "葛布春服",

src/api/config/SystemConditionsConfigCategory.json

@@ -138,5 +138,33 @@
     "Name": "签到功能",
     "OpenConditionType": 4,
     "ConditionParameter": 4
+  },
+  {
+    "Id": 23,
+    "OpenSystem": 23,
+    "Name": "战令系统",
+    "OpenConditionType": 4,
+    "ConditionParameter": 5
+  },
+  {
+    "Id": 24,
+    "OpenSystem": 24,
+    "Name": "材料转化",
+    "OpenConditionType": 4,
+    "ConditionParameter": 16
+  },
+  {
+    "Id": 25,
+    "OpenSystem": 25,
+    "Name": "拓印",
+    "OpenConditionType": 6,
+    "ConditionParameter": 5003
+  },
+  {
+    "Id": 26,
+    "OpenSystem": 26,
+    "Name": "专武",
+    "OpenConditionType": 4,
+    "ConditionParameter": 7
   }
 ]

src/api/config/TaskConfigCategory.json

@@ -2087,5 +2087,133 @@
     "AddWarrior": [],
     "AddNpc": [],
     "AddMonster": []
+  },
+  {
+    "Id": 5004,
+    "Name": "宴乐新筑·渔溪",
+    "Type": 2,
+    "Describe": "在渔溪村建造戏楼和宴楼。",
+    "MainLine": 0,
+    "ConditionType1": 5,
+    "Parameter1": [
+      21
+    ],
+    "ConditionType2": 0,
+    "Parameter2": [],
+    "ConditionType3": 0,
+    "Parameter3": [],
+    "ConditionType4": 0,
+    "Parameter4": [],
+    "ReleaseType": 3,
+    "ReleaseTypeParameter": [],
+    "TaskStep": [
+      5004
+    ],
+    "GiveUp": false,
+    "Repeat": false,
+    "CD": 0,
+    "ReAccess": false,
+    "TimeLimit": 0,
+    "Award": 4043,
+    "AddVillager": [],
+    "AddWarrior": [],
+    "AddNpc": [],
+    "AddMonster": []
+  },
+  {
+    "Id": 5005,
+    "Name": "宴乐新筑·赤丘",
+    "Type": 2,
+    "Describe": "在赤丘山建造戏楼和宴楼。",
+    "MainLine": 0,
+    "ConditionType1": 1,
+    "Parameter1": [
+      5004
+    ],
+    "ConditionType2": 0,
+    "Parameter2": [],
+    "ConditionType3": 0,
+    "Parameter3": [],
+    "ConditionType4": 0,
+    "Parameter4": [],
+    "ReleaseType": 3,
+    "ReleaseTypeParameter": [],
+    "TaskStep": [
+      5005
+    ],
+    "GiveUp": false,
+    "Repeat": false,
+    "CD": 0,
+    "ReAccess": false,
+    "TimeLimit": 0,
+    "Award": 4043,
+    "AddVillager": [],
+    "AddWarrior": [],
+    "AddNpc": [],
+    "AddMonster": []
+  },
+  {
+    "Id": 5006,
+    "Name": "宴乐新筑·太姥",
+    "Type": 2,
+    "Describe": "在太姥村建造戏楼和宴楼。",
+    "MainLine": 0,
+    "ConditionType1": 1,
+    "Parameter1": [
+      5005
+    ],
+    "ConditionType2": 0,
+    "Parameter2": [],
+    "ConditionType3": 0,
+    "Parameter3": [],
+    "ConditionType4": 0,
+    "Parameter4": [],
+    "ReleaseType": 3,
+    "ReleaseTypeParameter": [],
+    "TaskStep": [
+      5006
+    ],
+    "GiveUp": false,
+    "Repeat": false,
+    "CD": 0,
+    "ReAccess": false,
+    "TimeLimit": 0,
+    "Award": 4043,
+    "AddVillager": [],
+    "AddWarrior": [],
+    "AddNpc": [],
+    "AddMonster": []
+  },
+  {
+    "Id": 5007,
+    "Name": "宴乐新筑·青山",
+    "Type": 2,
+    "Describe": "在青山镇建造戏楼和宴楼。",
+    "MainLine": 0,
+    "ConditionType1": 1,
+    "Parameter1": [
+      5006
+    ],
+    "ConditionType2": 0,
+    "Parameter2": [],
+    "ConditionType3": 0,
+    "Parameter3": [],
+    "ConditionType4": 0,
+    "Parameter4": [],
+    "ReleaseType": 3,
+    "ReleaseTypeParameter": [],
+    "TaskStep": [
+      5007
+    ],
+    "GiveUp": false,
+    "Repeat": false,
+    "CD": 0,
+    "ReAccess": false,
+    "TimeLimit": 0,
+    "Award": 4043,
+    "AddVillager": [],
+    "AddWarrior": [],
+    "AddNpc": [],
+    "AddMonster": []
   }
 ]

src/api/config/TaskStepConfigCategory.json

@@ -1417,5 +1417,85 @@
     "TargetParameter4": [],
     "TargetDescribe": "建造{0}",
     "Number": true
+  },
+  {
+    "Id": 5004,
+    "Describe": "在渔溪村建造宴楼和戏楼",
+    "TargetType1": 23,
+    "TargetParameter1": [
+      1101,
+      1
+    ],
+    "TargetType2": 23,
+    "TargetParameter2": [
+      1200,
+      1
+    ],
+    "TargetType3": 0,
+    "TargetParameter3": [],
+    "TargetType4": 0,
+    "TargetParameter4": [],
+    "TargetDescribe": "建造{0}",
+    "Number": true
+  },
+  {
+    "Id": 5005,
+    "Describe": "在赤丘山建造戏楼和宴楼",
+    "TargetType1": 23,
+    "TargetParameter1": [
+      2101,
+      1
+    ],
+    "TargetType2": 23,
+    "TargetParameter2": [
+      2200,
+      1
+    ],
+    "TargetType3": 0,
+    "TargetParameter3": [],
+    "TargetType4": 0,
+    "TargetParameter4": [],
+    "TargetDescribe": "建造{0}",
+    "Number": true
+  },
+  {
+    "Id": 5006,
+    "Describe": "在太姥村建造戏楼和宴楼",
+    "TargetType1": 23,
+    "TargetParameter1": [
+      3101,
+      1
+    ],
+    "TargetType2": 23,
+    "TargetParameter2": [
+      3200,
+      1
+    ],
+    "TargetType3": 0,
+    "TargetParameter3": [],
+    "TargetType4": 0,
+    "TargetParameter4": [],
+    "TargetDescribe": "建造{0}",
+    "Number": true
+  },
+  {
+    "Id": 5007,
+    "Describe": "在青山镇建造戏楼和宴楼",
+    "TargetType1": 23,
+    "TargetParameter1": [
+      4101,
+      1
+    ],
+    "TargetType2": 23,
+    "TargetParameter2": [
+      4200,
+      1
+    ],
+    "TargetType3": 0,
+    "TargetParameter3": [],
+    "TargetType4": 0,
+    "TargetParameter4": [],
+    "TargetDescribe": "建造{0}",
+    "Number": true
   }
 ]

src/api/config/TextConfigCategory.json

@@ -1066,12 +1066,12 @@
   },
   {
     "Id": 1214,
-    "Text": "保存蓝图将覆盖上一份，您确定要保存当前的蓝图吗？",
+    "Text": "您确定要覆盖当前的拓印吗？",
     "Value": ""
   },
   {
     "Id": 1215,
-    "Text": "该谷主未开通蓝图保存权限",
+    "Text": "该谷主未开启拓印权限~",
     "Value": ""
   },
   {
@@ -1139,6 +1139,116 @@
     "Text": "存入铜钱后次日5:00产生收益 ！",
     "Value": ""
   },
+  {
+    "Id": 1229,
+    "Text": "请选择戏目！",
+    "Value": ""
+  },
+  {
+    "Id": 1230,
+    "Text": "戏班正在休息！请在工作时间：7:00-20:00进行操作~",
+    "Value": ""
+  },
+  {
+    "Id": 1231,
+    "Text": "该村落下聘数量已达上限！",
+    "Value": ""
+  },
+  {
+    "Id": 1232,
+    "Text": "该村落今日还未唱戏~",
+    "Value": ""
+  },
+  {
+    "Id": 1233,
+    "Text": "{npc}正在休息！请在工作时间：7:00-20:00进行操作~",
+    "Value": ""
+  },
+  {
+    "Id": 1234,
+    "Text": "请选择村民！",
+    "Value": ""
+  },
+  {
+    "Id": 1235,
+    "Text": "良缘缔结！",
+    "Value": ""
+  },
+  {
+    "Id": 1236,
+    "Text": "当前人口已超过不死树上限数量！",
+    "Value": ""
+  },
+  {
+    "Id": 1237,
+    "Text": "当前桃谷内无适龄村民",
+    "Value": ""
+  },
+  {
+    "Id": 1238,
+    "Text": "今日出嫁数量已达上限！",
+    "Value": ""
+  },
+  {
+    "Id": 1239,
+    "Text": "{0}{1}{2}成功",
+    "Value": ""
+  },
+  {
+    "Id": 1240,
+    "Text": "良缘未就，聘礼已退还！",
+    "Value": ""
+  },
+  {
+    "Id": 1241,
+    "Text": "{npc}在给二位牵针引线",
+    "Value": ""
+  },
+  {
+    "Id": 1242,
+    "Text": "请先举办喜宴",
+    "Value": ""
+  },
+  {
+    "Id": 1243,
+    "Text": "礼成！红烛长明照良缘，白首同心天地久",
+    "Value": ""
+  },
+  {
+    "Id": 1244,
+    "Text": "请先制作喜礼",
+    "Value": ""
+  },
+  {
+    "Id": 1245,
+    "Text": "请先选择邀请对象",
+    "Value": ""
+  },
+  {
+    "Id": 1246,
+    "Text": "覆盖成功！",
+    "Value": ""
+  },
+  {
+    "Id": 1247,
+    "Text": "拓印名称须在10个字以内！",
+    "Value": ""
+  },
+  {
+    "Id": 1248,
+    "Text": "当前拓印有无法到达的区域！",
+    "Value": ""
+  },
+  {
+    "Id": 1249,
+    "Text": "当前正在燃放的烟花已达到上限",
+    "Value": ""
+  },
+  {
+    "Id": 1250,
+    "Text": "今日已开宴，请明日再来修改菜品",
+    "Value": ""
+  },
   {
     "Id": 2001,
     "Text": "抵达中",
@@ -3199,6 +3309,11 @@
     "Text": "当前正在使用预设菜品功能",
     "Value": ""
   },
+  {
+    "Id": 2414,
+    "Text": "请先邀请宾客以及祝福新人<br>举办家宴后将无法邀请宾客和祝福新人",
+    "Value": ""
+  },
   {
     "Id": 2901,
     "Text": "图鉴积分包括以下四个要素：<br/>建筑积分：包括建造建筑的积分和加固建筑的积分<br/>宝物积分：建筑上装备的宝物所提供的积分<br/>装饰品积分：解锁装饰品提供的积分<br/>皮肤积分：解锁建筑皮肤提供的积分<br/>当图鉴积分相同时，先上榜的人排在前面<br/>每日排行榜于每天晚上12点结算并发放奖励。",
@@ -3969,6 +4084,11 @@
     "Text": "您确定要以{value}桃花石/次的价格洗练宝石属性吗？",
     "Value": ""
   },
+  {
+    "Id": 3057,
+    "Text": "取出铜钱后聚宝盆不产生收益，您确定要取出吗？",
+    "Value": ""
+  },
   {
     "Id": 4001,
     "Text": "你的鱼饵用完了",
@@ -4041,7 +4161,7 @@
   },
   {
     "Id": 4015,
-    "Text": "蓝图删除后不可撤销，您确定要删除吗？",
+    "Text": "拓印删除后不可撤销，您确定要删除吗？",
     "Value": ""
   },
   {

src/api/config/TheaterConfigCategory.json

@@ -0,0 +1,86 @@
+[
+  {
+    "Id": 1,
+    "Name": "贵妃醉酒",
+    "Price": 20000,
+    "Text1": [
+      250007,
+      250008,
+      250009,
+      250010,
+      250011,
+      250012
+    ],
+    "Text2": [
+      250001,
+      250002,
+      250003,
+      250004,
+      250005,
+      250006
+    ]
+  },
+  {
+    "Id": 2,
+    "Name": "红楼梦",
+    "Price": 20000,
+    "Text1": [
+      250007,
+      250008,
+      250013,
+      250014,
+      250015,
+      250016
+    ],
+    "Text2": [
+      250001,
+      250002,
+      250003,
+      250004,
+      250005,
+      250006
+    ]
+  },
+  {
+    "Id": 3,
+    "Name": "白蛇传",
+    "Price": 20000,
+    "Text1": [
+      250007,
+      250008,
+      250017,
+      250018,
+      250019,
+      250020
+    ],
+    "Text2": [
+      250001,
+      250002,
+      250003,
+      250004,
+      250005,
+      250006
+    ]
+  },
+  {
+    "Id": 4,
+    "Name": "梁祝",
+    "Price": 20000,
+    "Text1": [
+      250007,
+      250008,
+      250021,
+      250022,
+      250023,
+      250024
+    ],
+    "Text2": [
+      250001,
+      250002,
+      250003,
+      250004,
+      250005,
+      250006
+    ]
+  }
+]

src/api/config/TheaterHiresValueConfigCategory.json

@@ -0,0 +1,232 @@
+[
+  {
+    "Id": 1,
+    "ItemId": 817,
+    "Value": 100
+  },
+  {
+    "Id": 2,
+    "ItemId": 818,
+    "Value": 200
+  },
+  {
+    "Id": 3,
+    "ItemId": 831,
+    "Value": 5
+  },
+  {
+    "Id": 4,
+    "ItemId": 851,
+    "Value": 20
+  },
+  {
+    "Id": 5,
+    "ItemId": 852,
+    "Value": 20
+  },
+  {
+    "Id": 6,
+    "ItemId": 853,
+    "Value": 20
+  },
+  {
+    "Id": 7,
+    "ItemId": 854,
+    "Value": 20
+  },
+  {
+    "Id": 8,
+    "ItemId": 857,
+    "Value": 20
+  },
+  {
+    "Id": 9,
+    "ItemId": 859,
+    "Value": 20
+  },
+  {
+    "Id": 10,
+    "ItemId": 860,
+    "Value": 15
+  },
+  {
+    "Id": 11,
+    "ItemId": 110,
+    "Value": 2
+  },
+  {
+    "Id": 12,
+    "ItemId": 132,
+    "Value": 50
+  },
+  {
+    "Id": 13,
+    "ItemId": 839,
+    "Value": 10
+  },
+  {
+    "Id": 14,
+    "ItemId": 841,
+    "Value": 20
+  },
+  {
+    "Id": 15,
+    "ItemId": 842,
+    "Value": 20
+  },
+  {
+    "Id": 16,
+    "ItemId": 843,
+    "Value": 30
+  },
+  {
+    "Id": 17,
+    "ItemId": 844,
+    "Value": 30
+  },
+  {
+    "Id": 18,
+    "ItemId": 7308,
+    "Value": 20
+  },
+  {
+    "Id": 100,
+    "ItemId": 3001,
+    "Value": 15
+  },
+  {
+    "Id": 101,
+    "ItemId": 3002,
+    "Value": 20
+  },
+  {
+    "Id": 102,
+    "ItemId": 3003,
+    "Value": 30
+  },
+  {
+    "Id": 103,
+    "ItemId": 3004,
+    "Value": 35
+  },
+  {
+    "Id": 104,
+    "ItemId": 3005,
+    "Value": 40
+  },
+  {
+    "Id": 105,
+    "ItemId": 3006,
+    "Value": 50
+  },
+  {
+    "Id": 106,
+    "ItemId": 3007,
+    "Value": 60
+  },
+  {
+    "Id": 107,
+    "ItemId": 3008,
+    "Value": 15
+  },
+  {
+    "Id": 108,
+    "ItemId": 3009,
+    "Value": 20
+  },
+  {
+    "Id": 109,
+    "ItemId": 3010,
+    "Value": 30
+  },
+  {
+    "Id": 110,
+    "ItemId": 3011,
+    "Value": 35
+  },
+  {
+    "Id": 111,
+    "ItemId": 3012,
+    "Value": 40
+  },
+  {
+    "Id": 112,
+    "ItemId": 3013,
+    "Value": 50
+  },
+  {
+    "Id": 113,
+    "ItemId": 3014,
+    "Value": 60
+  },
+  {
+    "Id": 114,
+    "ItemId": 3015,
+    "Value": 15
+  },
+  {
+    "Id": 115,
+    "ItemId": 3016,
+    "Value": 20
+  },
+  {
+    "Id": 116,
+    "ItemId": 3017,
+    "Value": 30
+  },
+  {
+    "Id": 117,
+    "ItemId": 3018,
+    "Value": 35
+  },
+  {
+    "Id": 118,
+    "ItemId": 3019,
+    "Value": 40
+  },
+  {
+    "Id": 119,
+    "ItemId": 3020,
+    "Value": 50
+  },
+  {
+    "Id": 120,
+    "ItemId": 3021,
+    "Value": 60
+  },
+  {
+    "Id": 121,
+    "ItemId": 3022,
+    "Value": 15
+  },
+  {
+    "Id": 122,
+    "ItemId": 3023,
+    "Value": 20
+  },
+  {
+    "Id": 123,
+    "ItemId": 3024,
+    "Value": 30
+  },
+  {
+    "Id": 124,
+    "ItemId": 3025,
+    "Value": 35
+  },
+  {
+    "Id": 125,
+    "ItemId": 3026,
+    "Value": 40
+  },
+  {
+    "Id": 126,
+    "ItemId": 3027,
+    "Value": 50
+  },
+  {
+    "Id": 127,
+    "ItemId": 3028,
+    "Value": 80
+  }
+]

src/api/config/TheaterHiresValueProbabilityConfigCategory.json

@@ -0,0 +1,86 @@
+[
+  {
+    "Id": 1,
+    "Value": "低",
+    "Range_0": [
+      0,
+      200
+    ],
+    "Range_1": [
+      0,
+      500
+    ],
+    "Range_2": [
+      0,
+      1000
+    ],
+    "Range_3": [
+      0,
+      1500
+    ],
+    "Range_4": [
+      0,
+      2000
+    ],
+    "Probability": [
+      0,
+      20
+    ]
+  },
+  {
+    "Id": 2,
+    "Value": "中",
+    "Range_0": [
+      201,
+      1000
+    ],
+    "Range_1": [
+      501,
+      1500
+    ],
+    "Range_2": [
+      1001,
+      2000
+    ],
+    "Range_3": [
+      1501,
+      2500
+    ],
+    "Range_4": [
+      2001,
+      3000
+    ],
+    "Probability": [
+      20,
+      70
+    ]
+  },
+  {
+    "Id": 3,
+    "Value": "高",
+    "Range_0": [
+      1001,
+      3000
+    ],
+    "Range_1": [
+      1501,
+      3000
+    ],
+    "Range_2": [
+      2001,
+      3000
+    ],
+    "Range_3": [
+      2501,
+      3000
+    ],
+    "Range_4": [
+      3001,
+      4000
+    ],
+    "Probability": [
+      70,
+      100
+    ]
+  }
+]

src/api/config/TitleConfigCategory.json

@@ -10,7 +10,8 @@
     ],
     "Time": false,
     "Level": 1,
-    "Skin": "Tiltle_Pictrue_101"
+    "Skin": "Tiltle_Pictrue_101",
+    "ValleyEffect": []
   },
   {
     "Id": 102,
@@ -23,7 +24,8 @@
     ],
     "Time": false,
     "Level": 1,
-    "Skin": "Tiltle_Pictrue_102"
+    "Skin": "Tiltle_Pictrue_102",
+    "ValleyEffect": []
   },
   {
     "Id": 103,
@@ -36,7 +38,22 @@
     ],
     "Time": false,
     "Level": 1,
-    "Skin": "Tiltle_Pictrue_103"
+    "Skin": "Tiltle_Pictrue_103",
+    "ValleyEffect": []
+  },
+  {
+    "Id": 104,
+    "Name": "千秋良缘使",
+    "Requirement": "成就-桃源宴宴庆良缘",
+    "RequirementTpye": 31,
+    "IdAndType": [
+      140013,
+      1
+    ],
+    "Time": false,
+    "Level": 1,
+    "Skin": "Tiltle_Pictrue_104",
+    "ValleyEffect": []
   },
   {
     "Id": 201,
@@ -49,7 +66,8 @@
     ],
     "Time": false,
     "Level": 2,
-    "Skin": "Tiltle_Pictrue_201"
+    "Skin": "Tiltle_Pictrue_201",
+    "ValleyEffect": []
   },
   {
     "Id": 202,
@@ -62,7 +80,8 @@
     ],
     "Time": false,
     "Level": 2,
-    "Skin": "Tiltle_Pictrue_202"
+    "Skin": "Tiltle_Pictrue_202",
+    "ValleyEffect": []
   },
   {
     "Id": 301,
@@ -75,7 +94,8 @@
     ],
     "Time": false,
     "Level": 3,
-    "Skin": "Tiltle_Pictrue_301"
+    "Skin": "Tiltle_Pictrue_301",
+    "ValleyEffect": []
   },
   {
     "Id": 302,
@@ -88,7 +108,8 @@
     ],
     "Time": false,
     "Level": 3,
-    "Skin": "Tiltle_Pictrue_302"
+    "Skin": "Tiltle_Pictrue_302",
+    "ValleyEffect": []
   },
   {
     "Id": 303,
@@ -101,7 +122,8 @@
     ],
     "Time": false,
     "Level": 3,
-    "Skin": "Tiltle_Pictrue_303"
+    "Skin": "Tiltle_Pictrue_303",
+    "ValleyEffect": []
   },
   {
     "Id": 304,
@@ -114,7 +136,8 @@
     ],
     "Time": false,
     "Level": 3,
-    "Skin": "Tiltle_Pictrue_304"
+    "Skin": "Tiltle_Pictrue_304",
+    "ValleyEffect": []
   },
   {
     "Id": 401,
@@ -127,7 +150,10 @@
     ],
     "Time": false,
     "Level": 4,
-    "Skin": "Tiltle_Pictrue_401"
+    "Skin": "Tiltle_Pictrue_401",
+    "ValleyEffect": [
+      7001
+    ]
   },
   {
     "Id": 402,
@@ -140,7 +166,8 @@
     ],
     "Time": false,
     "Level": 4,
-    "Skin": "Tiltle_Pictrue_402"
+    "Skin": "Tiltle_Pictrue_402",
+    "ValleyEffect": []
   },
   {
     "Id": 403,
@@ -153,7 +180,10 @@
     ],
     "Time": false,
     "Level": 4,
-    "Skin": "Tiltle_Pictrue_403"
+    "Skin": "Tiltle_Pictrue_403",
+    "ValleyEffect": [
+      7002
+    ]
   },
   {
     "Id": 501,
@@ -166,6 +196,9 @@
     ],
     "Time": false,
     "Level": 5,
-    "Skin": "Tiltle_Pictrue_501"
+    "Skin": "Tiltle_Pictrue_501",
+    "ValleyEffect": [
+      7003
+    ]
   }
 ]

src/api/config/VilliagerLifeStoryConfigCategory.json

@@ -110,5 +110,19 @@
     "Record": 100,
     "RepeatRecord": false,
     "Text": "{0}岁时，被妖兽袭击 ，在家人的声嘶力竭中溘然长逝 "
+  },
+  {
+    "Id": 17,
+    "Type": 17,
+    "Record": 100,
+    "RepeatRecord": false,
+    "Text": "{0}岁时，{1}{2}"
+  },
+  {
+    "Id": 18,
+    "Type": 18,
+    "Record": 100,
+    "RepeatRecord": false,
+    "Text": "在{0}岁，从{1}{2}桃谷，与{3}成为夫妻"
   }
 ]

src/api/config/WarriorConfigCategory.json

@@ -45,7 +45,8 @@
     "StarArms": 10000,
     "StarArmor": 20000,
     "Exclusive": [
-      30001
+      30001,
+      30002
     ],
     "HeadIcon": "WarriorHead_qiaodn_1",
     "PrefabName": "Warrior_Lead_M",
@@ -102,7 +103,8 @@
     "StarArms": 10200,
     "StarArmor": 20000,
     "Exclusive": [
-      30002
+      30101,
+      30102
     ],
     "HeadIcon": "WarriorHead_yanggy_2",
     "PrefabName": "Warrior_Lead_F",
@@ -157,7 +159,8 @@
     "StarArms": 10500,
     "StarArmor": 20000,
     "Exclusive": [
-      30003
+      30201,
+      30202
     ],
     "HeadIcon": "WarriorHead_liler_3",
     "PrefabName": "Warrior_4",
@@ -212,7 +215,8 @@
     "StarArms": 10100,
     "StarArmor": 20000,
     "Exclusive": [
-      30004
+      30301,
+      30302
     ],
     "HeadIcon": "WarriorHead_mengh_5",
     "PrefabName": "Warrior_1",
@@ -267,7 +271,8 @@
     "StarArms": 10400,
     "StarArmor": 20000,
     "Exclusive": [
-      30005
+      30401,
+      30402
     ],
     "HeadIcon": "WarriorHead_hanf_6",
     "PrefabName": "Warrior_3",
@@ -322,7 +327,8 @@
     "StarArms": 10300,
     "StarArmor": 20000,
     "Exclusive": [
-      30006
+      30501,
+      30502
     ],
     "HeadIcon": "WarriorHead_murongw_7",
     "PrefabName": "Warrior_2",
@@ -377,7 +383,8 @@
     "StarArms": 10600,
     "StarArmor": 20000,
     "Exclusive": [
-      30007
+      30601,
+      30602
     ],
     "HeadIcon": "WarriorHead_luliu",
     "PrefabName": "Warrior_5",
@@ -432,7 +439,8 @@
     "StarArms": 10700,
     "StarArmor": 20000,
     "Exclusive": [
-      30008
+      30701,
+      30702
     ],
     "HeadIcon": "WarriorHead_Jiu",
     "PrefabName": "Warrior_6",
@@ -487,7 +495,8 @@
     "StarArms": 10800,
     "StarArmor": 20000,
     "Exclusive": [
-      30009
+      30801,
+      30802
     ],
     "HeadIcon": "WarriorHead_xiaogui",
     "PrefabName": "Warrior_9",

src/api/config/WorldParametersConfigCategory.json

@@ -292,7 +292,7 @@
     "VIPCompensateLimeted": 3,
     "VillagersCallForHelp": 15,
     "LinYuDongDraw": 3,
-    "ScaleMax": 20,
+    "ScaleMax": 21,
     "Warlose": "",
     "BehaviourSound": 5,
     "LingYuDongRefreshTime": 1,
@@ -373,8 +373,8 @@
     "CoinIncomeCap": 500000,
     "TaohuashiIncomCap": 100,
     "DaijinquanIncomCap": 10,
-    "BlueprintCap": 1,
-    "BlueprintPurchaseLimit": 1,
+    "BlueprintCap": 3,
+    "BlueprintPurchaseLimit": 3,
     "NormalSweep": 4,
     "VipSweep": 1,
     "RenameMoney": 500,
@@ -389,6 +389,44 @@
     "IngotsRefreshGuarantee": 100,
     "ExpeditionNum": 3,
     "ExpeditionBuyNum": 5,
-    "ExpeditionBuyPrice": 100
+    "ExpeditionBuyPrice": 100,
+    "VillagersRefreshPrice": 2000,
+    "VillagersRefreshNumber": 10,
+    "HiresNumber": 2,
+    "MarriageNumber": 10,
+    "HiresRecordTime": 3,
+    "VillagersAppearTime": 700,
+    "SingleVillager": 70,
+    "BattlePassLvPrice": 100,
+    "NewLywed": 5,
+    "RiverLanterns": 8,
+    "CopperNumber": [
+      66,
+      88,
+      99,
+      666,
+      888,
+      999
+    ],
+    "RiverLanternStertPoint": {
+      "x": 8.4,
+      "y": 41.8
+    },
+    "RiverLanternEndPoint": {
+      "x": 10.4,
+      "y": -51.2
+    },
+    "RiverLanternInterval": 5,
+    "RiverLanternTime": 60,
+    "BattlePassTimeInterval": 1,
+    "WeddingFeastAddNomadFacorability": 20,
+    "VillageDishesNum": 200,
+    "RegionWeddingGiftNumber": 5,
+    "TaoWeddingGiftNumber": 1,
+    "PhoenixFeatherAdd": 888,
+    "FeatherAdd": 666,
+    "FireworksNumbers": 10,
+    "VillageFeastGiveCopperNumber": 3,
+    "EachVillageRaiseFeastNumber": 10
   }
 ]