diff --git a/Assets/Art/UI/Animation/loading.anim b/Assets/Art/UI/Animation/loading.anim index e3682ee1..ac5b3945 100644 --- a/Assets/Art/UI/Animation/loading.anim +++ b/Assets/Art/UI/Animation/loading.anim @@ -409,7 +409,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/UIs/PanelLoading.prefab b/Assets/Resources/UIs/PanelLoading.prefab new file mode 100644 index 00000000..5b32b074 --- /dev/null +++ b/Assets/Resources/UIs/PanelLoading.prefab @@ -0,0 +1,527 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1154206977843104839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1154206977843104838} + - component: {fileID: 1154206977843104840} + - component: {fileID: 1154206977843104841} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1154206977843104838 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206977843104839} + 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: 1154206979077048076} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 900, y: 1500} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1154206977843104840 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206977843104839} + m_CullTransparentMesh: 0 +--- !u!114 &1154206977843104841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206977843104839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a517637c906ee4d60b75fc315d17fe7b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1154206977895471203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1154206977895471202} + - component: {fileID: 1154206977895471207} + - component: {fileID: 1154206977895471204} + - component: {fileID: 1154206977895471205} + m_Layer: 5 + m_Name: LoadingTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1154206977895471202 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206977895471203} + 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: 1154206979077048076} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -232} + m_SizeDelta: {x: 500, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1154206977895471207 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206977895471203} + m_CullTransparentMesh: 0 +--- !u!114 &1154206977895471204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206977895471203} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 4c40cb7a87dae4af190f05c10cd269e0, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8BFB\u53D6\u4E2D" +--- !u!114 &1154206977895471205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206977895471203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.98823535, g: 0.57254905, b: 0.7490196, a: 0.53333336} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!1 &1154206979077048077 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1154206979077048076} + - component: {fileID: 1154206979077048079} + m_Layer: 5 + m_Name: PanelLoading + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1154206979077048076 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206979077048077} + 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: 1154206977843104838} + - {fileID: 1811221915716929842} + - {fileID: 1154206979418434948} + - {fileID: 1154206977895471202} + m_Father: {fileID: 0} + 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 &1154206979077048079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206979077048077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 402d9035b7f674aa4b277f31c8cbd123, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1154206979418434949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1154206979418434948} + - component: {fileID: 1154206979418434953} + - component: {fileID: 1154206979418434950} + - component: {fileID: 1154206979418434951} + m_Layer: 5 + m_Name: LoadingImg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1154206979418434948 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206979418434949} + 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: 1154206979077048076} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -128} + m_SizeDelta: {x: 168, y: 173} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1154206979418434953 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206979418434949} + m_CullTransparentMesh: 0 +--- !u!114 &1154206979418434950 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206979418434949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a367abecba0dd4858ad8bed28177973d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1154206979418434951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154206979418434949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d0390bd8b8ffd640b34fe25065ff1df, type: 3} + m_Name: + m_EditorClassIdentifier: + updateType: 0 + isSpeedBased: 0 + hasOnStart: 0 + hasOnPlay: 0 + hasOnUpdate: 0 + hasOnStepComplete: 0 + hasOnComplete: 0 + hasOnTweenCreated: 0 + hasOnRewind: 0 + onStart: + m_PersistentCalls: + m_Calls: [] + onPlay: + m_PersistentCalls: + m_Calls: [] + onUpdate: + m_PersistentCalls: + m_Calls: [] + onStepComplete: + m_PersistentCalls: + m_Calls: [] + onComplete: + m_PersistentCalls: + m_Calls: [] + onTweenCreated: + m_PersistentCalls: + m_Calls: [] + onRewind: + m_PersistentCalls: + m_Calls: [] + targetIsSelf: 1 + targetGO: {fileID: 0} + tweenTargetIsTargetGO: 1 + delay: 0.2 + duration: 1 + easeType: 12 + easeCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + loopType: 0 + loops: 2 + id: + isRelative: 0 + isFrom: 0 + isIndependentUpdate: 0 + autoKill: 1 + isActive: 1 + isValid: 1 + target: {fileID: 1154206979418434948} + animationType: 4 + targetType: 11 + forcedTargetType: 0 + autoPlay: 1 + useTargetAsV3: 0 + endValueFloat: 0 + endValueV3: {x: 0, y: 0, z: -360} + endValueV2: {x: 0, y: 0} + endValueColor: {r: 1, g: 1, b: 1, a: 1} + endValueString: + endValueRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + endValueTransform: {fileID: 0} + optionalBool0: 0 + optionalFloat0: 0 + optionalInt0: 0 + optionalRotationMode: 3 + optionalScrambleMode: 0 + optionalString: +--- !u!1001 &1154206979535656558 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1154206979077048076} + m_Modifications: + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 659304132821786461, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + propertyPath: m_Name + value: Loading + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d7a10ec945b520f44b09e399609e3915, type: 3} +--- !u!224 &1811221915716929842 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 659304132821786460, guid: d7a10ec945b520f44b09e399609e3915, + type: 3} + m_PrefabInstance: {fileID: 1154206979535656558} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UIs/PanelLoading.prefab.meta b/Assets/Resources/UIs/PanelLoading.prefab.meta new file mode 100644 index 00000000..210aeff3 --- /dev/null +++ b/Assets/Resources/UIs/PanelLoading.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 12f206f57e3a54136b9c54f893ff39a2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index ddcc19c5..4fac8f06 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -271,6 +271,136 @@ Transform: m_Father: {fileID: 493959136} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &602532558 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 981190536} + m_Modifications: + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048077, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_Name + value: PanelLoading + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048077, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 12f206f57e3a54136b9c54f893ff39a2, type: 3} +--- !u!224 &602532559 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + m_PrefabInstance: {fileID: 602532558} + m_PrefabAsset: {fileID: 0} --- !u!1 &841774912 GameObject: m_ObjectHideFlags: 0 @@ -355,6 +485,7 @@ RectTransform: - {fileID: 8767444850111818679} - {fileID: 8174312654083100069} - {fileID: 3983645218197209946} + - {fileID: 602532559} m_Father: {fileID: 1041748534} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a88871c4..f6b1df72 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -121,6 +121,12 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!224 &1187219645 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + m_PrefabInstance: {fileID: 1154206978116521905} + m_PrefabAsset: {fileID: 0} --- !u!1 &1404456744 GameObject: m_ObjectHideFlags: 0 @@ -176,6 +182,130 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4965647244895307266} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1154206978116521905 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3333527423099584207} + m_Modifications: + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048076, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048077, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_Name + value: PanelLoading + objectReference: {fileID: 0} + - target: {fileID: 1154206979077048077, guid: 12f206f57e3a54136b9c54f893ff39a2, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 12f206f57e3a54136b9c54f893ff39a2, type: 3} --- !u!1001 &2617655799926167754 PrefabInstance: m_ObjectHideFlags: 0 @@ -442,6 +572,7 @@ RectTransform: m_Children: - {fileID: 776958736012266133} - {fileID: 1132805848468396765} + - {fileID: 1187219645} m_Father: {fileID: 3333527423029586801} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index c25e0c0a..0fd93131 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -7,12 +7,20 @@ public class GameManager : D_MonoSingleton { public void LoadMain() { - SceneManager.LoadScene("Main"); + PanelLoading tLoading = UIManager.Instance.OpenUI(); + tLoading.DelOver = () => + { + SceneManager.LoadScene("Main"); + }; } public void LoadGame() { - SceneManager.LoadScene("Game"); + PanelLoading tLoading = UIManager.Instance.OpenUI(); + tLoading.DelOver = () => + { + SceneManager.LoadScene("Game"); + }; } public void NextLevel() diff --git a/Assets/Scripts/UI/PanelLoading.cs b/Assets/Scripts/UI/PanelLoading.cs new file mode 100644 index 00000000..fd9a4753 --- /dev/null +++ b/Assets/Scripts/UI/PanelLoading.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PanelLoading : BasePanel +{ + public Action DelOver; + + public override void OnOpen() + { + base.OnOpen(); + + TimerManager.Instance.Schedule(Over, 1.5f); + } + + private void Over() + { + DelOver?.Invoke(); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/PanelLoading.cs.meta b/Assets/Scripts/UI/PanelLoading.cs.meta new file mode 100644 index 00000000..1627610a --- /dev/null +++ b/Assets/Scripts/UI/PanelLoading.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 402d9035b7f674aa4b277f31c8cbd123 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: