修改地点选择

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.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
+    - _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/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();
         }
     }