DESKTOP-FB72PO8\Administrator пре 1 дан
родитељ
комит
42d768a1c8

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.3
+    - _MainTexOffsetV: -0.010939717
     - _MainTilingU: 1
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5
     - _MaskSpeedU: 0.5

+ 2 - 2
Assets/Scenes/testCombat.scene

@@ -2378,7 +2378,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
-      value: 10001
+      value: 10005
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[2]
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[2]
@@ -2394,7 +2394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []

+ 2 - 0
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3401.cs

@@ -21,6 +21,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
 
 
         private float moveTime;
         private float moveTime;
 
 
+        
         public void InitActive(Vector3 endPos, System.Action finishCallBack)
         public void InitActive(Vector3 endPos, System.Action finishCallBack)
         {
         {
             this.endPos = endPos;
             this.endPos = endPos;
@@ -119,6 +120,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
                 bool isUpdate = fxMove.Update(time);
                 bool isUpdate = fxMove.Update(time);
                 if (!isUpdate)
                 if (!isUpdate)
                 {
                 {
+                    ActivationTimeLineData("sk1_hit");
                     _currTriggerFx.RemoveAt(i);
                     _currTriggerFx.RemoveAt(i);
                     i--;
                     i--;
                 }
                 }

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


Неке датотеке нису приказане због велике количине промена