Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/ReddotConfig.json

@@ -5,7 +5,8 @@
       "GroupID": 1,
       "LinkGroupID": [
         14,
-        16
+        16,
+        17
       ],
       "EnableForTarget": 0,
       "Layer": 1,
@@ -124,6 +125,13 @@
       "EnableForTarget": 0,
       "Layer": 1,
       "Enable": 1
+    },
+    {
+      "ID": 17,
+      "GroupID": 17,
+      "EnableForTarget": 0,
+      "Layer": 1,
+      "Enable": 1
     }
   ]
 }

Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab

@@ -835,11 +835,11 @@ RectTransform:
   - {fileID: 4792204723085321954}
   m_Father: {fileID: 8727043245965595146}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 2205.539, y: 1624}
-  m_Pivot: {x: 0.5, y: 1}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -877,7 +877,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1200, y: 2670}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/LevelChoosePanel/LevelChoosePanel.prefab

@@ -202,11 +202,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5861910991656876453}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_SizeDelta: {x: 7, y: 0}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &49434551961163824
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -214,7 +214,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2334654530509091999}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
@@ -228,7 +228,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2334654530509091999}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
   m_Name: 
@@ -775,7 +775,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1080, y: 1920}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8510129603972019916
 MonoBehaviour:

Assets/Res/UI/LevelChoosePanel/Places/PengLaiDaoPlacesPanel.prefab

@@ -35,10 +35,10 @@ RectTransform:
   - {fileID: 5795167107488113912}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4337750289727126355
 CanvasRenderer:

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -341,6 +341,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2894239996624351365}
+  - {fileID: 6023145684801792777}
   m_Father: {fileID: 6870355629153732168}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -4459,7 +4460,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 6.100006, y: -387.68243}
+  m_AnchoredPosition: {x: 6.0999756, y: -387.68237}
   m_SizeDelta: {x: -0.08001709, y: -1053.3606}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3278292523485782643
@@ -8063,6 +8064,116 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &8279456147118194413
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 3509861318896561903}
+    m_Modifications:
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.9634461
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -11.100037
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -6.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2789586574518551789, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3073202858500431554, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Name
+      value: RedDotCom (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4409762847385456447, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: RedDotConfigId
+      value: 17
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+--- !u!224 &6023145684801792777 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+  m_PrefabInstance: {fileID: 8279456147118194413}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8809657697632844294
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -83,6 +83,7 @@ namespace GameLogic.Hero
             PlayerManager.Instance.SaveHeroData(this);
             EventManager.Instance.Dispatch(CustomEventType.JingJieUpgrade, null);
             RedDotManager.Instance.AllRedDotUpDate();
+            ULockManager.Instance.RefreshULock();
             return this;
         }
 

Assets/Scripts/GameLogic/RedDot/RedDotData.cs

@@ -106,6 +106,35 @@ namespace Fort23.Mono
                             break;
                     }
 
+                    break;
+                case 17:
+                    isEnable = false;
+                    switch (EnableId)
+                    {
+                        case 0: //没有自己的红点逻辑根据下层红点来决定
+                            isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
+                            break;
+                        case 1:
+
+                            int count = 0;
+                            for (var i = 0; i < PlayerManager.Instance.GongFaControl.allUseSkill.Length; i++)
+                            {
+                                if (PlayerManager.Instance.GongFaControl.allUseSkill[i] != null &&
+                                    PlayerManager.Instance.GongFaControl.allUseSkill[i].skillConfig.SkillType == 2)
+                                {
+                                    count++;
+                                }
+                            }
+
+                            if (count < PlayerManager.Instance.myHero.powerUpConfig.MaxPassiveGongfaNum)
+                            {
+                                isEnable = true;
+                            }
+
+
+                            break;
+                    }
+
                     break;
                 //境界升级
                 case 5:

Assets/Scripts/GameLogic/RedDot/RedDotManager.cs

@@ -271,6 +271,10 @@ public class RedDotManager : Singleton<RedDotManager>
         if (_skillInfo == null)
             return false;
 
+        if (_skillInfo.SkillData.level == 1)
+        {
+            return false;
+        }
 
         var _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>();
         if (_skillInfo.SkillData.level >= _skillPowerupConfigs.Length)

Assets/Scripts/GameLogic/UnLock/ULockManager.cs

@@ -11,7 +11,7 @@ public class ULockManager : Singleton<ULockManager>
 {
     public UnlockConfig[] Configs;
 
-
+    public GameRuntimeConfig gameRuntimeConfig;
     public bool Nolock;
 
     public ULockManager()
@@ -82,7 +82,6 @@ public class ULockManager : Singleton<ULockManager>
         {
             case 1:
                 return PlayerManager.Instance.myHero.powerUpConfig.ID >= config.ulockValue;
-        
         }
 
         return false;
@@ -95,10 +94,11 @@ public class ULockManager : Singleton<ULockManager>
             return true;
         }
 
-        // if (mGameRuntimeConfig.unLockAll)
-        // {
-        //     return true;
-        // }
+
+        if (gameRuntimeConfig.isUnlockAll)
+        {
+            return true;
+        }
 
         if (functionID <= 0)
         {
@@ -134,9 +134,8 @@ public class ULockManager : Singleton<ULockManager>
                     LanguageManager.Instance.Text(levelBattleConfig.jingjieLanIDs[2]);
                 tips = LanguageManager.Instance.Text(_config.UnlockTipsID, jingjie);
                 break;
-
         }
-        
+
         return tips;
     }
 }

Assets/Scripts/GameUI/GameApplction.cs

@@ -114,6 +114,7 @@ public class GameApplction : IGameStart, ILogSend
         AssetHandle gameRuntimeAssetHandle =
             await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameRuntimeConfig>("GameRuntimeConfig.asset");
         gameRuntimeConfig = gameRuntimeAssetHandle.AssetObject<GameRuntimeConfig>();
+    
         await ConfigComponent.Instance.Preload();
         await AnimationCurveManager.Instance.Init();
         UGUIPackLoad uguiPackLoad = new UGUIPackLoad();
@@ -124,6 +125,7 @@ public class GameApplction : IGameStart, ILogSend
         await LanguageManager.Instance.InitManager();
         _root.AddComponent<StaticUpdater>();
         _root.AddComponent<UIManager, Transform>(null);
+        ULockManager.Instance.gameRuntimeConfig = gameRuntimeConfig;
         gameStartUIPanel.ShowMassge("loadUI");
         gameStartUIPanel.SetSlider(0.55f);
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -190,10 +190,10 @@ namespace Fort23.Mono
                                     1000);
 
             float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
-        
+
             Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;
-            Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp;
-            
+            Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
+
             Text_exp.text =
                 $"{(int)PlayerManager.Instance.myHero.exp.Value + allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
@@ -211,7 +211,7 @@ namespace Fort23.Mono
             }
 
             Text_Level.text = $"LV{PlayerManager.Instance.myHero.level}";
-            
+
             string jingjie =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
@@ -241,24 +241,23 @@ namespace Fort23.Mono
                     cts.AddTask(UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot));
                 }
 
-              
-                HeroAttributeWidgets =   await cts.WaitAll();
+
+                HeroAttributeWidgets = await cts.WaitAll();
             }
 
             if (PlayerManager.Instance.myHero.heroData.heroPowerId >= maxLevel)
             {
                 Btn_TuPo.gameObject.SetActive(false);
 
-              
+
                 HeroAttributeWidgets[0].CustomInit(new HeroAttributeData("生命",
                     PlayerManager.Instance.myHero.hp.Value.ToStringEx(), "Max"));
-                
+
                 HeroAttributeWidgets[1].CustomInit(new HeroAttributeData("攻击",
                     PlayerManager.Instance.myHero.attack.Value.ToStringEx(), "Max"));
-                
+
                 HeroAttributeWidgets[2].CustomInit(new HeroAttributeData("防御",
                     PlayerManager.Instance.myHero.defense.Value.ToStringEx(), "Max"));
- 
             }
             else
             {
@@ -321,23 +320,21 @@ namespace Fort23.Mono
                 }
 
 
-              
                 HeroAttributeWidgets[0].CustomInit(new HeroAttributeData("生命",
                     PlayerManager.Instance.myHero.hp.Value.ToStringEx(),
                     "+" + (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToStringEx()));
-            
+
 
                 HeroAttributeWidgets[1].CustomInit(new HeroAttributeData("攻击",
                     PlayerManager.Instance.myHero.attack.Value.ToStringEx(),
                     "+" + (heroInfo.attack.Value - PlayerManager.Instance.myHero.attack.Value).ToStringEx()));
-          
 
-               
+
                 HeroAttributeWidgets[2].CustomInit(new HeroAttributeData("防御",
                     PlayerManager.Instance.myHero.defense.Value.ToStringEx(),
                     "+" + (heroInfo.defense.Value - PlayerManager.Instance.myHero.defense.Value).ToStringEx()));
-         
-                
+
+
                 if (PlayerManager.Instance.myHero.heroData.isYuanMan)
                 {
                     Text_Jingjie1.text =
@@ -351,8 +348,6 @@ namespace Fort23.Mono
                         LanguageManager.Instance.Text(10429);
                 }
 
-         
-
 
                 //可以突破特效设置
                 fx_ui_tupo_loop.gameObject.SetActive(false);
@@ -390,7 +385,7 @@ namespace Fort23.Mono
                     }
                 }
 
-                
+
                 //突破按钮图片和文字设置
                 if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
                     PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
@@ -422,6 +417,7 @@ namespace Fort23.Mono
         }
 
         float timer = 0;
+
         [CustomMethod(CustomMethodType.Update)]
         public void Update()
         {
@@ -466,8 +462,6 @@ namespace Fort23.Mono
                     fx_ui_tupo_loop.Play();
                 }
             }
-
-
         }
 
 

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

@@ -141,8 +141,8 @@ namespace Fort23.Mono
                 await GObjectPool.Instance.FetchAsync<GameObjectPool>(bigMapConfig.mapPrefabName + ".prefab");
             gameObjectPool2.own.transform.parent = PlacesRoot;
             gameObjectPool2.own.transform.localScale = Vector3.one;
-            gameObjectPool2.own.transform.GetComponent<RectTransform>().offsetMin = Vector2.zero;
-            gameObjectPool2.own.transform.GetComponent<RectTransform>().offsetMax = Vector2.zero;
+            // gameObjectPool2.own.transform.GetComponent<RectTransform>().offsetMin = Vector2.zero;
+            // gameObjectPool2.own.transform.GetComponent<RectTransform>().offsetMax = Vector2.zero;
 
             placesItem = new PlacesItem();
             await placesItem.CustomInit(bigMapConfig.ID, gameObjectPool2, PlacesOnClick);