Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Excel2Json/Excel/DaoyouConfig.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/DaoyouLevelupConfig.json

@@ -28,7 +28,7 @@
       "prizeNum": [
         1
       ],
-      "guajiGrowup": 120
+      "guajiGrowup": 112
     },
     {
       "ID": 4,
@@ -40,7 +40,7 @@
       "prizeNum": [
         1
       ],
-      "guajiGrowup": 140
+      "guajiGrowup": 125
     },
     {
       "ID": 5,
@@ -52,7 +52,7 @@
       "prizeNum": [
         1
       ],
-      "guajiGrowup": 160
+      "guajiGrowup": 137
     },
     {
       "ID": 6,
@@ -64,7 +64,7 @@
       "prizeNum": [
         1
       ],
-      "guajiGrowup": 180
+      "guajiGrowup": 150
     },
     {
       "ID": 7,
@@ -76,7 +76,7 @@
       "prizeNum": [
         1
       ],
-      "guajiGrowup": 200
+      "guajiGrowup": 162
     },
     {
       "ID": 8,
@@ -88,7 +88,7 @@
       "prizeNum": [
         1
       ],
-      "guajiGrowup": 220
+      "guajiGrowup": 175
     },
     {
       "ID": 9,
@@ -100,7 +100,7 @@
       "prizeNum": [
         1
       ],
-      "guajiGrowup": 240
+      "guajiGrowup": 187
     },
     {
       "ID": 10,
@@ -112,7 +112,7 @@
       "prizeNum": [
         1
       ],
-      "guajiGrowup": 260
+      "guajiGrowup": 200
     }
   ]
 }

Assets/Res/Config/DaoyouModelConfig.json

@@ -23,22 +23,20 @@
       "shownPreferGiftID": [
         1201
       ],
-      "daolvBuffType": [
-        112
-      ],
-      "daolvBuffValue": [
-        10
+      "guajiBuffID": [
+        11,
+        22
       ],
-      "daolvBuffQuality": [
-        3
+      "daolvSkillID": [
+        112
       ],
-      "EmotionLvforQuest": null,
-      "QuestID": null,
+      "EmotionLvforQuest": 2,
+      "QuestID": 9001,
       "EmotionLvforspecialGift": [
-        5
+        3
       ],
       "specialGiftID": [
-        1002
+        10002
       ],
       "specialGiftNum": [
         1
@@ -67,8 +65,21 @@
       "shownPreferGiftID": [
         1204
       ],
-      "EmotionLvforQuest": null,
-      "QuestID": null
+      "guajiBuffID": [
+        21,
+        32
+      ],
+      "EmotionLvforQuest": 2,
+      "QuestID": 9002,
+      "EmotionLvforspecialGift": [
+        4
+      ],
+      "specialGiftID": [
+        10003
+      ],
+      "specialGiftNum": [
+        1
+      ]
     },
     {
       "ID": 3,
@@ -93,8 +104,21 @@
       "shownPreferGiftID": [
         1207
       ],
-      "EmotionLvforQuest": null,
-      "QuestID": null
+      "guajiBuffID": [
+        31,
+        42
+      ],
+      "EmotionLvforQuest": 2,
+      "QuestID": 9001,
+      "EmotionLvforspecialGift": [
+        5
+      ],
+      "specialGiftID": [
+        10004
+      ],
+      "specialGiftNum": [
+        1
+      ]
     },
     {
       "ID": 4,
@@ -119,8 +143,21 @@
       "shownPreferGiftID": [
         1301
       ],
-      "EmotionLvforQuest": null,
-      "QuestID": null
+      "guajiBuffID": [
+        41,
+        12
+      ],
+      "EmotionLvforQuest": 3,
+      "QuestID": 9002,
+      "EmotionLvforspecialGift": [
+        4
+      ],
+      "specialGiftID": [
+        10005
+      ],
+      "specialGiftNum": [
+        1
+      ]
     },
     {
       "ID": 5,
@@ -145,8 +182,21 @@
       "shownPreferGiftID": [
         1401
       ],
-      "EmotionLvforQuest": null,
-      "QuestID": null
+      "guajiBuffID": [
+        12,
+        33
+      ],
+      "EmotionLvforQuest": 3,
+      "QuestID": 9001,
+      "EmotionLvforspecialGift": [
+        5
+      ],
+      "specialGiftID": [
+        10006
+      ],
+      "specialGiftNum": [
+        1
+      ]
     },
     {
       "ID": 6,
@@ -171,8 +221,21 @@
       "shownPreferGiftID": [
         1201
       ],
-      "EmotionLvforQuest": null,
-      "QuestID": null
+      "guajiBuffID": [
+        22,
+        43
+      ],
+      "EmotionLvforQuest": 3,
+      "QuestID": 9002,
+      "EmotionLvforspecialGift": [
+        6
+      ],
+      "specialGiftID": [
+        10007
+      ],
+      "specialGiftNum": [
+        1
+      ]
     },
     {
       "ID": 7,
@@ -197,8 +260,21 @@
       "shownPreferGiftID": [
         1204
       ],
-      "EmotionLvforQuest": null,
-      "QuestID": null
+      "guajiBuffID": [
+        32,
+        13
+      ],
+      "EmotionLvforQuest": 4,
+      "QuestID": 9001,
+      "EmotionLvforspecialGift": [
+        5
+      ],
+      "specialGiftID": [
+        10008
+      ],
+      "specialGiftNum": [
+        1
+      ]
     },
     {
       "ID": 8,
@@ -223,8 +299,21 @@
       "shownPreferGiftID": [
         1207
       ],
-      "EmotionLvforQuest": null,
-      "QuestID": null
+      "guajiBuffID": [
+        42,
+        23
+      ],
+      "EmotionLvforQuest": 4,
+      "QuestID": 9002,
+      "EmotionLvforspecialGift": [
+        6
+      ],
+      "specialGiftID": [
+        10009
+      ],
+      "specialGiftNum": [
+        1
+      ]
     },
     {
       "ID": 9,
@@ -249,8 +338,21 @@
       "shownPreferGiftID": [
         1301
       ],
-      "EmotionLvforQuest": null,
-      "QuestID": null
+      "guajiBuffID": [
+        13,
+        34
+      ],
+      "EmotionLvforQuest": 5,
+      "QuestID": 9001,
+      "EmotionLvforspecialGift": [
+        7
+      ],
+      "specialGiftID": [
+        10010
+      ],
+      "specialGiftNum": [
+        1
+      ]
     },
     {
       "ID": 10,
@@ -275,8 +377,21 @@
       "shownPreferGiftID": [
         1401
       ],
-      "EmotionLvforQuest": null,
-      "QuestID": null
+      "guajiBuffID": [
+        23,
+        44
+      ],
+      "EmotionLvforQuest": 6,
+      "QuestID": 9002,
+      "EmotionLvforspecialGift": [
+        8
+      ],
+      "specialGiftID": [
+        10011
+      ],
+      "specialGiftNum": [
+        1
+      ]
     }
   ]
 }

Assets/Res/Config/DaoyouguajiResourcLevel.json

@@ -2,468 +2,2103 @@
   "configList": [
     {
       "ID": 1,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 50,
+      "para2": 50,
+      "para3": 50,
+      "para4": 50
     },
     {
       "ID": 2,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 51,
+      "para2": 51,
+      "para3": 51,
+      "para4": 51
     },
     {
       "ID": 3,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 51,
+      "para2": 51,
+      "para3": 51,
+      "para4": 51
     },
     {
       "ID": 4,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 52,
+      "para2": 52,
+      "para3": 52,
+      "para4": 52
     },
     {
       "ID": 5,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 52,
+      "para2": 52,
+      "para3": 52,
+      "para4": 52
     },
     {
       "ID": 6,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 53,
+      "para2": 53,
+      "para3": 53,
+      "para4": 53
     },
     {
       "ID": 7,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 53,
+      "para2": 53,
+      "para3": 53,
+      "para4": 53
     },
     {
       "ID": 8,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 54,
+      "para2": 54,
+      "para3": 54,
+      "para4": 54
     },
     {
       "ID": 9,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 54,
+      "para2": 54,
+      "para3": 54,
+      "para4": 54
     },
     {
       "ID": 10,
-      "para1": 100,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 55,
+      "para2": 55,
+      "para3": 55,
+      "para4": 55
     },
     {
       "ID": 11,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 55,
+      "para2": 55,
+      "para3": 55,
+      "para4": 55
     },
     {
       "ID": 12,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 56,
+      "para2": 56,
+      "para3": 56,
+      "para4": 56
     },
     {
       "ID": 13,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 56,
+      "para2": 56,
+      "para3": 56,
+      "para4": 56
     },
     {
       "ID": 14,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 57,
+      "para2": 57,
+      "para3": 57,
+      "para4": 57
     },
     {
       "ID": 15,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 57,
+      "para2": 57,
+      "para3": 57,
+      "para4": 57
     },
     {
       "ID": 16,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 58,
+      "para2": 58,
+      "para3": 58,
+      "para4": 58
     },
     {
       "ID": 17,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 58,
+      "para2": 58,
+      "para3": 58,
+      "para4": 58
     },
     {
       "ID": 18,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 59,
+      "para2": 59,
+      "para3": 59,
+      "para4": 59
     },
     {
       "ID": 19,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 59,
+      "para2": 59,
+      "para3": 59,
+      "para4": 59
     },
     {
       "ID": 20,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 60,
+      "para2": 60,
+      "para3": 60,
+      "para4": 60
     },
     {
       "ID": 21,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 60,
+      "para2": 60,
+      "para3": 60,
+      "para4": 60
     },
     {
       "ID": 22,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 61,
+      "para2": 61,
+      "para3": 61,
+      "para4": 61
     },
     {
       "ID": 23,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 61,
+      "para2": 61,
+      "para3": 61,
+      "para4": 61
     },
     {
       "ID": 24,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 62,
+      "para2": 62,
+      "para3": 62,
+      "para4": 62
     },
     {
       "ID": 25,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 62,
+      "para2": 62,
+      "para3": 62,
+      "para4": 62
     },
     {
       "ID": 26,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 63,
+      "para2": 63,
+      "para3": 63,
+      "para4": 63
     },
     {
       "ID": 27,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 63,
+      "para2": 63,
+      "para3": 63,
+      "para4": 63
     },
     {
       "ID": 28,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 64,
+      "para2": 64,
+      "para3": 64,
+      "para4": 64
     },
     {
       "ID": 29,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 64,
+      "para2": 64,
+      "para3": 64,
+      "para4": 64
     },
     {
       "ID": 30,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 65,
+      "para2": 65,
+      "para3": 65,
+      "para4": 65
     },
     {
       "ID": 31,
-      "para1": null,
-      "para2": null,
-      "para3": null,
-      "para4": null,
-      "para5": null,
-      "para6": null,
-      "para7": null,
-      "para8": null,
-      "para9": null,
-      "para10": null,
-      "para11": null,
-      "para12": null
+      "para1": 65,
+      "para2": 65,
+      "para3": 65,
+      "para4": 65
+    },
+    {
+      "ID": 32,
+      "para1": 66,
+      "para2": 66,
+      "para3": 66,
+      "para4": 66
+    },
+    {
+      "ID": 33,
+      "para1": 66,
+      "para2": 66,
+      "para3": 66,
+      "para4": 66
+    },
+    {
+      "ID": 34,
+      "para1": 67,
+      "para2": 67,
+      "para3": 67,
+      "para4": 67
+    },
+    {
+      "ID": 35,
+      "para1": 67,
+      "para2": 67,
+      "para3": 67,
+      "para4": 67
+    },
+    {
+      "ID": 36,
+      "para1": 68,
+      "para2": 68,
+      "para3": 68,
+      "para4": 68
+    },
+    {
+      "ID": 37,
+      "para1": 68,
+      "para2": 68,
+      "para3": 68,
+      "para4": 68
+    },
+    {
+      "ID": 38,
+      "para1": 69,
+      "para2": 69,
+      "para3": 69,
+      "para4": 69
+    },
+    {
+      "ID": 39,
+      "para1": 69,
+      "para2": 69,
+      "para3": 69,
+      "para4": 69
+    },
+    {
+      "ID": 40,
+      "para1": 70,
+      "para2": 70,
+      "para3": 70,
+      "para4": 70
+    },
+    {
+      "ID": 41,
+      "para1": 70,
+      "para2": 70,
+      "para3": 70,
+      "para4": 70
+    },
+    {
+      "ID": 42,
+      "para1": 71,
+      "para2": 71,
+      "para3": 71,
+      "para4": 71
+    },
+    {
+      "ID": 43,
+      "para1": 71,
+      "para2": 71,
+      "para3": 71,
+      "para4": 71
+    },
+    {
+      "ID": 44,
+      "para1": 72,
+      "para2": 72,
+      "para3": 72,
+      "para4": 72
+    },
+    {
+      "ID": 45,
+      "para1": 72,
+      "para2": 72,
+      "para3": 72,
+      "para4": 72
+    },
+    {
+      "ID": 46,
+      "para1": 73,
+      "para2": 73,
+      "para3": 73,
+      "para4": 73
+    },
+    {
+      "ID": 47,
+      "para1": 73,
+      "para2": 73,
+      "para3": 73,
+      "para4": 73
+    },
+    {
+      "ID": 48,
+      "para1": 74,
+      "para2": 74,
+      "para3": 74,
+      "para4": 74
+    },
+    {
+      "ID": 49,
+      "para1": 74,
+      "para2": 74,
+      "para3": 74,
+      "para4": 74
+    },
+    {
+      "ID": 50,
+      "para1": 75,
+      "para2": 75,
+      "para3": 75,
+      "para4": 75
+    },
+    {
+      "ID": 51,
+      "para1": 75,
+      "para2": 75,
+      "para3": 75,
+      "para4": 75
+    },
+    {
+      "ID": 52,
+      "para1": 76,
+      "para2": 76,
+      "para3": 76,
+      "para4": 76
+    },
+    {
+      "ID": 53,
+      "para1": 76,
+      "para2": 76,
+      "para3": 76,
+      "para4": 76
+    },
+    {
+      "ID": 54,
+      "para1": 77,
+      "para2": 77,
+      "para3": 77,
+      "para4": 77
+    },
+    {
+      "ID": 55,
+      "para1": 77,
+      "para2": 77,
+      "para3": 77,
+      "para4": 77
+    },
+    {
+      "ID": 56,
+      "para1": 78,
+      "para2": 78,
+      "para3": 78,
+      "para4": 78
+    },
+    {
+      "ID": 57,
+      "para1": 78,
+      "para2": 78,
+      "para3": 78,
+      "para4": 78
+    },
+    {
+      "ID": 58,
+      "para1": 79,
+      "para2": 79,
+      "para3": 79,
+      "para4": 79
+    },
+    {
+      "ID": 59,
+      "para1": 79,
+      "para2": 79,
+      "para3": 79,
+      "para4": 79
+    },
+    {
+      "ID": 60,
+      "para1": 80,
+      "para2": 80,
+      "para3": 80,
+      "para4": 80
+    },
+    {
+      "ID": 61,
+      "para1": 80,
+      "para2": 80,
+      "para3": 80,
+      "para4": 80
+    },
+    {
+      "ID": 62,
+      "para1": 81,
+      "para2": 81,
+      "para3": 81,
+      "para4": 81
+    },
+    {
+      "ID": 63,
+      "para1": 81,
+      "para2": 81,
+      "para3": 81,
+      "para4": 81
+    },
+    {
+      "ID": 64,
+      "para1": 82,
+      "para2": 82,
+      "para3": 82,
+      "para4": 82
+    },
+    {
+      "ID": 65,
+      "para1": 82,
+      "para2": 82,
+      "para3": 82,
+      "para4": 82
+    },
+    {
+      "ID": 66,
+      "para1": 83,
+      "para2": 83,
+      "para3": 83,
+      "para4": 83
+    },
+    {
+      "ID": 67,
+      "para1": 83,
+      "para2": 83,
+      "para3": 83,
+      "para4": 83
+    },
+    {
+      "ID": 68,
+      "para1": 84,
+      "para2": 84,
+      "para3": 84,
+      "para4": 84
+    },
+    {
+      "ID": 69,
+      "para1": 84,
+      "para2": 84,
+      "para3": 84,
+      "para4": 84
+    },
+    {
+      "ID": 70,
+      "para1": 85,
+      "para2": 85,
+      "para3": 85,
+      "para4": 85
+    },
+    {
+      "ID": 71,
+      "para1": 85,
+      "para2": 85,
+      "para3": 85,
+      "para4": 85
+    },
+    {
+      "ID": 72,
+      "para1": 86,
+      "para2": 86,
+      "para3": 86,
+      "para4": 86
+    },
+    {
+      "ID": 73,
+      "para1": 86,
+      "para2": 86,
+      "para3": 86,
+      "para4": 86
+    },
+    {
+      "ID": 74,
+      "para1": 87,
+      "para2": 87,
+      "para3": 87,
+      "para4": 87
+    },
+    {
+      "ID": 75,
+      "para1": 87,
+      "para2": 87,
+      "para3": 87,
+      "para4": 87
+    },
+    {
+      "ID": 76,
+      "para1": 88,
+      "para2": 88,
+      "para3": 88,
+      "para4": 88
+    },
+    {
+      "ID": 77,
+      "para1": 88,
+      "para2": 88,
+      "para3": 88,
+      "para4": 88
+    },
+    {
+      "ID": 78,
+      "para1": 89,
+      "para2": 89,
+      "para3": 89,
+      "para4": 89
+    },
+    {
+      "ID": 79,
+      "para1": 89,
+      "para2": 89,
+      "para3": 89,
+      "para4": 89
+    },
+    {
+      "ID": 80,
+      "para1": 90,
+      "para2": 90,
+      "para3": 90,
+      "para4": 90
+    },
+    {
+      "ID": 81,
+      "para1": 90,
+      "para2": 90,
+      "para3": 90,
+      "para4": 90
+    },
+    {
+      "ID": 82,
+      "para1": 91,
+      "para2": 91,
+      "para3": 91,
+      "para4": 91
+    },
+    {
+      "ID": 83,
+      "para1": 91,
+      "para2": 91,
+      "para3": 91,
+      "para4": 91
+    },
+    {
+      "ID": 84,
+      "para1": 92,
+      "para2": 92,
+      "para3": 92,
+      "para4": 92
+    },
+    {
+      "ID": 85,
+      "para1": 92,
+      "para2": 92,
+      "para3": 92,
+      "para4": 92
+    },
+    {
+      "ID": 86,
+      "para1": 93,
+      "para2": 93,
+      "para3": 93,
+      "para4": 93
+    },
+    {
+      "ID": 87,
+      "para1": 93,
+      "para2": 93,
+      "para3": 93,
+      "para4": 93
+    },
+    {
+      "ID": 88,
+      "para1": 94,
+      "para2": 94,
+      "para3": 94,
+      "para4": 94
+    },
+    {
+      "ID": 89,
+      "para1": 94,
+      "para2": 94,
+      "para3": 94,
+      "para4": 94
+    },
+    {
+      "ID": 90,
+      "para1": 95,
+      "para2": 95,
+      "para3": 95,
+      "para4": 95
+    },
+    {
+      "ID": 91,
+      "para1": 95,
+      "para2": 95,
+      "para3": 95,
+      "para4": 95
+    },
+    {
+      "ID": 92,
+      "para1": 96,
+      "para2": 96,
+      "para3": 96,
+      "para4": 96
+    },
+    {
+      "ID": 93,
+      "para1": 96,
+      "para2": 96,
+      "para3": 96,
+      "para4": 96
+    },
+    {
+      "ID": 94,
+      "para1": 97,
+      "para2": 97,
+      "para3": 97,
+      "para4": 97
+    },
+    {
+      "ID": 95,
+      "para1": 97,
+      "para2": 97,
+      "para3": 97,
+      "para4": 97
+    },
+    {
+      "ID": 96,
+      "para1": 98,
+      "para2": 98,
+      "para3": 98,
+      "para4": 98
+    },
+    {
+      "ID": 97,
+      "para1": 98,
+      "para2": 98,
+      "para3": 98,
+      "para4": 98
+    },
+    {
+      "ID": 98,
+      "para1": 99,
+      "para2": 99,
+      "para3": 99,
+      "para4": 99
+    },
+    {
+      "ID": 99,
+      "para1": 99,
+      "para2": 99,
+      "para3": 99,
+      "para4": 99
+    },
+    {
+      "ID": 100,
+      "para1": 100,
+      "para2": 100,
+      "para3": 100,
+      "para4": 100
+    },
+    {
+      "ID": 101,
+      "para1": 100,
+      "para2": 100,
+      "para3": 100,
+      "para4": 100
+    },
+    {
+      "ID": 102,
+      "para1": 101,
+      "para2": 101,
+      "para3": 101,
+      "para4": 101
+    },
+    {
+      "ID": 103,
+      "para1": 101,
+      "para2": 101,
+      "para3": 101,
+      "para4": 101
+    },
+    {
+      "ID": 104,
+      "para1": 102,
+      "para2": 102,
+      "para3": 102,
+      "para4": 102
+    },
+    {
+      "ID": 105,
+      "para1": 102,
+      "para2": 102,
+      "para3": 102,
+      "para4": 102
+    },
+    {
+      "ID": 106,
+      "para1": 103,
+      "para2": 103,
+      "para3": 103,
+      "para4": 103
+    },
+    {
+      "ID": 107,
+      "para1": 103,
+      "para2": 103,
+      "para3": 103,
+      "para4": 103
+    },
+    {
+      "ID": 108,
+      "para1": 104,
+      "para2": 104,
+      "para3": 104,
+      "para4": 104
+    },
+    {
+      "ID": 109,
+      "para1": 104,
+      "para2": 104,
+      "para3": 104,
+      "para4": 104
+    },
+    {
+      "ID": 110,
+      "para1": 105,
+      "para2": 105,
+      "para3": 105,
+      "para4": 105
+    },
+    {
+      "ID": 111,
+      "para1": 105,
+      "para2": 105,
+      "para3": 105,
+      "para4": 105
+    },
+    {
+      "ID": 112,
+      "para1": 106,
+      "para2": 106,
+      "para3": 106,
+      "para4": 106
+    },
+    {
+      "ID": 113,
+      "para1": 106,
+      "para2": 106,
+      "para3": 106,
+      "para4": 106
+    },
+    {
+      "ID": 114,
+      "para1": 107,
+      "para2": 107,
+      "para3": 107,
+      "para4": 107
+    },
+    {
+      "ID": 115,
+      "para1": 107,
+      "para2": 107,
+      "para3": 107,
+      "para4": 107
+    },
+    {
+      "ID": 116,
+      "para1": 108,
+      "para2": 108,
+      "para3": 108,
+      "para4": 108
+    },
+    {
+      "ID": 117,
+      "para1": 108,
+      "para2": 108,
+      "para3": 108,
+      "para4": 108
+    },
+    {
+      "ID": 118,
+      "para1": 109,
+      "para2": 109,
+      "para3": 109,
+      "para4": 109
+    },
+    {
+      "ID": 119,
+      "para1": 109,
+      "para2": 109,
+      "para3": 109,
+      "para4": 109
+    },
+    {
+      "ID": 120,
+      "para1": 110,
+      "para2": 110,
+      "para3": 110,
+      "para4": 110
+    },
+    {
+      "ID": 121,
+      "para1": 110,
+      "para2": 110,
+      "para3": 110,
+      "para4": 110
+    },
+    {
+      "ID": 122,
+      "para1": 111,
+      "para2": 111,
+      "para3": 111,
+      "para4": 111
+    },
+    {
+      "ID": 123,
+      "para1": 111,
+      "para2": 111,
+      "para3": 111,
+      "para4": 111
+    },
+    {
+      "ID": 124,
+      "para1": 112,
+      "para2": 112,
+      "para3": 112,
+      "para4": 112
+    },
+    {
+      "ID": 125,
+      "para1": 112,
+      "para2": 112,
+      "para3": 112,
+      "para4": 112
+    },
+    {
+      "ID": 126,
+      "para1": 113,
+      "para2": 113,
+      "para3": 113,
+      "para4": 113
+    },
+    {
+      "ID": 127,
+      "para1": 113,
+      "para2": 113,
+      "para3": 113,
+      "para4": 113
+    },
+    {
+      "ID": 128,
+      "para1": 114,
+      "para2": 114,
+      "para3": 114,
+      "para4": 114
+    },
+    {
+      "ID": 129,
+      "para1": 114,
+      "para2": 114,
+      "para3": 114,
+      "para4": 114
+    },
+    {
+      "ID": 130,
+      "para1": 115,
+      "para2": 115,
+      "para3": 115,
+      "para4": 115
+    },
+    {
+      "ID": 131,
+      "para1": 115,
+      "para2": 115,
+      "para3": 115,
+      "para4": 115
+    },
+    {
+      "ID": 132,
+      "para1": 116,
+      "para2": 116,
+      "para3": 116,
+      "para4": 116
+    },
+    {
+      "ID": 133,
+      "para1": 116,
+      "para2": 116,
+      "para3": 116,
+      "para4": 116
+    },
+    {
+      "ID": 134,
+      "para1": 117,
+      "para2": 117,
+      "para3": 117,
+      "para4": 117
+    },
+    {
+      "ID": 135,
+      "para1": 117,
+      "para2": 117,
+      "para3": 117,
+      "para4": 117
+    },
+    {
+      "ID": 136,
+      "para1": 118,
+      "para2": 118,
+      "para3": 118,
+      "para4": 118
+    },
+    {
+      "ID": 137,
+      "para1": 118,
+      "para2": 118,
+      "para3": 118,
+      "para4": 118
+    },
+    {
+      "ID": 138,
+      "para1": 119,
+      "para2": 119,
+      "para3": 119,
+      "para4": 119
+    },
+    {
+      "ID": 139,
+      "para1": 119,
+      "para2": 119,
+      "para3": 119,
+      "para4": 119
+    },
+    {
+      "ID": 140,
+      "para1": 120,
+      "para2": 120,
+      "para3": 120,
+      "para4": 120
+    },
+    {
+      "ID": 141,
+      "para1": 120,
+      "para2": 120,
+      "para3": 120,
+      "para4": 120
+    },
+    {
+      "ID": 142,
+      "para1": 121,
+      "para2": 121,
+      "para3": 121,
+      "para4": 121
+    },
+    {
+      "ID": 143,
+      "para1": 121,
+      "para2": 121,
+      "para3": 121,
+      "para4": 121
+    },
+    {
+      "ID": 144,
+      "para1": 122,
+      "para2": 122,
+      "para3": 122,
+      "para4": 122
+    },
+    {
+      "ID": 145,
+      "para1": 122,
+      "para2": 122,
+      "para3": 122,
+      "para4": 122
+    },
+    {
+      "ID": 146,
+      "para1": 123,
+      "para2": 123,
+      "para3": 123,
+      "para4": 123
+    },
+    {
+      "ID": 147,
+      "para1": 123,
+      "para2": 123,
+      "para3": 123,
+      "para4": 123
+    },
+    {
+      "ID": 148,
+      "para1": 124,
+      "para2": 124,
+      "para3": 124,
+      "para4": 124
+    },
+    {
+      "ID": 149,
+      "para1": 124,
+      "para2": 124,
+      "para3": 124,
+      "para4": 124
+    },
+    {
+      "ID": 150,
+      "para1": 125,
+      "para2": 125,
+      "para3": 125,
+      "para4": 125
+    },
+    {
+      "ID": 151,
+      "para1": 125,
+      "para2": 125,
+      "para3": 125,
+      "para4": 125
+    },
+    {
+      "ID": 152,
+      "para1": 126,
+      "para2": 126,
+      "para3": 126,
+      "para4": 126
+    },
+    {
+      "ID": 153,
+      "para1": 126,
+      "para2": 126,
+      "para3": 126,
+      "para4": 126
+    },
+    {
+      "ID": 154,
+      "para1": 127,
+      "para2": 127,
+      "para3": 127,
+      "para4": 127
+    },
+    {
+      "ID": 155,
+      "para1": 127,
+      "para2": 127,
+      "para3": 127,
+      "para4": 127
+    },
+    {
+      "ID": 156,
+      "para1": 128,
+      "para2": 128,
+      "para3": 128,
+      "para4": 128
+    },
+    {
+      "ID": 157,
+      "para1": 128,
+      "para2": 128,
+      "para3": 128,
+      "para4": 128
+    },
+    {
+      "ID": 158,
+      "para1": 129,
+      "para2": 129,
+      "para3": 129,
+      "para4": 129
+    },
+    {
+      "ID": 159,
+      "para1": 129,
+      "para2": 129,
+      "para3": 129,
+      "para4": 129
+    },
+    {
+      "ID": 160,
+      "para1": 130,
+      "para2": 130,
+      "para3": 130,
+      "para4": 130
+    },
+    {
+      "ID": 161,
+      "para1": 130,
+      "para2": 130,
+      "para3": 130,
+      "para4": 130
+    },
+    {
+      "ID": 162,
+      "para1": 131,
+      "para2": 131,
+      "para3": 131,
+      "para4": 131
+    },
+    {
+      "ID": 163,
+      "para1": 131,
+      "para2": 131,
+      "para3": 131,
+      "para4": 131
+    },
+    {
+      "ID": 164,
+      "para1": 132,
+      "para2": 132,
+      "para3": 132,
+      "para4": 132
+    },
+    {
+      "ID": 165,
+      "para1": 132,
+      "para2": 132,
+      "para3": 132,
+      "para4": 132
+    },
+    {
+      "ID": 166,
+      "para1": 133,
+      "para2": 133,
+      "para3": 133,
+      "para4": 133
+    },
+    {
+      "ID": 167,
+      "para1": 133,
+      "para2": 133,
+      "para3": 133,
+      "para4": 133
+    },
+    {
+      "ID": 168,
+      "para1": 134,
+      "para2": 134,
+      "para3": 134,
+      "para4": 134
+    },
+    {
+      "ID": 169,
+      "para1": 134,
+      "para2": 134,
+      "para3": 134,
+      "para4": 134
+    },
+    {
+      "ID": 170,
+      "para1": 135,
+      "para2": 135,
+      "para3": 135,
+      "para4": 135
+    },
+    {
+      "ID": 171,
+      "para1": 135,
+      "para2": 135,
+      "para3": 135,
+      "para4": 135
+    },
+    {
+      "ID": 172,
+      "para1": 136,
+      "para2": 136,
+      "para3": 136,
+      "para4": 136
+    },
+    {
+      "ID": 173,
+      "para1": 136,
+      "para2": 136,
+      "para3": 136,
+      "para4": 136
+    },
+    {
+      "ID": 174,
+      "para1": 137,
+      "para2": 137,
+      "para3": 137,
+      "para4": 137
+    },
+    {
+      "ID": 175,
+      "para1": 137,
+      "para2": 137,
+      "para3": 137,
+      "para4": 137
+    },
+    {
+      "ID": 176,
+      "para1": 138,
+      "para2": 138,
+      "para3": 138,
+      "para4": 138
+    },
+    {
+      "ID": 177,
+      "para1": 138,
+      "para2": 138,
+      "para3": 138,
+      "para4": 138
+    },
+    {
+      "ID": 178,
+      "para1": 139,
+      "para2": 139,
+      "para3": 139,
+      "para4": 139
+    },
+    {
+      "ID": 179,
+      "para1": 139,
+      "para2": 139,
+      "para3": 139,
+      "para4": 139
+    },
+    {
+      "ID": 180,
+      "para1": 140,
+      "para2": 140,
+      "para3": 140,
+      "para4": 140
+    },
+    {
+      "ID": 181,
+      "para1": 140,
+      "para2": 140,
+      "para3": 140,
+      "para4": 140
+    },
+    {
+      "ID": 182,
+      "para1": 141,
+      "para2": 141,
+      "para3": 141,
+      "para4": 141
+    },
+    {
+      "ID": 183,
+      "para1": 141,
+      "para2": 141,
+      "para3": 141,
+      "para4": 141
+    },
+    {
+      "ID": 184,
+      "para1": 142,
+      "para2": 142,
+      "para3": 142,
+      "para4": 142
+    },
+    {
+      "ID": 185,
+      "para1": 142,
+      "para2": 142,
+      "para3": 142,
+      "para4": 142
+    },
+    {
+      "ID": 186,
+      "para1": 143,
+      "para2": 143,
+      "para3": 143,
+      "para4": 143
+    },
+    {
+      "ID": 187,
+      "para1": 143,
+      "para2": 143,
+      "para3": 143,
+      "para4": 143
+    },
+    {
+      "ID": 188,
+      "para1": 144,
+      "para2": 144,
+      "para3": 144,
+      "para4": 144
+    },
+    {
+      "ID": 189,
+      "para1": 144,
+      "para2": 144,
+      "para3": 144,
+      "para4": 144
+    },
+    {
+      "ID": 190,
+      "para1": 145,
+      "para2": 145,
+      "para3": 145,
+      "para4": 145
+    },
+    {
+      "ID": 191,
+      "para1": 145,
+      "para2": 145,
+      "para3": 145,
+      "para4": 145
+    },
+    {
+      "ID": 192,
+      "para1": 146,
+      "para2": 146,
+      "para3": 146,
+      "para4": 146
+    },
+    {
+      "ID": 193,
+      "para1": 146,
+      "para2": 146,
+      "para3": 146,
+      "para4": 146
+    },
+    {
+      "ID": 194,
+      "para1": 147,
+      "para2": 147,
+      "para3": 147,
+      "para4": 147
+    },
+    {
+      "ID": 195,
+      "para1": 147,
+      "para2": 147,
+      "para3": 147,
+      "para4": 147
+    },
+    {
+      "ID": 196,
+      "para1": 148,
+      "para2": 148,
+      "para3": 148,
+      "para4": 148
+    },
+    {
+      "ID": 197,
+      "para1": 148,
+      "para2": 148,
+      "para3": 148,
+      "para4": 148
+    },
+    {
+      "ID": 198,
+      "para1": 149,
+      "para2": 149,
+      "para3": 149,
+      "para4": 149
+    },
+    {
+      "ID": 199,
+      "para1": 149,
+      "para2": 149,
+      "para3": 149,
+      "para4": 149
+    },
+    {
+      "ID": 200,
+      "para1": 150,
+      "para2": 150,
+      "para3": 150,
+      "para4": 150
+    },
+    {
+      "ID": 201,
+      "para1": 150,
+      "para2": 150,
+      "para3": 150,
+      "para4": 150
+    },
+    {
+      "ID": 202,
+      "para1": 151,
+      "para2": 151,
+      "para3": 151,
+      "para4": 151
+    },
+    {
+      "ID": 203,
+      "para1": 151,
+      "para2": 151,
+      "para3": 151,
+      "para4": 151
+    },
+    {
+      "ID": 204,
+      "para1": 152,
+      "para2": 152,
+      "para3": 152,
+      "para4": 152
+    },
+    {
+      "ID": 205,
+      "para1": 152,
+      "para2": 152,
+      "para3": 152,
+      "para4": 152
+    },
+    {
+      "ID": 206,
+      "para1": 153,
+      "para2": 153,
+      "para3": 153,
+      "para4": 153
+    },
+    {
+      "ID": 207,
+      "para1": 153,
+      "para2": 153,
+      "para3": 153,
+      "para4": 153
+    },
+    {
+      "ID": 208,
+      "para1": 154,
+      "para2": 154,
+      "para3": 154,
+      "para4": 154
+    },
+    {
+      "ID": 209,
+      "para1": 154,
+      "para2": 154,
+      "para3": 154,
+      "para4": 154
+    },
+    {
+      "ID": 210,
+      "para1": 155,
+      "para2": 155,
+      "para3": 155,
+      "para4": 155
+    },
+    {
+      "ID": 211,
+      "para1": 155,
+      "para2": 155,
+      "para3": 155,
+      "para4": 155
+    },
+    {
+      "ID": 212,
+      "para1": 156,
+      "para2": 156,
+      "para3": 156,
+      "para4": 156
+    },
+    {
+      "ID": 213,
+      "para1": 156,
+      "para2": 156,
+      "para3": 156,
+      "para4": 156
+    },
+    {
+      "ID": 214,
+      "para1": 157,
+      "para2": 157,
+      "para3": 157,
+      "para4": 157
+    },
+    {
+      "ID": 215,
+      "para1": 157,
+      "para2": 157,
+      "para3": 157,
+      "para4": 157
+    },
+    {
+      "ID": 216,
+      "para1": 158,
+      "para2": 158,
+      "para3": 158,
+      "para4": 158
+    },
+    {
+      "ID": 217,
+      "para1": 158,
+      "para2": 158,
+      "para3": 158,
+      "para4": 158
+    },
+    {
+      "ID": 218,
+      "para1": 159,
+      "para2": 159,
+      "para3": 159,
+      "para4": 159
+    },
+    {
+      "ID": 219,
+      "para1": 159,
+      "para2": 159,
+      "para3": 159,
+      "para4": 159
+    },
+    {
+      "ID": 220,
+      "para1": 160,
+      "para2": 160,
+      "para3": 160,
+      "para4": 160
+    },
+    {
+      "ID": 221,
+      "para1": 160,
+      "para2": 160,
+      "para3": 160,
+      "para4": 160
+    },
+    {
+      "ID": 222,
+      "para1": 161,
+      "para2": 161,
+      "para3": 161,
+      "para4": 161
+    },
+    {
+      "ID": 223,
+      "para1": 161,
+      "para2": 161,
+      "para3": 161,
+      "para4": 161
+    },
+    {
+      "ID": 224,
+      "para1": 162,
+      "para2": 162,
+      "para3": 162,
+      "para4": 162
+    },
+    {
+      "ID": 225,
+      "para1": 162,
+      "para2": 162,
+      "para3": 162,
+      "para4": 162
+    },
+    {
+      "ID": 226,
+      "para1": 163,
+      "para2": 163,
+      "para3": 163,
+      "para4": 163
+    },
+    {
+      "ID": 227,
+      "para1": 163,
+      "para2": 163,
+      "para3": 163,
+      "para4": 163
+    },
+    {
+      "ID": 228,
+      "para1": 164,
+      "para2": 164,
+      "para3": 164,
+      "para4": 164
+    },
+    {
+      "ID": 229,
+      "para1": 164,
+      "para2": 164,
+      "para3": 164,
+      "para4": 164
+    },
+    {
+      "ID": 230,
+      "para1": 165,
+      "para2": 165,
+      "para3": 165,
+      "para4": 165
+    },
+    {
+      "ID": 231,
+      "para1": 165,
+      "para2": 165,
+      "para3": 165,
+      "para4": 165
+    },
+    {
+      "ID": 232,
+      "para1": 166,
+      "para2": 166,
+      "para3": 166,
+      "para4": 166
+    },
+    {
+      "ID": 233,
+      "para1": 166,
+      "para2": 166,
+      "para3": 166,
+      "para4": 166
+    },
+    {
+      "ID": 234,
+      "para1": 167,
+      "para2": 167,
+      "para3": 167,
+      "para4": 167
+    },
+    {
+      "ID": 235,
+      "para1": 167,
+      "para2": 167,
+      "para3": 167,
+      "para4": 167
+    },
+    {
+      "ID": 236,
+      "para1": 168,
+      "para2": 168,
+      "para3": 168,
+      "para4": 168
+    },
+    {
+      "ID": 237,
+      "para1": 168,
+      "para2": 168,
+      "para3": 168,
+      "para4": 168
+    },
+    {
+      "ID": 238,
+      "para1": 169,
+      "para2": 169,
+      "para3": 169,
+      "para4": 169
+    },
+    {
+      "ID": 239,
+      "para1": 169,
+      "para2": 169,
+      "para3": 169,
+      "para4": 169
+    },
+    {
+      "ID": 240,
+      "para1": 170,
+      "para2": 170,
+      "para3": 170,
+      "para4": 170
+    },
+    {
+      "ID": 241,
+      "para1": 170,
+      "para2": 170,
+      "para3": 170,
+      "para4": 170
+    },
+    {
+      "ID": 242,
+      "para1": 171,
+      "para2": 171,
+      "para3": 171,
+      "para4": 171
+    },
+    {
+      "ID": 243,
+      "para1": 171,
+      "para2": 171,
+      "para3": 171,
+      "para4": 171
+    },
+    {
+      "ID": 244,
+      "para1": 172,
+      "para2": 172,
+      "para3": 172,
+      "para4": 172
+    },
+    {
+      "ID": 245,
+      "para1": 172,
+      "para2": 172,
+      "para3": 172,
+      "para4": 172
+    },
+    {
+      "ID": 246,
+      "para1": 173,
+      "para2": 173,
+      "para3": 173,
+      "para4": 173
+    },
+    {
+      "ID": 247,
+      "para1": 173,
+      "para2": 173,
+      "para3": 173,
+      "para4": 173
+    },
+    {
+      "ID": 248,
+      "para1": 174,
+      "para2": 174,
+      "para3": 174,
+      "para4": 174
+    },
+    {
+      "ID": 249,
+      "para1": 174,
+      "para2": 174,
+      "para3": 174,
+      "para4": 174
+    },
+    {
+      "ID": 250,
+      "para1": 175,
+      "para2": 175,
+      "para3": 175,
+      "para4": 175
+    },
+    {
+      "ID": 251,
+      "para1": 175,
+      "para2": 175,
+      "para3": 175,
+      "para4": 175
+    },
+    {
+      "ID": 252,
+      "para1": 176,
+      "para2": 176,
+      "para3": 176,
+      "para4": 176
+    },
+    {
+      "ID": 253,
+      "para1": 176,
+      "para2": 176,
+      "para3": 176,
+      "para4": 176
+    },
+    {
+      "ID": 254,
+      "para1": 177,
+      "para2": 177,
+      "para3": 177,
+      "para4": 177
+    },
+    {
+      "ID": 255,
+      "para1": 177,
+      "para2": 177,
+      "para3": 177,
+      "para4": 177
+    },
+    {
+      "ID": 256,
+      "para1": 178,
+      "para2": 178,
+      "para3": 178,
+      "para4": 178
+    },
+    {
+      "ID": 257,
+      "para1": 178,
+      "para2": 178,
+      "para3": 178,
+      "para4": 178
+    },
+    {
+      "ID": 258,
+      "para1": 179,
+      "para2": 179,
+      "para3": 179,
+      "para4": 179
+    },
+    {
+      "ID": 259,
+      "para1": 179,
+      "para2": 179,
+      "para3": 179,
+      "para4": 179
+    },
+    {
+      "ID": 260,
+      "para1": 180,
+      "para2": 180,
+      "para3": 180,
+      "para4": 180
+    },
+    {
+      "ID": 261,
+      "para1": 180,
+      "para2": 180,
+      "para3": 180,
+      "para4": 180
+    },
+    {
+      "ID": 262,
+      "para1": 181,
+      "para2": 181,
+      "para3": 181,
+      "para4": 181
+    },
+    {
+      "ID": 263,
+      "para1": 181,
+      "para2": 181,
+      "para3": 181,
+      "para4": 181
+    },
+    {
+      "ID": 264,
+      "para1": 182,
+      "para2": 182,
+      "para3": 182,
+      "para4": 182
+    },
+    {
+      "ID": 265,
+      "para1": 182,
+      "para2": 182,
+      "para3": 182,
+      "para4": 182
+    },
+    {
+      "ID": 266,
+      "para1": 183,
+      "para2": 183,
+      "para3": 183,
+      "para4": 183
+    },
+    {
+      "ID": 267,
+      "para1": 183,
+      "para2": 183,
+      "para3": 183,
+      "para4": 183
+    },
+    {
+      "ID": 268,
+      "para1": 184,
+      "para2": 184,
+      "para3": 184,
+      "para4": 184
+    },
+    {
+      "ID": 269,
+      "para1": 184,
+      "para2": 184,
+      "para3": 184,
+      "para4": 184
+    },
+    {
+      "ID": 270,
+      "para1": 185,
+      "para2": 185,
+      "para3": 185,
+      "para4": 185
+    },
+    {
+      "ID": 271,
+      "para1": 185,
+      "para2": 185,
+      "para3": 185,
+      "para4": 185
+    },
+    {
+      "ID": 272,
+      "para1": 186,
+      "para2": 186,
+      "para3": 186,
+      "para4": 186
+    },
+    {
+      "ID": 273,
+      "para1": 186,
+      "para2": 186,
+      "para3": 186,
+      "para4": 186
+    },
+    {
+      "ID": 274,
+      "para1": 187,
+      "para2": 187,
+      "para3": 187,
+      "para4": 187
+    },
+    {
+      "ID": 275,
+      "para1": 187,
+      "para2": 187,
+      "para3": 187,
+      "para4": 187
+    },
+    {
+      "ID": 276,
+      "para1": 188,
+      "para2": 188,
+      "para3": 188,
+      "para4": 188
+    },
+    {
+      "ID": 277,
+      "para1": 188,
+      "para2": 188,
+      "para3": 188,
+      "para4": 188
+    },
+    {
+      "ID": 278,
+      "para1": 189,
+      "para2": 189,
+      "para3": 189,
+      "para4": 189
+    },
+    {
+      "ID": 279,
+      "para1": 189,
+      "para2": 189,
+      "para3": 189,
+      "para4": 189
+    },
+    {
+      "ID": 280,
+      "para1": 190,
+      "para2": 190,
+      "para3": 190,
+      "para4": 190
+    },
+    {
+      "ID": 281,
+      "para1": 190,
+      "para2": 190,
+      "para3": 190,
+      "para4": 190
+    },
+    {
+      "ID": 282,
+      "para1": 191,
+      "para2": 191,
+      "para3": 191,
+      "para4": 191
+    },
+    {
+      "ID": 283,
+      "para1": 191,
+      "para2": 191,
+      "para3": 191,
+      "para4": 191
+    },
+    {
+      "ID": 284,
+      "para1": 192,
+      "para2": 192,
+      "para3": 192,
+      "para4": 192
+    },
+    {
+      "ID": 285,
+      "para1": 192,
+      "para2": 192,
+      "para3": 192,
+      "para4": 192
+    },
+    {
+      "ID": 286,
+      "para1": 193,
+      "para2": 193,
+      "para3": 193,
+      "para4": 193
+    },
+    {
+      "ID": 287,
+      "para1": 193,
+      "para2": 193,
+      "para3": 193,
+      "para4": 193
+    },
+    {
+      "ID": 288,
+      "para1": 194,
+      "para2": 194,
+      "para3": 194,
+      "para4": 194
+    },
+    {
+      "ID": 289,
+      "para1": 194,
+      "para2": 194,
+      "para3": 194,
+      "para4": 194
+    },
+    {
+      "ID": 290,
+      "para1": 195,
+      "para2": 195,
+      "para3": 195,
+      "para4": 195
+    },
+    {
+      "ID": 291,
+      "para1": 195,
+      "para2": 195,
+      "para3": 195,
+      "para4": 195
+    },
+    {
+      "ID": 292,
+      "para1": 196,
+      "para2": 196,
+      "para3": 196,
+      "para4": 196
+    },
+    {
+      "ID": 293,
+      "para1": 196,
+      "para2": 196,
+      "para3": 196,
+      "para4": 196
+    },
+    {
+      "ID": 294,
+      "para1": 197,
+      "para2": 197,
+      "para3": 197,
+      "para4": 197
+    },
+    {
+      "ID": 295,
+      "para1": 197,
+      "para2": 197,
+      "para3": 197,
+      "para4": 197
+    },
+    {
+      "ID": 296,
+      "para1": 198,
+      "para2": 198,
+      "para3": 198,
+      "para4": 198
+    },
+    {
+      "ID": 297,
+      "para1": 198,
+      "para2": 198,
+      "para3": 198,
+      "para4": 198
+    },
+    {
+      "ID": 298,
+      "para1": 199,
+      "para2": 199,
+      "para3": 199,
+      "para4": 199
+    },
+    {
+      "ID": 299,
+      "para1": 199,
+      "para2": 199,
+      "para3": 199,
+      "para4": 199
+    },
+    {
+      "ID": 300,
+      "para1": 200,
+      "para2": 200,
+      "para3": 200,
+      "para4": 200
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -342,6 +342,46 @@
       "EventCount": null,
       "EventName": 1943,
       "Description": 1944
+    },
+    {
+      "ID": 9001,
+      "EventLinksId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 174,
+      "Description": 1936
+    },
+    {
+      "ID": 9002,
+      "EventLinksId": [
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 175,
+      "Description": 1937
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -7970,35 +7970,131 @@
     },
     {
       "ID": 1993,
-      "txt": "0"
+      "txt": "双修之旅·小"
     },
     {
       "ID": 1994,
-      "txt": "0"
+      "txt": "双修之旅·中"
     },
     {
       "ID": 1995,
-      "txt": "0"
+      "txt": "双修之旅·大"
     },
     {
       "ID": 1996,
-      "txt": "0"
+      "txt": "双修之旅·极"
     },
     {
       "ID": 1997,
-      "txt": "0"
+      "txt": "商贾之道·小"
     },
     {
       "ID": 1998,
-      "txt": "0"
+      "txt": "商贾之道·中"
     },
     {
       "ID": 1999,
-      "txt": "0"
+      "txt": "商贾之道·大"
     },
     {
       "ID": 2000,
-      "txt": "0"
+      "txt": "商贾之道·极"
+    },
+    {
+      "ID": 2001,
+      "txt": "席地论法·小"
+    },
+    {
+      "ID": 2002,
+      "txt": "席地论法·中"
+    },
+    {
+      "ID": 2003,
+      "txt": "席地论法·大"
+    },
+    {
+      "ID": 2004,
+      "txt": "席地论法·极"
+    },
+    {
+      "ID": 2005,
+      "txt": "坎山寻宝·小"
+    },
+    {
+      "ID": 2006,
+      "txt": "坎山寻宝·中"
+    },
+    {
+      "ID": 2007,
+      "txt": "坎山寻宝·大"
+    },
+    {
+      "ID": 2008,
+      "txt": "坎山寻宝·极"
+    },
+    {
+      "ID": 2009,
+      "txt": "这位道友离开时会给与玩家少量修为奖励"
+    },
+    {
+      "ID": 2010,
+      "txt": "这位道友离开时会给与玩家一些修为奖励"
+    },
+    {
+      "ID": 2011,
+      "txt": "这位道友离开时会给与玩家很多修为奖励"
+    },
+    {
+      "ID": 2012,
+      "txt": "这位道友离开时会给与玩家丰厚修为奖励"
+    },
+    {
+      "ID": 2013,
+      "txt": "这位道友离开时会给与玩家少量铜钱奖励"
+    },
+    {
+      "ID": 2014,
+      "txt": "这位道友离开时会给与玩家一些铜钱奖励"
+    },
+    {
+      "ID": 2015,
+      "txt": "这位道友离开时会给与玩家很多铜钱奖励"
+    },
+    {
+      "ID": 2016,
+      "txt": "这位道友离开时会给与玩家丰厚铜钱奖励"
+    },
+    {
+      "ID": 2017,
+      "txt": "这位道友离开时会给与玩家少量功法灵气奖励"
+    },
+    {
+      "ID": 2018,
+      "txt": "这位道友离开时会给与玩家一些功法灵气奖励"
+    },
+    {
+      "ID": 2019,
+      "txt": "这位道友离开时会给与玩家很多功法灵气奖励"
+    },
+    {
+      "ID": 2020,
+      "txt": "这位道友离开时会给与玩家丰厚功法灵气奖励"
+    },
+    {
+      "ID": 2021,
+      "txt": "这位道友离开时会给与玩家少量法宝灵韵奖励"
+    },
+    {
+      "ID": 2022,
+      "txt": "这位道友离开时会给与玩家一些法宝灵韵奖励"
+    },
+    {
+      "ID": 2023,
+      "txt": "这位道友离开时会给与玩家很多法宝灵韵奖励"
+    },
+    {
+      "ID": 2024,
+      "txt": "这位道友离开时会给与玩家丰厚法宝灵韵奖励"
     }
   ]
 }

Assets/Res/Config/daolvSkill.json

@@ -0,0 +1,3 @@
+{
+  "configList": []
+}

Assets/Res/Config/guajibuff.json

@@ -1,18 +1,132 @@
 {
   "configList": [
     {
-      "ID": 1,
-      "name": null,
-      "Quality": null,
-      "paraValue": null,
-      "des": null
-    },
-    {
-      "ID": 2,
-      "name": null,
-      "Quality": null,
-      "paraValue": null,
-      "des": null
+      "ID": 11,
+      "name": 1993,
+      "Quality": 2,
+      "GivingRate": 25,
+      "paraValue": 1,
+      "des": 2009
+    },
+    {
+      "ID": 12,
+      "name": 1994,
+      "Quality": 3,
+      "GivingRate": 50,
+      "paraValue": 1,
+      "des": 2010
+    },
+    {
+      "ID": 13,
+      "name": 1995,
+      "Quality": 4,
+      "GivingRate": 75,
+      "paraValue": 1,
+      "des": 2011
+    },
+    {
+      "ID": 14,
+      "name": 1996,
+      "Quality": 5,
+      "GivingRate": 100,
+      "paraValue": 1,
+      "des": 2012
+    },
+    {
+      "ID": 21,
+      "name": 1997,
+      "Quality": 2,
+      "GivingRate": 25,
+      "paraValue": 2,
+      "des": 2013
+    },
+    {
+      "ID": 22,
+      "name": 1998,
+      "Quality": 3,
+      "GivingRate": 50,
+      "paraValue": 2,
+      "des": 2014
+    },
+    {
+      "ID": 23,
+      "name": 1999,
+      "Quality": 4,
+      "GivingRate": 75,
+      "paraValue": 2,
+      "des": 2015
+    },
+    {
+      "ID": 24,
+      "name": 2000,
+      "Quality": 5,
+      "GivingRate": 100,
+      "paraValue": 2,
+      "des": 2016
+    },
+    {
+      "ID": 31,
+      "name": 2001,
+      "Quality": 2,
+      "GivingRate": 25,
+      "paraValue": 3,
+      "des": 2017
+    },
+    {
+      "ID": 32,
+      "name": 2002,
+      "Quality": 3,
+      "GivingRate": 50,
+      "paraValue": 3,
+      "des": 2018
+    },
+    {
+      "ID": 33,
+      "name": 2003,
+      "Quality": 4,
+      "GivingRate": 75,
+      "paraValue": 3,
+      "des": 2019
+    },
+    {
+      "ID": 34,
+      "name": 2004,
+      "Quality": 5,
+      "GivingRate": 100,
+      "paraValue": 3,
+      "des": 2020
+    },
+    {
+      "ID": 41,
+      "name": 2005,
+      "Quality": 2,
+      "GivingRate": 25,
+      "paraValue": 4,
+      "des": 2021
+    },
+    {
+      "ID": 42,
+      "name": 2006,
+      "Quality": 3,
+      "GivingRate": 50,
+      "paraValue": 4,
+      "des": 2022
+    },
+    {
+      "ID": 43,
+      "name": 2007,
+      "Quality": 4,
+      "GivingRate": 75,
+      "paraValue": 4,
+      "des": 2023
+    },
+    {
+      "ID": 44,
+      "name": 2008,
+      "Quality": 5,
+      "GivingRate": 100,
+      "paraValue": 4,
+      "des": 2024
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/DaoyouModelConfig.cs

@@ -69,27 +69,9 @@ public int[] guajiBuffID;
 
 
 		/// <summary>
-		///挂机增益比例
+		///成为道侣后提供的技能ID
 		/// </summary>
-public int[] guajiBuffValue;
-
-
-		/// <summary>
-		///成为道侣后提供的加成类型
-		/// </summary>
-public int[] daolvBuffType;
-
-
-		/// <summary>
-		///成为道侣后提供的加成值
-		/// </summary>
-public int[] daolvBuffValue;
-
-
-		/// <summary>
-		///词缀品质
-		/// </summary>
-public int[] daolvBuffQuality;
+public int[] daolvSkillID;
 
 
 		/// <summary>

Assets/Scripts/GameData/ExcelConfig/DaoyouguajiResourcLevel.cs

@@ -33,65 +33,17 @@ public int para2;
 
 
 		/// <summary>
-		///银锭产出
+		///功法灵气
 		/// </summary>
 public int para3;
 
 
 		/// <summary>
-		///玩家修为产出
+		///法宝灵韵
 		/// </summary>
 public int para4;
 
 
-		/// <summary>
-		///玩家修为产出
-		/// </summary>
-public int para5;
-
-
-		/// <summary>
-		///玩家修为产出
-		/// </summary>
-public int para6;
-
-
-		/// <summary>
-		///玩家修为产出
-		/// </summary>
-public int para7;
-
-
-		/// <summary>
-		///玩家修为产出
-		/// </summary>
-public int para8;
-
-
-		/// <summary>
-		///玩家修为产出
-		/// </summary>
-public int para9;
-
-
-		/// <summary>
-		///玩家修为产出
-		/// </summary>
-public int para10;
-
-
-		/// <summary>
-		///玩家修为产出
-		/// </summary>
-public int para11;
-
-
-		/// <summary>
-		///玩家修为产出
-		/// </summary>
-public int para12;
-
-
 	}
 
 }

Assets/Scripts/GameData/ExcelConfig/guajibuff.cs

@@ -32,6 +32,12 @@ public int name;
 public int Quality;
 
 
+		/// <summary>
+		///产出比例 100=100%
+		/// </summary>
+public int GivingRate;
+
+
 		/// <summary>
 		///对应的para值
 		/// </summary>