修改bug

Assets/Art/Character/Guaiwu/BossQiongQi/Boss_QiongQi.playable

@@ -142,6 +142,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos2
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -216,6 +217,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos3
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -265,6 +267,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -708,6 +711,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: zdpos1
+  randomGroup: 0
   isUseRandom: 1
   xoff:
     x: 1
@@ -1312,6 +1316,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -1361,6 +1366,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 1
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -1520,6 +1526,7 @@ MonoBehaviour:
   targetType: 2
   LocationType: 1
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0
@@ -1538,7 +1545,7 @@ MonoBehaviour:
   isAttSpeed: 0
   isLoop: 0
   loopAlone: 0
-  isActivityCustomTargetPos: 0
+  isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
   isRoat: 0
@@ -2024,6 +2031,7 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  randomGroup: 0
   isUseRandom: 0
   xoff:
     x: 0

Assets/Art/VFX/FXPrefabs/fx gw laoshu zd.prefab

@@ -4848,7 +4848,6 @@ GameObject:
   - component: {fileID: 4549703131287283796}
   - component: {fileID: 3160199261674094191}
   - component: {fileID: 782681925891191511}
-  - component: {fileID: 1334813863390521901}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx gw laoshu zd
@@ -9770,6 +9769,7 @@ MonoBehaviour:
   multipleTargetDelayTime: 0.1
   hitFxName: fx gw laoshu zd hit
   hitAudioName: 
+  pengZhuangHitFxName: 
   extraMoveSpeed: 0
   isNotMove: 0
   isPenetrate: 0
@@ -9816,19 +9816,6 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
---- !u!114 &1334813863390521901
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2645004484261668492}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cfa417b106904e3fa8b8fdd30dfb0e38, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  delayTime: 0.5
 --- !u!1 &5123393947038394162
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/Config/BuffConfig.json

@@ -297,7 +297,7 @@
       "buffGroup": 1018,
       "overlayCount": 10,
       "effectValue": [
-        3.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 15.0,

Assets/Res/Config/HeroModelConfig.json

@@ -298,10 +298,10 @@
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 180,
-      "hp": 284,
+      "attack": 90,
+      "hp": 567,
       "def": 100,
-      "shield": 284,
+      "shield": 567,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -878,10 +878,10 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 359,
-      "hp": 232,
+      "attack": 302,
+      "hp": 276,
       "def": 100,
-      "shield": 232,
+      "shield": 276,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1110,10 +1110,10 @@
       "model": "Boss_Tree",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 281,
-      "hp": 350,
+      "attack": 219,
+      "hp": 283,
       "def": 100,
-      "shield": 350,
+      "shield": 283,
       "speed_atk": 0.0,
       "Linggen": [
         100,

Assets/Res/Config/SkillConfig.json

@@ -11675,7 +11675,7 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        100.0,
+        200.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11696,7 +11696,7 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        110.0,
+        230.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11717,7 +11717,7 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        120.0,
+        260.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11738,7 +11738,7 @@
       "SkillType": 2,
       "level": 4,
       "effectValue": [
-        130.0,
+        290.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11759,7 +11759,7 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        140.0,
+        320.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11780,7 +11780,7 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        150.0,
+        350.0,
         2.0
       ],
       "PromoteLan": 0
@@ -11802,7 +11802,7 @@
       "level": 1,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -11824,7 +11824,7 @@
       "level": 2,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -11846,7 +11846,7 @@
       "level": 3,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -11868,7 +11868,7 @@
       "level": 4,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -11890,7 +11890,7 @@
       "level": 5,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -11912,7 +11912,7 @@
       "level": 6,
       "effectValue": [
         80.0,
-        15.0,
+        30.0,
         20.0
       ],
       "PromoteLan": 0
@@ -12077,8 +12077,8 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12098,8 +12098,8 @@
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12119,8 +12119,8 @@
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12140,8 +12140,8 @@
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12161,8 +12161,8 @@
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12182,8 +12182,8 @@
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        4.0,
-        30.0
+        6.0,
+        90.0
       ],
       "PromoteLan": 0
     },
@@ -12491,8 +12491,8 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        2.0,
-        74.0
+        5.0,
+        29.0
       ],
       "intensifierIndex": [
         2
@@ -12515,8 +12515,8 @@
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        2.0,
-        98.0
+        5.0,
+        38.0
       ],
       "intensifierIndex": [
         2
@@ -12539,8 +12539,8 @@
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        2.0,
-        127.0
+        5.0,
+        49.0
       ],
       "intensifierIndex": [
         2
@@ -12563,8 +12563,8 @@
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        2.0,
-        167.0
+        5.0,
+        65.0
       ],
       "intensifierIndex": [
         2
@@ -12587,8 +12587,8 @@
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        2.0,
-        201.0
+        5.0,
+        78.0
       ],
       "intensifierIndex": [
         2
@@ -12611,8 +12611,8 @@
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        2.0,
-        255.0
+        5.0,
+        99.0
       ],
       "intensifierIndex": [
         2

Assets/Scenes/testCombat.scene

@@ -2277,7 +2277,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 9004
+      value: 5007
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID

Assets/Scripts/GameLogic/Combat/Buff/b_1017.cs

@@ -33,17 +33,17 @@ namespace GameLogic.Combat.Buff
 
         protected override void ProUpdateEffect()
         {
-            source.CurrCombatHeroInfo.attack += addAtt;
+            combatHeroEntity.CurrCombatHeroInfo.attack += addAtt;
             addAtt = 0;
             float addAttbl = buffCount * BuffConfig.effectValue[1];
-            addAtt = CombatCalculateTool.Instance.GetVlaueRatioForLong(source.CurrCombatHeroInfo.attack.Value,
+            addAtt = CombatCalculateTool.Instance.GetVlaueRatioForLong(combatHeroEntity.CurrCombatHeroInfo.attack.Value,
                 addAttbl);
-            source.CurrCombatHeroInfo.attack -= addAtt;
+            combatHeroEntity.CurrCombatHeroInfo.attack -= addAtt;
         }
 
         protected override void ProDormancyObj()
         {
-            source.CurrCombatHeroInfo.attack += addAtt;
+            combatHeroEntity.CurrCombatHeroInfo.attack += addAtt;
             addAtt = 0;
         }
     }

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

@@ -23,20 +23,20 @@ namespace GameLogic.Combat.Skill
             ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData, ISkillFeatures skillFeatures)
         {
-            float harmBl = 0;
-            b_1018 b1018 = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForType<b_1018>();
-            if (b1018 != null) //消耗一层感电，额外照成伤害
-            {
-                harmBl += b1018.buffCount * effectValue[1];
-            }
-
-            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                harmBl);
-
-            HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
-                AttType.Skill, triggerData,
-                wuXingType, skillFeatures,
-                HarmType.Default);
+            // float harmBl = 0;
+            // b_1018 b1018 = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForType<b_1018>();
+            // if (b1018 != null) //消耗一层感电，额外照成伤害
+            // {
+            //     harmBl += b1018.buffCount * effectValue[1];
+            // }
+            //
+            // long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+            //     harmBl);
+            //
+            // HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
+            //     AttType.Skill, triggerData,
+            //     wuXingType, skillFeatures,
+            //     HarmType.Default);
         }
 
         protected override void ProCombatUpdate(float time)
@@ -54,7 +54,7 @@ namespace GameLogic.Combat.Skill
                     if (b1018 != null)
                     {
                         Vector3 targetPos = targetHeroEntity.dotPos;
-                        ActivationTimeLineData("9053_fashe", customizePos: new Vector3[] { targetPos });
+                        ActivationTimeLineData("9054", customizePos: new Vector3[] { targetPos });
 
                         int count = b1018.buffCount;
                         float harmBl = count * effectValue[1];

UserSettings/Layouts/default-2022.dwlt

@@ -97,7 +97,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 1662
+  controlID: 6423
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -116,10 +116,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 790
-    width: 906
+    width: 1130
     height: 459
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
@@ -222,7 +222,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 150}
   m_MaxSize: {x: 32384, y: 24288}
   vertical: 0
-  controlID: 41
+  controlID: 78
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -241,7 +241,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 875
+    width: 651
     height: 1299
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
@@ -268,14 +268,14 @@ MonoBehaviour:
   - {fileID: 13}
   m_Position:
     serializedVersion: 2
-    x: 875
+    x: 651
     y: 0
-    width: 906
+    width: 1130
     height: 1299
   m_MinSize: {x: 100, y: 150}
   m_MaxSize: {x: 8096, y: 24288}
   vertical: 1
-  controlID: 42
+  controlID: 79
   draggingID: 0
 --- !u!114 &12
 MonoBehaviour:
@@ -294,10 +294,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 906
+    width: 1130
     height: 790
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 23}
@@ -323,10 +323,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 1249
-    width: 906
+    width: 1130
     height: 50
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 25}
   m_Panes:
   - {fileID: 25}
@@ -356,7 +356,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 187
+  controlID: 136
   draggingID: 0
 --- !u!114 &15
 MonoBehaviour:
@@ -490,9 +490,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 875
+    x: 651
     y: 73
-    width: 904
+    width: 1128
     height: 769
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2708,9 +2708,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 875
+    x: 651
     y: 863
-    width: 904
+    width: 1128
     height: 438
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2812,9 +2812,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 875
+    x: 651
     y: 73
-    width: 904
+    width: 1128
     height: 769
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2849,7 +2849,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 874
+    width: 650
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2903,23 +2903,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 874
+      width: 650
       height: 1257
-    m_Scale: {x: 0.77401483, y: 0.7740148}
-    m_Translation: {x: 437, y: 628.5}
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 325, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -564.5887
+      x: -419.88864
       y: -812
-      width: 1129.1774
+      width: 839.7773
       height: 1624
     m_MinimalGUI: 1
   m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 874, y: 1278}
+  m_LastWindowPixelSize: {x: 650, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -3692,9 +3692,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 875
+    x: 651
     y: 1322
-    width: 904
+    width: 1128
     height: 29
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -3752,9 +3752,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: bab6ffff
-      m_LastClickedID: -18758
-      m_ExpandedIDs: 58d1ffff78faffff
+      m_SelectedIDs: 16f20000
+      m_LastClickedID: 0
+      m_ExpandedIDs: 78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -3837,10 +3837,10 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 1178}
-    m_SelectedIDs: f8f60000
-    m_LastClickedID: 63224
-    m_ExpandedIDs: 000000002af200002cf200002ef2000030f2000032f2000034f2000036f2000038f200003af200003cf200003ef2000040f2000042f2000044f2000046f2000048f200004af200004cf200004ef2000050f2000052f2000054f2000056f2000058f200005af200005cf200005ef2000060f2000082f50000ccf50000faf6000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 1626}
+    m_SelectedIDs: 54f60000
+    m_LastClickedID: 63060
+    m_ExpandedIDs: 0000000032f2000034f2000036f2000038f200003af200003cf200003ef2000040f2000042f2000044f2000046f2000048f200004af200004cf200004ef2000050f2000052f2000054f2000056f2000058f200005af200005cf200005ef2000060f2000062f2000064f2000066f2000068f200008ef50000d8f5000056f6000050f8000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -3868,7 +3868,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000002af200002cf200002ef2000030f2000032f2000034f2000036f2000038f200003af200003cf200003ef2000040f2000042f2000044f2000046f2000048f200004af200004cf200004ef2000050f2000052f2000054f2000056f2000058f200005af200005cf200005ef2000060f20000
+    m_ExpandedIDs: 0000000032f2000034f2000036f2000038f200003af200003cf200003ef2000040f2000042f2000044f2000046f2000048f200004af200004cf200004ef2000050f2000052f2000054f2000056f2000058f200005af200005cf200005ef2000060f2000062f2000064f2000066f2000068f20000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -3965,7 +3965,7 @@ MonoBehaviour:
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 216
+  m_LastVerticalScrollValue: 0
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker: