diff --git a/Assets/Models/JueSe (2).fbx.meta b/Assets/Models/JueSe (2).fbx.meta index 81e9462..ad7c3e2 100644 --- a/Assets/Models/JueSe (2).fbx.meta +++ b/Assets/Models/JueSe (2).fbx.meta @@ -119,6 +119,7 @@ ModelImporter: normalSmoothingSource: 0 referencedClips: - 443560db040a95940b67b0f5951e235d + - 641f1884b69beb24d83580d03f524a03 importAnimation: 1 humanDescription: serializedVersion: 3 diff --git a/Assets/Models/NPC/NPC2.fbx b/Assets/Models/NPC/NPC2.fbx index 2a3cc25..2aab548 100644 Binary files a/Assets/Models/NPC/NPC2.fbx and b/Assets/Models/NPC/NPC2.fbx differ diff --git a/Assets/Models/NPC/Tex/NPC1.jpg b/Assets/Models/NPC/Tex/NPC1.jpg index c71f7fa..d127ede 100644 Binary files a/Assets/Models/NPC/Tex/NPC1.jpg and b/Assets/Models/NPC/Tex/NPC1.jpg differ diff --git a/Assets/Models/NPC/Tex/NPC3-ck.jpg b/Assets/Models/NPC/Tex/NPC3-ck.jpg deleted file mode 100644 index b3bb088..0000000 Binary files a/Assets/Models/NPC/Tex/NPC3-ck.jpg and /dev/null differ diff --git a/Assets/Models/NPC/Tex/NPC3.jpg b/Assets/Models/NPC/Tex/NPC3.jpg index f811480..90d75ee 100644 Binary files a/Assets/Models/NPC/Tex/NPC3.jpg and b/Assets/Models/NPC/Tex/NPC3.jpg differ diff --git a/Assets/Models/NPC/Tex/NPC3.psd b/Assets/Models/NPC/Tex/NPC3.psd deleted file mode 100644 index b21b22a..0000000 Binary files a/Assets/Models/NPC/Tex/NPC3.psd and /dev/null differ diff --git a/Assets/Models/NPC/Tex/npc2-uv.psd b/Assets/Models/NPC/Tex/npc2-uv.psd deleted file mode 100644 index 748cb71..0000000 Binary files a/Assets/Models/NPC/Tex/npc2-uv.psd and /dev/null differ diff --git a/Assets/Models/NPC/Tex/npc2.jpg b/Assets/Models/NPC/Tex/npc2.jpg index b6549cf..adf7621 100644 Binary files a/Assets/Models/NPC/Tex/npc2.jpg and b/Assets/Models/NPC/Tex/npc2.jpg differ diff --git a/Assets/Models/New Material.mat b/Assets/Models/New Material.mat index 6a7f20e..9750478 100644 --- a/Assets/Models/New Material.mat +++ b/Assets/Models/New Material.mat @@ -87,5 +87,5 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _Tint: {r: 0.20754719, g: 0.20754719, b: 0.20754719, a: 0.5} + - _Tint: {r: 0.08018868, g: 0.20298146, b: 0.3207547, a: 0.5} m_BuildTextureStacks: [] diff --git a/Assets/Models/mat/juese01.mat b/Assets/Models/mat/juese01.mat index dd11a49..edda7c7 100644 --- a/Assets/Models/mat/juese01.mat +++ b/Assets/Models/mat/juese01.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: dfd6ffa3487772a42ae4a7ce24cf4ce6, type: 3} + m_Texture: {fileID: 2800000, guid: c8616e1b7fbf41848befe95754c28efe, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/mat/juese02.mat b/Assets/Models/mat/juese02.mat index 227d293..2ee137a 100644 --- a/Assets/Models/mat/juese02.mat +++ b/Assets/Models/mat/juese02.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 2708993889a797240a086a8b71e3c0f9, type: 3} + m_Texture: {fileID: 2800000, guid: 28a709a7d5e31f348bb66935c6e8c3a6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/mat/juese03.mat b/Assets/Models/mat/juese03.mat index e5c5987..0a12871 100644 --- a/Assets/Models/mat/juese03.mat +++ b/Assets/Models/mat/juese03.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 5478eeb16f2454a44aa68671f225fde4, type: 3} + m_Texture: {fileID: 2800000, guid: b86bd512269bb7f41ae250e41870ed1c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/mat/juese04.mat b/Assets/Models/mat/juese04.mat index 7ae2531..57967a2 100644 --- a/Assets/Models/mat/juese04.mat +++ b/Assets/Models/mat/juese04.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: ef1a23a847cd6f149b01d6dfae36a93b, type: 3} + m_Texture: {fileID: 2800000, guid: fab0ac8819654e044850048d346e45ff, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/tex/juese01.jpg b/Assets/Models/tex/juese01.jpg new file mode 100644 index 0000000..bf57ec4 Binary files /dev/null and b/Assets/Models/tex/juese01.jpg differ diff --git a/Assets/Models/NPC/Tex/npc2-uv.psd.meta b/Assets/Models/tex/juese01.jpg.meta similarity index 88% rename from Assets/Models/NPC/Tex/npc2-uv.psd.meta rename to Assets/Models/tex/juese01.jpg.meta index 669b75e..9e62126 100644 --- a/Assets/Models/NPC/Tex/npc2-uv.psd.meta +++ b/Assets/Models/tex/juese01.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b5c9fb7a94c71d41b37969d6531d048 +guid: c8616e1b7fbf41848befe95754c28efe TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -80,19 +80,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 diff --git a/Assets/Models/tex/juese02.jpg b/Assets/Models/tex/juese02.jpg new file mode 100644 index 0000000..0168f19 Binary files /dev/null and b/Assets/Models/tex/juese02.jpg differ diff --git a/Assets/Models/NPC/Tex/NPC3-ck.jpg.meta b/Assets/Models/tex/juese02.jpg.meta similarity index 88% rename from Assets/Models/NPC/Tex/NPC3-ck.jpg.meta rename to Assets/Models/tex/juese02.jpg.meta index 5a0817f..00f4cd6 100644 --- a/Assets/Models/NPC/Tex/NPC3-ck.jpg.meta +++ b/Assets/Models/tex/juese02.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a557e8b5c8eff6b44bc21c68cee32628 +guid: 28a709a7d5e31f348bb66935c6e8c3a6 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -80,19 +80,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 diff --git a/Assets/Models/tex/juese03.jpg b/Assets/Models/tex/juese03.jpg new file mode 100644 index 0000000..cbf22a5 Binary files /dev/null and b/Assets/Models/tex/juese03.jpg differ diff --git a/Assets/Models/NPC/Tex/NPC3.psd.meta b/Assets/Models/tex/juese03.jpg.meta similarity index 88% rename from Assets/Models/NPC/Tex/NPC3.psd.meta rename to Assets/Models/tex/juese03.jpg.meta index cd7ca9c..205b6c4 100644 --- a/Assets/Models/NPC/Tex/NPC3.psd.meta +++ b/Assets/Models/tex/juese03.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2bd5907db189c744ea84fc791c429c50 +guid: b86bd512269bb7f41ae250e41870ed1c TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -80,19 +80,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 diff --git a/Assets/Models/tex/juese04.jpg b/Assets/Models/tex/juese04.jpg new file mode 100644 index 0000000..2891a33 Binary files /dev/null and b/Assets/Models/tex/juese04.jpg differ diff --git a/Assets/Models/tex/juese04.jpg.meta b/Assets/Models/tex/juese04.jpg.meta new file mode 100644 index 0000000..78ebf79 --- /dev/null +++ b/Assets/Models/tex/juese04.jpg.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: fab0ac8819654e044850048d346e45ff +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameMain.unity b/Assets/Scenes/GameMain.unity index 4236d6b..6b912cd 100644 --- a/Assets/Scenes/GameMain.unity +++ b/Assets/Scenes/GameMain.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.20666501, g: 0.20666501, b: 0.20666501, a: 1} + m_IndirectSpecularColor: {r: 0.07983414, g: 0.20214829, b: 0.31933627, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -155,6 +155,7 @@ RectTransform: - {fileID: 729867250} - {fileID: 940810604} m_Father: {fileID: 2057195108} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -258,13 +259,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 111120149} - serializedVersion: 2 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: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &128441204 GameObject: @@ -290,13 +291,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 128441204} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0, z: 0.251} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796358} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &128441206 Light: @@ -391,6 +392,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1828601341} + 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} @@ -459,13 +461,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 165221004} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0, z: 0.182} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796349} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &165221006 Light: @@ -602,6 +604,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1658937839} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -677,6 +680,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1065769331} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -742,13 +746,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 386215743} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.051, y: 0, z: 0.239} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796354} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &386215745 Light: @@ -910,13 +914,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 391702287} - serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -14.35, y: -0.04, z: -4.12} m_LocalScale: {x: 99, y: 1, z: 99} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 829146542} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &397247317 GameObject: @@ -949,6 +953,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1658937839} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1027,6 +1032,7 @@ RectTransform: - {fileID: 1226765700} - {fileID: 885638062} m_Father: {fileID: 1078499011} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1057,13 +1063,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 434849068} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0, z: 0.329} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796355} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &434849070 Light: @@ -1178,6 +1184,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 489683033} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1305,13 +1312,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 483351042} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.036, y: 0.078, z: 0.284} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796353} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &483351044 Light: @@ -1408,6 +1415,7 @@ RectTransform: m_Children: - {fileID: 463782486} m_Father: {fileID: 1196575230} + 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} @@ -1480,6 +1488,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_LocalScale.x value: 0.7 @@ -1494,35 +1506,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_LocalPosition.x - value: 0.574 + value: -2.662 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_LocalPosition.y - value: -0 + value: 0.137 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_LocalPosition.z - value: 1.89 + value: -2.503 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.6916497 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071067 + value: -0.6916495 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0.14704034 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.14704037 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -1530,7 +1542,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -24.004 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 827e34297d18f294685f428c2acf09f4, type: 3} propertyPath: m_ConstrainProportionsScale @@ -1576,6 +1588,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1065769331} + 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} @@ -1716,6 +1729,7 @@ RectTransform: - {fileID: 1916631278} - {fileID: 5605496339850101794} m_Father: {fileID: 20157960} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1753,6 +1767,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 933058014} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1887,6 +1902,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1748391624} + 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} @@ -2025,13 +2041,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 750477446} - serializedVersion: 2 m_LocalRotation: {x: -8.726756e-10, y: -0.38613293, z: -0.000000043823498, w: 0.92244315} m_LocalPosition: {x: -3.87, y: 0.44, z: 1.84} m_LocalScale: {x: 20.612, y: 2.3, z: 0.0265625} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 829146542} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: -45.428, z: 0} --- !u!1 &760796420 GameObject: @@ -2064,6 +2080,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 834078747} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2135,13 +2152,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 777526257} - serializedVersion: 2 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: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &777526259 MonoBehaviour: @@ -2215,13 +2232,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 820498683} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0, z: 0.204} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796351} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &820498685 Light: @@ -2308,7 +2325,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 829146541} - serializedVersion: 2 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} @@ -2322,6 +2338,7 @@ Transform: - {fileID: 833879382} - {fileID: 391702291} m_Father: {fileID: 0} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &833879380 GameObject: @@ -2378,13 +2395,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 833879380} - serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -4.9422517, y: -7.23359, z: -5.9959254} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 829146542} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &834078746 GameObject: @@ -2419,6 +2436,7 @@ RectTransform: m_Children: - {fileID: 760796421} m_Father: {fileID: 1696151401} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2507,6 +2525,7 @@ RectTransform: - {fileID: 1196575230} - {fileID: 1598569767} m_Father: {fileID: 641297855254715735} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2547,6 +2566,7 @@ RectTransform: - {fileID: 1888531078} - {fileID: 1030322885} m_Father: {fileID: 425163290} + 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} @@ -2676,6 +2696,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1196575230} + 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} @@ -2751,6 +2772,7 @@ RectTransform: - {fileID: 745002340} - {fileID: 1192370530} m_Father: {fileID: 425163290} + 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} @@ -2868,6 +2890,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 20157960} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2905,6 +2928,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1065769331} + 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} @@ -3092,13 +3116,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0.94264156, z: -0.33380687, w: 0} - m_LocalPosition: {x: -0.41, y: 2.32, z: 4.86} + m_LocalRotation: {x: -0.10971196, y: -0.88813, z: 0.28087568, w: -0.34683886} + m_LocalPosition: {x: -3.6837044, y: 1.2378252, z: 2.6315432} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 39, y: 180, z: 0} --- !u!1 &970182548 GameObject: @@ -3132,6 +3156,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1065769331} + 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} @@ -3244,13 +3269,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971335584} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.259} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796357} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &971335586 Light: @@ -3350,6 +3375,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1598569767} + 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} @@ -3422,6 +3448,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 885638062} + 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} @@ -3502,6 +3529,7 @@ RectTransform: - {fileID: 940820033} - {fileID: 683340024} m_Father: {fileID: 729867250} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3546,6 +3574,7 @@ RectTransform: m_Children: - {fileID: 425163290} m_Father: {fileID: 1835024422} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3576,13 +3605,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1151741065} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.493} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796359} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &1151741067 Light: @@ -3677,6 +3706,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 933058014} + 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} @@ -3754,6 +3784,7 @@ RectTransform: - {fileID: 1611233785} - {fileID: 489683033} m_Father: {fileID: 847175327} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -3794,6 +3825,7 @@ RectTransform: - {fileID: 1697935180} - {fileID: 1874307118} m_Father: {fileID: 425163290} + 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} @@ -3890,6 +3922,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} propertyPath: m_LocalScale.x value: 0.7 @@ -3904,7 +3940,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} propertyPath: m_LocalPosition.x - value: 1.367 + value: -2.474 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} propertyPath: m_LocalPosition.y @@ -3912,23 +3948,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} propertyPath: m_LocalPosition.z - value: 1.319 + value: -0.562 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.94258165 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0.33397588 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3936,7 +3972,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -39.021 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5fb08db92320b9542b19cad8c635ccfa, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -3986,6 +4022,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1598569767} + 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} @@ -4127,13 +4164,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1326370641} - serializedVersion: 2 m_LocalRotation: {x: 7.705887e-10, y: 0.30578393, z: 0.00000003869709, w: 0.952101} m_LocalPosition: {x: -1.42, y: 0.44, z: -3.49} m_LocalScale: {x: 20.612001, y: 2.3, z: 0.026562504} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 829146542} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 35.611, z: 0} --- !u!1 &1335263129 GameObject: @@ -4169,6 +4206,7 @@ RectTransform: - {fileID: 1804119627} - {fileID: 1629918950} m_Father: {fileID: 1598569767} + 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} @@ -4633,6 +4671,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5605496339850101794} + 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} @@ -4767,6 +4806,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1658937839} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4835,13 +4875,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1573092932} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0, z: 0.283} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796352} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &1573092934 Light: @@ -5035,13 +5075,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1595685131} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0, z: 0.351} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796356} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &1595685133 Light: @@ -5138,6 +5178,7 @@ RectTransform: - {fileID: 1025252442} - {fileID: 2131695283} m_Father: {fileID: 847175327} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -5204,13 +5245,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604650138} - serializedVersion: 2 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: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1611233784 GameObject: @@ -5243,6 +5284,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1196575230} + 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} @@ -5377,6 +5419,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1828601341} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5448,6 +5491,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1335263130} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -5575,13 +5619,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1656569731} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.076, y: 0.004, z: 0.267} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796350} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &1656569733 Light: @@ -5744,6 +5788,7 @@ RectTransform: - {fileID: 397247318} - {fileID: 232903987} m_Father: {fileID: 0} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5784,6 +5829,7 @@ RectTransform: m_Children: - {fileID: 834078747} m_Father: {fileID: 425163290} + 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} @@ -5906,6 +5952,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226765700} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6040,6 +6087,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1658937839} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -6117,6 +6165,7 @@ RectTransform: m_Children: - {fileID: 749986926} m_Father: {fileID: 5605496339850101794} + 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} @@ -6229,13 +6278,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753625065} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.098, y: -0.212, z: 0.263} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796361} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &1753625067 Light: @@ -6330,6 +6379,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1335263130} + 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} @@ -6551,6 +6601,7 @@ RectTransform: - {fileID: 1935335142} - {fileID: 1626709489} m_Father: {fileID: 425163290} + 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} @@ -6588,6 +6639,7 @@ RectTransform: - {fileID: 902322513} - {fileID: 1078499011} m_Father: {fileID: 20157960} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6602,6 +6654,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} propertyPath: m_LocalScale.x value: 0.7 @@ -6616,7 +6672,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} propertyPath: m_LocalPosition.x - value: -1.506 + value: 0.049 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} propertyPath: m_LocalPosition.y @@ -6624,23 +6680,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} propertyPath: m_LocalPosition.z - value: 1.49 + value: 1.15 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.9058306 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0.42363998 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6648,7 +6704,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -50.129 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 51cb6ce022de2dc448348f388e86bbef, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -6698,6 +6754,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226765700} + 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} @@ -6773,6 +6830,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 885638062} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6973,13 +7031,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1889821057} - serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.84, y: 0.44, z: 3.513} m_LocalScale: {x: 20.612, y: 2.3, z: 0.0265625} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 829146542} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1909582560 PrefabInstance: @@ -6989,6 +7047,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8679921383154817045, guid: 34398f670e6c4734ead8d5f5687aab63, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 34398f670e6c4734ead8d5f5687aab63, type: 3} propertyPath: m_LocalScale.x value: 3 @@ -7003,7 +7065,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 34398f670e6c4734ead8d5f5687aab63, type: 3} propertyPath: m_LocalPosition.x - value: -0.51 + value: -2.593 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 34398f670e6c4734ead8d5f5687aab63, type: 3} propertyPath: m_LocalPosition.y @@ -7011,7 +7073,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 34398f670e6c4734ead8d5f5687aab63, type: 3} propertyPath: m_LocalPosition.z - value: 2.326 + value: 1.463 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 34398f670e6c4734ead8d5f5687aab63, type: 3} propertyPath: m_LocalRotation.w @@ -7057,6 +7119,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: -3326095784850043357, guid: 34398f670e6c4734ead8d5f5687aab63, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -2749032509717145214, guid: 34398f670e6c4734ead8d5f5687aab63, type: 3} propertyPath: m_IsActive value: 0 @@ -7184,6 +7250,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1828601341} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7214,13 +7281,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1984127314} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.288} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796348} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &1984127316 Light: @@ -7315,6 +7382,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1196575230} + 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} @@ -7460,6 +7528,7 @@ RectTransform: m_Children: - {fileID: 20157960} m_Father: {fileID: 0} + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7490,13 +7559,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2060226935} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0, z: 0.199} + m_LocalPosition: {x: -0.123, y: 0.141, z: 0.199} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380796360} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &2060226937 Light: @@ -7510,7 +7579,7 @@ Light: m_Type: 2 m_Shape: 0 m_Color: {r: 0.95294124, g: 0.5058824, b: 0.9568628, a: 1} - m_Intensity: 1 + m_Intensity: 0.78 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -7657,13 +7726,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2063004806} - serializedVersion: 2 m_LocalRotation: {x: -9.311924e-10, y: -0.4105817, z: -0.000000046762064, w: 0.9118238} m_LocalPosition: {x: 0.42, y: 0.44, z: -2.33} m_LocalScale: {x: 20.612001, y: 2.3, z: 0.026562503} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 829146542} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: -48.483, z: 0} --- !u!1 &2067294796 GameObject: @@ -7695,6 +7764,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7749,6 +7819,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 729867250} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7822,6 +7893,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1065769331} + 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} @@ -7941,6 +8013,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1598569767} + 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} @@ -8075,6 +8148,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1065769331} + 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} @@ -8185,6 +8259,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5605496339850101794} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8235,6 +8310,7 @@ RectTransform: m_Children: - {fileID: 847175327} m_Father: {fileID: 2997144534003143884} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -8299,6 +8375,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5605496339850101794} + 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} @@ -8328,6 +8405,7 @@ RectTransform: - {fileID: 2997144534003143884} - {fileID: 4819038198720798328} m_Father: {fileID: 5605496339850101794} + 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} @@ -8452,6 +8530,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5605496339850101794} + 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} @@ -8472,6 +8551,7 @@ RectTransform: m_Children: - {fileID: 641297855254715735} m_Father: {fileID: 1976297113218945014} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8942,6 +9022,7 @@ RectTransform: m_Children: - {fileID: 8784142400049517485} m_Father: {fileID: 1976297113218945014} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9263,6 +9344,7 @@ RectTransform: - {fileID: 1414433267} - {fileID: 1748391624} m_Father: {fileID: 729867250} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9282,6 +9364,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8784142400049517485} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -10203,6 +10286,7 @@ RectTransform: m_Children: - {fileID: 5899891310685159181} m_Father: {fileID: 4819038198720798328} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -10226,19 +10310,3 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 963194228} - - {fileID: 1658937839} - - {fileID: 1604650141} - - {fileID: 111120153} - - {fileID: 1909582560} - - {fileID: 2057195108} - - {fileID: 777526258} - - {fileID: 2067294797} - - {fileID: 829146542} - - {fileID: 1873208457} - - {fileID: 579042986} - - {fileID: 1289774124} diff --git a/Assets/StreamingAssets/Fonts.meta b/Assets/StreamingAssets/Fonts.meta deleted file mode 100644 index cec8b1a..0000000 --- a/Assets/StreamingAssets/Fonts.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 4acb9c2d588542b58b0b0ab3f2722f37 -timeCreated: 1753319476 \ No newline at end of file