Move container logic to use inheritence and move logic around.
Also fix the clear counter spawning items, next I'm going to implament the logic for placing food onto them instead.
This commit is contained in:
parent
234e00cb9b
commit
44837c6c13
21 changed files with 1478 additions and 397 deletions
|
|
@ -1,115 +1,91 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &5911868891692506302
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1024188629140685204}
|
||||
m_Layer: 0
|
||||
m_Name: CounterTopPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1024188629140685204
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5911868891692506302}
|
||||
m_LocalRotation: {x: -0, y: 0.999996, z: -0, w: -0.0028347075}
|
||||
m_LocalPosition: {x: 0, y: 1.3, z: 0}
|
||||
m_LocalScale: {x: 0.99999976, y: 1, z: 0.99999976}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6371086230447438899}
|
||||
m_RootOrder: -1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &6869097019740516189
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6371086230447438899}
|
||||
- component: {fileID: 190913029279232345}
|
||||
- component: {fileID: 7837983985068458341}
|
||||
m_Layer: 6
|
||||
m_Name: ClearCounter
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &6371086230447438899
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6869097019740516189}
|
||||
m_LocalRotation: {x: -0, y: -0.999996, z: -0, w: -0.0028347075}
|
||||
m_LocalPosition: {x: -0.000021893527, y: 0, z: 3.0077405}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 3231759315905380366}
|
||||
- {fileID: 4409201660398974582}
|
||||
- {fileID: 1024188629140685204}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -180.325, z: 0}
|
||||
--- !u!65 &190913029279232345
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6869097019740516189}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 1.5, y: 1.5, z: 1.5}
|
||||
m_Center: {x: 0, y: 0.5, z: 0}
|
||||
--- !u!114 &7837983985068458341
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6869097019740516189}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bb159edc225081c408fe7a01d52732e4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tomatoPrefab: {fileID: 2446150686974603219, guid: cb38d4874f4f7c34e85414e72902704c,
|
||||
type: 3}
|
||||
counterTopPoint: {fileID: 1024188629140685204}
|
||||
--- !u!1001 &180516218137596637
|
||||
--- !u!1001 &1734168299195426923
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 6371086230447438899}
|
||||
m_TransformParent: {fileID: 1005032900244154635}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4589716710238282922, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ClearCounter_Visual
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0004cb1e11ad014419b943c7da960724, type: 3}
|
||||
--- !u!4 &2855550335523753152 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1734168299195426923}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2594104119648024423
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1005032900244154635}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3984833892277163771, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
|
|
@ -213,116 +189,155 @@ PrefabInstance:
|
|||
- targetCorrespondingSourceObject: {fileID: 4589716710238282922, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 6941436636027395465}
|
||||
addedObject: {fileID: 2306022452363298275}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0004cb1e11ad014419b943c7da960724, type: 3}
|
||||
--- !u!4 &4409201660398974582 stripped
|
||||
--- !u!4 &1995632245453493196 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 180516218137596637}
|
||||
m_PrefabInstance: {fileID: 2594104119648024423}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4409201660398974583 stripped
|
||||
--- !u!1 &1995632245453493197 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4589716710238282922, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 180516218137596637}
|
||||
m_PrefabInstance: {fileID: 2594104119648024423}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &6941436636027395465
|
||||
--- !u!114 &2306022452363298275
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4409201660398974583}
|
||||
m_GameObject: {fileID: 1995632245453493197}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6b8e4c74ab1ad4b4a8c3676f33904e52, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
clearCounter: {fileID: 7837983985068458341}
|
||||
visualGameObject: {fileID: 8596996214292255122}
|
||||
--- !u!1 &8596996214292255122 stripped
|
||||
baseCounter: {fileID: 4015805876386331469}
|
||||
visualGameObjectArray:
|
||||
- {fileID: 5895181103151592488}
|
||||
--- !u!1 &5895181103151592488 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8489276541531669327, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 180516218137596637}
|
||||
m_PrefabInstance: {fileID: 2594104119648024423}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1398491922627355813
|
||||
--- !u!1001 &6167746977889097016
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 6371086230447438899}
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4589716710238282922, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ClearCounter_Visual
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
value: -0.0028347075
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
value: -0.999996
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
value: -180.325
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
- 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: ClearCounter
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0004cb1e11ad014419b943c7da960724, type: 3}
|
||||
--- !u!4 &3231759315905380366 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4589716710238282923, guid: 0004cb1e11ad014419b943c7da960724,
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2855550335523753152}
|
||||
- targetCorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1995632245453493196}
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 6869097019740516189, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 4015805876386331469}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 509501a557d1d0a45817fb7332917dd5, type: 3}
|
||||
--- !u!1 &777946716258335333 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6869097019740516189, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1398491922627355813}
|
||||
m_PrefabInstance: {fileID: 6167746977889097016}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &4015805876386331469
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 777946716258335333}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bb159edc225081c408fe7a01d52732e4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
kitchenObjectSO: {fileID: 11400000, guid: 38de64e72d766a34c82d1ef83d41c98d, type: 2}
|
||||
counterTopPoint: {fileID: 6606388211444700332}
|
||||
--- !u!4 &1005032900244154635 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6167746977889097016}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &6606388211444700332 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1024188629140685204, guid: 509501a557d1d0a45817fb7332917dd5,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6167746977889097016}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
Reference in a new issue