Compare commits

...

4 Commits

Author SHA1 Message Date
zc d789048c25 mod:修改换装面板bg问题 2023-10-07 14:49:38 +08:00
zc 57ca35297a fix:处理灯光问题 2023-10-07 13:50:02 +08:00
zc 8fb5df4a40 修改场景光照模式 2023-10-06 23:17:32 +08:00
zc 13609fe77a 灯光更改为烘焙光 2023-10-06 17:46:43 +08:00
111 changed files with 2958 additions and 210176 deletions

View File

@ -54,6 +54,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: 934a5fe8d38cc634e9641160d8d570d9, type: 2}
- {fileID: 11400000, guid: 276591639b605e5488cd9ef2871f90a5, type: 2}
- {fileID: 11400000, guid: 713c49a05f3079a4688015e7391e6a61, type: 2}
- {fileID: 11400000, guid: 8f41a647ab6064e46a8d32b535d5d20b, type: 2}
m_BuildSettings:
m_CompileScriptsInVirtualMode: 0
m_CleanupStreamingAssetsAfterBuilds: 1

View File

@ -21,90 +21,14 @@ MonoBehaviour:
m_Address: Assets/Scenes/New Lighting Settings.lighting
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: c4b9aac0432a9514b8fb0894a9e28a5d
m_Address: Assets/UnityTest/ZXL/Scene/Main/LightingData.asset
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: c02c692bde7c7454fbe4eab1fd87e150
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-2_comp_light.exr
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 8171313bcca330c4d8aa4fc07f3924b4
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-5_comp_dir.png
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: e3443c71a91336442a610335fbffc0ae
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-8_comp_light.exr
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 945ed26eb9d49cb4981ad4aacbf39cc1
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-6_comp_dir.png
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 25a2a6dcfd3341f4aa3edf6e3885d3a4
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-2_comp_dir.png
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 45036fe47ea35d242b8edf212214c15c
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-0_comp_dir.png
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 360f5f48ad172654191f5c4ea0941d90
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-3_comp_dir.png
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 383993221366d7d49b5ef5430a7894fb
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-1_comp_light.exr
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 196946af32e7fe844aaf542ac3fba984
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-6_comp_light.exr
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: ba743947bbedc1b4d88203bd49abe162
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-1_comp_dir.png
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 2b2e3202eff088a4c89d3260ee9580aa
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-0_comp_light.exr
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 3bde44dcd275de34686128e59f4b3300
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-7_comp_dir.png
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 4bcedf0958dd61a409c255ba6a957282
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-8_comp_dir.png
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 9b7c866d9580779448b51df4f5806f84
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-4_comp_light.exr
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: bd4417f6486079947bc95c68616cbad7
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-4_comp_dir.png
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: bd5c2df68be1786459d9aa059b6bdc8d
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-5_comp_light.exr
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 1e9d2f34f26c1914396662b35eb9a32a
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-7_comp_light.exr
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: afa4599a79723474cbff8904c0b33f4d
m_Address: Assets/UnityTest/ZXL/Scene/Main/Lightmap-3_comp_light.exr
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 3f2948830e392a64e9f16f9bcc2b3963
m_Address: Assets/UnityTest/ZXL/Scene/Main/ReflectionProbe-0.exr
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: fb7eb66dc2db1ff4abeac9c638c5d613
m_Address: Assets/UnityTest/ZXL/Scene/Main_Profiles/GameObject Profile.asset
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: c4b9aac0432a9514b8fb0894a9e28a5d
m_Address: Assets/UnityTest/ZXL/Scene/Main/LightingData.asset
m_ReadOnly: 0
m_SerializedLabels: []
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: ed913c58494404948976a29465fa0b05, type: 2}
m_SchemaSet:

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: c5f21771b821cd1488425408c3dd634e
folderAsset: yes
DefaultImporter:
guid: 8f41a647ab6064e46a8d32b535d5d20b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Duplicate Asset Isolation7_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 8f41a647ab6064e46a8d32b535d5d20b, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: a0013a72da446f543a7eb7fe4e39b441
m_LoadPath:
m_Id: b27d182cea24dc24cb853633faadde43
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 0
m_AssetLoadMode: 0

View File

@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 56aed5b6e01306d4e97b7b9ac9f7baf0
TextScriptImporter:
guid: 8b0b126f1f94c504abee03aa6aa17005
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: Duplicate Asset Isolation7_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 8f41a647ab6064e46a8d32b535d5d20b, type: 2}
m_StaticContent: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0fc397a20d7cd74499584589ece5c542
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -24,10 +24,10 @@ ModelImporter:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationCompression: 3
animationRotationError: 0.01
animationPositionError: 0.01
animationScaleError: 0.01
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []

View File

@ -115,14 +115,14 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3

View File

@ -115,14 +115,14 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3

View File

@ -115,14 +115,14 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3

View File

@ -115,14 +115,14 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3

View File

@ -115,14 +115,14 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3

View File

@ -115,14 +115,14 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3

View File

@ -115,14 +115,14 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3

View File

@ -115,14 +115,14 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3

View File

@ -115,14 +115,14 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3

View File

@ -115,14 +115,14 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3

View File

@ -115,14 +115,14 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3

View File

@ -75,6 +75,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
- _Color: {r: 0.972549, g: 0.8392157, b: 0.7294118, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e6f63aefa55dab74ab8a7b93c4fe25ad
guid: 3507469b1b1870b49a6613022695dd37
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View File

@ -5,7 +5,7 @@ ModelImporter:
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 1
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 0
@ -25,9 +25,9 @@ ModelImporter:
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationRotationError: 0.01
animationPositionError: 0.01
animationScaleError: 0.01
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []

View File

@ -70,7 +70,7 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 1
- _GlossyReflections: 1
- _Metallic: 0.681
- _Metallic: 0.305
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02

View File

@ -1,33 +0,0 @@
fileFormatVersion: 2
guid: dbc76371245052247a6a00a94327cde2
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,3 +0,0 @@
<linker>
<assembly fullname="Sirenix.Serialization.AOTGenerated" preserve="all"/>
</linker>

View File

@ -16,11 +16,21 @@ MonoBehaviour:
deleteDllAfterBuilds: 1
AutomateForAllAOTPlatforms: 1
automateForPlatforms: 0900000014000000
lastScan: 638322055491964378
lastScan: 638322820025823816
lastScan: 638315169427075152
supportSerializedTypes:
- TypeName: UnityEngine.Animator, UnityEngine.AnimationModule
IsCustom: 0
Emit: 1
- TypeName: UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
Unity.ResourceManager
IsCustom: 0
Emit: 1
- TypeName: UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
Unity.ResourceManager
IsCustom: 0
Emit: 1
- TypeName: PMaker.Await.AwaitTimeline, Assembly-CSharp
IsCustom: 0
Emit: 1
@ -31,6 +41,22 @@ MonoBehaviour:
Assembly-CSharp],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
Unity.ResourceManager]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.GameObject,
UnityEngine.CoreModule]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
Unity.ResourceManager]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.GameObject,
UnityEngine.CoreModule]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.Dictionary`2[[ObjectItem, Assembly-CSharp],[System.String[],
mscorlib]], mscorlib
IsCustom: 0
@ -59,6 +85,22 @@ MonoBehaviour:
Assembly-CSharp]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.String,
mscorlib]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.Dictionary`2[[TMPro.TMP_FontAsset, Unity.TextMeshPro],[System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI,
Unity.TextMeshPro]], mscorlib]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.String,
mscorlib]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.Dictionary`2[[TMPro.TMP_FontAsset, Unity.TextMeshPro],[System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI,
Unity.TextMeshPro]], mscorlib]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.EnumEqualityComparer`1[[UnityTest.ZXL.DialogueType,
Assembly-CSharp]], mscorlib
IsCustom: 0
@ -79,6 +121,14 @@ MonoBehaviour:
mscorlib]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.HashSet`1[[System.Collections.Generic.Dictionary`2[[System.String,
mscorlib],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib]], System.Core
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.HashSet`1[[System.Collections.Generic.Dictionary`2[[System.String,
mscorlib],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib]], System.Core
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.IEqualityComparer`1[[UnityTest.ZXL.DialogueType,
Assembly-CSharp]], mscorlib
IsCustom: 0
@ -95,6 +145,14 @@ MonoBehaviour:
mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.IEqualityComparer`1[[TMPro.TMP_FontAsset,
Unity.TextMeshPro]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.IEqualityComparer`1[[TMPro.TMP_FontAsset,
Unity.TextMeshPro]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Int32, mscorlib
IsCustom: 0
Emit: 1
@ -106,6 +164,28 @@ MonoBehaviour:
UnityEngine.DirectorModule]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.List`1[[QuestionDatabase+Data, Assembly-CSharp]],
mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI, Unity.TextMeshPro]],
mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.List`1[[QuestionDatabase+Data, Assembly-CSharp]],
mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI, Unity.TextMeshPro]],
mscorlib
IsCustom: 0
Emit: 1
- TypeName: UnityTest.ZXL.ObjectComponent, Assembly-CSharp
IsCustom: 0
Emit: 1
@ -113,6 +193,14 @@ MonoBehaviour:
mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.ObjectEqualityComparer`1[[TMPro.TMP_FontAsset,
Unity.TextMeshPro]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.Collections.Generic.ObjectEqualityComparer`1[[TMPro.TMP_FontAsset,
Unity.TextMeshPro]], mscorlib
IsCustom: 0
Emit: 1
- TypeName: ObjectItem, Assembly-CSharp
IsCustom: 0
Emit: 1
@ -125,9 +213,45 @@ MonoBehaviour:
- TypeName: UnityTest.ZXL.ProcessType, Assembly-CSharp
IsCustom: 0
Emit: 1
- TypeName: QuestionDatabase+Data, Assembly-CSharp
IsCustom: 0
Emit: 1
- TypeName: QuestionDatabase+Option, Assembly-CSharp
IsCustom: 0
Emit: 1
- TypeName: QuestionDatabase+QusetionType, Assembly-CSharp
IsCustom: 0
Emit: 1
- TypeName: UnityEngine.ResourceManagement.ResourceProviders.SceneInstance, Unity.ResourceManager
IsCustom: 0
Emit: 1
- TypeName: QuestionDatabase+Data, Assembly-CSharp
IsCustom: 0
Emit: 1
- TypeName: QuestionDatabase+Option, Assembly-CSharp
IsCustom: 0
Emit: 1
- TypeName: QuestionDatabase+QusetionType, Assembly-CSharp
IsCustom: 0
Emit: 1
- TypeName: UnityEngine.ResourceManagement.ResourceProviders.SceneInstance, Unity.ResourceManager
IsCustom: 0
Emit: 1
- TypeName: System.String, mscorlib
IsCustom: 0
Emit: 1
- TypeName: System.String[], mscorlib
IsCustom: 0
Emit: 1
- TypeName: TMPro.TextMeshProUGUI, Unity.TextMeshPro
IsCustom: 0
Emit: 1
- TypeName: TMPro.TMP_FontAsset, Unity.TextMeshPro
IsCustom: 0
Emit: 1
- TypeName: TMPro.TextMeshProUGUI, Unity.TextMeshPro
IsCustom: 0
Emit: 1
- TypeName: TMPro.TMP_FontAsset, Unity.TextMeshPro
IsCustom: 0
Emit: 1

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.6336611, g: 0.63196677, b: 0.61535054, a: 1}
m_IndirectSpecularColor: {r: 0.5049538, g: 0.5270397, b: 0.5255087, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -30132,6 +30132,12 @@ MonoBehaviour:
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes:
- Name: sceneInstance
Entry: 7
Data: UnityEngine.ResourceManagement.ResourceProviders.SceneInstance, Unity.ResourceManager
- Name:
Entry: 8
Data:
- Name: _cache
Entry: 6
Data:
@ -30149,6 +30155,7 @@ MonoBehaviour:
m_SubObjectName:
m_SubObjectType:
m_EditorAssetChanged: 0
lightProbes: {fileID: 0}
last: -1
--- !u!4 &386864257
Transform:
@ -91741,6 +91748,50 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1219128256}
m_CullTransparentMesh: 1
--- !u!1 &1221275508
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1221275509}
- component: {fileID: 1221275510}
m_Layer: 0
m_Name: ZXL
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1221275509
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1221275508}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1221275510
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1221275508}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5a6b77da47c54d378c48d0f48ced21da, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1221419354
GameObject:
m_ObjectHideFlags: 0

View File

@ -9,12 +9,16 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.ResourceManagement.AsyncOperations;
using UnityEngine.ResourceManagement.ResourceProviders;
using UnityEngine.SceneManagement;
public class SceneLoader : SingletonMonobehaviour
{
public LoadSceneMode loadSceneMode;
public AssetReference[] sceneReferences;
public SceneInstance sceneInstance;
public LightProbes lightProbes;
public LightmapData[] lightmapDatas;
public int last = -1;
#if UNITY_EDITOR
[SerializeField]
@ -42,22 +46,30 @@ public class SceneLoader : SingletonMonobehaviour
}
if (key == true && last != -1)
{
LightmapSettings.lightProbes = null;
LightmapSettings.lightmaps = null;
await UnLoadScene(last);
last = -1;
}
if (_cache.TryGetValue(index, out var value))
{
await value;
sceneInstance = await value.Convert<SceneInstance>();
//SceneManager.SetActiveScene(sceneInstance.Scene);
}
else
{
var handle = sceneReferences[index].LoadSceneAsync(loadSceneMode, true);
_cache[index] = handle;
await handle;
sceneInstance = await handle;
//SceneManager.SetActiveScene(sceneInstance.Scene);
last = index;
}
await UniTask.WaitUntil(() => IoC.GetSingleton<SceneLoadMark>() == true);
SceneManager.SetActiveScene(sceneInstance.Scene);
lightProbes = LightmapSettings.lightProbes;
lightmapDatas = LightmapSettings.lightmaps;
if (key == true)
{
UniTask.Create(async () => {
@ -92,7 +104,8 @@ public class SceneLoader : SingletonMonobehaviour
{
var handle = sceneReferences[index].LoadSceneAsync(loadSceneMode, true);
_cache[index] = handle;
await handle;
var sceneInstance = await handle;
SceneManager.SetActiveScene(sceneInstance.Scene);
last = index;
}
await UniTask.WaitUntil(() => IoC.GetSingleton<SceneLoadMark>() == true);
@ -120,4 +133,12 @@ public class SceneLoader : SingletonMonobehaviour
_cache.Remove(index);
last = -1;
}
[Button]
[HideInEditorMode]
public void LoadLight()
{
LightmapSettings.lightProbes = lightProbes;
LightmapSettings.lightmaps = lightmapDatas;
}
}

View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 7881991397538345224}
- component: {fileID: 7043807769310218244}
- component: {fileID: 5577904058680780772}
m_Layer: 0
m_Layer: 5
m_Name: bg
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -89,7 +89,7 @@ GameObject:
- component: {fileID: 1009890084329534428}
- component: {fileID: 2642650512131287474}
- component: {fileID: 2434363376367822625}
m_Layer: 0
m_Layer: 5
m_Name: ObjectLabel
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -204,7 +204,7 @@ GameObject:
- component: {fileID: 2156443661134426571}
- component: {fileID: 3184980124319651197}
- component: {fileID: 3029006248383319169}
m_Layer: 0
m_Layer: 5
m_Name: label
m_TagString: Untagged
m_Icon: {fileID: 0}

View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 2657602411704145120}
- component: {fileID: 2657602411704145123}
- component: {fileID: 2657602411704145122}
m_Layer: 0
m_Layer: 5
m_Name: RoleLabel
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -129,7 +129,7 @@ GameObject:
- component: {fileID: 2657602411822548850}
- component: {fileID: 2657602411822548848}
- component: {fileID: 2657602411822548851}
m_Layer: 0
m_Layer: 5
m_Name: content
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -265,7 +265,7 @@ GameObject:
- component: {fileID: 2657602412343841978}
- component: {fileID: 2657602412343841976}
- component: {fileID: 2657602412343841979}
m_Layer: 0
m_Layer: 5
m_Name: name
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -403,7 +403,7 @@ GameObject:
- component: {fileID: 2657602412798002379}
- component: {fileID: 6044037897717386667}
- component: {fileID: 7029743700120857576}
m_Layer: 0
m_Layer: 5
m_Name: Speak
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -589,7 +589,7 @@ GameObject:
- component: {fileID: 2657602413369362670}
- component: {fileID: 2657602413369362668}
- component: {fileID: 2657602413369362671}
m_Layer: 0
m_Layer: 5
m_Name: RoleLabel
m_TagString: Untagged
m_Icon: {fileID: 0}

View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 5212178062472006117}
- component: {fileID: 5212178062472006119}
- component: {fileID: 5212178062472006116}
m_Layer: 0
m_Layer: 5
m_Name: name
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -149,7 +149,7 @@ GameObject:
- component: {fileID: 5212178062839073215}
- component: {fileID: 5212178062839073212}
- component: {fileID: -3208106873772101306}
m_Layer: 0
m_Layer: 5
m_Name: StateLabel
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -221,7 +221,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
m_PresetInfoIsWorld: 0
--- !u!114 &5212178062839073212
MonoBehaviour:
m_ObjectHideFlags: 0
@ -264,7 +264,7 @@ GameObject:
- component: {fileID: 5212178062957091373}
- component: {fileID: 5212178062957091375}
- component: {fileID: 5212178062957091372}
m_Layer: 0
m_Layer: 5
m_Name: content
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -400,7 +400,7 @@ GameObject:
- component: {fileID: 5212178063438747057}
- component: {fileID: 5212178063438747059}
- component: {fileID: 5212178063438747056}
m_Layer: 0
m_Layer: 5
m_Name: bg
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -477,7 +477,7 @@ GameObject:
- component: {fileID: 5212178064008042901}
- component: {fileID: 5212178064008042903}
- component: {fileID: 5212178064008042900}
m_Layer: 0
m_Layer: 5
m_Name: Speak
m_TagString: Untagged
m_Icon: {fileID: 0}

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -0,0 +1,159 @@
fileFormatVersion: 2
guid: c490c115df2cb004092765fe9f71f0e8
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 2
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0c3771b3c0b773d4ca5c0067bc8803e9
guid: b35b6cef2f04e764cacabaf8dd580e15
DefaultImporter:
externalObjects: {}
userData:

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

File diff suppressed because it is too large Load Diff

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.5052687, g: 0.5270108, b: 0.52580625, a: 1}
m_IndirectSpecularColor: {r: 0.5049538, g: 0.5270397, b: 0.5255087, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -263,10 +263,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -6748,7 +6748,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &96421661
RectTransform:
m_ObjectHideFlags: 0
@ -7314,7 +7314,7 @@ GameObject:
- component: {fileID: 107367958}
- component: {fileID: 107367957}
- component: {fileID: 107367960}
m_Layer: 0
m_Layer: 5
m_Name: "1-3-\u540C\u5B66D-1"
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -11019,7 +11019,7 @@ MonoBehaviour:
Entry: 8
Data:
hhh: '**************************************'
startProcessType: 0
startProcessType: 2
--- !u!1 &150321891
GameObject:
m_ObjectHideFlags: 0
@ -14490,7 +14490,7 @@ Transform:
- {fileID: 872168331}
- {fileID: 1817730513}
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &186399112
GameObject:
@ -15414,7 +15414,7 @@ Camera:
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 2147483647
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -19591,10 +19591,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -20978,10 +20978,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -22017,10 +22017,10 @@ Camera:
field of view: 62.4
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -26254,10 +26254,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -31671,11 +31671,11 @@ RectTransform:
- {fileID: 631603817}
- {fileID: 869367627}
m_Father: {fileID: 1610560036}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -622, y: -62}
m_AnchoredPosition: {x: -622, y: -17}
m_SizeDelta: {x: 203, y: 521}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &391288587
@ -33374,10 +33374,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -33447,7 +33447,7 @@ ReflectionProbe:
m_Enabled: 1
serializedVersion: 2
m_Type: 0
m_Mode: 1
m_Mode: 0
m_RefreshMode: 0
m_TimeSlicingMode: 0
m_Resolution: 128
@ -37507,6 +37507,7 @@ GameObject:
- component: {fileID: 448449847}
- component: {fileID: 448449846}
- component: {fileID: 448449845}
- component: {fileID: 448449848}
m_Layer: 0
m_Name: Canvas
m_TagString: Untagged
@ -37585,12 +37586,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_MatchWidthOrHeight: 0.5
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
@ -37615,8 +37616,22 @@ Canvas:
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_SortingOrder: 100
m_TargetDisplay: 0
--- !u!114 &448449848
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 448449843}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b122c0004fcd47f9b6efa3a93747f4ad, type: 3}
m_Name:
m_EditorClassIdentifier:
go: {fileID: 0}
uiCamera: {fileID: 0}
--- !u!1 &451238066
GameObject:
m_ObjectHideFlags: 0
@ -41689,7 +41704,7 @@ GameObject:
- component: {fileID: 495018998}
- component: {fileID: 495019000}
- component: {fileID: 495018999}
m_Layer: 0
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -46495,10 +46510,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 2147483647
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -51242,7 +51257,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &622440437
MonoBehaviour:
@ -60452,7 +60467,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &703230073
PrefabInstance:
@ -60588,10 +60603,10 @@ Camera:
field of view: 70.5
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -63360,7 +63375,7 @@ Transform:
m_Children:
- {fileID: 1445128716}
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &745691850
GameObject:
@ -67447,6 +67462,82 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 782528046}
m_CullTransparentMesh: 1
--- !u!1 &783577987
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 783577988}
- component: {fileID: 783577990}
- component: {fileID: 783577989}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &783577988
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783577987}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1610560036}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &783577989
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783577987}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c065bf33813ec814983e44253eccdab9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &783577990
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783577987}
m_CullTransparentMesh: 1
--- !u!1 &786588331
GameObject:
m_ObjectHideFlags: 0
@ -67828,10 +67919,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -71812,11 +71903,11 @@ RectTransform:
- {fileID: 1008848018}
- {fileID: 1449660738}
m_Father: {fileID: 1610560036}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 628, y: -220}
m_AnchoredPosition: {x: 628, y: -175}
m_SizeDelta: {x: 203, y: 262}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &830017575
@ -71918,10 +72009,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -75345,11 +75436,11 @@ RectTransform:
- {fileID: 782528047}
- {fileID: 1262759162}
m_Father: {fileID: 1610560036}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 628, y: 178}
m_AnchoredPosition: {x: 628, y: 223}
m_SizeDelta: {x: 203, y: 149}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &880204677
@ -79337,10 +79428,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_Depth: -2
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -79586,10 +79677,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -83353,10 +83444,10 @@ Camera:
field of view: 74.9
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -85241,7 +85332,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 45}
m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1014743278
@ -85610,10 +85701,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -93966,10 +94057,10 @@ Camera:
field of view: 83.2
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -95482,7 +95573,7 @@ GameObject:
- component: {fileID: 1100743588}
- component: {fileID: 1100743590}
- component: {fileID: 1100743589}
m_Layer: 0
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -96371,10 +96462,10 @@ Camera:
field of view: 60.9
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -97558,7 +97649,7 @@ GameObject:
- component: {fileID: 1130053525}
- component: {fileID: 1130053524}
- component: {fileID: 1130053526}
m_Layer: 0
m_Layer: 5
m_Name: "1-2-\u540C\u5B66D-1"
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -102257,10 +102348,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -103194,7 +103285,7 @@ Camera:
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -106715,7 +106806,7 @@ GameObject:
- component: {fileID: 1248341582}
- component: {fileID: 1248341584}
- component: {fileID: 1248341583}
m_Layer: 0
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -107305,10 +107396,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -107549,10 +107640,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -110983,10 +111074,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -112827,7 +112918,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 323}
m_AnchoredPosition: {x: 0, y: 368}
m_SizeDelta: {x: 378, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1315222916
@ -114957,10 +115048,10 @@ Camera:
field of view: 75
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -115373,7 +115464,7 @@ ReflectionProbe:
m_Enabled: 1
serializedVersion: 2
m_Type: 0
m_Mode: 1
m_Mode: 0
m_RefreshMode: 0
m_TimeSlicingMode: 0
m_Resolution: 128
@ -115438,7 +115529,7 @@ ReflectionProbe:
m_Enabled: 1
serializedVersion: 2
m_Type: 0
m_Mode: 1
m_Mode: 0
m_RefreshMode: 0
m_TimeSlicingMode: 0
m_Resolution: 128
@ -119938,10 +120029,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -120540,7 +120631,8 @@ GameObject:
- component: {fileID: 1412149795}
- component: {fileID: 1412149794}
- component: {fileID: 1412149793}
m_Layer: 0
- component: {fileID: 1412149797}
m_Layer: 5
m_Name: "\u5C4F\u5E55UI"
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -120625,13 +120717,27 @@ RectTransform:
- {fileID: 107367959}
- {fileID: 1785920616}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1412149797
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1412149792}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b122c0004fcd47f9b6efa3a93747f4ad, type: 3}
m_Name:
m_EditorClassIdentifier:
go: {fileID: 0}
uiCamera: {fileID: 0}
--- !u!1 &1412780444
GameObject:
m_ObjectHideFlags: 0
@ -121403,10 +121509,10 @@ Camera:
field of view: 75
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -124646,12 +124752,12 @@ RectTransform:
- {fileID: 1315222915}
- {fileID: 1014743277}
m_Father: {fileID: 1610560036}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1920, y: 1080}
m_SizeDelta: {x: 1884, y: 922}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1455443027
MonoBehaviour:
@ -124673,7 +124779,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3d0ac74490d584343b8fc3502eb3d68d, type: 3}
m_Sprite: {fileID: 21300000, guid: c490c115df2cb004092765fe9f71f0e8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -127346,10 +127452,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -131566,7 +131672,7 @@ MonoBehaviour:
- {fileID: 782528048}
finishPanel: {fileID: 199776810}
btnFinish: {fileID: 1728020683}
_rawImage: {fileID: 0}
_rawImage: {fileID: 1176915451}
--- !u!114 &1553341453
MonoBehaviour:
m_ObjectHideFlags: 0
@ -132707,10 +132813,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 48951
m_Bits: 48919
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -133597,185 +133703,6 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1582542316}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1583988380
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1583988383}
- component: {fileID: 1583988382}
- component: {fileID: 1583988381}
- component: {fileID: 1583988384}
- component: {fileID: 1583988385}
- component: {fileID: 1583988386}
m_Layer: 0
m_Name: Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!81 &1583988381
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1583988380}
m_Enabled: 1
--- !u!20 &1583988382
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1583988380}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 48951
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &1583988383
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1583988380}
m_LocalRotation: {x: 0.007552769, y: 0.99219316, z: -0.09854922, w: 0.07605114}
m_LocalPosition: {x: 5.319154, y: 1.7538759, z: -1.6928493}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1583988384
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1583988380}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EventMask:
serializedVersion: 2
m_Bits: 4294967295
m_MaxRayIntersections: 0
--- !u!114 &1583988385
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1583988380}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
m_Name:
m_EditorClassIdentifier:
volumeTrigger: {fileID: 1583988383}
volumeLayer:
serializedVersion: 2
m_Bits: 0
stopNaNPropagation: 1
finalBlitToCameraTarget: 0
antialiasingMode: 1
temporalAntialiasing:
jitterSpread: 0.75
sharpness: 0.25
stationaryBlending: 0.95
motionBlending: 0.85
subpixelMorphologicalAntialiasing:
quality: 2
fastApproximateAntialiasing:
fastMode: 0
keepAlpha: 0
fog:
enabled: 1
excludeSkybox: 1
debugLayer:
lightMeter:
width: 512
height: 256
showCurves: 1
histogram:
width: 512
height: 256
channel: 3
waveform:
exposure: 0.12
height: 256
vectorscope:
size: 256
exposure: 0.12
overlaySettings:
linearDepth: 0
motionColorIntensity: 4
motionGridSize: 64
colorBlindnessType: 0
colorBlindnessStrength: 1
m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
m_ShowToolkit: 0
m_ShowCustomSorter: 0
breakBeforeColorGrading: 0
m_BeforeTransparentBundles: []
m_BeforeStackBundles: []
m_AfterStackBundles: []
--- !u!114 &1583988386
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1583988380}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EventMask:
serializedVersion: 2
m_Bits: 4294967295
m_MaxRayIntersections: 0
--- !u!1 &1585405828
GameObject:
m_ObjectHideFlags: 0
@ -137187,10 +137114,10 @@ Camera:
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -137872,6 +137799,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 783577988}
- {fileID: 1455443026}
- {fileID: 391288586}
- {fileID: 830017574}
@ -140751,10 +140679,10 @@ Camera:
field of view: 67
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -145046,7 +144974,7 @@ GameObject:
- component: {fileID: 1718323522}
- component: {fileID: 1718323521}
- component: {fileID: 1718323523}
m_Layer: 0
m_Layer: 5
m_Name: "1-2-\u540C\u5B66D-2"
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -150150,7 +150078,7 @@ Transform:
- {fileID: 1051016550}
- {fileID: 431540143}
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1758695644
MonoBehaviour:
@ -152801,7 +152729,7 @@ GameObject:
- component: {fileID: 1785920615}
- component: {fileID: 1785920614}
- component: {fileID: 1785920617}
m_Layer: 0
m_Layer: 5
m_Name: "1-5-\u540C\u5B66D-1"
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -153819,10 +153747,10 @@ Camera:
field of view: 67
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -155638,10 +155566,10 @@ Camera:
field of view: 77.5
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -170950,7 +170878,7 @@ GameObject:
- component: {fileID: 2000995529}
- component: {fileID: 2000995531}
- component: {fileID: 2000995530}
m_Layer: 0
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -174470,10 +174398,10 @@ Camera:
field of view: 75
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -178237,10 +178165,10 @@ Camera:
field of view: 88.1
orthographic: 0
orthographic size: 5
m_Depth: 1
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 65303
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 KiB

After

Width:  |  Height:  |  Size: 177 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 KiB

After

Width:  |  Height:  |  Size: 213 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 175 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 596 KiB

After

Width:  |  Height:  |  Size: 617 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 KiB

After

Width:  |  Height:  |  Size: 318 KiB

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3f2948830e392a64e9f16f9bcc2b3963
guid: 2991d8e481cd22c4290f3caba7c0ac2b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

Some files were not shown because too many files have changed in this diff Show More