Browse Source

修改bug

lzx 12 hours ago
parent
commit
450c96fe5f

+ 5 - 5
Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -395,11 +395,11 @@ namespace Fort23.Mono
 
         List<List<int>> indexList = new List<List<int>>()
         {
-            new List<int>() { 0, 1, 9 },
-            new List<int>() { 6, 7, 5 },
-            new List<int>() { 8, 9, 7 },
-            new List<int>() { 4, 5, 3 },
-            new List<int>() { 2, 3, 1 },
+            new List<int>() { 0, 1, 9 },//金
+            new List<int>() { 4, 5, 3 },//木
+            new List<int>() { 2, 3, 1 },//水
+            new List<int>() { 6, 7, 5 },//火
+            new List<int>() { 8, 9, 7 },//土
         };
 
         private void Sort(int type1, int type2)

+ 12 - 1
Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -79,7 +80,17 @@ namespace Fort23.Mono
                 return;
             }
 
-            AccountFileInfo.SmallPlacesData smallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.PlacesId);
+            if (smallPlacesConfig.UnlockEnvetid != 0)
+            {
+                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == smallPlacesConfig.UnlockEnvetid);
+                if (eventList == null || !eventList.isCompleted)
+                {
+                    TipMessagePanel.OpenTipMessagePanel("主线任务没有完成");
+                    return;
+                }
+            }
+
+            AccountFileInfo.SmallPlacesData smallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
 
             if (smallPlacesData == null)
             {

BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Maps.xlsx