diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 925e04d6..cdccb6f8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -121,30 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &20629752 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 3665723643790057849} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &40183829 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 609410911} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &414580708 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916834121473269, guid: caaa748dbeed576499e8cae74d33f689, @@ -252,7 +228,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1796633949} - - {fileID: 1187654216} m_Father: {fileID: 2082561918} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -306,255 +281,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &609410911 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1187654216} - m_Modifications: - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.4 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_Name - value: Meter (4) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} ---- !u!4 &609410912 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 609410911} - m_PrefabAsset: {fileID: 0} ---- !u!114 &652597343 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 1076949532} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &814288039 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 1914907653} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &1042957342 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1187654216} - m_Modifications: - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.x - value: -1.4 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_Name - value: Meter (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} ---- !u!4 &1042957343 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 1042957342} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1076949532 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1187654216} - m_Modifications: - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.x - value: 4.2 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_Name - value: Meter (6) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} ---- !u!4 &1076949533 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 1076949532} - m_PrefabAsset: {fileID: 0} --- !u!1 &1122085163 GameObject: m_ObjectHideFlags: 0 @@ -663,219 +389,6 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 2.56, y: 2.24} m_EdgeRadius: 0 ---- !u!1001 &1153742598 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1187654216} - m_Modifications: - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_Name - value: Meter (3) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} ---- !u!4 &1153742599 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 1153742598} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1187654215 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1187654216} - - component: {fileID: 1187654217} - m_Layer: 0 - m_Name: StockMeter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1187654216 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187654215} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1916097752} - - {fileID: 1914907654} - - {fileID: 1042957343} - - {fileID: 1153742599} - - {fileID: 609410912} - - {fileID: 1298499618} - - {fileID: 1076949533} - m_Father: {fileID: 590848657} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -1.45} - m_SizeDelta: {x: 0, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1187654217 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187654215} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b2128b8291184b39b7956c18a5fb6fb1, type: 3} - m_Name: - m_EditorClassIdentifier: - tankStockViews: - - {fileID: 20629752} - - {fileID: 814288039} - - {fileID: 1896548482} - - {fileID: 1695639488} - - {fileID: 40183829} - - {fileID: 1685784269} - - {fileID: 652597343} ---- !u!1001 &1298499617 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1187654216} - m_Modifications: - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.x - value: 2.8 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_Name - value: Meter (5) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} ---- !u!4 &1298499618 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 1298499617} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1328732174 PrefabInstance: m_ObjectHideFlags: 0 @@ -962,30 +475,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 9117079082731140882} m_PrefabAsset: {fileID: 0} ---- !u!114 &1685784269 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 1298499617} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1695639488 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 1153742598} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1796633948 GameObject: m_ObjectHideFlags: 0 @@ -1178,7 +667,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: cookingButton: {fileID: 414580708} - tankListView: {fileID: 1187654217} --- !u!4 &1870432534 Transform: m_ObjectHideFlags: 0 @@ -1211,99 +699,6 @@ MonoBehaviour: coinPrefab: {fileID: 0} duration: 0.5 rootTransform: {fileID: 0} ---- !u!114 &1896548482 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 1042957342} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &1914907653 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1187654216} - m_Modifications: - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.x - value: -2.8 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_Name - value: Meter (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} ---- !u!4 &1914907654 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 1914907653} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1916097752 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - m_PrefabInstance: {fileID: 3665723643790057849} - m_PrefabAsset: {fileID: 0} --- !u!1 &2001111209 GameObject: m_ObjectHideFlags: 0 @@ -1998,80 +1393,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &3665723643790057849 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1187654216} - m_Modifications: - - target: {fileID: 3072131335653526340, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.x - value: -4.2 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3665723641945798062, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, - type: 3} - propertyPath: m_Name - value: Meter - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, type: 3} --- !u!1001 &3915769149207111994 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index c0337b39..763fc876 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -9,14 +9,12 @@ using UnityEngine.UI; public class KitchenManager : MonoBehaviour { [SerializeField] private Button cookingButton; - [SerializeField] private TankListView tankListView; // Start is called before the first frame update void Start() { // レシピの表示 cookingButton.OnClickAsObservable().Subscribe(_ => { - // TransitionManager.Instance.LoadScene(GameScenes.Cooking); TransitionManager.Instance.LoadSceneAdditive(GameScenes.Recipe); }); @@ -28,9 +26,6 @@ public class KitchenManager : MonoBehaviour SetData(); - // 在庫表示 - tankListView.SetTanksView(gameData.StorageTanks); - Market.StockFlavorLog(); } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs deleted file mode 100644 index b2d48d9d..00000000 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -public class TankListView : MonoBehaviour -{ - [SerializeField] private List tankStockViews; - - public void SetTanksView(List tanks) - { - var tankCount = tanks.Count; - var index = 0; - foreach (var tankView in tankStockViews) - { - if (index >= tankCount) - { - tankView.SetTankRelease(false); - continue; - } - tankView.SetTankRelease(true); - tankView.SetStock(tanks[index]); - index++; - } - } -} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs.meta deleted file mode 100644 index f79f9f25..00000000 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: b2128b8291184b39b7956c18a5fb6fb1 -timeCreated: 1628640207 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs deleted file mode 100644 index 7e4a58cb..00000000 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using UnityEngine; -using Random = UnityEngine.Random; - -public class TankStockView : MonoBehaviour -{ - [SerializeField] private SpriteRenderer popcornImage; - [SerializeField] private GameObject unreleaseObject; - [SerializeField] private float maxPosision = 0.16f; - [SerializeField] private float minPosision = -0.8f; - - public void SetTankRelease(bool released) - { - unreleaseObject.SetActive(!released); - } - - public void SetStock(StorageTank tank) - { - var newPos = popcornImage.transform.localPosition; - newPos.y = Mathf.Lerp(minPosision, maxPosision, (float) tank.Stock / tank.Capacity); - popcornImage.transform.localPosition = newPos; - } -} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs.meta deleted file mode 100644 index 1b4dec9f..00000000 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 50f3afa8df704ba79774a15424a573e3 -timeCreated: 1628584275 \ No newline at end of file