Skip to content

Commit ac4cd4b

Browse files
Merge pull request #1411 from playmint/rotations-fix
Fix ducks and building rotation
2 parents 622fc2b + a6e3120 commit ac4cd4b

File tree

4 files changed

+19
-18
lines changed

4 files changed

+19
-18
lines changed

.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@
2121
/contracts/node_modules/
2222
/contracts/lib/cog/services/
2323
!/contracts/lib/cog/services/schema/
24+
/map/ProjectSettings/ScriptableBuildPipeline.json

frontend/src/components/map/Buildings.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const Buildings = memo(
7575
const coords = getCoords(b.location.tile);
7676
const height = getTileHeightFromCoords(coords);
7777
const selected = selectedElementID === b.id ? 'outline' : 'none';
78-
const rotation = b.facingDirection == FacingDirectionKind.RIGHT ? -30 : 30;
78+
const rotation = b.facingDirection && b.facingDirection == FacingDirectionKind.LEFT ? 30 : -30;
7979
const tile = tiles.find(({ id }) => id === b.location?.tile.id);
8080
const overrideModel = (pluginBuildingProperties || [])
8181
.find((prop) => prop.id == b.id && prop.key == 'model')

map/Assets/Addressables/DisplayBuilding/DisplayBuildingMapElement.prefab

+7-7
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ PrefabInstance:
449449
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
450450
type: 3}
451451
propertyPath: m_LocalPosition.x
452-
value: 0.038
452+
value: 0.0043643117
453453
objectReference: {fileID: 0}
454454
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
455455
type: 3}
@@ -459,27 +459,27 @@ PrefabInstance:
459459
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
460460
type: 3}
461461
propertyPath: m_LocalPosition.z
462-
value: 0
462+
value: 0.05016914
463463
objectReference: {fileID: 0}
464464
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
465465
type: 3}
466466
propertyPath: m_LocalRotation.w
467-
value: 0
467+
value: 0.70710576
468468
objectReference: {fileID: 0}
469469
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
470470
type: 3}
471471
propertyPath: m_LocalRotation.x
472-
value: 0
472+
value: -0
473473
objectReference: {fileID: 0}
474474
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
475475
type: 3}
476476
propertyPath: m_LocalRotation.y
477-
value: 1
477+
value: 0.70710784
478478
objectReference: {fileID: 0}
479479
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
480480
type: 3}
481481
propertyPath: m_LocalRotation.z
482-
value: 0
482+
value: -0
483483
objectReference: {fileID: 0}
484484
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
485485
type: 3}
@@ -489,7 +489,7 @@ PrefabInstance:
489489
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
490490
type: 3}
491491
propertyPath: m_LocalEulerAnglesHint.y
492-
value: 180
492+
value: 90
493493
objectReference: {fileID: 0}
494494
- target: {fileID: 2481613906286960452, guid: 249851de4fb29b548ae1f53ad9c8dcb7,
495495
type: 3}

map/Assets/Addressables/FactoryBuilding/FactoryBuilding_2.0/Roof_04.prefab

+10-10
Original file line numberDiff line numberDiff line change
@@ -135,22 +135,22 @@ PrefabInstance:
135135
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
136136
type: 3}
137137
propertyPath: m_LocalRotation.w
138-
value: 1
138+
value: 0.7071068
139139
objectReference: {fileID: 0}
140140
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
141141
type: 3}
142142
propertyPath: m_LocalRotation.x
143-
value: -0
143+
value: 0
144144
objectReference: {fileID: 0}
145145
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
146146
type: 3}
147147
propertyPath: m_LocalRotation.y
148-
value: -0
148+
value: -0.7071068
149149
objectReference: {fileID: 0}
150150
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
151151
type: 3}
152152
propertyPath: m_LocalRotation.z
153-
value: -0
153+
value: 0
154154
objectReference: {fileID: 0}
155155
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
156156
type: 3}
@@ -160,7 +160,7 @@ PrefabInstance:
160160
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
161161
type: 3}
162162
propertyPath: m_LocalEulerAnglesHint.y
163-
value: 0
163+
value: -90
164164
objectReference: {fileID: 0}
165165
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
166166
type: 3}
@@ -241,22 +241,22 @@ PrefabInstance:
241241
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
242242
type: 3}
243243
propertyPath: m_LocalRotation.w
244-
value: 1
244+
value: 0.7071068
245245
objectReference: {fileID: 0}
246246
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
247247
type: 3}
248248
propertyPath: m_LocalRotation.x
249-
value: -0
249+
value: 0
250250
objectReference: {fileID: 0}
251251
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
252252
type: 3}
253253
propertyPath: m_LocalRotation.y
254-
value: -0
254+
value: -0.7071068
255255
objectReference: {fileID: 0}
256256
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
257257
type: 3}
258258
propertyPath: m_LocalRotation.z
259-
value: -0
259+
value: 0
260260
objectReference: {fileID: 0}
261261
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
262262
type: 3}
@@ -266,7 +266,7 @@ PrefabInstance:
266266
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
267267
type: 3}
268268
propertyPath: m_LocalEulerAnglesHint.y
269-
value: 0
269+
value: -90
270270
objectReference: {fileID: 0}
271271
- target: {fileID: -8679921383154817045, guid: 39ef6f0947a150742b03acab7789bd28,
272272
type: 3}

0 commit comments

Comments
 (0)