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

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

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.90681124
+    - _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.6423753
+    - _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.24384665
+    - _Alpha: 0.21190071
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.1607126
+    - _MainTexOffsetU: 0.19786286
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/EventConfig.json

@@ -2821,7 +2821,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 15,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
@@ -2924,7 +2924,7 @@
       "PrizeNums": [
         1
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
@@ -2950,7 +2950,7 @@
       "PrizeNums": [
         1
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3002,7 +3002,7 @@
       "PrizeNums": [
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3028,7 +3028,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 30,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3057,7 +3057,7 @@
       "PrizeNums": [
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3086,7 +3086,7 @@
       "PrizeNums": [
         1
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3115,7 +3115,7 @@
       "PrizeNums": [
         1
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -3144,7 +3144,7 @@
       "PrizeNums": [
         1
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -3175,7 +3175,7 @@
       "PrizeNums": [
         1
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -3205,7 +3205,7 @@
       "PrizeNums": [
         1
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
@@ -3229,7 +3229,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 30,
+      "RefreshProbability": 50,
       "RefreshCount": 5,
       "placeID": 3,
       "SmallPlacesId": 0,
@@ -3253,7 +3253,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "RefreshProbability": 30,
+      "RefreshProbability": 50,
       "RefreshCount": 5,
       "placeID": 3,
       "SmallPlacesId": 0,
@@ -3571,7 +3571,7 @@
         5,
         3810
       ],
-      "RefreshProbability": 15,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3615,7 +3615,7 @@
         5,
         4020
       ],
-      "RefreshProbability": 10,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3842,7 +3842,7 @@
         5,
         5430
       ],
-      "RefreshProbability": 15,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -3882,7 +3882,7 @@
         5,
         6000
       ],
-      "RefreshProbability": 10,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -4078,7 +4078,7 @@
         5,
         8100
       ],
-      "RefreshProbability": 15,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -4120,7 +4120,7 @@
         5,
         8940
       ],
-      "RefreshProbability": 10,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
@@ -4318,7 +4318,7 @@
         5,
         10920
       ],
-      "RefreshProbability": 15,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -4359,7 +4359,7 @@
         5,
         12090
       ],
-      "RefreshProbability": 10,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -4553,7 +4553,7 @@
         5,
         14760
       ],
-      "RefreshProbability": 15,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -4590,7 +4590,7 @@
         5,
         16320
       ],
-      "RefreshProbability": 10,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 0,
@@ -4787,7 +4787,7 @@
         5,
         19920
       ],
-      "RefreshProbability": 15,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 3,
       "SmallPlacesId": 0,
@@ -4838,7 +4838,7 @@
         3000,
         3000
       ],
-      "RefreshProbability": 40,
+      "RefreshProbability": 35,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,

Assets/Res/Config/EventLinkConfig.json

@@ -123,8 +123,15 @@
       "DialogueType": 3,
       "EventID": 103,
       "step": 1,
-      "optionType": 0,
-      "ResultType": 0
+      "optionType": 2,
+      "optionPara1": [
+        5006
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        10302,
+        101
+      ]
     },
     {
       "ID": 10401,
@@ -292,11 +299,18 @@
       "LanID": [
         5028
       ],
-      "DialogueType": 2,
+      "DialogueType": 3,
       "EventID": 112,
       "step": 1,
-      "optionType": 0,
-      "ResultType": 0
+      "optionType": 2,
+      "optionPara1": [
+        5006
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        11202,
+        101
+      ]
     },
     {
       "ID": 11301,
@@ -464,11 +478,18 @@
       "LanID": [
         5046
       ],
-      "DialogueType": 2,
+      "DialogueType": 3,
       "EventID": 121,
       "step": 1,
-      "optionType": 0,
-      "ResultType": 0
+      "optionType": 2,
+      "optionPara1": [
+        5006
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        12102,
+        101
+      ]
     },
     {
       "ID": 12201,
@@ -636,11 +657,18 @@
       "LanID": [
         5064
       ],
-      "DialogueType": 2,
+      "DialogueType": 3,
       "EventID": 130,
       "step": 1,
-      "optionType": 0,
-      "ResultType": 0
+      "optionType": 2,
+      "optionPara1": [
+        5006
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        13002,
+        101
+      ]
     },
     {
       "ID": 13101,
@@ -808,11 +836,18 @@
       "LanID": [
         5082
       ],
-      "DialogueType": 2,
+      "DialogueType": 3,
       "EventID": 139,
       "step": 1,
-      "optionType": 0,
-      "ResultType": 0
+      "optionType": 2,
+      "optionPara1": [
+        5006
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        13902,
+        101
+      ]
     },
     {
       "ID": 14001,
@@ -932,7 +967,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5033
+        5095
       ],
       "DialogueType": 2,
       "EventID": 11,
@@ -951,7 +986,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5095
+        5096
       ],
       "DialogueType": 2,
       "EventID": 11,
@@ -970,7 +1005,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5096
+        5097
       ],
       "DialogueType": 2,
       "EventID": 11,
@@ -986,7 +1021,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5097
+        5098
       ],
       "DialogueType": 2,
       "EventID": 12,
@@ -1005,7 +1040,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5098
+        5099
       ],
       "DialogueType": 0,
       "EventID": 12,
@@ -1024,7 +1059,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5099
+        5100
       ],
       "DialogueType": 0,
       "EventID": 12,
@@ -1040,7 +1075,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5100
+        5101
       ],
       "DialogueType": 0,
       "EventID": 13,
@@ -1059,7 +1094,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5101
+        5102
       ],
       "DialogueType": 0,
       "EventID": 13,
@@ -1078,7 +1113,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5102
+        5103
       ],
       "DialogueType": 0,
       "EventID": 13,
@@ -1097,7 +1132,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5103
+        5104
       ],
       "DialogueType": 0,
       "EventID": 13,
@@ -1113,7 +1148,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5104
+        5105
       ],
       "DialogueType": 0,
       "EventID": 14,
@@ -1132,7 +1167,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5105
+        5106
       ],
       "DialogueType": 0,
       "EventID": 14,
@@ -1151,7 +1186,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5106
+        5107
       ],
       "DialogueType": 0,
       "EventID": 14,
@@ -1167,7 +1202,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5107
+        5108
       ],
       "DialogueType": 0,
       "EventID": 15,
@@ -1186,7 +1221,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5108
+        5109
       ],
       "DialogueType": 0,
       "EventID": 15,
@@ -1205,7 +1240,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5109
+        5110
       ],
       "DialogueType": 0,
       "EventID": 15,
@@ -1224,7 +1259,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5110
+        5111
       ],
       "DialogueType": 0,
       "EventID": 15,
@@ -1240,7 +1275,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5111
+        5112
       ],
       "DialogueType": 0,
       "EventID": 16,
@@ -1259,7 +1294,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5112
+        5113
       ],
       "DialogueType": 0,
       "EventID": 16,
@@ -1278,7 +1313,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5113
+        5114
       ],
       "DialogueType": 0,
       "EventID": 16,
@@ -1294,7 +1329,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5114
+        5115
       ],
       "DialogueType": 0,
       "EventID": 0,
@@ -1318,7 +1353,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5115
+        5116
       ],
       "DialogueType": 0,
       "EventID": 0,
@@ -1341,7 +1376,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5116
+        5117
       ],
       "DialogueType": 0,
       "EventID": 0,
@@ -1357,7 +1392,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5117
+        5118
       ],
       "DialogueType": 0,
       "EventID": 0,
@@ -1373,7 +1408,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5118
+        5119
       ],
       "DialogueType": 0,
       "EventID": 0,
@@ -1406,12 +1441,12 @@
     {
       "ID": 9025,
       "conciseEventMessage": 0,
-      "EventConditionMessage": 5119,
+      "EventConditionMessage": 5120,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5120
+        5121
       ],
       "DialogueType": 0,
       "EventID": 0,
@@ -1433,7 +1468,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5121
+        5122
       ],
       "DialogueType": 0,
       "EventID": 0,
@@ -1447,7 +1482,7 @@
     {
       "ID": 9014,
       "conciseEventMessage": 0,
-      "EventConditionMessage": 5123,
+      "EventConditionMessage": 5124,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
@@ -1462,8 +1497,8 @@
     },
     {
       "ID": 9031,
-      "conciseEventMessage": 5124,
-      "EventConditionMessage": 5125,
+      "conciseEventMessage": 5125,
+      "EventConditionMessage": 5126,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
@@ -1484,7 +1519,7 @@
       "PreShowPar": 0,
       "NPCID": 157,
       "LanID": [
-        5126
+        5127
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1503,7 +1538,7 @@
       "PreShowPar": 0,
       "NPCID": 157,
       "LanID": [
-        5127
+        5128
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1522,7 +1557,7 @@
       "PreShowPar": 0,
       "NPCID": 157,
       "LanID": [
-        5128
+        5129
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1541,7 +1576,7 @@
       "PreShowPar": 0,
       "NPCID": 158,
       "LanID": [
-        5129
+        5130
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1560,7 +1595,7 @@
       "PreShowPar": 0,
       "NPCID": 158,
       "LanID": [
-        5130
+        5131
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1579,7 +1614,7 @@
       "PreShowPar": 0,
       "NPCID": 159,
       "LanID": [
-        5131
+        5132
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1598,7 +1633,7 @@
       "PreShowPar": 0,
       "NPCID": 159,
       "LanID": [
-        5132
+        5133
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1617,7 +1652,7 @@
       "PreShowPar": 0,
       "NPCID": 159,
       "LanID": [
-        5133
+        5134
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1636,7 +1671,7 @@
       "PreShowPar": 0,
       "NPCID": 159,
       "LanID": [
-        5134
+        5135
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1655,7 +1690,7 @@
       "PreShowPar": 0,
       "NPCID": 160,
       "LanID": [
-        5135
+        5136
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1674,7 +1709,7 @@
       "PreShowPar": 0,
       "NPCID": 137,
       "LanID": [
-        5136
+        5137
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1693,7 +1728,7 @@
       "PreShowPar": 0,
       "NPCID": 137,
       "LanID": [
-        5137
+        5138
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1704,8 +1739,8 @@
         1000014
       ],
       "optionPara2": [
-        5138,
-        5139
+        5139,
+        5140
       ],
       "ResultType": 1,
       "ResultOptions": [
@@ -1720,7 +1755,7 @@
       "PreShowPar": 0,
       "NPCID": 137,
       "LanID": [
-        5140
+        5141
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1739,7 +1774,7 @@
       "PreShowPar": 0,
       "NPCID": 137,
       "LanID": [
-        5141
+        5142
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1758,7 +1793,7 @@
       "PreShowPar": 0,
       "NPCID": 137,
       "LanID": [
-        5142
+        5143
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1777,7 +1812,7 @@
       "PreShowPar": 0,
       "NPCID": 137,
       "LanID": [
-        5143
+        5144
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1787,7 +1822,7 @@
         1000017
       ],
       "optionPara2": [
-        5144
+        5145
       ],
       "ResultType": 1,
       "ResultOptions": [
@@ -1802,7 +1837,7 @@
       "PreShowPar": 0,
       "NPCID": 137,
       "LanID": [
-        5145
+        5146
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1812,7 +1847,7 @@
         1000018
       ],
       "optionPara2": [
-        5146
+        5147
       ],
       "ResultType": 1,
       "ResultOptions": [
@@ -1827,7 +1862,7 @@
       "PreShowPar": 0,
       "NPCID": 137,
       "LanID": [
-        5147
+        5148
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1837,7 +1872,7 @@
         1000019
       ],
       "optionPara2": [
-        5148
+        5149
       ],
       "ResultType": 1,
       "ResultOptions": [
@@ -1852,7 +1887,7 @@
       "PreShowPar": 0,
       "NPCID": 137,
       "LanID": [
-        5149
+        5150
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1871,7 +1906,7 @@
       "PreShowPar": 0,
       "NPCID": 157,
       "LanID": [
-        5150
+        5151
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1890,7 +1925,7 @@
       "PreShowPar": 0,
       "NPCID": 161,
       "LanID": [
-        5151
+        5152
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1909,7 +1944,7 @@
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5152
+        5153
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1919,13 +1954,13 @@
     },
     {
       "ID": 1000101,
-      "conciseEventMessage": 5153,
+      "conciseEventMessage": 5154,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5154
+        5155
       ],
       "DialogueType": 2,
       "EventID": 10001,
@@ -1938,13 +1973,13 @@
     },
     {
       "ID": 1000102,
-      "conciseEventMessage": 5153,
+      "conciseEventMessage": 5154,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5155
+        5156
       ],
       "DialogueType": 2,
       "EventID": 10001,
@@ -1957,13 +1992,13 @@
     },
     {
       "ID": 1000103,
-      "conciseEventMessage": 5153,
+      "conciseEventMessage": 5154,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5156
+        5157
       ],
       "DialogueType": 2,
       "EventID": 10001,
@@ -1976,7 +2011,7 @@
     },
     {
       "ID": 1000104,
-      "conciseEventMessage": 5153,
+      "conciseEventMessage": 5154,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
@@ -1995,13 +2030,13 @@
     },
     {
       "ID": 1000201,
-      "conciseEventMessage": 5157,
-      "EventConditionMessage": 5158,
+      "conciseEventMessage": 5158,
+      "EventConditionMessage": 5159,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5159
+        5160
       ],
       "DialogueType": 2,
       "EventID": 10002,
@@ -2014,13 +2049,13 @@
     },
     {
       "ID": 1000202,
-      "conciseEventMessage": 5157,
-      "EventConditionMessage": 5158,
+      "conciseEventMessage": 5158,
+      "EventConditionMessage": 5159,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5160
+        5161
       ],
       "DialogueType": 2,
       "EventID": 10002,
@@ -2033,8 +2068,8 @@
     },
     {
       "ID": 1000203,
-      "conciseEventMessage": 5157,
-      "EventConditionMessage": 5158,
+      "conciseEventMessage": 5158,
+      "EventConditionMessage": 5159,
       "PreShow": 1,
       "PreShowPar": 5,
       "NPCID": 0,
@@ -2049,13 +2084,13 @@
     },
     {
       "ID": 1000301,
-      "conciseEventMessage": 5161,
+      "conciseEventMessage": 5162,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5162
+        5163
       ],
       "DialogueType": 2,
       "EventID": 10003,
@@ -2068,13 +2103,13 @@
     },
     {
       "ID": 1000302,
-      "conciseEventMessage": 5161,
+      "conciseEventMessage": 5162,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
-        5163
+        5164
       ],
       "DialogueType": 2,
       "EventID": 10003,
@@ -2087,13 +2122,13 @@
     },
     {
       "ID": 1000303,
-      "conciseEventMessage": 5161,
+      "conciseEventMessage": 5162,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 101,
       "LanID": [
-        5164
+        5165
       ],
       "DialogueType": 0,
       "EventID": 10003,
@@ -2103,7 +2138,7 @@
         1000304
       ],
       "optionPara2": [
-        5165
+        5166
       ],
       "ResultType": 1,
       "ResultOptions": [
@@ -2112,13 +2147,13 @@
     },
     {
       "ID": 1000304,
-      "conciseEventMessage": 5161,
+      "conciseEventMessage": 5162,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 102,
       "LanID": [
-        5166
+        5167
       ],
       "DialogueType": 0,
       "EventID": 10003,
@@ -2131,13 +2166,13 @@
     },
     {
       "ID": 1000305,
-      "conciseEventMessage": 5161,
+      "conciseEventMessage": 5162,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 102,
       "LanID": [
-        5167
+        5168
       ],
       "DialogueType": 0,
       "EventID": 10003,
@@ -2147,7 +2182,7 @@
         1000306
       ],
       "optionPara2": [
-        5168
+        5169
       ],
       "ResultType": 1,
       "ResultOptions": [
@@ -2156,13 +2191,13 @@
     },
     {
       "ID": 1000306,
-      "conciseEventMessage": 5161,
+      "conciseEventMessage": 5162,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 102,
       "LanID": [
-        5169
+        5170
       ],
       "DialogueType": 0,
       "EventID": 10003,
@@ -2175,24 +2210,22 @@
     },
     {
       "ID": 1000307,
-      "conciseEventMessage": 5161,
+      "conciseEventMessage": 5162,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
       "NPCID": 102,
       "LanID": [
-        5170
+        5171
       ],
       "DialogueType": 0,
       "EventID": 10003,
       "step": 7,
       "optionType": 1,
       "optionPara1": [
-        1000308,
         1000308
       ],
       "optionPara2": [
-        5171,
         5172
       ],
       "ResultType": 1,
@@ -2202,7 +2235,7 @@
     },
     {
       "ID": 1000308,
-      "conciseEventMessage": 5161,
+      "conciseEventMessage": 5162,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
@@ -2227,7 +2260,7 @@
     },
     {
       "ID": 1000309,
-      "conciseEventMessage": 5161,
+      "conciseEventMessage": 5162,
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,

Assets/Res/Config/GroupConfig.json

@@ -397,10 +397,10 @@
     {
       "ID": 10001,
       "GroupMonsterLevel": [
-        202
+        210
       ],
       "GroupMonster": [
-        9005
+        7003
       ]
     },
     {
@@ -634,7 +634,7 @@
         1005
       ],
       "hpQiangDu": [
-        80
+        100
       ],
       "attQiangDu": [
         80
@@ -649,7 +649,7 @@
         1006
       ],
       "hpQiangDu": [
-        85
+        100
       ],
       "attQiangDu": [
         85
@@ -664,7 +664,7 @@
         1007
       ],
       "hpQiangDu": [
-        90
+        100
       ],
       "attQiangDu": [
         90
@@ -679,7 +679,7 @@
         1008
       ],
       "hpQiangDu": [
-        95
+        100
       ],
       "attQiangDu": [
         95
@@ -709,7 +709,7 @@
         1005
       ],
       "hpQiangDu": [
-        80
+        100
       ],
       "attQiangDu": [
         80
@@ -724,7 +724,7 @@
         1006
       ],
       "hpQiangDu": [
-        85
+        100
       ],
       "attQiangDu": [
         85
@@ -739,7 +739,7 @@
         1007
       ],
       "hpQiangDu": [
-        90
+        100
       ],
       "attQiangDu": [
         90
@@ -754,7 +754,7 @@
         1008
       ],
       "hpQiangDu": [
-        95
+        100
       ],
       "attQiangDu": [
         95

Assets/Res/Config/HeroModelConfig.json

@@ -124,10 +124,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 101,
-      "hp": 77,
+      "attack": 98,
+      "hp": 74,
       "def": 100,
-      "shield": 77,
+      "shield": 74,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -181,10 +181,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 92,
-      "hp": 84,
+      "attack": 89,
+      "hp": 81,
       "def": 100,
-      "shield": 84,
+      "shield": 81,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -238,10 +238,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 84,
-      "hp": 93,
+      "attack": 81,
+      "hp": 89,
       "def": 100,
-      "shield": 93,
+      "shield": 89,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -296,10 +296,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 75,
-      "hp": 104,
+      "attack": 72,
+      "hp": 100,
       "def": 100,
-      "shield": 104,
+      "shield": 100,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -354,10 +354,10 @@
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 62,
-      "hp": 126,
+      "attack": 60,
+      "hp": 121,
       "def": 100,
-      "shield": 126,
+      "shield": 121,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -412,10 +412,10 @@
       "model": "gw_xianhe",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 79,
-      "hp": 98,
+      "attack": 77,
+      "hp": 94,
       "def": 100,
-      "shield": 98,
+      "shield": 94,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -470,10 +470,10 @@
       "model": "gw_huli",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 97,
-      "hp": 80,
+      "attack": 94,
+      "hp": 77,
       "def": 100,
-      "shield": 80,
+      "shield": 77,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -528,10 +528,10 @@
       "model": "Gw_zhizhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 114,
-      "hp": 68,
+      "attack": 111,
+      "hp": 65,
       "def": 100,
-      "shield": 68,
+      "shield": 65,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -586,10 +586,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 103,
-      "hp": 85,
+      "attack": 101,
+      "hp": 84,
       "def": 100,
-      "shield": 85,
+      "shield": 84,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -644,10 +644,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 85,
-      "hp": 104,
+      "attack": 83,
+      "hp": 102,
       "def": 100,
-      "shield": 104,
+      "shield": 102,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -702,10 +702,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 94,
-      "hp": 94,
+      "attack": 92,
+      "hp": 92,
       "def": 100,
-      "shield": 94,
+      "shield": 92,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -760,10 +760,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 113,
-      "hp": 78,
+      "attack": 110,
+      "hp": 77,
       "def": 100,
-      "shield": 78,
+      "shield": 77,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -818,10 +818,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 75,
-      "hp": 118,
+      "attack": 74,
+      "hp": 115,
       "def": 100,
-      "shield": 118,
+      "shield": 115,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -876,10 +876,10 @@
       "model": "Boss_ShuGuai",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 108,
-      "hp": 82,
+      "attack": 106,
+      "hp": 80,
       "def": 100,
-      "shield": 82,
+      "shield": 80,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -934,10 +934,10 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 99,
-      "hp": 90,
+      "attack": 97,
+      "hp": 88,
       "def": 100,
-      "shield": 90,
+      "shield": 88,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -993,7 +993,7 @@
       "isUseGpu": false,
       "heroType": 4,
       "attack": 100,
-      "hp": 70,
+      "hp": 80,
       "def": 100,
       "shield": 100,
       "speed_atk": 0.0,
@@ -1340,10 +1340,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 88,
-      "hp": 44,
+      "attack": 85,
+      "hp": 43,
       "def": 100,
-      "shield": 88,
+      "shield": 85,
       "speed_atk": 2.0,
       "Linggen": [
         100,
@@ -1398,10 +1398,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 88,
-      "hp": 88,
+      "attack": 85,
+      "hp": 102,
       "def": 100,
-      "shield": 88,
+      "shield": 85,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1447,6 +1447,64 @@
         80
       ],
       "heroStory": 0
+    },
+    {
+      "ID": 7003,
+      "nickName": -1,
+      "name": 21,
+      "headicon": "icon_tx101",
+      "model": "Nanzhu",
+      "isUseGpu": false,
+      "heroType": 4,
+      "attack": 30,
+      "hp": 200,
+      "def": 100,
+      "shield": 100,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        2005,
+        1404,
+        2006,
+        1401,
+        2007,
+        -1,
+        1402,
+        2017,
+        1403,
+        -1
+      ],
+      "skillActiveLv": [
+        1,
+        1,
+        1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        1,
+        1
+      ],
+      "fa_bao_id": [
+        10002,
+        10010,
+        10007,
+        10004
+      ],
+      "fabaoActiveLv": [
+        1,
+        -1,
+        1,
+        -1
+      ],
+      "heroStory": 0
     }
   ]
 }

Assets/Res/Config/InitialPlayerConfig.json

@@ -10,9 +10,9 @@
         1004
       ],
       "itemAmount": [
-        30000,
+        50000,
+        5000,
         8000,
-        6000,
         1,
         300
       ],

Assets/Res/Config/LanguageChineseConfig.json

@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4077,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4078,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4079,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4080,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4081,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4084,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4085,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4086,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4087,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4088,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4089,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4090,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4093,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4094,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4095,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4096,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4097,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4098,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4099,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4102,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4193,
@@ -17078,7 +17078,7 @@
     },
     {
       "ID": 5010,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你发现一只落单的妖邪，应战！"
     },
     {
       "ID": 5011,
@@ -17150,7 +17150,7 @@
     },
     {
       "ID": 5028,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你发现一只落单的妖邪，应战！"
     },
     {
       "ID": 5029,
@@ -17170,7 +17170,7 @@
     },
     {
       "ID": 5033,
-      "txt": "使用神识探得资源你遇到一只拦路的妖兽，它看起来饥肠辘辘"
+      "txt": "使用神识探得资源"
     },
     {
       "ID": 5034,
@@ -17222,7 +17222,7 @@
     },
     {
       "ID": 5046,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你发现一只落单的妖邪，应战！"
     },
     {
       "ID": 5047,
@@ -17294,7 +17294,7 @@
     },
     {
       "ID": 5064,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你发现一只落单的妖邪，应战！"
     },
     {
       "ID": 5065,
@@ -17366,7 +17366,7 @@
     },
     {
       "ID": 5082,
-      "txt": "此处仙气缭绕，你用神识一探果然探得丰富资源！"
+      "txt": "你发现一只落单的妖邪，应战！"
     },
     {
       "ID": 5083,
@@ -17418,311 +17418,311 @@
     },
     {
       "ID": 5095,
-      "txt": "你扔出一块鹿肉，趁它抢食之际，你祭出腰间的法宝"
+      "txt": "你遇到一只拦路的妖兽，它看起来饥肠辘辘"
     },
     {
       "ID": 5096,
-      "txt": "你成功诱捕了怪物，并从它身上吸取了一些修为"
+      "txt": "你扔出一块鹿肉，趁它抢食之际，你祭出腰间的法宝"
     },
     {
       "ID": 5097,
-      "txt": "你偶遇一处仙气四溢无人生活的洞穴"
+      "txt": "你成功诱捕了怪物，并从它身上吸取了一些修为"
     },
     {
       "ID": 5098,
-      "txt": "不知哪位高人在洞穴内壁留下绝世秘籍"
+      "txt": "你偶遇一处仙气四溢无人生活的洞穴"
     },
     {
       "ID": 5099,
-      "txt": "你仔细研读后，功法得到精进"
+      "txt": "不知哪位高人在洞穴内壁留下绝世秘籍"
     },
     {
       "ID": 5100,
-      "txt": "你偶然发现一只枯萎的葫芦，但泛着蓝光"
+      "txt": "你仔细研读后，功法得到精进"
     },
     {
       "ID": 5101,
-      "txt": "好奇的你凑近一看，不知谁将这件法宝遗落于此"
+      "txt": "你偶然发现一只枯萎的葫芦，但泛着蓝光"
     },
     {
       "ID": 5102,
-      "txt": "但法宝已经枯竭，你后悔没有早点发现它"
+      "txt": "好奇的你凑近一看，不知谁将这件法宝遗落于此"
     },
     {
       "ID": 5103,
-      "txt": "最后你从法宝中回收了一些玄晶"
+      "txt": "但法宝已经枯竭，你后悔没有早点发现它"
     },
     {
       "ID": 5104,
-      "txt": "你路过一座矿山，一个闪光点引起了你的注意"
+      "txt": "最后你从法宝中回收了一些玄晶"
     },
     {
       "ID": 5105,
-      "txt": "原来这是一颗珍贵的绿玛瑙"
+      "txt": "你路过一座矿山，一个闪光点引起了你的注意"
     },
     {
       "ID": 5106,
-      "txt": "你祭出法宝，将它转化成一些灵石"
+      "txt": "原来这是一颗珍贵的绿玛瑙"
     },
     {
       "ID": 5107,
-      "txt": "漫漫旅途，你通过神识释放增进不少阅历"
+      "txt": "你祭出法宝，将它转化成一些灵石"
     },
     {
       "ID": 5108,
-      "txt": "但随之而来的是神识用尽的空虚感"
+      "txt": "漫漫旅途，你通过神识释放增进不少阅历"
     },
     {
       "ID": 5109,
-      "txt": "但这种感受何尝又不是一种新的阅历呢"
+      "txt": "但随之而来的是神识用尽的空虚感"
     },
     {
       "ID": 5110,
-      "txt": "你将这些新的感悟存进了一颗神识丹"
+      "txt": "但这种感受何尝又不是一种新的阅历呢"
     },
     {
       "ID": 5111,
-      "txt": "两只体型硕大的妖兽正在为了一颗灵丹而缠斗"
+      "txt": "你将这些新的感悟存进了一颗神识丹"
     },
     {
       "ID": 5112,
-      "txt": "突然一道闪电自天而降，正中两只妖兽"
+      "txt": "两只体型硕大的妖兽正在为了一颗灵丹而缠斗"
     },
     {
       "ID": 5113,
-      "txt": "何其悲哉，念完往生咒，你顺手拿走了这颗珍贵的妖丹"
+      "txt": "突然一道闪电自天而降，正中两只妖兽"
     },
     {
       "ID": 5114,
-      "txt": "你在闭关修炼时，感受到一股凌厉的剑意波动。深入探查，发现一名白衣剑修“清霜”盘坐于谷中，周围剑气环绕，正与一柄散发不祥气息的灵剑对峙。她似在参悟剑诀，却灵气不足，剑灵桀骜。"
+      "txt": "何其悲哉，念完往生咒，你顺手拿走了这颗珍贵的妖丹"
     },
     {
       "ID": 5115,
-      "txt": "你上前以剑意对抗剑灵"
+      "txt": "你在闭关修炼时，感受到一股凌厉的剑意波动。深入探查，发现一名白衣剑修“清霜”盘坐于谷中，周围剑气环绕，正与一柄散发不祥气息的灵剑对峙。她似在参悟剑诀，却灵气不足，剑灵桀骜。"
     },
     {
       "ID": 5116,
-      "txt": "成功压制剑灵，清霜赠你“霜华剑符”并结下道友之谊"
+      "txt": "你上前以剑意对抗剑灵"
     },
     {
       "ID": 5117,
-      "txt": "你察觉谷中灵气匮乏，清霜剑意凝滞。神识探查得知，附近秘境可采集“玄冰花”"
+      "txt": "成功压制剑灵，清霜赠你“霜华剑符”并结下道友之谊"
     },
     {
       "ID": 5118,
-      "txt": "献上玄冰花，清霜炼化灵气突破瓶颈，赠你“玄霜剑意”"
+      "txt": "你察觉谷中灵气匮乏，清霜剑意凝滞。神识探查得知，附近秘境可采集“玄冰花”"
     },
     {
       "ID": 5119,
-      "txt": "和惠子交谈"
+      "txt": "献上玄冰花，清霜炼化灵气突破瓶颈，赠你“玄霜剑意”"
     },
     {
       "ID": 5120,
-      "txt": "惠子种的葫芦没用，他非常生气，需要打败魔休"
+      "txt": "和惠子交谈"
     },
     {
       "ID": 5121,
-      "txt": "选择后接新的事件"
+      "txt": "惠子种的葫芦没用，他非常生气，需要打败魔休"
     },
     {
       "ID": 5122,
-      "txt": "接受任务"
+      "txt": "选择后接新的事件"
     },
     {
       "ID": 5123,
-      "txt": "击杀魔休"
+      "txt": "接受任务"
     },
     {
       "ID": 5124,
-      "txt": "出现Boss魔修"
+      "txt": "击杀魔休"
     },
     {
       "ID": 5125,
-      "txt": "打败魔修"
+      "txt": "出现Boss魔修"
     },
     {
       "ID": 5126,
-      "txt": "（渡劫失败后，悬浮于混沌虚空，破碎道袍微微飘动，丹田空虚。）"
+      "txt": "打败魔修"
     },
     {
       "ID": 5127,
-      "txt": "还是做不到吗……多次渡劫，又功亏一篑！"
+      "txt": "（渡劫失败后，悬浮于混沌虚空，破碎道袍微微飘动，丹田空虚。）"
     },
     {
       "ID": 5128,
-      "txt": "好在神魂未灭，不过一身修为几乎散尽，只剩练气修为……"
+      "txt": "还是做不到吗……多次渡劫，又功亏一篑！"
     },
     {
       "ID": 5129,
-      "txt": "此处是何地？"
+      "txt": "好在神魂未灭，不过一身修为几乎散尽，只剩练气修为……"
     },
     {
       "ID": 5130,
-      "txt": "（虚空中，一块石碑若隐若现，上书：“无何有之乡”。）"
+      "txt": "此处是何地？"
     },
     {
       "ID": 5131,
-      "txt": "（忽然，一本古卷从天而落，落入掌中）"
+      "txt": "（虚空中，一块石碑若隐若现，上书：“无何有之乡”。）"
     },
     {
       "ID": 5132,
-      "txt": "（书封斑驳，触之微凉，似有灵气流转）"
+      "txt": "（忽然，一本古卷从天而落，落入掌中）"
     },
     {
       "ID": 5133,
-      "txt": "（你翻开书页，不自觉的低声诵读..）"
+      "txt": "（书封斑驳，触之微凉，似有灵气流转）"
     },
     {
       "ID": 5134,
-      "txt": "北冥有鱼，其名为鲲。鲲之大，不知其几千里也……"
+      "txt": "（你翻开书页，不自觉的低声诵读..）"
     },
     {
       "ID": 5135,
-      "txt": "（随着吟诵，泛起缕缕清气，虚空震颤，一道白鹤般的身影自混沌中现身，仙风道骨，目光如星。）"
+      "txt": "北冥有鱼，其名为鲲。鲲之大，不知其几千里也……"
     },
     {
       "ID": 5136,
-      "txt": "“小友的诵读，出自《逍遥游》。可知逍遥为何物？"
+      "txt": "（随着吟诵，泛起缕缕清气，虚空震颤，一道白鹤般的身影自混沌中现身，仙风道骨，目光如星。）"
     },
     {
       "ID": 5137,
-      "txt": "鲲鹏扶摇九天，究竟是真实存在，还是心之所向？"
+      "txt": "“小友的诵读，出自《逍遥游》。可知逍遥为何物？"
     },
     {
       "ID": 5138,
-      "txt": "渡劫失败，谈何逍遥？晚辈只求重返仙途！"
+      "txt": "鲲鹏扶摇九天，究竟是真实存在，还是心之所向？"
     },
     {
       "ID": 5139,
-      "txt": "何为逍遥？请前辈开示。"
+      "txt": "渡劫失败，谈何逍遥？晚辈只求重返仙途！"
     },
     {
       "ID": 5140,
-      "txt": " 你虽执着于飞升，却屡败不悟，谈何仙途？"
+      "txt": "何为逍遥？请前辈开示。"
     },
     {
       "ID": 5141,
-      "txt": " 逍遥存于内心。你心有执念，怎得逍遥？"
+      "txt": " 你虽执着于飞升，却屡败不悟，谈何仙途？"
     },
     {
       "ID": 5142,
-      "txt": "（冲虚真人扫过你破碎的道袍，叹息道）凡界、仙界、魔界，皆是棋盘，你只是棋子。"
+      "txt": " 逍遥存于内心。你心有执念，怎得逍遥？"
     },
     {
       "ID": 5143,
-      "txt": "若只是棋子，又如何能窥见天道？"
+      "txt": "（冲虚真人扫过你破碎的道袍，叹息道）凡界、仙界、魔界，皆是棋盘，你只是棋子。"
     },
     {
       "ID": 5144,
-      "txt": "前辈说得玄妙，可有具体指引？"
+      "txt": "若只是棋子，又如何能窥见天道？"
     },
     {
       "ID": 5145,
-      "txt": "参透七道心境，才有望窥见天道..\n去吧，历红尘，破心障，游三界，方能领悟。"
+      "txt": "前辈说得玄妙，可有具体指引？"
     },
     {
       "ID": 5146,
-      "txt": "七道心境？那是何物，请前辈指点？"
+      "txt": "参透七道心境，才有望窥见天道..\n去吧，历红尘，破心障，游三界，方能领悟。"
     },
     {
       "ID": 5147,
-      "txt": "天机不可泄露。\n（说罢，从袖中拿出一个风铃..）\n但此风铃，可以为你指引前路。"
+      "txt": "七道心境？那是何物，请前辈指点？"
     },
     {
       "ID": 5148,
-      "txt": "多谢前辈赠铃.."
+      "txt": "天机不可泄露。\n（说罢，从袖中拿出一个风铃..）\n但此风铃，可以为你指引前路。"
     },
     {
       "ID": 5149,
-      "txt": "（凝视远方，喃喃道）\n凡界有尧，欲让天下而不得其法；\n惠子得大葫芦，却不知其用；\n姑射仙山，藏无形之仙；\n列子可御风而行，却任有所求。\n（说完，便化作清风消散。）"
+      "txt": "多谢前辈赠铃.."
     },
     {
       "ID": 5150,
-      "txt": ".....\n“逍遥之意，何处可寻？”"
+      "txt": "（凝视远方，喃喃道）\n凡界有尧，欲让天下而不得其法；\n惠子得大葫芦，却不知其用；\n姑射仙山，藏无形之仙；\n列子可御风而行，却任有所求。\n（说完，便化作清风消散。）"
     },
     {
       "ID": 5151,
-      "txt": "算了，先看看这个风铃。\n(你拿起刚刚获得的风铃，仔细看了一下)"
+      "txt": ".....\n“逍遥之意，何处可寻？”"
     },
     {
       "ID": 5152,
-      "txt": "铃身刻有“逍遥”二字，铃声清脆悠远，似有灵性，隐约指向北海."
+      "txt": "算了，先看看这个风铃。\n(你拿起刚刚获得的风铃，仔细看了一下)"
     },
     {
       "ID": 5153,
-      "txt": "使用风铃唤醒还未泯灭的神识"
+      "txt": "铃身刻有“逍遥”二字，铃声清脆悠远，似有灵性，隐约指向北海."
     },
     {
       "ID": 5154,
-      "txt": "北冥有鱼，其名为鲲……"
+      "txt": "使用风铃唤醒还未泯灭的神识"
     },
     {
       "ID": 5155,
-      "txt": "不过北海遥远，何时能寻得鲲鹏的踪迹。"
+      "txt": "北冥有鱼，其名为鲲……"
     },
     {
       "ID": 5156,
-      "txt": "好在我的神识尚在，可探天地，再加上刚刚的风铃，或许能寻得前路线索。"
+      "txt": "不过北海遥远，何时能寻得鲲鹏的踪迹。"
     },
     {
       "ID": 5157,
-      "txt": "前往妖兽盘踞的地方"
+      "txt": "好在我的神识尚在，可探天地，再加上刚刚的风铃，或许能寻得前路线索。"
     },
     {
       "ID": 5158,
-      "txt": "御剑飞行"
+      "txt": "前往妖兽盘踞的地方"
     },
     {
       "ID": 5159,
-      "txt": "神识发现有一条古径，隐于云山之间，不过似乎有妖兽盘踞。"
+      "txt": "御剑飞行"
     },
     {
       "ID": 5160,
-      "txt": "没其他办法了，过去看看吧。"
+      "txt": "神识发现有一条古径，隐于云山之间，不过似乎有妖兽盘踞。"
     },
     {
       "ID": 5161,
-      "txt": "蜩鸟和小麻雀对你的到来很好奇"
+      "txt": "没其他办法了，过去看看吧。"
     },
     {
       "ID": 5162,
-      "txt": "应该就是这里了，似乎有古老的阵法挡住了去路"
+      "txt": "蜩鸟和小麻雀对你的到来很好奇"
     },
     {
       "ID": 5163,
-      "txt": "（结界门前，三只小鸟飞来，落在一旁古松上）"
+      "txt": "应该就是这里了，似乎有古老的阵法挡住了去路"
     },
     {
       "ID": 5164,
-      "txt": "（拍翅）：“咦？又是妄图穿行北海之人？”"
+      "txt": "（结界门前，三只小鸟飞来，落在一旁古松上）"
     },
     {
       "ID": 5165,
-      "txt": "我在寻找鲲鹏，你们知道它在哪里吗？"
+      "txt": "（拍翅）：“咦？又是妄图穿行北海之人？”"
     },
     {
       "ID": 5166,
-      "txt": "（扑棱翅膀）是想要从北海飞往南海的超级大鸟吧？"
+      "txt": "我在寻找鲲鹏，你们知道它在哪里吗？"
     },
     {
       "ID": 5167,
-      "txt": "我就想不明白，她为何要飞如此之远，太奇怪啦！"
+      "txt": "（扑棱翅膀）是想要从北海飞往南海的超级大鸟吧？"
     },
     {
       "ID": 5168,
-      "txt": "鲲鹏是在追求心中的目标吧。"
+      "txt": "我就想不明白，她为何要飞如此之远，太奇怪啦！"
     },
     {
       "ID": 5169,
-      "txt": "（偏头想了想）目标？我天天在这里上蹿下跳，在附近树林飞来飞去，就已经很幸福啦。"
+      "txt": "鲲鹏是在追求心中的目标吧。"
     },
     {
       "ID": 5170,
-      "txt": "就那大傻鸟，非要飞那么远，又笨又蠢...真没意思。"
+      "txt": "（偏头想了想）目标？我天天在这里上蹿下跳，在附近树林飞来飞去，就已经很幸福啦。"
     },
     {
       "ID": 5171,
-      "txt": "你说得也有一定道理…"
+      "txt": "就那大傻鸟，非要飞那么远，又笨又蠢...真没意思。"
     },
     {
       "ID": 5172,
@@ -21646,7 +21646,7 @@
     },
     {
       "ID": 6152,
-      "txt": "他脖子上带有我为他祈求的平安符。就是这种。（老李将平安符拿给玩家看）"
+      "txt": "谢谢仙师！有劳了！"
     },
     {
       "ID": 6153,
@@ -38730,7 +38730,7 @@
     },
     {
       "ID": 10423,
-      "txt": "点这里确认购买"
+      "txt": "这里可以用代金卷免费兑换稀有资源"
     },
     {
       "ID": 10424,

Assets/Res/Config/SkillConfig.json

@@ -10404,7 +10404,7 @@
       "level": 1,
       "effectUpK": 100,
       "effectValue": [
-        20.0,
+        30.0,
         50.0
       ],
       "PromoteLan": 0
@@ -10426,7 +10426,7 @@
       "level": 2,
       "effectUpK": 100,
       "effectValue": [
-        23.0,
+        35.0,
         50.0
       ],
       "PromoteLan": 0
@@ -10448,7 +10448,7 @@
       "level": 3,
       "effectUpK": 100,
       "effectValue": [
-        26.0,
+        40.0,
         50.0
       ],
       "PromoteLan": 0
@@ -10470,7 +10470,7 @@
       "level": 4,
       "effectUpK": 100,
       "effectValue": [
-        29.0,
+        45.0,
         50.0
       ],
       "PromoteLan": 0
@@ -10492,7 +10492,7 @@
       "level": 5,
       "effectUpK": 100,
       "effectValue": [
-        32.0,
+        50.0,
         50.0
       ],
       "PromoteLan": 0
@@ -10514,7 +10514,7 @@
       "level": 6,
       "effectUpK": 100,
       "effectValue": [
-        35.0,
+        55.0,
         50.0
       ],
       "PromoteLan": 0

Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab

@@ -3094,39 +3094,39 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 338933279804513873, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 338933279804513873, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 338933279804513873, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 38
       objectReference: {fileID: 0}
     - target: {fileID: 338933279804513873, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -36
       objectReference: {fileID: 0}
     - target: {fileID: 391061909760223855, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 391061909760223855, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 391061909760223855, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 190
       objectReference: {fileID: 0}
     - target: {fileID: 391061909760223855, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -36
       objectReference: {fileID: 0}
     - target: {fileID: 436368807920140684, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 190
       objectReference: {fileID: 0}
     - target: {fileID: 436368807920140684, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_LocalScale.x
@@ -3158,23 +3158,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 544340637007268772, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1398198344503143719, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1398198344503143719, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1398198344503143719, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 152
       objectReference: {fileID: 0}
     - target: {fileID: 1398198344503143719, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -36
       objectReference: {fileID: 0}
     - target: {fileID: 1997086601353049712, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_SizeDelta.x
@@ -3190,19 +3190,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2075704369294728403, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2075704369294728403, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2075704369294728403, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 114
       objectReference: {fileID: 0}
     - target: {fileID: 2075704369294728403, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -36
       objectReference: {fileID: 0}
     - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_Pivot.x
@@ -3286,19 +3286,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2867061352453296888, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2867061352453296888, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2867061352453296888, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 76
       objectReference: {fileID: 0}
     - target: {fileID: 2867061352453296888, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -36
       objectReference: {fileID: 0}
     - target: {fileID: 3937650637442666922, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_IsActive

Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab

@@ -1787,6 +1787,7 @@ RectTransform:
   - {fileID: 5584341330677092523}
   - {fileID: 4534880848114758260}
   - {fileID: 116889275732161449}
+  - {fileID: 4726773570345976831}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1842,18 +1843,13 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Slider_SmallJD
-    gameObject: {fileID: 0}
+  - key: Text_Go
+    gameObject: {fileID: 8932349408704961495}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Text_TanSuDu
-    gameObject: {fileID: 0}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_Go
-    gameObject: {fileID: 8932349408704961495}
+  - key: GuideHand
+    gameObject: {fileID: 4726773570345976830}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -1947,3 +1943,126 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1001 &5452356507890735754
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 9037135992368401232}
+    m_Modifications:
+    - target: {fileID: 734780393184598388, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_Name
+      value: GuideHand
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598388, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1255425239809916940, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6514837214852521581, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6928099528430643331, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+--- !u!1 &4726773570345976830 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 734780393184598388, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+  m_PrefabInstance: {fileID: 5452356507890735754}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &4726773570345976831 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+  m_PrefabInstance: {fileID: 5452356507890735754}
+  m_PrefabAsset: {fileID: 0}

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -82,7 +82,7 @@ public class DialogueManager : Singleton<DialogueManager>
         {
             var eventLinkDatas = CurrentEventList.eventLinks.FirstOrDefault(el => el.eventLinkId == dialogueID);
             if (eventLinkDatas != null &&
-                !EventSystemManager.Instance.CeekEventGroupComplete(eventLinkDatas.eventConditions))
+                !EventSystemManager.Instance.IsCeekEventGroupComplete(eventLinkDatas.eventConditions))
             {
                 if (isShowTips)
                     EventTipsPanel.OpenPanel(eventLinkDatas);

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -58,14 +58,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
         }
 
-        //进入游戏全部检测一次
-        foreach (var playerDataEventLinkData in AccountFileInfo.Instance.playerData.eventList)
-        {
-            foreach (var eventLinkData in playerDataEventLinkData.eventLinks)
-            {
-                CeekEventGroupComplete(eventLinkData.eventConditions);
-            }
-        }
+  
 
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         EventManager.Instance.AddEventListener(CustomEventType.DetectRandomEvent, RenfenceRandomEvent);
@@ -692,11 +685,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     TipMessagePanel tipMessagePanel = await TipMessagePanel.OpenTipMessagePanel(
                         LanguageManager.Instance.Text(10379,
                             LanguageManager.Instance.Text(lastSmallPlacesConfig.placeName),
-                            lastSmallPlacesConfig.CompletionEventCount-lastSmallPlacesData.completionEventCount));
+                            lastSmallPlacesConfig.CompletionEventCount - lastSmallPlacesData.completionEventCount));
                     if (PlayerGuideManager.Instance.GuideIsCanDo(3))
                     {
                         PlayerGuideManager.Instance.SetGuid(3);
                     }
+
                     AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
@@ -722,7 +716,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
                 CTask<bool> cT = CTask<bool>.Create();
 
-                PlacesInfoPanel.OpenPanel(SmallPlacesConfig.PlacesId, (b) => { cT.SetResult(b); });
+                PlacesInfoPanel.OpenPanel(SmallPlacesConfig.PlacesId, (b) => { cT.SetResult(b); },
+                    eventConfig.SmallPlacesId);
 
                 await cT;
                 if (eventConfig.SmallPlacesId != PlayerManager.Instance.CurrentsmallPlaces.id)
@@ -797,6 +792,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         {
             CancelEvent(CurrentEventList);
             cTask.SetResult();
+            
         });
         uiOpenOverCallBack?.Invoke();
 
@@ -852,7 +848,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         return false;
     }
 
-    public bool CeekEventGroupComplete(List<AccountFileInfo.EventConditionData> eventConditions)
+    public bool IsCeekEventGroupComplete(List<AccountFileInfo.EventConditionData> eventConditions)
     {
         Map<int, List<AccountFileInfo.EventConditionData>> eventConditionDataGroup =
             new Map<int, List<AccountFileInfo.EventConditionData>>();
@@ -904,8 +900,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     CeekTaskComplete(eventConditionData, type, value);
                 }
             }
+            if (playerDataEventLinkData.eventID == 10001 && playerDataEventLinkData.curStep == 1000104 &&
+                IsCeekEventGroupComplete(playerDataEventLinkData.eventLinks[3].eventConditions))
+            {
+                TriggerEvent(playerDataEventLinkData);
+            }
         }
-
+        
         EventManager.Instance.Dispatch(CustomEventType.RemoveEvent, null);
     }
 

Assets/Scripts/GameUI/UI/DialoguePanel/DialogueOptionWidget.cs

@@ -45,7 +45,7 @@ namespace Fort23.Mono
             this.callback = callback;
             
 
-            if (eventLinkData != null &&!EventSystemManager.Instance.CeekEventGroupComplete(eventLinkData.eventConditions))
+            if (eventLinkData != null &&!EventSystemManager.Instance.IsCeekEventGroupComplete(eventLinkData.eventConditions))
             {
                 transform.Gray();
             }

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -445,7 +445,7 @@ namespace Fort23.Mono
         private async void SelectOption(DialogueOptionWidget obj)
         {
             if (obj.eventLinkData != null &&
-                !EventSystemManager.Instance.CeekEventGroupComplete(obj.eventLinkData.eventConditions))
+                !EventSystemManager.Instance.IsCeekEventGroupComplete(obj.eventLinkData.eventConditions))
             {
                 bool isOk = await EventTipsPanel.OpenPanel(obj.eventLinkData);
 

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase7.cs

@@ -206,20 +206,20 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep706(UnityEngine.Object obj)
         {
             pgm.StepInit();
-            await TimerComponent.Instance.WaitAsync(100);
+            // await TimerComponent.Instance.WaitAsync(100);
 
-            GameObject gameObject =
-                UIManager.Instance.GetComponent<ShopBuyItemPanel>().Btn_Function.gameObject;
-            Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
-            Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
+            // GameObject gameObject =
+            //     UIManager.Instance.GetComponent<ShopBuyItemPanel>().Btn_Function.gameObject;
+            // Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
+            // Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
 
-            pgm.SetfxTransVisiable(true);
-            pgm.SetMaskTarget(gameObject);
-            pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
-            await pgm.ConfigLogic(706, delegate() { });
+            // pgm.SetfxTransVisiable(true);
+            // pgm.SetMaskTarget(gameObject);
+            // pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
+            await pgm.ConfigLogic(706, delegate() { pgm.NextGuide(); });
 
-            pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
-            pgm.SetFingerVisiable(true);
+            // pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
+            // pgm.SetFingerVisiable(true);
 
             UIManager.Instance.HideUIUIPanel<ShopPanel>();
         }

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -7,6 +7,7 @@ using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -14,6 +15,7 @@ namespace Fort23.Mono
     public partial class PlacesInfoPanel : UIPanel
     {
         private int PlacesId;
+        private int needSmallPlacesId;
         private SmallPlacesConfig smallPlacesConfig;
         private PlacesConfig placesConfig;
 
@@ -22,6 +24,8 @@ namespace Fort23.Mono
         private Action<bool> callBack;
         public bool isChange;
 
+        private PlacesInfoWidget currentNeedPlacesInfoWidget;
+
         private void Init()
         {
             isPopUi = true;
@@ -41,19 +45,25 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
+
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             PlacesId = (int)(uiData[0]);
             callBack = uiData[1] as Action<bool>;
-
+            needSmallPlacesId = (int)(uiData[2]);
             isChange = false;
             placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(PlacesId);
 
+
             foreach (var placesConfigSmallPlacersId in placesConfig.SmallPlacersIds)
             {
                 PlacesInfoWidget shopBtnWidget =
                     await UIManager.Instance.CreateGComponent<PlacesInfoWidget>(null, Content);
                 shopBtnWidget.CustomInit(placesConfigSmallPlacersId, callBack);
+                if (needSmallPlacesId == shopBtnWidget.smallPlacesConfig.ID && shopBtnWidget.isUlock)
+                {
+                    currentNeedPlacesInfoWidget = shopBtnWidget;
+                }
 
                 placesInfoWidgets.Add(shopBtnWidget);
             }
@@ -66,15 +76,32 @@ namespace Fort23.Mono
 
             AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(placesConfig.ID);
             int jindu = placesData == null ? 0 : placesData.progress;
-            Text_PlacesComplteProgress.text = LanguageManager.Instance.Text(10378, (jindu/placesConfig.TotalScore*100f).ToString("0"));
+            Text_PlacesComplteProgress.text =
+                LanguageManager.Instance.Text(10378, (jindu / placesConfig.TotalScore * 100f).ToString("0"));
             return await base.AsyncInit(uiData);
         }
 
 
-        public static async CTask OpenPanel(int placesId, Action<bool> callBack)
+        public override CTask Show()
+        {
+            if (currentNeedPlacesInfoWidget != null)
+            {
+                Vector3 localPos = transform.InverseTransformPoint(currentNeedPlacesInfoWidget.transform.position);
+                Vector2 size = currentNeedPlacesInfoWidget.transform.sizeDelta;
+
+                GuideHand.transform.localPosition = PlayerGuideManager.Instance.GetProperPos(localPos, size,
+                    currentNeedPlacesInfoWidget.GObjectPoolInterface);
+            }
+
+            GuideHand.gameObject.SetActive(currentNeedPlacesInfoWidget != null);
+
+            return base.Show();
+        }
+
+        public static async CTask OpenPanel(int placesId, Action<bool> callBack, int needSmallPlacesId = 0)
         {
             await UIManager.Instance.LoadAndOpenPanel<PlacesInfoPanel>(null, UILayer.Top,
-                uiData: new object[] { placesId, callBack }, isShowBG: true);
+                uiData: new object[] { placesId, callBack, needSmallPlacesId }, isShowBG: true);
         }
 
         public async override CTask Close()
@@ -93,6 +120,8 @@ namespace Fort23.Mono
                 callBack = null;
             }
 
+            currentNeedPlacesInfoWidget = null;
+
             await base.Close();
         }
     }

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanelData.cs

@@ -85,37 +85,26 @@ namespace Fort23.Mono
 	      return _Content;
 	     }
 	   }
-	  private Slider _Slider_SmallJD;
-	  public Slider Slider_SmallJD
-	   {
-	   get{
-	      if (_Slider_SmallJD == null)
-	       {
-	         _Slider_SmallJD  = GetUIUnit<Slider>("Slider_SmallJD"); 
-	       }
-	      return _Slider_SmallJD;
-	     }
-	   }
-	  private Text _Text_TanSuDu;
-	  public Text Text_TanSuDu
+	  private Text _Text_Go;
+	  public Text Text_Go
 	   {
 	   get{
-	      if (_Text_TanSuDu == null)
+	      if (_Text_Go == null)
 	       {
-	         _Text_TanSuDu  = GetUIUnit<Text>("Text_TanSuDu"); 
+	         _Text_Go  = GetUIUnit<Text>("Text_Go"); 
 	       }
-	      return _Text_TanSuDu;
+	      return _Text_Go;
 	     }
 	   }
-	  private Text _Text_Go;
-	  public Text Text_Go
+	  private GameObject _GuideHand;
+	  public GameObject GuideHand
 	   {
 	   get{
-	      if (_Text_Go == null)
+	      if (_GuideHand == null)
 	       {
-	         _Text_Go  = GetUIUnit<Text>("Text_Go"); 
+	         _GuideHand  = GetUIUnit<GameObject>("GuideHand"); 
 	       }
-	      return _Text_Go;
+	      return _GuideHand;
 	     }
 	   }
 	  #endregion 自定义数据结束 

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoWidget.cs

@@ -11,9 +11,11 @@ namespace Fort23.Mono
     {
         private AccountFileInfo.SmallPlacesData currentSmallPlacesData;
         private AccountFileInfo.SmallPlacesData lastSmallPlacesData;
-        private SmallPlacesConfig smallPlacesConfig;
+        public SmallPlacesConfig smallPlacesConfig;
         private Action<bool> callBack;
 
+        public bool isUlock;
+
         private void Init()
         {
         }
@@ -160,7 +162,7 @@ namespace Fort23.Mono
 
             Icon_Places.icon_name = smallPlacesConfig.placeIcon;
 
-            bool isUlock = IsSmallPlacesDataUlock(smallPlacesConfig.ID);
+             isUlock = IsSmallPlacesDataUlock(smallPlacesConfig.ID);
 
 
             if (currentSmallPlacesData == null && isUlock)