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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Res/Config/HeroModelConfig.json

@@ -12,11 +12,18 @@
       "heroType": 1,
       "profession": 1,
       "itemID": 1004,
-      "hp": 1000,
+      "hp": 100,
       "attack": 100,
       "def": 50,
       "shield": 100,
-      "speed_atk": 4.0,
+      "speed_atk": 6.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
       "skillID": [
         -1,
         -1,
@@ -53,7 +60,14 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 4.0,
+      "speed_atk": 6.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
       "skillID": [
         1201,
         2001,
@@ -90,7 +104,14 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 4.0,
+      "speed_atk": 6.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
       "skillID": [
         1202,
         2002,
@@ -127,7 +148,14 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 4.0,
+      "speed_atk": 6.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
       "skillID": [
         1201,
         2003,
@@ -160,11 +188,18 @@
       "heroType": 4,
       "profession": 1,
       "itemID": 1004,
-      "hp": 2000,
+      "hp": 200,
       "attack": 100,
       "def": 50,
       "shield": 200,
-      "speed_atk": 4.0,
+      "speed_atk": 6.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
       "skillID": [
         9003,
         9004,
@@ -179,9 +214,9 @@
       ],
       "fa_bao_id": [
         10001,
-        -1,
+        10003,
         10006,
-        -1
+        10010
       ],
       "heroStory": null
     }

Assets/Res/Config/SkillConfig.json

@@ -6555,7 +6555,7 @@
     {
       "ID": 90050,
       "PieceID": null,
-      "power": 100.0,
+      "power": 110.0,
       "name": 711,
       "dec": 721,
       "attribute": 1,

Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs

@@ -110,6 +110,12 @@ public int shield;
 public float speed_atk;
 
 
+		/// <summary>
+		///灵根初值 金-水-木-火-土
+		/// </summary>
+public int[] Linggen;
+
+
 		/// <summary>
 		///功法序列 主动≤4 主动+被动≤10
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/MonsterPowerUpConfig.cs

@@ -104,6 +104,12 @@ public int FabaoLv;
 public int FabaoStar;
 
 
+		/// <summary>
+		///灵根成长率 100=100%
+		/// </summary>
+public float LinggenUp;
+
+
 	}
 
 }

Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -136,7 +136,7 @@ namespace GameLogic.Combat.CombatTool
         public void Update(float t)
         {
             CombatGestureController.Instance.Update();
-            if (!isUpdate || _isFullUIShow)
+            if (!isUpdate || _isFullUIShow||IsGameOver)
             {
                 return;
             }
@@ -170,6 +170,7 @@ namespace GameLogic.Combat.CombatTool
 
         public void GameOver(bool isWin)
         {
+            IsGameOver = true;
             combatFinish?.Invoke(isWin);
         }
 

Assets/Scripts/GameLogic/Combat/CombatTool/MagicWeaponCollisionInfo.cs

@@ -305,6 +305,7 @@ namespace GameLogic.Combat.CombatTool
             GObjectPool.Instance.Recycle(ParticleSystemPool);
             ParticleSystemPool = null;
             triigerCount = 0;
+            _isPengZhuang = false;
         }
 
         public string tag { get; }

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -248,6 +248,11 @@ public class CombatHeroInfo
             defense = (EncryptionLong)(modelConfig.def * MonsterPowerUpConfig.DEFFactor);
             attack = (EncryptionLong)(modelConfig.attack * MonsterPowerUpConfig.ATKFactor);
             k = MonsterPowerUpConfig.defK;
+            Metal= modelConfig.Linggen[0]*MonsterPowerUpConfig.LinggenUp;
+            Water= modelConfig.Linggen[1]*MonsterPowerUpConfig.LinggenUp;
+            Wood= modelConfig.Linggen[2]*MonsterPowerUpConfig.LinggenUp;
+            Fire= modelConfig.Linggen[3]*MonsterPowerUpConfig.LinggenUp;
+            Earth= modelConfig.Linggen[4]*MonsterPowerUpConfig.LinggenUp;
             if (modelConfig.skillID != null)
             {
                 for (int i = 0; i < modelConfig.skillID.Length; i++)

Assets/Scripts/GameLogic/Combat/Hero/MagicWeaponControl.cs

@@ -82,6 +82,7 @@ namespace GameLogic.Combat.Hero
 
         public void UseMagicWeapon(CombatMagicWeaponEntity combatMagicWeaponEntity)
         {
+            combatMagicWeaponEntity.isMagicWeaponTreasureBook = false;
             globalMagicWeaponCd = 2;
             UseMagicWeaponEventData useMagicWeaponEventData = UseMagicWeaponEventData.Create();
             useMagicWeaponEventData.combatHeroEntity = combatHeroEntity;

Assets/Scripts/GameLogic/Combat/Skill/S2002.cs

@@ -13,11 +13,13 @@ namespace GameLogic.Combat.Skill
         protected override void ProInitSkill()
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjuredEventData);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.UseMagicWeapon, UseMagicWeapon);
         }
 
         protected override void ProReplace()
         {
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroInjured, HeroInjuredEventData);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseMagicWeapon, UseMagicWeapon);
         }
 
         protected override void ProUseSkill()
@@ -25,6 +27,16 @@ namespace GameLogic.Combat.Skill
             // CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjuredEventData);
         }
 
+        private void UseMagicWeapon(IEventData iEventData)
+        {
+            UseMagicWeaponEventData useMagicWeaponEventData = iEventData as UseMagicWeaponEventData;
+
+            if (useMagicWeaponEventData.combatHeroEntity == CombatHeroEntity)
+            {
+                useMagicWeaponEventData.combatMagicWeaponEntity.isMagicWeaponTreasureBook = true;
+            }
+        }
+
         private void HeroInjuredEventData(IEventData iEventData)
         {
             HeroInjuredEventData heroInjuredEventData = iEventData as HeroInjuredEventData;

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -36,7 +36,7 @@ namespace GameLogic.Combat
         public async CTask StartCombat(StartCombatInfo startCombatInfo)
         {
             CombatController.Dispose();
-            combatMonoBaisc = new CombatMonoBaisc();
+            combatMonoBaisc = new LevelBattleCombatMono();
             CombatEquipFallManager.Instance.Dispose();
             CombatEquipFallManager.Instance.Init();
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
@@ -84,11 +84,11 @@ namespace GameLogic.Combat
             // await cTaskAwaitBuffer.WaitAll();
             // await CombatHPPanel.OpenCombatHPPanel();
 
-           
+
             await CombatPanel.OpenCombatPanel();
             ///播放动画
 
-         
+
             // MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
             // mainPanel.transform.gameObject.SetActive(false);
             CombatController.ChangeState(CombatController.update);
@@ -96,15 +96,28 @@ namespace GameLogic.Combat
 
         protected void CombatFinish(bool isWin)
         {
-            caombatFinish?.Invoke(isWin);
-            
-            
-            ///播放动画
-        
-            UIManager.Instance.ShowLastHindAllShowPanel();
+            LoadCombatFinishUI(isWin);
+
             // MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
             // mainPanel.transform.gameObject.SetActive(true);
+        }
+
+        private async CTask LoadCombatFinishUI(bool isWin)
+        {
             UIManager.Instance.HideUIUIPanel<CombatPanel>();
+            await combatMonoBaisc.GameOver(isWin);
+        }
+
+        /// <summary>
+        /// 战斗到章节
+        /// </summary>
+        /// <param name="isWin"></param>
+        public void CombatToStage(bool isWin)
+        {
+            caombatFinish?.Invoke(isWin);
+
+
+            UIManager.Instance.ShowLastHindAllShowPanel();
         }
 
         public void Update()

Assets/Scripts/GameUI/Combat/CombatMonoBaisc.cs

@@ -19,15 +19,12 @@ namespace GameUI.Combat
     /// </summary>
     public class CombatMonoBaisc
     {
-        private CombatController combatController;
+        protected CombatController combatController;
 
-      
-
-        
         public async CTask Init(CombatController combatController)
         {
             this.combatController = combatController;
-           
+
             AddEvent();
         }
 
@@ -35,33 +32,39 @@ namespace GameUI.Combat
         protected void AddEvent()
         {
             EventManager.Instance.AddEventListener(CustomEventType.Combat_ItemShow, Combat_ItemShow);
-          
-            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroDieFinish, HeroDie);
+
+            // CombatEventManager.Instance.AddEventListener(CombatEventType.HeroDieFinish, HeroDie);
         }
 
-        protected void HeroDie(IEventData iEventData)
+        public async CTask GameOver(bool isWin)
         {
-            HeroDieEventData heroDieEventData= iEventData as HeroDieEventData;
-            if (heroDieEventData.combatHeroEntity.IsEnemy)
-            {
-                return;
-            }
+            await ProGameOver(isWin);
+        }
 
-            BetterList<CombatHeroEntity> myHero = combatController.CombatHeroController.GetHeroList(false);
-            if (myHero.Count <= 0)
-            {
-              
-            }
+        protected virtual async CTask ProGameOver(bool isWin)
+        {
         }
+        // protected void HeroDie(IEventData iEventData)
+        // {
+        //     HeroDieEventData heroDieEventData= iEventData as HeroDieEventData;
+        //     if (heroDieEventData.combatHeroEntity.IsEnemy)
+        //     {
+        //         return;
+        //     }
+        //
+        //     BetterList<CombatHeroEntity> myHero = combatController.CombatHeroController.GetHeroList(false);
+        //     if (myHero.Count <= 0)
+        //     {
+        //         // BattleSettlementPanel.OpenPanel(true);
+        //     }
+        // }
 
         protected void Combat_ItemShow(IEventData iEventData)
         {
-          
         }
 
         private void SetTargetPoint(ImageMove imageMove)
         {
-          
         }
 
 

Assets/Scripts/GameUI/Combat/LevelBattleCombatMono.cs

@@ -0,0 +1,18 @@
+using Fort23.Core;
+using Fort23.Mono;
+
+namespace GameUI.Combat
+{
+    public class LevelBattleCombatMono : CombatMonoBaisc
+    {
+        protected override async CTask ProGameOver(bool isWin)
+        {
+            await BattleSettlementPanel.OpenPanel(isWin,UICallBack);
+        }
+
+        private void UICallBack()
+        {
+            
+        }
+    }
+}

Assets/Scripts/GameUI/Combat/LevelBattleCombatMono.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 79d8344f033d423a8a51f21166a5f490
+timeCreated: 1747733073

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -5,6 +5,8 @@ namespace Fort23.Mono
 	[UIBinding(prefab = "BattleSettlementPanel"  )]
 	public partial class BattleSettlementPanel : UIPanel
 	{
+		
+		private System.Action callBack;
 		private void Init()
 		{
 
@@ -22,11 +24,14 @@ namespace Fort23.Mono
 			Button_ok.onClick.AddListener(() =>
 			{
 				UIManager.Instance.HideUIUIPanel(this);
+				callBack?.Invoke();
+				callBack = null;
 			});
 		}
 
-		public void CustomInit(bool isWin)
+		public void CustomInit(bool isWin,System.Action callBack)
 		{
+			this.callBack = callBack;
 			if (isWin)
 			{
 				Text_Desc.gameObject.SetActive(false);
@@ -39,10 +44,11 @@ namespace Fort23.Mono
 			}
 		}
 
-		public async CTask<BattleSettlementPanel> OpenPanel(bool isWin)
+		public static async CTask<BattleSettlementPanel> OpenPanel(bool isWin,System.Action callBack)
 		{
 			BattleSettlementPanel battleSettlementPanel = await UIManager.Instance.LoadAndOpenPanel<BattleSettlementPanel>(null);
-			battleSettlementPanel.CustomInit(isWin);
+			battleSettlementPanel.CustomInit(isWin,callBack);
+			
 			return battleSettlementPanel;
 		}