Skip to content

Commit

Permalink
Planter boxes tinkered with
Browse files Browse the repository at this point in the history
  • Loading branch information
xxxtlgxxx committed Aug 20, 2024
1 parent 8fdf3be commit e61066a
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 30 deletions.
38 changes: 19 additions & 19 deletions Assets/Prefabs/Balcony.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Transform:
m_GameObject: {fileID: 694864813262027994}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 2, z: 0}
m_LocalPosition: {x: 0, y: 2, z: 15}
m_LocalScale: {x: 4, y: 4, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -167,7 +167,7 @@ Transform:
m_GameObject: {fileID: 1892988468506331080}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.20249987, y: -0.25700003, z: 0}
m_LocalPosition: {x: -0.20249987, y: -0.25700003, z: 15}
m_LocalScale: {x: 0.25, y: 0.25, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -359,7 +359,7 @@ Transform:
m_GameObject: {fileID: 3310829007094402125}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.16061258, z: 0}
m_LocalPosition: {x: 0, y: -0.16061258, z: 15}
m_LocalScale: {x: 0.56, y: 0.3298, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -405,7 +405,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 100
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 0.21345346, g: 0.6754716, b: 0.17205401, a: 1}
m_FlipX: 0
Expand Down Expand Up @@ -474,7 +474,7 @@ Transform:
m_GameObject: {fileID: 4827125125704224067}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.16061258, z: 0}
m_LocalPosition: {x: 0, y: -0.16061258, z: 15}
m_LocalScale: {x: 0.56, y: 0.3298, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -520,7 +520,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 100
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 0.6792453, g: 0.18986283, b: 0, a: 1}
m_FlipX: 0
Expand Down Expand Up @@ -558,7 +558,7 @@ Transform:
m_GameObject: {fileID: 4856988803589969594}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 15}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -638,7 +638,7 @@ Transform:
m_GameObject: {fileID: 4865033375174845822}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.16061258, z: 0}
m_LocalPosition: {x: 0, y: -0.16061258, z: 15}
m_LocalScale: {x: 0.56, y: 0.3298, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -684,7 +684,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 30
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 0.21345346, g: 0.6754716, b: 0.17205401, a: 1}
m_FlipX: 0
Expand Down Expand Up @@ -832,7 +832,7 @@ Transform:
m_GameObject: {fileID: 5301034053863408981}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.16061258, z: 0}
m_LocalPosition: {x: 0, y: -0.16061258, z: 15}
m_LocalScale: {x: 0.56, y: 0.3298, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -878,7 +878,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 100
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 0.6792453, g: 0.18986283, b: 0, a: 1}
m_FlipX: 0
Expand Down Expand Up @@ -915,7 +915,7 @@ Transform:
m_GameObject: {fileID: 5428500544517241335}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.00999999, z: 0}
m_LocalPosition: {x: 0, y: 0.00999999, z: 15}
m_LocalScale: {x: 1, y: 0.3298, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -1139,7 +1139,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 100
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 0.6895644, g: 0.90943396, b: 0.6777857, a: 1}
m_FlipX: 0
Expand Down Expand Up @@ -1177,7 +1177,7 @@ Transform:
m_GameObject: {fileID: 6559942125639856361}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.16061258, z: 0}
m_LocalPosition: {x: 0, y: -0.16061258, z: 15}
m_LocalScale: {x: 0.56, y: 0.3298, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -1223,7 +1223,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 100
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 0.6792453, g: 0.18986283, b: 0, a: 1}
m_FlipX: 0
Expand Down Expand Up @@ -1261,7 +1261,7 @@ Transform:
m_GameObject: {fileID: 7271356666873455231}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.16061258, z: 0}
m_LocalPosition: {x: 0, y: -0.16061258, z: 15}
m_LocalScale: {x: 0.56, y: 0.3298, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -1307,7 +1307,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 100
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 0.21345346, g: 0.6754716, b: 0.17205401, a: 1}
m_FlipX: 0
Expand Down Expand Up @@ -1429,7 +1429,7 @@ Transform:
m_GameObject: {fileID: 8429444618200748305}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.362, z: -1}
m_LocalPosition: {x: 0, y: -0.362, z: 15}
m_LocalScale: {x: 0.89, y: 0.0538, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -1475,7 +1475,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 10
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/Prefabs/Tiles/Balcony.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ Transform:
m_GameObject: {fileID: 5707488040799474971}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 15}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -524,7 +524,7 @@ Transform:
m_GameObject: {fileID: 6145106966939438652}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 15}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Tiles/Planter Box.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Transform:
m_GameObject: {fileID: 4656692425353838017}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 15}
m_LocalScale: {x: 0.25, y: 0.25, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down
28 changes: 20 additions & 8 deletions Assets/Scenes/Planter_test Jeager.unity
Original file line number Diff line number Diff line change
Expand Up @@ -2153,6 +2153,10 @@ PrefabInstance:
propertyPath: m_Name
value: Home
objectReference: {fileID: 0}
- target: {fileID: 1630719329031074243, guid: 6711c6a4b7b92fe45a0b96adf5ada9df, type: 3}
propertyPath: m_LocalPosition.z
value: 15
objectReference: {fileID: 0}
- target: {fileID: 2379951828109064342, guid: 6711c6a4b7b92fe45a0b96adf5ada9df, type: 3}
propertyPath: _isUnlockedByDefault
value: 1
Expand Down Expand Up @@ -2213,6 +2217,14 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4263264092683441732, guid: 6711c6a4b7b92fe45a0b96adf5ada9df, type: 3}
propertyPath: m_SortingOrder
value: 15
objectReference: {fileID: 0}
- target: {fileID: 7802135901436773983, guid: 6711c6a4b7b92fe45a0b96adf5ada9df, type: 3}
propertyPath: m_SortingOrder
value: 7
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
Expand Down Expand Up @@ -3664,7 +3676,6 @@ Transform:
- {fileID: 474032337}
- {fileID: 1889669281}
- {fileID: 1207671004}
- {fileID: 1118494615}
- {fileID: 1652670926}
- {fileID: 1578970747}
- {fileID: 1640796948}
Expand Down Expand Up @@ -3988,7 +3999,7 @@ Transform:
m_GameObject: {fileID: 1001579515}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.4447, y: 24.9, z: 0}
m_LocalPosition: {x: -1.4447, y: 24.9, z: -10}
m_LocalScale: {x: 0.53119093, y: 0.53119093, z: 0.53119093}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -4449,7 +4460,7 @@ Transform:
m_GameObject: {fileID: 1112695636}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.4419284, y: -4.6268396, z: 0.045382656}
m_LocalPosition: {x: -2.4419284, y: -4.6268396, z: 0}
m_LocalScale: {x: 0.3129472, y: 0.3129472, z: 0.3129472}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -4632,11 +4643,11 @@ Transform:
m_GameObject: {fileID: 1118494614}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.8680716, y: -1.2168398, z: 0.045382656}
m_LocalPosition: {x: -1.8400002, y: 12.04, z: 0}
m_LocalScale: {x: 0.29924744, y: 0.29924744, z: 0.29924744}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 900642748}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1118494616
SpriteRenderer:
Expand Down Expand Up @@ -4782,7 +4793,7 @@ Transform:
m_GameObject: {fileID: 1207671003}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.8680716, y: -4.5468397, z: 0.045382656}
m_LocalPosition: {x: 2.8680716, y: -4.5468397, z: -9}
m_LocalScale: {x: 0.29924744, y: 0.29924744, z: 0.29924744}
m_ConstrainProportionsScale: 1
m_Children: []
Expand Down Expand Up @@ -5364,7 +5375,7 @@ Transform:
m_GameObject: {fileID: 1401906835}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 5.048072, y: -4.6268396, z: 0.045382656}
m_LocalPosition: {x: 5.048072, y: -4.6268396, z: 16}
m_LocalScale: {x: 0.3129472, y: 0.3129472, z: 0.3129472}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -6608,7 +6619,7 @@ Transform:
m_GameObject: {fileID: 1673901241}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -7.01, y: 8.68, z: 0}
m_LocalPosition: {x: -7.01, y: 8.68, z: -5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -9168,3 +9179,4 @@ SceneRoots:
- {fileID: 502862376}
- {fileID: 1269639628}
- {fileID: 1001579517}
- {fileID: 1118494615}

0 comments on commit e61066a

Please sign in to comment.