Skip to content

Commit a902027

Browse files
ChillyHubChillyHub
committed
Update materials, UI
1 parent 05762db commit a902027

76 files changed

Lines changed: 5193 additions & 466 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,11 @@ Library/PackageCache/com.unity.burst@1.8.8/.Runtime/libburst-llvm-15.dylib filte
1313
Library/PackageCache/com.unity.burst@1.8.8/.Runtime/libburst-llvm-15.so filter=lfs diff=lfs merge=lfs -text
1414
Library/PlayerDataCache/Win64/Data/sharedassets1.assets.resS filter=lfs diff=lfs merge=lfs -text
1515
Library/PlayerDataCache/Win64/Data/sharedassets3.assets.resS filter=lfs diff=lfs merge=lfs -text
16+
Library/Bee/Android/Prj/Mono2x/Gradle/launcher/build/intermediates/assets/release/mergeReleaseAssets/bin/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text
17+
Library/Bee/Android/Prj/Mono2x/Gradle/launcher/build/intermediates/compressed_assets/release/out/assets/bin/Data/data.unity3d.jar filter=lfs diff=lfs merge=lfs -text
18+
Library/Bee/Android/Prj/Mono2x/Gradle/launcher/build/outputs/apk/release/launcher-release.apk filter=lfs diff=lfs merge=lfs -text
19+
Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/build/.transforms/e82c8aa592ef7be866b0733dbe18cf9b/transformed/out/assets/bin/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text
20+
Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/build/intermediates/library_assets/release/out/bin/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text
21+
Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/build/intermediates/local_aar_for_lint/release/out.aar filter=lfs diff=lfs merge=lfs -text
22+
Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/src/main/assets/bin/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text
23+
Library/PlayerDataCache/Android/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text

‎Assets/Unity_StarRail_CRP_Sample/Characters/Asta/Materials/Asta_00_Mat_Body1.mat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Material:
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
2727
m_ValidKeywords:
28-
- _CUSTOMBLOOMCOLORVARENUM_DISABLE
28+
- _CUSTOMBLOOMCOLORVARENUM_TINT
2929
- _CUSTOMBLOOMVARENUM_DISABLE
3030
- _CUSTOMOUTLINEVARENUM_MULTIPLY
3131
- _CUSTOMRIMVARENUM_MULTIPLY
@@ -140,7 +140,7 @@ Material:
140140
- _AnisotropySpecularToggle: 0
141141
- _Blend: 0
142142
- _BlendModePreserveSpecular: 1
143-
- _BloomIntensity: 0.37
143+
- _BloomIntensity: 0.8
144144
- _BloomIntensity0: 1
145145
- _BloomIntensity1: 1
146146
- _BloomIntensity2: 1
@@ -154,7 +154,7 @@ Material:
154154
- _ClearCoatSmoothness: 0
155155
- _Cull: 2
156156
- _CullMode: 2
157-
- _CustomBloomColorVarEnum: 0
157+
- _CustomBloomColorVarEnum: 1
158158
- _CustomBloomVarEnum: 0
159159
- _CustomOutlineVarEnum: 1
160160
- _CustomRampMappingToggle: 1
@@ -204,7 +204,7 @@ Material:
204204
- _ReceiveShadows: 1
205205
- _ReceiveShadowsToggle: 1
206206
- _RenderingMode: 0
207-
- _RimIntensity: 1
207+
- _RimIntensity: 0.6
208208
- _RimWidth: 1
209209
- _RimWidth0: 1
210210
- _RimWidth1: 1
@@ -264,7 +264,7 @@ Material:
264264
- _ZWrite: 1
265265
m_Colors:
266266
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
267-
- _BloomColor: {r: 1, g: 1, b: 1, a: 1}
267+
- _BloomColor: {r: 1, g: 0.76792455, b: 0.81185067, a: 1}
268268
- _BloomColor0: {r: 1, g: 1, b: 1, a: 1}
269269
- _BloomColor1: {r: 1, g: 1, b: 1, a: 1}
270270
- _BloomColor2: {r: 1, g: 1, b: 1, a: 1}

‎Assets/Unity_StarRail_CRP_Sample/Characters/Asta/Materials/Asta_00_Mat_Body2.mat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Material:
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
2727
m_ValidKeywords:
28-
- _CUSTOMBLOOMCOLORVARENUM_DISABLE
28+
- _CUSTOMBLOOMCOLORVARENUM_TINT
2929
- _CUSTOMBLOOMVARENUM_DISABLE
3030
- _CUSTOMOUTLINEVARENUM_MULTIPLY
3131
- _CUSTOMRIMVARENUM_MULTIPLY
@@ -140,7 +140,7 @@ Material:
140140
- _AnisotropySpecularToggle: 0
141141
- _Blend: 0
142142
- _BlendModePreserveSpecular: 1
143-
- _BloomIntensity: 0.37
143+
- _BloomIntensity: 0.8
144144
- _BloomIntensity0: 1
145145
- _BloomIntensity1: 1
146146
- _BloomIntensity2: 1
@@ -154,7 +154,7 @@ Material:
154154
- _ClearCoatSmoothness: 0
155155
- _Cull: 2
156156
- _CullMode: 2
157-
- _CustomBloomColorVarEnum: 0
157+
- _CustomBloomColorVarEnum: 1
158158
- _CustomBloomVarEnum: 0
159159
- _CustomOutlineVarEnum: 1
160160
- _CustomRampMappingToggle: 1
@@ -204,7 +204,7 @@ Material:
204204
- _ReceiveShadows: 1
205205
- _ReceiveShadowsToggle: 1
206206
- _RenderingMode: 0
207-
- _RimIntensity: 1
207+
- _RimIntensity: 0.6
208208
- _RimWidth: 1
209209
- _RimWidth0: 1
210210
- _RimWidth1: 1
@@ -264,7 +264,7 @@ Material:
264264
- _ZWrite: 1
265265
m_Colors:
266266
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
267-
- _BloomColor: {r: 1, g: 1, b: 1, a: 1}
267+
- _BloomColor: {r: 1, g: 0.76862746, b: 0.8117647, a: 1}
268268
- _BloomColor0: {r: 1, g: 1, b: 1, a: 1}
269269
- _BloomColor1: {r: 1, g: 1, b: 1, a: 1}
270270
- _BloomColor2: {r: 1, g: 1, b: 1, a: 1}

‎Assets/Unity_StarRail_CRP_Sample/Characters/Asta/Materials/Asta_00_Mat_Body2_Trans.mat‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Material:
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
2727
m_ValidKeywords:
28-
- _CUSTOMBLOOMCOLORVARENUM_DISABLE
28+
- _CUSTOMBLOOMCOLORVARENUM_TINT
2929
- _CUSTOMBLOOMVARENUM_DISABLE
3030
- _CUSTOMOUTLINEVARENUM_MULTIPLY
3131
- _CUSTOMRIMVARENUM_MULTIPLY
@@ -34,7 +34,6 @@ Material:
3434
- _ENABLE_DIFFUSE
3535
- _ENABLE_GI
3636
- _ENABLE_OUTLINE
37-
- _ENABLE_RIM
3837
- _ENABLE_SPECULAR
3938
- _OUTLINENORMALCHANNEL_TANGENT
4039
- _RECEIVE_SHADOWS
@@ -136,7 +135,7 @@ Material:
136135
- _AnisotropySpecularToggle: 0
137136
- _Blend: 0
138137
- _BlendModePreserveSpecular: 1
139-
- _BloomIntensity: 0.37
138+
- _BloomIntensity: 0.8
140139
- _BloomIntensity0: 1
141140
- _BloomIntensity1: 1
142141
- _BloomIntensity2: 1
@@ -150,7 +149,7 @@ Material:
150149
- _ClearCoatSmoothness: 0
151150
- _Cull: 2
152151
- _CullMode: 2
153-
- _CustomBloomColorVarEnum: 0
152+
- _CustomBloomColorVarEnum: 1
154153
- _CustomBloomVarEnum: 0
155154
- _CustomOutlineVarEnum: 1
156155
- _CustomRampMappingToggle: 1
@@ -169,7 +168,7 @@ Material:
169168
- _EnableEmissionToggle: 0
170169
- _EnableGIToggle: 1
171170
- _EnableOutlineToggle: 1
172-
- _EnableRimToggle: 1
171+
- _EnableRimToggle: 0
173172
- _EnableSpecularToggle: 1
174173
- _EnvironmentReflections: 1
175174
- _FresnelIntensity: 1
@@ -200,7 +199,7 @@ Material:
200199
- _ReceiveShadows: 1
201200
- _ReceiveShadowsToggle: 1
202201
- _RenderingMode: 0
203-
- _RimIntensity: 1
202+
- _RimIntensity: 0.6
204203
- _RimWidth: 1
205204
- _RimWidth0: 1
206205
- _RimWidth1: 1
@@ -259,7 +258,7 @@ Material:
259258
- _ZWrite: 1
260259
m_Colors:
261260
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
262-
- _BloomColor: {r: 1, g: 1, b: 1, a: 1}
261+
- _BloomColor: {r: 1, g: 0.76862746, b: 0.8117647, a: 1}
263262
- _BloomColor0: {r: 1, g: 1, b: 1, a: 1}
264263
- _BloomColor1: {r: 1, g: 1, b: 1, a: 1}
265264
- _BloomColor2: {r: 1, g: 1, b: 1, a: 1}

‎Assets/Unity_StarRail_CRP_Sample/Characters/Asta/Materials/Asta_00_Mat_Weapon.mat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Material:
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
2727
m_ValidKeywords:
28-
- _CUSTOMBLOOMCOLORVARENUM_DISABLE
28+
- _CUSTOMBLOOMCOLORVARENUM_TINT
2929
- _CUSTOMBLOOMVARENUM_DISABLE
3030
- _CUSTOMOUTLINEVARENUM_MULTIPLY
3131
- _CUSTOMRIMVARENUM_MULTIPLY
@@ -132,7 +132,7 @@ Material:
132132
- _AnisotropySpecularToggle: 0
133133
- _Blend: 0
134134
- _BlendModePreserveSpecular: 1
135-
- _BloomIntensity: 0.37
135+
- _BloomIntensity: 0.8
136136
- _BloomIntensity0: 1
137137
- _BloomIntensity1: 1
138138
- _BloomIntensity2: 1
@@ -146,7 +146,7 @@ Material:
146146
- _ClearCoatSmoothness: 0
147147
- _Cull: 2
148148
- _CullMode: 2
149-
- _CustomBloomColorVarEnum: 0
149+
- _CustomBloomColorVarEnum: 1
150150
- _CustomBloomVarEnum: 0
151151
- _CustomOutlineVarEnum: 1
152152
- _CustomRampMappingToggle: 1
@@ -196,7 +196,7 @@ Material:
196196
- _ReceiveShadows: 1
197197
- _ReceiveShadowsToggle: 1
198198
- _RenderingMode: 0
199-
- _RimIntensity: 1
199+
- _RimIntensity: 0.6
200200
- _RimWidth: 1
201201
- _RimWidth0: 1
202202
- _RimWidth1: 1
@@ -251,7 +251,7 @@ Material:
251251
- _ZWrite: 1
252252
m_Colors:
253253
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
254-
- _BloomColor: {r: 1, g: 1, b: 1, a: 1}
254+
- _BloomColor: {r: 1, g: 0.76862746, b: 0.8117647, a: 1}
255255
- _BloomColor0: {r: 1, g: 1, b: 1, a: 1}
256256
- _BloomColor1: {r: 1, g: 1, b: 1, a: 1}
257257
- _BloomColor2: {r: 1, g: 1, b: 1, a: 1}

‎Assets/Unity_StarRail_CRP_Sample/Characters/Asta/Materials/Asta_Mat_Face.mat‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Material:
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
15+
- _CUSTOMBLOOMCOLORVARENUM_TINT
1516
- _CUSTOMRIMVARENUM_MULTIPLY
1617
- _ENABLE_DIFFUSE
1718
- _ENABLE_GI
@@ -119,13 +120,14 @@ Material:
119120
- _AnisotropySpecularToggle: 0
120121
- _Blend: 0
121122
- _BlendModePreserveSpecular: 1
122-
- _BloomIntensity: 0.37
123+
- _BloomIntensity: 0.8
123124
- _BumpScale: 1
124125
- _CheckIntensity: 0
125126
- _ClearCoatMask: 0
126127
- _ClearCoatSmoothness: 0
127128
- _Cull: 2
128129
- _CullMode: 2
130+
- _CustomBloomColorVarEnum: 1
129131
- _CustomRimVarEnum: 1
130132
- _Cutoff: 0.5
131133
- _DetailAlbedoMapScale: 1
@@ -164,7 +166,7 @@ Material:
164166
- _ReceiveShadows: 1
165167
- _ReceiveShadowsToggle: 1
166168
- _RenderingMode: 0
167-
- _RimIntensity: 1
169+
- _RimIntensity: 0.6
168170
- _RimWidth: 1
169171
- _ShadowBoost: 1
170172
- _ShadowIntensity: 0
@@ -189,6 +191,7 @@ Material:
189191
- _ZWrite: 1
190192
m_Colors:
191193
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
194+
- _BloomColor: {r: 1, g: 0.76862746, b: 0.8117647, a: 1}
192195
- _Color: {r: 1, g: 1, b: 1, a: 1}
193196
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
194197
- _FresnelColor: {r: 0, g: 0, b: 0, a: 0}

‎Assets/Unity_StarRail_CRP_Sample/Characters/Asta/Materials/Asta_Mat_Hair.mat‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Material:
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
15+
- _CUSTOMBLOOMCOLORVARENUM_TINT
1516
- _CUSTOMRIMVARENUM_MULTIPLY
1617
- _ENABLE_DIFFUSE
1718
- _ENABLE_GI
@@ -114,12 +115,13 @@ Material:
114115
- _AnisotropySpecularToggle: 0
115116
- _Blend: 0
116117
- _BlendModePreserveSpecular: 1
117-
- _BloomIntensity: 0.37
118+
- _BloomIntensity: 0.8
118119
- _BumpScale: 1
119120
- _ClearCoatMask: 0
120121
- _ClearCoatSmoothness: 0
121122
- _Cull: 2
122123
- _CullMode: 2
124+
- _CustomBloomColorVarEnum: 1
123125
- _CustomRimVarEnum: 1
124126
- _Cutoff: 0.5
125127
- _DetailAlbedoMapScale: 1
@@ -180,6 +182,7 @@ Material:
180182
- _ZWrite: 1
181183
m_Colors:
182184
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
185+
- _BloomColor: {r: 1, g: 0.7962264, b: 0.85774255, a: 1}
183186
- _Color: {r: 1, g: 1, b: 1, a: 1}
184187
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
185188
- _FresnelColor: {r: 0, g: 0, b: 0, a: 0}

‎Assets/Unity_StarRail_CRP_Sample/Characters/Asta/Materials/Mat_FaceMask.mat‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Material:
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
2727
m_ValidKeywords:
28+
- _CUSTOMBLOOMCOLORVARENUM_DISABLE
2829
- _CUSTOMRIMVARENUM_DISABLE
2930
- _ENABLE_ADDITIONAL_LIGHT
3031
- _ENABLE_DIFFUSE
@@ -141,6 +142,7 @@ Material:
141142
- _ClearCoatSmoothness: 0
142143
- _Cull: 2
143144
- _CullMode: 2
145+
- _CustomBloomColorVarEnum: 0
144146
- _CustomRimVarEnum: 0
145147
- _Cutoff: 0.5
146148
- _DetailAlbedoMapScale: 1
@@ -204,6 +206,7 @@ Material:
204206
- _ZWrite: 1
205207
m_Colors:
206208
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
209+
- _BloomColor: {r: 1, g: 1, b: 1, a: 1}
207210
- _Color: {r: 1, g: 1, b: 1, a: 1}
208211
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
209212
- _FresnelColor: {r: 0, g: 0, b: 0, a: 0}

‎Assets/Unity_StarRail_CRP_Sample/Characters/Herta/Materials/Herta_00_Mat_Body.mat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Material:
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
2727
m_ValidKeywords:
28-
- _CUSTOMBLOOMCOLORVARENUM_DISABLE
28+
- _CUSTOMBLOOMCOLORVARENUM_TINT
2929
- _CUSTOMBLOOMVARENUM_DISABLE
3030
- _CUSTOMOUTLINEVARENUM_MULTIPLY
3131
- _CUSTOMRIMVARENUM_MULTIPLY
@@ -140,7 +140,7 @@ Material:
140140
- _AnisotropySpecularToggle: 0
141141
- _Blend: 0
142142
- _BlendModePreserveSpecular: 1
143-
- _BloomIntensity: 0.37
143+
- _BloomIntensity: 0.8
144144
- _BloomIntensity0: 1
145145
- _BloomIntensity1: 1
146146
- _BloomIntensity2: 1
@@ -154,7 +154,7 @@ Material:
154154
- _ClearCoatSmoothness: 0
155155
- _Cull: 2
156156
- _CullMode: 0
157-
- _CustomBloomColorVarEnum: 0
157+
- _CustomBloomColorVarEnum: 1
158158
- _CustomBloomVarEnum: 0
159159
- _CustomOutlineVarEnum: 1
160160
- _CustomRampMappingToggle: 1
@@ -204,7 +204,7 @@ Material:
204204
- _ReceiveShadows: 1
205205
- _ReceiveShadowsToggle: 1
206206
- _RenderingMode: 0
207-
- _RimIntensity: 1
207+
- _RimIntensity: 0.6
208208
- _RimWidth: 1
209209
- _RimWidth0: 1
210210
- _RimWidth1: 1
@@ -264,7 +264,7 @@ Material:
264264
- _ZWrite: 1
265265
m_Colors:
266266
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
267-
- _BloomColor: {r: 1, g: 1, b: 1, a: 1}
267+
- _BloomColor: {r: 0.9267357, g: 0.72075474, b: 1, a: 1}
268268
- _BloomColor0: {r: 1, g: 1, b: 1, a: 1}
269269
- _BloomColor1: {r: 1, g: 1, b: 1, a: 1}
270270
- _BloomColor2: {r: 1, g: 1, b: 1, a: 1}

0 commit comments

Comments
 (0)