Skip to content

Commit 9263c14

Browse files
committed
Fixed CaneSwing SFX, new toon Slash effect
1 parent 63c88b9 commit 9263c14

File tree

6 files changed

+113
-8
lines changed

6 files changed

+113
-8
lines changed

UOP1_Project/Assets/Art/Characters/PigChef/Animation/CaneHit.anim

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75690,6 +75690,13 @@ AnimationClip:
7569075690
intParameter: 0
7569175691
messageOptions: 0
7569275692
- time: 0.9166667
75693+
functionName: PlayCaneSwing
75694+
data:
75695+
objectReferenceParameter: {fileID: 0}
75696+
floatParameter: 0
75697+
intParameter: 0
75698+
messageOptions: 0
75699+
- time: 0.96666664
7569375700
functionName: DisableWeapon
7569475701
data:
7569575702
objectReferenceParameter: {fileID: 0}

UOP1_Project/Assets/Art/Characters/PigChef/Animation/CaneHit2.anim

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80135,6 +80135,13 @@ AnimationClip:
8013580135
floatParameter: 0
8013680136
intParameter: 0
8013780137
messageOptions: 0
80138+
- time: 0.96666664
80139+
functionName: PlayCaneSwing
80140+
data:
80141+
objectReferenceParameter: {fileID: 0}
80142+
floatParameter: 0
80143+
intParameter: 0
80144+
messageOptions: 0
8013880145
- time: 1.0333333
8013980146
functionName: DisableWeapon
8014080147
data:

UOP1_Project/Assets/Art/Characters/PigChef/Effect/SlashMaterial.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Material:
1313
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
1414
m_LightmapFlags: 4
1515
m_EnableInstancingVariants: 0
16-
m_DoubleSidedGI: 1
16+
m_DoubleSidedGI: 0
1717
m_CustomRenderQueue: -1
1818
stringTagMap: {}
1919
disabledShaderPasses:
@@ -22,7 +22,7 @@ Material:
2222
serializedVersion: 3
2323
m_TexEnvs:
2424
- Texture2D_1730F8B5:
25-
m_Texture: {fileID: 2800000, guid: 8c13366d54440e543a42887f5060a526, type: 3}
25+
m_Texture: {fileID: 2800000, guid: 8ccdb0aee73283e47aed1e459be172e7, type: 3}
2626
m_Scale: {x: 1, y: 1}
2727
m_Offset: {x: 0, y: 0}
2828
- _BaseMap:
7.96 KB
Loading

UOP1_Project/Assets/Art/Characters/PigChef/Effect/SlashToon.png.meta

Lines changed: 92 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Prefabs/Effects/SlashEffect.prefab

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ ParticleSystem:
115115
startLifetime:
116116
serializedVersion: 2
117117
minMaxState: 0
118-
scalar: 0.2
118+
scalar: 0.3
119119
minScalar: 5
120120
maxCurve:
121121
serializedVersion: 2
@@ -1361,7 +1361,7 @@ ParticleSystem:
13611361
maxColor: {r: 1, g: 1, b: 1, a: 1}
13621362
maxGradient:
13631363
serializedVersion: 2
1364-
key0: {r: 0.5676334, g: 0.5943396, b: 0.26633143, a: 1}
1364+
key0: {r: 1, g: 1, b: 1, a: 1}
13651365
key1: {r: 0.8254717, g: 0.9386101, b: 1, a: 1}
13661366
key2: {r: 0, g: 0, b: 0, a: 0}
13671367
key3: {r: 0, g: 0, b: 0, a: 0}
@@ -1379,8 +1379,8 @@ ParticleSystem:
13791379
ctime7: 0
13801380
atime0: 0
13811381
atime1: 65535
1382-
atime2: 0
1383-
atime3: 0
1382+
atime2: 56456
1383+
atime3: 65535
13841384
atime4: 0
13851385
atime5: 0
13861386
atime6: 0
@@ -4184,7 +4184,7 @@ ParticleSystem:
41844184
m_NumAlphaKeys: 2
41854185
CustomDataModule:
41864186
enabled: 0
4187-
mode0: 0
4187+
mode0: 2
41884188
vectorComponentCount0: 4
41894189
color0:
41904190
serializedVersion: 2
@@ -4768,7 +4768,6 @@ ParticleSystemRenderer:
47684768
m_RendererPriority: 0
47694769
m_Materials:
47704770
- {fileID: 2100000, guid: 514e8bd3e7d96c24e81a80aa87141fe7, type: 2}
4771-
- {fileID: 0}
47724771
m_StaticBatchInfo:
47734772
firstSubMesh: 0
47744773
subMeshCount: 0

0 commit comments

Comments
 (0)