diff --git a/Assets/01.Scenes/00.TycoonTitle.unity b/Assets/01.Scenes/00.TycoonTitle.unity index f3e706b4c..688bd86d9 100644 --- a/Assets/01.Scenes/00.TycoonTitle.unity +++ b/Assets/01.Scenes/00.TycoonTitle.unity @@ -1252,11 +1252,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!224 &595339336 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6448125349934981781, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - m_PrefabInstance: {fileID: 8401317452346303361} - m_PrefabAsset: {fileID: 0} --- !u!1 &652021011 GameObject: m_ObjectHideFlags: 0 @@ -2396,11 +2391,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 285334972} m_PrefabAsset: {fileID: 0} ---- !u!224 &1325306576 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - m_PrefabInstance: {fileID: 1401815268} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1363927973 PrefabInstance: m_ObjectHideFlags: 0 @@ -2526,103 +2516,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} ---- !u!1001 &1401815268 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 595339336} - m_Modifications: - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_SizeDelta.x - value: 160 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_AnchoredPosition.x - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_AnchoredPosition.y - value: -50 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 544138656343027660, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6041565752754092942, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} - propertyPath: m_Name - value: TutorialPageButton - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} --- !u!1001 &1465657075 PrefabInstance: m_ObjectHideFlags: 0 @@ -4468,6 +4361,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 290108948241752577, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 290108948241752577, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 290108948241752577, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 290108948241752577, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 290108948241752577, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 290108948241752577, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 414015556802972880, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4500,6 +4417,42 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 782217958273666457, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 782217958273666457, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 782217958273666457, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 782217958273666457, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 782217958273666457, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 124.09 + objectReference: {fileID: 0} + - target: {fileID: 782217958273666457, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 782217958273666457, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 782217958273666457, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 112.045 + objectReference: {fileID: 0} + - target: {fileID: 782217958273666457, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -35 + objectReference: {fileID: 0} - target: {fileID: 949839561363117171, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4512,6 +4465,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1039721586360569850, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1039721586360569850, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1039721586360569850, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1039721586360569850, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1039721586360569850, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1062717157444337255, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4560,6 +4533,26 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1428936733988020838, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1428936733988020838, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1428936733988020838, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1428936733988020838, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1428936733988020838, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1529748261538296468, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4652,6 +4645,38 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -35 objectReference: {fileID: 0} + - target: {fileID: 2696951849434447587, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2696951849434447587, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2696951849434447587, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2696951849434447587, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2696951849434447587, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2696951849434447587, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2696951849434447587, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2696951849434447587, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2792920680325341881, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4740,6 +4765,34 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -440 objectReference: {fileID: 0} + - target: {fileID: 3888891624253089110, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3888891624253089110, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3888891624253089110, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 125.51999 + objectReference: {fileID: 0} + - target: {fileID: 3888891624253089110, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3888891624253089110, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3888891624253089110, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 286.84998 + objectReference: {fileID: 0} + - target: {fileID: 3888891624253089110, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -35 + objectReference: {fileID: 0} - target: {fileID: 3976132546625396958, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4768,6 +4821,34 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4433936681926280011, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4433936681926280011, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4433936681926280011, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 124.8 + objectReference: {fileID: 0} + - target: {fileID: 4433936681926280011, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4433936681926280011, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4433936681926280011, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 462.00998 + objectReference: {fileID: 0} + - target: {fileID: 4433936681926280011, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -35 + objectReference: {fileID: 0} - target: {fileID: 4504395504687778956, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4800,6 +4881,34 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4841013803479721482, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4841013803479721482, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4841013803479721482, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4841013803479721482, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4841013803479721482, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4841013803479721482, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4841013803479721482, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4934171152649608560, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4896,6 +5005,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -330 objectReference: {fileID: 0} + - target: {fileID: 5720963034508307960, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5720963034508307960, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5720963034508307960, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 124.09 + objectReference: {fileID: 0} + - target: {fileID: 5720963034508307960, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 236.135 + objectReference: {fileID: 0} + - target: {fileID: 5720963034508307960, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: -35 + objectReference: {fileID: 0} - target: {fileID: 5833474583663148126, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4924,6 +5053,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6026972614650954365, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6026972614650954365, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6026972614650954365, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6026972614650954365, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6026972614650954365, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6026972614650954365, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6309230753613603339, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -4952,9 +5105,13 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -35 objectReference: {fileID: 0} + - target: {fileID: 6448125349934981781, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6448125349934981781, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.0009474608 + value: -0.0009642145 objectReference: {fileID: 0} - target: {fileID: 6537485383528875604, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y @@ -5292,6 +5449,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -110 objectReference: {fileID: 0} + - target: {fileID: 8821734039056801808, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8821734039056801808, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8821734039056801808, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8821734039056801808, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8821734039056801808, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8821734039056801808, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8855145811590553786, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5301,12 +5482,8 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 8158165551738235553, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6448125349934981781, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - insertIndex: -1 - addedObject: {fileID: 1325306576} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} --- !u!224 &8401317452346303362 stripped diff --git a/Assets/02.Scripts/NewBlueWater.inputactions b/Assets/02.Scripts/NewBlueWater.inputactions index bdd805e9f..8124c9c03 100644 --- a/Assets/02.Scripts/NewBlueWater.inputactions +++ b/Assets/02.Scripts/NewBlueWater.inputactions @@ -751,6 +751,33 @@ "interactions": "", "initialStateCheck": false }, + { + "name": "PressR", + "type": "Button", + "id": "e4fa5849-c9d6-4997-9b4e-90534871a42b", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "PressA", + "type": "Button", + "id": "ba45488a-1cd7-479a-a42c-7ecf4d140eb6", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "PressD", + "type": "Button", + "id": "8eb2dcae-c555-4f18-949a-ead8d65767f9", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, { "name": "PressAnyKey", "type": "Button", @@ -843,10 +870,43 @@ "path": "/e", "interactions": "", "processors": "", - "groups": "", + "groups": ";Keyboard&Mouse", "action": "InteractionE", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "c8c18337-6d1f-47f7-9e88-017d311a5ece", + "path": "/r", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "PressR", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "35cbd356-f529-4281-94b8-087c7bd21859", + "path": "/a", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "PressA", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "2df367e5-1d6c-428c-b859-455392708188", + "path": "/d", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "PressD", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/02.Scripts/PlayerInputKeyManager.cs b/Assets/02.Scripts/PlayerInputKeyManager.cs index 52817c346..409ece7e7 100644 --- a/Assets/02.Scripts/PlayerInputKeyManager.cs +++ b/Assets/02.Scripts/PlayerInputKeyManager.cs @@ -38,6 +38,9 @@ namespace BlueWater public const string Move = "Move"; public const string Cancel = "Cancel"; public const string PressQ = "PressQ"; + public const string PressR = "PressR"; + public const string PressA = "PressA"; + public const string PressD = "PressD"; public const string PressAnyKey = "PressAnyKey"; public const string InteractionE = "InteractionE"; } diff --git a/Assets/02.Scripts/ScriptableObject/Tutorial/TutorialSo.asset b/Assets/02.Scripts/ScriptableObject/Tutorial/TutorialSo.asset index 3d6eb8490..9bc47fa43 100644 --- a/Assets/02.Scripts/ScriptableObject/Tutorial/TutorialSo.asset +++ b/Assets/02.Scripts/ScriptableObject/Tutorial/TutorialSo.asset @@ -30,6 +30,139 @@ MonoBehaviour: k__BackingField: 3 k__BackingField: TutorialA03 k__BackingField: {fileID: 21300000, guid: 29fd4626221cc4e449047cb509a4b670, type: 3} + - k__BackingField: TutorialB + k__BackingField: + k__BackingField: TutorialB + k__BackingField: TutorialTitleB + k__BackingField: + - k__BackingField: 0 + k__BackingField: 1 + k__BackingField: TutorialB01 + k__BackingField: {fileID: 21300000, guid: 3d7a8b0b4b41eac4aa4098cef0206994, type: 3} + - k__BackingField: 1 + k__BackingField: 2 + k__BackingField: TutorialB02 + k__BackingField: {fileID: 21300000, guid: 1b6fbbe5c5df6df45b4feabedfc5d24d, type: 3} + - k__BackingField: 1 + k__BackingField: 3 + k__BackingField: TutorialB03 + k__BackingField: {fileID: 21300000, guid: 4b752d2d5763abc4cb65b8355450cc70, type: 3} + - k__BackingField: 2 + k__BackingField: 4 + k__BackingField: TutorialB04 + k__BackingField: {fileID: 21300000, guid: f13384a7d3bd41a48a5ef3bd2671681b, type: 3} + - k__BackingField: TutorialC + k__BackingField: + k__BackingField: TutorialC + k__BackingField: TutorialTitleC + k__BackingField: + - k__BackingField: 0 + k__BackingField: 1 + k__BackingField: TutorialC01 + k__BackingField: {fileID: 21300000, guid: 4c88f781368f1354bbc3dc6d16a5e092, type: 3} + - k__BackingField: 2 + k__BackingField: 2 + k__BackingField: TutorialC02 + k__BackingField: {fileID: 21300000, guid: c2b2347daad35824fb06639765562756, type: 3} + - k__BackingField: TutorialD + k__BackingField: + k__BackingField: TutorialD + k__BackingField: TutorialTitleD + k__BackingField: + - k__BackingField: 0 + k__BackingField: 1 + k__BackingField: TutorialD01 + k__BackingField: {fileID: 21300000, guid: 498ee1d309cc40147be2fbc30f4e1f98, type: 3} + - k__BackingField: 2 + k__BackingField: 2 + k__BackingField: TutorialD02 + k__BackingField: {fileID: 21300000, guid: 0e5d85d1988fddf4489c332411fdcd01, type: 3} + - k__BackingField: TutorialE + k__BackingField: + k__BackingField: TutorialE + k__BackingField: TutorialTitleE + k__BackingField: + - k__BackingField: 0 + k__BackingField: 1 + k__BackingField: TutorialE01 + k__BackingField: {fileID: 21300000, guid: 50aa58873f7c70a4e9e852c4f85c961d, type: 3} + - k__BackingField: 1 + k__BackingField: 2 + k__BackingField: TutorialE02 + k__BackingField: {fileID: 21300000, guid: 1df0d2dcaa205ac4896a9445e53ca20d, type: 3} + - k__BackingField: 1 + k__BackingField: 3 + k__BackingField: TutorialE03 + k__BackingField: {fileID: 21300000, guid: e8737123e0a24884fbdee2f95b076c02, type: 3} + - k__BackingField: 2 + k__BackingField: 4 + k__BackingField: TutorialE04 + k__BackingField: {fileID: 21300000, guid: b944272f378e723459f5b917aecea0df, type: 3} + - k__BackingField: TutorialF + k__BackingField: + k__BackingField: TutorialF + k__BackingField: TutorialTitleF + k__BackingField: + - k__BackingField: 0 + k__BackingField: 1 + k__BackingField: TutorialF01 + k__BackingField: {fileID: 21300000, guid: 34afe998d81409849ac9027c92aa8298, type: 3} + - k__BackingField: 0 + k__BackingField: 2 + k__BackingField: TutorialF02 + k__BackingField: {fileID: 21300000, guid: 314511725dea78e489cd83c8e6e7c7f4, type: 3} + - k__BackingField: TutorialG + k__BackingField: + k__BackingField: TutorialG + k__BackingField: TutorialTitleG + k__BackingField: + - k__BackingField: 0 + k__BackingField: 1 + k__BackingField: TutorialG01 + k__BackingField: {fileID: 21300000, guid: a89ec2f974875f84ba47bf0ee5f6bf43, type: 3} + - k__BackingField: 2 + k__BackingField: 2 + k__BackingField: TutorialG02 + k__BackingField: {fileID: 21300000, guid: 28a69f413a21ad548aa6e4add76be684, type: 3} + - k__BackingField: TutorialH + k__BackingField: + k__BackingField: TutorialH + k__BackingField: TutorialTitleH + k__BackingField: + - k__BackingField: 3 + k__BackingField: 1 + k__BackingField: TutorialH01 + k__BackingField: {fileID: 21300000, guid: db00f49f58fded241a25b68b4ac8ff9a, type: 3} + - k__BackingField: TutorialI + k__BackingField: + k__BackingField: TutorialI + k__BackingField: TutorialTitleI + k__BackingField: + - k__BackingField: 3 + k__BackingField: 1 + k__BackingField: TutorialI01 + k__BackingField: {fileID: 21300000, guid: 6758a337148c7474588128873b3695a2, type: 3} + - k__BackingField: TutorialJ + k__BackingField: + k__BackingField: TutorialJ + k__BackingField: TutorialTitleJ + k__BackingField: + - k__BackingField: 0 + k__BackingField: 1 + k__BackingField: TutorialJ01 + k__BackingField: {fileID: 21300000, guid: df7a898725d87014cba236537831e17a, type: 3} + - k__BackingField: 1 + k__BackingField: 2 + k__BackingField: TutorialJ02 + k__BackingField: {fileID: 21300000, guid: f3aded03bbc1e8345b08380f7647ffd4, type: 3} + - k__BackingField: 1 + k__BackingField: 3 + k__BackingField: TutorialJ03 + k__BackingField: {fileID: 21300000, guid: 66cfebf11cb5b7d46bbec75addd1764e, type: 3} + - k__BackingField: 2 + k__BackingField: 4 + k__BackingField: TutorialJ04 + k__BackingField: {fileID: 21300000, guid: 5d6455c1c94a7d44395818bc14d8a867, type: 3} k__BackingField: {fileID: 1581927570, guid: d881395249d9f7d43940877db16f096d, type: 3} k__BackingField: {fileID: 1740845040, guid: 4eb21a9cf7ed8e44388a74756a151b20, type: 3} k__BackingField: {fileID: -1576049482, guid: d21603cd31610504c847fd606881daba, type: 3} diff --git a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs index 72fa93adf..1c0a68c85 100644 --- a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs +++ b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs @@ -100,6 +100,7 @@ namespace BlueWater.Titles titleOptions.CloseOptions = HideSettingUi; titleQuitUi.CloseQuit = HideQuitUi; + _tycoonTutorial.CloseAction = HideTutorialUi; _versionText.text = GetVersion(); inkMaterialInstance = Instantiate(_ink.material); @@ -267,14 +268,17 @@ namespace BlueWater.Titles public void ShowTutorialUi() { _titleMenuUiPanel.SetActive(false); - _tycoonTutorial.ShowUi(); + _tycoonTutorial.ShowUi(true); + + Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(1f)); } public void HideTutorialUi() { _titleMenuUiPanel.SetActive(true); - _tycoonTutorial.HideUi(); EventSystem.current.SetSelectedGameObject(_tutorialButton.gameObject); + + Utils.StartUniqueCoroutine(this, ref _inkCoroutine, MoveInkBackground(0.4f)); } private IEnumerator MoveInkBackground(float pos) diff --git a/Assets/02.Scripts/Ui/TutorialPopupUi.cs b/Assets/02.Scripts/Ui/TutorialPopupUi.cs index 4aa3832d9..2357d7271 100644 --- a/Assets/02.Scripts/Ui/TutorialPopupUi.cs +++ b/Assets/02.Scripts/Ui/TutorialPopupUi.cs @@ -6,12 +6,16 @@ namespace BlueWater.Uis { public override void Open() { - + PopupUiController.RegisterPopup(this); + gameObject.SetActive(true); + IsOpened = true; } public override void Close() { - + gameObject.SetActive(false); + PopupUiController.UnregisterPopup(this); + IsOpened = false; } public override void EnableInput() diff --git a/Assets/02.Scripts/Ui/Tycoon/TutorialLink.cs b/Assets/02.Scripts/Ui/Tycoon/TutorialLink.cs new file mode 100644 index 000000000..191db432d --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/TutorialLink.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace BlueWater +{ + [Serializable] + public class TutorialLink + { + [field: SerializeField] + public string TutorialName { get; private set; } + + [field: SerializeField] + public TutorialPageToggle TutorialPageToggle { get; private set; } + + [field: SerializeField] + public List TycoonTutorialPopupUis { get; private set; } + + [field: SerializeField] + public int CurrentPageIndex { get; private set; } + + public TutorialLink(string tutorialName, TutorialPageToggle tutorialPageToggle, List tycoonTutorialPopupUis) + { + TutorialName = tutorialName; + TutorialPageToggle = tutorialPageToggle; + TycoonTutorialPopupUis = tycoonTutorialPopupUis; + } + + public void OnToggle(bool isOn) + { + if (!TutorialPageToggle) return; + + TutorialPageToggle.OnToggle(isOn); + + if (isOn) + { + OpenPage(0); + } + else + { + CloseAllPage(); + } + } + + public void OpenPage(int pageIndex) + { + CurrentPageIndex = Mathf.Clamp(pageIndex, 0, TycoonTutorialPopupUis.Count - 1); + TycoonTutorialPopupUis[CurrentPageIndex].Open(); + } + + public void ClosePage(int pageIndex) + { + TycoonTutorialPopupUis[CurrentPageIndex].Close(); + } + + public void CloseAllPage() + { + foreach (TycoonTutorialPopupUi tycoonTutorialPopupUi in TycoonTutorialPopupUis) + { + if (!tycoonTutorialPopupUi.IsOpened) continue; + + tycoonTutorialPopupUi.Close(); + } + } + + public void MovePage(bool moveNext) + { + ClosePage(CurrentPageIndex); + OpenPage(CurrentPageIndex + (moveNext ? 1 : -1)); + } + } +} diff --git a/Assets/02.Scripts/Ui/Tycoon/TutorialLink.cs.meta b/Assets/02.Scripts/Ui/Tycoon/TutorialLink.cs.meta new file mode 100644 index 000000000..c371d780c --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/TutorialLink.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ac25cbaf820aa674eb6a1539b9ac4c01 \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/TutorialPage.cs b/Assets/02.Scripts/Ui/Tycoon/TutorialPage.cs index 13b918ff0..3fcefe07d 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TutorialPage.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TutorialPage.cs @@ -8,7 +8,7 @@ namespace BlueWater First = 0, Middle = 1, Last = 2, - Sole = 3 + Solo = 3 } [Serializable] diff --git a/Assets/02.Scripts/Ui/Tycoon/TutorialPageToggle.cs b/Assets/02.Scripts/Ui/Tycoon/TutorialPageToggle.cs index e4f7e8ee1..7501e4d17 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TutorialPageToggle.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TutorialPageToggle.cs @@ -14,6 +14,9 @@ namespace BlueWater { public class TutorialPageToggle : MonoBehaviour { + [field: SerializeField] + public RectTransform Rect { get; private set; } + [SerializeField] private Toggle _toggle; @@ -43,7 +46,7 @@ namespace BlueWater private Coroutine _changedLocaleInstance; private Sequence _selectSequence; private Sequence _deselectSequence; - + public Action OnToggleEvent; private void Awake() @@ -57,8 +60,6 @@ namespace BlueWater _selectSequence.Kill(); _deselectSequence.Kill(); - - OnToggleEvent = null; } private void OnChangedLocale(Locale locale) @@ -102,17 +103,22 @@ namespace BlueWater .SetUpdate(true) .SetAutoKill(false) .Pause(); + + _toggle.interactable = true; + _toggle.isOn = false; + _toggleImage.sprite = _deselectToggleSprite; + Vector3 newPosition = _buttonText.transform.localPosition; + newPosition.y = _buttonTextPositionY.x; + _buttonText.transform.localPosition = newPosition; + Vector3 newScale = _toggleImage.transform.localScale; + newScale.y = _buttonImageScale.x; + _toggleImage.transform.localScale = newScale; } public void OnToggle(bool isOn) { - if (_toggle.isOn) - { - _toggle.interactable = false; - return; - } - - _toggle.interactable = true; + _toggle.isOn = isOn; + _toggle.interactable = !_toggle.isOn; if (isOn) { @@ -126,6 +132,7 @@ namespace BlueWater _selectSequence?.Pause(); _deselectSequence.Restart(); } + OnToggleEvent?.Invoke(isOn); } } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs index e6a7693b6..f94d1ab31 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonTutorial.cs @@ -1,29 +1,9 @@ +using System; using System.Collections.Generic; -using BlueWater; using Sirenix.OdinInspector; using UnityEngine; - -public class TutorialLink -{ - public TutorialPageToggle TutorialPageToggle { get; private set; } - public List TycoonTutorialPopupUis { get; private set; } - - public TutorialLink(TutorialPageToggle tutorialPageToggle, List tycoonTutorialPopupUis) - { - TutorialPageToggle = tutorialPageToggle; - TycoonTutorialPopupUis = tycoonTutorialPopupUis; - - TutorialPageToggle.OnToggleEvent += OnToggle; - } - - public void OnToggle(bool isOn) - { - if (isOn) - { - TycoonTutorialPopupUis[0].Open(); - } - } -} +using UnityEngine.InputSystem; +using UnityEngine.UI; namespace BlueWater { @@ -31,31 +11,69 @@ namespace BlueWater { [SerializeField, Required] private GameObject _tutorialPanel; + + [SerializeField, Required] + private GameObject _togglePanel; + + [SerializeField, Required] + private ScrollRect _scrollRect; - [SerializeField] - private Transform _buttonContents; + [SerializeField, Required] + private RectTransform _buttonContents; - [SerializeField] + [SerializeField, Required] private Transform _tutorialPopupUiContents; + + [SerializeField] + private GameObject _keyAPanel; + + [SerializeField] + private GameObject _keyDPanel; + + [SerializeField] + private GameObject _keyEPanel; [Title("프리팹")] - [SerializeField] + [SerializeField, Required] private TutorialPageToggle _tutorialPageToggle; - [SerializeField] + [SerializeField, Required] private TycoonTutorialPopupUi _tutorialPopupUi; [Title("So")] [SerializeField, Required] private TutorialSo _tutorialSo; - private Dictionary _tutorialLinks; + [Title("실시간 데이터")] + [SerializeField] + private List _tutorialLinks; + + [SerializeField] + private TutorialLink _currentTutorialLink; + + private InputAction _pressQAction; + private InputAction _pressRAction; + private InputAction _pressAAction; + private InputAction _pressDAction; + private InputAction _interactionEAction; + private InputAction _closeAction; + private bool _isInMenu; + private bool _isUpdatingToggle; + + public Action CloseAction; private void Start() { + _pressQAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.PressQ); + _pressRAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.PressR); + _pressAAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.PressA); + _pressDAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.PressD); + _interactionEAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE); + _closeAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel); + HideUi(); - foreach (Transform element in _buttonContents) + foreach (Transform element in _buttonContents.transform) { Destroy(element.gameObject); } @@ -65,7 +83,7 @@ namespace BlueWater Destroy(element.gameObject); } - _tutorialLinks = new Dictionary(_tutorialSo.GetDataCount()); + _tutorialLinks = new List(_tutorialSo.GetDataCount()); foreach (TutorialInfo tutorialInfo in _tutorialSo.GetData().Values) { TutorialPageToggle tutorialPageToggle = Instantiate(this._tutorialPageToggle, _buttonContents); @@ -75,25 +93,211 @@ namespace BlueWater for (int i = 0; i < tutorialInfo.TutorialPages.Count; i++) { TycoonTutorialPopupUi tycoonTutorialPopupUi = Instantiate(_tutorialPopupUi, _tutorialPopupUiContents); + TutorialPageType tutorialPageType = tutorialInfo.TutorialPages[i].TutorialPageType; + Sprite popupSprite = null; + switch (tutorialPageType) + { + case TutorialPageType.First: + popupSprite = _tutorialSo.FirstPopup; + break; + case TutorialPageType.Middle: + popupSprite = _tutorialSo.MiddlePopup; + break; + case TutorialPageType.Last: + popupSprite = _tutorialSo.LastPopup; + break; + case TutorialPageType.Solo: + popupSprite = _tutorialSo.SoloPopup; + break; + default: + throw new ArgumentOutOfRangeException(); + } + tycoonTutorialPopupUi.Initialize(tutorialInfo, i, popupSprite); tycoonTutorialPopupUis.Add(tycoonTutorialPopupUi); } - _tutorialLinks.Add(tutorialInfo.TutorialName, new TutorialLink(tutorialPageToggle, tycoonTutorialPopupUis)); + TutorialLink tutorialLink = new TutorialLink(tutorialInfo.TutorialName, tutorialPageToggle, tycoonTutorialPopupUis); + tutorialPageToggle.OnToggleEvent += isOn => + { + if (_isUpdatingToggle) return; // 이벤트 중복 방지 + if (isOn) + { + _isUpdatingToggle = true; + CloseKeyPanels(); + _currentTutorialLink?.OnToggle(false); + _currentTutorialLink = tutorialLink; + _currentTutorialLink.OnToggle(true); + UpdateKeyPanels(); + FocusOnToggle(_currentTutorialLink.TutorialPageToggle); + _isUpdatingToggle = false; + } + }; + + _tutorialLinks.Add(tutorialLink); } + + _currentTutorialLink = _tutorialLinks[0]; } - public void ShowUi() + private void OnDestroy() { - if (_tutorialLinks.TryGetValue("TutorialA", out TutorialLink tutorialLink)) - { - tutorialLink.TutorialPageToggle.OnToggle(true); - } + _pressQAction = null; + _pressRAction = null; + _pressAAction = null; + _pressDAction = null; + _interactionEAction = null; + _closeAction = null; + } + + public void ShowUi(bool isInMenu) + { + _isInMenu = isInMenu; + UpdateKeyPanels(); + + _currentTutorialLink = _tutorialLinks[0]; + _currentTutorialLink.OnToggle(true); + _togglePanel.SetActive(true); _tutorialPanel.SetActive(true); + + _pressQAction.performed += OnMovePreviousToggle; + _pressRAction.performed += OnMovNextToggle; + _pressAAction.performed += OnMovePreviousPage; + _pressDAction.performed += OnMoveNextPage; + + if (_isInMenu) + { + FocusOnToggle(_currentTutorialLink.TutorialPageToggle); + _closeAction.performed += OnClose; + } + } + + public void ShowUiByIdx(string tutorialName) + { + CloseKeyPanels(); + + _togglePanel.SetActive(false); + _currentTutorialLink = _tutorialLinks.Find(link => link.TutorialName == tutorialName); + _currentTutorialLink?.OnToggle(true); + _tutorialPanel.SetActive(true); + UpdateKeyPanels(); + + _pressAAction.performed += OnMovePreviousPage; + _pressDAction.performed += OnMoveNextPage; } public void HideUi() { + _pressQAction.performed -= OnMovePreviousToggle; + _pressRAction.performed -= OnMovNextToggle; + _pressAAction.performed -= OnMovePreviousPage; + _pressDAction.performed -= OnMoveNextPage; + _interactionEAction.performed -= OnClose; + _closeAction.performed -= OnClose; + + _togglePanel.SetActive(false); _tutorialPanel.SetActive(false); + _currentTutorialLink?.OnToggle(false); + CloseKeyPanels(); + + if (_isInMenu) + { + CloseAction?.Invoke(); + } + _isInMenu = false; + } + + private void OnMovePreviousToggle(InputAction.CallbackContext context) + { + MoveToggle(-1); + } + + private void OnMovNextToggle(InputAction.CallbackContext context) + { + MoveToggle(1); + } + + private void MoveToggle(int direction) + { + CloseKeyPanels(); + + int currentIndex = _tutorialLinks.IndexOf(_currentTutorialLink); + int nextIndex = Mathf.Clamp(currentIndex + direction, 0, _tutorialLinks.Count - 1); + + _currentTutorialLink.OnToggle(false); + _currentTutorialLink = _tutorialLinks[nextIndex]; + _currentTutorialLink.OnToggle(true); + UpdateKeyPanels(); + + FocusOnToggle(_currentTutorialLink.TutorialPageToggle); + } + + private void FocusOnToggle(TutorialPageToggle selectedToggle) + { + if (!selectedToggle.gameObject.activeInHierarchy) return; + + // Viewport와 Content의 너비를 가져오기 + float contentWidth = _buttonContents.rect.width; // Content 전체 너비 + float viewportWidth = _scrollRect.viewport.rect.width; // Viewport 너비 + + // 선택된 토글의 x 위치를 Content 기준으로 가져오기 + float targetX = selectedToggle.Rect.anchoredPosition.x; + + // Normalized Position 계산 + // (Content 기준 위치 - 뷰포트 절반) / (Content 너비 - 뷰포트 너비) + float normalizedPosition = Mathf.Clamp01((targetX - (viewportWidth / 2)) / (contentWidth - viewportWidth)); + + // ScrollRect에 반영 + _scrollRect.horizontalNormalizedPosition = normalizedPosition; + } + + private void OnMovePreviousPage(InputAction.CallbackContext context) + { + MovePage(false); + } + + private void OnMoveNextPage(InputAction.CallbackContext context) + { + MovePage(true); + } + + private void MovePage(bool moveNext) + { + if (_currentTutorialLink == null) return; + + _currentTutorialLink.MovePage(moveNext); + + UpdateKeyPanels(); + } + + private void CloseKeyPanels() + { + _interactionEAction.performed -= OnClose; + + _keyAPanel.SetActive(false); + _keyDPanel.SetActive(false); + _keyEPanel.SetActive(false); + } + + private void UpdateKeyPanels() + { + if (_currentTutorialLink == null) return; + + int currentPageIndex = _currentTutorialLink.CurrentPageIndex; + int lastPage = _currentTutorialLink.TycoonTutorialPopupUis.Count; + + _keyAPanel.SetActive(currentPageIndex > 0); + _keyDPanel.SetActive(currentPageIndex < lastPage - 1); + + if (currentPageIndex == lastPage - 1) + { + _keyEPanel.SetActive(true); + _interactionEAction.performed += OnClose; + } + } + + private void OnClose(InputAction.CallbackContext context) + { + HideUi(); } } } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonTutorialPopupUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonTutorialPopupUi.cs index 8604b7425..e96bcba84 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonTutorialPopupUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonTutorialPopupUi.cs @@ -1,6 +1,8 @@ +using System; using System.Collections; using BlueWater.Uis; using BlueWater.Utility; +using Sirenix.OdinInspector; using TMPro; using UnityEngine; using UnityEngine.Localization; @@ -12,18 +14,41 @@ namespace BlueWater { public class TycoonTutorialPopupUi : TutorialPopupUi { + [SerializeField] + private Image _popupImage; + [SerializeField] private TMP_Text _titleText; + [SerializeField] + private RectTransform _descriptionTextRect; + [SerializeField] private TMP_Text _descriptionText; + [SerializeField] + private RectTransform _descriptionTImageRect; + [SerializeField] private Image _descriptionImage; + [SerializeField] private TMP_Text _pageText; + [Title("연출")] + [SerializeField] + private Vector3 _descriptionTextAnchorPositionInFirst = new(0f, -37f, 0f); + + [SerializeField] + private Vector3 _descriptionTextAnchorPositionExceptFirst = new(0f, -280f, 0f); + + [SerializeField] + private Vector3 _descriptionImageAnchorPositionInFirst = new(0f, -210f, 0f); + + [SerializeField] + private Vector3 _descriptionImageAnchorPositionExceptFirst = new(0f, -150f, 0f); + private TutorialInfo _tutorialInfo; private TutorialPage _tutorialPage; private Coroutine _changedLocaleInstance; @@ -59,7 +84,7 @@ namespace BlueWater } } - public void Initialize(TutorialInfo tutorialInfo, int pageindex) + public void Initialize(TutorialInfo tutorialInfo, int pageindex, Sprite popupSprite) { gameObject.SetActive(false); @@ -69,17 +94,24 @@ namespace BlueWater gameObject.name = $"{_tutorialInfo.TutorialName}{_pageIndex + 1}"; - if (_tutorialPage.TutorialPageType is TutorialPageType.First or TutorialPageType.Sole) + _popupImage.sprite = popupSprite; + + if (_tutorialPage.TutorialPageType is TutorialPageType.First or TutorialPageType.Solo) { _titleText.text = Utils.GetLocalizedString(_tutorialInfo.TitleTextIdx); _titleText.enabled = true; + _descriptionTextRect.anchoredPosition = _descriptionTextAnchorPositionInFirst; + _descriptionTImageRect.anchoredPosition = _descriptionImageAnchorPositionInFirst; } else { _titleText.enabled = false; + _descriptionTextRect.anchoredPosition = _descriptionTextAnchorPositionExceptFirst; + _descriptionTImageRect.anchoredPosition = _descriptionImageAnchorPositionExceptFirst; } _descriptionText.text = Utils.GetLocalizedString(_tutorialPage.DescriptionIdx); _descriptionImage.sprite = _tutorialPage.Sprite; + _pageText.text = $"{_tutorialPage.PageIndex}/{_tutorialInfo.GetPages()}"; } } diff --git a/Assets/05.Prefabs/Uis/Tycoons/TutorialPageToggle.prefab b/Assets/05.Prefabs/Uis/Tycoons/TutorialPageToggle.prefab index 91b3bea9e..3ecd94839 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TutorialPageToggle.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TutorialPageToggle.prefab @@ -352,6 +352,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 696314dff3acfcf42800aeaeb72ce6f5, type: 3} m_Name: m_EditorClassIdentifier: + k__BackingField: {fileID: 544138656343027660} _toggle: {fileID: 3415835946493528833} _toggleImage: {fileID: 4512403691070795629} _buttonText: {fileID: 4925199464364819969} diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab index ae0aeddfd..52f83e2c3 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab @@ -325,6 +325,154 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &391768441572299297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1039721586360569850} + - component: {fileID: 6304292247385336241} + - component: {fileID: 6737909127057499379} + - component: {fileID: 5952693303584335750} + - component: {fileID: 849531968837280037} + m_Layer: 5 + m_Name: KeyBoxImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1039721586360569850 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 391768441572299297} + 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: 5131651199607829273} + m_Father: {fileID: 4433936681926280011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -30} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6304292247385336241 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 391768441572299297} + m_CullTransparentMesh: 1 +--- !u!114 &6737909127057499379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 391768441572299297} + 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: c7ef1b7221f0b5b4f94a1d2685ff92c2, 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: 2 +--- !u!114 &5952693303584335750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 391768441572299297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 50 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &849531968837280037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 391768441572299297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3c9d341c4bc7de548937508e6f837144, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6737909127057499379} + toggleTransition: 0 + graphic: {fileID: 0} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 0 + m_MinHeight: 18 + m_MinWidth: 40 --- !u!1 &618360709326667778 GameObject: m_ObjectHideFlags: 0 @@ -890,6 +1038,154 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &1046262048991921106 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6026972614650954365} + - component: {fileID: 101977634829509554} + - component: {fileID: 2920023786596968878} + - component: {fileID: 1173478366817503882} + - component: {fileID: 2372675272696310850} + m_Layer: 5 + m_Name: KeyBoxImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6026972614650954365 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046262048991921106} + 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: 2779194275478552841} + m_Father: {fileID: 782217958273666457} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -30} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &101977634829509554 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046262048991921106} + m_CullTransparentMesh: 1 +--- !u!114 &2920023786596968878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046262048991921106} + 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: c7ef1b7221f0b5b4f94a1d2685ff92c2, 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: 2 +--- !u!114 &1173478366817503882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046262048991921106} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 50 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &2372675272696310850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046262048991921106} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3c9d341c4bc7de548937508e6f837144, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2920023786596968878} + toggleTransition: 0 + graphic: {fileID: 0} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 0 + m_MinHeight: 18 + m_MinWidth: 40 --- !u!1 &1180456214718401517 GameObject: m_ObjectHideFlags: 0 @@ -1524,7 +1820,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 309.05, y: -440} - m_SizeDelta: {x: 0, y: 60} + m_SizeDelta: {x: 81.9, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5205768152149774126 CanvasRenderer: @@ -3163,6 +3459,154 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1945339375210407726 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1428936733988020838} + - component: {fileID: 6962063838870746438} + - component: {fileID: 8415865168405216229} + - component: {fileID: 85074287532272251} + - component: {fileID: 3621329675117078169} + m_Layer: 5 + m_Name: KeyBoxImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1428936733988020838 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945339375210407726} + 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: 8790384775043777065} + m_Father: {fileID: 3888891624253089110} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -30} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6962063838870746438 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945339375210407726} + m_CullTransparentMesh: 1 +--- !u!114 &8415865168405216229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945339375210407726} + 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: c7ef1b7221f0b5b4f94a1d2685ff92c2, 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: 2 +--- !u!114 &85074287532272251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945339375210407726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 50 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &3621329675117078169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945339375210407726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3c9d341c4bc7de548937508e6f837144, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8415865168405216229} + toggleTransition: 0 + graphic: {fileID: 0} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 0 + m_MinHeight: 18 + m_MinWidth: 40 --- !u!1 &1952684284530658331 GameObject: m_ObjectHideFlags: 0 @@ -4341,8 +4785,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 410632297286541511} - - component: {fileID: 2211573112566837551} - - component: {fileID: 6496299567958227602} - component: {fileID: 5781299685099380431} m_Layer: 5 m_Name: Scroll View @@ -4358,57 +4800,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2888065190704870309} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1791322888632655903} - m_Father: {fileID: 5615362378397233016} + m_Father: {fileID: 7807712691439818562} 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: 400} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 880, y: 80} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2211573112566837551 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2888065190704870309} - m_CullTransparentMesh: 1 ---- !u!114 &6496299567958227602 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2888065190704870309} - m_Enabled: 0 - 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: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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!114 &5781299685099380431 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4539,6 +4943,142 @@ MonoBehaviour: m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &2951363277751388748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5131651199607829273} + - component: {fileID: 5578153311190590570} + - component: {fileID: 2677835477394781866} + m_Layer: 5 + m_Name: KeyText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5131651199607829273 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951363277751388748} + 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: 1039721586360569850} + 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: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5578153311190590570 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951363277751388748} + m_CullTransparentMesh: 1 +--- !u!114 &2677835477394781866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951363277751388748} + 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: E + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 36 + m_fontSizeBase: 36 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &2958656382474301032 GameObject: m_ObjectHideFlags: 0 @@ -6536,6 +7076,439 @@ MonoBehaviour: _selectedImage: {fileID: 362652815281007987} _highlightedColor: {r: 1, g: 1, b: 1, a: 0.19607843} _selectedSfxName: SelectedButton01 +--- !u!1 &4200268634060053151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4433936681926280011} + - component: {fileID: 8806817459023457707} + - component: {fileID: 9201807593392285670} + m_Layer: 5 + m_Name: KeyEPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4433936681926280011 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4200268634060053151} + 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: 1039721586360569850} + - {fileID: 290108948241752577} + m_Father: {fileID: 6027631196813621015} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 462.00998, y: -35} + m_SizeDelta: {x: 124.8, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8806817459023457707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4200268634060053151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &9201807593392285670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4200268634060053151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &4212667024870430911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8821734039056801808} + - component: {fileID: 9060815902601146790} + - component: {fileID: 3710159224700249911} + - component: {fileID: 1207698055515049695} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8821734039056801808 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4212667024870430911} + 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: 3888891624253089110} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 92.759995, y: -30} + m_SizeDelta: {x: 65.52, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9060815902601146790 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4212667024870430911} + m_CullTransparentMesh: 1 +--- !u!114 &3710159224700249911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4212667024870430911} + 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: "\uB2E4\uC74C" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!114 &1207698055515049695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4212667024870430911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7 + m_TableEntryReference: + m_KeyId: 13642850919841792 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3710159224700249911} + m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro + m_MethodName: set_text + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 + references: + version: 2 + RefIds: [] +--- !u!1 &4253581069941728644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4841013803479721482} + - component: {fileID: 5197895642369450441} + - component: {fileID: 4035271401228829513} + - component: {fileID: 159512051685302825} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4841013803479721482 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4253581069941728644} + 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: 782217958273666457} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 92.045, y: -30} + m_SizeDelta: {x: 64.09, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5197895642369450441 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4253581069941728644} + m_CullTransparentMesh: 1 +--- !u!114 &4035271401228829513 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4253581069941728644} + 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: "\uC774\uC804" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!114 &159512051685302825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4253581069941728644} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7 + m_TableEntryReference: + m_KeyId: 13642850898870272 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4035271401228829513} + m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro + m_MethodName: set_text + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 + references: + version: 2 + RefIds: [] --- !u!1 &4274622425349367766 GameObject: m_ObjectHideFlags: 0 @@ -6632,6 +7605,44 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &4322288740481648975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7807712691439818562} + m_Layer: 5 + m_Name: TogglePanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7807712691439818562 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4322288740481648975} + 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: 910614227131204694} + - {fileID: 93539670018348197} + - {fileID: 410632297286541511} + m_Father: {fileID: 5615362378397233016} + 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: 400} + m_SizeDelta: {x: 1000, y: 80} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4327469554350876183 GameObject: m_ObjectHideFlags: 0 @@ -6871,6 +7882,71 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4367487208628297890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6027631196813621015} + - component: {fileID: 851498089424094376} + m_Layer: 5 + m_Name: KeyPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6027631196813621015 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4367487208628297890} + 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: 782217958273666457} + - {fileID: 3888891624253089110} + - {fileID: 4433936681926280011} + m_Father: {fileID: 5615362378397233016} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &851498089424094376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4367487208628297890} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 50 + m_Right: 0 + m_Top: 0 + m_Bottom: 30 + m_ChildAlignment: 3 + m_Spacing: 50 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &4431534473259728903 GameObject: m_ObjectHideFlags: 0 @@ -7248,6 +8324,85 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_AlphaFadeSpeed: 0.15 +--- !u!1 &4713976562249665386 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 782217958273666457} + - component: {fileID: 2650021704988355676} + - component: {fileID: 3710445852674308258} + m_Layer: 5 + m_Name: KeyAPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &782217958273666457 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4713976562249665386} + 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: 6026972614650954365} + - {fileID: 4841013803479721482} + m_Father: {fileID: 6027631196813621015} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 112.045, y: -35} + m_SizeDelta: {x: 124.09, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2650021704988355676 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4713976562249665386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &3710445852674308258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4713976562249665386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &4798327847585280952 GameObject: m_ObjectHideFlags: 0 @@ -8065,6 +9220,85 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5265682283131194282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3888891624253089110} + - component: {fileID: 3163838286795861988} + - component: {fileID: 5638775387712129693} + m_Layer: 5 + m_Name: KeyDPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3888891624253089110 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5265682283131194282} + 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: 1428936733988020838} + - {fileID: 8821734039056801808} + m_Father: {fileID: 6027631196813621015} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 286.84998, y: -35} + m_SizeDelta: {x: 125.51999, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3163838286795861988 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5265682283131194282} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &5638775387712129693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5265682283131194282} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &5453501309530702932 GameObject: m_ObjectHideFlags: 0 @@ -8141,7 +9375,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 263.525, y: -220} - m_SizeDelta: {x: 0, y: 60} + m_SizeDelta: {x: 172.95, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &9180586790238432773 CanvasRenderer: @@ -8262,6 +9496,183 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &5531191608704228592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 290108948241752577} + - component: {fileID: 9217886272368364008} + - component: {fileID: 6747784428043067184} + - component: {fileID: 777421396893044123} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &290108948241752577 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5531191608704228592} + 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: 4433936681926280011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 92.4, y: -30} + m_SizeDelta: {x: 64.8, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9217886272368364008 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5531191608704228592} + m_CullTransparentMesh: 1 +--- !u!114 &6747784428043067184 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5531191608704228592} + 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: "\uD655\uC778" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!114 &777421396893044123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5531191608704228592} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7 + m_TableEntryReference: + m_KeyId: 667711001395200 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6747784428043067184} + m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro + m_MethodName: set_text + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 + references: + version: 2 + RefIds: [] --- !u!1 &5727961872225020776 GameObject: m_ObjectHideFlags: 0 @@ -8867,6 +10278,142 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6000253408901276686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8790384775043777065} + - component: {fileID: 6428572629190016195} + - component: {fileID: 1369642837069219684} + m_Layer: 5 + m_Name: KeyText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8790384775043777065 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6000253408901276686} + 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: 1428936733988020838} + 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: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6428572629190016195 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6000253408901276686} + m_CullTransparentMesh: 1 +--- !u!114 &1369642837069219684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6000253408901276686} + 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: D + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 36 + m_fontSizeBase: 36 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &6054079044142495115 GameObject: m_ObjectHideFlags: 0 @@ -10561,6 +12108,7 @@ GameObject: m_Component: - component: {fileID: 6448125349934981781} - component: {fileID: 5742109014411104933} + - component: {fileID: 7531489255347431265} m_Layer: 5 m_Name: ButtonContents m_TagString: Untagged @@ -10586,7 +12134,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_SizeDelta: {x: -720, y: 80} m_Pivot: {x: 0, y: 1} --- !u!114 &5742109014411104933 MonoBehaviour: @@ -10612,6 +12160,20 @@ MonoBehaviour: m_Spacing: {x: 20, y: 0} m_Constraint: 2 m_ConstraintCount: 1 +--- !u!114 &7531489255347431265 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6797207180545739620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &6803395611905984505 GameObject: m_ObjectHideFlags: 0 @@ -10810,6 +12372,142 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &6887699561283733736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2779194275478552841} + - component: {fileID: 1223128256694701908} + - component: {fileID: 7840260991305453004} + m_Layer: 5 + m_Name: KeyText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2779194275478552841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6887699561283733736} + 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: 6026972614650954365} + 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: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1223128256694701908 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6887699561283733736} + m_CullTransparentMesh: 1 +--- !u!114 &7840260991305453004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6887699561283733736} + 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: A + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 36 + m_fontSizeBase: 36 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &6990643379758234813 GameObject: m_ObjectHideFlags: 0 @@ -12045,10 +13743,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 910614227131204694} - - {fileID: 93539670018348197} - - {fileID: 410632297286541511} + - {fileID: 7807712691439818562} - {fileID: 1819717237836237387} + - {fileID: 6027631196813621015} m_Father: {fileID: 7869185857112310372} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -12562,11 +14259,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _tutorialPanel: {fileID: 7483265235863153638} + _togglePanel: {fileID: 4322288740481648975} + _scrollRect: {fileID: 5781299685099380431} _buttonContents: {fileID: 6448125349934981781} _tutorialPopupUiContents: {fileID: 1819717237836237387} + _keyAPanel: {fileID: 4713976562249665386} + _keyDPanel: {fileID: 5265682283131194282} + _keyEPanel: {fileID: 4200268634060053151} _tutorialPageToggle: {fileID: 722696753693917626, guid: 4f5ae3c4e3e2d014ab0c1f8336189c58, type: 3} _tutorialPopupUi: {fileID: 6663804084001025864, guid: b6b8408f432f9d043bd8dbfe38e419aa, type: 3} _tutorialSo: {fileID: 11400000, guid: 409afbfab40779a4abf64756763265d0, type: 2} + _tutorialLinks: [] + _currentTutorialLink: + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: [] + k__BackingField: 0 --- !u!1 &7939965459843172077 GameObject: m_ObjectHideFlags: 0 @@ -12607,7 +14315,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 309.5, y: -330} - m_SizeDelta: {x: 0, y: 60} + m_SizeDelta: {x: 81, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1470126346877250000 CanvasRenderer: @@ -13073,17 +14781,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8203191465248375533} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 8217434853052334112} - m_Father: {fileID: 5615362378397233016} + m_Father: {fileID: 7807712691439818562} 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: 470, y: 390} + m_AnchoredPosition: {x: 470, y: -10} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6807858264659512333 @@ -13347,7 +15055,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 263.525, y: -110} - m_SizeDelta: {x: 0, y: 60} + m_SizeDelta: {x: 172.95, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &80049197063144741 CanvasRenderer: @@ -14054,17 +15762,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8896206665725204534} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2974537153288850476} - m_Father: {fileID: 5615362378397233016} + m_Father: {fileID: 7807712691439818562} 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: -470, y: 390} + m_AnchoredPosition: {x: -470, y: -10} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5320871554609888152 diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonTutorialPopupUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonTutorialPopupUi.prefab index 892a01ea6..af97fad1c 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonTutorialPopupUi.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonTutorialPopupUi.prefab @@ -364,10 +364,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ba9784e695ed7541b83a7ba1abc6322, type: 3} m_Name: m_EditorClassIdentifier: + _popupImage: {fileID: 7646635641658828703} _titleText: {fileID: 8689142317051947403} + _descriptionTextRect: {fileID: 8058949667021111035} _descriptionText: {fileID: 6974469971681953221} + _descriptionTImageRect: {fileID: 1278368319364570773} _descriptionImage: {fileID: 1623653273502312062} _pageText: {fileID: 6555518522208864136} + _descriptionTextAnchorPositionInFirst: {x: 0, y: -37, z: 0} + _descriptionTextAnchorPositionExceptFirst: {x: 0, y: -280, z: 0} + _descriptionImageAnchorPositionInFirst: {x: 0, y: -210, z: 0} + _descriptionImageAnchorPositionExceptFirst: {x: 0, y: -150, z: 0} --- !u!1 &6641577588875726565 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/13.Localization/StringDataTable.csv b/Assets/13.Localization/StringDataTable.csv index ac4e503aa..2591d7e2d 100644 --- a/Assets/13.Localization/StringDataTable.csv +++ b/Assets/13.Localization/StringDataTable.csv @@ -255,3 +255,5 @@ TutorialTitleH,펌프,Pump,水泵,水泵,ポンプ,Bomba,Насос,Pompe TutorialTitleI,특별한 보물 상자,Special Treasure Chest,特殊宝箱,特殊寶箱,特別な宝箱,Cofre del Tesoro Especial,Особый сундук с сокровищами,Coffre au Trésor Spécial TutorialTitleJ,재료 조합,Ingredient Combination,材料组合,材料組合,材料の組み合わせ,Combinación de Ingredientes,Комбинация ингредиентов,Combinaison d'Ingrédients HowToPlay,플레이 방법,How To Play,遊戲方法,游戏方法,遊び方,Cómo Jugar,Как Играть,Comment Jouer +Previous,이전,Previous,上一个,上一個,前へ (まえへ),Anterior," Предыдущий",Précédent +Next,다음,Next,下一个," 下一個"," 次へ (つぎへ)"," Siguiente"," Следующий",Suivant diff --git a/Assets/13.Localization/Tables/StringDataTable Shared Data.asset b/Assets/13.Localization/Tables/StringDataTable Shared Data.asset index 3ad1b6f03..7059932a9 100644 --- a/Assets/13.Localization/Tables/StringDataTable Shared Data.asset +++ b/Assets/13.Localization/Tables/StringDataTable Shared Data.asset @@ -679,6 +679,14 @@ MonoBehaviour: m_Key: HowToPlay m_Metadata: m_Items: [] + - m_Id: 13642850898870272 + m_Key: Previous + m_Metadata: + m_Items: [] + - m_Id: 13642850919841792 + m_Key: Next + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/13.Localization/Tables/StringDataTable_en.asset b/Assets/13.Localization/Tables/StringDataTable_en.asset index bbd53a2ce..f15ef2eea 100644 --- a/Assets/13.Localization/Tables/StringDataTable_en.asset +++ b/Assets/13.Localization/Tables/StringDataTable_en.asset @@ -725,6 +725,14 @@ MonoBehaviour: m_Localized: Ingredient Combination m_Metadata: m_Items: [] + - m_Id: 13642850898870272 + m_Localized: Previous + m_Metadata: + m_Items: [] + - m_Id: 13642850919841792 + m_Localized: Next + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/13.Localization/Tables/StringDataTable_es-ES.asset b/Assets/13.Localization/Tables/StringDataTable_es-ES.asset index efd15e969..966c965fc 100644 --- a/Assets/13.Localization/Tables/StringDataTable_es-ES.asset +++ b/Assets/13.Localization/Tables/StringDataTable_es-ES.asset @@ -719,6 +719,14 @@ MonoBehaviour: m_Localized: "Combinaci\xF3n de Ingredientes" m_Metadata: m_Items: [] + - m_Id: 13642850898870272 + m_Localized: Anterior + m_Metadata: + m_Items: [] + - m_Id: 13642850919841792 + m_Localized: "\tSiguiente" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/13.Localization/Tables/StringDataTable_fr.asset b/Assets/13.Localization/Tables/StringDataTable_fr.asset index 08eb609de..01a803e44 100644 --- a/Assets/13.Localization/Tables/StringDataTable_fr.asset +++ b/Assets/13.Localization/Tables/StringDataTable_fr.asset @@ -724,6 +724,14 @@ MonoBehaviour: m_Localized: "Combinaison d'Ingr\xE9dients" m_Metadata: m_Items: [] + - m_Id: 13642850898870272 + m_Localized: "Pr\xE9c\xE9dent" + m_Metadata: + m_Items: [] + - m_Id: 13642850919841792 + m_Localized: Suivant + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/13.Localization/Tables/StringDataTable_ja.asset b/Assets/13.Localization/Tables/StringDataTable_ja.asset index ddad540c7..171995d9f 100644 --- a/Assets/13.Localization/Tables/StringDataTable_ja.asset +++ b/Assets/13.Localization/Tables/StringDataTable_ja.asset @@ -689,6 +689,14 @@ MonoBehaviour: m_Localized: "\u6750\u6599\u306E\u7D44\u307F\u5408\u308F\u305B" m_Metadata: m_Items: [] + - m_Id: 13642850898870272 + m_Localized: "\u524D\u3078 (\u307E\u3048\u3078)" + m_Metadata: + m_Items: [] + - m_Id: 13642850919841792 + m_Localized: "\t\u6B21\u3078 (\u3064\u304E\u3078)" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/13.Localization/Tables/StringDataTable_ko.asset b/Assets/13.Localization/Tables/StringDataTable_ko.asset index 1898c8874..d06c5dbe4 100644 --- a/Assets/13.Localization/Tables/StringDataTable_ko.asset +++ b/Assets/13.Localization/Tables/StringDataTable_ko.asset @@ -760,6 +760,14 @@ MonoBehaviour: m_Localized: "\uC7AC\uB8CC \uC870\uD569" m_Metadata: m_Items: [] + - m_Id: 13642850898870272 + m_Localized: "\uC774\uC804" + m_Metadata: + m_Items: [] + - m_Id: 13642850919841792 + m_Localized: "\uB2E4\uC74C" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/13.Localization/Tables/StringDataTable_ru.asset b/Assets/13.Localization/Tables/StringDataTable_ru.asset index 85954e0d4..49cbf093d 100644 --- a/Assets/13.Localization/Tables/StringDataTable_ru.asset +++ b/Assets/13.Localization/Tables/StringDataTable_ru.asset @@ -907,6 +907,14 @@ MonoBehaviour: m_Localized: "\u041A\u043E\u043C\u0431\u0438\u043D\u0430\u0446\u0438\u044F \u0438\u043D\u0433\u0440\u0435\u0434\u0438\u0435\u043D\u0442\u043E\u0432" m_Metadata: m_Items: [] + - m_Id: 13642850898870272 + m_Localized: "\t\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0438\u0439" + m_Metadata: + m_Items: [] + - m_Id: 13642850919841792 + m_Localized: "\t\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/13.Localization/Tables/StringDataTable_zh-Hans.asset b/Assets/13.Localization/Tables/StringDataTable_zh-Hans.asset index d4b9c85fc..fcd30d754 100644 --- a/Assets/13.Localization/Tables/StringDataTable_zh-Hans.asset +++ b/Assets/13.Localization/Tables/StringDataTable_zh-Hans.asset @@ -685,6 +685,14 @@ MonoBehaviour: m_Localized: "\u6750\u6599\u7EC4\u5408" m_Metadata: m_Items: [] + - m_Id: 13642850898870272 + m_Localized: "\u4E0A\u4E00\u4E2A" + m_Metadata: + m_Items: [] + - m_Id: 13642850919841792 + m_Localized: "\u4E0B\u4E00\u4E2A" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/13.Localization/Tables/StringDataTable_zh-Hant.asset b/Assets/13.Localization/Tables/StringDataTable_zh-Hant.asset index 3179c783a..e2eb49e49 100644 --- a/Assets/13.Localization/Tables/StringDataTable_zh-Hant.asset +++ b/Assets/13.Localization/Tables/StringDataTable_zh-Hant.asset @@ -685,6 +685,14 @@ MonoBehaviour: m_Localized: "\u6750\u6599\u7D44\u5408" m_Metadata: m_Items: [] + - m_Id: 13642850898870272 + m_Localized: "\u4E0A\u4E00\u500B" + m_Metadata: + m_Items: [] + - m_Id: 13642850919841792 + m_Localized: "\t\u4E0B\u4E00\u500B" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index a0da37ad1..cf78280fc 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 8e0a3b4ef79b6b240a41c854861466bc m_currentHash: serializedVersion: 2 - Hash: 752e2ffa415f639560376d023f23f4fe + Hash: 00000000000000000000000000000000 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/Resources/Excel/~$LevelDataTable.xlsx.meta b/Assets/Resources/Excel/~$LevelDataTable.xlsx.meta new file mode 100644 index 000000000..0a1efe1a7 --- /dev/null +++ b/Assets/Resources/Excel/~$LevelDataTable.xlsx.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 91c4c233d1371764f92eb6575e9000f7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: