李桃 2 hete
szülő
commit
9d94845521

+ 8 - 8
Assets/Art/Character/Guaiwu/BossQiongQi/Boss_QiongQi.playable

@@ -34,7 +34,7 @@ MonoBehaviour:
   m_Children: []
   m_Children: []
   m_Clips:
   m_Clips:
   - m_Version: 1
   - m_Version: 1
-    m_Start: 1.1
+    m_Start: 0.9
     m_ClipIn: 0
     m_ClipIn: 0
     m_Asset: {fileID: -2469125803487629868}
     m_Asset: {fileID: -2469125803487629868}
     m_Duration: 5
     m_Duration: 5
@@ -710,14 +710,14 @@ MonoBehaviour:
   targetSpecialDotName: zdpos1
   targetSpecialDotName: zdpos1
   isUseRandom: 1
   isUseRandom: 1
   xoff:
   xoff:
-    x: 2
-    y: -2
+    x: 1
+    y: -1
   yoff:
   yoff:
-    x: 2
-    y: -2
+    x: 1
+    y: -1
   zoff:
   zoff:
-    x: 2
-    y: -2
+    x: 1
+    y: -1
   hitPointGroupName: 
   hitPointGroupName: 
   isGround: 0
   isGround: 0
   isFollowTarget: 0
   isFollowTarget: 0
@@ -1858,7 +1858,7 @@ MonoBehaviour:
   m_Version: 3
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_AnimClip: {fileID: 0}
   m_Locked: 0
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Parent: {fileID: 11400000}

+ 1 - 1
Assets/Art/Character/Guaiwu/BossQiongQi/qiongqi.mat

@@ -121,7 +121,7 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _Emission: {r: 0, g: 0, b: 0, a: 0}
     - _Emission: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _MainColor: {r: 3.1088903, g: 2.2481136, b: 2.0404708, a: 0}
+    - _MainColor: {r: 0.6508542, g: 0.7421368, b: 1.3396225, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
   m_BuildTextureStacks: []
 --- !u!114 &8208605292606508037
 --- !u!114 &8208605292606508037

+ 2 - 24
Assets/Art/VFX/FXPrefabs/fx boss 9052 zd.prefab

@@ -24575,7 +24575,6 @@ GameObject:
   - component: {fileID: 7466353896069030335}
   - component: {fileID: 7466353896069030335}
   - component: {fileID: 998150403444552732}
   - component: {fileID: 998150403444552732}
   - component: {fileID: 7793222201525339119}
   - component: {fileID: 7793222201525339119}
-  - component: {fileID: 989054108311261063}
   m_Layer: 0
   m_Layer: 0
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: fx boss 9052 zd
   m_Name: fx boss 9052 zd
@@ -29468,7 +29467,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
   moveTarget: {fileID: 0}
   delayTime: 0.1
   delayTime: 0.1
-  multipleTargetDelayTime: 0
+  multipleTargetDelayTime: 0.1
   hitFxName: fx boss 9052 hit
   hitFxName: fx boss 9052 hit
   hitAudioName: 
   hitAudioName: 
   extraMoveSpeed: 0
   extraMoveSpeed: 0
@@ -29478,7 +29477,7 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   customTargetEndPosIndex: 0
   size: 1
   size: 1
   isInit: 0
   isInit: 0
-  speed: 25
+  speed: 20
   roatRoot: {fileID: 0}
   roatRoot: {fileID: 0}
   raotIndex: 0
   raotIndex: 0
   parabolaCurveType: 1
   parabolaCurveType: 1
@@ -29490,27 +29489,6 @@ MonoBehaviour:
     controlPoints: []
     controlPoints: []
     allDis: 0
     allDis: 0
   maxTime: 10
   maxTime: 10
---- !u!95 &989054108311261063
-Animator:
-  serializedVersion: 5
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7412391199606318376}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 94f3085beb48e1a40a1b61538dfa91c4, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &8163178968380641720
 --- !u!1 &8163178968380641720
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Res/TimeLineAssets/Boss_QiongQi_TD.txt


+ 1 - 1
Assets/Scenes/testCombat.scene

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

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott