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

Assets/Res/Config/HeroModelConfig.json

@@ -67,7 +67,7 @@
       "isUseGpu": false,
       "heroType": 2,
       "hp": 100,
-      "attack": 60,
+      "attack": 100,
       "def": 50,
       "shield": 100,
       "speed_atk": 6.0,
@@ -125,7 +125,7 @@
       "isUseGpu": false,
       "heroType": 2,
       "hp": 100,
-      "attack": 60,
+      "attack": 100,
       "def": 50,
       "shield": 100,
       "speed_atk": 6.0,
@@ -183,7 +183,7 @@
       "isUseGpu": false,
       "heroType": 2,
       "hp": 100,
-      "attack": 60,
+      "attack": 100,
       "def": 50,
       "shield": 100,
       "speed_atk": 6.0,
@@ -241,9 +241,9 @@
       "isUseGpu": false,
       "heroType": 4,
       "hp": 200,
-      "attack": 100,
+      "attack": 60,
       "def": 50,
-      "shield": 200,
+      "shield": 100,
       "speed_atk": 6.0,
       "Linggen": [
         100,

Assets/Scenes/testCombat.scene

@@ -2198,20 +2198,28 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 0
+      value: 40000
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].att
-      value: 0
+      value: 400
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].hp
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[0].level
+      value: 90
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].att
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: enemyHeroInfo.Array.data[0].level
+      value: 90
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
       value: 9201

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -116,12 +116,6 @@ public float ATKFactor;
 public float DEFFactor;
 
 
-		/// <summary>
-		///法力倍率
-		/// </summary>
-public float MPFactor;
-
-
 		/// <summary>
 		///护盾倍率
 		/// </summary>
@@ -170,6 +164,12 @@ public int MaxPassiveGongfaNum;
 public int MaxFabaoNum;
 
 
+		/// <summary>
+		///法力倍率
+		/// </summary>
+public float MPFactor;
+
+
 	}
 
 }

Assets/Scripts/GameData/ExcelConfig/MonsterPowerUpConfig.cs

@@ -62,12 +62,6 @@ public float ATKFactor;
 public float DEFFactor;
 
 
-		/// <summary>
-		///法力倍率
-		/// </summary>
-public float MPFactor;
-
-
 		/// <summary>
 		///护盾倍率
 		/// </summary>
@@ -110,6 +104,12 @@ public int FabaoStar;
 public float LinggenUp;
 
 
+		/// <summary>
+		///法力倍率
+		/// </summary>
+public float MPFactor;
+
+
 	}
 
 }

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

@@ -14,6 +14,7 @@ namespace GameLogic.Combat.Skill
     {
         protected override void ProUseSkill()
         {
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget

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

@@ -23,6 +23,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));

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

@@ -23,6 +23,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 float startTime = i * -0.02f;

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

@@ -19,6 +19,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));

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

@@ -21,6 +21,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));

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

@@ -18,6 +18,7 @@ namespace GameLogic.Combat.Skill
         protected override void ProUseSkill()
         {
             ActivationTimeLineData("1201");
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 CombatHeroHitPoint combatHeroHitPoint=    CombatHeroEntity.CombatAIBasic.currFocusTarget.GetThis<CombatHeroEntity>()

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

@@ -18,6 +18,7 @@ namespace GameLogic.Combat.Skill
         protected override void ProUseSkill()
         {
             ActivationTimeLineData("1202");
+            ballisticsCount = (int)effectValue[0];
             currCount = 0;
         }
 

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

@@ -16,6 +16,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));

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

@@ -16,6 +16,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));

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

@@ -21,6 +21,7 @@ namespace GameLogic.Combat.Skill
             currCount = 0;
 
             ActivationTimeLineData("1301");
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i <  effectValue[0]; i++)
             {
                 CombatHeroHitPoint combatHeroHitPoint = CombatHeroEntity.CombatAIBasic.currFocusTarget

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

@@ -16,6 +16,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));

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

@@ -16,6 +16,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));

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

@@ -16,6 +16,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProUseSkill()
         {
+            ballisticsCount = (int)effectValue[0];
             this.AddTriggerCallBack("lieyanjian_zd", ProDefaultTimeLineTrigger_ZD);
             ActivationTimeLineData("1401");
         }

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

@@ -24,6 +24,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));

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

@@ -21,6 +21,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0]*5;
             for (int j = 0; j < 5; j++)
             {
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (j + 2));

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

@@ -19,6 +19,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));

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

@@ -19,6 +19,7 @@ namespace GameLogic.Combat.Skill
                 .GetMainHotPoin<CombatHeroHitPoint>();
             BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
             currTarget.Add(combatHeroHitPoint);
+            ballisticsCount = (int)effectValue[0];
             for (int i = 0; i < effectValue[0]; i++)
             {
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));

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

@@ -25,6 +25,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProInitSkill()
         {
+            ballisticsCount = (int)10;
             AddTriggerCallBack("sk1_fashe", Sk1_FaSheProDefaultTimeLineTrigger);
         }
 

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

@@ -12,6 +12,7 @@ namespace GameLogic.Combat.Skill
     {
         protected override void ProUseSkill()
         {
+            ballisticsCount = (int)3;
             ActivationTimeLineData("sk4");
         }
 

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

@@ -9,6 +9,7 @@ namespace GameLogic.Combat.Skill
     {
         protected override void ProUseSkill()
         {
+            ballisticsCount = (int)3;
             ActivationTimeLineData("sk4");
         }
 

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

@@ -139,6 +139,7 @@ namespace GameLogic.Combat.Skill
 
         protected SkillInfo skillInfo;
 
+        protected int ballisticsCount=1;
         public T This<T>()
         {
             return (T)(object)this;
@@ -171,7 +172,7 @@ namespace GameLogic.Combat.Skill
         {
             SkillFeaturesData skillFeaturesData = SkillFeaturesData.CapyFeaturesData();
             skillFeaturesData.hp =
-                (long)(skillFeaturesData.hp * CombatHeroEntity.CurrCombatHeroInfo.GetWuXingShuXing(wuXingType));
+                (long)(skillFeaturesData.hp * CombatHeroEntity.CurrCombatHeroInfo.GetWuXingShuXing(wuXingType)/ballisticsCount);
             skillFeaturesData.maxHp = skillFeaturesData.hp;
             return skillFeaturesData;
         }