浏览代码

修改功法效果

DESKTOP-FB72PO8\Administrator 3 周之前
父节点
当前提交
d7fd1c0fe6

+ 5 - 1
Assets/Art/HeroTimeLine/gf_1102_timeline.playable

@@ -71,7 +71,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0
+    m_Start: 0.21666666666666667
     m_ClipIn: 0
     m_Asset: {fileID: -620769377542017112}
     m_Duration: 1.6
@@ -296,6 +296,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -355,6 +357,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &6478050454879568048
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 7 - 1
Assets/Art/HeroTimeLine/gf_1402_timeline.playable

@@ -180,6 +180,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-3027029268403137025
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -217,6 +219,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-1961705670254758766
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -334,7 +338,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 6478050454879568048}
-    m_Duration: 0.9333333333333333
+    m_Duration: 1.6
     m_TimeScale: 1
     m_ParentTrack: {fileID: -894447145330074657}
     m_EaseInDuration: 0
@@ -463,6 +467,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 5 - 2
Assets/Art/VFX/FXPrefabs/fx_gf_1101.prefab

@@ -9868,6 +9868,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1101_hit
@@ -9880,10 +9881,12 @@ MonoBehaviour:
   size: 1
   isInit: 0
   speed: 30
-  parabolaCurveType: 1
+  roatRoot: {fileID: 0}
+  raotIndex: 0
+  parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
-  isUseX: 0
+  isUseX: 1
   BesselPath:
     isActive: 0
     controlPoints: []

+ 4 - 1
Assets/Art/VFX/FXPrefabs/fx_gf_1102.prefab

@@ -24423,7 +24423,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  delayTime: 0
+  moveTarget: {fileID: 0}
+  delayTime: 0.75
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1102_hit
   hitAudioName: 
@@ -24435,6 +24436,8 @@ MonoBehaviour:
   size: 1
   isInit: 0
   speed: 30
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 

+ 1 - 1
Assets/Res/CombatScenes/CombatRoot.prefab

@@ -30,7 +30,7 @@ Transform:
   m_GameObject: {fileID: 65994213146227239}
   serializedVersion: 2
   m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078}
-  m_LocalPosition: {x: -0, y: -2, z: -0.7}
+  m_LocalPosition: {x: -0, y: -3, z: -0.7}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

+ 1 - 1
Assets/Res/TimeLineAssets/1102_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"1102_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack3_1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1102\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_1102_sf\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1102_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"1102_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack3_1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.6,\"continuedTime\":1.6,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_1102\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0.2166667,\"endTime\":1.816667,\"continuedTime\":1.6,\"targetEntityType\":2,\"totalTime\":0}","{\"fxName\":\"fx_gf_1102_sf\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"zdpos1\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1102_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":1,\"totalTime\":0}"],"heroName":"1102_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

文件差异内容过多而无法显示
+ 0 - 0
Assets/Res/TimeLineAssets/1402_timeline_TD.txt


+ 1 - 1
Assets/Scenes/testCombat.scene

@@ -2297,7 +2297,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 1 - 1
Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -114,7 +114,7 @@ namespace GameLogic.Combat.CombatState
 
                 float distance = Vector3.SqrMagnitude(hero.combatHeroGameObject.position -
                                                       playerHeroEntity.combatHeroGameObject.position);
-                if (distance < minDistance && distance < 400)
+                if (distance < minDistance && distance < 225)
                 {
                     // if (!_combatHeroEntity.IsEnemy || distance < _combatHeroEntity.CurrCombatHeroInfo.maxDisTo + 100)
                     {

+ 2 - 2
Assets/Scripts/GameLogic/Combat/CombatTool/CombatCameraControllder.cs

@@ -84,9 +84,9 @@ namespace GameLogic.Combat.CombatTool
         public void CameraSelect_onValueChanged(float value)
         {
             _cameraSelectValue = value;
-            Vector3 pos1 = new Vector3(0, -2, -0.7f);
+            Vector3 pos1 = new Vector3(0, -3, -0.7f);
             Vector3 e1 = new Vector3(20, 0, 0);
-            Vector3 pos2 = new Vector3(9, 0.7f, -1.4f);
+            Vector3 pos2 = new Vector3(9, -1, -1.4f);
             Vector3 e2 = new Vector3(17.77f, -28.25f, 1.165f);
             Camera.transform.localPosition =
                 Vector3.Lerp(pos1, pos2, value);

+ 8 - 4
Assets/Scripts/GameLogic/Combat/Skill/S1102.cs

@@ -23,12 +23,16 @@ 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++)
+            ballisticsCount = 1;
+            for (int i = 0; i < 1; i++)
             {
-                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+                // float x=CombatCalculateTool.Instance.GetOdd(-100, 100)/100f*3;
+                // float y=CombatCalculateTool.Instance.GetOdd(50, 100)/100f*2;
+                Vector3 off = new Vector3(0, 1,1.5f);
+                off = CombatHeroEntity.GameObject.transform.TransformPoint(off);
+                // SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
                 ActivationTimeLineData("1102_fashe", currTarget: currTarget,
-                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
+                    customizePos: new Vector3[] { off }, indexCount: i);
             }
         }
 

+ 1 - 1
Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxParabolaBulletLogic.cs

@@ -85,7 +85,7 @@ namespace Common.Combat.FxAILogic
                 startDir = CombatHeroEntity.GameObject.transform.TransformPoint(off +
                     new Vector3(
                         x,
-                        Random.Range(0.1f, 1f),
+                        0,
                         Random.Range(0.1f, 5f)));
 
                 startDir = (startDir - _currPos).normalized;

部分文件因为文件数量过多而无法显示