| 
					
				 | 
			
			
				@@ -28,12 +28,13 @@ namespace GameLogic.Combat.Hero 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// 充能额外速度 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// </summary> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         public float cdAddSpeed; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // public float cdSpeed=1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// <summary> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// 是否拥有法宝宝典 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// </summary> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         public bool isMagicWeaponTreasureBook = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         public FaBaoInfo FaBaoInfo 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             get { return _faBaoInfo; } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -65,9 +66,18 @@ namespace GameLogic.Combat.Hero 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private BetterList<SkillBasic> allSkill = new BetterList<SkillBasic>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        private SkillBasic skillBasic; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         public float MaxCd 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            get { return magicWeaponConfig.cd; } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            get 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (skillBasic == null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    return 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                return skillBasic.SelfSkillConfig.cd; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private FabaoConfig magicWeaponConfig; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -94,8 +104,8 @@ namespace GameLogic.Combat.Hero 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             string modelName = magicWeaponConfig.model; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             CurrCombatHeroInfo = new CombatHeroInfo(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            CurrCombatHeroInfo.modelName= magicWeaponConfig.model; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cd = magicWeaponConfig.cd; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            CurrCombatHeroInfo.modelName = magicWeaponConfig.model; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // GameTimeLineParticleFactory 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             CombatHeroGameObjectPool poolInterface = 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -131,7 +141,7 @@ namespace GameLogic.Combat.Hero 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             int id = magicWeaponConfig.SkillGroupID * 10 + 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             SkillInfo skillInfo = new SkillInfo(id, 1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            CombatHeroSkillControl.AddSkill(skillInfo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            skillBasic = CombatHeroSkillControl.AddSkill(skillInfo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             BuffControl = new BuffControl(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             BuffControl.Init(this); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -157,6 +167,10 @@ namespace GameLogic.Combat.Hero 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             poolInterface.own.SetActive(true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             combatHeroAnimtion.Init(this); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (skillBasic != null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                cd = skillBasic.SelfSkillConfig.cd; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 #endif 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             callBack?.Invoke(this); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return this; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -191,7 +205,7 @@ namespace GameLogic.Combat.Hero 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _HpBl = _faBaoInfo.FabaoPowerupConfig.Power; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cd = magicWeaponConfig.cd; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cd = MaxCd; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _rootMagicWeaponControl.UseMagicWeapon(this); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -208,7 +222,7 @@ namespace GameLogic.Combat.Hero 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (b1008 == null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     cd -= t; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    if (_rootMagicWeaponControl.isAutoUse&&IsCanUse()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if (_rootMagicWeaponControl.isAutoUse && IsCanUse()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         UseMagicWeapon(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 |