diff --git a/.erp b/.erp index ff1c754..d9792bb 100644 --- a/.erp +++ b/.erp @@ -5,7 +5,7 @@ false false true - 1677628481 + 1677629650 8006271043655199372 false \ No newline at end of file diff --git a/Assets/Prefabs/Counter/TrashCounter.prefab b/Assets/Prefabs/Counter/TrashCounter.prefab new file mode 100644 index 0000000..77b1443 --- /dev/null +++ b/Assets/Prefabs/Counter/TrashCounter.prefab @@ -0,0 +1,332 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &536337449265068504 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.0028347075 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.999996 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180.325 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6869097019740516189, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_Name + value: TrashCounter + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5125247152357100535} + - targetCorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8032291724589720095} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6869097019740516189, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2790575735805069350} + m_SourcePrefab: {fileID: 100100000, guid: 509501a557d1d0a45817fb7332917dd5, type: 3} +--- !u!4 &668734174257100876 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1024188629140685204, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + m_PrefabInstance: {fileID: 536337449265068504} + m_PrefabAsset: {fileID: 0} +--- !u!1 &6350809166314804869 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6869097019740516189, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + m_PrefabInstance: {fileID: 536337449265068504} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2790575735805069350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6350809166314804869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 584348b5b586ab44d81c2da9bdcca354, type: 3} + m_Name: + m_EditorClassIdentifier: + counterTopPoint: {fileID: 668734174257100876} +--- !u!4 &6853301306222527979 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + m_PrefabInstance: {fileID: 536337449265068504} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5821357456698607284 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6853301306222527979} + m_Modifications: + - target: {fileID: 4589716710238282922, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_Name + value: Selected + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalScale.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalScale.y + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalScale.z + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7880980075579474333, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8529292057493577800, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 1a0afd856a35421469b28b916116fd9c, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4589716710238282922, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1841437090180478593} + m_SourcePrefab: {fileID: 100100000, guid: c4e141bc61e807b4b832b850d92f5fd7, type: 3} +--- !u!1 &4438086721876199209 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7880980075579474333, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + m_PrefabInstance: {fileID: 5821357456698607284} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8032291724589720094 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4589716710238282922, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + m_PrefabInstance: {fileID: 5821357456698607284} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1841437090180478593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8032291724589720094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b8e4c74ab1ad4b4a8c3676f33904e52, type: 3} + m_Name: + m_EditorClassIdentifier: + baseCounter: {fileID: 2790575735805069350} + visualGameObjectArray: + - {fileID: 4438086721876199209} +--- !u!4 &8032291724589720095 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + m_PrefabInstance: {fileID: 5821357456698607284} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8687859462137884508 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6853301306222527979} + m_Modifications: + - target: {fileID: 4589716710238282922, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_Name + value: TrashCounter_Visual + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c4e141bc61e807b4b832b850d92f5fd7, type: 3} +--- !u!4 &5125247152357100535 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4589716710238282923, guid: c4e141bc61e807b4b832b850d92f5fd7, + type: 3} + m_PrefabInstance: {fileID: 8687859462137884508} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Counter/TrashCounter.prefab.meta b/Assets/Prefabs/Counter/TrashCounter.prefab.meta new file mode 100644 index 0000000..f5e0299 --- /dev/null +++ b/Assets/Prefabs/Counter/TrashCounter.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dcc374f2f4a690540874e0afc4c73531 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GaneScene.unity b/Assets/Scenes/GaneScene.unity index b44be75..525457d 100644 --- a/Assets/Scenes/GaneScene.unity +++ b/Assets/Scenes/GaneScene.unity @@ -203,6 +203,95 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3bfdb3694a8dc7c4bb11c56dc2ff30f8, type: 3} +--- !u!1001 &78671168 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 369744370} + m_Modifications: + - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_Name + value: ClearCounter (9) + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.x + value: 7.75 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.z + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.w + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.000008988169 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -359.999 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3695181730978947652, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.25 + objectReference: {fileID: 0} + - target: {fileID: 3695181730978947652, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.0000044940844 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} +--- !u!4 &78671169 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 78671168} + m_PrefabAsset: {fileID: 0} --- !u!1001 &100998660 PrefabInstance: m_ObjectHideFlags: 0 @@ -573,8 +662,12 @@ Transform: - {fileID: 176917312} - {fileID: 1434749041} - {fileID: 1194811187} + - {fileID: 1329055551} + - {fileID: 2078814028} + - {fileID: 78671169} + - {fileID: 1617745536} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &392963849 GameObject: @@ -642,7 +735,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &408182761 GameObject: @@ -768,7 +861,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &410087042 MonoBehaviour: @@ -1039,7 +1132,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &763156967 PrefabInstance: @@ -1234,7 +1327,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &974939165 GameObject: @@ -1268,7 +1361,7 @@ Transform: - {fileID: 1139635725} - {fileID: 408182762} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &974939167 MonoBehaviour: @@ -1693,8 +1786,87 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1329055550 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 369744370} + m_Modifications: + - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_Name + value: ClearCounter (7) + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.z + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.w + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.000008988169 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -359.999 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} +--- !u!4 &1329055551 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 1329055550} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1396109600 PrefabInstance: m_ObjectHideFlags: 0 @@ -1780,6 +1952,85 @@ Transform: type: 3} m_PrefabInstance: {fileID: 763156967} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1617745535 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 369744370} + m_Modifications: + - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_Name + value: ClearCounter (8) + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.x + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.z + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.w + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.000008988169 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -359.999 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} +--- !u!4 &1617745536 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 1617745535} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1705190436 PrefabInstance: m_ObjectHideFlags: 0 @@ -2020,7 +2271,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2112,6 +2363,79 @@ Transform: type: 3} m_PrefabInstance: {fileID: 654883703} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1989753350 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6350809166314804869, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_Name + value: TrashCounter + objectReference: {fileID: 0} + - target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_LocalPosition.x + value: 7.5 + objectReference: {fileID: 0} + - target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_LocalPosition.z + value: -3.5 + objectReference: {fileID: 0} + - target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.0028347075 + objectReference: {fileID: 0} + - target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.999996 + objectReference: {fileID: 0} + - target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180.325 + objectReference: {fileID: 0} + - target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dcc374f2f4a690540874e0afc4c73531, type: 3} --- !u!1001 &2012115357 PrefabInstance: m_ObjectHideFlags: 0 @@ -2185,6 +2509,85 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5a6d4a6a519334e4c80af11a89e73536, type: 3} +--- !u!1001 &2078814027 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 369744370} + m_Modifications: + - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_LocalPosition.x + value: 4.4999948 + objectReference: {fileID: 0} + - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_LocalPosition.z + value: -5.00769 + objectReference: {fileID: 0} + - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.99999726 + objectReference: {fileID: 0} + - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.0023566035 + objectReference: {fileID: 0} + - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -360.27 + objectReference: {fileID: 0} + - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3197933390074847600, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + propertyPath: m_Name + value: CuttingCounter (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, type: 3} +--- !u!4 &2078814028 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + m_PrefabInstance: {fileID: 2078814027} + m_PrefabAsset: {fileID: 0} --- !u!1 &2099865127 GameObject: m_ObjectHideFlags: 0 @@ -2255,5 +2658,5 @@ Transform: m_Children: - {fileID: 691696597} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 46, y: 0, z: 0} diff --git a/Assets/Scripts/Counters.meta b/Assets/Scripts/Counters.meta new file mode 100644 index 0000000..ab9316c --- /dev/null +++ b/Assets/Scripts/Counters.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e985fc15337d10f408fb1f75d30aeefc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/BaseCounter.cs b/Assets/Scripts/Counters/BaseCounter.cs similarity index 100% rename from Assets/Scripts/BaseCounter.cs rename to Assets/Scripts/Counters/BaseCounter.cs diff --git a/Assets/Scripts/BaseCounter.cs.meta b/Assets/Scripts/Counters/BaseCounter.cs.meta similarity index 100% rename from Assets/Scripts/BaseCounter.cs.meta rename to Assets/Scripts/Counters/BaseCounter.cs.meta diff --git a/Assets/Scripts/ClearCounter.cs b/Assets/Scripts/Counters/ClearCounter.cs similarity index 100% rename from Assets/Scripts/ClearCounter.cs rename to Assets/Scripts/Counters/ClearCounter.cs diff --git a/Assets/Scripts/ClearCounter.cs.meta b/Assets/Scripts/Counters/ClearCounter.cs.meta similarity index 100% rename from Assets/Scripts/ClearCounter.cs.meta rename to Assets/Scripts/Counters/ClearCounter.cs.meta diff --git a/Assets/Scripts/ContainerCounter.cs b/Assets/Scripts/Counters/ContainerCounter.cs similarity index 100% rename from Assets/Scripts/ContainerCounter.cs rename to Assets/Scripts/Counters/ContainerCounter.cs diff --git a/Assets/Scripts/ContainerCounter.cs.meta b/Assets/Scripts/Counters/ContainerCounter.cs.meta similarity index 100% rename from Assets/Scripts/ContainerCounter.cs.meta rename to Assets/Scripts/Counters/ContainerCounter.cs.meta diff --git a/Assets/Scripts/ContainerCounterVisual.cs b/Assets/Scripts/Counters/ContainerCounterVisual.cs similarity index 100% rename from Assets/Scripts/ContainerCounterVisual.cs rename to Assets/Scripts/Counters/ContainerCounterVisual.cs diff --git a/Assets/Scripts/ContainerCounterVisual.cs.meta b/Assets/Scripts/Counters/ContainerCounterVisual.cs.meta similarity index 100% rename from Assets/Scripts/ContainerCounterVisual.cs.meta rename to Assets/Scripts/Counters/ContainerCounterVisual.cs.meta diff --git a/Assets/Scripts/CuttingCounter.cs b/Assets/Scripts/Counters/CuttingCounter.cs similarity index 100% rename from Assets/Scripts/CuttingCounter.cs rename to Assets/Scripts/Counters/CuttingCounter.cs diff --git a/Assets/Scripts/CuttingCounter.cs.meta b/Assets/Scripts/Counters/CuttingCounter.cs.meta similarity index 100% rename from Assets/Scripts/CuttingCounter.cs.meta rename to Assets/Scripts/Counters/CuttingCounter.cs.meta diff --git a/Assets/Scripts/CuttingCounterVisual.cs b/Assets/Scripts/Counters/CuttingCounterVisual.cs similarity index 100% rename from Assets/Scripts/CuttingCounterVisual.cs rename to Assets/Scripts/Counters/CuttingCounterVisual.cs diff --git a/Assets/Scripts/CuttingCounterVisual.cs.meta b/Assets/Scripts/Counters/CuttingCounterVisual.cs.meta similarity index 100% rename from Assets/Scripts/CuttingCounterVisual.cs.meta rename to Assets/Scripts/Counters/CuttingCounterVisual.cs.meta diff --git a/Assets/Scripts/Counters/TrashCounter.cs b/Assets/Scripts/Counters/TrashCounter.cs new file mode 100644 index 0000000..0257300 --- /dev/null +++ b/Assets/Scripts/Counters/TrashCounter.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TrashCounter : BaseCounter +{ + public override void Interact(Player player) + { + if (player.HasKitchenObject()) + { + player.GetKitchenObject().DestroySelf(); + } + } +} diff --git a/Assets/Scripts/Counters/TrashCounter.cs.meta b/Assets/Scripts/Counters/TrashCounter.cs.meta new file mode 100644 index 0000000..103b14b --- /dev/null +++ b/Assets/Scripts/Counters/TrashCounter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 584348b5b586ab44d81c2da9bdcca354 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ScriptableObjects.meta b/Assets/Scripts/ScriptableObjects.meta new file mode 100644 index 0000000..b1b0155 --- /dev/null +++ b/Assets/Scripts/ScriptableObjects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: efcd31fcedb97f843abe4a9e68b25ce6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/CuttingRecipeSO.cs b/Assets/Scripts/ScriptableObjects/CuttingRecipeSO.cs similarity index 100% rename from Assets/Scripts/CuttingRecipeSO.cs rename to Assets/Scripts/ScriptableObjects/CuttingRecipeSO.cs diff --git a/Assets/Scripts/CuttingRecipeSO.cs.meta b/Assets/Scripts/ScriptableObjects/CuttingRecipeSO.cs.meta similarity index 100% rename from Assets/Scripts/CuttingRecipeSO.cs.meta rename to Assets/Scripts/ScriptableObjects/CuttingRecipeSO.cs.meta diff --git a/Assets/Scripts/KitchenObjectSO.cs b/Assets/Scripts/ScriptableObjects/KitchenObjectSO.cs similarity index 100% rename from Assets/Scripts/KitchenObjectSO.cs rename to Assets/Scripts/ScriptableObjects/KitchenObjectSO.cs diff --git a/Assets/Scripts/KitchenObjectSO.cs.meta b/Assets/Scripts/ScriptableObjects/KitchenObjectSO.cs.meta similarity index 100% rename from Assets/Scripts/KitchenObjectSO.cs.meta rename to Assets/Scripts/ScriptableObjects/KitchenObjectSO.cs.meta