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

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.56224924
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.00092924875
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.3860619
+    - _Alpha: 0.2050029
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.00906992
+    - _MainTexOffsetU: 0.20611608
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/DaoyouGiftConfig.json

@@ -2,318 +2,418 @@
   "configList": [
     {
       "ID": 1,
-      "ItemID": 1201,
-      "emotionValue": 10
+      "ItemID": 1501,
+      "emotionValue": 300
     },
     {
       "ID": 2,
+      "ItemID": 1502,
+      "emotionValue": 500
+    },
+    {
+      "ID": 301,
+      "ItemID": 1201,
+      "emotionValue": 100
+    },
+    {
+      "ID": 302,
       "ItemID": 1202,
-      "emotionValue": 20
+      "emotionValue": 100
     },
     {
-      "ID": 3,
+      "ID": 303,
       "ItemID": 1203,
-      "emotionValue": 30
+      "emotionValue": 100
     },
     {
-      "ID": 4,
+      "ID": 304,
       "ItemID": 1204,
-      "emotionValue": 10
+      "emotionValue": 100
     },
     {
-      "ID": 5,
+      "ID": 305,
       "ItemID": 1205,
-      "emotionValue": 20
+      "emotionValue": 100
     },
     {
-      "ID": 6,
+      "ID": 306,
       "ItemID": 1206,
-      "emotionValue": 30
+      "emotionValue": 100
     },
     {
-      "ID": 7,
+      "ID": 307,
       "ItemID": 1207,
-      "emotionValue": 10
+      "emotionValue": 100
     },
     {
-      "ID": 8,
+      "ID": 308,
       "ItemID": 1208,
-      "emotionValue": 20
+      "emotionValue": 100
     },
     {
-      "ID": 9,
+      "ID": 309,
       "ItemID": 1209,
-      "emotionValue": 30
-    },
-    {
-      "ID": 10,
-      "ItemID": 1301,
-      "emotionValue": 10
-    },
-    {
-      "ID": 11,
-      "ItemID": 1302,
-      "emotionValue": 15
-    },
-    {
-      "ID": 12,
-      "ItemID": 1303,
-      "emotionValue": 20
-    },
-    {
-      "ID": 13,
-      "ItemID": 1304,
-      "emotionValue": 25
+      "emotionValue": 100
     },
     {
-      "ID": 14,
-      "ItemID": 1401,
-      "emotionValue": 10
+      "ID": 310,
+      "ItemID": 1210,
+      "emotionValue": 100
     },
     {
-      "ID": 15,
-      "ItemID": 1402,
-      "emotionValue": 15
+      "ID": 311,
+      "ItemID": 1211,
+      "emotionValue": 100
     },
     {
-      "ID": 16,
-      "ItemID": 1403,
-      "emotionValue": 20
+      "ID": 312,
+      "ItemID": 1212,
+      "emotionValue": 100
     },
     {
-      "ID": 17,
-      "ItemID": 1404,
-      "emotionValue": 30
+      "ID": 313,
+      "ItemID": 1213,
+      "emotionValue": 100
     },
     {
-      "ID": 18,
-      "ItemID": 1501,
-      "emotionValue": 50
+      "ID": 314,
+      "ItemID": 1214,
+      "emotionValue": 100
     },
     {
-      "ID": 19,
-      "ItemID": 1502,
+      "ID": 315,
+      "ItemID": 1215,
       "emotionValue": 100
     },
     {
-      "ID": 20,
-      "ItemID": 11001,
-      "emotionValue": 20
+      "ID": 316,
+      "ItemID": 1216,
+      "emotionValue": 100
     },
     {
-      "ID": 21,
-      "ItemID": 11002,
-      "emotionValue": 20
+      "ID": 317,
+      "ItemID": 1217,
+      "emotionValue": 100
     },
     {
-      "ID": 22,
-      "ItemID": 11003,
-      "emotionValue": 20
+      "ID": 318,
+      "ItemID": 1218,
+      "emotionValue": 100
     },
     {
-      "ID": 23,
-      "ItemID": 11004,
-      "emotionValue": 20
+      "ID": 319,
+      "ItemID": 1219,
+      "emotionValue": 100
     },
     {
-      "ID": 24,
-      "ItemID": 11005,
-      "emotionValue": 20
+      "ID": 320,
+      "ItemID": 1220,
+      "emotionValue": 100
     },
     {
-      "ID": 25,
-      "ItemID": 11006,
-      "emotionValue": 20
+      "ID": 321,
+      "ItemID": 1221,
+      "emotionValue": 100
     },
     {
-      "ID": 26,
-      "ItemID": 11007,
-      "emotionValue": 20
+      "ID": 322,
+      "ItemID": 1222,
+      "emotionValue": 100
     },
     {
-      "ID": 27,
-      "ItemID": 11008,
-      "emotionValue": 20
+      "ID": 323,
+      "ItemID": 1223,
+      "emotionValue": 100
     },
     {
-      "ID": 28,
-      "ItemID": 11009,
-      "emotionValue": 20
+      "ID": 324,
+      "ItemID": 1224,
+      "emotionValue": 100
     },
     {
-      "ID": 29,
-      "ItemID": 11010,
-      "emotionValue": 20
+      "ID": 325,
+      "ItemID": 1225,
+      "emotionValue": 100
     },
     {
-      "ID": 30,
-      "ItemID": 11011,
-      "emotionValue": 20
+      "ID": 326,
+      "ItemID": 1226,
+      "emotionValue": 100
     },
     {
-      "ID": 31,
+      "ID": 501,
       "ItemID": 13001,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 32,
+      "ID": 502,
       "ItemID": 13002,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 33,
+      "ID": 503,
       "ItemID": 13003,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 34,
+      "ID": 504,
       "ItemID": 13004,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 35,
+      "ID": 505,
       "ItemID": 13005,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 36,
+      "ID": 506,
       "ItemID": 13006,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 37,
+      "ID": 507,
       "ItemID": 13007,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 38,
+      "ID": 508,
       "ItemID": 13008,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 39,
+      "ID": 509,
       "ItemID": 13009,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 40,
+      "ID": 510,
       "ItemID": 13010,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 41,
+      "ID": 511,
       "ItemID": 13011,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 42,
+      "ID": 512,
       "ItemID": 13012,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 43,
+      "ID": 513,
       "ItemID": 13013,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 44,
+      "ID": 514,
       "ItemID": 13014,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 45,
+      "ID": 515,
       "ItemID": 13015,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 46,
+      "ID": 516,
       "ItemID": 13016,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 47,
+      "ID": 517,
       "ItemID": 13017,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 48,
+      "ID": 518,
       "ItemID": 13018,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 49,
+      "ID": 519,
       "ItemID": 13019,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 50,
+      "ID": 520,
       "ItemID": 13020,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 51,
+      "ID": 521,
       "ItemID": 13021,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 52,
+      "ID": 522,
       "ItemID": 13022,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 53,
+      "ID": 523,
       "ItemID": 13023,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 54,
+      "ID": 524,
       "ItemID": 13024,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 55,
+      "ID": 525,
       "ItemID": 13025,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 56,
+      "ID": 526,
       "ItemID": 13501,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 57,
+      "ID": 527,
       "ItemID": 13502,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 58,
+      "ID": 528,
       "ItemID": 13503,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 59,
+      "ID": 529,
       "ItemID": 13504,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 60,
+      "ID": 530,
       "ItemID": 13505,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 61,
+      "ID": 531,
       "ItemID": 13506,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 62,
+      "ID": 532,
       "ItemID": 13507,
-      "emotionValue": 20
+      "emotionValue": 1
     },
     {
-      "ID": 63,
+      "ID": 533,
       "ItemID": 13508,
-      "emotionValue": 20
+      "emotionValue": 1
+    },
+    {
+      "ID": 534,
+      "ItemID": 13509,
+      "emotionValue": 1
+    },
+    {
+      "ID": 535,
+      "ItemID": 13510,
+      "emotionValue": 1
+    },
+    {
+      "ID": 536,
+      "ItemID": 13511,
+      "emotionValue": 1
+    },
+    {
+      "ID": 537,
+      "ItemID": 13512,
+      "emotionValue": 1
+    },
+    {
+      "ID": 538,
+      "ItemID": 13513,
+      "emotionValue": 1
+    },
+    {
+      "ID": 539,
+      "ItemID": 13514,
+      "emotionValue": 1
+    },
+    {
+      "ID": 540,
+      "ItemID": 13515,
+      "emotionValue": 1
+    },
+    {
+      "ID": 541,
+      "ItemID": 13516,
+      "emotionValue": 1
+    },
+    {
+      "ID": 542,
+      "ItemID": 13517,
+      "emotionValue": 1
+    },
+    {
+      "ID": 543,
+      "ItemID": 13518,
+      "emotionValue": 1
+    },
+    {
+      "ID": 544,
+      "ItemID": 13519,
+      "emotionValue": 1
+    },
+    {
+      "ID": 545,
+      "ItemID": 11001,
+      "emotionValue": 1
+    },
+    {
+      "ID": 546,
+      "ItemID": 11002,
+      "emotionValue": 1
+    },
+    {
+      "ID": 547,
+      "ItemID": 11003,
+      "emotionValue": 1
+    },
+    {
+      "ID": 548,
+      "ItemID": 11004,
+      "emotionValue": 1
+    },
+    {
+      "ID": 549,
+      "ItemID": 11005,
+      "emotionValue": 1
+    },
+    {
+      "ID": 550,
+      "ItemID": 11006,
+      "emotionValue": 1
+    },
+    {
+      "ID": 551,
+      "ItemID": 11007,
+      "emotionValue": 1
+    },
+    {
+      "ID": 552,
+      "ItemID": 11008,
+      "emotionValue": 1
+    },
+    {
+      "ID": 553,
+      "ItemID": 11009,
+      "emotionValue": 1
+    },
+    {
+      "ID": 554,
+      "ItemID": 11010,
+      "emotionValue": 1
+    },
+    {
+      "ID": 555,
+      "ItemID": 11011,
+      "emotionValue": 1
     }
   ]
 }

Assets/Res/Config/DaoyouLevelupConfig.json

@@ -3,102 +3,102 @@
     {
       "ID": 1,
       "name": 2025,
-      "exp": 10,
+      "exp": 1000,
       "guajiGrowup": 0
     },
     {
       "ID": 2,
       "name": 2026,
-      "exp": 20,
+      "exp": 2000,
       "prizeID": [
-        1002
+        1701
       ],
       "prizeNum": [
-        100
+        1
       ],
       "guajiGrowup": 100
     },
     {
       "ID": 3,
       "name": 2027,
-      "exp": 30,
+      "exp": 3000,
       "prizeID": [
-        1002
+        1701
       ],
       "prizeNum": [
-        150
+        2
       ],
       "guajiGrowup": 112
     },
     {
       "ID": 4,
       "name": 2028,
-      "exp": 40,
+      "exp": 4000,
       "prizeID": [
-        1002
+        1703
       ],
       "prizeNum": [
-        200
+        1
       ],
       "guajiGrowup": 125
     },
     {
       "ID": 5,
       "name": 2029,
-      "exp": 50,
+      "exp": 5000,
       "prizeID": [
-        1002
+        1703
       ],
       "prizeNum": [
-        250
+        1
       ],
       "guajiGrowup": 137
     },
     {
       "ID": 6,
       "name": 2030,
-      "exp": 60,
+      "exp": 6000,
       "prizeID": [
-        1002
+        1703
       ],
       "prizeNum": [
-        300
+        2
       ],
       "guajiGrowup": 150
     },
     {
       "ID": 7,
       "name": 2031,
-      "exp": 70,
+      "exp": 7000,
       "prizeID": [
-        1002
+        1703
       ],
       "prizeNum": [
-        350
+        2
       ],
       "guajiGrowup": 162
     },
     {
       "ID": 8,
       "name": 2032,
-      "exp": 80,
+      "exp": 8000,
       "prizeID": [
-        1002
+        1704
       ],
       "prizeNum": [
-        400
+        1
       ],
       "guajiGrowup": 175
     },
     {
       "ID": 9,
       "name": 2033,
-      "exp": 90,
+      "exp": 9000,
       "prizeID": [
-        1002
+        1704
       ],
       "prizeNum": [
-        450
+        1
       ],
       "guajiGrowup": 187
     },
@@ -107,10 +107,10 @@
       "name": 2034,
       "exp": -1,
       "prizeID": [
-        1002
+        1704
       ],
       "prizeNum": [
-        500
+        1
       ],
       "guajiGrowup": 200
     }

Assets/Res/Config/DaoyouModelConfig.json

@@ -6,7 +6,7 @@
       "quality": 2,
       "bodyIcon": "bg_lh_quelinger",
       "headIcon": "",
-      "growupRate": 100,
+      "growupRate": 90,
       "des": [
         1963,
         1964,
@@ -18,29 +18,29 @@
         6
       ],
       "PreferGiftID": [
-        1201,
-        1202,
-        1203
+        13005,
+        11001,
+        11002
       ],
       "shownPreferGiftID": [
-        1201
+        13005
       ],
       "guajiBuffID": [
-        1,
+        30,
         11,
-        22
+        23
       ],
       "daolvSkillID": [
-        1
+        17
       ],
-      "EmotionLvforQuest": 2,
+      "EmotionLvforQuest": 4,
       "EventCompleteforQuest": 1,
       "QuestID": 6006,
       "EmotionLvforspecialGift": [
         3
       ],
       "specialGiftID": [
-        1201
+        1703
       ],
       "specialGiftNum": [
         1
@@ -52,7 +52,7 @@
       "quality": 2,
       "bodyIcon": "bg_lh_chidaoren",
       "headIcon": "",
-      "growupRate": 100,
+      "growupRate": 90,
       "des": [
         1966,
         1967,
@@ -64,29 +64,29 @@
         6
       ],
       "PreferGiftID": [
-        1204,
-        1205,
-        1206
+        13010,
+        11003,
+        11004
       ],
       "shownPreferGiftID": [
-        1204
+        13010
       ],
       "guajiBuffID": [
-        1,
-        21,
-        32
+        30,
+        11,
+        33
       ],
       "daolvSkillID": [
-        2
+        22
       ],
-      "EmotionLvforQuest": 2,
+      "EmotionLvforQuest": 5,
       "EventCompleteforQuest": 1,
       "QuestID": 6016,
       "EmotionLvforspecialGift": [
         4
       ],
       "specialGiftID": [
-        1202
+        1703
       ],
       "specialGiftNum": [
         1
@@ -110,29 +110,29 @@
         6
       ],
       "PreferGiftID": [
-        1207,
-        1208,
-        1209
+        13015,
+        11006,
+        11005
       ],
       "shownPreferGiftID": [
-        1207
+        13015
       ],
       "guajiBuffID": [
-        1,
-        31,
-        42
+        30,
+        11,
+        43
       ],
       "daolvSkillID": [
-        3
+        27
       ],
-      "EmotionLvforQuest": 2,
+      "EmotionLvforQuest": 6,
       "EventCompleteforQuest": 1,
       "QuestID": 6026,
       "EmotionLvforspecialGift": [
         5
       ],
       "specialGiftID": [
-        1201
+        1703
       ],
       "specialGiftNum": [
         1
@@ -156,45 +156,45 @@
         6
       ],
       "PreferGiftID": [
-        1301,
-        1302,
-        1303
+        13020,
+        11008,
+        11007
       ],
       "shownPreferGiftID": [
-        1301
+        13020
       ],
       "guajiBuffID": [
-        2,
-        41,
-        12
+        30,
+        12,
+        22
       ],
       "daolvSkillID": [
-        4
+        32
       ],
-      "EmotionLvforQuest": 3,
+      "EmotionLvforQuest": 7,
       "EventCompleteforQuest": 1,
       "QuestID": 6036,
       "EmotionLvforspecialGift": [
         4
       ],
       "specialGiftID": [
-        1202
+        1703
       ],
       "specialGiftNum": [
         1
       ]
     },
     {
-      "ID": 5,
-      "name": 1957,
+      "ID": 7,
+      "name": 1959,
       "quality": 4,
-      "bodyIcon": "bg_lh_xuyou",
+      "bodyIcon": "bg_lh_xiner",
       "headIcon": "",
-      "growupRate": 100,
+      "growupRate": 110,
       "des": [
-        1975,
-        1976,
-        1977
+        1981,
+        1982,
+        1983
       ],
       "desUnlockLv": [
         1,
@@ -202,45 +202,45 @@
         6
       ],
       "PreferGiftID": [
-        1401,
-        1402,
-        1403
+        13025,
+        11010,
+        13511
       ],
       "shownPreferGiftID": [
-        1401
+        13025
       ],
       "guajiBuffID": [
-        2,
+        30,
         12,
-        33
+        32
       ],
       "daolvSkillID": [
-        5
+        37
       ],
-      "EmotionLvforQuest": 3,
+      "EmotionLvforQuest": 8,
       "EventCompleteforQuest": 1,
-      "QuestID": -1,
+      "QuestID": 9146,
       "EmotionLvforspecialGift": [
         5
       ],
       "specialGiftID": [
-        1201
+        1703
       ],
       "specialGiftNum": [
         1
       ]
     },
     {
-      "ID": 6,
-      "name": 1958,
-      "quality": 5,
-      "bodyIcon": "bg_lh_fengdaoren",
+      "ID": 8,
+      "name": 1960,
+      "quality": 4,
+      "bodyIcon": "bg_lh_liuqingyan2",
       "headIcon": "",
-      "growupRate": 100,
+      "growupRate": 110,
       "des": [
-        1978,
-        1979,
-        1980
+        1984,
+        1985,
+        1986
       ],
       "desUnlockLv": [
         1,
@@ -248,45 +248,45 @@
         6
       ],
       "PreferGiftID": [
-        1201,
-        1202,
-        1203
+        13501,
+        13506,
+        13512
       ],
       "shownPreferGiftID": [
-        1201
+        13501
       ],
       "guajiBuffID": [
-        2,
-        22,
-        43
+        30,
+        13,
+        41
       ],
       "daolvSkillID": [
-        6
+        18
       ],
-      "EmotionLvforQuest": 3,
+      "EmotionLvforQuest": 9,
       "EventCompleteforQuest": 1,
-      "QuestID": -1,
+      "QuestID": 9146,
       "EmotionLvforspecialGift": [
         6
       ],
       "specialGiftID": [
-        1202
+        1703
       ],
       "specialGiftNum": [
         1
       ]
     },
     {
-      "ID": 7,
-      "name": 1959,
+      "ID": 5,
+      "name": 1957,
       "quality": 4,
-      "bodyIcon": "bg_lh_xiner",
+      "bodyIcon": "bg_lh_xuyou",
       "headIcon": "",
       "growupRate": 100,
       "des": [
-        1981,
-        1982,
-        1983
+        1975,
+        1976,
+        1977
       ],
       "desUnlockLv": [
         1,
@@ -294,45 +294,45 @@
         6
       ],
       "PreferGiftID": [
-        1204,
-        1205,
-        1206
+        13502,
+        13507,
+        13513
       ],
       "shownPreferGiftID": [
-        1204
+        13502
       ],
       "guajiBuffID": [
-        3,
-        32,
-        13
+        30,
+        22,
+        33
       ],
       "daolvSkillID": [
-        7
+        23
       ],
-      "EmotionLvforQuest": 4,
+      "EmotionLvforQuest": -1,
       "EventCompleteforQuest": 1,
-      "QuestID": 9146,
+      "QuestID": -1,
       "EmotionLvforspecialGift": [
         5
       ],
       "specialGiftID": [
-        1201
+        1703
       ],
       "specialGiftNum": [
-        1
+        3
       ]
     },
     {
-      "ID": 8,
-      "name": 1960,
-      "quality": 4,
-      "bodyIcon": "bg_lh_liuqingyan2",
+      "ID": 6,
+      "name": 1958,
+      "quality": 5,
+      "bodyIcon": "bg_lh_fengdaoren",
       "headIcon": "",
       "growupRate": 100,
       "des": [
-        1984,
-        1985,
-        1986
+        1978,
+        1979,
+        1980
       ],
       "desUnlockLv": [
         1,
@@ -340,32 +340,32 @@
         6
       ],
       "PreferGiftID": [
-        1207,
-        1208,
-        1209
+        13503,
+        13508,
+        13514
       ],
       "shownPreferGiftID": [
-        1207
+        13503
       ],
       "guajiBuffID": [
-        3,
-        42,
-        23
+        30,
+        32,
+        43
       ],
       "daolvSkillID": [
-        8
+        28
       ],
-      "EmotionLvforQuest": 4,
+      "EmotionLvforQuest": -1,
       "EventCompleteforQuest": 1,
-      "QuestID": 9146,
+      "QuestID": -1,
       "EmotionLvforspecialGift": [
         6
       ],
       "specialGiftID": [
-        1202
+        1703
       ],
       "specialGiftNum": [
-        1
+        3
       ]
     },
     {
@@ -386,32 +386,32 @@
         6
       ],
       "PreferGiftID": [
-        1301,
-        1302,
-        1303
+        13504,
+        13509,
+        13515
       ],
       "shownPreferGiftID": [
-        1301
+        13504
       ],
       "guajiBuffID": [
-        4,
-        13,
-        34
+        30,
+        42,
+        23
       ],
       "daolvSkillID": [
-        1
+        33
       ],
-      "EmotionLvforQuest": 5,
+      "EmotionLvforQuest": -1,
       "EventCompleteforQuest": 1,
       "QuestID": -1,
       "EmotionLvforspecialGift": [
         7
       ],
       "specialGiftID": [
-        1201
+        1703
       ],
       "specialGiftNum": [
-        1
+        3
       ]
     },
     {
@@ -432,32 +432,32 @@
         6
       ],
       "PreferGiftID": [
-        1401,
-        1402,
-        1403
+        13505,
+        13510,
+        13516
       ],
       "shownPreferGiftID": [
-        1401
+        13505
       ],
       "guajiBuffID": [
-        4,
-        23,
-        44
+        30,
+        22,
+        43
       ],
       "daolvSkillID": [
-        2
+        38
       ],
-      "EmotionLvforQuest": 6,
+      "EmotionLvforQuest": -1,
       "EventCompleteforQuest": 1,
       "QuestID": -1,
       "EmotionLvforspecialGift": [
         8
       ],
       "specialGiftID": [
-        1202
+        1703
       ],
       "specialGiftNum": [
-        1
+        3
       ]
     }
   ]

Assets/Res/Config/DropConfig.json

@@ -170,6 +170,226 @@
         1204
       ]
     },
+    {
+      "ID": 1205,
+      "dropGroupID": [
+        1205
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1205
+      ]
+    },
+    {
+      "ID": 1206,
+      "dropGroupID": [
+        1206
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1206
+      ]
+    },
+    {
+      "ID": 1207,
+      "dropGroupID": [
+        1207
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1207
+      ]
+    },
+    {
+      "ID": 1208,
+      "dropGroupID": [
+        1208
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1208
+      ]
+    },
+    {
+      "ID": 1209,
+      "dropGroupID": [
+        1209
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1209
+      ]
+    },
+    {
+      "ID": 1210,
+      "dropGroupID": [
+        1210
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1210
+      ]
+    },
+    {
+      "ID": 1211,
+      "dropGroupID": [
+        1211
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1211
+      ]
+    },
+    {
+      "ID": 1212,
+      "dropGroupID": [
+        1212
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1212
+      ]
+    },
+    {
+      "ID": 1213,
+      "dropGroupID": [
+        1213
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1213
+      ]
+    },
+    {
+      "ID": 1214,
+      "dropGroupID": [
+        1214
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1214
+      ]
+    },
+    {
+      "ID": 1215,
+      "dropGroupID": [
+        1215
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1215
+      ]
+    },
+    {
+      "ID": 1216,
+      "dropGroupID": [
+        1216
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1216
+      ]
+    },
+    {
+      "ID": 1217,
+      "dropGroupID": [
+        1217
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1217
+      ]
+    },
+    {
+      "ID": 1218,
+      "dropGroupID": [
+        1218
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1218
+      ]
+    },
+    {
+      "ID": 1219,
+      "dropGroupID": [
+        1219
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1219
+      ]
+    },
+    {
+      "ID": 1220,
+      "dropGroupID": [
+        1220
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1220
+      ]
+    },
+    {
+      "ID": 1221,
+      "dropGroupID": [
+        1221
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1221
+      ]
+    },
+    {
+      "ID": 1222,
+      "dropGroupID": [
+        1222
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1222
+      ]
+    },
+    {
+      "ID": 1223,
+      "dropGroupID": [
+        1223
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1223
+      ]
+    },
+    {
+      "ID": 1224,
+      "dropGroupID": [
+        1224
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1224
+      ]
+    },
+    {
+      "ID": 1225,
+      "dropGroupID": [
+        1225
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1225
+      ]
+    },
+    {
+      "ID": 1226,
+      "dropGroupID": [
+        1226
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1226
+      ]
+    },
     {
       "ID": 1301,
       "dropGroupID": [
@@ -260,6 +480,216 @@
         1309
       ]
     },
+    {
+      "ID": 1310,
+      "dropGroupID": [
+        1310
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1310
+      ]
+    },
+    {
+      "ID": 1311,
+      "dropGroupID": [
+        1311
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1311
+      ]
+    },
+    {
+      "ID": 1312,
+      "dropGroupID": [
+        1312
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1312
+      ]
+    },
+    {
+      "ID": 1313,
+      "dropGroupID": [
+        1313
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1313
+      ]
+    },
+    {
+      "ID": 1314,
+      "dropGroupID": [
+        1314
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1314
+      ]
+    },
+    {
+      "ID": 1315,
+      "dropGroupID": [
+        1315
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1315
+      ]
+    },
+    {
+      "ID": 1316,
+      "dropGroupID": [
+        1316
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1316
+      ]
+    },
+    {
+      "ID": 1317,
+      "dropGroupID": [
+        1317
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1317
+      ]
+    },
+    {
+      "ID": 1318,
+      "dropGroupID": [
+        1318
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1318
+      ]
+    },
+    {
+      "ID": 1319,
+      "dropGroupID": [
+        1319
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1319
+      ]
+    },
+    {
+      "ID": 1320,
+      "dropGroupID": [
+        1320
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1320
+      ]
+    },
+    {
+      "ID": 1321,
+      "dropGroupID": [
+        1321
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1321
+      ]
+    },
+    {
+      "ID": 1322,
+      "dropGroupID": [
+        1322
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1322
+      ]
+    },
+    {
+      "ID": 1323,
+      "dropGroupID": [
+        1323
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1323
+      ]
+    },
+    {
+      "ID": 1324,
+      "dropGroupID": [
+        1324
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1324
+      ]
+    },
+    {
+      "ID": 1325,
+      "dropGroupID": [
+        1325
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1325
+      ]
+    },
+    {
+      "ID": 1326,
+      "dropGroupID": [
+        1326
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1326
+      ]
+    },
+    {
+      "ID": 1327,
+      "dropGroupID": [
+        1327
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1327
+      ]
+    },
+    {
+      "ID": 1328,
+      "dropGroupID": [
+        1328
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1328
+      ]
+    },
+    {
+      "ID": 1329,
+      "dropGroupID": [
+        1329
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1329
+      ]
+    },
+    {
+      "ID": 1330,
+      "dropGroupID": [
+        1330
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1330
+      ]
+    },
     {
       "ID": 1401,
       "dropGroupID": [
@@ -1920,6 +2350,56 @@
         23200
       ]
     },
+    {
+      "ID": 23300,
+      "dropGroupID": [
+        23300
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23300
+      ]
+    },
+    {
+      "ID": 23301,
+      "dropGroupID": [
+        23301
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23301
+      ]
+    },
+    {
+      "ID": 23302,
+      "dropGroupID": [
+        23302
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23302
+      ]
+    },
+    {
+      "ID": 23303,
+      "dropGroupID": [
+        23303
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23303
+      ]
+    },
+    {
+      "ID": 23304,
+      "dropGroupID": [
+        23304
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23304
+      ]
+    },
     {
       "ID": 999001,
       "dropGroupID": [

Assets/Res/Config/DropItemConfig.json

@@ -21,8 +21,7 @@
         10002,
         10004,
         10007,
-        10009,
-        10011
+        10005
       ],
       "dropMinV": 1,
       "dropMaxV": 1,

Assets/Res/Config/EventConfig.json

@@ -203,13 +203,13 @@
       ],
       "PrizeIDs": [
         1003,
-        1201
+        23300
       ],
       "PrizeNums": [
         -5000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -482,13 +482,13 @@
       ],
       "PrizeIDs": [
         1003,
-        1201
+        23301
       ],
       "PrizeNums": [
         -7500,
-        2
+        1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -761,13 +761,13 @@
       ],
       "PrizeIDs": [
         1003,
-        1202
+        23302
       ],
       "PrizeNums": [
         -15000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1040,13 +1040,13 @@
       ],
       "PrizeIDs": [
         1003,
-        1203
+        23303
       ],
       "PrizeNums": [
         -30000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1319,13 +1319,13 @@
       ],
       "PrizeIDs": [
         1003,
-        1204
+        23304
       ],
       "PrizeNums": [
         -50000,
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 20,
       "RefreshCount": 0,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -1577,12 +1577,12 @@
       "PrizeIDs": [
         10001,
         1702,
-        1003
+        1301
       ],
       "PrizeNums": [
         1,
         1,
-        330
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1731,12 +1731,12 @@
       "PrizeIDs": [
         10003,
         1702,
-        1003
+        1302
       ],
       "PrizeNums": [
         1,
         1,
-        360
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1799,12 +1799,12 @@
       "PrizeIDs": [
         1301,
         1702,
-        1003
+        1303
       ],
       "PrizeNums": [
         1,
         1,
-        390
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -3238,7 +3238,7 @@
         3
       ],
       "EventName": 4275,
-      "Description": 0
+      "Description": 4394
     },
     {
       "ID": 30024,
@@ -3262,7 +3262,7 @@
         3
       ],
       "EventName": 4276,
-      "Description": 0
+      "Description": 4395
     },
     {
       "ID": 5004,

Assets/Res/Config/EventLinkConfig.json

@@ -125,7 +125,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5011
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -180,7 +180,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5001
+        5016
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -203,7 +203,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5021
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -304,7 +304,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5012
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -359,7 +359,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5002
+        5017
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -382,7 +382,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5007
+        5022
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -483,7 +483,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5013
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -538,7 +538,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5003
+        5018
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -561,7 +561,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5008
+        5023
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -662,7 +662,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5014
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -717,7 +717,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5004
+        5019
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -740,7 +740,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5009
+        5024
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -841,7 +841,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5006
+        5015
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -896,7 +896,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5005
+        5020
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -919,7 +919,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        5010
+        5025
       ],
       "ResultType": 2,
       "ResultOptions": [

Assets/Res/Config/GameConstantConfig.json

@@ -49,7 +49,8 @@
         2000.0,
         0.023148,
         0.023148
-      ]
+      ],
+      "daolvfavoratePara": 200
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -640,7 +640,7 @@
     {
       "ID": 5001,
       "GroupMonster": [
-        1005
+        1001
       ],
       "hpQiangDu": [
         70
@@ -655,7 +655,7 @@
     {
       "ID": 5002,
       "GroupMonster": [
-        1006
+        1001
       ],
       "hpQiangDu": [
         85
@@ -670,52 +670,68 @@
     {
       "ID": 5003,
       "GroupMonster": [
-        1007
+        1001,
+        1002
       ],
       "hpQiangDu": [
-        100
+        60,
+        60
       ],
       "attQiangDu": [
-        112
+        66,
+        66
       ],
       "duipingQiangDu": [
-        106
+        63,
+        63
       ]
     },
     {
       "ID": 5004,
       "GroupMonster": [
-        1008
+        1001,
+        1002
       ],
       "hpQiangDu": [
-        115
+        70,
+        70
       ],
       "attQiangDu": [
-        123
+        77,
+        77
       ],
       "duipingQiangDu": [
-        119
+        74,
+        74
       ]
     },
     {
       "ID": 5005,
       "GroupMonster": [
-        1001
+        1001,
+        1002,
+        1003
       ],
       "hpQiangDu": [
-        130
+        40,
+        40,
+        50
       ],
       "attQiangDu": [
-        134
+        44,
+        44,
+        55
       ],
       "duipingQiangDu": [
-        132
+        42,
+        42,
+        52
       ]
     },
     {
       "ID": 5006,
       "GroupMonster": [
-        1005
+        1002
       ],
       "hpQiangDu": [
         70
@@ -730,7 +746,7 @@
     {
       "ID": 5007,
       "GroupMonster": [
-        1006
+        1002
       ],
       "hpQiangDu": [
         85
@@ -745,46 +761,62 @@
     {
       "ID": 5008,
       "GroupMonster": [
-        1007
+        1002,
+        1003
       ],
       "hpQiangDu": [
-        100
+        60,
+        60
       ],
       "attQiangDu": [
-        112
+        66,
+        66
       ],
       "duipingQiangDu": [
-        106
+        63,
+        63
       ]
     },
     {
       "ID": 5009,
       "GroupMonster": [
-        1008
+        1002,
+        1003
       ],
       "hpQiangDu": [
-        115
+        70,
+        70
       ],
       "attQiangDu": [
-        123
+        77,
+        77
       ],
       "duipingQiangDu": [
-        119
+        74,
+        74
       ]
     },
     {
       "ID": 5010,
       "GroupMonster": [
+        1002,
+        1003,
         1001
       ],
       "hpQiangDu": [
-        130
+        40,
+        40,
+        50
       ],
       "attQiangDu": [
-        134
+        44,
+        44,
+        55
       ],
       "duipingQiangDu": [
-        132
+        42,
+        42,
+        52
       ]
     },
     {
@@ -1686,6 +1718,287 @@
       "GroupMonster": [
         9006
       ]
+    },
+    {
+      "ID": 5011,
+      "GroupMonster": [
+        1005
+      ],
+      "hpQiangDu": [
+        70
+      ],
+      "attQiangDu": [
+        90
+      ],
+      "duipingQiangDu": [
+        80
+      ]
+    },
+    {
+      "ID": 5012,
+      "GroupMonster": [
+        1005
+      ],
+      "hpQiangDu": [
+        85
+      ],
+      "attQiangDu": [
+        101
+      ],
+      "duipingQiangDu": [
+        93
+      ]
+    },
+    {
+      "ID": 5013,
+      "GroupMonster": [
+        1005,
+        1006
+      ],
+      "hpQiangDu": [
+        60,
+        60
+      ],
+      "attQiangDu": [
+        66,
+        66
+      ],
+      "duipingQiangDu": [
+        63,
+        63
+      ]
+    },
+    {
+      "ID": 5014,
+      "GroupMonster": [
+        1005,
+        1006
+      ],
+      "hpQiangDu": [
+        70,
+        70
+      ],
+      "attQiangDu": [
+        77,
+        77
+      ],
+      "duipingQiangDu": [
+        74,
+        74
+      ]
+    },
+    {
+      "ID": 5015,
+      "GroupMonster": [
+        1005,
+        1006,
+        1001
+      ],
+      "hpQiangDu": [
+        40,
+        40,
+        50
+      ],
+      "attQiangDu": [
+        44,
+        44,
+        55
+      ],
+      "duipingQiangDu": [
+        42,
+        42,
+        52
+      ]
+    },
+    {
+      "ID": 5016,
+      "GroupMonster": [
+        1007
+      ],
+      "hpQiangDu": [
+        70
+      ],
+      "attQiangDu": [
+        90
+      ],
+      "duipingQiangDu": [
+        80
+      ]
+    },
+    {
+      "ID": 5017,
+      "GroupMonster": [
+        1007
+      ],
+      "hpQiangDu": [
+        85
+      ],
+      "attQiangDu": [
+        101
+      ],
+      "duipingQiangDu": [
+        93
+      ]
+    },
+    {
+      "ID": 5018,
+      "GroupMonster": [
+        1007,
+        1008
+      ],
+      "hpQiangDu": [
+        60,
+        60
+      ],
+      "attQiangDu": [
+        66,
+        66
+      ],
+      "duipingQiangDu": [
+        63,
+        63
+      ]
+    },
+    {
+      "ID": 5019,
+      "GroupMonster": [
+        1007,
+        1008
+      ],
+      "hpQiangDu": [
+        70,
+        70
+      ],
+      "attQiangDu": [
+        77,
+        77
+      ],
+      "duipingQiangDu": [
+        74,
+        74
+      ]
+    },
+    {
+      "ID": 5020,
+      "GroupMonster": [
+        1007,
+        1008,
+        1003
+      ],
+      "hpQiangDu": [
+        40,
+        40,
+        50
+      ],
+      "attQiangDu": [
+        44,
+        44,
+        55
+      ],
+      "duipingQiangDu": [
+        42,
+        42,
+        52
+      ]
+    },
+    {
+      "ID": 5021,
+      "GroupMonster": [
+        9001
+      ],
+      "hpQiangDu": [
+        70
+      ],
+      "attQiangDu": [
+        90
+      ],
+      "duipingQiangDu": [
+        80
+      ]
+    },
+    {
+      "ID": 5022,
+      "GroupMonster": [
+        9002,
+        5006
+      ],
+      "hpQiangDu": [
+        80,
+        40
+      ],
+      "attQiangDu": [
+        72,
+        36
+      ],
+      "duipingQiangDu": [
+        66,
+        33
+      ]
+    },
+    {
+      "ID": 5023,
+      "GroupMonster": [
+        9003,
+        5007
+      ],
+      "hpQiangDu": [
+        88,
+        44
+      ],
+      "attQiangDu": [
+        80,
+        40
+      ],
+      "duipingQiangDu": [
+        73,
+        36
+      ]
+    },
+    {
+      "ID": 5024,
+      "GroupMonster": [
+        9004,
+        5006,
+        5007
+      ],
+      "hpQiangDu": [
+        60,
+        40,
+        40
+      ],
+      "attQiangDu": [
+        66,
+        44,
+        44
+      ],
+      "duipingQiangDu": [
+        63,
+        42,
+        42
+      ]
+    },
+    {
+      "ID": 5025,
+      "GroupMonster": [
+        9006,
+        5006,
+        5007
+      ],
+      "hpQiangDu": [
+        66,
+        44,
+        44
+      ],
+      "attQiangDu": [
+        73,
+        48,
+        48
+      ],
+      "duipingQiangDu": [
+        70,
+        46,
+        46
+      ]
     }
   ]
 }

Assets/Res/Config/ItemConfig.json

@@ -1114,7 +1114,7 @@
         270,
         300,
         18,
-        20
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1148,7 +1148,7 @@
         270,
         300,
         18,
-        20
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1182,7 +1182,7 @@
         270,
         300,
         18,
-        20
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1216,7 +1216,7 @@
         270,
         300,
         18,
-        20
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1250,7 +1250,7 @@
         270,
         300,
         19,
-        20
+        15
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1284,7 +1284,7 @@
         10,
         11,
         100,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1318,7 +1318,7 @@
         20,
         21,
         100,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1352,7 +1352,7 @@
         30,
         31,
         85,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1367,7 +1367,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1386,7 +1386,7 @@
         40,
         41,
         70,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1401,7 +1401,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1420,7 +1420,7 @@
         50,
         51,
         70,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1435,7 +1435,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1454,7 +1454,7 @@
         60,
         61,
         70,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1469,7 +1469,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1488,7 +1488,7 @@
         70,
         71,
         60,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1503,7 +1503,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1522,7 +1522,7 @@
         80,
         81,
         60,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1537,7 +1537,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1556,7 +1556,7 @@
         90,
         91,
         60,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1571,7 +1571,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1590,7 +1590,7 @@
         100,
         101,
         50,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1605,7 +1605,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1624,7 +1624,7 @@
         110,
         111,
         50,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1639,7 +1639,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1658,7 +1658,7 @@
         120,
         121,
         50,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1673,7 +1673,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1692,7 +1692,7 @@
         130,
         131,
         40,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1707,7 +1707,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1726,7 +1726,7 @@
         140,
         141,
         40,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1741,7 +1741,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1760,7 +1760,7 @@
         150,
         151,
         40,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1775,7 +1775,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1794,7 +1794,7 @@
         160,
         161,
         25,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1809,7 +1809,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1828,7 +1828,7 @@
         170,
         171,
         25,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1843,7 +1843,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1862,7 +1862,7 @@
         180,
         181,
         25,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1877,7 +1877,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1896,7 +1896,7 @@
         190,
         191,
         10,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1911,7 +1911,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1930,7 +1930,7 @@
         200,
         201,
         10,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1945,7 +1945,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1964,7 +1964,7 @@
         210,
         211,
         10,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1979,7 +1979,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1998,7 +1998,7 @@
         220,
         221,
         10,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2013,7 +2013,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2032,7 +2032,7 @@
         230,
         231,
         10,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2047,7 +2047,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2066,7 +2066,7 @@
         240,
         241,
         10,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2081,7 +2081,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2100,7 +2100,7 @@
         250,
         251,
         10,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2115,7 +2115,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2134,7 +2134,7 @@
         260,
         261,
         10,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2149,7 +2149,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2168,7 +2168,7 @@
         270,
         271,
         10,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2183,7 +2183,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2202,7 +2202,7 @@
         280,
         281,
         5,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2217,7 +2217,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2236,7 +2236,7 @@
         290,
         291,
         5,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2251,7 +2251,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2270,7 +2270,7 @@
         299,
         300,
         5,
-        0
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -2507,7 +2507,8 @@
       "isSell": false,
       "SkiptoID": [
         8,
-        7
+        7,
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2538,7 +2539,8 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        8,
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2570,7 +2572,8 @@
       "isSell": false,
       "SkiptoID": [
         8,
-        9
+        9,
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2971,7 +2974,7 @@
       "itemDesc": 308,
       "icon": "icon_s3101",
       "itemTag": 12,
-      "quality": 3,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -3002,7 +3005,7 @@
       "itemDesc": 309,
       "icon": "icon_s3102",
       "itemTag": 12,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -3033,7 +3036,7 @@
       "itemDesc": 310,
       "icon": "icon_s3201",
       "itemTag": 12,
-      "quality": 3,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -3064,7 +3067,7 @@
       "itemDesc": 311,
       "icon": "icon_s3202",
       "itemTag": 12,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -3126,7 +3129,7 @@
       "itemDesc": 313,
       "icon": "icon_s3301",
       "itemTag": 12,
-      "quality": 3,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -3157,7 +3160,7 @@
       "itemDesc": 314,
       "icon": "icon_s3302",
       "itemTag": 12,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -3188,7 +3191,7 @@
       "itemDesc": 315,
       "icon": "icon_s3401",
       "itemTag": 12,
-      "quality": 3,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -3217,9 +3220,9 @@
       "ID": 11009,
       "itemName": 1408,
       "itemDesc": 1411,
-      "icon": "icon_s3402",
+      "icon": "",
       "itemTag": 12,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -3250,7 +3253,7 @@
       "itemDesc": 1412,
       "icon": "icon_s3501",
       "itemTag": 12,
-      "quality": 3,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -3279,9 +3282,9 @@
       "ID": 11011,
       "itemName": 1410,
       "itemDesc": 1413,
-      "icon": "icon_s3502",
+      "icon": "",
       "itemTag": 12,
-      "quality": 4,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -7478,6 +7481,146 @@
       "associateID": 0,
       "sort": 0,
       "itemDesc2": 0
+    },
+    {
+      "ID": 23300,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 27,
+      "quality": 2,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 14,
+      "associateVlaue": [
+        7
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 23301,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 27,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 14,
+      "associateVlaue": [
+        8
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 23302,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 27,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 14,
+      "associateVlaue": [
+        9
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 23303,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 27,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 14,
+      "associateVlaue": [
+        10
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 23304,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 27,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 14,
+      "associateVlaue": [
+        11
+      ],
+      "sort": 0,
+      "itemDesc2": 0
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -7834,19 +7834,19 @@
     },
     {
       "ID": 1959,
-      "txt": "道友7"
+      "txt": "馨儿"
     },
     {
       "ID": 1960,
-      "txt": "道友8"
+      "txt": "柳轻烟"
     },
     {
       "ID": 1961,
-      "txt": "道友9"
+      "txt": "楚云缪"
     },
     {
       "ID": 1962,
-      "txt": "道友10"
+      "txt": "林风"
     },
     {
       "ID": 1963,
@@ -13066,7 +13066,7 @@
     },
     {
       "ID": 4007,
-      "txt": "[资源]渡劫丹"
+      "txt": "[资源]天材地宝"
     },
     {
       "ID": 4008,
@@ -13102,7 +13102,7 @@
     },
     {
       "ID": 4016,
-      "txt": "[资源]渡劫丹"
+      "txt": "[资源]天材地宝"
     },
     {
       "ID": 4017,
@@ -13342,27 +13342,27 @@
     },
     {
       "ID": 4076,
-      "txt": ""
+      "txt": "伏魔证道之遗宝"
     },
     {
       "ID": 4077,
-      "txt": ""
+      "txt": "斩孽顿悟之残章"
     },
     {
       "ID": 4078,
-      "txt": ""
+      "txt": "天地蕴生之灵石"
     },
     {
       "ID": 4079,
-      "txt": ""
+      "txt": "灵墟残脉之精气"
     },
     {
       "ID": 4080,
-      "txt": ""
+      "txt": "九玄凝淬之异矿"
     },
     {
       "ID": 4081,
-      "txt": ""
+      "txt": "大妖陨落之元丹"
     },
     {
       "ID": 4082,
@@ -13370,35 +13370,35 @@
     },
     {
       "ID": 4083,
-      "txt": ""
+      "txt": "云端仙草之甘露"
     },
     {
       "ID": 4084,
-      "txt": ""
+      "txt": "岭南千年之仙果"
     },
     {
       "ID": 4085,
-      "txt": ""
+      "txt": "伏魔证道之遗宝"
     },
     {
       "ID": 4086,
-      "txt": ""
+      "txt": "斩孽顿悟之残章"
     },
     {
       "ID": 4087,
-      "txt": ""
+      "txt": "天地蕴生之灵石"
     },
     {
       "ID": 4088,
-      "txt": ""
+      "txt": "灵墟残脉之精气"
     },
     {
       "ID": 4089,
-      "txt": ""
+      "txt": "九玄凝淬之异矿"
     },
     {
       "ID": 4090,
-      "txt": ""
+      "txt": "大妖陨落之元丹"
     },
     {
       "ID": 4091,
@@ -13406,35 +13406,35 @@
     },
     {
       "ID": 4092,
-      "txt": ""
+      "txt": "云端仙草之甘露"
     },
     {
       "ID": 4093,
-      "txt": ""
+      "txt": "岭南千年之仙果"
     },
     {
       "ID": 4094,
-      "txt": ""
+      "txt": "伏魔证道之遗宝"
     },
     {
       "ID": 4095,
-      "txt": ""
+      "txt": "斩孽顿悟之残章"
     },
     {
       "ID": 4096,
-      "txt": ""
+      "txt": "天地蕴生之灵石"
     },
     {
       "ID": 4097,
-      "txt": ""
+      "txt": "灵墟残脉之精气"
     },
     {
       "ID": 4098,
-      "txt": ""
+      "txt": "九玄凝淬之异矿"
     },
     {
       "ID": 4099,
-      "txt": ""
+      "txt": "大妖陨落之元丹"
     },
     {
       "ID": 4100,
@@ -13442,11 +13442,11 @@
     },
     {
       "ID": 4101,
-      "txt": ""
+      "txt": "云端仙草之甘露"
     },
     {
       "ID": 4102,
-      "txt": ""
+      "txt": "岭南千年之仙果"
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "问道尧都"
     },
     {
       "ID": 4115,
@@ -13550,7 +13550,7 @@
     },
     {
       "ID": 4128,
-      "txt": "登山"
+      "txt": "登山寻神"
     },
     {
       "ID": 4129,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "饮用甘露"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "心镜问道"
     },
     {
       "ID": 4132,
@@ -13750,7 +13750,7 @@
     },
     {
       "ID": 4178,
-      "txt": "云枝-击败风妖"
+      "txt": "击败风妖"
     },
     {
       "ID": 4179,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "御风证道"
     },
     {
       "ID": 4193,
@@ -13814,7 +13814,7 @@
     },
     {
       "ID": 4194,
-      "txt": "风瑶-2. 风灵碎片.岛间搜寻"
+      "txt": "获取风灵碎片"
     },
     {
       "ID": 4195,
@@ -13822,7 +13822,7 @@
     },
     {
       "ID": 4196,
-      "txt": "风瑶-3. 风中疑云.探听消息"
+      "txt": "获取信息"
     },
     {
       "ID": 4197,
@@ -13830,7 +13830,7 @@
     },
     {
       "ID": 4198,
-      "txt": "风瑶-4. 隐秘信物.追踪残片"
+      "txt": "获取浮岛灵石"
     },
     {
       "ID": 4199,
@@ -13838,7 +13838,7 @@
     },
     {
       "ID": 4200,
-      "txt": "风瑶-5. 风中密信.截获情报"
+      "txt": "截获情报"
     },
     {
       "ID": 4201,
@@ -13894,7 +13894,7 @@
     },
     {
       "ID": 4214,
-      "txt": "婉溪-4. 玉佩稳灵.收集信物"
+      "txt": "击败小妖获取信物"
     },
     {
       "ID": 4215,
@@ -13950,7 +13950,7 @@
     },
     {
       "ID": 4228,
-      "txt": "许由-2. 山野采草.炼丹初助"
+      "txt": "获取炼丹的灵草"
     },
     {
       "ID": 4229,
@@ -13958,7 +13958,7 @@
     },
     {
       "ID": 4230,
-      "txt": "许由-4. 玉佩镇丹.稳气寻材"
+      "txt": "获取秘境种子"
     },
     {
       "ID": 4231,
@@ -14010,7 +14010,7 @@
     },
     {
       "ID": 4243,
-      "txt": "疯道人-2. 途中解乏"
+      "txt": "采集疯道人想要的果实"
     },
     {
       "ID": 4244,
@@ -14254,7 +14254,7 @@
     },
     {
       "ID": 4304,
-      "txt": "[资源]良品渡劫丹"
+      "txt": "[资源]天材地宝"
     },
     {
       "ID": 4305,
@@ -14290,7 +14290,7 @@
     },
     {
       "ID": 4313,
-      "txt": "[资源]上品渡劫丹"
+      "txt": "[资源]天材地宝"
     },
     {
       "ID": 4314,
@@ -14326,7 +14326,7 @@
     },
     {
       "ID": 4322,
-      "txt": "[资源]极品渡劫丹"
+      "txt": "[资源]天材地宝"
     },
     {
       "ID": 4323,
@@ -14606,7 +14606,7 @@
     },
     {
       "ID": 4392,
-      "txt": "采集灵草种子"
+      "txt": "获取灵草"
     },
     {
       "ID": 4393,
@@ -14614,11 +14614,11 @@
     },
     {
       "ID": 4394,
-      "txt": ""
+      "txt": "消灭妖邪"
     },
     {
       "ID": 4395,
-      "txt": ""
+      "txt": "清剿妖兽"
     },
     {
       "ID": 4396,
@@ -17062,7 +17062,7 @@
     },
     {
       "ID": 5006,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他炫耀着抢来的法宝，正向你扑来，应战！"
     },
     {
       "ID": 5007,
@@ -17070,7 +17070,7 @@
     },
     {
       "ID": 5008,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他嘴里念叨着才学会的功法秘诀，正向你扑来，应战！"
     },
     {
       "ID": 5009,
@@ -17078,7 +17078,7 @@
     },
     {
       "ID": 5010,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他口袋里的灵石正叮当作响，看来你要发财了，应战！"
     },
     {
       "ID": 5011,
@@ -17086,7 +17086,7 @@
     },
     {
       "ID": 5012,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "此处仙气缭绕，你用神识一探，果然探得丰富的功法灵气！"
     },
     {
       "ID": 5013,
@@ -17094,7 +17094,7 @@
     },
     {
       "ID": 5014,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "此处仙气缭绕，你用神识一探，果然探得丰富的法宝玄晶！"
     },
     {
       "ID": 5015,
@@ -17102,7 +17102,7 @@
     },
     {
       "ID": 5016,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你遭遇一只妖邪，他挥舞着不知从哪来的妖丹，示意要打劫，应战！"
     },
     {
       "ID": 5017,
@@ -17110,7 +17110,7 @@
     },
     {
       "ID": 5018,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只实力不俗的妖邪，正在炼制渡劫所需要的天材地宝，这等好事都让你遇上了！"
     },
     {
       "ID": 5019,
@@ -17118,7 +17118,7 @@
     },
     {
       "ID": 5020,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你来到一片清香之地，漫山的茶叶散发着清香，你摘走了一些。"
     },
     {
       "ID": 5021,
@@ -17126,7 +17126,7 @@
     },
     {
       "ID": 5022,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你偶然闯入一片隐秘的果林，突然发现这果实，不正好是可以让所有道友都开心的好东西么！"
     },
     {
       "ID": 5023,
@@ -17134,7 +17134,7 @@
     },
     {
       "ID": 5024,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他炫耀着抢来的法宝，正向你扑来，应战！"
     },
     {
       "ID": 5025,
@@ -17142,7 +17142,7 @@
     },
     {
       "ID": 5026,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他嘴里念叨着才学会的功法秘诀，正向你扑来，应战！"
     },
     {
       "ID": 5027,
@@ -17150,7 +17150,7 @@
     },
     {
       "ID": 5028,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他口袋里的灵石正叮当作响，看来你要发财了，应战！"
     },
     {
       "ID": 5029,
@@ -17158,7 +17158,7 @@
     },
     {
       "ID": 5030,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "此处仙气缭绕，你用神识一探，果然探得丰富的功法灵气！"
     },
     {
       "ID": 5031,
@@ -17166,7 +17166,7 @@
     },
     {
       "ID": 5032,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "此处仙气缭绕，你用神识一探，果然探得丰富的法宝玄晶！"
     },
     {
       "ID": 5033,
@@ -17174,7 +17174,7 @@
     },
     {
       "ID": 5034,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你遭遇一只妖邪，他挥舞着不知从哪来的妖丹，示意要打劫，应战！"
     },
     {
       "ID": 5035,
@@ -17182,7 +17182,7 @@
     },
     {
       "ID": 5036,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只实力不俗的妖邪，正在炼制渡劫所需要的天材地宝，这等好事都让你遇上了！"
     },
     {
       "ID": 5037,
@@ -17190,7 +17190,7 @@
     },
     {
       "ID": 5038,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你来到一片清香之地，漫山的茶叶散发着清香，你摘走了一些。"
     },
     {
       "ID": 5039,
@@ -17198,7 +17198,7 @@
     },
     {
       "ID": 5040,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你偶然闯入一片隐秘的果林，突然发现这果实，不正好是可以让所有道友都开心的好东西么！"
     },
     {
       "ID": 5041,
@@ -17206,7 +17206,7 @@
     },
     {
       "ID": 5042,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他炫耀着抢来的法宝，正向你扑来，应战！"
     },
     {
       "ID": 5043,
@@ -17214,7 +17214,7 @@
     },
     {
       "ID": 5044,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他嘴里念叨着才学会的功法秘诀，正向你扑来，应战！"
     },
     {
       "ID": 5045,
@@ -17222,7 +17222,7 @@
     },
     {
       "ID": 5046,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他口袋里的灵石正叮当作响，看来你要发财了，应战！"
     },
     {
       "ID": 5047,
@@ -17230,7 +17230,7 @@
     },
     {
       "ID": 5048,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "此处仙气缭绕，你用神识一探，果然探得丰富的功法灵气！"
     },
     {
       "ID": 5049,
@@ -17238,7 +17238,7 @@
     },
     {
       "ID": 5050,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "此处仙气缭绕，你用神识一探，果然探得丰富的法宝玄晶！"
     },
     {
       "ID": 5051,
@@ -17246,7 +17246,7 @@
     },
     {
       "ID": 5052,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你遭遇一只妖邪，他挥舞着不知从哪来的妖丹，示意要打劫，应战！"
     },
     {
       "ID": 5053,
@@ -17254,7 +17254,7 @@
     },
     {
       "ID": 5054,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只实力不俗的妖邪，正在炼制渡劫所需要的天材地宝，这等好事都让你遇上了！"
     },
     {
       "ID": 5055,
@@ -17262,7 +17262,7 @@
     },
     {
       "ID": 5056,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你来到一片清香之地，漫山的茶叶散发着清香，你摘走了一些。"
     },
     {
       "ID": 5057,
@@ -17270,7 +17270,7 @@
     },
     {
       "ID": 5058,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你偶然闯入一片隐秘的果林，突然发现这果实，不正好是可以让所有道友都开心的好东西么！"
     },
     {
       "ID": 5059,
@@ -17278,7 +17278,7 @@
     },
     {
       "ID": 5060,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他炫耀着抢来的法宝，正向你扑来，应战！"
     },
     {
       "ID": 5061,
@@ -17286,7 +17286,7 @@
     },
     {
       "ID": 5062,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他嘴里念叨着才学会的功法秘诀，正向你扑来，应战！"
     },
     {
       "ID": 5063,
@@ -17294,7 +17294,7 @@
     },
     {
       "ID": 5064,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他口袋里的灵石正叮当作响，看来你要发财了，应战！"
     },
     {
       "ID": 5065,
@@ -17302,7 +17302,7 @@
     },
     {
       "ID": 5066,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "此处仙气缭绕，你用神识一探，果然探得丰富的功法灵气！"
     },
     {
       "ID": 5067,
@@ -17310,7 +17310,7 @@
     },
     {
       "ID": 5068,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "此处仙气缭绕，你用神识一探，果然探得丰富的法宝玄晶！"
     },
     {
       "ID": 5069,
@@ -17318,7 +17318,7 @@
     },
     {
       "ID": 5070,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你遭遇一只妖邪，他挥舞着不知从哪来的妖丹，示意要打劫，应战！"
     },
     {
       "ID": 5071,
@@ -17326,7 +17326,7 @@
     },
     {
       "ID": 5072,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只实力不俗的妖邪，正在炼制渡劫所需要的天材地宝，这等好事都让你遇上了！"
     },
     {
       "ID": 5073,
@@ -17334,7 +17334,7 @@
     },
     {
       "ID": 5074,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你来到一片清香之地，漫山的茶叶散发着清香，你摘走了一些。"
     },
     {
       "ID": 5075,
@@ -17342,7 +17342,7 @@
     },
     {
       "ID": 5076,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你偶然闯入一片隐秘的果林，突然发现这果实，不正好是可以让所有道友都开心的好东西么！"
     },
     {
       "ID": 5077,
@@ -17350,7 +17350,7 @@
     },
     {
       "ID": 5078,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他炫耀着抢来的法宝，正向你扑来，应战！"
     },
     {
       "ID": 5079,
@@ -17358,7 +17358,7 @@
     },
     {
       "ID": 5080,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他嘴里念叨着才学会的功法秘诀，正向你扑来，应战！"
     },
     {
       "ID": 5081,
@@ -17366,7 +17366,7 @@
     },
     {
       "ID": 5082,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只落单的妖邪，他口袋里的灵石正叮当作响，看来你要发财了，应战！"
     },
     {
       "ID": 5083,
@@ -17374,7 +17374,7 @@
     },
     {
       "ID": 5084,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "此处仙气缭绕，你用神识一探，果然探得丰富的功法灵气！"
     },
     {
       "ID": 5085,
@@ -17382,7 +17382,7 @@
     },
     {
       "ID": 5086,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "此处仙气缭绕，你用神识一探，果然探得丰富的法宝玄晶！"
     },
     {
       "ID": 5087,
@@ -17390,7 +17390,7 @@
     },
     {
       "ID": 5088,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你遭遇一只妖邪，他挥舞着不知从哪来的妖丹，示意要打劫，应战！"
     },
     {
       "ID": 5089,
@@ -17398,7 +17398,7 @@
     },
     {
       "ID": 5090,
-      "txt": "你发现一只落单的妖邪，应战！"
+      "txt": "你发现一只实力不俗的妖邪，正在炼制渡劫所需要的天材地宝，这等好事都让你遇上了！"
     },
     {
       "ID": 5091,
@@ -17406,7 +17406,7 @@
     },
     {
       "ID": 5092,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你来到一片清香之地，漫山的茶叶散发着清香，你摘走了一些。"
     },
     {
       "ID": 5093,
@@ -17414,7 +17414,7 @@
     },
     {
       "ID": 5094,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你偶然闯入一片隐秘的果林，突然发现这果实，不正好是可以让所有道友都开心的好东西么！"
     },
     {
       "ID": 5095,
@@ -39823,6 +39823,66 @@
     {
       "ID": 10696,
       "txt": "突破飞升后期达到真仙境界所必需的天材地宝。"
+    },
+    {
+      "ID": 10697,
+      "txt": "需要好感度达到{0}级，并完成她的所有支线神识任务，才能与之结为道侣。"
+    },
+    {
+      "ID": 10698,
+      "txt": "突破时提升{2}%概率，如果失败会损失当前{3}%修为。"
+    },
+    {
+      "ID": 10699,
+      "txt": "使用后获得{0}点修为值。"
+    },
+    {
+      "ID": 10700,
+      "txt": "占位"
+    },
+    {
+      "ID": 10701,
+      "txt": "占位"
+    },
+    {
+      "ID": 10702,
+      "txt": "占位"
+    },
+    {
+      "ID": 10703,
+      "txt": "占位"
+    },
+    {
+      "ID": 10704,
+      "txt": "占位"
+    },
+    {
+      "ID": 10705,
+      "txt": "使用后立即恢复{0}点神识点数。"
+    },
+    {
+      "ID": 10706,
+      "txt": "占位"
+    },
+    {
+      "ID": 10707,
+      "txt": "占位"
+    },
+    {
+      "ID": 10708,
+      "txt": "占位"
+    },
+    {
+      "ID": 10709,
+      "txt": "占位"
+    },
+    {
+      "ID": 10710,
+      "txt": "占位"
+    },
+    {
+      "ID": 10711,
+      "txt": "占位"
     }
   ]
 }

Assets/Res/Config/LevelbattleConfig.json

@@ -717,7 +717,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1401
       ],
       "awardNum": [
         4200,
@@ -735,7 +735,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1701
       ],
       "awardNum": [
         4200,
@@ -771,7 +771,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1304
       ],
       "awardNum": [
         4500,
@@ -789,7 +789,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1401
       ],
       "awardNum": [
         4500,
@@ -807,7 +807,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1701
       ],
       "awardNum": [
         4500,
@@ -825,7 +825,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        21012
       ],
       "awardNum": [
         4800,
@@ -843,7 +843,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1305
       ],
       "awardNum": [
         4800,
@@ -861,7 +861,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1402
       ],
       "awardNum": [
         5100,
@@ -879,7 +879,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1702
       ],
       "awardNum": [
         5100,
@@ -897,7 +897,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         5100,
@@ -915,7 +915,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1306
       ],
       "awardNum": [
         5400,
@@ -987,7 +987,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1307
       ],
       "awardNum": [
         6000,
@@ -1005,7 +1005,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1402
       ],
       "awardNum": [
         6000,
@@ -1023,7 +1023,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         6300,
@@ -1041,7 +1041,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        21012
       ],
       "awardNum": [
         6300,
@@ -1059,7 +1059,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1308
       ],
       "awardNum": [
         6600,
@@ -1077,7 +1077,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1402
       ],
       "awardNum": [
         6600,
@@ -1095,7 +1095,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1702
       ],
       "awardNum": [
         6900,
@@ -1113,7 +1113,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         6900,
@@ -1131,7 +1131,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1309
       ],
       "awardNum": [
         7200,
@@ -1203,7 +1203,7 @@
       ],
       "awardDrop": [
         1001,
-        1402
+        1310
       ],
       "awardNum": [
         8100,
@@ -1221,7 +1221,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1402
       ],
       "awardNum": [
         8100,
@@ -1239,7 +1239,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         8400,
@@ -1257,7 +1257,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        21012
       ],
       "awardNum": [
         8700,
@@ -1275,7 +1275,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1311
       ],
       "awardNum": [
         9000,
@@ -1293,7 +1293,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1403
       ],
       "awardNum": [
         9000,
@@ -1311,7 +1311,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        1702
       ],
       "awardNum": [
         9300,
@@ -1329,7 +1329,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         9600,
@@ -1347,7 +1347,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1312
       ],
       "awardNum": [
         9900,
@@ -1419,7 +1419,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        1313
       ],
       "awardNum": [
         10800,
@@ -1437,7 +1437,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1403
       ],
       "awardNum": [
         11100,
@@ -1455,7 +1455,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         11400,
@@ -1473,7 +1473,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        21012
       ],
       "awardNum": [
         11700,
@@ -1491,7 +1491,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1314
       ],
       "awardNum": [
         12000,
@@ -1509,7 +1509,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1403
       ],
       "awardNum": [
         12300,
@@ -1527,7 +1527,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        1702
       ],
       "awardNum": [
         12300,
@@ -1545,7 +1545,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         12900,
@@ -1563,7 +1563,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1315
       ],
       "awardNum": [
         13200,
@@ -1635,7 +1635,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        1316
       ],
       "awardNum": [
         14700,
@@ -1653,7 +1653,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1403
       ],
       "awardNum": [
         15000,
@@ -1671,7 +1671,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         15300,
@@ -1689,7 +1689,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        21012
       ],
       "awardNum": [
         15600,
@@ -1707,7 +1707,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1317
       ],
       "awardNum": [
         16200,
@@ -1725,7 +1725,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1403
       ],
       "awardNum": [
         16500,
@@ -1743,7 +1743,7 @@
       ],
       "awardDrop": [
         1001,
-        1403
+        1702
       ],
       "awardNum": [
         16800,
@@ -1761,7 +1761,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         17400,
@@ -1779,7 +1779,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1318
       ],
       "awardNum": [
         18000,
@@ -1797,7 +1797,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1403
       ],
       "awardNum": [
         18300,
@@ -1851,7 +1851,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1319
       ],
       "awardNum": [
         19800,
@@ -1869,7 +1869,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1403
       ],
       "awardNum": [
         20100,
@@ -1887,7 +1887,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         20400,
@@ -1905,7 +1905,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        21012
       ],
       "awardNum": [
         21300,
@@ -1923,7 +1923,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1320
       ],
       "awardNum": [
         21900,
@@ -1941,7 +1941,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1404
       ],
       "awardNum": [
         22200,
@@ -1959,7 +1959,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1702
       ],
       "awardNum": [
         22800,
@@ -1977,7 +1977,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         23400,
@@ -1995,7 +1995,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1321
       ],
       "awardNum": [
         24000,
@@ -2067,7 +2067,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1322
       ],
       "awardNum": [
         26700,
@@ -2085,7 +2085,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1404
       ],
       "awardNum": [
         27300,
@@ -2103,7 +2103,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         27600,
@@ -2121,7 +2121,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        21012
       ],
       "awardNum": [
         28500,
@@ -2139,7 +2139,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1323
       ],
       "awardNum": [
         29400,
@@ -2157,7 +2157,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1404
       ],
       "awardNum": [
         30000,
@@ -2175,7 +2175,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1702
       ],
       "awardNum": [
         30600,
@@ -2193,7 +2193,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        21012
       ],
       "awardNum": [
         31500,
@@ -2211,7 +2211,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1324
       ],
       "awardNum": [
         32700,
@@ -2283,7 +2283,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1325
       ],
       "awardNum": [
         36000,
@@ -2301,7 +2301,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1404
       ],
       "awardNum": [
         36600,
@@ -2319,7 +2319,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1702
       ],
       "awardNum": [
         37500,
@@ -2337,7 +2337,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        21012
       ],
       "awardNum": [
         38700,
@@ -2355,7 +2355,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1326
       ],
       "awardNum": [
         40200,
@@ -2373,7 +2373,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1703
       ],
       "awardNum": [
         42300,
@@ -2391,7 +2391,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1327
       ],
       "awardNum": [
         44400,
@@ -2409,7 +2409,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1703
       ],
       "awardNum": [
         46800,
@@ -2427,7 +2427,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1328
       ],
       "awardNum": [
         49200,
@@ -2445,7 +2445,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1703
       ],
       "awardNum": [
         51600,
@@ -2463,7 +2463,7 @@
       ],
       "awardDrop": [
         1001,
-        1702
+        1329
       ],
       "awardNum": [
         54300,
@@ -2481,7 +2481,7 @@
       ],
       "awardDrop": [
         1001,
-        21012
+        1703
       ],
       "awardNum": [
         57000,
@@ -2499,7 +2499,7 @@
       ],
       "awardDrop": [
         1001,
-        1404
+        1330
       ],
       "awardNum": [
         60000,
@@ -2509,6 +2509,156 @@
       "combatType": 1,
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5011,
+      "Group": [
+        5011
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5012,
+      "Group": [
+        5012
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5013,
+      "Group": [
+        5013
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5014,
+      "Group": [
+        5014
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5015,
+      "Group": [
+        5015
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5016,
+      "Group": [
+        5016
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5017,
+      "Group": [
+        5017
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5018,
+      "Group": [
+        5018
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5019,
+      "Group": [
+        5019
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5020,
+      "Group": [
+        5020
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5021,
+      "Group": [
+        5021
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5022,
+      "Group": [
+        5022
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5023,
+      "Group": [
+        5023
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5024,
+      "Group": [
+        5024
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 5025,
+      "Group": [
+        5025
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     }
   ]
 }

Assets/Res/Config/ShopItemConfig.json

@@ -2096,52 +2096,6 @@
     {
       "ID": 801,
       "giftID": "",
-      "itemId": [
-        1201
-      ],
-      "itemCount": [
-        1
-      ],
-      "costItemId": 1004,
-      "price": 6,
-      "oldPrice": 1,
-      "buyCount": 4,
-      "maxBuyCount": -1,
-      "shopItemGroup": 8,
-      "continueTime": -1,
-      "shopName": 0,
-      "shopDesc": 0,
-      "shopShowTemplate": 3,
-      "shopShowTemplateParm": [
-        "icon_Gem_Star_Blue"
-      ]
-    },
-    {
-      "ID": 802,
-      "giftID": "",
-      "itemId": [
-        1202
-      ],
-      "itemCount": [
-        1
-      ],
-      "costItemId": 1004,
-      "price": 30,
-      "oldPrice": 1,
-      "buyCount": 2,
-      "maxBuyCount": -1,
-      "shopItemGroup": 8,
-      "continueTime": -1,
-      "shopName": 0,
-      "shopDesc": 0,
-      "shopShowTemplate": 3,
-      "shopShowTemplateParm": [
-        "icon_Gem_Star_Blue"
-      ]
-    },
-    {
-      "ID": 803,
-      "giftID": "",
       "itemId": [
         1701
       ],
@@ -2163,7 +2117,7 @@
       ]
     },
     {
-      "ID": 804,
+      "ID": 802,
       "giftID": "",
       "itemId": [
         12004
@@ -2186,7 +2140,7 @@
       ]
     },
     {
-      "ID": 805,
+      "ID": 803,
       "giftID": "",
       "itemId": [
         12510
@@ -2209,7 +2163,7 @@
       ]
     },
     {
-      "ID": 806,
+      "ID": 804,
       "giftID": "",
       "itemId": [
         10010

Assets/Res/Config/SkillConfig.json

@@ -433,7 +433,7 @@
         3.0,
         56.0,
         100.0,
-        30.0
+        15.0
       ],
       "intensifierIndex": [
         2
@@ -460,7 +460,7 @@
         3.0,
         64.0,
         100.0,
-        40.0
+        20.0
       ],
       "intensifierIndex": [
         2
@@ -496,7 +496,7 @@
         3.0,
         73.0,
         100.0,
-        50.0
+        25.0
       ],
       "intensifierIndex": [
         2
@@ -532,7 +532,7 @@
         3.0,
         84.0,
         100.0,
-        60.0
+        30.0
       ],
       "intensifierIndex": [
         2
@@ -568,7 +568,7 @@
         3.0,
         77.0,
         100.0,
-        70.0,
+        35.0,
         20.0
       ],
       "intensifierIndex": [
@@ -5976,7 +5976,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         30.0,
@@ -6005,7 +6005,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         40.0,
@@ -6043,7 +6043,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         50.0,
@@ -6081,7 +6081,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         60.0,
@@ -6119,7 +6119,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         70.0,
@@ -6157,7 +6157,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         100.0,
@@ -6193,7 +6193,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         50.0,
         0.0
@@ -6218,7 +6218,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         60.0,
         20.0,
@@ -6253,7 +6253,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         70.0,
         20.0,
@@ -6288,7 +6288,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         80.0,
         30.0,
@@ -6323,7 +6323,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         90.0,
         30.0,
@@ -6358,7 +6358,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         100.0,
         30.0,

Assets/Res/Config/TowerInfoConfig.json

@@ -11,7 +11,7 @@
         2001
       ],
       "reward": [
-        1402,
+        1401,
         1001
       ],
       "unlockValue": 0
@@ -27,7 +27,7 @@
         2002
       ],
       "reward": [
-        1702,
+        1701,
         1001
       ],
       "unlockValue": 0
@@ -59,7 +59,7 @@
         2004
       ],
       "reward": [
-        1402,
+        1304,
         1001
       ],
       "unlockValue": 0
@@ -75,7 +75,7 @@
         2005
       ],
       "reward": [
-        1702,
+        1401,
         1001
       ],
       "unlockValue": 0
@@ -91,7 +91,7 @@
         2006
       ],
       "reward": [
-        21012,
+        1701,
         1001
       ],
       "unlockValue": 0
@@ -107,7 +107,7 @@
         2007
       ],
       "reward": [
-        1402,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -123,7 +123,7 @@
         2008
       ],
       "reward": [
-        1702,
+        1305,
         1001
       ],
       "unlockValue": 0
@@ -139,7 +139,7 @@
         2009
       ],
       "reward": [
-        21012,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -155,7 +155,7 @@
         2010
       ],
       "reward": [
-        1402,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -171,7 +171,7 @@
         2011
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -187,7 +187,7 @@
         2012
       ],
       "reward": [
-        21012,
+        1306,
         1001
       ],
       "unlockValue": 0
@@ -251,7 +251,7 @@
         2016
       ],
       "reward": [
-        1402,
+        1307,
         1001
       ],
       "unlockValue": 0
@@ -267,7 +267,7 @@
         2017
       ],
       "reward": [
-        1702,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -283,7 +283,7 @@
         2018
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -299,7 +299,7 @@
         2019
       ],
       "reward": [
-        1402,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -315,7 +315,7 @@
         2020
       ],
       "reward": [
-        1702,
+        1308,
         1001
       ],
       "unlockValue": 0
@@ -331,7 +331,7 @@
         2021
       ],
       "reward": [
-        21012,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -347,7 +347,7 @@
         2022
       ],
       "reward": [
-        1402,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -363,7 +363,7 @@
         2023
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -379,7 +379,7 @@
         2024
       ],
       "reward": [
-        21012,
+        1309,
         1001
       ],
       "unlockValue": 0
@@ -443,7 +443,7 @@
         2028
       ],
       "reward": [
-        1402,
+        1310,
         1001
       ],
       "unlockValue": 0
@@ -459,7 +459,7 @@
         2029
       ],
       "reward": [
-        1702,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -475,7 +475,7 @@
         2030
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -491,7 +491,7 @@
         2031
       ],
       "reward": [
-        1403,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -507,7 +507,7 @@
         2032
       ],
       "reward": [
-        1702,
+        1311,
         1001
       ],
       "unlockValue": 0
@@ -523,7 +523,7 @@
         2033
       ],
       "reward": [
-        21012,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -539,7 +539,7 @@
         2034
       ],
       "reward": [
-        1403,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -555,7 +555,7 @@
         2035
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -571,7 +571,7 @@
         2036
       ],
       "reward": [
-        21012,
+        1312,
         1001
       ],
       "unlockValue": 0
@@ -635,7 +635,7 @@
         2040
       ],
       "reward": [
-        1403,
+        1313,
         1001
       ],
       "unlockValue": 0
@@ -651,7 +651,7 @@
         2041
       ],
       "reward": [
-        1702,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -667,7 +667,7 @@
         2042
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -683,7 +683,7 @@
         2043
       ],
       "reward": [
-        1403,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -699,7 +699,7 @@
         2044
       ],
       "reward": [
-        1702,
+        1314,
         1001
       ],
       "unlockValue": 0
@@ -715,7 +715,7 @@
         2045
       ],
       "reward": [
-        21012,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -731,7 +731,7 @@
         2046
       ],
       "reward": [
-        1403,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -747,7 +747,7 @@
         2047
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -763,7 +763,7 @@
         2048
       ],
       "reward": [
-        21012,
+        1315,
         1001
       ],
       "unlockValue": 0
@@ -827,7 +827,7 @@
         2052
       ],
       "reward": [
-        1403,
+        1316,
         1001
       ],
       "unlockValue": 0
@@ -843,7 +843,7 @@
         2053
       ],
       "reward": [
-        1702,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -859,7 +859,7 @@
         2054
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -875,7 +875,7 @@
         2055
       ],
       "reward": [
-        1403,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -891,7 +891,7 @@
         2056
       ],
       "reward": [
-        1702,
+        1317,
         1001
       ],
       "unlockValue": 0
@@ -907,7 +907,7 @@
         2057
       ],
       "reward": [
-        21012,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -923,7 +923,7 @@
         2058
       ],
       "reward": [
-        1403,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -939,7 +939,7 @@
         2059
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -955,7 +955,7 @@
         2060
       ],
       "reward": [
-        21012,
+        1318,
         1001
       ],
       "unlockValue": 0
@@ -971,7 +971,7 @@
         2061
       ],
       "reward": [
-        1404,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -1019,7 +1019,7 @@
         2064
       ],
       "reward": [
-        1404,
+        1319,
         1001
       ],
       "unlockValue": 0
@@ -1035,7 +1035,7 @@
         2065
       ],
       "reward": [
-        1702,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -1051,7 +1051,7 @@
         2066
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1067,7 +1067,7 @@
         2067
       ],
       "reward": [
-        1404,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1083,7 +1083,7 @@
         2068
       ],
       "reward": [
-        1702,
+        1320,
         1001
       ],
       "unlockValue": 0
@@ -1099,7 +1099,7 @@
         2069
       ],
       "reward": [
-        21012,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1115,7 +1115,7 @@
         2070
       ],
       "reward": [
-        1404,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1131,7 +1131,7 @@
         2071
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1147,7 +1147,7 @@
         2072
       ],
       "reward": [
-        21012,
+        1321,
         1001
       ],
       "unlockValue": 0
@@ -1211,7 +1211,7 @@
         2076
       ],
       "reward": [
-        1404,
+        1322,
         1001
       ],
       "unlockValue": 0
@@ -1227,7 +1227,7 @@
         2077
       ],
       "reward": [
-        1702,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1243,7 +1243,7 @@
         2078
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1259,7 +1259,7 @@
         2079
       ],
       "reward": [
-        1404,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1275,7 +1275,7 @@
         2080
       ],
       "reward": [
-        1702,
+        1323,
         1001
       ],
       "unlockValue": 0
@@ -1291,7 +1291,7 @@
         2081
       ],
       "reward": [
-        21012,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1307,7 +1307,7 @@
         2082
       ],
       "reward": [
-        1404,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1323,7 +1323,7 @@
         2083
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1339,7 +1339,7 @@
         2084
       ],
       "reward": [
-        21012,
+        1324,
         1001
       ],
       "unlockValue": 0
@@ -1403,7 +1403,7 @@
         2088
       ],
       "reward": [
-        1404,
+        1325,
         1001
       ],
       "unlockValue": 0
@@ -1419,7 +1419,7 @@
         2089
       ],
       "reward": [
-        1702,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1435,7 +1435,7 @@
         2090
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1451,7 +1451,7 @@
         2091
       ],
       "reward": [
-        1404,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1467,7 +1467,7 @@
         2092
       ],
       "reward": [
-        1702,
+        1326,
         1001
       ],
       "unlockValue": 0
@@ -1483,7 +1483,7 @@
         2093
       ],
       "reward": [
-        21012,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1499,7 +1499,7 @@
         2094
       ],
       "reward": [
-        1404,
+        1327,
         1001
       ],
       "unlockValue": 0
@@ -1515,7 +1515,7 @@
         2095
       ],
       "reward": [
-        1702,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1531,7 +1531,7 @@
         2096
       ],
       "reward": [
-        21012,
+        1328,
         1001
       ],
       "unlockValue": 0
@@ -1547,7 +1547,7 @@
         2097
       ],
       "reward": [
-        1404,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1563,7 +1563,7 @@
         2098
       ],
       "reward": [
-        1702,
+        1329,
         1001
       ],
       "unlockValue": 0
@@ -1579,7 +1579,7 @@
         2099
       ],
       "reward": [
-        21012,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1595,7 +1595,7 @@
         2100
       ],
       "reward": [
-        1404,
+        1330,
         1001
       ],
       "unlockValue": 0

Assets/Res/UI/DaoYouPanel/DaoYouIdleEarningsWidget.prefab

@@ -118,7 +118,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 68.29999, y: 235.4986}
-  m_SizeDelta: {x: 107, y: 4}
+  m_SizeDelta: {x: 107, y: 40}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &566111804867399921
 CanvasRenderer:

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -1232,7 +1232,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 197.0892, y: -53}
+  m_AnchoredPosition: {x: 197.0892, y: -38}
   m_SizeDelta: {x: 394.1784, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8219955351092879517
@@ -9728,7 +9728,7 @@ GameObject:
   - component: {fileID: 5720882546850458775}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Icon_bodyIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -10034,6 +10034,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_bodyIcon
+    gameObject: {fileID: 5720882546850458775}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1001 &2591569182256414571
 PrefabInstance:

Assets/Res/UI/DaoYouPanel/DaoYouWidget.prefab

@@ -524,6 +524,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Daoyou
+    gameObject: {fileID: 2328298552659041410}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &4309724099149842934
 MonoBehaviour:
@@ -1038,7 +1043,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang
+  _icon_name: dec_juxing_yuanjiao16
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1220,7 +1225,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7555ba42c145339429e4c693ce3601d7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 03130e562c0aeca4383835e226fa650c, type: 3}
   m_Type: 0
   m_PreserveAspect: 1
   m_FillCenter: 1
@@ -1230,7 +1235,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: bg_lh_wanxi
+  _icon_name: bg_lh_lingji
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 0}
   packInfo:

Assets/Res/UI/HeroInformainPanel/BreakthroughItemWidget.prefab

@@ -398,7 +398,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.000015258789, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 118.8268, y: 118.8268}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &380172200749822584
 CanvasRenderer:
@@ -438,15 +438,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_3_2_1
+  _icon_name: icon_item_20012
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
-  imageH: 0
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 738ec5908281e178b7c40618cc12b514
+  imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/HeroInformainPanel/DaoYouInvitePanel.prefab

@@ -319,7 +319,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.56999, y: -237.22296}
-  m_SizeDelta: {x: 664.15, y: 71.9107}
+  m_SizeDelta: {x: 664.15, y: 96}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1362513949651933117
 CanvasRenderer:
@@ -372,7 +372,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 961340744379981622}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1

Assets/Res/UI/HeroInformainPanel/ElixirItemWidget.prefab

@@ -195,8 +195,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -0, y: -64.9}
-  m_SizeDelta: {x: 58.8736, y: 58.874}
+  m_AnchoredPosition: {x: -0, y: -64.9001}
+  m_SizeDelta: {x: 105.49, y: 105.4875}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2951448184634106011
 CanvasRenderer:
@@ -236,14 +236,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_3_4_3
+  _icon_name: icon_item_20012
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 738ec5908281e178b7c40618cc12b514
   imageH: 58.874
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/HeroInformainPanel/ExpElixirItemWidget.prefab

@@ -689,7 +689,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 43.997498, y: -12.5}
-  m_SizeDelta: {x: 24, y: 23.1372}
+  m_SizeDelta: {x: 0, y: 23.1372}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7796567445027890541
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/ImmortalBondPanel.prefab

@@ -317,7 +317,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 3230630177281992838}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1
@@ -2570,7 +2570,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/HeroInformainPanel/SelectBreakthroughItemPanel.prefab

@@ -391,8 +391,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.0000050863, y: 4.2}
-  m_SizeDelta: {x: 70.4851, y: 70.4851}
+  m_AnchoredPosition: {x: 0.0000050863, y: 8.3}
+  m_SizeDelta: {x: 104.8072, y: 104.8072}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8151761943818166883
 CanvasRenderer:
@@ -432,14 +432,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_3_4_3
+  _icon_name: icon_shenshidan
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1ef03ad075d5c504196a7354786d23e8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 4b54a953fcd0950cece7d4eeea1f40a9
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 738ec5908281e178b7c40618cc12b514
   imageH: 70.43144
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -1822,7 +1822,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 55.200012, y: -168.2185}
-  m_SizeDelta: {x: 72.46, y: 30}
+  m_SizeDelta: {x: 72, y: 30}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3243743412898019261
 CanvasRenderer:
@@ -3168,7 +3168,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 2347182967128371605}
   - {fileID: 50435170631078031}

Assets/Scenes/testCombat.scene

@@ -2310,6 +2310,221 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!213 &1357740138
+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!224 &1469808077 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4202026612452094680, guid: 2e16b8f8d28965a45ab1457a3656d5e2, type: 3}
@@ -2730,7 +2945,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1881818885}
+  m_Sprite: {fileID: 1357740138}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2761,221 +2976,6 @@ 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/GameData/ExcelConfig/GameConstantConfig.cs

@@ -194,6 +194,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///赠送给道友喜欢的礼物时，增加的好感度倍率 200=200%
+		/// </summary>
+#if !COMBAT_SERVER
+		public int daolvfavoratePara;
+#else
+		public int daolvfavoratePara{ set; get; }
+#endif
+		
+
 	}
 
 }

Assets/Scripts/GameData/ExcelConfig/ResourceLevelConfig.cs

@@ -94,6 +94,56 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///动态道具 23300
+		/// </summary>
+#if !COMBAT_SERVER
+		public int value7;
+#else
+		public int value7{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///动态道具 23301
+		/// </summary>
+#if !COMBAT_SERVER
+		public int value8;
+#else
+		public int value8{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///动态道具 23302
+		/// </summary>
+#if !COMBAT_SERVER
+		public int value9;
+#else
+		public int value9{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///动态道具 23303
+		/// </summary>
+#if !COMBAT_SERVER
+		public int value10;
+#else
+		public int value10{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///动态道具 23304
+		/// </summary>
+#if !COMBAT_SERVER
+		public int value11;
+#else
+		public int value11{ set; get; }
+#endif
+		
+
 	}
 
 }

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -121,7 +121,7 @@ namespace GameLogic.Hero
                     if (daolvSkill.type == 1)
                     {
                         daoLvBiData = daolvBl.FirstOrDefault(d => d.id == i1);
-                        if (daoLvBiData != null)
+                        if (daoLvBiData == null)
                         {
                             daoLvBiData = new DaoLVBiData();
                             daoLvBiData.id = i1;

Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Bag;
@@ -168,6 +169,7 @@ namespace GameLogic.Player
                 itemInfo = new ItemInfo(dropItemConfig.itemID[itemIndex], c);
             }
 
+
             itemInfos.Add(itemInfo);
             // for (int j = 0; j < dropItemConfig.itemID.Length; j++)
             // {
@@ -254,17 +256,35 @@ namespace GameLogic.Player
         public List<ItemInfo> Drop(int itemID, int count)
         {
             List<ItemInfo> itemInfos = new List<ItemInfo>();
+            DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(itemID);
+
+
             if (count < 0)
             {
                 itemInfos.Add(DropResourceLevel(itemID, count));
             }
+
             else
             {
-                DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(itemID);
                 if (dropConfig.dropType == 3)
                 {
-                    ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], count);
-                    itemInfos.Add(itemInfo);
+                    ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(dropConfig.dropGroupID[0]);
+                    if (itemConfig.associateID == 14)
+                    {
+                        ResourceLevelConfig resourceLevelConfig =
+                            ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero
+                                .powerUpConfig.ID);
+                        FieldInfo scoreField =
+                            resourceLevelConfig.GetType().GetField("value" + itemConfig.associateVlaue[0]);
+                        int itemId = (int)scoreField.GetValue(resourceLevelConfig);
+                        ItemInfo itemInfo = new ItemInfo(itemId, count);
+                        itemInfos.Add(itemInfo);
+                    }
+                    else
+                    {
+                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], count);
+                        itemInfos.Add(itemInfo);
+                    }
                 }
                 else
                 {
@@ -278,7 +298,8 @@ namespace GameLogic.Player
 
         public ItemInfo DropResourceLevel(int itemID, int count)
         {
-            ResourceLevelConfig resourceLevelConfig = ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero.powerUpConfig.ID);
+            ResourceLevelConfig resourceLevelConfig =
+                ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero.powerUpConfig.ID);
             ItemInfo itemInfo = null;
             float c = Math.Abs(count / (float)1000);
             switch (itemID)

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -777,7 +777,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         CurrentEventList = evt;
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
-        await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, async() =>
+        await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, async () =>
         {
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(CurrentEventList.eventID);
             if (eventConfig.EventTriggerType != 4)
@@ -796,7 +796,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
                     UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
                 }
-     
+
                 EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
             }
 
@@ -852,6 +852,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventConditionConfig eventConditionConfig =
             ConfigComponent.Instance.Get<EventConditionConfig>(eventCondition.eventCondition);
 
+
         if (eventCondition != null)
         {
             return eventCondition.fishCount >= eventConditionConfig.finishCount;
@@ -930,7 +931,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
             ConfigComponent.Instance.Get<EventConditionConfig>(conditionData.eventCondition);
 
 
-        if (IsEvenkLinkComplete(conditionData))
+        if (IsEvenkLinkComplete(conditionData) && eventConditionConfig.ConditionType != 1)
             return;
 
         switch (type)
@@ -1066,17 +1067,33 @@ public class EventSystemManager : Singleton<EventSystemManager>
             {
                 //背包道具检测
                 case 1:
+                    if (evt.EventCount == null)
+                    {
+                        return false;
+                    }
                     return PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[i]) >= evt.EventCount[i];
                 //境界判断
                 case 3:
+                    if (evt.EventValue == null)
+                    {
+                        return false;
+                    }
                     return PlayerManager.Instance.myHero.level >= evt.EventValue[i];
                 //概率判断
                 case 7:
+                    if (evt.EventValue == null)
+                    {
+                        return false;
+                    }
                     int randomValue1 = Random.Range(0, 1001);
 
                     return randomValue1 <= evt.EventValue[i];
                 //完成事件判断
                 case 10:
+                    if (evt.EventValue == null)
+                    {
+                        return false;
+                    }
                     AccountFileInfo.EventList eventList =
                         AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
                             ce.eventID == evt.EventValue[i]);
@@ -1180,28 +1197,32 @@ public class EventSystemManager : Singleton<EventSystemManager>
         {
             for (var i = 0; i < eventConfig.PrizeIDs.Length; i++)
             {
-                DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(eventConfig.PrizeIDs[i]);
-                if (dropConfig.dropType == 3)
-                {
-                    if (eventConfig.PrizeNums[i] < 0)
-                    {
-                        List<ItemInfo> items =
-                            DropManager.Instance.Drop(dropConfig.dropGroupID[0], eventConfig.PrizeNums[i]);
-                        if (items != null)
-                            itemInfos.AddRange(items);
-                    }
-                    else
-                    {
-                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], eventConfig.PrizeNums[i]);
-                        itemInfos.Add(itemInfo);
-                    }
-                }
-                else
-                {
-                    List<ItemInfo> items = DropManager.Instance.DropItem(eventConfig.PrizeIDs[i]);
-                    if (items != null)
-                        itemInfos.AddRange(items);
-                }
+                List<ItemInfo> items =
+                    DropManager.Instance.Drop(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]);
+                if (items != null)
+                    itemInfos.AddRange(items);
+                // DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(eventConfig.PrizeIDs[i]);
+                // if (dropConfig.dropType == 3)
+                // {
+                //     if (eventConfig.PrizeNums[i] < 0)
+                //     {
+                //         List<ItemInfo> items =
+                //             DropManager.Instance.Drop(dropConfig.dropGroupID[0], eventConfig.PrizeNums[i]);
+                //         if (items != null)
+                //             itemInfos.AddRange(items);
+                //     }
+                //     else
+                //     {
+                //         ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], eventConfig.PrizeNums[i]);
+                //         itemInfos.Add(itemInfo);
+                //     }
+                // }
+                // else
+                // {
+                //     List<ItemInfo> items = DropManager.Instance.DropItem(eventConfig.PrizeIDs[i]);
+                //     if (items != null)
+                //         itemInfos.AddRange(items);
+                // }
 
                 // itemInfos.Add(new ItemInfo(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]));
             }
@@ -1285,12 +1306,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
         if (eventConfig.EventTriggerType == 4)
         {
-          
             await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
             await UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
         }
+        
 
-        if (PlayerGuideManager.Instance.GuideIsCanDo(2))
+        if (eventConfig.ID == 10001 && PlayerGuideManager.Instance.GuideIsCanDo(2))
         {
             PlayerGuideManager.Instance.SetGuid(2);
         }

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -561,7 +561,7 @@ namespace Fort23.Mono
                 Btn_Setting.gameObject.SetActive(true);
                 CloseSelect();
                 AppBarPanel.OpenPanel(this);
-                Text_FuZhuGongFaCount.transform.parent.gameObject.SetActive(false);
+                // Text_FuZhuGongFaCount.transform.parent.gameObject.SetActive(false);
             }
             else if (type == 2)
             {
@@ -570,7 +570,7 @@ namespace Fort23.Mono
                 allUseSkill = PlayerManager.Instance.GongFaControl.allUseSkill.ToArray();
                 Btn_Setting.gameObject.SetActive(false);
                 AppBarPanel.ClosePanel();
-                Text_FuZhuGongFaCount.transform.parent.gameObject.SetActive(true);
+                // Text_FuZhuGongFaCount.transform.parent.gameObject.SetActive(true);
             }
         }
 
@@ -681,7 +681,9 @@ namespace Fort23.Mono
 
             return type1.skillConfig.SkillType != type2.skillConfig.SkillType
                 ? type1.skillConfig.SkillType.CompareTo(type2.skillConfig.SkillType)
-                : type1.skillConfig.ID.CompareTo(type2.skillConfig.ID);
+                : type1.SkillData.star != type2.SkillData.star
+                    ? type2.SkillData.star.CompareTo(type1.SkillData.star)
+                    : type1.skillConfig.ID.CompareTo(type2.skillConfig.ID);
 
             return 0;
         }
@@ -783,6 +785,7 @@ namespace Fort23.Mono
                 return;
             }
 
+            Btn_Info.GetComponent<RectTransform>().sizeDelta = new Vector2(72, 30);
             Btn_Info.transform.SetParent(transform);
             Btn_Info.gameObject.SetActive(false);
             currentSelectedSkill = skillKongWidget.SkillInfo;
@@ -905,6 +908,7 @@ namespace Fort23.Mono
                     dianjiSkillKongWidget = skillKongWidget;
                     Btn_RemoveGongFa.transform.position = dianjiSkillKongWidget.RemovePos.position;
                     Btn_RemoveGongFa.gameObject.SetActive(true);
+                    Btn_Info.GetComponent<RectTransform>().sizeDelta = new Vector2(72, 30);
                     Btn_Info.transform.position = dianjiSkillKongWidget.InfoPos.position;
                     Btn_Info.gameObject.SetActive(true);
                     SelectSkill(skillKongWidget.SkillInfo, false, false);
@@ -1016,7 +1020,7 @@ namespace Fort23.Mono
             }
 
             int index = 5;
-            if (PlayerManager.Instance.myHero.level <= 60)
+            // if (PlayerManager.Instance.myHero.level <= 60)
             {
                 //金
                 if (skillConfig.skillConfig.attribute == 1)
@@ -1369,6 +1373,7 @@ namespace Fort23.Mono
             else if (infoType == 2)
             {
                 CloseSelect();
+                Btn_Info.GetComponent<RectTransform>().sizeDelta = new Vector2(98, 36);
                 Btn_Info.transform.SetParent(ContentRoot);
                 Btn_Info.transform.position = skillWidget.InfoPos.position;
                 Btn_Info.gameObject.SetActive(true);

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -88,18 +88,19 @@ namespace Fort23.Mono
 
             Btn_Eveent.onClick.AddListener(() =>
             {
-                if (daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
-                    && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
-                    && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)
-                    && !EventSystemManager.Instance.IsEventCompleted(_daoyouModelConfig.QuestID))
-                {
-                    AccountFileInfo.EventList eventList =
-                        EventSystemManager.Instance.AddEvent(_daoyouModelConfig.QuestID);
-                    AccountFileInfo.Instance.playerData.eventList.Add(eventList);
-                    AccountFileInfo.Instance.SavePlayerData();
-                    EventSystemManager.Instance.TriggerEvent(eventList);
-                    Btn_Eveent.gameObject.SetActive(false);
-                }
+                TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10697, daoYouData.favorabilityLv));
+                // if (daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
+                //     && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
+                //     && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)
+                //     && !EventSystemManager.Instance.IsEventCompleted(_daoyouModelConfig.QuestID))
+                // {
+                //     AccountFileInfo.EventList eventList =
+                //         EventSystemManager.Instance.AddEvent(_daoyouModelConfig.QuestID);
+                //     AccountFileInfo.Instance.playerData.eventList.Add(eventList);
+                //     AccountFileInfo.Instance.SavePlayerData();
+                //     EventSystemManager.Instance.TriggerEvent(eventList);
+                //     Btn_Eveent.gameObject.SetActive(false);
+                // }
             });
 
 
@@ -150,7 +151,16 @@ namespace Fort23.Mono
                     for (int i = 0; i < count; i++)
                     {
                         int bl = Random.Range(emotionConfig.hanganUpRate[0], emotionConfig.hanganUpRate[1] + 1);
-                        daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f);
+                        //喜好礼物翻倍
+                        if (_daoyouModelConfig.PreferGiftID.Contains(daoyouGiftConfig.ItemID))
+                        {
+                            daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f * PlayerManager.Instance.gameConstantConfig.daolvfavoratePara * 0.01f);
+                        }
+                        else
+                        {
+                            daoYouData.exp += (int)(daoyouGiftConfig.emotionValue * bl * 0.001f);
+                        }
+                       
                     }
 
 
@@ -164,6 +174,7 @@ namespace Fort23.Mono
                             daoYouData.favorabilityLv++;
                         }
                     }
+
                     AudioManager.Instance.PlayAudio("ui_shiyonghuode");
                     AccountFileInfo.Instance.SavePlayerData();
                 }
@@ -203,6 +214,7 @@ namespace Fort23.Mono
             emotionConfig emotionConfig = ConfigComponent.Instance.Get<emotionConfig>(daoYouData.emotion);
             Text_message.text = LanguageManager.Instance.Text(emotionConfig.des);
             ShowMessage();
+            Icon_bodyIcon.icon_name = _daoyouModelConfig.bodyIcon;
             await UpdateUI();
             return await base.AsyncInit(uiData);
         }
@@ -250,8 +262,7 @@ namespace Fort23.Mono
 
             daoYouaaFfixWidgets.Clear();
 
-            if (daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
-                && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
+            if (daoYouData.favorabilityLv != -1
                 && !EventSystemManager.Instance.IsEventCompleted(_daoyouModelConfig.QuestID))
             {
                 Btn_Eveent.gameObject.SetActive(true);
@@ -286,7 +297,7 @@ namespace Fort23.Mono
             // DaoyouLevelupConfig daoyouLevelupConfig1 = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.favorabilityLv);
             Text_GiftGailv.text = LanguageManager.Instance.Text(10278,
                 PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]));
-                // "送礼概率:" + PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]) + "%";
+            // "送礼概率:" + PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]) + "%";
             for (var i = 1; i < _daoyouModelConfig.guajiBuffID.Length; i++)
             {
                 DaoYouIdleEarningsWidget daoYouIdleEarningsWidget =

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanelData.cs

@@ -393,6 +393,17 @@ namespace Fort23.Mono
 	      return _Slider_Emotion;
 	     }
 	   }
+	  private MyImage _Icon_bodyIcon;
+	  public MyImage Icon_bodyIcon
+	   {
+	   get{
+	      if (_Icon_bodyIcon == null)
+	       {
+	         _Icon_bodyIcon  = GetUIUnit<MyImage>("Icon_bodyIcon"); 
+	       }
+	      return _Icon_bodyIcon;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInvitePanel.cs

@@ -64,6 +64,12 @@ namespace Fort23.Mono
             {
                 if (!PlayerManager.Instance.myHero.heroData.ImmortalBond.Contains(playerDataDaoYouData.id))
                 {
+                    DaoyouModelConfig daoyouModelConfig =
+                        ConfigComponent.Instance.Get<DaoyouModelConfig>(playerDataDaoYouData.id);
+                    if (playerDataDaoYouData.favorabilityLv == -1 || playerDataDaoYouData.favorabilityLv < daoyouModelConfig.EmotionLvforQuest || !EventSystemManager.Instance.IsEventCompleted(daoyouModelConfig.QuestID))
+                    {
+                        continue;
+                    }
                     count++;
                     DaoYouWidget daoYouWidget = await UIManager.Instance.CreateGComponent<DaoYouWidget>(null, Content);
                     daoYouWidget.CustomInit(playerDataDaoYouData.id);

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -34,6 +34,7 @@ namespace Fort23.Mono
         {
             _daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(configId);
             _daoYouData = AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(dy => dy.id == configId);
+            Icon_Daoyou.icon_name = _daoyouModelConfig.bodyIcon;
 
             Text_Name.text = LanguageManager.Instance.Text(_daoyouModelConfig.name);
             if (_daoYouData != null)
@@ -53,7 +54,7 @@ namespace Fort23.Mono
             {
                 Slider_Emotion.fillAmount = _daoYouData.emotionValue / 100;
             }
-           
+
 
             if (_daoYouData == null)
             {
@@ -74,7 +75,8 @@ namespace Fort23.Mono
 
                 Icon_Emotion.gameObject.SetActive(false);
 
-                DaoyouLevelupConfig daoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(_daoYouData.favorabilityLv);
+                DaoyouLevelupConfig daoyouLevelupConfig =
+                    ConfigComponent.Instance.Get<DaoyouLevelupConfig>(_daoYouData.favorabilityLv);
                 Text_DaoyouLvName.text = LanguageManager.Instance.Text(daoyouLevelupConfig.name);
                 if (_daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
                     && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidgetData.cs

@@ -85,6 +85,17 @@ namespace Fort23.Mono
 	      return _Slider_Emotion;
 	     }
 	   }
+	  private MyImage _Icon_Daoyou;
+	  public MyImage Icon_Daoyou
+	   {
+	   get{
+	      if (_Icon_Daoyou == null)
+	       {
+	         _Icon_Daoyou  = GetUIUnit<MyImage>("Icon_Daoyou"); 
+	       }
+	      return _Icon_Daoyou;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -212,6 +212,18 @@ namespace Fort23.Mono
                 for (var i = 0; i < randomEventConfig.PrizeIDs.Length; i++)
                 {
                     DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(randomEventConfig.PrizeIDs[i]);
+                    if (dropConfig.dropType == 3)
+                    {
+                        ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(dropConfig.dropGroupID[0]);
+                        if (itemConfig.associateID == 14)
+                        {
+                            List<ItemInfo> itemInfoss = DropManager.Instance.Drop(randomEventConfig.PrizeIDs[i],
+                                randomEventConfig.PrizeNums[i]);
+                            itemInfos.AddRange(itemInfoss);
+                            continue;
+                        }
+                    }
+
                     if (dropConfig.showItemId != null)
                     {
                         foreach (var i1 in dropConfig.showItemId)

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

@@ -115,7 +115,7 @@ namespace Fort23.Mono
                         }
                     }
 
-                    for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs.Length; i++)
+                    for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs?.Length; i++)
                     {
                         PlayerManager.Instance.BagController.DeductItem(
                             PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs[i], 1);
@@ -326,16 +326,20 @@ namespace Fort23.Mono
                                     LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[2]);
 
 
-            LevelbattleConfig levelbattleConfig =
-                ConfigComponent.Instance.Get<LevelbattleConfig>(heroPowerUpConfig.DujieLevelbattleID);
-            GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
-            HeroModelConfig heroModelConfig =
-                ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
-            MonsterPowerUpConfig monsterPowerUpConfig =
-                ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
+            if (heroPowerUpConfig.DujieLevelbattleID != -1)
+            {
+                LevelbattleConfig levelbattleConfig =
+                    ConfigComponent.Instance.Get<LevelbattleConfig>(heroPowerUpConfig.DujieLevelbattleID);
+                GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
+                HeroModelConfig heroModelConfig =
+                    ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
+                MonsterPowerUpConfig monsterPowerUpConfig =
+                    ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
+
+                Text_CombatTitle.text =
+                    $"{LanguageManager.Instance.Text(heroModelConfig.name)}   {LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie1)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie2)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie3)}";
+            }
 
-            Text_CombatTitle.text =
-                $"{LanguageManager.Instance.Text(heroModelConfig.name)}   {LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie1)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie2)}{LanguageManager.Instance.Text(monsterPowerUpConfig.jingjie3)}";
 
             if (heroPowerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
             {
@@ -424,8 +428,11 @@ namespace Fort23.Mono
                 using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer =
                        new CTaskAwaitBuffer<BreakthroughItemWidget>())
                 {
+                    int dujieItemCount = heroPowerUpConfig.DujieItemIDs == null
+                        ? 0
+                        : heroPowerUpConfig.DujieItemIDs.Length;
                     for (int i = 0;
-                         i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
+                         i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + dujieItemCount;
                          i++)
                     {
                         cTaskAwaitBuffer.AddTask(
@@ -444,7 +451,7 @@ namespace Fort23.Mono
                     }
 
                     //可选道具
-                    for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
+                    for (var i = 0; i < heroPowerUpConfig.DujieItemIDs?.Length; i++)
                     {
                         breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
                             .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
@@ -541,7 +548,11 @@ namespace Fort23.Mono
             else
             {
                 //提示需要什么道具
-                string tips = "需要 破除心魔 ";
+                string tips = "需要";
+                if (heroPowerUpConfig.DujieLevelbattleID != -1 && !hero.heroData.isCombat)
+                {
+                    tips +=  " 破除心魔";
+                }
                 foreach (var dujieMustItemID in hero.powerUpConfig.DujieMustItemIDs)
                 {
                     ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(dujieMustItemID);
@@ -701,7 +712,7 @@ namespace Fort23.Mono
                    new CTaskAwaitBuffer<BreakthroughItemWidget>())
             {
                 for (int i = 0;
-                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs.Length;
+                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs?.Length;
                      i++)
                 {
                     cTaskAwaitBuffer.AddTask(
@@ -720,7 +731,7 @@ namespace Fort23.Mono
                 }
 
                 //可选道具
-                for (var i = 0; i < heroPowerUpConfig.DujieItemIDs.Length; i++)
+                for (var i = 0; i < heroPowerUpConfig.DujieItemIDs?.Length; i++)
                 {
                     breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
                         .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);

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

@@ -81,6 +81,7 @@ namespace Fort23.Mono
             {
                 DaoYouaaFfixWidget daoLvSkillWidget =
                     await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, JiachengContent);
+                daoLvSkillWidget.transform.localScale = Vector3.one;
                 daoLvSkillWidget.CustomInit(i);
                 _daoLvSkillWidgets.Add(daoLvSkillWidget);
             }

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

@@ -13,7 +13,7 @@ namespace Fort23.Mono
     {
         ItemConfig itemConfig;
         private Action callBack;
-        
+
         private Transform weidgetFater;
 
         BreakthroughItemWidget breakthrough;
@@ -26,18 +26,22 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+            EventManager.Instance.AddEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
+        }
+
+        private void ItemUpdateEvent(IEventData e)
+        {
+            CustomInit(breakthrough, callBack);
         }
 
         protected override void DelEvent()
         {
+            EventManager.Instance.RemoveEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
         }
 
         public override void AddButtonEvent()
         {
-            Btn_Close.onClick.AddListener(() =>
-            {
-                UIManager.Instance.HideUIUIPanel(this);
-            });
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
             Btn_Affirm.onClick.AddListener(() =>
             {
                 this.callBack?.Invoke();
@@ -45,11 +49,8 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel(this);
             });
             Btn_Cancel.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
-            
-            Btn_Source.onClick.AddListener(() =>
-            {
-                ItemSourcePanel.OpenPanel(itemConfig.ID);
-            });
+
+            Btn_Source.onClick.AddListener(() => { ItemSourcePanel.OpenPanel(itemConfig.ID); });
         }
 
         public void CustomInit(BreakthroughItemWidget breakthroughItemWidget, Action callBack)
@@ -97,8 +98,6 @@ namespace Fort23.Mono
                 Btn_Cancel.gameObject.SetActive(true);
                 Text_NoEnough.gameObject.SetActive(false);
             }
-
-          
         }
 
         public async override CTask Close()
@@ -111,9 +110,12 @@ namespace Fort23.Mono
             await base.Close();
         }
 
-        public async static CTask<SelectBreakthroughItemPanel> OpenPanel(BreakthroughItemWidget breakthroughItemWidget, Action callBack)
+        public async static CTask<SelectBreakthroughItemPanel> OpenPanel(BreakthroughItemWidget breakthroughItemWidget,
+            Action callBack)
         {
-            SelectBreakthroughItemPanel selectBreakthroughItemPanel = await UIManager.Instance.LoadAndOpenPanel<SelectBreakthroughItemPanel>(null,UILayer.Middle,isFocus:false);
+            SelectBreakthroughItemPanel selectBreakthroughItemPanel =
+                await UIManager.Instance.LoadAndOpenPanel<SelectBreakthroughItemPanel>(null, UILayer.Middle,
+                    isFocus: false);
 
             selectBreakthroughItemPanel.CustomInit(breakthroughItemWidget, callBack);
             return selectBreakthroughItemPanel;

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

@@ -30,10 +30,17 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+            EventManager.Instance.AddEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
+        }
+
+        private void ItemUpdateEvent(IEventData e)
+        {
+            CustomInit(breakthrough, callback);
         }
 
         protected override void DelEvent()
         {
+            EventManager.Instance.RemoveEventListener(CustomEventType.ItemUpdate, ItemUpdateEvent);
         }
 
         public override void AddButtonEvent()

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemSourcePanel.cs

@@ -65,6 +65,7 @@ namespace Fort23.Mono
             SkipToWidget skipToWidget = obj as SkipToWidget;
             isSkipto = true;
             await UIManager.Instance.HideUIUIPanel(this);
+            
             SkiptoHelper.Skipto(skipToWidget.SkiptoConfig.ID);
         }
 

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -78,7 +78,12 @@ namespace Fort23.Mono
                 //     await PlayerGuideManager.Instance.SetGuid(8);
                 // }
 
-                if (PlayerGuideManager.Instance.GuideIsCanDo(4))
+                if (PlayerGuideManager.Instance.GuideIsCanDo(4) && PlayerManager.Instance.GongFaControl.allSkill
+                                                                    .FirstOrDefault(s =>
+                                                                        s.skillConfig.IDGroup == 1405) != null
+                                                                && PlayerManager.Instance.GongFaControl.allSkill
+                                                                    .FirstOrDefault(s =>
+                                                                        s.skillConfig.IDGroup == 2006) != null)
                 {
                     await PlayerGuideManager.Instance.SetGuid(4);
                 }

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

@@ -198,6 +198,7 @@ namespace Fort23.Mono
             _towerData = null;
             ulockId = 0;
             currentLevelWidget = null;
+            CombatController.currActiveCombat.ChangeState(CombatController.update);
             await base.Close();
         }
     }

Assets/Scripts/GameUI/Utility/SkiptoHelper.cs

@@ -1,4 +1,6 @@
-using Excel2Json;
+using System.Collections.Generic;
+using System.Linq;
+using Excel2Json;
 using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
@@ -36,6 +38,18 @@ namespace Mono.Utility
                     return;
                 //实用神识界面
                 case 5:
+                    List<UIPanel> TopUIPanels = UIManager.Instance.TopUIPanels.ToList();
+                    for (var i = TopUIPanels.Count - 1; i >= 0; i--)
+                    {
+                        if (!(TopUIPanels[i] is MainPanel))
+                        {
+                            await UIManager.Instance.HideUIUIPanel(TopUIPanels[i], isBreadcrumbBarPanel: false);
+                        }
+                    }
+
+
+                    await MainPanel.OpenPanel();
+
                     UIManager.Instance.GetComponent<AppBarPanel>().Bnt_ShengShi_Click();
                     return;
 
@@ -55,7 +69,7 @@ namespace Mono.Utility
                 case 9:
                     QiankundaiPanel.OpenPanel();
                     return;
-       
+
 
                 default:
                     return;

XiuXianGame.sln.DotSettings.user

@@ -87,6 +87,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATrailRenderer_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fe4_003F6073d988_003FTrailRenderer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATransform_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F66_003F966ef437_003FTransform_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATransform_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fe5_003Fc58fb33c_003FTransform_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AType_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fbe_003F26f5d741_003FType_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUIVertex_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F99827ca3f9704445bee7a19d83c9a5a27c00_003F7d_003F478e3a8a_003FUIVertex_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUndo_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003Fff_003Fe1991d08_003FUndo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUnityEvent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F71_003F77df5b6d_003FUnityEvent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>