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.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/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,
@@ -38730,7 +38730,7 @@
     },
     {
       "ID": 10423,
-      "txt": "点这里确认购买"
+      "txt": "这里可以用代金卷免费兑换稀有资源"
     },
     {
       "ID": 10424,

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)