Skip to content

Commit 93a55c0

Browse files
committed
Add New Scene, Decal Light
1 parent 408d161 commit 93a55c0

385 files changed

Lines changed: 1644574 additions & 2236 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: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,32 @@ Assets/Unity_StarRail_CRP_Sample/Characters/Asta/Models/Player_Maid_Asta_00.fbx
22
Assets/Unity_StarRail_CRP_Sample/Characters/Herta/Models/Player_Girl_Herta_00.fbx filter=lfs diff=lfs merge=lfs -text
33
Assets/Unity_StarRail_CRP_Sample/Characters/Mar_7th/Models/Avatar_Mar_7th_00.fbx filter=lfs diff=lfs merge=lfs -text
44
Assets/Unity_StarRail_CRP_Sample/Characters/Mar_7th/Models/Player_Maid_Mar_7th_00.fbx filter=lfs diff=lfs merge=lfs -text
5-
Assets/Unity_StarRail_CRP_Sample/Characters/PlayerGirl/Player_Miss_PlayerGirl_00/Player_Miss_PlayerGirl_00.fbx filter=lfs diff=lfs merge=lfs -text
5+
Assets/Unity_StarRail_CRP_Sample/Characters/PlayerGirl/Models/Player_Miss_PlayerGirl_00.fbx filter=lfs diff=lfs merge=lfs -text
6+
Documents~/Temp/Video/Characters1_1080p.mp4 filter=lfs diff=lfs merge=lfs -text
67
Library/ArtifactDB filter=lfs diff=lfs merge=lfs -text
7-
Library/Artifacts/42/42fe3aaa07094fe13a0eae5271a49408 filter=lfs diff=lfs merge=lfs -text
88
Library/Artifacts/79/792d2ec107b4201e712a406e3dea9cab filter=lfs diff=lfs merge=lfs -text
9-
Library/PackageCache/com.unity.burst@1.8.8/.Runtime/burst-llvm-15.dll filter=lfs diff=lfs merge=lfs -text
10-
Library/PackageCache/com.unity.burst@1.8.8/.Runtime/hostmac/dsymutil filter=lfs diff=lfs merge=lfs -text
11-
Library/PackageCache/com.unity.burst@1.8.8/.Runtime/libburst-llvm-10.dylib filter=lfs diff=lfs merge=lfs -text
12-
Library/PackageCache/com.unity.burst@1.8.8/.Runtime/libburst-llvm-15.dylib filter=lfs diff=lfs merge=lfs -text
13-
Library/PackageCache/com.unity.burst@1.8.8/.Runtime/libburst-llvm-15.so filter=lfs diff=lfs merge=lfs -text
14-
Library/PlayerDataCache/Win64/Data/sharedassets1.assets.resS filter=lfs diff=lfs merge=lfs -text
15-
Library/PlayerDataCache/Win64/Data/sharedassets3.assets.resS filter=lfs diff=lfs merge=lfs -text
9+
Library/Bee/Android/Prj/Mono2x/Gradle/launcher/build/intermediates/assets/debug/mergeDebugAssets/bin/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text
1610
Library/Bee/Android/Prj/Mono2x/Gradle/launcher/build/intermediates/assets/release/mergeReleaseAssets/bin/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text
11+
Library/Bee/Android/Prj/Mono2x/Gradle/launcher/build/intermediates/compressed_assets/debug/out/assets/bin/Data/data.unity3d.jar filter=lfs diff=lfs merge=lfs -text
1712
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
13+
Library/Bee/Android/Prj/Mono2x/Gradle/launcher/build/intermediates/merged_native_libs/debug/out/lib/armeabi-v7a/libunity.so filter=lfs diff=lfs merge=lfs -text
14+
Library/Bee/Android/Prj/Mono2x/Gradle/launcher/build/intermediates/stripped_native_libs/debug/out/lib/armeabi-v7a/libunity.so filter=lfs diff=lfs merge=lfs -text
15+
Library/Bee/Android/Prj/Mono2x/Gradle/launcher/build/outputs/apk/debug/launcher-debug.apk filter=lfs diff=lfs merge=lfs -text
1816
Library/Bee/Android/Prj/Mono2x/Gradle/launcher/build/outputs/apk/release/launcher-release.apk filter=lfs diff=lfs merge=lfs -text
1917
Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/build/.transforms/e82c8aa592ef7be866b0733dbe18cf9b/transformed/out/assets/bin/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text
18+
Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/build/intermediates/library_assets/debug/out/bin/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text
2019
Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/build/intermediates/library_assets/release/out/bin/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text
20+
Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/build/intermediates/library_jni/debug/jni/armeabi-v7a/libunity.so filter=lfs diff=lfs merge=lfs -text
2121
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/build/intermediates/merged_jni_libs/debug/out/armeabi-v7a/libunity.so filter=lfs diff=lfs merge=lfs -text
23+
Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/build/intermediates/merged_native_libs/debug/out/lib/armeabi-v7a/libunity.so filter=lfs diff=lfs merge=lfs -text
2224
Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/src/main/assets/bin/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text
25+
Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/src/main/jniLibs/armeabi-v7a/libunity.so filter=lfs diff=lfs merge=lfs -text
26+
Library/PackageCache/com.unity.burst@1.8.8/.Runtime/burst-llvm-15.dll filter=lfs diff=lfs merge=lfs -text
27+
Library/PackageCache/com.unity.burst@1.8.8/.Runtime/hostmac/dsymutil filter=lfs diff=lfs merge=lfs -text
28+
Library/PackageCache/com.unity.burst@1.8.8/.Runtime/libburst-llvm-10.dylib filter=lfs diff=lfs merge=lfs -text
29+
Library/PackageCache/com.unity.burst@1.8.8/.Runtime/libburst-llvm-15.dylib filter=lfs diff=lfs merge=lfs -text
30+
Library/PackageCache/com.unity.burst@1.8.8/.Runtime/libburst-llvm-15.so filter=lfs diff=lfs merge=lfs -text
2331
Library/PlayerDataCache/Android/Data/data.unity3d filter=lfs diff=lfs merge=lfs -text
32+
Library/PlayerDataCache/Win64/Data/sharedassets1.assets.resS filter=lfs diff=lfs merge=lfs -text
33+
Library/PlayerDataCache/Win64/Data/sharedassets3.assets.resS filter=lfs diff=lfs merge=lfs -text

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,24 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2180264
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: LiberationSans SDF Material
1111
m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
12-
m_ShaderKeywords:
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords: []
15+
m_InvalidKeywords: []
1316
m_LightmapFlags: 1
1417
m_EnableInstancingVariants: 0
1518
m_DoubleSidedGI: 0
1619
m_CustomRenderQueue: -1
1720
stringTagMap: {}
1821
disabledShaderPasses: []
22+
m_LockedProperties:
1923
m_SavedProperties:
2024
serializedVersion: 3
2125
m_TexEnvs:
@@ -67,6 +71,7 @@ Material:
6771
m_Texture: {fileID: 0}
6872
m_Scale: {x: 1, y: 1}
6973
m_Offset: {x: 0, y: 0}
74+
m_Ints: []
7075
m_Floats:
7176
- _Ambient: 0.5
7277
- _Bevel: 0.5
@@ -107,9 +112,9 @@ Material:
107112
- _Parallax: 0.02
108113
- _PerspectiveFilter: 0.875
109114
- _Reflectivity: 10
110-
- _ScaleRatioA: 0.90909094
115+
- _ScaleRatioA: 0.9
111116
- _ScaleRatioB: 0.73125
112-
- _ScaleRatioC: 0.7386364
117+
- _ScaleRatioC: 0.73125
113118
- _ScaleX: 1
114119
- _ScaleY: 1
115120
- _ShaderFlags: 0
@@ -148,6 +153,7 @@ Material:
148153
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
149154
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
150155
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
156+
m_BuildTextureStacks: []
151157
--- !u!114 &11400000
152158
MonoBehaviour:
153159
m_ObjectHideFlags: 0
@@ -170,10 +176,12 @@ MonoBehaviour:
170176
m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
171177
m_AtlasPopulationMode: 1
172178
m_FaceInfo:
179+
m_FaceIndex: 0
173180
m_FamilyName: Liberation Sans
174181
m_StyleName: Regular
175182
m_PointSize: 86
176183
m_Scale: 1
184+
m_UnitsPerEM: 0
177185
m_LineHeight: 98.8916
178186
m_AscentLine: 77.853516
179187
m_CapLine: 59
@@ -313,15 +321,21 @@ Texture2D:
313321
Hash: 00000000000000000000000000000000
314322
m_ForcedFallbackFormat: 4
315323
m_DownscaleFallback: 0
324+
m_IsAlphaChannelOptional: 0
316325
serializedVersion: 2
317326
m_Width: 0
318327
m_Height: 0
319328
m_CompleteImageSize: 0
329+
m_MipsStripped: 0
320330
m_TextureFormat: 1
321331
m_MipCount: 1
322332
m_IsReadable: 1
333+
m_IsPreProcessed: 0
334+
m_IgnoreMipmapLimit: 0
335+
m_MipmapLimitGroupName:
323336
m_StreamingMipmaps: 0
324337
m_StreamingMipmapsPriority: 0
338+
m_VTOnly: 0
325339
m_AlphaIsTransparency: 0
326340
m_ImageCount: 1
327341
m_TextureDimension: 2
@@ -335,9 +349,11 @@ Texture2D:
335349
m_WrapW: 0
336350
m_LightmapFormat: 0
337351
m_ColorSpace: 0
352+
m_PlatformBlob:
338353
image data: 0
339354
_typelessdata:
340355
m_StreamData:
356+
serializedVersion: 2
341357
offset: 0
342358
size: 0
343359
path:

Assets/Unity_StarRail_CRP_Sample/Characters/PlayerGirl/Player_Miss_PlayerGirl_00.meta renamed to Assets/Unity_StarRail_CRP_Sample/Characters/PlayerGirl/Animations.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)