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
+    - _Alpha: 0.017855883
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _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.2207349
+    - _Alpha: 0.5004834
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.1874206
+    - _MainTexOffsetU: -0.105480194
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 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: 108, y: 96.45}
+  m_SizeDelta: {x: 0, y: 96.45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5304083428607473890
 CanvasRenderer:

Assets/Res/UI/LevelChoosePanel/PlacesInfoWidget.prefab

@@ -929,7 +929,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 4.0237, y: 0.7521}
-  m_SizeDelta: {x: 108.0475, y: 30.3291}
+  m_SizeDelta: {x: 182.9447, y: 51.353}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6482916863988794459
 CanvasRenderer:
@@ -1061,7 +1061,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000011444092, y: 0}
+  m_AnchoredPosition: {x: 0.000015258789, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6269718719758085347
@@ -1094,7 +1094,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 19
+    m_FontSize: 36
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -464,7 +464,7 @@ public class PlayerManager : Singleton<PlayerManager>
         }
     }
 
-    public async CTask ChangeMap(int mapId)
+    public async CTask ChangeMap(int mapId,bool isShowUI = true)
     {
         SmallPlacesConfig currentSmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
         SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(mapId);
@@ -528,7 +528,8 @@ public class PlayerManager : Singleton<PlayerManager>
 
     
         await _cTask;
-        UIManager.Instance.ShowLastHindAllShowPanel();
+        if(isShowUI)
+            UIManager.Instance.ShowLastHindAllShowPanel();
         EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
     }
 

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

@@ -50,6 +50,12 @@ namespace Fort23.Mono
         protected override void AddEvent()
         {
             EventManager.Instance.AddEventListener(CustomEventType.RemoveEvent, RemoveEvent);
+            EventManager.Instance.AddEventListener(CustomEventType.CompleteUpdate, CompleteUpdate);
+        }
+
+        private void CompleteUpdate(IEventData e)
+        {
+            UpdateContent();
         }
 
 
@@ -61,6 +67,7 @@ namespace Fort23.Mono
         protected override void DelEvent()
         {
             EventManager.Instance.RemoveEventListener(CustomEventType.RemoveEvent, RemoveEvent);
+            EventManager.Instance.RemoveEventListener(CustomEventType.CompleteUpdate, CompleteUpdate);
         }
 
         public override void AddButtonEvent()
@@ -118,8 +125,8 @@ namespace Fort23.Mono
                 toggleList.ShowTargetIndex(0);
                 TitleRoot.SetActive(true);
                 Rect_Sv.SetParent(Sv1root);
-                Rect_Sv.offsetMax =Vector2.zero;
-                Rect_Sv.offsetMin =Vector2.zero;
+                Rect_Sv.offsetMax = Vector2.zero;
+                Rect_Sv.offsetMin = Vector2.zero;
                 // Rect_Sv.sizeDelta = new Vector2(718.82f, 844.7f);
                 // Rect_Sv.anchoredPosition = new Vector2(2.61f, -190.52f);
                 Text_Tips.gameObject.SetActive(false);
@@ -145,8 +152,8 @@ namespace Fort23.Mono
                 TitleRoot.SetActive(false);
 
                 Rect_Sv.SetParent(Sv2root);
-                Rect_Sv.offsetMax =Vector2.zero;
-                Rect_Sv.offsetMin =Vector2.zero;
+                Rect_Sv.offsetMax = Vector2.zero;
+                Rect_Sv.offsetMin = Vector2.zero;
                 Text_Tips.gameObject.SetActive(showEventList.Count > 0);
             }
 
@@ -236,7 +243,7 @@ namespace Fort23.Mono
                 if (shengShiEventWidgetType2.eventList.isCompleted1)
                 {
                     EventSystemManager.Instance.CompleteEvent(shengShiEventWidgetType2.eventList);
-                    UpdateContent();
+                    // UpdateContent();
                     return;
                 }
             }
@@ -247,7 +254,7 @@ namespace Fort23.Mono
             EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
             {
                 isTriggerEvent = false;
-                UpdateContent();
+                // UpdateContent();
             });
         }
 

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

@@ -80,7 +80,7 @@ namespace Fort23.Mono
 
                 await UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
                 await UIManager.Instance.HideUIUIPanel<PlacesInfoPanel>();
-                await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
+                await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID, false);
 
                 if (currentSmallPlacesConfig.PlacesId == smallPlacesConfig.PlacesId)
                 {
@@ -95,6 +95,7 @@ namespace Fort23.Mono
                     await bigPlacesChangeInfoPanel.UIClosed();
                 }
 
+                UIManager.Instance.ShowLastHindAllShowPanel();
 
                 callBack?.Invoke(true);
                 callBack = null;
@@ -122,7 +123,7 @@ namespace Fort23.Mono
                         ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
 
                     //切换下一个地图
-                    await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
+                    await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID, false);
 
 
                     if (currentSmallPlacesConfig.PlacesId == smallPlacesConfig.PlacesId)
@@ -138,6 +139,7 @@ namespace Fort23.Mono
                         await bigPlacesChangeInfoPanel.UIClosed();
                     }
 
+                    UIManager.Instance.ShowLastHindAllShowPanel();
 
                     callBack?.Invoke(true);
                     callBack = null;
@@ -162,7 +164,7 @@ namespace Fort23.Mono
 
             Icon_Places.icon_name = smallPlacesConfig.placeIcon;
 
-             isUlock = IsSmallPlacesDataUlock(smallPlacesConfig.ID);
+            isUlock = IsSmallPlacesDataUlock(smallPlacesConfig.ID);
 
 
             if (currentSmallPlacesData == null && isUlock)
@@ -189,12 +191,12 @@ namespace Fort23.Mono
             SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(id);
 
             AccountFileInfo.SmallPlacesData currentSmallPlacesData =
-                PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID-1);
+                PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID - 1);
             if (currentSmallPlacesData == null)
             {
                 return LanguageManager.Instance.Text(10377);
             }
-            
+
             AccountFileInfo.SmallPlacesData lastSmallPlacesData =
                 PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID - 1);
             SmallPlacesConfig lastSmallPlacesConfig =
@@ -219,7 +221,6 @@ namespace Fort23.Mono
                 }
             }
 
-         
 
             return "";
         }