Changes to cement Factory, adjusting colliders and sprite orders.

This commit is contained in:
2025-12-16 15:18:28 +01:00
parent c7630b32bb
commit 1e56520367
7 changed files with 635 additions and 355 deletions

View File

@@ -71,25 +71,23 @@ MonoBehaviour:
slottedItemRenderers:
- renderer: {fileID: 4363732810493563330}
assignedItem: {fileID: 11400000, guid: f5a6df00a3840924a8e5b5052a8c9b05, type: 2}
displayType: 0
- renderer: {fileID: 4765283125670404640}
assignedItem: {fileID: 11400000, guid: 0f94d1cbd3735424ea37b6125154ed37, type: 2}
displayType: 0
- renderer: {fileID: 6453868228671073978}
assignedItem: {fileID: 11400000, guid: d0e8554a0463a924e803732e9209c92a, type: 2}
displayType: 0
- renderer: {fileID: 5502334101811892095}
assignedItem: {fileID: 11400000, guid: 45c190ffad50b994ba53f64a9838751d, type: 2}
displayType: 0
onItemSlotted:
m_PersistentCalls:
m_Calls: []
onItemSlotRemoved:
m_PersistentCalls:
m_Calls: []
onCorrectItemSlotted:
m_PersistentCalls:
m_Calls: []
onIncorrectItemSlotted:
m_PersistentCalls:
m_Calls: []
onForbiddenItemSlotted:
onWrongItemAttempted:
m_PersistentCalls:
m_Calls: []
--- !u!212 &1311388821310946158
@@ -379,6 +377,84 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
m_SpriteSortPoint: 0
--- !u!1 &2887399999982874339
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7564470332554766137}
- component: {fileID: 6132420137009971689}
m_Layer: 6
m_Name: FireCollider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7564470332554766137
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2887399999982874339}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 10.1, y: -19.33, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1858988612203349957}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &6132420137009971689
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2887399999982874339}
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Size: {x: 7, y: 4}
m_EdgeRadius: 0
--- !u!1 &2889622702591889868
GameObject:
m_ObjectHideFlags: 0
@@ -618,6 +694,7 @@ GameObject:
- component: {fileID: 1858988612203349957}
- component: {fileID: 8107165993532415765}
- component: {fileID: 122742907268588378}
- component: {fileID: 6489000226021644401}
m_Layer: 6
m_Name: CardPrintingMachineInteractable
m_TagString: Untagged
@@ -640,6 +717,7 @@ Transform:
m_Children:
- {fileID: 4355942933543779535}
- {fileID: 8474381535300328579}
- {fileID: 7564470332554766137}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &8107165993532415765
@@ -710,6 +788,66 @@ BoxCollider2D:
m_AutoTiling: 0
m_Size: {x: 52.7, y: 4.48}
m_EdgeRadius: 0
--- !u!114 &6489000226021644401
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8449696027466354713}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalReceiver
m_Events:
m_Signals:
- {fileID: 11400000, guid: 624acdeeb1ef5d041945271eb29fb68f, type: 2}
- {fileID: 11400000, guid: 50cc58e8ee01bf841a920508fe336516, type: 2}
- {fileID: 11400000, guid: fc40e2ad40f81aa4595bdf7a53dc58b3, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1273721449607275699}
m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts
m_MethodName: ChangeState
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: Exploding
m_BoolArgument: 0
m_CallState: 2
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1273721449607275699}
m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts
m_MethodName: ChangeState
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: Broken
m_BoolArgument: 0
m_CallState: 2
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1273721449607275699}
m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts
m_MethodName: ChangeState
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: Working
m_BoolArgument: 0
m_CallState: 2
--- !u!1001 &3311950488448821222
PrefabInstance:
m_ObjectHideFlags: 0
@@ -718,6 +856,14 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1858988612203349957}
m_Modifications:
- target: {fileID: 239658593309924751, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SortingOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 239658593309924751, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SpriteSortPoint
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1262417946682301225, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_LocalScale.x
value: 1.2
@@ -774,25 +920,139 @@ PrefabInstance:
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1852366222342304007, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2200039860192678593, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_LocalPosition.y
value: 4.080006
objectReference: {fileID: 0}
- target: {fileID: 3083594724729558494, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_Name
value: CardMachine
objectReference: {fileID: 0}
- target: {fileID: 3111710571448952061, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_LocalPosition.y
value: 0.34
objectReference: {fileID: 0}
- target: {fileID: 3953654171218162169, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_LocalPosition.y
value: 0.94000673
objectReference: {fileID: 0}
- target: {fileID: 4016122581718493239, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4349144095261672277, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: defaultState
value:
objectReference: {fileID: 7820936471920159333}
- target: {fileID: 4719742874103500163, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4837076380432796848, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4907884058974367606, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_LocalPosition.y
value: 5.620007
objectReference: {fileID: 0}
- target: {fileID: 5007544549737395896, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5089514919501508623, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5589287127171019735, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SortingOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5589287127171019735, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SpriteSortPoint
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5637859103962238792, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6381434641084294076, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7743535260057350024, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7865660038021731712, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8540979423276956300, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 9076375528679299737, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
propertyPath: m_LocalPosition.y
value: 5.09
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 5089514919501508623, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
insertIndex: -1
addedObject: {fileID: 7872244739155912846}
m_SourcePrefab: {fileID: 100100000, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
--- !u!114 &1273721449607275699 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4349144095261672277, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
m_PrefabInstance: {fileID: 3311950488448821222}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6f56763d30b94bf6873d395a6c116eb5, type: 3}
m_Name:
m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleMachine
--- !u!4 &4355942933543779535 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1262417946682301225, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
m_PrefabInstance: {fileID: 3311950488448821222}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7734932022557956073 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5089514919501508623, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
m_PrefabInstance: {fileID: 3311950488448821222}
m_PrefabAsset: {fileID: 0}
--- !u!95 &7872244739155912846
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7734932022557956073}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &7820936471920159333 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4719742874103500163, guid: 1d1ea4e9a24d36a4795ac6ff0301bbb7, type: 3}
m_PrefabInstance: {fileID: 3311950488448821222}
m_PrefabAsset: {fileID: 0}