duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'feature/gfx-action' (#476) from feature/gfx-action into develop

Browse Source 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/476
This commit is contained in:
hoangvd
2026-05-30 08:46:18 +00:00
parent 6f931db92d ad788a1f3e
commit 8fcdcddc4c
2 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/法师/火煞天灯预备.prefab
+62 -62
View File
@@ -28,8 +28,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -48,7 +48,7 @@ ParticleSystem:
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 0
looping: 1
looping: 0
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
@@ -286,9 +286,9 @@ ParticleSystem:
m_NumAlphaKeys: 2
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 0.06
minScalar: 1
minMaxState: 3
scalar: 0.0198
minScalar: 0.00198
maxCurve:
serializedVersion: 2
m_Curve:
@@ -339,9 +339,9 @@ ParticleSystem:
m_RotationOrder: 4
startSizeY:
serializedVersion: 2
minMaxState: 0
scalar: 0.8
minScalar: 1
minMaxState: 3
scalar: 0.264
minScalar: 0.0264
maxCurve:
serializedVersion: 2
m_Curve:
@@ -392,7 +392,7 @@ ParticleSystem:
m_RotationOrder: 4
startSizeZ:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
@@ -989,15 +989,15 @@ ParticleSystem:
time: 0
value: 0.1
inSlope: 0
outSlope: 0.9
outSlope: 2.25
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 0.4
value: 1
inSlope: 0.9
inSlope: 2.25
outSlope: 1
tangentMode: 69
weightedMode: 0
@@ -4861,8 +4861,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -5120,7 +5120,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 0.1
scalar: 0.066
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -5173,7 +5173,7 @@ ParticleSystem:
startSizeY:
serializedVersion: 2
minMaxState: 0
scalar: 3
scalar: 1.98
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -9701,13 +9701,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4156109756121644754}
serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!198 &3044079569031960902
ParticleSystem:
m_ObjectHideFlags: 0
@@ -9717,13 +9717,13 @@ ParticleSystem:
m_GameObject: {fileID: 4156109756121644754}
serializedVersion: 8
lengthInSec: 2.6666667
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 0
looping: 1
looping: 0
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
@@ -9961,9 +9961,9 @@ ParticleSystem:
m_NumAlphaKeys: 2
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 0.3
minScalar: 1
minMaxState: 3
scalar: 0.198
minScalar: 0.0594
maxCurve:
serializedVersion: 2
m_Curve:
@@ -10014,7 +10014,7 @@ ParticleSystem:
m_RotationOrder: 4
startSizeY:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
@@ -10067,7 +10067,7 @@ ParticleSystem:
m_RotationOrder: 4
startSizeZ:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
@@ -10343,7 +10343,7 @@ ParticleSystem:
angle: 25
length: 5
boxThickness: {x: 0, y: 0, z: 0}
radiusThickness: 0.15
radiusThickness: 0.075
donutRadius: 0.2
m_Position: {x: 0, y: 0, z: 0}
m_Rotation: {x: 0, y: 0, z: 0}
@@ -10426,7 +10426,7 @@ ParticleSystem:
sphericalDirectionAmount: 0
randomPositionAmount: 0
radius:
value: 0.3
value: 0.15
mode: 0
spread: 0
speed:
@@ -10923,7 +10923,7 @@ ParticleSystem:
curve:
serializedVersion: 2
minMaxState: 0
scalar: -1.0471976
scalar: 0.5235988
minScalar: 0.7853982
maxCurve:
serializedVersion: 2
@@ -11000,7 +11000,7 @@ ParticleSystem:
ctime6: 0
ctime7: 0
atime0: 0
atime1: 41746
atime1: 31391
atime2: 0
atime3: 0
atime4: 0
@@ -11166,7 +11166,7 @@ ParticleSystem:
flipU: 0
flipV: 0
VelocityModule:
enabled: 0
enabled: 1
x:
serializedVersion: 2
minMaxState: 0
@@ -11276,7 +11276,7 @@ ParticleSystem:
z:
serializedVersion: 2
minMaxState: 0
scalar: 0
scalar: -0.3
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -14534,13 +14534,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5356063420659783603}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!198 &7809534118132123031
ParticleSystem:
m_ObjectHideFlags: 0
@@ -14550,13 +14550,13 @@ ParticleSystem:
m_GameObject: {fileID: 5356063420659783603}
serializedVersion: 8
lengthInSec: 2.6666667
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 0
looping: 1
looping: 0
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
@@ -14794,9 +14794,9 @@ ParticleSystem:
m_NumAlphaKeys: 2
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 0.3
minScalar: 1
minMaxState: 3
scalar: 0.198
minScalar: 0.0594
maxCurve:
serializedVersion: 2
m_Curve:
@@ -14847,7 +14847,7 @@ ParticleSystem:
m_RotationOrder: 4
startSizeY:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
@@ -14900,7 +14900,7 @@ ParticleSystem:
m_RotationOrder: 4
startSizeZ:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
@@ -15176,7 +15176,7 @@ ParticleSystem:
angle: 25
length: 5
boxThickness: {x: 0, y: 0, z: 0}
radiusThickness: 0.15
radiusThickness: 0.075
donutRadius: 0.2
m_Position: {x: 0, y: 0, z: 0}
m_Rotation: {x: 0, y: 0, z: 0}
@@ -15259,7 +15259,7 @@ ParticleSystem:
sphericalDirectionAmount: 0
randomPositionAmount: 0
radius:
value: 0.3
value: 0.15
mode: 0
spread: 0
speed:
@@ -15756,7 +15756,7 @@ ParticleSystem:
curve:
serializedVersion: 2
minMaxState: 0
scalar: -1.0471976
scalar: 0.5235988
minScalar: 0.7853982
maxCurve:
serializedVersion: 2
@@ -15833,7 +15833,7 @@ ParticleSystem:
ctime6: 0
ctime7: 0
atime0: 0
atime1: 41746
atime1: 31391
atime2: 0
atime3: 0
atime4: 0
@@ -15999,7 +15999,7 @@ ParticleSystem:
flipU: 0
flipV: 0
VelocityModule:
enabled: 0
enabled: 1
x:
serializedVersion: 2
minMaxState: 0
@@ -16109,7 +16109,7 @@ ParticleSystem:
z:
serializedVersion: 2
minMaxState: 0
scalar: 0
scalar: -0.3
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -24203,8 +24203,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -24462,7 +24462,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.66
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -25213,7 +25213,7 @@ ParticleSystem:
curve:
serializedVersion: 2
minMaxState: 1
scalar: 3
scalar: 7
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -29265,8 +29265,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -29524,7 +29524,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.66
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -30275,7 +30275,7 @@ ParticleSystem:
curve:
serializedVersion: 2
minMaxState: 1
scalar: 3
scalar: 7
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -34325,7 +34325,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8371960761476880613}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -34337,7 +34337,7 @@ Transform:
- {fileID: 5672422335746002953}
- {fileID: 2225657002619551216}
m_Father: {fileID: 7819147162491929641}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
--- !u!198 &3986264003655121474
ParticleSystem:
m_ObjectHideFlags: 0
@@ -34346,7 +34346,7 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8371960761476880613}
serializedVersion: 8
lengthInSec: 5
lengthInSec: 3
simulationSpeed: 1
stopAction: 0
cullingMode: 0
Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/冰雹飞行.prefab
+14 -14
View File
@@ -108,7 +108,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -4999,7 +4999,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -9890,7 +9890,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -14723,7 +14723,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -19614,7 +19614,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -24505,7 +24505,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -29396,7 +29396,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -34287,7 +34287,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -39120,7 +39120,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -43931,8 +43931,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_LocalScale: {x: 1.3, y: 1.3, z: 1.3}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 2723944771967831532}
- {fileID: 3213955229976586519}
@@ -48856,7 +48856,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -53747,7 +53747,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -58580,7 +58580,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3