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

Assets/Res/Config/SkillConfig.json

@@ -5687,7 +5687,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
@@ -5710,7 +5710,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
@@ -5742,7 +5742,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
@@ -5776,7 +5776,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
@@ -5810,7 +5810,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
@@ -5844,7 +5844,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
@@ -5876,13 +5876,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
       "effectValue": [
         50.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -5900,13 +5900,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
       "effectValue": [
         75.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -5924,13 +5924,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
       "effectValue": [
         75.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -5957,13 +5957,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
       "effectValue": [
         75.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -5992,13 +5992,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
       "effectValue": [
         75.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -6027,13 +6027,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
         75.0,
-        9.0,
+        12.0,
         50.0
       ],
       "intensifierIndex": [
@@ -6060,14 +6060,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
       "effectValue": [
-        10.0,
+        20.0,
         2.0,
-        12.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -6085,14 +6085,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
       "effectValue": [
-        10.0,
+        20.0,
         2.0,
-        12.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -6119,14 +6119,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
       "effectValue": [
-        10.0,
+        20.0,
         2.0,
-        12.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -6155,14 +6155,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
       "effectValue": [
-        10.0,
+        20.0,
         3.0,
-        12.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -6188,14 +6188,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
       "effectValue": [
-        10.0,
+        20.0,
         3.0,
-        12.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -6224,14 +6224,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
-        10.0,
+        20.0,
         3.0,
-        12.0,
+        18.0,
         20.0
       ],
       "intensifierIndex": [
@@ -6258,14 +6258,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
       "effectValue": [
         1.0,
-        6.0,
-        480.0
+        12.0,
+        1000.0
       ],
       "intensifierIndex": [
         2
@@ -6283,14 +6283,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
       "effectValue": [
         2.0,
-        6.0,
-        480.0
+        12.0,
+        1000.0
       ],
       "intensifierIndex": [
         2
@@ -6308,14 +6308,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
       "effectValue": [
         2.0,
-        6.0,
-        480.0
+        12.0,
+        1000.0
       ],
       "intensifierIndex": [
         2
@@ -6342,14 +6342,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
       "effectValue": [
         2.0,
-        6.0,
-        480.0,
+        12.0,
+        1000.0,
         30.0
       ],
       "intensifierIndex": [
@@ -6374,14 +6374,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
       "effectValue": [
         2.0,
-        6.0,
-        480.0,
+        12.0,
+        1000.0,
         30.0
       ],
       "intensifierIndex": [
@@ -6409,14 +6409,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
         2.0,
-        6.0,
-        480.0,
+        12.0,
+        1000.0,
         300.0
       ],
       "intensifierIndex": [
@@ -6441,7 +6441,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
@@ -6461,7 +6461,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
@@ -6481,7 +6481,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
@@ -6501,7 +6501,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
@@ -6521,7 +6521,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
@@ -6541,7 +6541,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
@@ -6561,13 +6561,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
       "effectValue": [
         40.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         2
@@ -6585,13 +6585,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
       "effectValue": [
         40.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         2
@@ -6618,13 +6618,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
       "effectValue": [
         60.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         2
@@ -6648,13 +6648,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
       "effectValue": [
         60.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         2
@@ -6683,13 +6683,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
       "effectValue": [
         60.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         2
@@ -6718,13 +6718,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
         100.0,
-        9.0,
+        12.0,
         20.0,
         9.0
       ],
@@ -6752,7 +6752,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
@@ -6772,7 +6772,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
@@ -6795,7 +6795,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
@@ -6827,7 +6827,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
@@ -6858,7 +6858,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
@@ -6892,13 +6892,13 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
         12.0,
-        10.0,
+        15.0,
         3.0
       ],
       "intensifierIndex": [
@@ -6925,13 +6925,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
       "effectValue": [
-        30.0,
-        9.0
+        10.0,
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -6949,13 +6949,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
       "effectValue": [
-        40.0,
-        9.0
+        13.0,
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -6973,13 +6973,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
       "effectValue": [
-        40.0,
-        9.0
+        13.0,
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -7006,13 +7006,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
       "effectValue": [
-        50.0,
-        9.0
+        16.0,
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -7036,13 +7036,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
       "effectValue": [
-        50.0,
-        9.0
+        16.0,
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -7069,13 +7069,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
-        60.0,
-        9.0
+        20.0,
+        12.0
       ],
       "intensifierIndex": [
         1

Assets/Scenes/testCombat.scene

@@ -2198,7 +2198,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: isZhanZhuang
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: zhanZhuangTime
@@ -2206,7 +2206,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 46090
+      value: 43373
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].mu
@@ -2218,11 +2218,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].att
-      value: 1713
+      value: 1353
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].def
-      value: 933
+      value: 708
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].huo
@@ -2242,7 +2242,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].level
-      value: 120
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].att
@@ -2250,7 +2250,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].level
-      value: 120
+      value: 150
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
@@ -2258,11 +2258,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillLevel
-      value: 23
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillStart
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skill.Array.size

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

@@ -391,11 +391,13 @@ namespace GameLogic.Combat.CombatTool
             {
                 myHp -= targetHp;
                 a.hp = myHp;
+                b.hp = 0;
             }
             else if (myHp < targetHp)
             {
                 targetHp -= myHp;
                 b.hp = targetHp;
+                a.hp = 0;
             }
             else if (myHp == targetHp)
             {

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

@@ -46,6 +46,12 @@ namespace GameLogic.Combat.CombatTool
             harmType = HarmType.Default;
             triggerData = new TriggerData();
             WuXingType = WuXingType.Null;
+            isInvalid = false;
+            isHitHero = false;
+            QiangDu = 0;
+            isMiss = false;
+            yuanShiAtt = 0;
+            att = 0;
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3501.cs

@@ -60,7 +60,9 @@ namespace GameLogic.Combat.Skill.MagicSkill
                 .transform);
             barrierEntityMono.Barrier = this;
             _use = true;
-            _currHp = (long)SelfSkillConfig.effectValue[0];
+            _currHp = CombatCalculateTool.Instance.GetVlaueRatioForLong(
+                CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.MaxCombatHeroInfo.hp.Value,
+                SelfSkillConfig.effectValue[0]);
         }
 
         public bool CollideTriiger(ITriggerEntity triggerEntity)
@@ -102,6 +104,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
                 pengZhuang.SetActive(false);
                 Debug.Log("盾破了，做表现的时候一起做");
             }
+
             return 0;
         }
     }

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

@@ -12,7 +12,7 @@ namespace GameLogic.Combat.Skill
     /// </summary>
     public class S1401 : SkillBasic
     {
-        private static int[] zdPosIndex = new int[] { 9, 8, 7, 6, 5, 4, 3, 2, 1 };
+        private static int[] zdPosIndex = new int[] { 9, 8, 7, 6, 5, 4, 3, 2, 1 , 9};
 
         protected override void ProUseSkill()
         {

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -59,52 +59,56 @@ namespace GameLogic.Hero
         {
             attributeBlValue.Clear();
             CalAttribute();
-            List<FaBaoInfo> myAllFaBao = PlayerManager.Instance.FaBaoControl.myAllFaBao;
-            foreach (var faBaoInfo in myAllFaBao)
+         
+
+            if (!PlayerManager.Instance.isTest)
             {
-                if (faBaoInfo.SkillConfig.addPropertyType != null)
+                List<FaBaoInfo> myAllFaBao = PlayerManager.Instance.FaBaoControl.myAllFaBao;
+                foreach (var faBaoInfo in myAllFaBao)
                 {
-                    for (int i = 0; i < faBaoInfo.SkillConfig.addPropertyType.Length; i++)
+                    if (faBaoInfo.SkillConfig.addPropertyType != null)
                     {
-                        int shuxingID = faBaoInfo.SkillConfig.addPropertyType[i];
-                        float shuxingValue = faBaoInfo.SkillConfig.addPropertyValue[i];
-                        ComputeHeroAttributeType(shuxingID, shuxingValue);
+                        for (int i = 0; i < faBaoInfo.SkillConfig.addPropertyType.Length; i++)
+                        {
+                            int shuxingID = faBaoInfo.SkillConfig.addPropertyType[i];
+                            float shuxingValue = faBaoInfo.SkillConfig.addPropertyValue[i];
+                            ComputeHeroAttributeType(shuxingID, shuxingValue);
+                        }
                     }
                 }
-            }
-
-            ///功法加被动属性
-            List<SkillInfo> allSkill = PlayerManager.Instance.GongFaControl.allSkill;
-            for (int j = 0; j < allSkill.Count; j++)
-            {
-                SkillInfo skillInfo = allSkill[j];
-                if (skillInfo.skillConfig.addPropertyType != null)
+                ///功法加被动属性
+                List<SkillInfo> allSkill = PlayerManager.Instance.GongFaControl.allSkill;
+                for (int j = 0; j < allSkill.Count; j++)
                 {
-                    for (int i = 0; i < skillInfo.skillConfig.addPropertyType.Length; i++)
+                    SkillInfo skillInfo = allSkill[j];
+                    if (skillInfo.skillConfig.addPropertyType != null)
                     {
-                        int shuxingID = skillInfo.skillConfig.addPropertyType[i];
-                        float shuxingValue = skillInfo.skillConfig.addPropertyValue[i];
-                        ComputeHeroAttributeType(shuxingID, shuxingValue);
+                        for (int i = 0; i < skillInfo.skillConfig.addPropertyType.Length; i++)
+                        {
+                            int shuxingID = skillInfo.skillConfig.addPropertyType[i];
+                            float shuxingValue = skillInfo.skillConfig.addPropertyValue[i];
+                            ComputeHeroAttributeType(shuxingID, shuxingValue);
+                        }
                     }
                 }
-            }
 
-            foreach (var VARIABLE in attributeBlValue)
-            {
-                switch (VARIABLE.Key)
+                foreach (var VARIABLE in attributeBlValue)
                 {
-                    case HeroAttributeType.HP_BL:
-                        hp.Value += (long)(hp.Value * (VARIABLE.Value / 100f));
-                        break;
-                    case HeroAttributeType.ATT_BL:
-                        attack.Value += (long)(attack.Value * (VARIABLE.Value / 100f));
-                        break;
-                    case HeroAttributeType.DEF_BL:
-                        defense.Value += (long)(defense.Value * (VARIABLE.Value / 100f));
-                        break;
-                    case HeroAttributeType.ShengShi_BL:
-                        shenshi.Value += (long)(shenshi.Value * (VARIABLE.Value / 100f));
-                        break;
+                    switch (VARIABLE.Key)
+                    {
+                        case HeroAttributeType.HP_BL:
+                            hp.Value += (long)(hp.Value * (VARIABLE.Value / 100f));
+                            break;
+                        case HeroAttributeType.ATT_BL:
+                            attack.Value += (long)(attack.Value * (VARIABLE.Value / 100f));
+                            break;
+                        case HeroAttributeType.DEF_BL:
+                            defense.Value += (long)(defense.Value * (VARIABLE.Value / 100f));
+                            break;
+                        case HeroAttributeType.ShengShi_BL:
+                            shenshi.Value += (long)(shenshi.Value * (VARIABLE.Value / 100f));
+                            break;
+                    }
                 }
             }
 

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -21,6 +21,8 @@ public class PlayerManager : Singleton<PlayerManager>
     public FaBaoControl FaBaoControl;
     public BagController BagController;
 
+    public bool isTest;
+
     /// <summary>
     /// 玩家角色属性
     /// </summary>
@@ -86,6 +88,7 @@ public class PlayerManager : Singleton<PlayerManager>
 
     public void AddTestHeroInfo(TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig)
     {
+        isTest = true;
         GongFaControl.allSkill.Clear();
         SkillConfig[] allSkillConfig = ConfigComponent.Instance.GetAll<SkillConfig>();
         for (int i = 0; i < allSkillConfig.Length; i++)
@@ -142,8 +145,9 @@ public class PlayerManager : Singleton<PlayerManager>
             for (int i = 0; i < testHeroInfoConfig.magicWeaponId.Count; i++)
             {
                 FaBaoInfo faBaoInfo = new FaBaoInfo(testHeroInfoConfig.magicWeaponId[i], fbLevel);
-                FaBaoControl.AddFaBao(faBaoInfo);
+                faBaoInfo.FaBaoData.useIndex = i;
                 FaBaoControl.FightFaBao[i] = faBaoInfo;
+                FaBaoControl.AddFaBao(faBaoInfo);
             }
         }
 
@@ -162,28 +166,28 @@ public class PlayerManager : Singleton<PlayerManager>
         myHero.TaoismSkillId = 601011;
         myHero.MagicWeaponID.Clear();
         myHero.MagicWeaponID.AddRange(FaBaoControl.FightFaBao);
-        for (int i = 0; i < FaBaoControl.FightFaBao.Length; i++)
-        {
-            FaBaoInfo faBaoInfo = FaBaoControl.FightFaBao[i];
-            if (faBaoInfo != null)
-            {
-                foreach (var VARIABLE in faBaoInfo.attriButedIC)
-                {
-                    switch (VARIABLE.Key)
-                    {
-                        case 1:
-                            myHero.hp += VARIABLE.Value;
-                            break;
-                        case 2:
-                            myHero.defense += VARIABLE.Value;
-                            break;
-                        case 3:
-                            myHero.attack += VARIABLE.Value;
-                            break;
-                    }
-                }
-            }
-        }
+        // for (int i = 0; i < FaBaoControl.FightFaBao.Length; i++)
+        // {
+        //     FaBaoInfo faBaoInfo = FaBaoControl.FightFaBao[i];
+        //     if (faBaoInfo != null)
+        //     {
+        //         foreach (var VARIABLE in faBaoInfo.attriButedIC)
+        //         {
+        //             switch (VARIABLE.Key)
+        //             {
+        //                 case 1:
+        //                     myHero.hp += VARIABLE.Value;
+        //                     break;
+        //                 case 2:
+        //                     myHero.defense += VARIABLE.Value;
+        //                     break;
+        //                 case 3:
+        //                     myHero.attack += VARIABLE.Value;
+        //                     break;
+        //             }
+        //         }
+        //     }
+        // }
     }