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.99909014
+    - _Alpha: 0.7765688
     - _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.99817175
+    - _Alpha: 0.59746575
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -245,7 +245,7 @@ MonoBehaviour:
     isLoop: 1
     allTargets:
     - {fileID: 4394259989585503546}
-    TweenAssetInfo: {fileID: 11400000, guid: ad51b724902d50d4a8bfee51c7c2ac05, type: 2}
+    TweenAssetInfo: {fileID: 0}
     TargetFoldout: 0
     maxDuration: 0
     isUpdate: 1
@@ -1857,7 +1857,7 @@ MonoBehaviour:
     isLoop: 1
     allTargets:
     - {fileID: 6614233195307115645}
-    TweenAssetInfo: {fileID: 11400000, guid: ad51b724902d50d4a8bfee51c7c2ac05, type: 2}
+    TweenAssetInfo: {fileID: 0}
     TargetFoldout: 0
     maxDuration: 0
     isUpdate: 1
@@ -2187,7 +2187,7 @@ MonoBehaviour:
     isLoop: 1
     allTargets:
     - {fileID: 5838194811331929845}
-    TweenAssetInfo: {fileID: 11400000, guid: ad51b724902d50d4a8bfee51c7c2ac05, type: 2}
+    TweenAssetInfo: {fileID: 0}
     TargetFoldout: 0
     maxDuration: 0
     isUpdate: 1
@@ -2919,6 +2919,7 @@ GameObject:
   - component: {fileID: 1323129257164695259}
   - component: {fileID: 2475580319306575879}
   - component: {fileID: 6810677379968457547}
+  - component: {fileID: 5388431150151075162}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2988,3 +2989,16 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5173\u95ED\u5267\u60C5"
+--- !u!114 &5388431150151075162
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9185397062077033591}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10336

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -144,6 +144,7 @@ namespace Fort23.Core
       /// 更改名称
       /// </summary>
       AlterName,
+      DialoguePanelOpen,
 
     }
 }

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -135,7 +135,7 @@ public class DialogueManager : Singleton<DialogueManager>
         {
             if (dialogueConfig.LanID != null)
             {
-                DialoguePanel.OpenDialoguePanel(CurrentEventList, dialogueConfig.ID, null, ShowDialogueEventData.MessageShowType.Verbatim,
+                await DialoguePanel.OpenDialoguePanel(CurrentEventList, dialogueConfig.ID, null, ShowDialogueEventData.MessageShowType.Verbatim,
                     FishDialogue);
             }
             else

Assets/Scripts/GameUI/GameApplction.cs

@@ -116,6 +116,8 @@ public class GameApplction : IGameStart
         //     LogTool.Error("登陆失败");
         //     return;
         // }
+        EventManager.Instance.RemoveEventListener(CustomEventType.DialoguePanelOpen,DialoguePanelOpenEvent);
+        EventManager.Instance.AddEventListener(CustomEventType.DialoguePanelOpen,DialoguePanelOpenEvent);
         UIManager.Instance.Canvas.gameObject.SetActive(true);
         if (PlayerGuideManager.Instance.GuideIsCanDo(1))
         {
@@ -199,14 +201,19 @@ public class GameApplction : IGameStart
         XinShouCombat();
     }
 
-    public async void XinShouCombat()
+    private void DialoguePanelOpenEvent(IEventData e)
     {
         MarskPanel.ClosePanel();
+    }
+
+    public async void XinShouCombat()
+    {
+        // MarskPanel.ClosePanel();
         if (PlayerGuideManager.Instance.GuideIsCanDo(1))
         {
             AccountFileInfo.EventList eventList2 = EventSystemManager.Instance.AddEvent(9999);
             await EventSystemManager.Instance.TriggerEvent(eventList2,
-                uiOpenOverCallBack: () => { MarskPanel.ClosePanel(); });
+                uiOpenOverCallBack: () => { });
 
             CTask cTask = CTask.Create();
             await CombatDrive.Instance.LoadLevelBattleCombat(10001, false, -1,
@@ -232,5 +239,9 @@ public class GameApplction : IGameStart
             // PlayerGuideManager.Instance.NextGuide();
             mainPanel.GetFocus();
         }
+        else
+        {
+            MarskPanel.ClosePanel();
+        }
     }
 }

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

@@ -202,7 +202,7 @@ namespace Fort23.Mono
                 PlayerManager.Instance.gameConstantConfig.DetectEventCount)
             {
                 await DivineSenceRestoredPanel.OpenPanel();
-                await TipMessagePanel.OpenTipMessagePanel("神识值不够！");
+                // await TipMessagePanel.OpenTipMessagePanel("神识值不够！");
                 return;
             }
             

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

@@ -45,7 +45,7 @@ namespace Fort23.Mono
 
         private bool isOver;
 
-        public static async void OpenDialoguePanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
+        public static async CTask OpenDialoguePanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
         {
@@ -62,6 +62,12 @@ namespace Fort23.Mono
             dialoguePanel.ShowPanel(LanID, icon, messageShowType, finish);
         }
 
+        public override CTask Show()
+        {
+            EventManager.Instance.Dispatch(CustomEventType.DialoguePanelOpen,null);
+            return base.Show();
+        }
+
         private void Init()
         {
             isAddStack = false;
@@ -299,7 +305,7 @@ namespace Fort23.Mono
 
             _isShowNextButton = false;
             shownextIcon.SetActive(false);
-            string m = LanguageManager.Instance.Text(dialogueMessaga[index]);
+            string m = LanguageManager.Instance.Text(dialogueMessaga[index],PlayerManager.Instance.PlayerName);
 
          
             

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

@@ -61,9 +61,31 @@ namespace Fort23.Mono
                 _shopBtnWidgets.Add(shopBtnWidget);
             }
 
+            bool isSelect = false;
+            for (var i = 0; i < _shopBtnWidgets.Count; i++)
+            {
+                if (PlayerManager.Instance.CurrentsmallPlaces.id == _shopBtnWidgets[i].SmallPlacesConfig.ID)
+                {
+                    isSelect = true;
+                    _shopBtnWidgets[i].OnPointerClick();
+                    break;
+                }
+            }
+
+            if (!isSelect)
+            {
+                for (var i = _shopBtnWidgets.Count - 1; i >= _shopBtnWidgets.Count; i--)
+                {
+                    if (_shopBtnWidgets[i].iaUlock)
+                    {
+                        _shopBtnWidgets[i].OnPointerClick();
+                        break;
+                    }
+                }
+            }
 
             // toggleList.GetChildObj();
-            _shopBtnWidgets[0].OnPointerClick();
+
             BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(placesConfig.bigMapID);
             Text_BigMapName.text = LanguageManager.Instance.Text(bigMapConfig.mapName);
             Text_PlacesName.text = LanguageManager.Instance.Text(placesConfig.placeName);
@@ -77,7 +99,7 @@ namespace Fort23.Mono
             // }
 
             AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(placesConfig.ID);
-            int jindu =placesData == null ? 0 : placesData.progress;
+            int jindu = placesData == null ? 0 : placesData.progress;
             Text_PlacesComplteProgress.text = $"章节事件：{jindu}/{placesConfig.TotalScore}";
             return await base.AsyncInit(uiData);
         }
@@ -247,7 +269,7 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
                 UIManager.Instance.HideUIUIPanel(this);
                 await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
-                
+
                 callBack?.Invoke(true);
                 callBack = null;
             }

Assets/Scripts/GameUI/UI/ShopPanel/ShopBtnWidget.cs

@@ -12,6 +12,8 @@ namespace Fort23.Mono
 
         public SmallPlacesConfig SmallPlacesConfig;
 
+        public bool iaUlock = false;
+
         private void Init()
         {
         }
@@ -49,6 +51,7 @@ namespace Fort23.Mono
                                              lastSmallPlacesData.completionEventCount <
                                              lastSmallPlacesConfig.CompletionEventCount))
             {
+                iaUlock = false;
                 uiToggle.Hind();
                 // TipMessagePanel.OpenTipMessagePanel(
                 //     $"[{LanguageManager.Instance.Text(shopBtnWidget.SmallPlacesConfig.placeName)}]未解锁, 完成{lastSmallPlacesConfig.CompletionEventCount}个任务后, 可解锁. ");
@@ -63,6 +66,7 @@ namespace Fort23.Mono
                         ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
                 if (eventList == null || !eventList.isCompleted)
                 {
+                    iaUlock = false;
                     uiToggle.Hind();
                     return;
                 }
@@ -72,10 +76,12 @@ namespace Fort23.Mono
                 PlayerManager.Instance.GetSmallPlacesData(SmallPlacesConfig.ID);
             if (currentSmallPlacesData == null)
             {
+                iaUlock = false;
                 uiToggle.Hind();
                 return;
             }
 
+            iaUlock = true;
             uiToggle.Show();
         }
     }