diff --git a/Assets/Resources/Animations/SceneTransition_e.anim b/Assets/Resources/Animations/SceneTransition_e.anim index a6ae617..d77e9b8 100644 --- a/Assets/Resources/Animations/SceneTransition_e.anim +++ b/Assets/Resources/Animations/SceneTransition_e.anim @@ -22,7 +22,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -33,7 +33,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.r - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -41,7 +41,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -52,7 +52,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.g - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -60,7 +60,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -71,7 +71,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.b - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -99,7 +99,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -127,7 +127,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.r - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -155,7 +155,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.g - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -183,7 +183,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.b - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -211,7 +211,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_PPtrCurves: [] @@ -249,7 +249,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -260,7 +260,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.r - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -268,7 +268,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -279,7 +279,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.g - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -287,7 +287,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -298,7 +298,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.b - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -326,7 +326,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -354,7 +354,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.r - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -382,7 +382,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.g - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -410,7 +410,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.b - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -438,7 +438,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_EulerEditorCurves: [] diff --git a/Assets/Resources/Animations/SceneTransition_s.anim b/Assets/Resources/Animations/SceneTransition_s.anim index fc13374..e5698f7 100644 --- a/Assets/Resources/Animations/SceneTransition_s.anim +++ b/Assets/Resources/Animations/SceneTransition_s.anim @@ -22,7 +22,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -33,7 +33,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.r - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -41,7 +41,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -52,7 +52,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.g - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -60,7 +60,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -71,7 +71,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.b - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -99,7 +99,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -127,7 +127,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.r - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -155,7 +155,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.g - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -183,7 +183,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.b - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -211,7 +211,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_PPtrCurves: [] @@ -249,7 +249,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -260,7 +260,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.r - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -268,7 +268,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -279,7 +279,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.g - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -287,7 +287,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -298,7 +298,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.b - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -326,7 +326,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: Image + path: BG classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -354,7 +354,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.r - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -382,7 +382,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.g - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -410,7 +410,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.b - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - curve: @@ -438,7 +438,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: Image/Text + path: BG/LoadingText classID: 114 script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_EulerEditorCurves: [] diff --git a/Assets/Resources/Materials/RT_UI.mat b/Assets/Resources/Materials/RT_UI.mat deleted file mode 100644 index a1cc201..0000000 --- a/Assets/Resources/Materials/RT_UI.mat +++ /dev/null @@ -1,86 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RT_UI - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 8400000, guid: fc14c232dda058947a72db386fc2993c, type: 2} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - PixelSnap: 0 - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EnableExternalAlpha: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Resources/Materials/RT_UI.mat.meta b/Assets/Resources/Materials/RT_UI.mat.meta deleted file mode 100644 index 5ebe02d..0000000 --- a/Assets/Resources/Materials/RT_UI.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 59812940749770848ba5df0f6a7d4fae -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/LoadingCanvas.prefab b/Assets/Resources/Prefabs/LoadingCanvas.prefab new file mode 100644 index 0000000..6d0f56a --- /dev/null +++ b/Assets/Resources/Prefabs/LoadingCanvas.prefab @@ -0,0 +1,257 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3372298933905795298 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3372298933905795311} + - component: {fileID: 3372298933905795296} + - component: {fileID: 3372298933905795297} + - component: {fileID: 3372298933905795310} + m_Layer: 5 + m_Name: LoadingCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3372298933905795311 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372298933905795298} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 3372298934429094626} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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!223 &3372298933905795296 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372298933905795298} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 +--- !u!114 &3372298933905795297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372298933905795298} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!111 &3372298933905795310 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372298933905795298} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 0} + m_Animations: + - {fileID: 7400000, guid: a672197739c288842868e48866a157d6, type: 2} + - {fileID: 7400000, guid: 555620dd82051444c9f0227ac5776202, type: 2} + m_WrapMode: 0 + m_PlayAutomatically: 0 + m_AnimatePhysics: 0 + m_CullingType: 0 +--- !u!1 &3372298934006655904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3372298934006655919} + - component: {fileID: 3372298934006655917} + - component: {fileID: 3372298934006655918} + m_Layer: 5 + m_Name: LoadingText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3372298934006655919 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372298934006655904} + 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_Children: [] + m_Father: {fileID: 3372298934429094626} + 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: -9.9999695, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3372298934006655917 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372298934006655904} + m_CullTransparentMesh: 1 +--- !u!114 &3372298934006655918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372298934006655904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3018868, g: 0.3018868, b: 0.3018868, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 036631af73b15ac41a9d10f75f5bbafe, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 8 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Loading... +--- !u!1 &3372298934429094627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3372298934429094626} + - component: {fileID: 3372298934429094624} + - component: {fileID: 3372298934429094625} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3372298934429094626 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372298934429094627} + 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_Children: + - {fileID: 3372298934006655919} + m_Father: {fileID: 3372298933905795311} + 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!222 &3372298934429094624 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372298934429094627} + m_CullTransparentMesh: 1 +--- !u!114 &3372298934429094625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372298934429094627} + 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: 0.7, g: 0.7, b: 0.7, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 diff --git a/Assets/Scenes/TransitionScene.unity.meta b/Assets/Resources/Prefabs/LoadingCanvas.prefab.meta similarity index 63% rename from Assets/Scenes/TransitionScene.unity.meta rename to Assets/Resources/Prefabs/LoadingCanvas.prefab.meta index 1c964d1..e8571a3 100644 --- a/Assets/Scenes/TransitionScene.unity.meta +++ b/Assets/Resources/Prefabs/LoadingCanvas.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: d27bf257d552cb54b8fd1cd1216143e8 -DefaultImporter: +guid: 32b4730e27604aa469e71267cc6f70f2 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Scenes/TransitionScene.unity b/Assets/Scenes/TransitionScene.unity deleted file mode 100644 index 6199e44..0000000 --- a/Assets/Scenes/TransitionScene.unity +++ /dev/null @@ -1,463 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &131828496 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 131828499} - - component: {fileID: 131828498} - - component: {fileID: 131828497} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &131828497 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 131828496} - m_Enabled: 1 ---- !u!20 &131828498 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 131828496} - 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: 4294967295 - 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 &131828499 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 131828496} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.0122751, y: 4.231879, z: -6.53595} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1252115220 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1252115221} - - component: {fileID: 1252115223} - - component: {fileID: 1252115222} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1252115221 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1252115220} - 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_Children: - - {fileID: 1347943000} - m_Father: {fileID: 1783691544} - 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 &1252115222 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1252115220} - 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: 0.6792453, g: 0.6792453, b: 0.6792453, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - 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 &1252115223 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1252115220} - m_CullTransparentMesh: 1 ---- !u!1 &1347942999 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1347943000} - - component: {fileID: 1347943002} - - component: {fileID: 1347943001} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1347943000 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1347942999} - 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_Children: [] - m_Father: {fileID: 1252115221} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.000061035156, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 1, y: 0} ---- !u!114 &1347943001 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1347942999} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.3018868, g: 0.3018868, b: 0.3018868, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 036631af73b15ac41a9d10f75f5bbafe, type: 3} - m_FontSize: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Loading... ---- !u!222 &1347943002 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1347942999} - m_CullTransparentMesh: 1 ---- !u!1 &1783691541 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1783691544} - - component: {fileID: 1783691543} - - component: {fileID: 1783691542} - - component: {fileID: 1783691545} - m_Layer: 5 - m_Name: LoadingCanvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1783691542 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783691541} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1783691543 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783691541} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 131828498} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 1 - m_TargetDisplay: 0 ---- !u!224 &1783691544 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783691541} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1252115221} - m_Father: {fileID: 0} - m_RootOrder: 0 - 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!111 &1783691545 -Animation: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1783691541} - m_Enabled: 1 - serializedVersion: 3 - m_Animation: {fileID: 0} - m_Animations: - - {fileID: 7400000, guid: a672197739c288842868e48866a157d6, type: 2} - - {fileID: 7400000, guid: 555620dd82051444c9f0227ac5776202, type: 2} - m_WrapMode: 0 - m_PlayAutomatically: 0 - m_AnimatePhysics: 0 - m_CullingType: 0 diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 50a3949..4e44781 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -2166,7 +2166,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000305} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &92965282 @@ -4981,6 +4981,52 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 212377231} m_CullTransparentMesh: 1 +--- !u!1 &217907836 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 217907838} + - component: {fileID: 217907837} + m_Layer: 0 + m_Name: GlobalSceneController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &217907837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 217907836} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 281012d668bdb724b978234aacdc0ef2, type: 3} + m_Name: + m_EditorClassIdentifier: + CavansPrefab: {fileID: 3372298933905795298, guid: 32b4730e27604aa469e71267cc6f70f2, + type: 3} + CavansInstance: {fileID: 0} +--- !u!4 &217907838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 217907836} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &232074764 GameObject: m_ObjectHideFlags: 0 @@ -6500,7 +6546,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000366} + m_AnchoredPosition: {x: 255, y: -45.000305} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &270183827 @@ -26250,7 +26296,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 380, y: -45.000366} + m_AnchoredPosition: {x: 380, y: -45.000305} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &931406427 @@ -26484,7 +26530,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000366} + m_AnchoredPosition: {x: 255, y: -45.000305} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &952551665 @@ -28859,7 +28905,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000305} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1040294592 @@ -39326,7 +39372,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -29.999878} + m_AnchoredPosition: {x: 0, y: -29.999817} m_SizeDelta: {x: 300, y: -60.000233} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1453791885 @@ -40662,7 +40708,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000305} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!224 &1525688469 stripped @@ -41372,7 +41418,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000305} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1558324558 @@ -44881,7 +44927,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000305} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1678768231 @@ -45215,7 +45261,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000305} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1684693616 @@ -45585,7 +45631,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000305} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1699478760 @@ -47691,7 +47737,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000366} + m_AnchoredPosition: {x: 255, y: -45.000305} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1765749874 @@ -52184,7 +52230,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000305} m_SizeDelta: {x: 400, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1970310175 @@ -57302,7 +57348,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000305} m_SizeDelta: {x: 400, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2129326814 @@ -58423,7 +58469,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000305} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2146564492 diff --git a/Assets/Scripts/CallAfterDelay.cs b/Assets/Scripts/CallAfterDelay.cs deleted file mode 100644 index 2f41d8b..0000000 --- a/Assets/Scripts/CallAfterDelay.cs +++ /dev/null @@ -1,32 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class CallAfterDelay : MonoBehaviour -{ - float delay; - System.Action action; - - // Will never call this frame, always the next frame at the earliest - public static CallAfterDelay Create(float delay, System.Action action) - { - CallAfterDelay cad = new GameObject("CallAfterDelay").AddComponent(); - cad.delay = delay; - cad.action = action; - return cad; - } - - float age; - - void Update() - { - if (age > delay) - { - action(); - Destroy(gameObject); - } - } - void LateUpdate() - { - age += Time.deltaTime; - } -} diff --git a/Assets/Scripts/CallAfterDelay.cs.meta b/Assets/Scripts/CallAfterDelay.cs.meta deleted file mode 100644 index bc12514..0000000 --- a/Assets/Scripts/CallAfterDelay.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d30491b056a700f48b6af3b340ae0caf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UmaSceneController.cs b/Assets/Scripts/UmaSceneController.cs index 1834a53..8e6a94e 100644 --- a/Assets/Scripts/UmaSceneController.cs +++ b/Assets/Scripts/UmaSceneController.cs @@ -7,7 +7,8 @@ using UnityEngine.SceneManagement; public class UmaSceneController:MonoBehaviour { public static UmaSceneController instance; - + public GameObject CavansPrefab; + public GameObject CavansInstance; private void Awake() { if (instance) @@ -18,19 +19,21 @@ public class UmaSceneController:MonoBehaviour DontDestroyOnLoad(this); } - public void LoadScene(string name, Action onNewSceneLoaded, Action onPrevSceneUnLoaded) + public void LoadScene(string name, Action OnSceneloaded, Action OnLastSceneUnloaded) { - StartCoroutine(LoadLiveSceneAsync("LiveScene", onNewSceneLoaded, onPrevSceneUnLoaded)); + StartCoroutine(LoadLiveSceneAsync(name, OnSceneloaded, OnLastSceneUnloaded)); } - IEnumerator LoadLiveSceneAsync(string sceneName, Action onNewSceneLoaded, Action onPrevSceneUnLoaded) + IEnumerator LoadLiveSceneAsync(string sceneName, Action OnSceneloaded, Action OnLastSceneUnloaded) { - AsyncOperation asyncTransitionLoad = SceneManager.LoadSceneAsync("TransitionScene", LoadSceneMode.Additive); - yield return new WaitUntil(() => asyncTransitionLoad.isDone); - - Animation loadingCanvas = GameObject.Find("LoadingCanvas").GetComponent(); - loadingCanvas.Play("SceneTransition_s"); - yield return new WaitUntil(() => !loadingCanvas.isPlaying); + if (CavansInstance) + { + Destroy(CavansInstance); + } + CavansInstance = Instantiate(CavansPrefab, transform); + var animation = CavansInstance.GetComponent(); + animation.Play("SceneTransition_s"); + yield return new WaitUntil(() => !animation.isPlaying); // Set the current Scene to be able to unload it later Scene currentScene = SceneManager.GetActiveScene(); @@ -41,21 +44,17 @@ public class UmaSceneController:MonoBehaviour // Wait until the last operation fully loads to return anything yield return new WaitUntil(()=> asyncLoad.isDone); - onNewSceneLoaded.Invoke(); + OnSceneloaded.Invoke(); // Unload the previous Scene AsyncOperation asyncUnLoad = SceneManager.UnloadSceneAsync(currentScene); yield return new WaitUntil(() => asyncUnLoad.isDone); + OnLastSceneUnloaded.Invoke(); - onPrevSceneUnLoaded.Invoke(); - - loadingCanvas.Play("SceneTransition_e"); - yield return new WaitUntil(() => !loadingCanvas.isPlaying); - - // Unload the Transition Scene - AsyncOperation asyncTransitionUnLoad = SceneManager.UnloadSceneAsync("TransitionScene"); - yield return new WaitUntil(() => asyncTransitionUnLoad.isDone); + animation.Play("SceneTransition_e"); + yield return new WaitUntil(() => !animation.isPlaying); + Destroy(CavansInstance); } } diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index d992daf..164e90f 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -665,10 +665,8 @@ public class UmaViewerBuilder : MonoBehaviour { GameObject MainLive = new GameObject("Live"); GameObject Director = new GameObject("Director"); - //Gallop.Live.Director.instance.Play(); List transferObjs = new List() { MainLive, - Director, GameObject.Find("ViewerMain"), GameObject.Find("Camera"), GameObject.Find("Directional Light"), @@ -678,7 +676,6 @@ public class UmaViewerBuilder : MonoBehaviour UmaSceneController.instance.LoadScene("LiveScene", delegate () { - // Move the GameObject (you attach this in the Inspector) to the newly loaded Scene transferObjs.ForEach(o => SceneManager.MoveGameObjectToScene(o, SceneManager.GetSceneByName("LiveScene"))); @@ -699,11 +696,10 @@ public class UmaViewerBuilder : MonoBehaviour LoadLiveUma(characters); - Gallop.Live.Director.instance.InitializeTimeline(); - }, delegate () { + Gallop.Live.Director.instance.InitializeTimeline(); Gallop.Live.Director.instance.Play(live.MusicId, characters[0].CharaEntry.Id); } ); diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 8e5ba9f..92f4bbf 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -198,6 +198,7 @@ public class UmaViewerUI : MonoBehaviour public void LoadedAssetsAdd(UmaDatabaseEntry entry) { + if (!LoadedAssetsPanel) return; foreach (UmaUIContainer ui in LoadedAssetsPanel.GetComponentsInChildren()) { if (ui.Name == Path.GetFileName(entry.Name)) return; @@ -589,9 +590,7 @@ public class UmaViewerUI : MonoBehaviour { LiveTime = true; SetEyeTrackingEnable(false); - CallAfterDelay.Create(0, () => { - Builder.LoadLive(currentLive, new List(selectlist)); - }); + Builder.LoadLive(currentLive, new List(selectlist)); LiveSelectPannel.SetActive(false); } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index b1a8398..7b85eb2 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,7 +11,4 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/LiveScene.unity guid: fd2aa604854afa848a69857be81b7231 - - enabled: 1 - path: Assets/Scenes/TransitionScene.unity - guid: d27bf257d552cb54b8fd1cd1216143e8 m_configObjects: {} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 4489ab0..40e9dc3 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,10 +27,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c731f171311242b66333e243d04 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c731900122b292926237e38271427fb + value: 22424703114646680e0b0227036c6b0217190b233821293e1e2a183de7ae2136ebf32f flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c6b0217190b233821293e1e2a183de7ae2136ebf32f + value: 22424703114646680e0b0227036c731900122b292926237e38271427fb flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c691504041125227a68252320092a