Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

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/ChanllegeTower.json

@@ -1,184 +1,304 @@
 {
   "configList": [
     {
-      "ID": 1
+      "ID": 1,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 2
+      "ID": 2,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 3
+      "ID": 3,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 4
+      "ID": 4,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 5
+      "ID": 5,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 6
+      "ID": 6,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 7
+      "ID": 7,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 8
+      "ID": 8,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 9
+      "ID": 9,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 10
+      "ID": 10,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 11
+      "ID": 11,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 12
+      "ID": 12,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 13
+      "ID": 13,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 14
+      "ID": 14,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 15
+      "ID": 15,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 16
+      "ID": 16,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 17
+      "ID": 17,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 18
+      "ID": 18,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 19
+      "ID": 19,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 20
+      "ID": 20,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 21
+      "ID": 21,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 22
+      "ID": 22,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 23
+      "ID": 23,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 24
+      "ID": 24,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 25
+      "ID": 25,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 26
+      "ID": 26,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 27
+      "ID": 27,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 28
+      "ID": 28,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 29
+      "ID": 29,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 30
+      "ID": 30,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 31
+      "ID": 31,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 32
+      "ID": 32,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 33
+      "ID": 33,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 34
+      "ID": 34,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 35
+      "ID": 35,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 36
+      "ID": 36,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 37
+      "ID": 37,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 38
+      "ID": 38,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 39
+      "ID": 39,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 40
+      "ID": 40,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 41
+      "ID": 41,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 42
+      "ID": 42,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 43
+      "ID": 43,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 44
+      "ID": 44,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 45
+      "ID": 45,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 46
+      "ID": 46,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 47
+      "ID": 47,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 48
+      "ID": 48,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 49
+      "ID": 49,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 50
+      "ID": 50,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 51
+      "ID": 51,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 52
+      "ID": 52,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 53
+      "ID": 53,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 54
+      "ID": 54,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 55
+      "ID": 55,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 56
+      "ID": 56,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 57
+      "ID": 57,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 58
+      "ID": 58,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 59
+      "ID": 59,
+      "NeedLevel": null,
+      "LevelbattleID": null
     },
     {
-      "ID": 60
+      "ID": 60,
+      "NeedLevel": null,
+      "LevelbattleID": null
     }
   ]
 }

Assets/Res/Config/EventConfig.json

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

Assets/Res/UI/LevelChoosePanel/LevelChoosePanel.prefab

@@ -1308,7 +1308,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -17}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5201399924952541782
 CanvasRenderer:

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/ChanllegeTower.cs

@@ -21,9 +21,27 @@ public int ID;
 
 
 		/// <summary>
-		///道具名称 
+		///准入修为等级 
 		/// </summary>
-public int Column1;
+public int NeedLevel;
+
+
+		/// <summary>
+		///战斗组ID 
+		/// </summary>
+public int LevelbattleID;
+
+
+		/// <summary>
+		///奖励预览道具
+		/// </summary>
+public int[] prizeid;
+
+
+		/// <summary>
+		///奖励预览数量
+		/// </summary>
+public int[] prizeNum;
 
 
 	}

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;