DamianBranch #76

Merged
damian merged 4 commits from DamianBranch into main 2025-12-05 14:50:25 +00:00
69 changed files with 5277 additions and 272 deletions
Showing only changes of commit 82b1a1e78c - Show all commits

View File

@@ -2353,11 +2353,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &231233378 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8253899898826930916, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
m_PrefabInstance: {fileID: 2643697864013042755}
m_PrefabAsset: {fileID: 0}
--- !u!1 &237315295
GameObject:
m_ObjectHideFlags: 0
@@ -5651,68 +5646,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &584426257
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1645280574}
m_Modifications:
- target: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
propertyPath: m_LocalPosition.x
value: 29.42
objectReference: {fileID: 0}
- target: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
propertyPath: m_LocalPosition.y
value: 58.74
objectReference: {fileID: 0}
- target: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5051952955007952309, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
propertyPath: m_Name
value: Box_E (8)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
--- !u!4 &584426258 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
m_PrefabInstance: {fileID: 584426257}
m_PrefabAsset: {fileID: 0}
--- !u!1 &588889195
GameObject:
m_ObjectHideFlags: 0
@@ -320504,68 +320437,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1343096875615152793, guid: ff5ce55321520324ba6db2066ea13bb8, type: 3}
m_PrefabInstance: {fileID: 1439077070}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1452632539
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1546183199}
m_Modifications:
- target: {fileID: 3818379547293037242, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
propertyPath: m_LocalPosition.x
value: -13.34
objectReference: {fileID: 0}
- target: {fileID: 3818379547293037242, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
propertyPath: m_LocalPosition.y
value: 59.68
objectReference: {fileID: 0}
- target: {fileID: 3818379547293037242, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3818379547293037242, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3818379547293037242, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3818379547293037242, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3818379547293037242, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3818379547293037242, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3818379547293037242, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3818379547293037242, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4141318507414723518, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
propertyPath: m_Name
value: Cement_D (4)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
--- !u!4 &1452632540 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3818379547293037242, guid: 9055555feb1e1504db61eb744be6a766, type: 3}
m_PrefabInstance: {fileID: 1452632539}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1454705326 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 125184620464971558, guid: 45448de839107bb428f04b0e29ce1456, type: 3}
@@ -321797,7 +321668,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1720345874487436519, guid: 241aa2c50380dfe408fd30f947456ea5, type: 3}
propertyPath: m_LocalPosition.y
value: 57.46
value: 78.76
objectReference: {fileID: 0}
- target: {fileID: 1720345874487436519, guid: 241aa2c50380dfe408fd30f947456ea5, type: 3}
propertyPath: m_LocalPosition.z
@@ -321906,7 +321777,6 @@ Transform:
- {fileID: 1552090288}
- {fileID: 1499238197}
- {fileID: 1677912927}
- {fileID: 1452632540}
- {fileID: 1840606103}
- {fileID: 1300830843}
- {fileID: 1509725170}
@@ -322943,12 +322813,10 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1950060642}
- {fileID: 1554010874}
- {fileID: 157456463}
- {fileID: 1816944013}
- {fileID: 1413352184}
- {fileID: 231233378}
- {fileID: 1513223384}
- {fileID: 1875985225}
- {fileID: 842096508}
@@ -322970,7 +322838,6 @@ Transform:
- {fileID: 137734307}
- {fileID: 1314772817}
- {fileID: 895584635}
- {fileID: 584426258}
- {fileID: 136958178}
- {fileID: 1211592621}
- {fileID: 637261722}
@@ -325387,11 +325254,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1950060642 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 969572930157133558, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
m_PrefabInstance: {fileID: 505344293318133598}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1967539169
GameObject:
m_ObjectHideFlags: 0
@@ -325865,7 +325727,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7265392889702705666, guid: af1b6add1597d7641be62eb674b63a86, type: 3}
propertyPath: m_LocalPosition.y
value: 59.6
value: 80.9
objectReference: {fileID: 0}
- target: {fileID: 7265392889702705666, guid: af1b6add1597d7641be62eb674b63a86, type: 3}
propertyPath: m_LocalPosition.z
@@ -327129,63 +326991,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &505344293318133598
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1645280574}
m_Modifications:
- target: {fileID: 782510930290658401, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
propertyPath: m_Name
value: Box_A
objectReference: {fileID: 0}
- target: {fileID: 969572930157133558, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
propertyPath: m_LocalPosition.x
value: 30.49
objectReference: {fileID: 0}
- target: {fileID: 969572930157133558, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
propertyPath: m_LocalPosition.y
value: 60.23
objectReference: {fileID: 0}
- target: {fileID: 969572930157133558, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 969572930157133558, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 969572930157133558, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 969572930157133558, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 969572930157133558, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 969572930157133558, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 969572930157133558, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 969572930157133558, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e1688e628a75d604cb8a5d3d2e353b7d, type: 3}
--- !u!1001 &1059980105740828160
PrefabInstance:
m_ObjectHideFlags: 0
@@ -327593,6 +327398,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 458415185846848580, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_SortingOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 522809001399822766, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_Name
value: ForkLiftInteraction
@@ -327613,6 +327422,22 @@ PrefabInstance:
propertyPath: m_Sprite
value:
objectReference: {fileID: -772091242, guid: d031465f6fdffcd49b08f24a89b92062, type: 3}
- target: {fileID: 3242836565465984131, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.x
value: -0.89
objectReference: {fileID: 0}
- target: {fileID: 3242836565465984131, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.y
value: -4.94
objectReference: {fileID: 0}
- target: {fileID: 3672810868019658564, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.x
value: 1.78
objectReference: {fileID: 0}
- target: {fileID: 3672810868019658564, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.y
value: -1.31
objectReference: {fileID: 0}
- target: {fileID: 3785502661120159249, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.x
value: -15.05
@@ -327685,6 +327510,14 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5057217536574039096, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.x
value: 19.64
objectReference: {fileID: 0}
- target: {fileID: 5057217536574039096, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.y
value: -4.35
objectReference: {fileID: 0}
- target: {fileID: 5377715489692883818, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_Name
value: WalkingWorker
@@ -327737,13 +327570,29 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7338175006250910518, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.x
value: -1.7800006
objectReference: {fileID: 0}
- target: {fileID: 7338175006250910518, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.y
value: 1.3100004
objectReference: {fileID: 0}
- target: {fileID: 7488072885374278401, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: fd49be538e07fb744860136761ab144f, type: 2}
- target: {fileID: 7508847384281937588, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.x
value: 1.55
objectReference: {fileID: 0}
- target: {fileID: 7508847384281937588, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.y
value: 2.31
objectReference: {fileID: 0}
- target: {fileID: 7558457198582461538, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.x
value: 42.43
value: 37.66
objectReference: {fileID: 0}
- target: {fileID: 7558457198582461538, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.y
@@ -327793,6 +327642,14 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: -7.54
objectReference: {fileID: 0}
- target: {fileID: 7842440814220139303, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.x
value: 0.05
objectReference: {fileID: 0}
- target: {fileID: 7842440814220139303, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.y
value: -2.18
objectReference: {fileID: 0}
- target: {fileID: 7848397806898645977, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.x
value: 3.2799988
@@ -327867,63 +327724,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5e789e15196d7d047887aa7721288637, type: 3}
--- !u!1001 &2643697864013042755
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1645280574}
m_Modifications:
- target: {fileID: 4141500550345959506, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
propertyPath: m_Name
value: Box_B
objectReference: {fileID: 0}
- target: {fileID: 8253899898826930916, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
propertyPath: m_LocalPosition.x
value: 30.02
objectReference: {fileID: 0}
- target: {fileID: 8253899898826930916, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
propertyPath: m_LocalPosition.y
value: 62.43
objectReference: {fileID: 0}
- target: {fileID: 8253899898826930916, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8253899898826930916, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8253899898826930916, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8253899898826930916, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8253899898826930916, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8253899898826930916, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8253899898826930916, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8253899898826930916, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5423e77fe4f5df342a943203a4072e8d, type: 3}
--- !u!1001 &3817275161224707557
PrefabInstance:
m_ObjectHideFlags: 0