修改bug

Assets/Editor/CombatEditor/HeroEntityCombatReport.cs

@@ -7,7 +7,6 @@ using Core.BattleReport;
 using GameLogic.Combat.CombatTool.CombatReport;
 using UnityEngine;
 using UnityEngine.UIElements;
-using static System.Drawing.FontStyle;
 
 namespace xy002Editor.CombatEditor
 {

Assets/Res/Config/TaskConfig.json.meta → Assets/Res/Config/ChanllegeTower.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: CX5Ot3+lAC2LKpT1E57KULwqTMx8oMG4gzY92K2eKwlIJ8OuJ/lgPsFsdfVS
+guid: BitJvS38BipZn+Yks16v6CsnO3kVmLoF3hbnuM63Gco1bEu9Bq4ZUM5gKWOV
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Res/Config/EventConfig.json

@@ -61,7 +61,7 @@
       "EventQuality": 1,
       "EventConditionId": 1,
       "EventValue": [
-        10007
+        1004
       ],
       "EventCount": 1,
       "EventName": 176,

Assets/Res/Config/TanxianConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D3oXsXupAHLqOXkwA2fKMfWif4QS94PyPEh39Aj1juW0znKkMOKwKRlsPFb2
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -1398,15 +1398,15 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -22.8
+      value: -28.15
       objectReference: {fileID: 0}
     - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -3.91
+      value: -3.9
       objectReference: {fileID: 0}
     - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 44.35
+      value: 42.8
       objectReference: {fileID: 0}
     - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
       propertyPath: m_LocalRotation.w
@@ -6769,11 +6769,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.105
+      value: 0.032
       objectReference: {fileID: 0}
     - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 6.027
+      value: 4.998
       objectReference: {fileID: 0}
     - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_LocalPosition.z

Assets/Scripts/GameData/ExcelConfig/TaskConfig.cs.meta → Assets/Scripts/GameData/ExcelConfig/ChanllegeTower.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: CHoc4C+tUXvtUByGtg+uUn8xwROB80uHQZB93RhTufkB8HoMzw18qmy3ksAf
+guid: XCwe4CutUHMj0g9kYyldN8uJKTDQGGW+vbicwd8u3CSrijw9aWui8fNKOEzT
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/GameData/ExcelConfig/TanxianConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Byka5C78Byo44LCFiSj3R2PgyWnUVZUYOe0/LXnUQ7ggiyN7Y9zmVj5J8N8B
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -92,7 +92,13 @@ public class PlayerManager : Singleton<PlayerManager>
     public float GetMapBl(int map)
     {
         AccountFileInfo.PlacesData placesData = GetPlacesData(map);
+        if (placesData == null)
+            return 0;
         PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(map);
+        if (placesConfig.TotalScore == 0)
+        {
+            return 0;
+        }
         return ((float)placesData.progress / placesConfig.TotalScore) * 100;
         // AccountFileInfo.Instance.playerData.completeEvents.Where(ce =>placesConfig.MainTaskID.Contains(ce.eventID) || placesConfig.ZhixianID.Contains(ce.eventID) || placesConfig.ZhixianID.Contains(ce.1001
         // ))

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

@@ -70,8 +70,8 @@ namespace Fort23.Mono
             PlacesWidget placesWidget = obj as PlacesWidget;
             //加载地图
 
-            AccountFileInfo.PlacesData lastPlacesData = PlayerManager.Instance.GetPlacesData(placesWidget.placesConfig.ID - 1);
-            if (placesWidget.placesConfig.ID > 1 && (lastPlacesData == null || lastPlacesData.progress < 100))
+            // AccountFileInfo.PlacesData lastPlacesData = PlayerManager.Instance.GetPlacesData(placesWidget.placesConfig.ID - 1);
+            if (placesWidget.placesConfig.ID > 1 && PlayerManager.Instance.GetMapBl(placesWidget.placesConfig.ID - 1) < 100)
             {
                 TipMessagePanel.OpenTipMessagePanel("上一个关卡没有解锁");
                 return;