Skip to content

Commit 450af9e

Browse files
authored
Art: Added revive icon, fixes for seams in CharSel and Title screen background, fix for seam in boss room platform, fix for right torch being offset in Title screen, ground click fx now more animated, fix for skybox showing through at Title Screen (#290)
* interim art checkin * fixed normal map seams * interim art checkin * Fix for seams in floor both in dungeon scene and CharSel & Title scenes. Update to crystal material. * interim art checkin * Update to groundclick fx so they look more polished, offset torch fixed in CharSelect screen * Added revive icon, fixes for seams in CharSel and Title screen background, fix for seam in boss room platform, fix for right torch being offset in Title screen, ground click fx now more animated, fix for skybox showing through at Title Screen
1 parent 793f799 commit 450af9e

File tree

8 files changed

+292
-211
lines changed

8 files changed

+292
-211
lines changed

Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab

Lines changed: 171 additions & 171 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:7bd8ffc7869c132b1cf9c63350490688824a503f19c6cdb09b6cb7819f45df8d
3-
size 205246
2+
oid sha256:fe320eca57417b2ff383f7581753e1062092d3ff91af8541345642708995288f
3+
size 201050
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:fdf648e5a3c2730a1fc06b2122f60e7d29beb0b5dc6e9314de97f1d518874437
3-
size 26803
2+
oid sha256:69d0a3a2744936be9f156c8e64afad5a7221562282b237c52a1027f9757be88f
3+
size 26699
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1ea5a5bd2ede9e315a23dafe0a9cd9c7bc839bdb66a3912464c48225304223a0
2+
oid sha256:b55792777381795cbad5e097f49b4c0350ba73d01a451ab35ef1ee4be3c387e9
33
size 12582956
Lines changed: 3 additions & 0 deletions
Loading

Assets/BossRoom/Textures/UI/ui_revive.png.meta

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

Assets/BossRoom/VFX/Materials/GroundClick.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Material:
166166
- _ZWrite: 0
167167
m_Colors:
168168
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
169-
- _Color: {r: 0.43921566, g: 0.6440593, b: 1, a: 0.0627451}
169+
- _Color: {r: 0.4392156, g: 0.6440593, b: 1, a: 0.2509804}
170170
- _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
171171
- _Emission: {r: 0, g: 0, b: 0, a: 0}
172172
- _EmissionColor: {r: 0.045186214, g: 1, b: 0, a: 1}

Assets/BossRoom/VFX/Prefabs/UI/fx_GroundClickFX.prefab

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ ParticleSystem:
4040
m_PrefabAsset: {fileID: 0}
4141
m_GameObject: {fileID: 6957808770263120477}
4242
serializedVersion: 7
43-
lengthInSec: 1
44-
simulationSpeed: 5
43+
lengthInSec: 0.25
44+
simulationSpeed: 1
4545
stopAction: 0
4646
cullingMode: 0
4747
ringBufferMode: 0
@@ -50,7 +50,7 @@ ParticleSystem:
5050
prewarm: 0
5151
playOnAwake: 1
5252
useUnscaledTime: 0
53-
autoRandomSeed: 1
53+
autoRandomSeed: 0
5454
useRigidbodyForVelocity: 1
5555
startDelay:
5656
serializedVersion: 2
@@ -115,7 +115,7 @@ ParticleSystem:
115115
startLifetime:
116116
serializedVersion: 2
117117
minMaxState: 0
118-
scalar: 1
118+
scalar: 0.25
119119
minScalar: 5
120120
maxCurve:
121121
serializedVersion: 2
@@ -284,7 +284,7 @@ ParticleSystem:
284284
startSize:
285285
serializedVersion: 2
286286
minMaxState: 0
287-
scalar: 1
287+
scalar: 0.5
288288
minScalar: 1
289289
maxCurve:
290290
serializedVersion: 2
@@ -865,7 +865,7 @@ ParticleSystem:
865865
rateOverTime:
866866
serializedVersion: 2
867867
minMaxState: 0
868-
scalar: 2
868+
scalar: 5
869869
minScalar: 10
870870
maxCurve:
871871
serializedVersion: 2
@@ -982,40 +982,22 @@ ParticleSystem:
982982
m_Curve:
983983
- serializedVersion: 3
984984
time: 0
985-
value: 0.16923074
986-
inSlope: 2.076824
987-
outSlope: 2.076824
988-
tangentMode: 34
989-
weightedMode: 0
990-
inWeight: 0
991-
outWeight: 0.33333334
992-
- serializedVersion: 3
993-
time: 0.07984485
994-
value: 0.33505443
995-
inSlope: 1.1490527
996-
outSlope: 1.1490527
997-
tangentMode: 0
998-
weightedMode: 0
999-
inWeight: 0.33333334
1000-
outWeight: 0.26303408
1001-
- serializedVersion: 3
1002-
time: 0.65103936
1003-
value: 0.50198555
1004-
inSlope: 0.032624926
1005-
outSlope: 0.032624926
985+
value: 0
986+
inSlope: 0
987+
outSlope: 0
1006988
tangentMode: 0
1007989
weightedMode: 0
1008-
inWeight: 0.284846
1009-
outWeight: 0.50125784
990+
inWeight: 0
991+
outWeight: 0
1010992
- serializedVersion: 3
1011993
time: 1
1012-
value: 0.42801476
994+
value: 1
1013995
inSlope: 0
1014996
outSlope: 0
1015-
tangentMode: 136
997+
tangentMode: 0
1016998
weightedMode: 0
1017-
inWeight: 0.33333334
1018-
outWeight: 0.33333334
999+
inWeight: 0
1000+
outWeight: 0
10191001
m_PreInfinity: 2
10201002
m_PostInfinity: 2
10211003
m_RotationOrder: 4
@@ -1313,7 +1295,7 @@ ParticleSystem:
13131295
m_RotationOrder: 4
13141296
separateAxes: 0
13151297
ColorModule:
1316-
enabled: 1
1298+
enabled: 0
13171299
gradient:
13181300
serializedVersion: 2
13191301
minMaxState: 1

0 commit comments

Comments
 (0)