diff --git a/popcorn/Assets/MyGame/Resources/MainCityBackground.meta b/popcorn/Assets/MyGame/Resources/MainCityBackground.meta new file mode 100644 index 00000000..2a314f84 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/MainCityBackground.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e13aeaadb44347141967cc230c47855c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index c76e997e..d253f8f8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -1404,7 +1404,7 @@ Transform: - {fileID: 251891027} - {fileID: 519190655} m_Father: {fileID: 2082561918} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &407927298 GameObject: @@ -4287,6 +4287,40 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1120804189 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1120804190} + m_Layer: 0 + m_Name: Kitchen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1120804190 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120804189} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2.81, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1122085164} + - {fileID: 2088316431} + - {fileID: 2082561918} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1122085163 GameObject: m_ObjectHideFlags: 0 @@ -4312,13 +4346,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1122085163} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.07, y: 2.6, z: 0.1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.07, y: -0.21000004, z: 0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2082561918} - m_RootOrder: 1 + m_Father: {fileID: 1120804190} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1122085165 SpriteRenderer: @@ -5979,19 +6013,6 @@ Transform: m_Father: {fileID: 1175036174} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1750992672 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1821652566} --- !u!1 &1760476833 GameObject: m_ObjectHideFlags: 0 @@ -6455,7 +6476,7 @@ MonoBehaviour: mGUI_ShowReferences: 0 mGUI_ShowTems: 1 mGUI_ShowCallback: 0 - mLocalizeTarget: {fileID: 1750992672} + mLocalizeTarget: {fileID: 0} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &1823553374 GameObject: @@ -7750,7 +7771,7 @@ GameObject: m_Component: - component: {fileID: 2082561918} m_Layer: 0 - m_Name: Kitchen + m_Name: egg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7763,16 +7784,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2082561917} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -2.81, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2001111210} - - {fileID: 1122085164} - {fileID: 382888005} - - {fileID: 2088316431} - m_Father: {fileID: 0} + m_Father: {fileID: 1120804190} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2088316430 @@ -7799,8 +7818,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2088316430} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.9769201, y: -3.46, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.9769201, y: -6.27, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -7811,8 +7830,8 @@ Transform: - {fileID: 876594163} - {fileID: 418169888} - {fileID: 1298571077} - m_Father: {fileID: 2082561918} - m_RootOrder: 3 + m_Father: {fileID: 1120804190} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2088316432 MonoBehaviour: