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.49184418
+    - _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.19341296
+    - _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.22744322
+    - _Alpha: 0.21369332
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.17958128
+    - _MainTexOffsetU: 0.19573247
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/DivineSenseConfig.json

@@ -11,7 +11,7 @@
         0.0
       ],
       "exp": 400,
-      "MaxNum": 2
+      "MaxNum": 4
     },
     {
       "ID": 2,
@@ -24,7 +24,7 @@
         0.0
       ],
       "exp": 900,
-      "MaxNum": 3
+      "MaxNum": 5
     },
     {
       "ID": 3,
@@ -37,7 +37,7 @@
         0.0
       ],
       "exp": 1200,
-      "MaxNum": 4
+      "MaxNum": 6
     },
     {
       "ID": 4,
@@ -50,7 +50,7 @@
         0.0
       ],
       "exp": 2000,
-      "MaxNum": 5
+      "MaxNum": 7
     },
     {
       "ID": 5,
@@ -63,7 +63,7 @@
         0.0
       ],
       "exp": 2400,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 6,
@@ -76,7 +76,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 7,
@@ -89,7 +89,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 8,
@@ -102,7 +102,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 9,
@@ -115,7 +115,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 10,
@@ -128,7 +128,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 11,
@@ -141,7 +141,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 12,
@@ -154,7 +154,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 13,
@@ -167,7 +167,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 14,
@@ -180,7 +180,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 15,
@@ -193,7 +193,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 16,
@@ -206,7 +206,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 17,
@@ -219,7 +219,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 18,
@@ -232,7 +232,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 19,
@@ -245,7 +245,7 @@
         0.0
       ],
       "exp": 3000,
-      "MaxNum": 6
+      "MaxNum": 8
     },
     {
       "ID": 20,
@@ -258,7 +258,7 @@
         0.0
       ],
       "exp": 3000000,
-      "MaxNum": 6
+      "MaxNum": 8
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -6438,6 +6438,7 @@
         915003,
         915004,
         915005,
+        915006,
         102,
         103
       ],
@@ -6475,6 +6476,7 @@
         915106,
         915107,
         915108,
+        915109,
         102,
         103
       ],
@@ -6512,6 +6514,7 @@
         915206,
         915207,
         915208,
+        915209,
         102,
         103
       ],
@@ -6557,6 +6560,7 @@
         915308,
         915309,
         915310,
+        915311,
         102,
         103
       ],

Assets/Res/Config/EventLinkConfig.json

@@ -1334,7 +1334,7 @@
       "DialogueType": 0,
       "EventID": 0,
       "step": 0,
-      "optionType": 1,
+      "optionType": 0,
       "optionPara1": [
         9004,
         9006
@@ -1358,7 +1358,7 @@
       "DialogueType": 0,
       "EventID": 0,
       "step": 0,
-      "optionType": 2,
+      "optionType": 0,
       "optionPara1": [
         100001
       ],
@@ -1451,7 +1451,7 @@
       "DialogueType": 0,
       "EventID": 0,
       "step": 0,
-      "optionType": 1,
+      "optionType": 0,
       "optionPara1": [
         9026
       ],
@@ -1473,7 +1473,7 @@
       "DialogueType": 0,
       "EventID": 0,
       "step": 0,
-      "optionType": 0,
+      "optionType": 1,
       "ResultType": 0,
       "ResultOptions": [
         9014
@@ -1505,7 +1505,7 @@
       "DialogueType": 0,
       "EventID": 0,
       "step": 0,
-      "optionType": 2,
+      "optionType": 0,
       "optionPara1": [
         100001
       ],
@@ -3472,7 +3472,10 @@
       "DialogueType": 0,
       "EventID": 10011,
       "step": 5,
-      "optionType": 0,
+      "optionType": 1,
+      "optionPara1": [
+        1001106
+      ],
       "optionPara2": [
         5258
       ],
@@ -6383,7 +6386,7 @@
       "DialogueType": 0,
       "EventID": 10025,
       "step": 7,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         20001
       ],
@@ -7336,7 +7339,7 @@
       "ConditionId": [
         27
       ],
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1003
       ],
@@ -9620,10 +9623,7 @@
       "DialogueType": 0,
       "EventID": 30009,
       "step": 1,
-      "optionType": 2,
-      "optionPara1": [
-        10001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1301
       ],
@@ -9711,7 +9711,7 @@
       "DialogueType": 0,
       "EventID": 1018,
       "step": 3,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1202
       ],
@@ -9736,7 +9736,7 @@
       "DialogueType": 0,
       "EventID": 1018,
       "step": 4,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1201
       ],
@@ -9843,10 +9843,7 @@
       "DialogueType": 0,
       "EventID": 1020,
       "step": 2,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1203
       ],
@@ -9916,7 +9913,7 @@
       "ConditionId": [
         19
       ],
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1203
       ],
@@ -9938,10 +9935,7 @@
       "DialogueType": 0,
       "EventID": 30010,
       "step": 1,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -10134,7 +10128,7 @@
       "ConditionId": [
         20
       ],
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -10200,10 +10194,7 @@
       "DialogueType": 0,
       "EventID": 1024,
       "step": 2,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -10229,7 +10220,7 @@
       "DialogueType": 0,
       "EventID": 1024,
       "step": 3,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -10279,10 +10270,7 @@
       "DialogueType": 0,
       "EventID": 1025,
       "step": 2,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -10506,10 +10494,7 @@
       "DialogueType": 0,
       "EventID": 1028,
       "step": 5,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -11371,7 +11356,7 @@
       "step": 1,
       "optionType": 2,
       "optionPara1": [
-        30017
+        3016
       ],
       "ResultType": 2,
       "ResultOptions": [
@@ -22685,13 +22670,10 @@
       "optionPara2": [
         1
       ],
-      "PrizeIDs": [
-        1402
-      ],
-      "PrizeNums": [
-        1
-      ],
-      "ResultType": 0
+      "ResultType": 1,
+      "ResultOptions": [
+        915006
+      ]
     },
     {
       "ID": 915004,
@@ -22706,7 +22688,7 @@
       "DialogueType": 0,
       "EventID": 9150,
       "step": 4,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -22734,6 +22716,25 @@
       "optionType": 0,
       "ResultType": 0
     },
+    {
+      "ID": 915006,
+      "conciseEventMessage": 6565,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 9150,
+      "step": 6,
+      "optionType": 3,
+      "PrizeIDs": [
+        1402
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 0
+    },
     {
       "ID": 915101,
       "conciseEventMessage": 6574,
@@ -22856,13 +22857,10 @@
       "optionPara2": [
         100
       ],
-      "PrizeIDs": [
-        23200
-      ],
-      "PrizeNums": [
-        1
-      ],
-      "ResultType": 0
+      "ResultType": 1,
+      "ResultOptions": [
+        915109
+      ]
     },
     {
       "ID": 915107,
@@ -22896,7 +22894,7 @@
       "DialogueType": 0,
       "EventID": 9151,
       "step": 8,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -22905,6 +22903,25 @@
       ],
       "ResultType": 0
     },
+    {
+      "ID": 915109,
+      "conciseEventMessage": 0,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 9151,
+      "step": 9,
+      "optionType": 3,
+      "PrizeIDs": [
+        23200
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 0
+    },
     {
       "ID": 915201,
       "conciseEventMessage": 6586,
@@ -22985,7 +23002,7 @@
       "DialogueType": 0,
       "EventID": 9152,
       "step": 4,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -23074,6 +23091,22 @@
       "optionPara2": [
         100
       ],
+      "ResultType": 1,
+      "ResultOptions": [
+        915209
+      ]
+    },
+    {
+      "ID": 915209,
+      "conciseEventMessage": 0,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 9152,
+      "step": 9,
+      "optionType": 3,
       "PrizeIDs": [
         23200
       ],
@@ -23169,15 +23202,9 @@
       "optionPara2": [
         100
       ],
-      "PrizeIDs": [
-        23200
-      ],
-      "PrizeNums": [
-        1
-      ],
       "ResultType": 1,
       "ResultOptions": [
-        915305
+        915311
       ]
     },
     {
@@ -23288,7 +23315,7 @@
       "DialogueType": 0,
       "EventID": 9153,
       "step": 10,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],
@@ -23297,6 +23324,25 @@
       ],
       "ResultType": 0
     },
+    {
+      "ID": 915311,
+      "conciseEventMessage": 0,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 9153,
+      "step": 11,
+      "optionType": 3,
+      "PrizeIDs": [
+        23200
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "ResultType": 0
+    },
     {
       "ID": 915401,
       "conciseEventMessage": 6612,
@@ -23386,7 +23432,7 @@
       "DialogueType": 0,
       "EventID": 9154,
       "step": 5,
-      "optionType": 0,
+      "optionType": 3,
       "PrizeIDs": [
         1001
       ],

Assets/Res/Config/GameConstantConfig.json

@@ -35,7 +35,7 @@
         120,
         240
       ],
-      "RefreshRelevanceEventProbability": 50,
+      "RefreshRelevanceEventProbability": 100,
       "shenshiRecoverSpeed": [
         12.0,
         1.0

Assets/Res/Config/GroupConfig.json

@@ -394,6 +394,15 @@
         9001
       ]
     },
+    {
+      "ID": 3016,
+      "GroupMonsterLevel": [
+        80
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
     {
       "ID": 10001,
       "GroupMonsterLevel": [

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,
@@ -17054,7 +17054,7 @@
     },
     {
       "ID": 5004,
-      "txt": "失败了怎么多次，这次一定要突破心魔。"
+      "txt": "失败了这么多次，这次一定要突破心魔。"
     },
     {
       "ID": 5005,
@@ -22222,7 +22222,7 @@
     },
     {
       "ID": 6296,
-      "txt": "不要感到惊讶，你虽屏蔽了神识，但我有宗门法宝窥识珠，能识方圆10公里修仙者。"
+      "txt": "不要感到惊讶，你虽屏蔽了神识，但我有宗门法宝窥识珠，能识方圆十里的修仙者。"
     },
     {
       "ID": 6297,
@@ -22238,7 +22238,7 @@
     },
     {
       "ID": 6300,
-      "txt": "（惊讶）你早知我以到此地？"
+      "txt": "（惊讶）你早知我已到此地？"
     },
     {
       "ID": 6301,
@@ -37602,7 +37602,7 @@
     },
     {
       "ID": 10141,
-      "txt": "每完成一个神识事件，都增加当前地点的探索度;再完成{0}个事件就可以把北海.海边探索完毕了;去看看。"
+      "txt": "这是目前探得的神识事件；去看看吧！"
     },
     {
       "ID": 10142,
@@ -38787,6 +38787,54 @@
     {
       "ID": 10437,
       "txt": "道友未解锁！"
+    },
+    {
+      "ID": 10438,
+      "txt": "浪涌沙轻海风扬，天蓝水阔意茫茫。"
+    },
+    {
+      "ID": 10439,
+      "txt": "奇花异草绕幽径，神秘气息引探行。"
+    },
+    {
+      "ID": 10440,
+      "txt": "碧波之上浮岛奇，珍禽异草梦如诗。"
+    },
+    {
+      "ID": 10441,
+      "txt": "幽暗深蓝藏秘境，奇光异影梦魂萦。"
+    },
+    {
+      "ID": 10442,
+      "txt": "尧都宫阙接云霞，万民朝拜共繁华。"
+    },
+    {
+      "ID": 10443,
+      "txt": "尧都山林翠色深，清泉鸟鸣隐仙音。"
+    },
+    {
+      "ID": 10444,
+      "txt": "尧都郊外稻花香，牧童横笛伴夕阳。"
+    },
+    {
+      "ID": 10445,
+      "txt": "雾锁山门苔径深，凡尘未净望云岑。"
+    },
+    {
+      "ID": 10446,
+      "txt": "石滑风急步难行，叶隙灵光引仙登。"
+    },
+    {
+      "ID": 10447,
+      "txt": "千辛踏尽见仙庭，一念逍遥万念宁。"
+    },
+    {
+      "ID": 10448,
+      "txt": "法宝准备好了，点击这里使用"
+    },
+    {
+      "ID": 10449,
+      "txt": "同时使用的法宝，会开始比拼！"
     }
   ]
 }

Assets/Res/Config/LevelbattleConfig.json

@@ -340,6 +340,16 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 3016,
+      "Group": [
+        3016
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 10001,
       "Group": [

Assets/Res/Config/PlayerGuideConfig.json

@@ -381,7 +381,7 @@
       "SpeakerName": 0,
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
-      "desc": 10140,
+      "desc": -1,
       "Highlighting": 1,
       "blackAlpha": 0.55,
       "Handle": 1,
@@ -1301,6 +1301,84 @@
       "ForceOnclick": 0,
       "forceText": 1,
       "voiceFile": ""
+    },
+    {
+      "ID": 901,
+      "Index": 1,
+      "NeedLevel": 0,
+      "groupID": 9,
+      "FingerType": 1,
+      "dialogPos": [
+        -182,
+        -517
+      ],
+      "NpcPos": [
+        422,
+        -100
+      ],
+      "NpcSize": [
+        500,
+        500
+      ],
+      "SpeakerName": 0,
+      "SpeakerStyle": 1,
+      "SpeakerImage": 3,
+      "desc": 10448,
+      "Highlighting": 1,
+      "AwardItem": [
+        1002
+      ],
+      "AwardItemNum": [
+        2700
+      ],
+      "blackAlpha": 0.0,
+      "Handle": 1,
+      "IsSkip": 0,
+      "TextSize": [
+        1240,
+        157
+      ],
+      "reversalFinger": 1,
+      "reversalBox": 2,
+      "ForceOnclick": 1,
+      "forceText": 1,
+      "voiceFile": ""
+    },
+    {
+      "ID": 902,
+      "Index": 2,
+      "NeedLevel": 0,
+      "groupID": 9,
+      "FingerType": 1,
+      "dialogPos": [
+        -182,
+        -517
+      ],
+      "NpcPos": [
+        422,
+        -100
+      ],
+      "NpcSize": [
+        500,
+        500
+      ],
+      "SpeakerName": 0,
+      "SpeakerStyle": 1,
+      "SpeakerImage": 3,
+      "desc": 10449,
+      "Highlighting": 1,
+      "blackAlpha": 0.0,
+      "Handle": 1,
+      "IsSkip": 0,
+      "TextSize": [
+        1240,
+        157
+      ],
+      "reversalFinger": 1,
+      "reversalBox": 2,
+      "ForceOnclick": 0,
+      "forceText": 1,
+      "voiceFile": ""
     }
   ]
 }

Assets/Res/Config/SmallPlacesConfig.json

@@ -3,7 +3,7 @@
     {
       "ID": 1,
       "placeName": 10037,
-      "placeDesc": 0,
+      "placeDesc": 10438,
       "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 1,
       "CompletionEventCount": 5,
@@ -13,7 +13,7 @@
     {
       "ID": 2,
       "placeName": 10038,
-      "placeDesc": 0,
+      "placeDesc": 10439,
       "placeIcon": "bg_map_xdd_haibian",
       "PlacesId": 1,
       "CompletionEventCount": 4,
@@ -23,7 +23,7 @@
     {
       "ID": 3,
       "placeName": 10039,
-      "placeDesc": 0,
+      "placeDesc": 10440,
       "placeIcon": "bg_map_xdd_mijing",
       "PlacesId": 1,
       "CompletionEventCount": 6,
@@ -33,7 +33,7 @@
     {
       "ID": 4,
       "placeName": 10040,
-      "placeDesc": 0,
+      "placeDesc": 10441,
       "placeIcon": "bg_10040",
       "PlacesId": 1,
       "CompletionEventCount": 8,
@@ -43,7 +43,7 @@
     {
       "ID": 5,
       "placeName": 10041,
-      "placeDesc": 0,
+      "placeDesc": 10442,
       "placeIcon": "bg_10041",
       "PlacesId": 2,
       "CompletionEventCount": 10,
@@ -53,7 +53,7 @@
     {
       "ID": 6,
       "placeName": 10042,
-      "placeDesc": 0,
+      "placeDesc": 10443,
       "placeIcon": "bg_10042",
       "PlacesId": 2,
       "CompletionEventCount": 10,
@@ -63,7 +63,7 @@
     {
       "ID": 7,
       "placeName": 10043,
-      "placeDesc": 0,
+      "placeDesc": 10444,
       "placeIcon": "bg_10043",
       "PlacesId": 2,
       "CompletionEventCount": 10,
@@ -73,7 +73,7 @@
     {
       "ID": 8,
       "placeName": 10044,
-      "placeDesc": 0,
+      "placeDesc": 10445,
       "placeIcon": "bg_10044",
       "PlacesId": 3,
       "CompletionEventCount": 10,
@@ -83,7 +83,7 @@
     {
       "ID": 9,
       "placeName": 10045,
-      "placeDesc": 0,
+      "placeDesc": 10446,
       "placeIcon": "bg_10045",
       "PlacesId": 3,
       "CompletionEventCount": 10,
@@ -93,7 +93,7 @@
     {
       "ID": 10,
       "placeName": 10046,
-      "placeDesc": 0,
+      "placeDesc": 10447,
       "placeIcon": "bg_10046",
       "PlacesId": 3,
       "CompletionEventCount": -1,

Assets/Res/UI/BoxPanel/WidgetItemType2.prefab

@@ -328,6 +328,7 @@ GameObject:
   - component: {fileID: 7957917780475828645}
   - component: {fileID: 3323885914582972465}
   - component: {fileID: 4361466827399270368}
+  - component: {fileID: 601692356227923924}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon_SuiPian
@@ -353,7 +354,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 27, y: 32}
+  m_SizeDelta: {x: 45, y: 45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3323885914582972465
 CanvasRenderer:
@@ -393,19 +394,35 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_chouka_suipian
+  _icon_name: icon_suipian
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 425a9eab85b24b74b81413be06f42b76, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: chouka
-    packgJsonPath: /Art/UIAssets/TextrueJson\chouka.txt
-    packgSpritePath: Assets/Res/UIAtlas/chouka.spriteatlasv2
-    lasetJsonGUID: d884f25912221810fe344e7b1e77ccc2
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 738ec5908281e178b7c40618cc12b514
   imageH: 78.167946
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &601692356227923924
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2228955867083360576}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  effectColor: {r: 0.7264149, g: 0.42735037, b: 0.30153063, a: 1}
+  effectDistanceX: 1
+  effectDistanceY: 1
+  samplingRate: 10
 --- !u!1 &3820391084866158623
 GameObject:
   m_ObjectHideFlags: 0
@@ -740,8 +757,8 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 7
-  m_Spacing: 6.91
+  m_ChildAlignment: 4
+  m_Spacing: 2
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -1040,7 +1057,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &646260402244696982
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1057,8 +1074,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: 7.5, y: 17.8}
-  m_SizeDelta: {x: 43.5479, y: 43.5479}
+  m_AnchoredPosition: {x: 4, y: 12}
+  m_SizeDelta: {x: 78.0353, y: 98.7017}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5725457208173664469
 CanvasRenderer:
@@ -1123,6 +1140,7 @@ GameObject:
   - component: {fileID: 1507516687379950841}
   - component: {fileID: 4035756139084935713}
   - component: {fileID: 637556485701324123}
+  - component: {fileID: 2632687183539169689}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -1147,8 +1165,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 58.41, y: -21.027552}
-  m_SizeDelta: {x: 49, y: 35.3449}
+  m_AnchoredPosition: {x: 71, y: -19.35}
+  m_SizeDelta: {x: 48, y: 35.3449}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1507516687379950841
 CanvasRenderer:
@@ -1171,7 +1189,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.21176472, g: 0.20000002, b: 0.18039216, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1179,13 +1197,13 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 30
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 6
+    m_MaxSize: 44
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -1206,3 +1224,19 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!114 &2632687183539169689
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9204525041625646555}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 1.5
+  effectDistanceY: 1.5
+  samplingRate: 10

Assets/Res/UI/Canvas/Canvas.prefab

@@ -432,7 +432,7 @@ MonoBehaviour:
   m_RendererIndex: -1
   m_VolumeLayerMask:
     serializedVersion: 2
-    m_Bits: 0
+    m_Bits: 32
   m_VolumeTrigger: {fileID: 0}
   m_VolumeFrameworkUpdateModeOption: 2
   m_RenderPostProcessing: 1

Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -118,7 +118,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 189.53296, y: -49.37755}
-  m_SizeDelta: {x: 0, y: 96.45}
+  m_SizeDelta: {x: 108, y: 96.45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5304083428607473890
 CanvasRenderer:

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -1232,6 +1232,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
             await rewardsPanel.UIClosed();
         }
 
+        if (eventConfig.EventTriggerType == 4)
+        {
+            await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
+            UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
+        }
 
         if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid)
         {
@@ -1262,7 +1267,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// 取消事件
     /// </summary>
     /// <param name="eventID">事件ID</param>
-    public void CancelEvent(AccountFileInfo.EventList eventList)
+    public async void CancelEvent(AccountFileInfo.EventList eventList)
     {
         LogTool.Log($"取消事件{eventList.eventID}");
         isTriggerEvent = false;
@@ -1271,7 +1276,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
         CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
         onCompleteCallback?.Invoke();
         onCompleteCallback = null;
-
+        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))
         {

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -264,7 +264,7 @@ namespace Fort23.Mono
         {
             currentOpenUIPanel = uiPanel;
 
-
+            DivineSensePointChange(null);
             UpdateUitoggleState();
         }
 

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

@@ -60,6 +60,7 @@ namespace Fort23.Mono
                             {
                                 AccountFileInfo.Instance.playerData.divineSensePoint +=
                                     itemInfo.config.associateVlaue[0];
+                                EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
                                 PlayerManager.Instance.BagController.DeductItem(itemInfo.config.ID, 1);
                             }
                         }
@@ -81,6 +82,7 @@ namespace Fort23.Mono
                         AccountFileInfo.Instance.playerData.divineSensePoint +=
                             itemConfig.associateVlaue[0];
                         PlayerManager.Instance.BagController.DeductItem(itemConfig.ID, 1);
+                        EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
                         UIManager.Instance.GetComponent<DivineSenceRestoredPanel>().CreatWidget();
                     }
                     else

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

@@ -156,20 +156,20 @@ namespace Fort23.Mono
                 Text_Eventcondition.text = desc;
             }
 
-            if (eventList.isCompleted)
-            {
-                Text_Go.text = LanguageManager.Instance.Text(10240);
-                Btn_Go.image.color = new Color32(200, 199, 199, 255);
-            }
-            else if (eventList.isCompleted1)
-            {
-                Text_Go.text = LanguageManager.Instance.Text(10157);
-                Btn_Go.image.color = new Color32(206, 168, 105, 255);
-            }
-            else
-            {
-                Btn_Go.image.color = new Color32(206, 168, 105, 255);
-            }
+            // if (eventList.isCompleted)
+            // {
+            //     Text_Go.text = LanguageManager.Instance.Text(10240);
+            //     Btn_Go.image.color = new Color32(200, 199, 199, 255);
+            // }
+            // else if (eventList.isCompleted1)
+            // {
+            //     Text_Go.text = LanguageManager.Instance.Text(10157);
+            //     Btn_Go.image.color = new Color32(179, 39, 65, 255);
+            // }
+            // else
+            // {
+            //     Btn_Go.image.color = new Color32(206, 168, 105, 255);
+            // }
 
 
             Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=

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

@@ -104,7 +104,7 @@ namespace Fort23.Mono.Phases
             pgm.SetfxTransVisiable(true);
             pgm.SetMaskTarget(gameObject);
             pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
-            await pgm.ConfigLogic(602, delegate() { });
+            await pgm.ConfigLogic(802, delegate() { });
 
             pgm.SetFingerPos(localPos);
             pgm.SetFingerVisiable(true);

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

@@ -0,0 +1,133 @@
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Combat;
+using GameLogic.Combat.CombatTool;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono.Phases
+{
+    public class Phase9 : IGuideLogic
+    {
+        public PlayerGuideManager pgm;
+
+        private bool once = false;
+
+        public Phase9(PlayerGuideManager guideManager)
+        {
+            this.pgm = guideManager;
+            once = true;
+        }
+
+        public override void Active()
+        {
+            base.Active();
+            actionList.Add(OnStep901);
+            actionList.Add(OnStep902);
+            actionList.Add(OnStepEnd);
+        }
+
+        public override void Begin()
+        {
+            guideID =9;
+            guideIdx = -1;
+            pgm.isForceDone = false;
+            pgm.isTriggerDone = false;
+        }
+
+        public override void End()
+        {
+        }
+
+        public override async CTask Guide()
+        {
+            if (actionList.Count > guideIdx)
+            {
+                pgm.ResetPlayerGuide();
+                guideIdx++;
+
+
+                SaveStep(guideIdx);
+                await actionList[guideIdx](null);
+            }
+            else
+            {
+                LogTool.Error("没有引导了，强制结束。出错步骤，：" + pgm.curPhase + guideIdx);
+                pgm.isForceDone = true;
+            }
+        }
+
+        public override void LogicRelase()
+        {
+            actionList.Clear();
+        }
+
+        public override void LogicUpdate()
+        {
+        }
+
+
+        /// <summary>
+        /// 点击宝箱
+        /// </summary>
+        /// <param name="obj"></param>
+        public async CTask OnStep901(UnityEngine.Object obj)
+        {
+            pgm.StepInit();
+            await TimerComponent.Instance.WaitAsync(100);
+            GameObject gameObject = UIManager.Instance.GetComponent<MainPanel>().Btn_Box.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(901, delegate() { });
+
+            pgm.SetFingerPos(localPos);
+            pgm.SetFingerVisiable(true);
+        }
+
+        /// <summary>
+        /// 点十连抽
+        /// </summary>
+        /// <param name="obj"></param>
+        public async CTask OnStep902(UnityEngine.Object obj)
+        {
+            pgm.StepInit();
+            await TimerComponent.Instance.WaitAsync(100);
+            GameObject gameObject = UIManager.Instance.GetComponent<BoxPanel>().oneButton.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(902, delegate() { });
+
+            pgm.SetFingerPos(localPos);
+            pgm.SetFingerVisiable(true);
+        }
+
+
+        public async CTask OnStepEnd(UnityEngine.Object obj)
+        {
+            pgm.StepInit();
+            pgm.SetBlackBaseVisiable(false);
+
+            ForceGuideOver();
+        }
+
+        /// <summary>
+        /// 引导完成
+        /// </summary>
+        private async void ForceGuideOver()
+        {
+            pgm.CloseForceGuide();
+            pgm.RestGuide();
+            await UIManager.Instance.HideUIUIPanel<GachaPanel>();
+
+            UIManager.Instance.HideUIUIPanel<BoxPanel>();
+        }
+    }
+}

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase9.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bc438fb9d820446cab103d23ef9d7ebc
+timeCreated: 1761546523