Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
342 changes: 171 additions & 171 deletions Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/CharSelect.unity
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/Startup.unity
Git LFS file not shown
Git LFS file not shown
3 changes: 3 additions & 0 deletions Assets/BossRoom/Textures/UI/ui_revive.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 96 additions & 0 deletions Assets/BossRoom/Textures/UI/ui_revive.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/BossRoom/VFX/Materials/GroundClick.mat
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 0.43921566, g: 0.6440593, b: 1, a: 0.0627451}
- _Color: {r: 0.4392156, g: 0.6440593, b: 1, a: 0.2509804}
- _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
- _Emission: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0.045186214, g: 1, b: 0, a: 1}
Expand Down
50 changes: 16 additions & 34 deletions Assets/BossRoom/VFX/Prefabs/UI/fx_GroundClickFX.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6957808770263120477}
serializedVersion: 7
lengthInSec: 1
simulationSpeed: 5
lengthInSec: 0.25
simulationSpeed: 1
stopAction: 0
cullingMode: 0
ringBufferMode: 0
Expand All @@ -50,7 +50,7 @@ ParticleSystem:
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 1
autoRandomSeed: 0
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
Expand Down Expand Up @@ -115,7 +115,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.25
minScalar: 5
maxCurve:
serializedVersion: 2
Expand Down Expand Up @@ -284,7 +284,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.5
minScalar: 1
maxCurve:
serializedVersion: 2
Expand Down Expand Up @@ -865,7 +865,7 @@ ParticleSystem:
rateOverTime:
serializedVersion: 2
minMaxState: 0
scalar: 2
scalar: 5
minScalar: 10
maxCurve:
serializedVersion: 2
Expand Down Expand Up @@ -982,40 +982,22 @@ ParticleSystem:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.16923074
inSlope: 2.076824
outSlope: 2.076824
tangentMode: 34
weightedMode: 0
inWeight: 0
outWeight: 0.33333334
- serializedVersion: 3
time: 0.07984485
value: 0.33505443
inSlope: 1.1490527
outSlope: 1.1490527
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.26303408
- serializedVersion: 3
time: 0.65103936
value: 0.50198555
inSlope: 0.032624926
outSlope: 0.032624926
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.284846
outWeight: 0.50125784
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0.42801476
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
Expand Down Expand Up @@ -1313,7 +1295,7 @@ ParticleSystem:
m_RotationOrder: 4
separateAxes: 0
ColorModule:
enabled: 1
enabled: 0
gradient:
serializedVersion: 2
minMaxState: 1
Expand Down