Changes to cement Factory, adjusting colliders and sprite orders.
This commit is contained in:
@@ -119,17 +119,6 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!114 &14324897 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1273721449607275699, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
m_PrefabInstance: {fileID: 7905701319677686381}
|
||||
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!1 &18882508
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -314853,33 +314842,6 @@ SpriteRenderer:
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &959043612 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7734932022557956073, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
m_PrefabInstance: {fileID: 7905701319677686381}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!95 &959043616
|
||||
Animator:
|
||||
serializedVersion: 7
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 959043612}
|
||||
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 &964051269
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -316701,11 +316663,6 @@ SpriteRenderer:
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &1132513019 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7820936471920159333, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
m_PrefabInstance: {fileID: 7905701319677686381}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1133819592
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -317381,84 +317338,6 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1795319160942683320, guid: 0d3410fed4070304a98dea321427e2ce, type: 3}
|
||||
m_PrefabInstance: {fileID: 1713626488053205516}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1181730029
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1181730030}
|
||||
- component: {fileID: 1181730031}
|
||||
m_Layer: 6
|
||||
m_Name: FireCollider
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1181730030
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1181730029}
|
||||
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: 1375798238}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!61 &1181730031
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1181730029}
|
||||
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 &1187962677
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -319080,76 +318959,17 @@ SpriteRenderer:
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &1375798233 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8449696027466354713, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
--- !u!114 &1375798237 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 6489000226021644401, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
m_PrefabInstance: {fileID: 7905701319677686381}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1375798237
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1375798233}
|
||||
m_GameObject: {fileID: 0}
|
||||
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: 14324897}
|
||||
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: 14324897}
|
||||
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: 14324897}
|
||||
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!4 &1375798238 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1858988612203349957, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
m_PrefabInstance: {fileID: 7905701319677686381}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1376662052
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -324825,33 +324645,34 @@ PolygonCollider2D:
|
||||
m_AutoTiling: 0
|
||||
m_Points:
|
||||
m_Paths:
|
||||
- - {x: 5.1603775, y: 9.15213}
|
||||
- - {x: 5.558792, y: 1.5056305}
|
||||
- {x: 5.634819, y: 9.816341}
|
||||
- {x: -1.4506226, y: 10.259354}
|
||||
- {x: -7.042984, y: 10.330727}
|
||||
- {x: -11.682144, y: 8.493572}
|
||||
- {x: -16.233465, y: 7.2538795}
|
||||
- {x: -14.16739, y: -3.3433266}
|
||||
- {x: -4.6087246, y: -1.3820684}
|
||||
- {x: 5.262885, y: 0.44875717}
|
||||
- - {x: 16.549332, y: -0.20000458}
|
||||
- {x: 13.6491165, y: 0.6376343}
|
||||
- {x: 10.780769, y: 2.898857}
|
||||
- {x: 10.705847, y: -2.0886574}
|
||||
- {x: 13.973121, y: -4.546749}
|
||||
- {x: 20.966578, y: -8.284489}
|
||||
- {x: 17.112373, y: -13.2230835}
|
||||
- {x: 5.667816, y: -14.541885}
|
||||
- {x: -5.273979, y: -12.866203}
|
||||
- {x: -10.769512, y: -8.253792}
|
||||
- {x: -11.311192, y: -12.148888}
|
||||
- {x: -8.517841, y: -16.091797}
|
||||
- {x: -20.455954, y: 4.3123703}
|
||||
- {x: -20.002964, y: -3.6754265}
|
||||
- {x: -5.0357037, y: -2.2835042}
|
||||
- {x: 1.5148306, y: -0.16801071}
|
||||
- - {x: 20.202492, y: 1.8875198}
|
||||
- {x: 16.021309, y: 4.1010246}
|
||||
- {x: 9.357468, y: 4.654274}
|
||||
- {x: 8.286215, y: -1.7091026}
|
||||
- {x: 12.075377, y: -5.8751717}
|
||||
- {x: 12.4741535, y: -9.138477}
|
||||
- {x: 12.083336, y: -11.183006}
|
||||
- {x: 7.9925537, y: -13.972557}
|
||||
- {x: -2.7120209, y: -13.055977}
|
||||
- {x: -11.291389, y: -10.625977}
|
||||
- {x: -21.226925, y: -15.422501}
|
||||
- {x: -11.886345, y: -23.872566}
|
||||
- {x: 5.0315323, y: -18.689537}
|
||||
- {x: 22.162643, y: -18.383507}
|
||||
- {x: 28.232323, y: -15.105881}
|
||||
- {x: 32.255585, y: -11.937599}
|
||||
- {x: 33.718163, y: -5.045006}
|
||||
- {x: 28.311745, y: -3.074852}
|
||||
- {x: 21.134857, y: -1.6411095}
|
||||
- {x: 24.788017, y: 0.25663376}
|
||||
m_UseDelaunayMesh: 1
|
||||
--- !u!4 &1919655035 stripped
|
||||
Transform:
|
||||
@@ -328449,7 +328270,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1816788760757037215, guid: 3ed87deee75bd9d4d9333a40985f72d4, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 1
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4242724393814467592, guid: 3ed87deee75bd9d4d9333a40985f72d4, type: 3}
|
||||
propertyPath: m_Layer
|
||||
@@ -328580,10 +328401,10 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1273721449607275699, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: defaultState
|
||||
value:
|
||||
objectReference: {fileID: 1132513019}
|
||||
- target: {fileID: 493545673386787611, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.34
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1858988612203349957, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 14.9
|
||||
@@ -328624,83 +328445,38 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1894409461576830929, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 2
|
||||
- target: {fileID: 1956914018515899935, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.94000673
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3361120543057640041, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 1
|
||||
- target: {fileID: 3710532830876431655, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 4.080006
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3361120543057640041, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SpriteSortPoint
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3765717546524301025, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4674201271356961382, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5080334300755413102, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6589275206185622890, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6946602780561593393, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6946602780561593393, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SpriteSortPoint
|
||||
value: 1
|
||||
- target: {fileID: 5765639000691195263, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5.09
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7191082675790375086, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7532330125638373726, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 2
|
||||
- target: {fileID: 7631956394112206992, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 5.620007
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7734932022557956073, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7820936471920159333, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7986806546510998358, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8449696027466354713, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: CardPrintingMachine
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8464798714393773146, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 1858988612203349957, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1181730030}
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 8449696027466354713, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1375798237}
|
||||
- targetCorrespondingSourceObject: {fileID: 7734932022557956073, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 959043616}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
|
||||
--- !u!1001 &7974433369916253896
|
||||
PrefabInstance:
|
||||
|
||||
Reference in New Issue
Block a user