From babf7c2cd4d438ee989a9c78d8d7f22f9ec97a49 Mon Sep 17 00:00:00 2001 From: villaingames Date: Thu, 12 Oct 2023 21:40:32 +0900 Subject: [PATCH] =?UTF-8?q?Intro=20=EB=A1=9C=EB=94=A9=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EB=A1=9C=EB=93=9C=20=EA=B0=9C=EC=88=98=20=EC=97=B0?= =?UTF-8?q?=EB=8F=99=20=EC=B6=94=EA=B0=80,=20=ED=94=8C=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=96=B4=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetGroups/Tables.asset | 5 + .../AddressableResources/Tables/JPlayer.json | 32 + .../Tables/JPlayer.json.meta | 7 + .../UI/Loading/UIPanelLoadingIntro.prefab | 6 +- Assets/Scenes/Stage_Single.unity | 1251 +---------------- .../Scripts/Addressable/AddressableManager.cs | 22 +- Assets/Scripts/Data/PlayerInfo.cs | 22 +- Assets/Scripts/Entities/JPlayerData.cs | 28 + Assets/Scripts/Entities/JPlayerData.cs.meta | 11 + Assets/Scripts/Etc/Enums.cs | 1 + Assets/Scripts/Manage/GameManager.cs | 18 + Assets/Scripts/Manage/GameManager.cs.meta | 11 + .../Manage/Scene/IntroSceneController.cs | 53 + .../Scene/SingleStageSceneController.cs | 22 + .../Scene/SingleStageSceneController.cs.meta | 11 + Assets/Scripts/Manage/TableManager.cs | 25 +- Assets/Scripts/Manage/UIManager.cs | 2 +- .../Stage/Controller/PlayerController.cs | 5 +- .../Stage/Controller/SpawnController.cs | 6 +- Assets/Scripts/Stage/Events/IntroEvents.cs | 30 + .../Scripts/Stage/Events/IntroEvents.cs.meta | 11 + Assets/Scripts/Stage/Events/StageEvents.cs | 12 + Assets/Scripts/Stage/Manage/StageManager.cs | 9 +- Assets/Scripts/UI/Intro/UIPanelIntro.cs | 7 +- .../Scripts/UI/Loading/UIPanelLoadingIntro.cs | 27 +- 25 files changed, 389 insertions(+), 1245 deletions(-) create mode 100644 Assets/AddressableResources/Tables/JPlayer.json create mode 100644 Assets/AddressableResources/Tables/JPlayer.json.meta create mode 100644 Assets/Scripts/Entities/JPlayerData.cs create mode 100644 Assets/Scripts/Entities/JPlayerData.cs.meta create mode 100644 Assets/Scripts/Manage/GameManager.cs create mode 100644 Assets/Scripts/Manage/GameManager.cs.meta create mode 100644 Assets/Scripts/Manage/Scene/SingleStageSceneController.cs create mode 100644 Assets/Scripts/Manage/Scene/SingleStageSceneController.cs.meta create mode 100644 Assets/Scripts/Stage/Events/IntroEvents.cs create mode 100644 Assets/Scripts/Stage/Events/IntroEvents.cs.meta diff --git a/Assets/AddressableAssetsData/AssetGroups/Tables.asset b/Assets/AddressableAssetsData/AssetGroups/Tables.asset index 53f8186..139cd31 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Tables.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Tables.asset @@ -22,6 +22,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: e5c8e53bdb2364549800184c7cafe645 + m_Address: JPlayer + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: a27fd004fb823a34a9ae690bdbfd496e, type: 2} m_SchemaSet: diff --git a/Assets/AddressableResources/Tables/JPlayer.json b/Assets/AddressableResources/Tables/JPlayer.json new file mode 100644 index 0000000..1aee8c3 --- /dev/null +++ b/Assets/AddressableResources/Tables/JPlayer.json @@ -0,0 +1,32 @@ +{ + "list": [ + { + "Id": 1, + "Str": 2000, + "Range": 2.0, + "Speed": 3.0, + "PrefabName": "Crate_01" + }, + { + "Id": 2, + "Str": 2200, + "Range": 2.5, + "Speed": 2.5, + "PrefabName": "Crate_02" + }, + { + "Id": 3, + "Str": 1800, + "Range": 2.8, + "Speed": 2.5, + "PrefabName": "Crate_03" + }, + { + "Id": 4, + "Str": 1800, + "Range": 2.5, + "Speed": 2.8, + "PrefabName": "Crate_04" + } + ] +} \ No newline at end of file diff --git a/Assets/AddressableResources/Tables/JPlayer.json.meta b/Assets/AddressableResources/Tables/JPlayer.json.meta new file mode 100644 index 0000000..8326cc5 --- /dev/null +++ b/Assets/AddressableResources/Tables/JPlayer.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e5c8e53bdb2364549800184c7cafe645 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableResources/UI/Loading/UIPanelLoadingIntro.prefab b/Assets/AddressableResources/UI/Loading/UIPanelLoadingIntro.prefab index 2ed8a12..aae44fe 100644 --- a/Assets/AddressableResources/UI/Loading/UIPanelLoadingIntro.prefab +++ b/Assets/AddressableResources/UI/Loading/UIPanelLoadingIntro.prefab @@ -125,7 +125,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0.75 + m_Value: 0 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -194,7 +194,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 75% + m_text: 0% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 50c12c23294124aa48490c44ac65a9e4, type: 2} m_sharedMaterial: {fileID: 7746803525459343344, guid: 50c12c23294124aa48490c44ac65a9e4, @@ -540,3 +540,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c670cb90c2944c468eb583d02b49571, type: 3} m_Name: m_EditorClassIdentifier: + _loadingSlider: {fileID: 4116304718493178528} + _loadingText: {fileID: 4116304719635805339} diff --git a/Assets/Scenes/Stage_Single.unity b/Assets/Scenes/Stage_Single.unity index 93ff73f..c7fc8cb 100644 --- a/Assets/Scenes/Stage_Single.unity +++ b/Assets/Scenes/Stage_Single.unity @@ -3255,6 +3255,50 @@ Transform: type: 3} m_PrefabInstance: {fileID: 675497815} m_PrefabAsset: {fileID: 0} +--- !u!1 &679879112 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 679879114} + - component: {fileID: 679879113} + m_Layer: 0 + m_Name: StageSceneController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &679879113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 679879112} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 818ef5b96b08601408dc3300b2e1f2f5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &679879114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 679879112} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.45891833, y: -0.4580552, z: 1224.0216} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &680863647 PrefabInstance: m_ObjectHideFlags: 0 @@ -6700,42 +6744,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1186250816} m_PrefabAsset: {fileID: 0} ---- !u!1 &1187820171 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1187820172} - m_Layer: 5 - m_Name: PlayerRespawn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1187820172 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187820171} - 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: - - {fileID: 1639615302} - m_Father: {fileID: 1887147766} - 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1226638843 PrefabInstance: m_ObjectHideFlags: 0 @@ -6859,109 +6867,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1248021798} m_PrefabAsset: {fileID: 0} ---- !u!1 &1251357596 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1251357597} - - component: {fileID: 1251357600} - - component: {fileID: 1251357599} - - component: {fileID: 1251357598} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1251357597 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1251357596} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1887147766} - - {fileID: 1807277377} - m_Father: {fileID: 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!114 &1251357598 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1251357596} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1251357599 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1251357596} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 1 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1251357600 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1251357596} - 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_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!1001 &1288596674 PrefabInstance: m_ObjectHideFlags: 0 @@ -9222,141 +9127,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1616382888} m_PrefabAsset: {fileID: 0} ---- !u!1 &1639615301 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1639615302} - - component: {fileID: 1639615304} - - component: {fileID: 1639615303} - m_Layer: 5 - m_Name: Timer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1639615302 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1639615301} - 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: 1187820172} - 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: 394.3, y: 120} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1639615303 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1639615301} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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_text: START - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7659f6d6ec9b642db8be29bc45fe97cc, type: 2} - m_sharedMaterial: {fileID: 8690591861142563998, guid: 7659f6d6ec9b642db8be29bc45fe97cc, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 120 - m_fontSizeBase: 120 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1639615304 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1639615301} - m_CullTransparentMesh: 1 --- !u!1 &1664598418 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1978775886026106, guid: bbc12ae2f967ec04e8c3c39eeb92733b, @@ -10418,130 +10188,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1785958686} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1807277376 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1251357597} - m_Modifications: - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_SizeDelta.x - value: 145.62859 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_SizeDelta.y - value: 132 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -72.8125 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -82.5 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1518944720451438275, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - propertyPath: m_Name - value: Button_Settings - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4ec798a481bf945e5936c4cb72dd37a0, type: 3} ---- !u!224 &1807277377 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1518944720451438274, guid: 4ec798a481bf945e5936c4cb72dd37a0, - type: 3} - m_PrefabInstance: {fileID: 1807277376} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1809692043 PrefabInstance: m_ObjectHideFlags: 0 @@ -11010,53 +10656,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1866496571} m_PrefabAsset: {fileID: 0} ---- !u!1 &1887147765 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1887147766} - - component: {fileID: 1887147768} - m_Layer: 5 - m_Name: UIPanelStage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1887147766 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1887147765} - 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: - - {fileID: 1187820172} - - {fileID: 1687315722461256733} - - {fileID: 4602185086918758052} - m_Father: {fileID: 1251357597} - 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 &1887147768 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1887147765} - m_CullTransparentMesh: 1 --- !u!1001 &1891280744 PrefabInstance: m_ObjectHideFlags: 0 @@ -12730,489 +12329,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3491503960183968028} m_PrefabAsset: {fileID: 0} ---- !u!1 &1687315721749144561 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1687315721749144566} - - component: {fileID: 1687315721749144564} - - component: {fileID: 1687315721749144567} - m_Layer: 5 - m_Name: Text_Time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!222 &1687315721749144564 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315721749144561} - m_CullTransparentMesh: 0 ---- !u!224 &1687315721749144566 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315721749144561} - 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: 1687315722461256733} - 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: 4.4} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1687315721749144567 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315721749144561} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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_text: '03 : 19' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c2f49fe8c22d94f9a9e6cd06ad490155, type: 2} - m_sharedMaterial: {fileID: 3074828514974314926, guid: c2f49fe8c22d94f9a9e6cd06ad490155, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &1687315722461256722 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315722461256732} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 40e516e86fce54a15af160021faa0796, type: 3} - m_Type: 1 - 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 &1687315722461256723 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315722461256732} - m_CullTransparentMesh: 0 ---- !u!1 &1687315722461256732 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1687315722461256733} - - component: {fileID: 1687315722461256723} - - component: {fileID: 1687315722461256722} - m_Layer: 5 - m_Name: Play_Time_Score - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1687315722461256733 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315722461256732} - 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: - - {fileID: 1687315721749144566} - - {fileID: 1687315722461415234} - - {fileID: 1687315723602315567} - m_Father: {fileID: 1887147766} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -53.179688} - m_SizeDelta: {x: 451.3667, y: 107} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1687315722461415232 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315722461415245} - m_CullTransparentMesh: 0 ---- !u!224 &1687315722461415234 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315722461415245} - 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: 1687315722461256733} - 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: -162, y: 9.1} - m_SizeDelta: {x: 90.89264, y: 81.49614} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1687315722461415235 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315722461415245} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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_text: 0 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c2f49fe8c22d94f9a9e6cd06ad490155, type: 2} - m_sharedMaterial: {fileID: 3074828514974314926, guid: c2f49fe8c22d94f9a9e6cd06ad490155, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1687315722461415245 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1687315722461415234} - - component: {fileID: 1687315722461415232} - - component: {fileID: 1687315722461415235} - m_Layer: 5 - m_Name: Text_Score_Red - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1687315723602315564 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315723602315566} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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_text: 0 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c2f49fe8c22d94f9a9e6cd06ad490155, type: 2} - m_sharedMaterial: {fileID: 3074828514974314926, guid: c2f49fe8c22d94f9a9e6cd06ad490155, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1687315723602315565 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315723602315566} - m_CullTransparentMesh: 0 ---- !u!1 &1687315723602315566 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1687315723602315567} - - component: {fileID: 1687315723602315565} - - component: {fileID: 1687315723602315564} - m_Layer: 5 - m_Name: Text_Score_Blue - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1687315723602315567 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687315723602315566} - 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: 1687315722461256733} - 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: 158.7, y: 9.1} - m_SizeDelta: {x: 90.89264, y: 81.49614} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &3491503960183968028 PrefabInstance: m_ObjectHideFlags: 0 @@ -13281,283 +12397,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d641786a4f8b77d449322a313a6ddecd, type: 3} ---- !u!224 &4602185086918758052 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4602185086918758055} - 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: - - {fileID: 4602185087750958635} - - {fileID: 4602185087847067075} - m_Father: {fileID: 1887147766} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -76.1, y: 0} - m_SizeDelta: {x: 252.60449, y: 261.86234} - m_Pivot: {x: 1, y: 0} ---- !u!1 &4602185086918758055 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4602185086918758052} - m_Layer: 5 - m_Name: Frame_UserPictureFrame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &4602185087750958632 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4602185087750958634} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 ---- !u!114 &4602185087750958633 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4602185087750958634} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 427ac1f9e8f5d4fb6b2366559519f8fd, 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 &4602185087750958634 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4602185087750958635} - - component: {fileID: 4602185087750958638} - - component: {fileID: 4602185087750958633} - - component: {fileID: 4602185087750958632} - m_Layer: 5 - m_Name: Frame_UserPictureFrame_InBase - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4602185087750958635 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4602185087750958634} - 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: - - {fileID: 4602185088829315724} - m_Father: {fileID: 4602185086918758052} - 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.000061035156, y: 0.000030517578} - m_SizeDelta: {x: 216, y: 216} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4602185087750958638 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4602185087750958634} - m_CullTransparentMesh: 0 ---- !u!114 &4602185087847067072 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4602185087847067074} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c036f3de1f1584b6eb35aa03cce9964c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &4602185087847067073 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4602185087847067074} - m_CullTransparentMesh: 0 ---- !u!1 &4602185087847067074 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4602185087847067075} - - component: {fileID: 4602185087847067073} - - component: {fileID: 4602185087847067072} - m_Layer: 5 - m_Name: Frame_UserPictureFrame_Frame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4602185087847067075 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4602185087847067074} - 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: 4602185086918758052} - 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.000061035156, y: 0.000030517578} - m_SizeDelta: {x: 248, y: 258} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &4602185088829315724 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4602185088829315727} - 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: 4602185087750958635} - 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: -4, y: -4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4602185088829315725 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4602185088829315727} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5f786fb94b6c64495acebba441286554, 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 &4602185088829315727 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4602185088829315724} - - component: {fileID: 4602185088829315730} - - component: {fileID: 4602185088829315725} - m_Layer: 5 - m_Name: Character - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!222 &4602185088829315730 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4602185088829315727} - m_CullTransparentMesh: 0 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -13569,6 +12408,6 @@ SceneRoots: - {fileID: 1339745045} - {fileID: 164462792} - {fileID: 2039856058} - - {fileID: 1251357597} - {fileID: 514824634} - {fileID: 2058148467} + - {fileID: 679879114} diff --git a/Assets/Scripts/Addressable/AddressableManager.cs b/Assets/Scripts/Addressable/AddressableManager.cs index 10dd6c2..bdbc340 100644 --- a/Assets/Scripts/Addressable/AddressableManager.cs +++ b/Assets/Scripts/Addressable/AddressableManager.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.AddressableAssets; using UnityEngine.Pool; +using UnityEngine.ResourceManagement.AsyncOperations; public class AddressableManager : UnitySingleton { @@ -29,15 +30,28 @@ public class AddressableManager : UnitySingleton }; } - public void InstantiateAsync(string name, Transform parent, Action onComplete) + public AsyncOperationHandle LoadTableAssetAsync(string name, Action onComplete) where T : UnityEngine.Object { - var handle = Addressables.InstantiateAsync(name, parent); + var handle = Addressables.LoadAssetAsync(name); handle.Completed += handler => { - onComplete(handle.Result); - Addressables.Release(handle); + if (handler.Status == UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationStatus.Succeeded) + { + onComplete(handler.Result); + } }; + + return handle; } + //public void InstantiateAsync(string name, Transform parent, Action onComplete) + //{ + // var handle = Addressables.InstantiateAsync(name, parent); + // handle.Completed += handler => + // { + // onComplete(handle.Result); + // Addressables.Release(handle); + // }; + //} public void Spawn(string name, Transform parent, Action complete) { diff --git a/Assets/Scripts/Data/PlayerInfo.cs b/Assets/Scripts/Data/PlayerInfo.cs index abf1de2..1b9d668 100644 --- a/Assets/Scripts/Data/PlayerInfo.cs +++ b/Assets/Scripts/Data/PlayerInfo.cs @@ -1,11 +1,27 @@ +using FirstVillain.Entities; using System.Collections; using System.Collections.Generic; using UnityEngine; public class PlayerInfo { - public int STR { get; private set; } - public int RANGE { get; private set; } - public float SPEED { get; private set; } + public int STR { get { return _table.Str; } } + public float RANGE { get { return _table.Range; } } + public float SPEED { get { return _table.Speed; } } + public E_TEAM Team { get; private set; } + + public string PrefapName { get { return _table.PrefabName; } } + + private JPlayerData _table; + + public PlayerInfo(JPlayerData data) + { + _table = data; + } + + public void SetTeam(E_TEAM team) + { + Team = team; + } } diff --git a/Assets/Scripts/Entities/JPlayerData.cs b/Assets/Scripts/Entities/JPlayerData.cs new file mode 100644 index 0000000..38c8c9b --- /dev/null +++ b/Assets/Scripts/Entities/JPlayerData.cs @@ -0,0 +1,28 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace FirstVillain.Entities +{ + + + public class JPlayerData + { + + public int Id; + + public int Str; + + public float Range; + + public float Speed; + + public string PrefabName; + } +} diff --git a/Assets/Scripts/Entities/JPlayerData.cs.meta b/Assets/Scripts/Entities/JPlayerData.cs.meta new file mode 100644 index 0000000..b24b1e5 --- /dev/null +++ b/Assets/Scripts/Entities/JPlayerData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 565ce374e8f8f02449bdee1296a77865 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Etc/Enums.cs b/Assets/Scripts/Etc/Enums.cs index 05af8e5..b4029f9 100644 --- a/Assets/Scripts/Etc/Enums.cs +++ b/Assets/Scripts/Etc/Enums.cs @@ -41,5 +41,6 @@ public enum E_UI_TYPE public enum E_TABLE { JPropInfo, + JPlayer, } #endregion Table \ No newline at end of file diff --git a/Assets/Scripts/Manage/GameManager.cs b/Assets/Scripts/Manage/GameManager.cs new file mode 100644 index 0000000..816054a --- /dev/null +++ b/Assets/Scripts/Manage/GameManager.cs @@ -0,0 +1,18 @@ +using FirstVillain.Entities; +using FirstVillain.Singleton; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GameManager : UnitySingleton +{ + public List PlayerData { get; private set; } = new(); + + public void SetPlayerData(List dataList) + { + foreach (var data in dataList) + { + PlayerData.Add(new PlayerInfo(data)); + } + } +} diff --git a/Assets/Scripts/Manage/GameManager.cs.meta b/Assets/Scripts/Manage/GameManager.cs.meta new file mode 100644 index 0000000..0f366bb --- /dev/null +++ b/Assets/Scripts/Manage/GameManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d11671a564f4c5d4cb0351d09ae5030e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Manage/Scene/IntroSceneController.cs b/Assets/Scripts/Manage/Scene/IntroSceneController.cs index 4782832..06305cb 100644 --- a/Assets/Scripts/Manage/Scene/IntroSceneController.cs +++ b/Assets/Scripts/Manage/Scene/IntroSceneController.cs @@ -1,11 +1,64 @@ +using FirstVillain.Converter; +using FirstVillain.Entities; +using FirstVillain.EventBus; using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.AddressableAssets; +using UnityEngine.ResourceManagement.AsyncOperations; public class IntroSceneController : MonoBehaviour { + private int _loadedTableCount = 0; + private void Start() { UIManager.Instance.OpenUI(E_UI_TYPE.UIPanelIntro); + EventBus.Instance.Subscribe(OnStartLoadAssets); + //EventBus.Instance.Subscribe>(OnPlayerDataLoaded); } + + private void OnDestroy() + { + EventBus.Instance.Unsubscribe(OnStartLoadAssets); + //EventBus.Instance.Unsubscribe>(OnPlayerDataLoaded); + } + + private void OnStartLoadAssets(EventLoadAssets e) + { + LoadTable(); + StartCoroutine(LoadingGauge()); + } + + private IEnumerator LoadingGauge() + { + float maxGauge = TableManager.Instance.LoadTableCount; + while (_loadedTableCount < maxGauge) + { + EventBus.Instance.Publish(new EventUpdateTableLadingProgress(_loadedTableCount / maxGauge)); + yield return null; + } + + EventBus.Instance.Publish(new EventUpdateTableLadingProgress(1)); + SceneLoadManager.Instance.LoadSceneAsync("Lobby", UnityEngine.SceneManagement.LoadSceneMode.Single, OnCompleteLoad); + } + public void OnCompleteLoad() + { + EventBus.Instance.Publish(new EventStartLobby()); + UIManager.Instance.ReleaseUI(); + } + + private void LoadTable() + { + TableManager.Instance.LoadTable(E_TABLE.JPlayer, OnPlayerDataLoaded); + } + + private void OnPlayerDataLoaded(Wrapper data) + { + //데이터 세팅 + GameManager.Instance.SetPlayerData(data.list); + _loadedTableCount++; + } + + } diff --git a/Assets/Scripts/Manage/Scene/SingleStageSceneController.cs b/Assets/Scripts/Manage/Scene/SingleStageSceneController.cs new file mode 100644 index 0000000..38a50ff --- /dev/null +++ b/Assets/Scripts/Manage/Scene/SingleStageSceneController.cs @@ -0,0 +1,22 @@ +using FirstVillain.EventBus; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SingleStageSceneController : MonoBehaviour +{ + private void Start() + { + EventBus.Instance.Subscribe(OnStartStage); + } + + private void OnDestroy() + { + EventBus.Instance.Unsubscribe(OnStartStage); + } + + private void OnStartStage(EventStartStage e) + { + + } +} diff --git a/Assets/Scripts/Manage/Scene/SingleStageSceneController.cs.meta b/Assets/Scripts/Manage/Scene/SingleStageSceneController.cs.meta new file mode 100644 index 0000000..f218e84 --- /dev/null +++ b/Assets/Scripts/Manage/Scene/SingleStageSceneController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 818ef5b96b08601408dc3300b2e1f2f5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Manage/TableManager.cs b/Assets/Scripts/Manage/TableManager.cs index d5111d5..f00cac3 100644 --- a/Assets/Scripts/Manage/TableManager.cs +++ b/Assets/Scripts/Manage/TableManager.cs @@ -1,26 +1,41 @@ using FirstVillain.Converter; using FirstVillain.Entities; +using FirstVillain.EventBus; using FirstVillain.Singleton; using Newtonsoft.Json; using System; using System.Collections.Generic; using UnityEngine; +using UnityEngine.AddressableAssets; +using UnityEngine.ResourceManagement.AsyncOperations; //규칙 : 테이블을 필요할 때마다 로드해서 사용한다. public class TableManager : UnitySingleton { - private void LoadTable(E_TABLE table, Action> result) + public int LoadTableCount { get; private set; } = 0; + + public void LoadTable(E_TABLE table, Action> result) { - AddressableManager.Instance.LoadAssetAsync(table.ToString(), asset => { - result(JsonConvert.DeserializeObject>(asset.text)); + LoadTableCount++; + LoadTableAsset(table, result); + } + + private void LoadTableAsset(E_TABLE table, Action> result) + { + AddressableManager.Instance.LoadAssetAsync(table.ToString(), asset => { + result(JsonConvert.DeserializeObject>(asset.text)); }); } + #region LoadAssets + + + #endregion LoadAssets //테이블별로 테이블 가져오는 함수를 계속 추가해 줘야하는 단점... #region Prop public void GetPropInfoById(E_TABLE table, int id, Action result) { - LoadTable(table, loaded => + LoadTableAsset(table, loaded => { var list = loaded.list; result(list.Find(arg => arg.Id == id)); @@ -29,7 +44,7 @@ public class TableManager : UnitySingleton public void GetPropInfoList(E_TABLE table, Action> result) { - LoadTable(table, loaded => + LoadTableAsset(table, loaded => { result(loaded.list); }); diff --git a/Assets/Scripts/Manage/UIManager.cs b/Assets/Scripts/Manage/UIManager.cs index f9bdd3c..9efd788 100644 --- a/Assets/Scripts/Manage/UIManager.cs +++ b/Assets/Scripts/Manage/UIManager.cs @@ -147,7 +147,7 @@ public class UIManager : UnitySingleton } private IEnumerator DelayCloseLoading() { - yield return new WaitForSeconds(1.5f); + yield return new WaitForSeconds(0.5f); _loadingUI.CloseAction(); Destroy(_loadingUI.gameObject); _loadingUI = null; diff --git a/Assets/Scripts/Stage/Controller/PlayerController.cs b/Assets/Scripts/Stage/Controller/PlayerController.cs index 2df288a..ef156bd 100644 --- a/Assets/Scripts/Stage/Controller/PlayerController.cs +++ b/Assets/Scripts/Stage/Controller/PlayerController.cs @@ -26,10 +26,11 @@ public class PlayerController : MonoBehaviour EventBus.Instance.Unsubscribe(OnGetMinigamePoint); } - public void SetData() + public void SetData(PlayerInfo info) { + _tableData = info; + //_currentTeam = info.Team; _currentTeam = E_TEAM.Red; - _tableData = new PlayerInfo(); } // Update is called once per frame diff --git a/Assets/Scripts/Stage/Controller/SpawnController.cs b/Assets/Scripts/Stage/Controller/SpawnController.cs index 04fb6cc..9c1d1be 100644 --- a/Assets/Scripts/Stage/Controller/SpawnController.cs +++ b/Assets/Scripts/Stage/Controller/SpawnController.cs @@ -28,15 +28,15 @@ public class SpawnController : MonoBehaviour //최초 플레이어 프리팹 로드 및 생성 //TODO : 씬 외부에서 선택된 플레이어 정보를 넘겨주고 해당 데이터를 받아 생성한다. - public void SpawnPlayer(string prefab/*추후 데이터로 교체*/, System.Action result) + public void SpawnPlayer(PlayerInfo info, System.Action result) { TableManager.Instance.GetPropInfoList(E_TABLE.JPropInfo, propList => { _PropDataList = propList; - AddressableManager.Instance.Spawn(prefab, null, onComplete => + AddressableManager.Instance.Spawn(info.PrefapName, null, onComplete => { var controller = onComplete.GetComponent(); - controller.SetData(); + controller.SetData(info); controller.Block(); RespawnPlayer(controller); result(controller); diff --git a/Assets/Scripts/Stage/Events/IntroEvents.cs b/Assets/Scripts/Stage/Events/IntroEvents.cs new file mode 100644 index 0000000..45e1000 --- /dev/null +++ b/Assets/Scripts/Stage/Events/IntroEvents.cs @@ -0,0 +1,30 @@ +using FirstVillain.Converter; +using FirstVillain.EventBus; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EventLoadAssets : EventBase +{ + +} + +public class EventLoadTable : EventBase +{ + public List DataList { get; private set; } + + public EventLoadTable(Wrapper wrapper) + { + DataList = wrapper.list; + } +} + +public class EventUpdateTableLadingProgress : EventBase +{ + public float Progress { get; private set; } + + public EventUpdateTableLadingProgress(float progress) + { + Progress = progress; + } +} diff --git a/Assets/Scripts/Stage/Events/IntroEvents.cs.meta b/Assets/Scripts/Stage/Events/IntroEvents.cs.meta new file mode 100644 index 0000000..dd5f95f --- /dev/null +++ b/Assets/Scripts/Stage/Events/IntroEvents.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a8adede989e77864fbbac657acc08e3c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Stage/Events/StageEvents.cs b/Assets/Scripts/Stage/Events/StageEvents.cs index 9f50680..bcad45c 100644 --- a/Assets/Scripts/Stage/Events/StageEvents.cs +++ b/Assets/Scripts/Stage/Events/StageEvents.cs @@ -1,5 +1,17 @@ using FirstVillain.EventBus; +public class EventStartStage : EventBase +{ + public PlayerInfo SelectedPlayer { get; private set; } + public E_STAGE_TYPE StageType { get; private set; } + + public EventStartStage(PlayerInfo info, E_STAGE_TYPE stageType) + { + SelectedPlayer= info; + StageType = stageType; + } +} + public class EventMinigameStop : EventBase { diff --git a/Assets/Scripts/Stage/Manage/StageManager.cs b/Assets/Scripts/Stage/Manage/StageManager.cs index 49c5232..ae1d067 100644 --- a/Assets/Scripts/Stage/Manage/StageManager.cs +++ b/Assets/Scripts/Stage/Manage/StageManager.cs @@ -16,19 +16,14 @@ public class StageManager : UnitySingletonOnce public bool IsPlaying { get { return _state == E_STAGE_STATE.Playing; } } - private void Start() + private void Init(PlayerInfo player, E_STAGE_TYPE type) { - //임시 호출 - Init(E_STAGE_TYPE.Single_TimeAttack, "Player_Cop"); - } - private void Init(E_STAGE_TYPE type, string prefab/*추후 테이블*/) - { _currentStageType = type; _state = E_STAGE_STATE.Ready; InitScore(); //TODO : UI초기화 - _spawnController.SpawnPlayer(prefab, result => + _spawnController.SpawnPlayer(player, result => { //시작 시간표기? StartGame(); diff --git a/Assets/Scripts/UI/Intro/UIPanelIntro.cs b/Assets/Scripts/UI/Intro/UIPanelIntro.cs index 3191db7..89dce45 100644 --- a/Assets/Scripts/UI/Intro/UIPanelIntro.cs +++ b/Assets/Scripts/UI/Intro/UIPanelIntro.cs @@ -16,12 +16,11 @@ public class UIPanelIntro : UIBase public void OnClickStart() { - SceneLoadManager.Instance.LoadSceneAsync("Lobby", OnCompleteLoad, E_UI_TYPE.UIPanelLoadingIntro); + UIManager.Instance.OpenLoadingUI(E_UI_TYPE.UIPanelLoadingIntro, LoadingUIOpened); } - public void OnCompleteLoad() + private void LoadingUIOpened(UIBase ui) { - EventBus.Instance.Publish(new EventStartLobby()); - Close(); + EventBus.Instance.Publish(new EventLoadAssets()); } } diff --git a/Assets/Scripts/UI/Loading/UIPanelLoadingIntro.cs b/Assets/Scripts/UI/Loading/UIPanelLoadingIntro.cs index 5179f4e..811a6e3 100644 --- a/Assets/Scripts/UI/Loading/UIPanelLoadingIntro.cs +++ b/Assets/Scripts/UI/Loading/UIPanelLoadingIntro.cs @@ -1,18 +1,29 @@ +using FirstVillain.EventBus; using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; +using UnityEngine.UI; public class UIPanelLoadingIntro : UIBase { - // Start is called before the first frame update - void Start() - { - - } + [SerializeField] private Slider _loadingSlider; + [SerializeField] private TextMeshProUGUI _loadingText; - // Update is called once per frame - void Update() + private void Start() { - + _loadingSlider.value = 0; + _loadingText.text = "0%"; + + EventBus.Instance.Subscribe(OnUpdateLoadingGauge); + } + private void OnDestroy() + { + EventBus.Instance.Unsubscribe(OnUpdateLoadingGauge); + } + private void OnUpdateLoadingGauge(EventUpdateTableLadingProgress e) + { + _loadingSlider.value = e.Progress; + _loadingText.text = $"{(int)(e.Progress * 100)}%"; } }