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

# Conflicts:
#	Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat   resolved by master version

Assets/Res/Config/DaoyouModelConfig.json

@@ -6,7 +6,7 @@
       "quality": 2,
       "bodyIcon": "bg_lh_quelinger",
       "headIcon": "",
-      "growupRate": 60,
+      "growupRate": 100,
       "des": [
         1963,
         1964,
@@ -52,7 +52,7 @@
       "quality": 2,
       "bodyIcon": "bg_lh_chidaoren",
       "headIcon": "",
-      "growupRate": 60,
+      "growupRate": 100,
       "des": [
         1966,
         1967,
@@ -98,7 +98,7 @@
       "quality": 3,
       "bodyIcon": "bg_lh_fengyao",
       "headIcon": "",
-      "growupRate": 80,
+      "growupRate": 100,
       "des": [
         1969,
         1970,
@@ -144,7 +144,7 @@
       "quality": 3,
       "bodyIcon": "bg_lh_wanxi",
       "headIcon": "",
-      "growupRate": 80,
+      "growupRate": 100,
       "des": [
         1972,
         1973,
@@ -183,6 +183,282 @@
       "specialGiftNum": [
         1
       ]
+    },
+    {
+      "ID": 5,
+      "name": 1957,
+      "quality": 4,
+      "bodyIcon": "bg_lh_xuyou",
+      "headIcon": "",
+      "growupRate": 100,
+      "des": [
+        1975,
+        1976,
+        1977
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1401,
+        1402,
+        1403
+      ],
+      "shownPreferGiftID": [
+        1401
+      ],
+      "guajiBuffID": [
+        2,
+        12,
+        33
+      ],
+      "daolvSkillID": [
+        5
+      ],
+      "EmotionLvforQuest": 3,
+      "EventCompleteforQuest": 1,
+      "QuestID": -1,
+      "EmotionLvforspecialGift": [
+        5
+      ],
+      "specialGiftID": [
+        1201
+      ],
+      "specialGiftNum": [
+        1
+      ]
+    },
+    {
+      "ID": 6,
+      "name": 1958,
+      "quality": 5,
+      "bodyIcon": "bg_lh_fengdaoren",
+      "headIcon": "",
+      "growupRate": 100,
+      "des": [
+        1978,
+        1979,
+        1980
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1201,
+        1202,
+        1203
+      ],
+      "shownPreferGiftID": [
+        1201
+      ],
+      "guajiBuffID": [
+        2,
+        22,
+        43
+      ],
+      "daolvSkillID": [
+        6
+      ],
+      "EmotionLvforQuest": 3,
+      "EventCompleteforQuest": 1,
+      "QuestID": -1,
+      "EmotionLvforspecialGift": [
+        6
+      ],
+      "specialGiftID": [
+        1202
+      ],
+      "specialGiftNum": [
+        1
+      ]
+    },
+    {
+      "ID": 7,
+      "name": 1959,
+      "quality": 4,
+      "bodyIcon": "bg_lh_xiner",
+      "headIcon": "",
+      "growupRate": 100,
+      "des": [
+        1981,
+        1982,
+        1983
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1204,
+        1205,
+        1206
+      ],
+      "shownPreferGiftID": [
+        1204
+      ],
+      "guajiBuffID": [
+        3,
+        32,
+        13
+      ],
+      "daolvSkillID": [
+        7
+      ],
+      "EmotionLvforQuest": 4,
+      "EventCompleteforQuest": 1,
+      "QuestID": 9146,
+      "EmotionLvforspecialGift": [
+        5
+      ],
+      "specialGiftID": [
+        1201
+      ],
+      "specialGiftNum": [
+        1
+      ]
+    },
+    {
+      "ID": 8,
+      "name": 1960,
+      "quality": 4,
+      "bodyIcon": "bg_lh_liuqingyan2",
+      "headIcon": "",
+      "growupRate": 100,
+      "des": [
+        1984,
+        1985,
+        1986
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1207,
+        1208,
+        1209
+      ],
+      "shownPreferGiftID": [
+        1207
+      ],
+      "guajiBuffID": [
+        3,
+        42,
+        23
+      ],
+      "daolvSkillID": [
+        8
+      ],
+      "EmotionLvforQuest": 4,
+      "EventCompleteforQuest": 1,
+      "QuestID": 9146,
+      "EmotionLvforspecialGift": [
+        6
+      ],
+      "specialGiftID": [
+        1202
+      ],
+      "specialGiftNum": [
+        1
+      ]
+    },
+    {
+      "ID": 9,
+      "name": 1961,
+      "quality": 5,
+      "bodyIcon": "bg_lh_chuyunmiao",
+      "headIcon": "",
+      "growupRate": 100,
+      "des": [
+        1987,
+        1988,
+        1989
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1301,
+        1302,
+        1303
+      ],
+      "shownPreferGiftID": [
+        1301
+      ],
+      "guajiBuffID": [
+        4,
+        13,
+        34
+      ],
+      "daolvSkillID": [
+        1
+      ],
+      "EmotionLvforQuest": 5,
+      "EventCompleteforQuest": 1,
+      "QuestID": -1,
+      "EmotionLvforspecialGift": [
+        7
+      ],
+      "specialGiftID": [
+        1201
+      ],
+      "specialGiftNum": [
+        1
+      ]
+    },
+    {
+      "ID": 10,
+      "name": 1962,
+      "quality": 6,
+      "bodyIcon": "bg_lh_linfeng",
+      "headIcon": "",
+      "growupRate": 100,
+      "des": [
+        1990,
+        1991,
+        1992
+      ],
+      "desUnlockLv": [
+        1,
+        3,
+        6
+      ],
+      "PreferGiftID": [
+        1401,
+        1402,
+        1403
+      ],
+      "shownPreferGiftID": [
+        1401
+      ],
+      "guajiBuffID": [
+        4,
+        23,
+        44
+      ],
+      "daolvSkillID": [
+        2
+      ],
+      "EmotionLvforQuest": 6,
+      "EventCompleteforQuest": 1,
+      "QuestID": -1,
+      "EmotionLvforspecialGift": [
+        8
+      ],
+      "specialGiftID": [
+        1202
+      ],
+      "specialGiftNum": [
+        1
+      ]
     }
   ]
 }

Assets/Res/Config/DaoyouguajiResourcLevel.json

@@ -2,2402 +2,2402 @@
   "configList": [
     {
       "ID": 1,
-      "para1": 50,
-      "para2": 500,
-      "para3": 5,
-      "para4": 5,
+      "para1": 5,
+      "para2": 50,
+      "para3": 3,
+      "para4": 3,
       "para5": 201
     },
     {
       "ID": 2,
-      "para1": 51,
-      "para2": 505,
-      "para3": 5,
-      "para4": 5,
+      "para1": 5,
+      "para2": 51,
+      "para3": 3,
+      "para4": 3,
       "para5": 202
     },
     {
       "ID": 3,
-      "para1": 51,
-      "para2": 510,
-      "para3": 5,
-      "para4": 5,
+      "para1": 5,
+      "para2": 51,
+      "para3": 3,
+      "para4": 3,
       "para5": 203
     },
     {
       "ID": 4,
-      "para1": 52,
-      "para2": 515,
-      "para3": 5,
-      "para4": 5,
+      "para1": 5,
+      "para2": 52,
+      "para3": 3,
+      "para4": 3,
       "para5": 204
     },
     {
       "ID": 5,
-      "para1": 52,
-      "para2": 520,
-      "para3": 5,
-      "para4": 5,
+      "para1": 5,
+      "para2": 52,
+      "para3": 3,
+      "para4": 3,
       "para5": 205
     },
     {
       "ID": 6,
-      "para1": 53,
-      "para2": 526,
-      "para3": 5,
-      "para4": 5,
+      "para1": 6,
+      "para2": 53,
+      "para3": 3,
+      "para4": 3,
       "para5": 206
     },
     {
       "ID": 7,
-      "para1": 53,
-      "para2": 531,
-      "para3": 5,
-      "para4": 5,
+      "para1": 6,
+      "para2": 53,
+      "para3": 3,
+      "para4": 3,
       "para5": 207
     },
     {
       "ID": 8,
-      "para1": 54,
-      "para2": 536,
-      "para3": 5,
-      "para4": 5,
+      "para1": 6,
+      "para2": 54,
+      "para3": 3,
+      "para4": 3,
       "para5": 208
     },
     {
       "ID": 9,
-      "para1": 54,
-      "para2": 542,
-      "para3": 5,
-      "para4": 5,
+      "para1": 6,
+      "para2": 54,
+      "para3": 3,
+      "para4": 3,
       "para5": 209
     },
     {
       "ID": 10,
-      "para1": 55,
-      "para2": 547,
-      "para3": 5,
-      "para4": 5,
+      "para1": 6,
+      "para2": 55,
+      "para3": 3,
+      "para4": 3,
       "para5": 210
     },
     {
       "ID": 11,
-      "para1": 56,
-      "para2": 553,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 55,
+      "para3": 3,
+      "para4": 3,
       "para5": 211
     },
     {
       "ID": 12,
-      "para1": 56,
-      "para2": 558,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 56,
+      "para3": 3,
+      "para4": 3,
       "para5": 212
     },
     {
       "ID": 13,
-      "para1": 57,
-      "para2": 564,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 56,
+      "para3": 3,
+      "para4": 3,
       "para5": 213
     },
     {
       "ID": 14,
-      "para1": 57,
-      "para2": 570,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 57,
+      "para3": 3,
+      "para4": 3,
       "para5": 214
     },
     {
       "ID": 15,
-      "para1": 58,
-      "para2": 575,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 58,
+      "para3": 3,
+      "para4": 3,
       "para5": 215
     },
     {
       "ID": 16,
-      "para1": 58,
-      "para2": 581,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 58,
+      "para3": 3,
+      "para4": 3,
       "para5": 216
     },
     {
       "ID": 17,
-      "para1": 59,
-      "para2": 587,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 59,
+      "para3": 3,
+      "para4": 3,
       "para5": 217
     },
     {
       "ID": 18,
-      "para1": 60,
-      "para2": 593,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 59,
+      "para3": 3,
+      "para4": 3,
       "para5": 218
     },
     {
       "ID": 19,
-      "para1": 60,
-      "para2": 599,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 60,
+      "para3": 3,
+      "para4": 3,
       "para5": 219
     },
     {
       "ID": 20,
-      "para1": 61,
-      "para2": 605,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 61,
+      "para3": 3,
+      "para4": 3,
       "para5": 220
     },
     {
       "ID": 21,
-      "para1": 61,
-      "para2": 611,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 61,
+      "para3": 4,
+      "para4": 4,
       "para5": 221
     },
     {
       "ID": 22,
-      "para1": 62,
-      "para2": 617,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 62,
+      "para3": 4,
+      "para4": 4,
       "para5": 222
     },
     {
       "ID": 23,
-      "para1": 63,
-      "para2": 623,
-      "para3": 6,
-      "para4": 6,
+      "para1": 6,
+      "para2": 62,
+      "para3": 4,
+      "para4": 4,
       "para5": 223
     },
     {
       "ID": 24,
-      "para1": 63,
-      "para2": 630,
-      "para3": 6,
-      "para4": 6,
+      "para1": 7,
+      "para2": 63,
+      "para3": 4,
+      "para4": 4,
       "para5": 224
     },
     {
       "ID": 25,
-      "para1": 64,
-      "para2": 636,
-      "para3": 6,
-      "para4": 6,
+      "para1": 7,
+      "para2": 64,
+      "para3": 4,
+      "para4": 4,
       "para5": 225
     },
     {
       "ID": 26,
-      "para1": 64,
-      "para2": 642,
-      "para3": 6,
-      "para4": 6,
+      "para1": 7,
+      "para2": 64,
+      "para3": 4,
+      "para4": 4,
       "para5": 226
     },
     {
       "ID": 27,
-      "para1": 65,
-      "para2": 649,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 65,
+      "para3": 4,
+      "para4": 4,
       "para5": 227
     },
     {
       "ID": 28,
-      "para1": 66,
-      "para2": 655,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 66,
+      "para3": 4,
+      "para4": 4,
       "para5": 228
     },
     {
       "ID": 29,
-      "para1": 66,
-      "para2": 662,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 66,
+      "para3": 4,
+      "para4": 4,
       "para5": 229
     },
     {
       "ID": 30,
-      "para1": 67,
-      "para2": 669,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 67,
+      "para3": 4,
+      "para4": 4,
       "para5": 230
     },
     {
       "ID": 31,
-      "para1": 68,
-      "para2": 675,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 68,
+      "para3": 4,
+      "para4": 4,
       "para5": 231
     },
     {
       "ID": 32,
-      "para1": 68,
-      "para2": 682,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 68,
+      "para3": 4,
+      "para4": 4,
       "para5": 232
     },
     {
       "ID": 33,
-      "para1": 69,
-      "para2": 689,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 69,
+      "para3": 4,
+      "para4": 4,
       "para5": 233
     },
     {
       "ID": 34,
-      "para1": 70,
-      "para2": 696,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 70,
+      "para3": 4,
+      "para4": 4,
       "para5": 234
     },
     {
       "ID": 35,
-      "para1": 71,
-      "para2": 703,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 70,
+      "para3": 4,
+      "para4": 4,
       "para5": 235
     },
     {
       "ID": 36,
-      "para1": 71,
-      "para2": 710,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 71,
+      "para3": 4,
+      "para4": 4,
       "para5": 236
     },
     {
       "ID": 37,
-      "para1": 72,
-      "para2": 717,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 72,
+      "para3": 4,
+      "para4": 4,
       "para5": 237
     },
     {
       "ID": 38,
-      "para1": 73,
-      "para2": 724,
-      "para3": 7,
-      "para4": 7,
+      "para1": 7,
+      "para2": 72,
+      "para3": 4,
+      "para4": 4,
       "para5": 238
     },
     {
       "ID": 39,
-      "para1": 73,
-      "para2": 732,
-      "para3": 7,
-      "para4": 7,
+      "para1": 8,
+      "para2": 73,
+      "para3": 4,
+      "para4": 4,
       "para5": 239
     },
     {
       "ID": 40,
-      "para1": 74,
-      "para2": 739,
-      "para3": 7,
-      "para4": 7,
+      "para1": 8,
+      "para2": 74,
+      "para3": 4,
+      "para4": 4,
       "para5": 240
     },
     {
       "ID": 41,
-      "para1": 75,
-      "para2": 747,
-      "para3": 7,
-      "para4": 7,
+      "para1": 8,
+      "para2": 75,
+      "para3": 5,
+      "para4": 5,
       "para5": 241
     },
     {
       "ID": 42,
-      "para1": 76,
-      "para2": 754,
-      "para3": 8,
-      "para4": 8,
+      "para1": 8,
+      "para2": 75,
+      "para3": 5,
+      "para4": 5,
       "para5": 242
     },
     {
       "ID": 43,
-      "para1": 76,
-      "para2": 762,
-      "para3": 8,
-      "para4": 8,
+      "para1": 8,
+      "para2": 76,
+      "para3": 5,
+      "para4": 5,
       "para5": 243
     },
     {
       "ID": 44,
-      "para1": 77,
-      "para2": 769,
-      "para3": 8,
-      "para4": 8,
+      "para1": 8,
+      "para2": 77,
+      "para3": 5,
+      "para4": 5,
       "para5": 244
     },
     {
       "ID": 45,
-      "para1": 78,
-      "para2": 777,
-      "para3": 8,
-      "para4": 8,
+      "para1": 8,
+      "para2": 78,
+      "para3": 5,
+      "para4": 5,
       "para5": 245
     },
     {
       "ID": 46,
-      "para1": 79,
-      "para2": 785,
-      "para3": 8,
-      "para4": 8,
+      "para1": 8,
+      "para2": 79,
+      "para3": 5,
+      "para4": 5,
       "para5": 246
     },
     {
       "ID": 47,
-      "para1": 80,
-      "para2": 793,
-      "para3": 8,
-      "para4": 8,
+      "para1": 8,
+      "para2": 79,
+      "para3": 5,
+      "para4": 5,
       "para5": 247
     },
     {
       "ID": 48,
-      "para1": 80,
-      "para2": 801,
-      "para3": 8,
-      "para4": 8,
+      "para1": 8,
+      "para2": 80,
+      "para3": 5,
+      "para4": 5,
       "para5": 248
     },
     {
       "ID": 49,
-      "para1": 81,
-      "para2": 809,
-      "para3": 8,
-      "para4": 8,
+      "para1": 8,
+      "para2": 81,
+      "para3": 5,
+      "para4": 5,
       "para5": 249
     },
     {
       "ID": 50,
-      "para1": 82,
-      "para2": 817,
-      "para3": 8,
-      "para4": 8,
+      "para1": 8,
+      "para2": 82,
+      "para3": 5,
+      "para4": 5,
       "para5": 250
     },
     {
       "ID": 51,
-      "para1": 83,
-      "para2": 825,
-      "para3": 8,
-      "para4": 8,
+      "para1": 9,
+      "para2": 83,
+      "para3": 5,
+      "para4": 5,
       "para5": 251
     },
     {
       "ID": 52,
-      "para1": 84,
-      "para2": 833,
-      "para3": 8,
-      "para4": 8,
+      "para1": 9,
+      "para2": 83,
+      "para3": 5,
+      "para4": 5,
       "para5": 252
     },
     {
       "ID": 53,
-      "para1": 84,
-      "para2": 842,
-      "para3": 8,
-      "para4": 8,
+      "para1": 9,
+      "para2": 84,
+      "para3": 5,
+      "para4": 5,
       "para5": 253
     },
     {
       "ID": 54,
-      "para1": 85,
-      "para2": 850,
-      "para3": 9,
-      "para4": 9,
+      "para1": 9,
+      "para2": 85,
+      "para3": 5,
+      "para4": 5,
       "para5": 254
     },
     {
       "ID": 55,
-      "para1": 86,
-      "para2": 859,
-      "para3": 9,
-      "para4": 9,
+      "para1": 9,
+      "para2": 86,
+      "para3": 5,
+      "para4": 5,
       "para5": 255
     },
     {
       "ID": 56,
-      "para1": 87,
-      "para2": 868,
-      "para3": 9,
-      "para4": 9,
+      "para1": 9,
+      "para2": 87,
+      "para3": 5,
+      "para4": 5,
       "para5": 256
     },
     {
       "ID": 57,
-      "para1": 88,
-      "para2": 876,
-      "para3": 9,
-      "para4": 9,
+      "para1": 9,
+      "para2": 88,
+      "para3": 5,
+      "para4": 5,
       "para5": 257
     },
     {
       "ID": 58,
-      "para1": 89,
-      "para2": 885,
-      "para3": 9,
-      "para4": 9,
+      "para1": 9,
+      "para2": 89,
+      "para3": 5,
+      "para4": 5,
       "para5": 258
     },
     {
       "ID": 59,
-      "para1": 90,
-      "para2": 894,
-      "para3": 9,
-      "para4": 9,
+      "para1": 9,
+      "para2": 89,
+      "para3": 5,
+      "para4": 5,
       "para5": 259
     },
     {
       "ID": 60,
-      "para1": 91,
-      "para2": 903,
-      "para3": 9,
-      "para4": 9,
+      "para1": 9,
+      "para2": 90,
+      "para3": 5,
+      "para4": 5,
       "para5": 260
     },
     {
       "ID": 61,
-      "para1": 91,
-      "para2": 912,
-      "para3": 9,
-      "para4": 9,
+      "para1": 9,
+      "para2": 91,
+      "para3": 6,
+      "para4": 6,
       "para5": 261
     },
     {
       "ID": 62,
-      "para1": 92,
-      "para2": 921,
-      "para3": 9,
-      "para4": 9,
+      "para1": 9,
+      "para2": 92,
+      "para3": 6,
+      "para4": 6,
       "para5": 262
     },
     {
       "ID": 63,
-      "para1": 93,
-      "para2": 931,
-      "para3": 9,
-      "para4": 9,
+      "para1": 10,
+      "para2": 93,
+      "para3": 6,
+      "para4": 6,
       "para5": 263
     },
     {
       "ID": 64,
-      "para1": 94,
-      "para2": 940,
-      "para3": 9,
-      "para4": 9,
+      "para1": 10,
+      "para2": 94,
+      "para3": 6,
+      "para4": 6,
       "para5": 264
     },
     {
       "ID": 65,
-      "para1": 95,
-      "para2": 949,
-      "para3": 10,
-      "para4": 10,
+      "para1": 10,
+      "para2": 95,
+      "para3": 6,
+      "para4": 6,
       "para5": 265
     },
     {
       "ID": 66,
-      "para1": 96,
-      "para2": 959,
-      "para3": 10,
-      "para4": 10,
+      "para1": 10,
+      "para2": 96,
+      "para3": 6,
+      "para4": 6,
       "para5": 266
     },
     {
       "ID": 67,
-      "para1": 97,
-      "para2": 969,
-      "para3": 10,
-      "para4": 10,
+      "para1": 10,
+      "para2": 97,
+      "para3": 6,
+      "para4": 6,
       "para5": 267
     },
     {
       "ID": 68,
-      "para1": 98,
-      "para2": 978,
-      "para3": 10,
-      "para4": 10,
+      "para1": 10,
+      "para2": 98,
+      "para3": 6,
+      "para4": 6,
       "para5": 268
     },
     {
       "ID": 69,
-      "para1": 99,
-      "para2": 988,
-      "para3": 10,
-      "para4": 10,
+      "para1": 10,
+      "para2": 99,
+      "para3": 6,
+      "para4": 6,
       "para5": 269
     },
     {
       "ID": 70,
-      "para1": 100,
-      "para2": 998,
-      "para3": 10,
-      "para4": 10,
+      "para1": 10,
+      "para2": 100,
+      "para3": 6,
+      "para4": 6,
       "para5": 270
     },
     {
       "ID": 71,
-      "para1": 101,
-      "para2": 1008,
-      "para3": 10,
-      "para4": 10,
+      "para1": 10,
+      "para2": 101,
+      "para3": 6,
+      "para4": 6,
       "para5": 271
     },
     {
       "ID": 72,
-      "para1": 102,
-      "para2": 1018,
-      "para3": 10,
-      "para4": 10,
+      "para1": 10,
+      "para2": 102,
+      "para3": 6,
+      "para4": 6,
       "para5": 272
     },
     {
       "ID": 73,
-      "para1": 103,
-      "para2": 1029,
-      "para3": 10,
-      "para4": 10,
+      "para1": 11,
+      "para2": 103,
+      "para3": 6,
+      "para4": 6,
       "para5": 273
     },
     {
       "ID": 74,
-      "para1": 104,
-      "para2": 1039,
-      "para3": 10,
-      "para4": 10,
+      "para1": 11,
+      "para2": 104,
+      "para3": 6,
+      "para4": 6,
       "para5": 274
     },
     {
       "ID": 75,
-      "para1": 105,
-      "para2": 1049,
-      "para3": 11,
-      "para4": 11,
+      "para1": 11,
+      "para2": 105,
+      "para3": 6,
+      "para4": 6,
       "para5": 275
     },
     {
       "ID": 76,
-      "para1": 106,
-      "para2": 1060,
-      "para3": 11,
-      "para4": 11,
+      "para1": 11,
+      "para2": 106,
+      "para3": 6,
+      "para4": 6,
       "para5": 276
     },
     {
       "ID": 77,
-      "para1": 107,
-      "para2": 1071,
-      "para3": 11,
-      "para4": 11,
+      "para1": 11,
+      "para2": 107,
+      "para3": 6,
+      "para4": 6,
       "para5": 277
     },
     {
       "ID": 78,
-      "para1": 108,
-      "para2": 1082,
-      "para3": 11,
-      "para4": 11,
+      "para1": 11,
+      "para2": 108,
+      "para3": 6,
+      "para4": 6,
       "para5": 278
     },
     {
       "ID": 79,
-      "para1": 109,
-      "para2": 1092,
-      "para3": 11,
-      "para4": 11,
+      "para1": 11,
+      "para2": 109,
+      "para3": 6,
+      "para4": 6,
       "para5": 279
     },
     {
       "ID": 80,
-      "para1": 111,
-      "para2": 1103,
-      "para3": 11,
-      "para4": 11,
+      "para1": 11,
+      "para2": 110,
+      "para3": 6,
+      "para4": 6,
       "para5": 280
     },
     {
       "ID": 81,
-      "para1": 112,
-      "para2": 1115,
-      "para3": 11,
-      "para4": 11,
+      "para1": 11,
+      "para2": 111,
+      "para3": 7,
+      "para4": 7,
       "para5": 281
     },
     {
       "ID": 82,
-      "para1": 113,
-      "para2": 1126,
-      "para3": 11,
-      "para4": 11,
+      "para1": 12,
+      "para2": 113,
+      "para3": 7,
+      "para4": 7,
       "para5": 282
     },
     {
       "ID": 83,
-      "para1": 114,
-      "para2": 1137,
-      "para3": 11,
-      "para4": 11,
+      "para1": 12,
+      "para2": 114,
+      "para3": 7,
+      "para4": 7,
       "para5": 283
     },
     {
       "ID": 84,
-      "para1": 115,
-      "para2": 1149,
-      "para3": 12,
-      "para4": 12,
+      "para1": 12,
+      "para2": 115,
+      "para3": 7,
+      "para4": 7,
       "para5": 284
     },
     {
       "ID": 85,
-      "para1": 116,
-      "para2": 1160,
-      "para3": 12,
-      "para4": 12,
+      "para1": 12,
+      "para2": 116,
+      "para3": 7,
+      "para4": 7,
       "para5": 285
     },
     {
       "ID": 86,
-      "para1": 117,
-      "para2": 1172,
-      "para3": 12,
-      "para4": 12,
+      "para1": 12,
+      "para2": 117,
+      "para3": 7,
+      "para4": 7,
       "para5": 286
     },
     {
       "ID": 87,
-      "para1": 119,
-      "para2": 1184,
-      "para3": 12,
-      "para4": 12,
+      "para1": 12,
+      "para2": 118,
+      "para3": 7,
+      "para4": 7,
       "para5": 287
     },
     {
       "ID": 88,
-      "para1": 120,
-      "para2": 1195,
-      "para3": 12,
-      "para4": 12,
+      "para1": 12,
+      "para2": 120,
+      "para3": 7,
+      "para4": 7,
       "para5": 288
     },
     {
       "ID": 89,
-      "para1": 121,
-      "para2": 1208,
-      "para3": 12,
-      "para4": 12,
+      "para1": 12,
+      "para2": 121,
+      "para3": 7,
+      "para4": 7,
       "para5": 289
     },
     {
       "ID": 90,
-      "para1": 122,
-      "para2": 1220,
-      "para3": 12,
-      "para4": 12,
+      "para1": 12,
+      "para2": 122,
+      "para3": 7,
+      "para4": 7,
       "para5": 290
     },
     {
       "ID": 91,
-      "para1": 123,
-      "para2": 1232,
-      "para3": 12,
-      "para4": 12,
+      "para1": 13,
+      "para2": 123,
+      "para3": 7,
+      "para4": 7,
       "para5": 291
     },
     {
       "ID": 92,
-      "para1": 125,
-      "para2": 1244,
-      "para3": 12,
-      "para4": 12,
+      "para1": 13,
+      "para2": 124,
+      "para3": 7,
+      "para4": 7,
       "para5": 292
     },
     {
       "ID": 93,
-      "para1": 126,
-      "para2": 1257,
-      "para3": 13,
-      "para4": 13,
+      "para1": 13,
+      "para2": 126,
+      "para3": 7,
+      "para4": 7,
       "para5": 293
     },
     {
       "ID": 94,
-      "para1": 127,
-      "para2": 1270,
-      "para3": 13,
-      "para4": 13,
+      "para1": 13,
+      "para2": 127,
+      "para3": 7,
+      "para4": 7,
       "para5": 294
     },
     {
       "ID": 95,
-      "para1": 128,
-      "para2": 1282,
-      "para3": 13,
-      "para4": 13,
+      "para1": 13,
+      "para2": 128,
+      "para3": 7,
+      "para4": 7,
       "para5": 295
     },
     {
       "ID": 96,
-      "para1": 130,
-      "para2": 1295,
-      "para3": 13,
-      "para4": 13,
+      "para1": 13,
+      "para2": 130,
+      "para3": 7,
+      "para4": 7,
       "para5": 296
     },
     {
       "ID": 97,
-      "para1": 131,
-      "para2": 1308,
-      "para3": 13,
-      "para4": 13,
+      "para1": 13,
+      "para2": 131,
+      "para3": 7,
+      "para4": 7,
       "para5": 297
     },
     {
       "ID": 98,
-      "para1": 132,
-      "para2": 1321,
-      "para3": 13,
-      "para4": 13,
+      "para1": 13,
+      "para2": 132,
+      "para3": 7,
+      "para4": 7,
       "para5": 298
     },
     {
       "ID": 99,
-      "para1": 134,
-      "para2": 1335,
-      "para3": 13,
-      "para4": 13,
+      "para1": 14,
+      "para2": 133,
+      "para3": 7,
+      "para4": 7,
       "para5": 299
     },
     {
       "ID": 100,
-      "para1": 135,
-      "para2": 1348,
-      "para3": 14,
-      "para4": 14,
+      "para1": 14,
+      "para2": 135,
+      "para3": 7,
+      "para4": 7,
       "para5": 300
     },
     {
       "ID": 101,
-      "para1": 136,
-      "para2": 1362,
-      "para3": 14,
-      "para4": 14,
+      "para1": 14,
+      "para2": 136,
+      "para3": 8,
+      "para4": 8,
       "para5": 301
     },
     {
       "ID": 102,
-      "para1": 138,
-      "para2": 1375,
-      "para3": 14,
-      "para4": 14,
+      "para1": 14,
+      "para2": 138,
+      "para3": 8,
+      "para4": 8,
       "para5": 302
     },
     {
       "ID": 103,
-      "para1": 139,
-      "para2": 1389,
-      "para3": 14,
-      "para4": 14,
+      "para1": 14,
+      "para2": 139,
+      "para3": 8,
+      "para4": 8,
       "para5": 303
     },
     {
       "ID": 104,
-      "para1": 141,
-      "para2": 1403,
-      "para3": 14,
-      "para4": 14,
+      "para1": 14,
+      "para2": 140,
+      "para3": 8,
+      "para4": 8,
       "para5": 304
     },
     {
       "ID": 105,
-      "para1": 142,
-      "para2": 1417,
-      "para3": 14,
-      "para4": 14,
+      "para1": 14,
+      "para2": 142,
+      "para3": 8,
+      "para4": 8,
       "para5": 305
     },
     {
       "ID": 106,
-      "para1": 143,
-      "para2": 1432,
-      "para3": 14,
-      "para4": 14,
+      "para1": 15,
+      "para2": 143,
+      "para3": 8,
+      "para4": 8,
       "para5": 306
     },
     {
       "ID": 107,
-      "para1": 145,
-      "para2": 1446,
-      "para3": 14,
-      "para4": 14,
+      "para1": 15,
+      "para2": 145,
+      "para3": 8,
+      "para4": 8,
       "para5": 307
     },
     {
       "ID": 108,
-      "para1": 146,
-      "para2": 1461,
-      "para3": 15,
-      "para4": 15,
+      "para1": 15,
+      "para2": 146,
+      "para3": 8,
+      "para4": 8,
       "para5": 308
     },
     {
       "ID": 109,
-      "para1": 148,
-      "para2": 1475,
-      "para3": 15,
-      "para4": 15,
+      "para1": 15,
+      "para2": 148,
+      "para3": 8,
+      "para4": 8,
       "para5": 309
     },
     {
       "ID": 110,
-      "para1": 149,
-      "para2": 1490,
-      "para3": 15,
-      "para4": 15,
+      "para1": 15,
+      "para2": 149,
+      "para3": 8,
+      "para4": 8,
       "para5": 310
     },
     {
       "ID": 111,
-      "para1": 151,
-      "para2": 1505,
-      "para3": 15,
-      "para4": 15,
+      "para1": 15,
+      "para2": 151,
+      "para3": 8,
+      "para4": 8,
       "para5": 311
     },
     {
       "ID": 112,
-      "para1": 152,
-      "para2": 1520,
-      "para3": 15,
-      "para4": 15,
+      "para1": 15,
+      "para2": 152,
+      "para3": 8,
+      "para4": 8,
       "para5": 312
     },
     {
       "ID": 113,
-      "para1": 154,
-      "para2": 1536,
-      "para3": 15,
-      "para4": 15,
+      "para1": 16,
+      "para2": 154,
+      "para3": 8,
+      "para4": 8,
       "para5": 313
     },
     {
       "ID": 114,
-      "para1": 155,
-      "para2": 1551,
-      "para3": 16,
-      "para4": 16,
+      "para1": 16,
+      "para2": 155,
+      "para3": 8,
+      "para4": 8,
       "para5": 314
     },
     {
       "ID": 115,
-      "para1": 157,
-      "para2": 1567,
-      "para3": 16,
-      "para4": 16,
+      "para1": 16,
+      "para2": 157,
+      "para3": 8,
+      "para4": 8,
       "para5": 315
     },
     {
       "ID": 116,
-      "para1": 159,
-      "para2": 1583,
-      "para3": 16,
-      "para4": 16,
+      "para1": 16,
+      "para2": 158,
+      "para3": 8,
+      "para4": 8,
       "para5": 316
     },
     {
       "ID": 117,
-      "para1": 160,
-      "para2": 1599,
-      "para3": 16,
-      "para4": 16,
+      "para1": 16,
+      "para2": 160,
+      "para3": 8,
+      "para4": 8,
       "para5": 317
     },
     {
       "ID": 118,
-      "para1": 162,
-      "para2": 1615,
-      "para3": 16,
-      "para4": 16,
+      "para1": 16,
+      "para2": 161,
+      "para3": 8,
+      "para4": 8,
       "para5": 318
     },
     {
       "ID": 119,
-      "para1": 163,
-      "para2": 1631,
-      "para3": 16,
-      "para4": 16,
+      "para1": 17,
+      "para2": 163,
+      "para3": 8,
+      "para4": 8,
       "para5": 319
     },
     {
       "ID": 120,
-      "para1": 165,
-      "para2": 1647,
-      "para3": 16,
-      "para4": 16,
+      "para1": 17,
+      "para2": 165,
+      "para3": 8,
+      "para4": 8,
       "para5": 320
     },
     {
       "ID": 121,
-      "para1": 167,
-      "para2": 1664,
-      "para3": 17,
-      "para4": 17,
+      "para1": 17,
+      "para2": 166,
+      "para3": 9,
+      "para4": 9,
       "para5": 321
     },
     {
       "ID": 122,
-      "para1": 168,
-      "para2": 1681,
-      "para3": 17,
-      "para4": 17,
+      "para1": 17,
+      "para2": 168,
+      "para3": 9,
+      "para4": 9,
       "para5": 322
     },
     {
       "ID": 123,
-      "para1": 170,
-      "para2": 1698,
-      "para3": 17,
-      "para4": 17,
+      "para1": 17,
+      "para2": 170,
+      "para3": 9,
+      "para4": 9,
       "para5": 323
     },
     {
-      "ID": 124,
-      "para1": 172,
-      "para2": 1715,
-      "para3": 17,
-      "para4": 17,
+      "ID": 124,
+      "para1": 17,
+      "para2": 171,
+      "para3": 9,
+      "para4": 9,
       "para5": 324
     },
     {
       "ID": 125,
-      "para1": 173,
-      "para2": 1732,
-      "para3": 17,
-      "para4": 17,
+      "para1": 18,
+      "para2": 173,
+      "para3": 9,
+      "para4": 9,
       "para5": 325
     },
     {
       "ID": 126,
-      "para1": 175,
-      "para2": 1749,
-      "para3": 18,
-      "para4": 18,
+      "para1": 18,
+      "para2": 175,
+      "para3": 9,
+      "para4": 9,
       "para5": 326
     },
     {
       "ID": 127,
-      "para1": 177,
-      "para2": 1767,
-      "para3": 18,
-      "para4": 18,
+      "para1": 18,
+      "para2": 177,
+      "para3": 9,
+      "para4": 9,
       "para5": 327
     },
     {
       "ID": 128,
-      "para1": 179,
-      "para2": 1785,
-      "para3": 18,
-      "para4": 18,
+      "para1": 18,
+      "para2": 179,
+      "para3": 9,
+      "para4": 9,
       "para5": 328
     },
     {
       "ID": 129,
-      "para1": 181,
-      "para2": 1803,
-      "para3": 18,
-      "para4": 18,
+      "para1": 18,
+      "para2": 180,
+      "para3": 9,
+      "para4": 9,
       "para5": 329
     },
     {
       "ID": 130,
-      "para1": 182,
-      "para2": 1821,
-      "para3": 18,
-      "para4": 18,
+      "para1": 18,
+      "para2": 182,
+      "para3": 9,
+      "para4": 9,
       "para5": 330
     },
     {
       "ID": 131,
-      "para1": 184,
-      "para2": 1839,
-      "para3": 18,
-      "para4": 18,
+      "para1": 19,
+      "para2": 184,
+      "para3": 9,
+      "para4": 9,
       "para5": 331
     },
     {
       "ID": 132,
-      "para1": 186,
-      "para2": 1858,
-      "para3": 19,
-      "para4": 19,
+      "para1": 19,
+      "para2": 186,
+      "para3": 10,
+      "para4": 10,
       "para5": 332
     },
     {
       "ID": 133,
-      "para1": 188,
-      "para2": 1876,
-      "para3": 19,
-      "para4": 19,
+      "para1": 19,
+      "para2": 188,
+      "para3": 10,
+      "para4": 10,
       "para5": 333
     },
     {
       "ID": 134,
-      "para1": 190,
-      "para2": 1895,
-      "para3": 19,
-      "para4": 19,
+      "para1": 19,
+      "para2": 190,
+      "para3": 10,
+      "para4": 10,
       "para5": 334
     },
     {
       "ID": 135,
-      "para1": 192,
-      "para2": 1914,
-      "para3": 19,
-      "para4": 19,
+      "para1": 19,
+      "para2": 191,
+      "para3": 10,
+      "para4": 10,
       "para5": 335
     },
     {
       "ID": 136,
-      "para1": 194,
-      "para2": 1934,
-      "para3": 19,
-      "para4": 19,
+      "para1": 20,
+      "para2": 193,
+      "para3": 10,
+      "para4": 10,
       "para5": 336
     },
     {
       "ID": 137,
-      "para1": 196,
-      "para2": 1953,
-      "para3": 20,
-      "para4": 20,
+      "para1": 20,
+      "para2": 195,
+      "para3": 10,
+      "para4": 10,
       "para5": 337
     },
     {
       "ID": 138,
-      "para1": 198,
-      "para2": 1973,
-      "para3": 20,
-      "para4": 20,
+      "para1": 20,
+      "para2": 197,
+      "para3": 10,
+      "para4": 10,
       "para5": 338
     },
     {
       "ID": 139,
-      "para1": 200,
-      "para2": 1993,
-      "para3": 20,
-      "para4": 20,
+      "para1": 20,
+      "para2": 199,
+      "para3": 10,
+      "para4": 10,
       "para5": 339
     },
     {
       "ID": 140,
-      "para1": 202,
-      "para2": 2013,
-      "para3": 20,
-      "para4": 20,
+      "para1": 20,
+      "para2": 201,
+      "para3": 10,
+      "para4": 10,
       "para5": 340
     },
     {
       "ID": 141,
-      "para1": 204,
-      "para2": 2033,
-      "para3": 20,
-      "para4": 20,
+      "para1": 21,
+      "para2": 203,
+      "para3": 10,
+      "para4": 10,
       "para5": 341
     },
     {
       "ID": 142,
-      "para1": 206,
-      "para2": 2054,
-      "para3": 21,
-      "para4": 21,
+      "para1": 21,
+      "para2": 205,
+      "para3": 11,
+      "para4": 11,
       "para5": 342
     },
     {
       "ID": 143,
-      "para1": 208,
-      "para2": 2074,
-      "para3": 21,
-      "para4": 21,
+      "para1": 21,
+      "para2": 207,
+      "para3": 11,
+      "para4": 11,
       "para5": 343
     },
     {
       "ID": 144,
-      "para1": 210,
-      "para2": 2095,
-      "para3": 21,
-      "para4": 21,
+      "para1": 21,
+      "para2": 210,
+      "para3": 11,
+      "para4": 11,
       "para5": 344
     },
     {
       "ID": 145,
-      "para1": 212,
-      "para2": 2116,
-      "para3": 21,
-      "para4": 21,
+      "para1": 21,
+      "para2": 212,
+      "para3": 11,
+      "para4": 11,
       "para5": 345
     },
     {
       "ID": 146,
-      "para1": 214,
-      "para2": 2138,
-      "para3": 21,
-      "para4": 21,
+      "para1": 22,
+      "para2": 214,
+      "para3": 11,
+      "para4": 11,
       "para5": 346
     },
     {
       "ID": 147,
-      "para1": 216,
-      "para2": 2159,
-      "para3": 22,
-      "para4": 22,
+      "para1": 22,
+      "para2": 216,
+      "para3": 11,
+      "para4": 11,
       "para5": 347
     },
     {
       "ID": 148,
-      "para1": 218,
-      "para2": 2181,
-      "para3": 22,
-      "para4": 22,
+      "para1": 22,
+      "para2": 218,
+      "para3": 11,
+      "para4": 11,
       "para5": 348
     },
     {
       "ID": 149,
-      "para1": 221,
-      "para2": 2203,
-      "para3": 22,
-      "para4": 22,
+      "para1": 22,
+      "para2": 220,
+      "para3": 11,
+      "para4": 11,
       "para5": 349
     },
     {
       "ID": 150,
-      "para1": 223,
-      "para2": 2225,
-      "para3": 22,
-      "para4": 22,
+      "para1": 22,
+      "para2": 223,
+      "para3": 11,
+      "para4": 11,
       "para5": 350
     },
     {
       "ID": 151,
-      "para1": 225,
-      "para2": 2247,
-      "para3": 22,
-      "para4": 22,
+      "para1": 23,
+      "para2": 225,
+      "para3": 11,
+      "para4": 11,
       "para5": 351
     },
     {
       "ID": 152,
-      "para1": 227,
-      "para2": 2270,
-      "para3": 23,
-      "para4": 23,
+      "para1": 23,
+      "para2": 227,
+      "para3": 12,
+      "para4": 12,
       "para5": 352
     },
     {
       "ID": 153,
-      "para1": 230,
-      "para2": 2293,
-      "para3": 23,
-      "para4": 23,
+      "para1": 23,
+      "para2": 229,
+      "para3": 12,
+      "para4": 12,
       "para5": 353
     },
     {
       "ID": 154,
-      "para1": 232,
-      "para2": 2316,
-      "para3": 23,
-      "para4": 23,
+      "para1": 23,
+      "para2": 232,
+      "para3": 12,
+      "para4": 12,
       "para5": 354
     },
     {
       "ID": 155,
-      "para1": 234,
-      "para2": 2339,
-      "para3": 23,
-      "para4": 23,
+      "para1": 24,
+      "para2": 234,
+      "para3": 12,
+      "para4": 12,
       "para5": 355
     },
     {
       "ID": 156,
-      "para1": 237,
-      "para2": 2363,
-      "para3": 24,
-      "para4": 24,
+      "para1": 24,
+      "para2": 236,
+      "para3": 12,
+      "para4": 12,
       "para5": 356
     },
     {
       "ID": 157,
-      "para1": 239,
-      "para2": 2387,
-      "para3": 24,
-      "para4": 24,
+      "para1": 24,
+      "para2": 239,
+      "para3": 12,
+      "para4": 12,
       "para5": 357
     },
     {
       "ID": 158,
-      "para1": 241,
-      "para2": 2411,
-      "para3": 24,
-      "para4": 24,
+      "para1": 24,
+      "para2": 241,
+      "para3": 12,
+      "para4": 12,
       "para5": 358
     },
     {
       "ID": 159,
-      "para1": 244,
-      "para2": 2435,
-      "para3": 24,
-      "para4": 24,
+      "para1": 25,
+      "para2": 244,
+      "para3": 12,
+      "para4": 12,
       "para5": 359
     },
     {
       "ID": 160,
-      "para1": 246,
-      "para2": 2459,
-      "para3": 25,
-      "para4": 25,
+      "para1": 25,
+      "para2": 246,
+      "para3": 12,
+      "para4": 12,
       "para5": 360
     },
     {
       "ID": 161,
-      "para1": 249,
-      "para2": 2484,
-      "para3": 25,
-      "para4": 25,
+      "para1": 25,
+      "para2": 248,
+      "para3": 12,
+      "para4": 12,
       "para5": 361
     },
     {
       "ID": 162,
-      "para1": 251,
-      "para2": 2509,
-      "para3": 25,
-      "para4": 25,
+      "para1": 25,
+      "para2": 251,
+      "para3": 13,
+      "para4": 13,
       "para5": 362
     },
     {
       "ID": 163,
-      "para1": 254,
-      "para2": 2534,
-      "para3": 25,
-      "para4": 25,
+      "para1": 26,
+      "para2": 253,
+      "para3": 13,
+      "para4": 13,
       "para5": 363
     },
     {
       "ID": 164,
-      "para1": 256,
-      "para2": 2560,
-      "para3": 26,
-      "para4": 26,
+      "para1": 26,
+      "para2": 256,
+      "para3": 13,
+      "para4": 13,
       "para5": 364
     },
     {
       "ID": 165,
-      "para1": 259,
-      "para2": 2586,
-      "para3": 26,
-      "para4": 26,
+      "para1": 26,
+      "para2": 259,
+      "para3": 13,
+      "para4": 13,
       "para5": 365
     },
     {
       "ID": 166,
-      "para1": 261,
-      "para2": 2612,
-      "para3": 26,
-      "para4": 26,
+      "para1": 26,
+      "para2": 261,
+      "para3": 13,
+      "para4": 13,
       "para5": 366
     },
     {
       "ID": 167,
-      "para1": 264,
-      "para2": 2638,
-      "para3": 26,
-      "para4": 26,
+      "para1": 27,
+      "para2": 264,
+      "para3": 13,
+      "para4": 13,
       "para5": 367
     },
     {
       "ID": 168,
-      "para1": 267,
-      "para2": 2665,
-      "para3": 27,
-      "para4": 27,
+      "para1": 27,
+      "para2": 266,
+      "para3": 13,
+      "para4": 13,
       "para5": 368
     },
     {
       "ID": 169,
-      "para1": 269,
-      "para2": 2691,
-      "para3": 27,
-      "para4": 27,
+      "para1": 27,
+      "para2": 269,
+      "para3": 13,
+      "para4": 13,
       "para5": 369
     },
     {
       "ID": 170,
-      "para1": 272,
-      "para2": 2719,
-      "para3": 27,
-      "para4": 27,
+      "para1": 27,
+      "para2": 272,
+      "para3": 13,
+      "para4": 13,
       "para5": 370
     },
     {
       "ID": 171,
-      "para1": 275,
-      "para2": 2746,
-      "para3": 27,
-      "para4": 27,
+      "para1": 28,
+      "para2": 275,
+      "para3": 13,
+      "para4": 13,
       "para5": 371
     },
     {
       "ID": 172,
-      "para1": 278,
-      "para2": 2774,
-      "para3": 28,
-      "para4": 28,
+      "para1": 28,
+      "para2": 277,
+      "para3": 14,
+      "para4": 14,
       "para5": 372
     },
     {
       "ID": 173,
-      "para1": 280,
-      "para2": 2802,
-      "para3": 28,
-      "para4": 28,
+      "para1": 28,
+      "para2": 280,
+      "para3": 14,
+      "para4": 14,
       "para5": 373
     },
     {
       "ID": 174,
-      "para1": 283,
-      "para2": 2830,
-      "para3": 28,
-      "para4": 28,
+      "para1": 29,
+      "para2": 283,
+      "para3": 14,
+      "para4": 14,
       "para5": 374
     },
     {
       "ID": 175,
-      "para1": 286,
-      "para2": 2858,
-      "para3": 29,
-      "para4": 29,
+      "para1": 29,
+      "para2": 286,
+      "para3": 14,
+      "para4": 14,
       "para5": 375
     },
     {
       "ID": 176,
-      "para1": 289,
-      "para2": 2887,
-      "para3": 29,
-      "para4": 29,
+      "para1": 29,
+      "para2": 289,
+      "para3": 14,
+      "para4": 14,
       "para5": 376
     },
     {
       "ID": 177,
-      "para1": 292,
-      "para2": 2916,
-      "para3": 29,
-      "para4": 29,
+      "para1": 29,
+      "para2": 292,
+      "para3": 14,
+      "para4": 14,
       "para5": 377
     },
     {
       "ID": 178,
-      "para1": 295,
-      "para2": 2945,
-      "para3": 29,
-      "para4": 29,
+      "para1": 30,
+      "para2": 295,
+      "para3": 14,
+      "para4": 14,
       "para5": 378
     },
     {
       "ID": 179,
-      "para1": 298,
-      "para2": 2975,
-      "para3": 30,
-      "para4": 30,
+      "para1": 30,
+      "para2": 298,
+      "para3": 14,
+      "para4": 14,
       "para5": 379
     },
     {
       "ID": 180,
-      "para1": 301,
-      "para2": 3005,
-      "para3": 30,
-      "para4": 30,
+      "para1": 30,
+      "para2": 301,
+      "para3": 14,
+      "para4": 14,
       "para5": 380
     },
     {
       "ID": 181,
-      "para1": 304,
-      "para2": 3035,
-      "para3": 30,
-      "para4": 30,
+      "para1": 31,
+      "para2": 304,
+      "para3": 14,
+      "para4": 14,
       "para5": 381
     },
     {
       "ID": 182,
-      "para1": 307,
-      "para2": 3066,
-      "para3": 31,
-      "para4": 31,
+      "para1": 31,
+      "para2": 307,
+      "para3": 15,
+      "para4": 15,
       "para5": 382
     },
     {
       "ID": 183,
-      "para1": 310,
-      "para2": 3097,
-      "para3": 31,
-      "para4": 31,
+      "para1": 31,
+      "para2": 310,
+      "para3": 15,
+      "para4": 15,
       "para5": 383
     },
     {
       "ID": 184,
-      "para1": 313,
-      "para2": 3128,
-      "para3": 31,
-      "para4": 31,
+      "para1": 32,
+      "para2": 313,
+      "para3": 15,
+      "para4": 15,
       "para5": 384
     },
     {
       "ID": 185,
-      "para1": 316,
-      "para2": 3159,
-      "para3": 32,
-      "para4": 32,
+      "para1": 32,
+      "para2": 316,
+      "para3": 15,
+      "para4": 15,
       "para5": 385
     },
     {
       "ID": 186,
-      "para1": 319,
-      "para2": 3191,
-      "para3": 32,
-      "para4": 32,
+      "para1": 32,
+      "para2": 319,
+      "para3": 15,
+      "para4": 15,
       "para5": 386
     },
     {
       "ID": 187,
-      "para1": 323,
-      "para2": 3223,
-      "para3": 32,
-      "para4": 32,
+      "para1": 32,
+      "para2": 322,
+      "para3": 15,
+      "para4": 15,
       "para5": 387
     },
     {
       "ID": 188,
-      "para1": 326,
-      "para2": 3256,
-      "para3": 33,
-      "para4": 33,
+      "para1": 33,
+      "para2": 326,
+      "para3": 15,
+      "para4": 15,
       "para5": 388
     },
     {
       "ID": 189,
-      "para1": 329,
-      "para2": 3289,
-      "para3": 33,
-      "para4": 33,
+      "para1": 33,
+      "para2": 329,
+      "para3": 15,
+      "para4": 15,
       "para5": 389
     },
     {
       "ID": 190,
-      "para1": 332,
-      "para2": 3322,
-      "para3": 33,
-      "para4": 33,
+      "para1": 33,
+      "para2": 332,
+      "para3": 15,
+      "para4": 15,
       "para5": 390
     },
     {
       "ID": 191,
-      "para1": 336,
-      "para2": 3355,
-      "para3": 34,
-      "para4": 34,
+      "para1": 34,
+      "para2": 336,
+      "para3": 15,
+      "para4": 15,
       "para5": 391
     },
     {
       "ID": 192,
-      "para1": 339,
-      "para2": 3389,
-      "para3": 34,
-      "para4": 34,
+      "para1": 34,
+      "para2": 339,
+      "para3": 16,
+      "para4": 16,
       "para5": 392
     },
     {
       "ID": 193,
-      "para1": 343,
-      "para2": 3423,
-      "para3": 34,
-      "para4": 34,
+      "para1": 34,
+      "para2": 342,
+      "para3": 16,
+      "para4": 16,
       "para5": 393
     },
     {
       "ID": 194,
-      "para1": 346,
-      "para2": 3458,
-      "para3": 35,
-      "para4": 35,
+      "para1": 35,
+      "para2": 346,
+      "para3": 16,
+      "para4": 16,
       "para5": 394
     },
     {
       "ID": 195,
-      "para1": 349,
-      "para2": 3492,
-      "para3": 35,
-      "para4": 35,
+      "para1": 35,
+      "para2": 349,
+      "para3": 16,
+      "para4": 16,
       "para5": 395
     },
     {
       "ID": 196,
-      "para1": 353,
-      "para2": 3528,
-      "para3": 35,
-      "para4": 35,
+      "para1": 36,
+      "para2": 353,
+      "para3": 16,
+      "para4": 16,
       "para5": 396
     },
     {
       "ID": 197,
-      "para1": 357,
-      "para2": 3563,
-      "para3": 36,
-      "para4": 36,
+      "para1": 36,
+      "para2": 356,
+      "para3": 16,
+      "para4": 16,
       "para5": 397
     },
     {
       "ID": 198,
-      "para1": 360,
-      "para2": 3599,
-      "para3": 36,
-      "para4": 36,
+      "para1": 36,
+      "para2": 360,
+      "para3": 16,
+      "para4": 16,
       "para5": 398
     },
     {
       "ID": 199,
-      "para1": 364,
-      "para2": 3635,
-      "para3": 36,
-      "para4": 36,
+      "para1": 37,
+      "para2": 364,
+      "para3": 16,
+      "para4": 16,
       "para5": 399
     },
     {
       "ID": 200,
-      "para1": 367,
-      "para2": 3672,
-      "para3": 37,
-      "para4": 37,
+      "para1": 37,
+      "para2": 367,
+      "para3": 16,
+      "para4": 16,
       "para5": 400
     },
     {
       "ID": 201,
-      "para1": 371,
-      "para2": 3709,
-      "para3": 37,
-      "para4": 37,
+      "para1": 37,
+      "para2": 371,
+      "para3": 16,
+      "para4": 16,
       "para5": 401
     },
     {
       "ID": 202,
-      "para1": 375,
-      "para2": 3746,
-      "para3": 37,
-      "para4": 37,
+      "para1": 38,
+      "para2": 375,
+      "para3": 17,
+      "para4": 17,
       "para5": 402
     },
     {
       "ID": 203,
-      "para1": 379,
-      "para2": 3784,
-      "para3": 38,
-      "para4": 38,
+      "para1": 38,
+      "para2": 378,
+      "para3": 17,
+      "para4": 17,
       "para5": 403
     },
     {
       "ID": 204,
-      "para1": 382,
-      "para2": 3822,
-      "para3": 38,
-      "para4": 38,
+      "para1": 38,
+      "para2": 382,
+      "para3": 17,
+      "para4": 17,
       "para5": 404
     },
     {
       "ID": 205,
-      "para1": 386,
-      "para2": 3860,
-      "para3": 39,
-      "para4": 39,
+      "para1": 39,
+      "para2": 386,
+      "para3": 17,
+      "para4": 17,
       "para5": 405
     },
     {
       "ID": 206,
-      "para1": 390,
-      "para2": 3899,
-      "para3": 39,
-      "para4": 39,
+      "para1": 39,
+      "para2": 390,
+      "para3": 17,
+      "para4": 17,
       "para5": 406
     },
     {
       "ID": 207,
-      "para1": 394,
-      "para2": 3939,
-      "para3": 39,
-      "para4": 39,
+      "para1": 40,
+      "para2": 394,
+      "para3": 17,
+      "para4": 17,
       "para5": 407
     },
     {
       "ID": 208,
-      "para1": 398,
-      "para2": 3978,
-      "para3": 40,
-      "para4": 40,
+      "para1": 40,
+      "para2": 398,
+      "para3": 17,
+      "para4": 17,
       "para5": 408
     },
     {
       "ID": 209,
-      "para1": 402,
-      "para2": 4018,
-      "para3": 40,
-      "para4": 40,
+      "para1": 40,
+      "para2": 402,
+      "para3": 17,
+      "para4": 17,
       "para5": 409
     },
     {
       "ID": 210,
-      "para1": 406,
-      "para2": 4059,
-      "para3": 41,
-      "para4": 41,
+      "para1": 41,
+      "para2": 406,
+      "para3": 17,
+      "para4": 17,
       "para5": 410
     },
     {
       "ID": 211,
-      "para1": 410,
-      "para2": 4100,
-      "para3": 41,
-      "para4": 41,
+      "para1": 41,
+      "para2": 410,
+      "para3": 17,
+      "para4": 17,
       "para5": 411
     },
     {
       "ID": 212,
-      "para1": 414,
-      "para2": 4141,
-      "para3": 41,
-      "para4": 41,
+      "para1": 42,
+      "para2": 414,
+      "para3": 18,
+      "para4": 18,
       "para5": 412
     },
     {
       "ID": 213,
-      "para1": 419,
-      "para2": 4183,
-      "para3": 42,
-      "para4": 42,
+      "para1": 42,
+      "para2": 418,
+      "para3": 18,
+      "para4": 18,
       "para5": 413
     },
     {
       "ID": 214,
-      "para1": 423,
-      "para2": 4225,
-      "para3": 42,
-      "para4": 42,
+      "para1": 42,
+      "para2": 422,
+      "para3": 18,
+      "para4": 18,
       "para5": 414
     },
     {
       "ID": 215,
-      "para1": 427,
-      "para2": 4267,
-      "para3": 43,
-      "para4": 43,
+      "para1": 43,
+      "para2": 427,
+      "para3": 18,
+      "para4": 18,
       "para5": 415
     },
     {
       "ID": 216,
-      "para1": 431,
-      "para2": 4310,
-      "para3": 43,
-      "para4": 43,
+      "para1": 43,
+      "para2": 431,
+      "para3": 18,
+      "para4": 18,
       "para5": 416
     },
     {
       "ID": 217,
-      "para1": 436,
-      "para2": 4354,
-      "para3": 44,
-      "para4": 44,
+      "para1": 44,
+      "para2": 435,
+      "para3": 18,
+      "para4": 18,
       "para5": 417
     },
     {
       "ID": 218,
-      "para1": 440,
-      "para2": 4397,
-      "para3": 44,
-      "para4": 44,
+      "para1": 44,
+      "para2": 440,
+      "para3": 18,
+      "para4": 18,
       "para5": 418
     },
     {
       "ID": 219,
-      "para1": 444,
-      "para2": 4442,
-      "para3": 44,
-      "para4": 44,
+      "para1": 45,
+      "para2": 444,
+      "para3": 18,
+      "para4": 18,
       "para5": 419
     },
     {
       "ID": 220,
-      "para1": 449,
-      "para2": 4486,
-      "para3": 45,
-      "para4": 45,
+      "para1": 45,
+      "para2": 449,
+      "para3": 18,
+      "para4": 18,
       "para5": 420
     },
     {
       "ID": 221,
-      "para1": 453,
-      "para2": 4532,
-      "para3": 45,
-      "para4": 45,
+      "para1": 46,
+      "para2": 453,
+      "para3": 18,
+      "para4": 18,
       "para5": 421
     },
     {
       "ID": 222,
-      "para1": 458,
-      "para2": 4577,
-      "para3": 46,
-      "para4": 46,
+      "para1": 46,
+      "para2": 458,
+      "para3": 19,
+      "para4": 19,
       "para5": 422
     },
     {
       "ID": 223,
-      "para1": 463,
-      "para2": 4623,
-      "para3": 46,
-      "para4": 46,
+      "para1": 46,
+      "para2": 462,
+      "para3": 19,
+      "para4": 19,
       "para5": 423
     },
     {
       "ID": 224,
-      "para1": 467,
-      "para2": 4670,
-      "para3": 47,
-      "para4": 47,
+      "para1": 47,
+      "para2": 467,
+      "para3": 19,
+      "para4": 19,
       "para5": 424
     },
     {
       "ID": 225,
-      "para1": 472,
-      "para2": 4717,
-      "para3": 47,
-      "para4": 47,
+      "para1": 47,
+      "para2": 472,
+      "para3": 19,
+      "para4": 19,
       "para5": 425
     },
     {
       "ID": 226,
-      "para1": 477,
-      "para2": 4764,
-      "para3": 48,
-      "para4": 48,
+      "para1": 48,
+      "para2": 476,
+      "para3": 19,
+      "para4": 19,
       "para5": 426
     },
     {
       "ID": 227,
-      "para1": 481,
-      "para2": 4812,
-      "para3": 48,
-      "para4": 48,
+      "para1": 48,
+      "para2": 481,
+      "para3": 19,
+      "para4": 19,
       "para5": 427
     },
     {
       "ID": 228,
-      "para1": 486,
-      "para2": 4861,
-      "para3": 49,
-      "para4": 49,
+      "para1": 49,
+      "para2": 486,
+      "para3": 19,
+      "para4": 19,
       "para5": 428
     },
     {
       "ID": 229,
-      "para1": 491,
-      "para2": 4910,
-      "para3": 49,
-      "para4": 49,
+      "para1": 49,
+      "para2": 491,
+      "para3": 19,
+      "para4": 19,
       "para5": 429
     },
     {
       "ID": 230,
-      "para1": 496,
-      "para2": 4959,
-      "para3": 50,
-      "para4": 50,
+      "para1": 50,
+      "para2": 496,
+      "para3": 19,
+      "para4": 19,
       "para5": 430
     },
     {
       "ID": 231,
-      "para1": 501,
-      "para2": 5009,
-      "para3": 50,
-      "para4": 50,
+      "para1": 50,
+      "para2": 501,
+      "para3": 19,
+      "para4": 19,
       "para5": 431
     },
     {
       "ID": 232,
-      "para1": 506,
-      "para2": 5060,
-      "para3": 51,
-      "para4": 51,
+      "para1": 51,
+      "para2": 506,
+      "para3": 20,
+      "para4": 20,
       "para5": 432
     },
     {
       "ID": 233,
-      "para1": 511,
-      "para2": 5111,
-      "para3": 51,
-      "para4": 51,
+      "para1": 51,
+      "para2": 511,
+      "para3": 20,
+      "para4": 20,
       "para5": 433
     },
     {
       "ID": 234,
-      "para1": 516,
-      "para2": 5162,
-      "para3": 52,
-      "para4": 52,
+      "para1": 52,
+      "para2": 516,
+      "para3": 20,
+      "para4": 20,
       "para5": 434
     },
     {
       "ID": 235,
-      "para1": 522,
-      "para2": 5214,
-      "para3": 52,
-      "para4": 52,
+      "para1": 52,
+      "para2": 521,
+      "para3": 20,
+      "para4": 20,
       "para5": 435
     },
     {
       "ID": 236,
-      "para1": 527,
-      "para2": 5266,
-      "para3": 53,
-      "para4": 53,
+      "para1": 53,
+      "para2": 527,
+      "para3": 20,
+      "para4": 20,
       "para5": 436
     },
     {
       "ID": 237,
-      "para1": 532,
-      "para2": 5320,
-      "para3": 53,
-      "para4": 53,
+      "para1": 53,
+      "para2": 532,
+      "para3": 20,
+      "para4": 20,
       "para5": 437
     },
     {
       "ID": 238,
-      "para1": 538,
-      "para2": 5373,
-      "para3": 54,
-      "para4": 54,
+      "para1": 54,
+      "para2": 537,
+      "para3": 20,
+      "para4": 20,
       "para5": 438
     },
     {
       "ID": 239,
-      "para1": 543,
-      "para2": 5427,
-      "para3": 54,
-      "para4": 54,
+      "para1": 55,
+      "para2": 543,
+      "para3": 20,
+      "para4": 20,
       "para5": 439
     },
     {
       "ID": 240,
-      "para1": 548,
-      "para2": 5482,
-      "para3": 55,
-      "para4": 55,
+      "para1": 55,
+      "para2": 548,
+      "para3": 20,
+      "para4": 20,
       "para5": 440
     },
     {
       "ID": 241,
-      "para1": 554,
-      "para2": 5537,
-      "para3": 55,
-      "para4": 55,
+      "para1": 56,
+      "para2": 554,
+      "para3": 20,
+      "para4": 20,
       "para5": 441
     },
     {
       "ID": 242,
-      "para1": 560,
-      "para2": 5593,
-      "para3": 56,
-      "para4": 56,
+      "para1": 56,
+      "para2": 559,
+      "para3": 21,
+      "para4": 21,
       "para5": 442
     },
     {
       "ID": 243,
-      "para1": 565,
-      "para2": 5649,
-      "para3": 57,
-      "para4": 57,
+      "para1": 57,
+      "para2": 565,
+      "para3": 21,
+      "para4": 21,
       "para5": 443
     },
     {
       "ID": 244,
-      "para1": 571,
-      "para2": 5706,
-      "para3": 57,
-      "para4": 57,
+      "para1": 57,
+      "para2": 571,
+      "para3": 21,
+      "para4": 21,
       "para5": 444
     },
     {
       "ID": 245,
-      "para1": 577,
-      "para2": 5763,
-      "para3": 58,
-      "para4": 58,
+      "para1": 58,
+      "para2": 576,
+      "para3": 21,
+      "para4": 21,
       "para5": 445
     },
     {
       "ID": 246,
-      "para1": 582,
-      "para2": 5821,
-      "para3": 58,
-      "para4": 58,
+      "para1": 58,
+      "para2": 582,
+      "para3": 21,
+      "para4": 21,
       "para5": 446
     },
     {
       "ID": 247,
-      "para1": 588,
-      "para2": 5880,
-      "para3": 59,
-      "para4": 59,
+      "para1": 59,
+      "para2": 588,
+      "para3": 21,
+      "para4": 21,
       "para5": 447
     },
     {
       "ID": 248,
-      "para1": 594,
-      "para2": 5939,
-      "para3": 59,
-      "para4": 59,
+      "para1": 60,
+      "para2": 594,
+      "para3": 21,
+      "para4": 21,
       "para5": 448
     },
     {
       "ID": 249,
-      "para1": 600,
-      "para2": 5999,
-      "para3": 60,
-      "para4": 60,
+      "para1": 60,
+      "para2": 600,
+      "para3": 21,
+      "para4": 21,
       "para5": 449
     },
     {
       "ID": 250,
-      "para1": 606,
-      "para2": 6060,
-      "para3": 61,
-      "para4": 61,
+      "para1": 61,
+      "para2": 606,
+      "para3": 21,
+      "para4": 21,
       "para5": 450
     },
     {
       "ID": 251,
-      "para1": 612,
-      "para2": 6121,
-      "para3": 61,
-      "para4": 61,
+      "para1": 61,
+      "para2": 612,
+      "para3": 21,
+      "para4": 21,
       "para5": 451
     },
     {
       "ID": 252,
-      "para1": 618,
-      "para2": 6182,
-      "para3": 62,
-      "para4": 62,
+      "para1": 62,
+      "para2": 618,
+      "para3": 22,
+      "para4": 22,
       "para5": 452
     },
     {
       "ID": 253,
-      "para1": 625,
-      "para2": 6244,
-      "para3": 62,
-      "para4": 62,
+      "para1": 63,
+      "para2": 624,
+      "para3": 22,
+      "para4": 22,
       "para5": 453
     },
     {
       "ID": 254,
-      "para1": 631,
-      "para2": 6307,
-      "para3": 63,
-      "para4": 63,
+      "para1": 63,
+      "para2": 631,
+      "para3": 22,
+      "para4": 22,
       "para5": 454
     },
     {
       "ID": 255,
-      "para1": 637,
-      "para2": 6371,
-      "para3": 64,
-      "para4": 64,
+      "para1": 64,
+      "para2": 637,
+      "para3": 22,
+      "para4": 22,
       "para5": 455
     },
     {
       "ID": 256,
-      "para1": 644,
-      "para2": 6435,
-      "para3": 64,
-      "para4": 64,
+      "para1": 65,
+      "para2": 644,
+      "para3": 22,
+      "para4": 22,
       "para5": 456
     },
     {
       "ID": 257,
-      "para1": 650,
-      "para2": 6500,
-      "para3": 65,
-      "para4": 65,
+      "para1": 65,
+      "para2": 650,
+      "para3": 22,
+      "para4": 22,
       "para5": 457
     },
     {
       "ID": 258,
-      "para1": 657,
-      "para2": 6565,
-      "para3": 66,
-      "para4": 66,
+      "para1": 66,
+      "para2": 657,
+      "para3": 22,
+      "para4": 22,
       "para5": 458
     },
     {
       "ID": 259,
-      "para1": 663,
-      "para2": 6631,
-      "para3": 66,
-      "para4": 66,
+      "para1": 67,
+      "para2": 663,
+      "para3": 22,
+      "para4": 22,
       "para5": 459
     },
     {
       "ID": 260,
-      "para1": 670,
-      "para2": 6698,
-      "para3": 67,
-      "para4": 67,
+      "para1": 67,
+      "para2": 670,
+      "para3": 22,
+      "para4": 22,
       "para5": 460
     },
     {
       "ID": 261,
-      "para1": 677,
-      "para2": 6766,
-      "para3": 68,
-      "para4": 68,
+      "para1": 68,
+      "para2": 677,
+      "para3": 22,
+      "para4": 22,
       "para5": 461
     },
     {
       "ID": 262,
-      "para1": 684,
-      "para2": 6834,
-      "para3": 68,
-      "para4": 68,
+      "para1": 69,
+      "para2": 683,
+      "para3": 23,
+      "para4": 23,
       "para5": 462
     },
     {
       "ID": 263,
-      "para1": 690,
-      "para2": 6902,
-      "para3": 69,
-      "para4": 69,
+      "para1": 69,
+      "para2": 690,
+      "para3": 23,
+      "para4": 23,
       "para5": 463
     },
     {
       "ID": 264,
-      "para1": 697,
-      "para2": 6972,
-      "para3": 70,
-      "para4": 70,
+      "para1": 70,
+      "para2": 697,
+      "para3": 23,
+      "para4": 23,
       "para5": 464
     },
     {
       "ID": 265,
-      "para1": 704,
-      "para2": 7042,
-      "para3": 70,
-      "para4": 70,
+      "para1": 71,
+      "para2": 704,
+      "para3": 23,
+      "para4": 23,
       "para5": 465
     },
     {
       "ID": 266,
-      "para1": 712,
-      "para2": 7113,
-      "para3": 71,
-      "para4": 71,
+      "para1": 71,
+      "para2": 711,
+      "para3": 23,
+      "para4": 23,
       "para5": 466
     },
     {
       "ID": 267,
-      "para1": 719,
-      "para2": 7185,
-      "para3": 72,
-      "para4": 72,
+      "para1": 72,
+      "para2": 718,
+      "para3": 23,
+      "para4": 23,
       "para5": 467
     },
     {
       "ID": 268,
-      "para1": 726,
-      "para2": 7257,
-      "para3": 73,
-      "para4": 73,
+      "para1": 73,
+      "para2": 726,
+      "para3": 23,
+      "para4": 23,
       "para5": 468
     },
     {
       "ID": 269,
-      "para1": 733,
-      "para2": 7330,
-      "para3": 73,
-      "para4": 73,
+      "para1": 74,
+      "para2": 733,
+      "para3": 23,
+      "para4": 23,
       "para5": 469
     },
     {
       "ID": 270,
-      "para1": 741,
-      "para2": 7404,
-      "para3": 74,
-      "para4": 74,
+      "para1": 74,
+      "para2": 740,
+      "para3": 23,
+      "para4": 23,
       "para5": 470
     },
     {
       "ID": 271,
-      "para1": 748,
-      "para2": 7478,
-      "para3": 75,
-      "para4": 75,
+      "para1": 75,
+      "para2": 748,
+      "para3": 23,
+      "para4": 23,
       "para5": 471
     },
     {
       "ID": 272,
-      "para1": 756,
-      "para2": 7554,
-      "para3": 76,
-      "para4": 76,
+      "para1": 76,
+      "para2": 755,
+      "para3": 24,
+      "para4": 24,
       "para5": 472
     },
     {
       "ID": 273,
-      "para1": 763,
-      "para2": 7630,
-      "para3": 76,
-      "para4": 76,
+      "para1": 77,
+      "para2": 763,
+      "para3": 24,
+      "para4": 24,
       "para5": 473
     },
     {
       "ID": 274,
-      "para1": 771,
-      "para2": 7707,
-      "para3": 77,
-      "para4": 77,
+      "para1": 77,
+      "para2": 771,
+      "para3": 24,
+      "para4": 24,
       "para5": 474
     },
     {
       "ID": 275,
-      "para1": 779,
-      "para2": 7784,
-      "para3": 78,
-      "para4": 78,
+      "para1": 78,
+      "para2": 778,
+      "para3": 24,
+      "para4": 24,
       "para5": 475
     },
     {
       "ID": 276,
-      "para1": 787,
-      "para2": 7863,
-      "para3": 79,
-      "para4": 79,
+      "para1": 79,
+      "para2": 786,
+      "para3": 24,
+      "para4": 24,
       "para5": 476
     },
     {
       "ID": 277,
-      "para1": 794,
-      "para2": 7942,
-      "para3": 79,
-      "para4": 79,
+      "para1": 80,
+      "para2": 794,
+      "para3": 24,
+      "para4": 24,
       "para5": 477
     },
     {
       "ID": 278,
-      "para1": 802,
-      "para2": 8022,
-      "para3": 80,
-      "para4": 80,
+      "para1": 80,
+      "para2": 802,
+      "para3": 24,
+      "para4": 24,
       "para5": 478
     },
     {
       "ID": 279,
-      "para1": 811,
-      "para2": 8103,
-      "para3": 81,
-      "para4": 81,
+      "para1": 81,
+      "para2": 810,
+      "para3": 24,
+      "para4": 24,
       "para5": 479
     },
     {
       "ID": 280,
-      "para1": 819,
-      "para2": 8184,
-      "para3": 82,
-      "para4": 82,
+      "para1": 82,
+      "para2": 818,
+      "para3": 24,
+      "para4": 24,
       "para5": 480
     },
     {
       "ID": 281,
-      "para1": 827,
-      "para2": 8267,
-      "para3": 83,
-      "para4": 83,
+      "para1": 83,
+      "para2": 827,
+      "para3": 24,
+      "para4": 24,
       "para5": 481
     },
     {
       "ID": 282,
-      "para1": 835,
-      "para2": 8350,
-      "para3": 84,
-      "para4": 84,
+      "para1": 84,
+      "para2": 835,
+      "para3": 25,
+      "para4": 25,
       "para5": 482
     },
     {
       "ID": 283,
-      "para1": 844,
-      "para2": 8434,
-      "para3": 84,
-      "para4": 84,
+      "para1": 85,
+      "para2": 843,
+      "para3": 25,
+      "para4": 25,
       "para5": 483
     },
     {
       "ID": 284,
-      "para1": 852,
-      "para2": 8519,
-      "para3": 85,
-      "para4": 85,
+      "para1": 85,
+      "para2": 852,
+      "para3": 25,
+      "para4": 25,
       "para5": 484
     },
     {
       "ID": 285,
-      "para1": 861,
-      "para2": 8605,
-      "para3": 86,
-      "para4": 86,
+      "para1": 86,
+      "para2": 860,
+      "para3": 25,
+      "para4": 25,
       "para5": 485
     },
     {
       "ID": 286,
-      "para1": 869,
-      "para2": 8691,
-      "para3": 87,
-      "para4": 87,
+      "para1": 87,
+      "para2": 869,
+      "para3": 25,
+      "para4": 25,
       "para5": 486
     },
     {
       "ID": 287,
-      "para1": 878,
-      "para2": 8779,
-      "para3": 88,
-      "para4": 88,
+      "para1": 88,
+      "para2": 878,
+      "para3": 25,
+      "para4": 25,
       "para5": 487
     },
     {
       "ID": 288,
-      "para1": 887,
-      "para2": 8867,
-      "para3": 89,
-      "para4": 89,
+      "para1": 89,
+      "para2": 887,
+      "para3": 25,
+      "para4": 25,
       "para5": 488
     },
     {
       "ID": 289,
-      "para1": 896,
-      "para2": 8956,
-      "para3": 90,
-      "para4": 90,
+      "para1": 90,
+      "para2": 896,
+      "para3": 25,
+      "para4": 25,
       "para5": 489
     },
     {
       "ID": 290,
-      "para1": 905,
-      "para2": 9047,
-      "para3": 90,
-      "para4": 90,
+      "para1": 91,
+      "para2": 905,
+      "para3": 25,
+      "para4": 25,
       "para5": 490
     },
     {
       "ID": 291,
-      "para1": 914,
-      "para2": 9138,
-      "para3": 91,
-      "para4": 91,
+      "para1": 92,
+      "para2": 914,
+      "para3": 25,
+      "para4": 25,
       "para5": 491
     },
     {
       "ID": 292,
-      "para1": 923,
-      "para2": 9230,
-      "para3": 92,
-      "para4": 92,
+      "para1": 93,
+      "para2": 923,
+      "para3": 26,
+      "para4": 26,
       "para5": 492
     },
     {
       "ID": 293,
-      "para1": 933,
-      "para2": 9323,
-      "para3": 93,
-      "para4": 93,
+      "para1": 93,
+      "para2": 932,
+      "para3": 26,
+      "para4": 26,
       "para5": 493
     },
     {
       "ID": 294,
-      "para1": 942,
-      "para2": 9417,
-      "para3": 94,
-      "para4": 94,
+      "para1": 94,
+      "para2": 942,
+      "para3": 26,
+      "para4": 26,
       "para5": 494
     },
     {
       "ID": 295,
-      "para1": 951,
-      "para2": 9511,
-      "para3": 95,
-      "para4": 95,
+      "para1": 95,
+      "para2": 951,
+      "para3": 26,
+      "para4": 26,
       "para5": 495
     },
     {
       "ID": 296,
-      "para1": 961,
-      "para2": 9607,
-      "para3": 96,
-      "para4": 96,
+      "para1": 96,
+      "para2": 961,
+      "para3": 26,
+      "para4": 26,
       "para5": 496
     },
     {
       "ID": 297,
-      "para1": 971,
-      "para2": 9704,
-      "para3": 97,
-      "para4": 97,
+      "para1": 97,
+      "para2": 970,
+      "para3": 26,
+      "para4": 26,
       "para5": 497
     },
     {
       "ID": 298,
-      "para1": 980,
-      "para2": 9802,
-      "para3": 98,
-      "para4": 98,
+      "para1": 98,
+      "para2": 980,
+      "para3": 26,
+      "para4": 26,
       "para5": 498
     },
     {
       "ID": 299,
-      "para1": 990,
-      "para2": 9900,
-      "para3": 99,
-      "para4": 99,
+      "para1": 99,
+      "para2": 990,
+      "para3": 26,
+      "para4": 26,
       "para5": 499
     },
     {
       "ID": 300,
-      "para1": 1000,
-      "para2": 10000,
-      "para3": 100,
-      "para4": 100,
+      "para1": 100,
+      "para2": 1000,
+      "para3": 26,
+      "para4": 26,
       "para5": 500
     }
   ]

Assets/Res/Config/EventConfig.json

@@ -23,7 +23,7 @@
         -5000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -54,7 +54,7 @@
         -5000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -85,7 +85,7 @@
         -5000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -116,7 +116,7 @@
         -5000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -147,7 +147,7 @@
         -5000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -178,7 +178,7 @@
         -5000,
         100
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -209,7 +209,7 @@
         -5000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -240,7 +240,7 @@
         -5000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -271,7 +271,7 @@
         -5000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -302,7 +302,7 @@
         -7500,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -333,7 +333,7 @@
         -7500,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -364,7 +364,7 @@
         -7500,
         -7500
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -395,7 +395,7 @@
         -7500,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -426,7 +426,7 @@
         -7500,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -457,7 +457,7 @@
         -7500,
         100
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -488,7 +488,7 @@
         -7500,
         2
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -519,7 +519,7 @@
         -7500,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -550,7 +550,7 @@
         -7500,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -581,7 +581,7 @@
         -15000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -612,7 +612,7 @@
         -15000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -643,7 +643,7 @@
         -15000,
         -15000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -674,7 +674,7 @@
         -15000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -705,7 +705,7 @@
         -15000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -736,7 +736,7 @@
         -15000,
         100
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -767,7 +767,7 @@
         -15000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -798,7 +798,7 @@
         -15000,
         2
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -829,7 +829,7 @@
         -15000,
         2
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -860,7 +860,7 @@
         -30000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -891,7 +891,7 @@
         -30000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -922,7 +922,7 @@
         -30000,
         -30000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -953,7 +953,7 @@
         -30000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -984,7 +984,7 @@
         -30000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1015,7 +1015,7 @@
         -30000,
         100
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1046,7 +1046,7 @@
         -30000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1077,7 +1077,7 @@
         -30000,
         2
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1108,7 +1108,7 @@
         -30000,
         2
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1139,7 +1139,7 @@
         -50000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1170,7 +1170,7 @@
         -50000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1201,7 +1201,7 @@
         -50000,
         -50000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1232,7 +1232,7 @@
         -50000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1263,7 +1263,7 @@
         -50000,
         -5000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 200,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1294,7 +1294,7 @@
         -50000,
         100
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1325,7 +1325,7 @@
         -50000,
         1
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1356,7 +1356,7 @@
         -50000,
         3
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1387,7 +1387,7 @@
         -50000,
         3
       ],
-      "RefreshProbability": 50,
+      "RefreshProbability": 40,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,

Assets/Res/Config/LanguageChineseConfig.json

@@ -2790,7 +2790,7 @@
     },
     {
       "ID": 698,
-      "txt": "玄黄道 "
+      "txt": "玄黄道"
     },
     {
       "ID": 699,
@@ -2802,7 +2802,7 @@
     },
     {
       "ID": 701,
-      "txt": "每次使用功法时在当前位置留下一道属性印记，下一个放上来的功法如果和以前功法相生则功法效果提升{0}%，每次使用功法时都会治疗对应相生属性的{1}伤势。（均衡性功法搭配，转盘改变，变为金、水、木、火、土）\n"
+      "txt": "每次使用功法时在当前位置留下一道属性印记，下一个放上来的功法如果和以前功法相生则功法效果提升{0}%，每次使用功法时都会治疗对应相生属性的{1}伤势。（均衡性功法搭配，转盘改变，变为金、水、木、火、土）"
     },
     {
       "ID": 702,
@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4077,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4078,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4079,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4080,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4081,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4082,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4083,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4084,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4085,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4086,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4087,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4088,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4089,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4090,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4091,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4092,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4093,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4094,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4095,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4096,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4097,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4098,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4099,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4100,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4101,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4102,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4131,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4193,
@@ -23390,7 +23390,7 @@
     },
     {
       "ID": 6588,
-      "txt": "仙长！上次算我大意！这次我一定能赢！” 它还是挥舞着那只拳头……"
+      "txt": "仙长！上次没玩尽兴，我们再来一次！ 它还是挥舞着那只拳头……"
     },
     {
       "ID": 6589,
@@ -23410,7 +23410,7 @@
     },
     {
       "ID": 6593,
-      "txt": "可恶，又输了！石头精羞愤难当"
+      "txt": "可恶，输了！石头精羞愤难当"
     },
     {
       "ID": 6594,
@@ -38198,7 +38198,7 @@
     },
     {
       "ID": 10290,
-      "txt": "心情+{0} "
+      "txt": "心情+{0}"
     },
     {
       "ID": 10291,
@@ -38710,7 +38710,7 @@
     },
     {
       "ID": 10418,
-      "txt": " 听说这里可以免费获得代金券？这些是可以白嫖吗？"
+      "txt": "听说这里可以免费获得代金券？这些是可以白嫖吗？"
     },
     {
       "ID": 10419,
@@ -38718,7 +38718,7 @@
     },
     {
       "ID": 10420,
-      "txt": " 代金券可以兑换稀有资源，我们先去兑换一些妖丹。"
+      "txt": "代金券可以兑换稀有资源，我们先去兑换一些妖丹。"
     },
     {
       "ID": 10421,

Assets/Res/Config/LevelbattleConfig.json

@@ -720,7 +720,7 @@
         1402
       ],
       "awardNum": [
-        3600,
+        4200,
         1
       ],
       "combatTime": 120.0,
@@ -738,7 +738,7 @@
         1702
       ],
       "awardNum": [
-        3600,
+        4200,
         1
       ],
       "combatTime": 120.0,
@@ -756,7 +756,7 @@
         21012
       ],
       "awardNum": [
-        3900,
+        4200,
         1
       ],
       "combatTime": 120.0,
@@ -774,7 +774,7 @@
         1402
       ],
       "awardNum": [
-        3900,
+        4500,
         1
       ],
       "combatTime": 120.0,
@@ -792,7 +792,7 @@
         1702
       ],
       "awardNum": [
-        4200,
+        4500,
         1
       ],
       "combatTime": 120.0,
@@ -810,7 +810,7 @@
         21012
       ],
       "awardNum": [
-        4200,
+        4500,
         1
       ],
       "combatTime": 120.0,
@@ -828,7 +828,7 @@
         1402
       ],
       "awardNum": [
-        4200,
+        4800,
         1
       ],
       "combatTime": 120.0,
@@ -846,7 +846,7 @@
         1702
       ],
       "awardNum": [
-        4500,
+        4800,
         1
       ],
       "combatTime": 120.0,
@@ -864,7 +864,7 @@
         21012
       ],
       "awardNum": [
-        4500,
+        5100,
         1
       ],
       "combatTime": 120.0,
@@ -882,7 +882,7 @@
         1402
       ],
       "awardNum": [
-        4800,
+        5100,
         1
       ],
       "combatTime": 120.0,
@@ -900,7 +900,7 @@
         1702
       ],
       "awardNum": [
-        4800,
+        5100,
         1
       ],
       "combatTime": 120.0,
@@ -918,7 +918,7 @@
         21012
       ],
       "awardNum": [
-        5100,
+        5400,
         1
       ],
       "combatTime": 120.0,
@@ -936,7 +936,7 @@
         1402
       ],
       "awardNum": [
-        5100,
+        5400,
         1
       ],
       "combatTime": 120.0,
@@ -954,7 +954,7 @@
         1702
       ],
       "awardNum": [
-        5400,
+        5700,
         1
       ],
       "combatTime": 120.0,
@@ -972,7 +972,7 @@
         21012
       ],
       "awardNum": [
-        5400,
+        5700,
         1
       ],
       "combatTime": 120.0,
@@ -990,7 +990,7 @@
         1402
       ],
       "awardNum": [
-        5700,
+        6000,
         1
       ],
       "combatTime": 120.0,
@@ -1026,7 +1026,7 @@
         21012
       ],
       "awardNum": [
-        6000,
+        6300,
         1
       ],
       "combatTime": 120.0,
@@ -1062,7 +1062,7 @@
         1702
       ],
       "awardNum": [
-        6300,
+        6600,
         1
       ],
       "combatTime": 120.0,
@@ -1170,7 +1170,7 @@
         1702
       ],
       "awardNum": [
-        7800,
+        7500,
         1
       ],
       "combatTime": 120.0,
@@ -1224,7 +1224,7 @@
         1702
       ],
       "awardNum": [
-        8400,
+        8100,
         1
       ],
       "combatTime": 120.0,
@@ -1242,7 +1242,7 @@
         21012
       ],
       "awardNum": [
-        8700,
+        8400,
         1
       ],
       "combatTime": 120.0,
@@ -1260,7 +1260,7 @@
         1403
       ],
       "awardNum": [
-        9000,
+        8700,
         1
       ],
       "combatTime": 120.0,
@@ -1278,7 +1278,7 @@
         1702
       ],
       "awardNum": [
-        9300,
+        9000,
         1
       ],
       "combatTime": 120.0,
@@ -1296,7 +1296,7 @@
         21012
       ],
       "awardNum": [
-        9600,
+        9000,
         1
       ],
       "combatTime": 120.0,
@@ -1314,7 +1314,7 @@
         1403
       ],
       "awardNum": [
-        9900,
+        9300,
         1
       ],
       "combatTime": 120.0,
@@ -1332,7 +1332,7 @@
         1702
       ],
       "awardNum": [
-        10200,
+        9600,
         1
       ],
       "combatTime": 120.0,
@@ -1350,7 +1350,7 @@
         21012
       ],
       "awardNum": [
-        10500,
+        9900,
         1
       ],
       "combatTime": 120.0,
@@ -1368,7 +1368,7 @@
         1403
       ],
       "awardNum": [
-        10800,
+        9900,
         1
       ],
       "combatTime": 120.0,
@@ -1386,7 +1386,7 @@
         1702
       ],
       "awardNum": [
-        11100,
+        10200,
         1
       ],
       "combatTime": 120.0,
@@ -1404,7 +1404,7 @@
         21012
       ],
       "awardNum": [
-        11400,
+        10500,
         1
       ],
       "combatTime": 120.0,
@@ -1422,7 +1422,7 @@
         1403
       ],
       "awardNum": [
-        11700,
+        10800,
         1
       ],
       "combatTime": 120.0,
@@ -1440,7 +1440,7 @@
         1702
       ],
       "awardNum": [
-        12000,
+        11100,
         1
       ],
       "combatTime": 120.0,
@@ -1458,7 +1458,7 @@
         21012
       ],
       "awardNum": [
-        12300,
+        11400,
         1
       ],
       "combatTime": 120.0,
@@ -1476,7 +1476,7 @@
         1403
       ],
       "awardNum": [
-        12900,
+        11700,
         1
       ],
       "combatTime": 120.0,
@@ -1494,7 +1494,7 @@
         1702
       ],
       "awardNum": [
-        13200,
+        12000,
         1
       ],
       "combatTime": 120.0,
@@ -1512,7 +1512,7 @@
         21012
       ],
       "awardNum": [
-        13500,
+        12300,
         1
       ],
       "combatTime": 120.0,
@@ -1530,7 +1530,7 @@
         1403
       ],
       "awardNum": [
-        14100,
+        12300,
         1
       ],
       "combatTime": 120.0,
@@ -1548,7 +1548,7 @@
         1702
       ],
       "awardNum": [
-        14400,
+        12900,
         1
       ],
       "combatTime": 120.0,
@@ -1566,7 +1566,7 @@
         21012
       ],
       "awardNum": [
-        15000,
+        13200,
         1
       ],
       "combatTime": 120.0,
@@ -1584,7 +1584,7 @@
         1403
       ],
       "awardNum": [
-        15300,
+        13500,
         1
       ],
       "combatTime": 120.0,
@@ -1602,7 +1602,7 @@
         1702
       ],
       "awardNum": [
-        15900,
+        13800,
         1
       ],
       "combatTime": 120.0,
@@ -1620,7 +1620,7 @@
         21012
       ],
       "awardNum": [
-        16200,
+        14100,
         1
       ],
       "combatTime": 120.0,
@@ -1638,7 +1638,7 @@
         1403
       ],
       "awardNum": [
-        16800,
+        14700,
         1
       ],
       "combatTime": 120.0,
@@ -1656,7 +1656,7 @@
         1702
       ],
       "awardNum": [
-        17400,
+        15000,
         1
       ],
       "combatTime": 120.0,
@@ -1674,7 +1674,7 @@
         21012
       ],
       "awardNum": [
-        18000,
+        15300,
         1
       ],
       "combatTime": 120.0,
@@ -1692,7 +1692,7 @@
         1403
       ],
       "awardNum": [
-        18300,
+        15600,
         1
       ],
       "combatTime": 120.0,
@@ -1710,7 +1710,7 @@
         1702
       ],
       "awardNum": [
-        18900,
+        16200,
         1
       ],
       "combatTime": 120.0,
@@ -1728,7 +1728,7 @@
         21012
       ],
       "awardNum": [
-        19500,
+        16500,
         1
       ],
       "combatTime": 120.0,
@@ -1746,7 +1746,7 @@
         1403
       ],
       "awardNum": [
-        20100,
+        16800,
         1
       ],
       "combatTime": 120.0,
@@ -1764,7 +1764,7 @@
         1702
       ],
       "awardNum": [
-        20700,
+        17400,
         1
       ],
       "combatTime": 120.0,
@@ -1782,7 +1782,7 @@
         21012
       ],
       "awardNum": [
-        21300,
+        18000,
         1
       ],
       "combatTime": 120.0,
@@ -1800,7 +1800,7 @@
         1404
       ],
       "awardNum": [
-        21900,
+        18300,
         1
       ],
       "combatTime": 120.0,
@@ -1818,7 +1818,7 @@
         1702
       ],
       "awardNum": [
-        22800,
+        18600,
         1
       ],
       "combatTime": 120.0,
@@ -1836,7 +1836,7 @@
         21012
       ],
       "awardNum": [
-        23400,
+        19200,
         1
       ],
       "combatTime": 120.0,
@@ -1854,7 +1854,7 @@
         1404
       ],
       "awardNum": [
-        24000,
+        19800,
         1
       ],
       "combatTime": 120.0,
@@ -1872,7 +1872,7 @@
         1702
       ],
       "awardNum": [
-        24900,
+        20100,
         1
       ],
       "combatTime": 120.0,
@@ -1890,7 +1890,7 @@
         21012
       ],
       "awardNum": [
-        25500,
+        20400,
         1
       ],
       "combatTime": 120.0,
@@ -1908,7 +1908,7 @@
         1404
       ],
       "awardNum": [
-        26400,
+        21300,
         1
       ],
       "combatTime": 120.0,
@@ -1926,7 +1926,7 @@
         1702
       ],
       "awardNum": [
-        27300,
+        21900,
         1
       ],
       "combatTime": 120.0,
@@ -1944,7 +1944,7 @@
         21012
       ],
       "awardNum": [
-        27900,
+        22200,
         1
       ],
       "combatTime": 120.0,
@@ -1962,7 +1962,7 @@
         1404
       ],
       "awardNum": [
-        28800,
+        22800,
         1
       ],
       "combatTime": 120.0,
@@ -1980,7 +1980,7 @@
         1702
       ],
       "awardNum": [
-        29700,
+        23400,
         1
       ],
       "combatTime": 120.0,
@@ -1998,7 +1998,7 @@
         21012
       ],
       "awardNum": [
-        30600,
+        24000,
         1
       ],
       "combatTime": 120.0,
@@ -2016,7 +2016,7 @@
         1404
       ],
       "awardNum": [
-        31500,
+        24600,
         1
       ],
       "combatTime": 120.0,
@@ -2034,7 +2034,7 @@
         1702
       ],
       "awardNum": [
-        32700,
+        25200,
         1
       ],
       "combatTime": 120.0,
@@ -2052,7 +2052,7 @@
         21012
       ],
       "awardNum": [
-        33600,
+        25800,
         1
       ],
       "combatTime": 120.0,
@@ -2070,7 +2070,7 @@
         1404
       ],
       "awardNum": [
-        34500,
+        26700,
         1
       ],
       "combatTime": 120.0,
@@ -2088,7 +2088,7 @@
         1702
       ],
       "awardNum": [
-        35700,
+        27300,
         1
       ],
       "combatTime": 120.0,
@@ -2106,7 +2106,7 @@
         21012
       ],
       "awardNum": [
-        36600,
+        27600,
         1
       ],
       "combatTime": 120.0,
@@ -2124,7 +2124,7 @@
         1404
       ],
       "awardNum": [
-        37800,
+        28500,
         1
       ],
       "combatTime": 120.0,
@@ -2142,7 +2142,7 @@
         1702
       ],
       "awardNum": [
-        39000,
+        29400,
         1
       ],
       "combatTime": 120.0,
@@ -2160,7 +2160,7 @@
         21012
       ],
       "awardNum": [
-        40200,
+        30000,
         1
       ],
       "combatTime": 120.0,
@@ -2178,7 +2178,7 @@
         1404
       ],
       "awardNum": [
-        41400,
+        30600,
         1
       ],
       "combatTime": 120.0,
@@ -2196,7 +2196,7 @@
         1702
       ],
       "awardNum": [
-        42600,
+        31500,
         1
       ],
       "combatTime": 120.0,
@@ -2214,7 +2214,7 @@
         21012
       ],
       "awardNum": [
-        43500,
+        32700,
         1
       ],
       "combatTime": 120.0,
@@ -2232,7 +2232,7 @@
         1404
       ],
       "awardNum": [
-        44400,
+        33300,
         1
       ],
       "combatTime": 120.0,
@@ -2250,7 +2250,7 @@
         1702
       ],
       "awardNum": [
-        45300,
+        33900,
         1
       ],
       "combatTime": 120.0,
@@ -2268,7 +2268,7 @@
         21012
       ],
       "awardNum": [
-        46200,
+        34800,
         1
       ],
       "combatTime": 120.0,
@@ -2286,7 +2286,7 @@
         1404
       ],
       "awardNum": [
-        47100,
+        36000,
         1
       ],
       "combatTime": 120.0,
@@ -2304,7 +2304,7 @@
         1702
       ],
       "awardNum": [
-        48000,
+        36600,
         1
       ],
       "combatTime": 120.0,
@@ -2322,7 +2322,7 @@
         21012
       ],
       "awardNum": [
-        49200,
+        37500,
         1
       ],
       "combatTime": 120.0,
@@ -2340,7 +2340,7 @@
         1404
       ],
       "awardNum": [
-        50100,
+        38700,
         1
       ],
       "combatTime": 120.0,
@@ -2358,7 +2358,7 @@
         1702
       ],
       "awardNum": [
-        51000,
+        40200,
         1
       ],
       "combatTime": 120.0,
@@ -2376,7 +2376,7 @@
         21012
       ],
       "awardNum": [
-        52200,
+        42300,
         1
       ],
       "combatTime": 120.0,
@@ -2394,7 +2394,7 @@
         1404
       ],
       "awardNum": [
-        53100,
+        44400,
         1
       ],
       "combatTime": 120.0,
@@ -2412,7 +2412,7 @@
         1702
       ],
       "awardNum": [
-        54300,
+        46800,
         1
       ],
       "combatTime": 120.0,
@@ -2430,7 +2430,7 @@
         21012
       ],
       "awardNum": [
-        55500,
+        49200,
         1
       ],
       "combatTime": 120.0,
@@ -2448,7 +2448,7 @@
         1404
       ],
       "awardNum": [
-        56400,
+        51600,
         1
       ],
       "combatTime": 120.0,
@@ -2466,7 +2466,7 @@
         1702
       ],
       "awardNum": [
-        57600,
+        54300,
         1
       ],
       "combatTime": 120.0,
@@ -2484,7 +2484,7 @@
         21012
       ],
       "awardNum": [
-        58800,
+        57000,
         1
       ],
       "combatTime": 120.0,

Assets/Res/UIAtlas/bufficon.spriteatlasv2

@@ -25,5 +25,24 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: b867be2b2b03ab247afa462760e4e2ba, type: 3}
     - {fileID: 2800000, guid: e08ce5a4c895ddb4dbcb451a27ee094a, type: 3}
     - {fileID: 2800000, guid: 70b93bf66948fe14e83e3a4d7a3a2642, type: 3}
+    - {fileID: 2800000, guid: 712f5287db85b414fa4b1b2eb7c0a687, type: 3}
+    - {fileID: 2800000, guid: 9f686ae7a1f3d224b8024e5fa2103ecb, type: 3}
+    - {fileID: 2800000, guid: 50e7afba6ad55f749ab9d86bed958321, type: 3}
+    - {fileID: 2800000, guid: b37e0882eac21374a8c2c47c50ba0c75, type: 3}
+    - {fileID: 2800000, guid: 2daf48ea991648b46ad2496403ab338e, type: 3}
+    - {fileID: 2800000, guid: 840ea39e783ff094fb9ab556d9c234c6, type: 3}
+    - {fileID: 2800000, guid: a917323cc9acc4548a5ab01e2d60d821, type: 3}
+    - {fileID: 2800000, guid: c036fa94d517ed94782d6150168dc8fd, type: 3}
+    - {fileID: 2800000, guid: 0d19de473abcacd4794caca10462cd27, type: 3}
+    - {fileID: 2800000, guid: e0e6378590d630643b094f3fa8c24203, type: 3}
+    - {fileID: 2800000, guid: 60ef1e3cecb88c3409b66cd123d087e7, type: 3}
+    - {fileID: 2800000, guid: 889163f7619aae34088b458e424de5af, type: 3}
+    - {fileID: 2800000, guid: d3965f83da4c72d4887b696d94d1595b, type: 3}
+    - {fileID: 2800000, guid: fec22b128ab7e264497690f56b75e469, type: 3}
+    - {fileID: 2800000, guid: 0dcf8eef9f6c62a4b98a70da6d92866a, type: 3}
+    - {fileID: 2800000, guid: 6ac7afd01dae13f408e610c26433fd1a, type: 3}
+    - {fileID: 2800000, guid: 614a977425806ec4290b5aa8e35f00e7, type: 3}
+    - {fileID: 2800000, guid: 403b980753e466945abdffe1fc2c2445, type: 3}
+    - {fileID: 2800000, guid: 84b12e7f086cfaa41b42dc54355c9d54, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Scenes/testCombat.scene

@@ -668,11 +668,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0e351b4322d564b589ca735763c1da14, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  YourAppKeyForAndroid: djpz510z
+  YourAppKeyForAndroid: sm0zzhed
   YourChannelIdForAndroid: ysj
-  YourAppKeyForIOS: YourAppKeyForIOS
+  YourAppKeyForIOS: wi9su6vc
   YourChannelIdForIOS: YourChannelIdForIOS
-  YourAppKeyForPC: k2uvouqp
+  YourAppKeyForPC: ve5x7wfy
   YourChannelIdForPC: ysj_pc
 --- !u!1 &164319092
 GameObject:
@@ -1267,221 +1267,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
---- !u!213 &643583353
-Sprite:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: dec_jianbian_tiao(Clone)
-  m_Rect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 115
-    height: 33
-  m_Offset: {x: 0, y: 0}
-  m_Border: {x: 0, y: 0, z: 0, w: 0}
-  m_PixelsToUnits: 100
-  m_Pivot: {x: 0.5, y: 0.5}
-  m_Extrude: 1
-  m_IsPolygon: 0
-  m_AtlasName: 
-  m_PackingTag: 
-  m_RenderDataKey:
-    c0c46614f24bc234b92e828eae8336c3: 21300000
-  m_AtlasTags:
-  - tongyong
-  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  m_RD:
-    serializedVersion: 3
-    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
-    downscaleMultiplier: 1
-  m_AtlasRD:
-    serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 389
-      y: 1229
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 389, y: 1229}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.5}
-    downscaleMultiplier: 1
-  m_PhysicsShape:
-  - - {x: 0.345, y: 0.16499999}
-    - {x: 0.345, y: -0.16499999}
-    - {x: 0.575, y: -0.16499999}
-    - {x: 0.575, y: 0.16499999}
-  m_Bones: []
-  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &753442135
 GameObject:
   m_ObjectHideFlags: 0
@@ -2040,7 +1825,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 37.6367
+      value: 156.42639
       objectReference: {fileID: 0}
     - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
@@ -2048,7 +1833,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 145.36514
+      value: 679.91876
       objectReference: {fileID: 0}
     - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -2064,7 +1849,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 37.6367
+      value: 156.42639
       objectReference: {fileID: 0}
     - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
@@ -2072,7 +1857,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 183.00185
+      value: 836.34515
       objectReference: {fileID: 0}
     - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -2168,7 +1953,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 37.6367
+      value: 156.42639
       objectReference: {fileID: 0}
     - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
@@ -2176,7 +1961,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 258.27527
+      value: 1149.198
       objectReference: {fileID: 0}
     - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -2192,7 +1977,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 37.6367
+      value: 156.42639
       objectReference: {fileID: 0}
     - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
@@ -2200,7 +1985,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 56.455048
+      value: 234.63959
       objectReference: {fileID: 0}
     - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -2216,7 +2001,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 37.6367
+      value: 156.42639
       objectReference: {fileID: 0}
     - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
@@ -2224,7 +2009,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 220.63855
+      value: 992.77155
       objectReference: {fileID: 0}
     - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -2240,7 +2025,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 51.2734
+      value: 288.85278
       objectReference: {fileID: 0}
     - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
@@ -2248,7 +2033,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 100.910095
+      value: 457.27917
       objectReference: {fileID: 0}
     - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -2264,7 +2049,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 37.6367
+      value: 156.42639
       objectReference: {fileID: 0}
     - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_SizeDelta.y
@@ -2272,7 +2057,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 18.81835
+      value: 78.213196
       objectReference: {fileID: 0}
     - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -2945,7 +2730,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 643583353}
+  m_Sprite: {fileID: 1881818885}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2976,6 +2761,221 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1831378551}
   m_CullTransparentMesh: 1
+--- !u!213 &1881818885
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dec_jianbian_tiao(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 115
+    height: 33
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 0, z: 0, w: 0}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    c0c46614f24bc234b92e828eae8336c3: 21300000
+  m_AtlasTags:
+  - tongyong
+  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 389
+      y: 1229
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 389, y: 1229}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.5}
+    downscaleMultiplier: 1
+  m_PhysicsShape:
+  - - {x: 0.345, y: 0.16499999}
+    - {x: 0.345, y: -0.16499999}
+    - {x: 0.575, y: -0.16499999}
+    - {x: 0.575, y: 0.16499999}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!114 &4237119297094294473
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -195,6 +195,11 @@ namespace GameLogic.Combat.CombatTool
                     source.CurrCombatHeroInfo.abnormalHarmAdd);
             }
 
+            if (att <= 0)
+            {
+                att = 1;
+            }
+
             harmReturnInfo.att = att;
             target.combatHeroEntity.This<CombatHeroEntity>().HeroHurt(harmReturnInfo);
 
@@ -370,8 +375,9 @@ namespace GameLogic.Combat.CombatTool
                 p2 = Mathf.Max(100, Mathf.Min(200, 30 + lg_a - lg_b));
                 myHp = (long)(myHp * p2);
             }
-            a.HpBl= myHp;
-            b.HpBl= targetHp;
+
+            a.HpBl = myHp;
+            b.HpBl = targetHp;
             if (myHp > targetHp)
             {
                 return targetHp;
@@ -380,6 +386,7 @@ namespace GameLogic.Combat.CombatTool
             {
                 return myHp;
             }
+
             return targetHp;
         }
 
@@ -556,7 +563,7 @@ namespace GameLogic.Combat.CombatTool
                     break;
             }
 
-            return new Color(1,1,1,0.3f);
+            return new Color(1, 1, 1, 0.3f);
         }
 
         public Color GetColor(int wuXingType)

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -459,7 +459,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         {
             return;
         }
-
+        heroMagicWeaponControl?.Dispose();
         _isDis = true;
         BuffControl.Dispose();
         _isDis = true;
@@ -471,6 +471,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         CloseLoopFx();
         ShieldsBarrier?.Dispose();
         ShieldsBarrier = null;
+        heroMagicWeaponControl = null;
     }
 
     public void Dispose()
@@ -479,7 +480,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         {
             return;
         }
-        // heroMagicWeaponControl?.Dispose();
+        heroMagicWeaponControl?.Dispose();
         _isDis = true;
         BuffControl.Dispose();
         combatHeroGameObject.Dispose();
@@ -492,6 +493,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         CloseLoopFx();
         ShieldsBarrier?.Dispose();
         ShieldsBarrier = null;
+        heroMagicWeaponControl = null;
     }
 
     private void ProDormancyObj()

Assets/Scripts/GameLogic/Combat/Hero/MagicWeaponControl.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Common.Utility.CombatEvent;
 using Core.Utility;
@@ -12,7 +13,7 @@ namespace GameLogic.Combat.Hero
     /// <summary>
     /// 法宝的管理
     /// </summary>
-    public class MagicWeaponControl
+    public class MagicWeaponControl:IDisposable
     {
         public bool isAutoUse;
         private BetterList<CombatMagicWeaponEntity> _allMagicWeapon = new BetterList<CombatMagicWeaponEntity>();
@@ -119,5 +120,15 @@ namespace GameLogic.Combat.Hero
                 _allMagicWeapon[i].Update(t);
             }
         }
+
+        public void Dispose()
+        {
+            for (int i = 0; i < _allMagicWeapon.Count; i++)
+            {
+                _allMagicWeapon[i].Dispose();
+            }
+            _allMagicWeapon.Clear();
+            combatHeroEntity = null;
+        }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3301.cs

@@ -99,13 +99,17 @@ namespace GameLogic.Combat.Skill.MagicSkill
                     }
                 }
             }
-
+        
+            long att = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CurrCombatHeroInfo.attack.Value;
+            long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(att, effectValue[2]);
+            CombatCalculateTool.Instance.Harm(CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity,
+                lifetCycleHitPoint as CombatHeroHitPoint, harm, AttType.FaBao, triggerData, wuXingType, null,
+                HarmType.Default);
             BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
             cBetterList.Add(lifetCycleHitPoint);
             ActivationTimeLineData("sk1_hit", currTarget: cBetterList);
             SkillPlayFinish();
-            // TimeLineEventLogicGroupBasic timeLineEventLogicGroupBasic =
-            //     ActivationTimeLineData("sk1_xiaoshi");
+           
         }
 
         // protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(

Assets/Scripts/GameUI/Combat/LevelBattleCombatMono.cs

@@ -27,6 +27,7 @@ namespace GameUI.Combat
            
             await UIManager.Instance.HideUIUIPanel<CombatPanel>();
             CombatDrive.Instance.CombatToStage(CombatController.currActiveCombat.isWin);
+            CombatController.currActiveCombat.ChangeState(CombatController.idle);
         }
     }
 }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -151,7 +151,7 @@ namespace Fort23.Mono
                     else
                     {
                         RemoveHeroItem(list[1]);
-                        AudioManager.Instance.PlayAudio("ui_tuposhiba.wav");
+                        AudioManager.Instance.PlayAudio("ui_tuposhibai.wav");
                         HeroBreakthroughFailPanel heroBreakthroughFailPanel =
                             await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
                         await heroBreakthroughFailPanel.UIClosed();
@@ -183,7 +183,7 @@ namespace Fort23.Mono
                         //渡劫失败
                         if (ramdomValue >= PlayerManager.Instance.myHero.hp.Value)
                         {
-                            AudioManager.Instance.PlayAudio("ui_tuposhiba.wav");
+                            AudioManager.Instance.PlayAudio("ui_tuposhibai.wav");
                             RemoveHeroItem(100);
 
                             HeroBreakthroughFailPanel heroBreakthroughFailPanel =

Assets/Scripts/GameUI/UI/TowerPanel/TowerPanel.cs

@@ -74,6 +74,7 @@ namespace Fort23.Mono
 
                             CustomInit();
                         }
+                        CombatController.currActiveCombat.ChangeState(CombatController.update);
                     });
             });
 

XiuXianGame.sln.DotSettings.user

@@ -37,6 +37,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F78_003Fe39b72ca_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFunc_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F7d_003F1afce2dc_003FFunc_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGraphicsBuffer_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F3a_003F867eec19_003FGraphicsBuffer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIDisposable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Ff0_003F55936aef_003FIDisposable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIGrouping_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fb1_003F69de2d9e_003FIGrouping_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIMGUIContainer_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F2c_003F134ee6ec_003FIMGUIContainer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AINotifyCompletion_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F64_003Fbb31faf9_003FINotifyCompletion_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>