fums/ofb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Sam 2023-05-06 23:59:14 -07:00
commit c2b9a2aa88
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/Scenes/Brasslands.unity
View File

@ -2174,8 +2174,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 75995289} m_GameObject: {fileID: 75995289}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.117, y: -7.5057, z: 0} m_LocalPosition: {x: -6.117, y: -7.5735, z: 0}
m_LocalScale: {x: 11.755, y: 14.772899, z: 10} m_LocalScale: {x: 11.755, y: 14.82717, z: 10}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: [] m_Children: []
m_Father: {fileID: 721142256} m_Father: {fileID: 721142256}
@ -8198,7 +8198,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 331950543} m_GameObject: {fileID: 331950543}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 81.77, y: -0.2, z: 0} m_LocalPosition: {x: 81.77, y: 0.23, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -8229,7 +8229,7 @@ MonoBehaviour:
xRight: 0 xRight: 0
movementVectorHorizontal: {x: 1, y: 0} movementVectorHorizontal: {x: 1, y: 0}
isVertical: 1 isVertical: 1
rangeVertical: 2 rangeVertical: 3
yUp: 0 yUp: 0
yDown: 0 yDown: 0
movementVectorVertical: {x: 0, y: 1} movementVectorVertical: {x: 0, y: 1}
@ -22845,7 +22845,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 889351563} m_GameObject: {fileID: 889351563}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 63.76, y: 9.81, z: 0} m_LocalPosition: {x: 63.76, y: 8.88, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -22876,7 +22876,7 @@ MonoBehaviour:
xRight: 0 xRight: 0
movementVectorHorizontal: {x: 1, y: 0} movementVectorHorizontal: {x: 1, y: 0}
isVertical: 1 isVertical: 1
rangeVertical: 1 rangeVertical: 2
yUp: 0 yUp: 0
yDown: 0 yDown: 0
movementVectorVertical: {x: 0, y: 1} movementVectorVertical: {x: 0, y: 1}
@ -43512,11 +43512,11 @@ MonoBehaviour:
xRight: 0 xRight: 0
movementVectorHorizontal: {x: 1, y: 0} movementVectorHorizontal: {x: 1, y: 0}
isVertical: 1 isVertical: 1
rangeVertical: 2 rangeVertical: 3
yUp: 0 yUp: 0
yDown: 0 yDown: 0
movementVectorVertical: {x: 0, y: 1} movementVectorVertical: {x: 0, y: 1}
moveSpeed: 2.5 moveSpeed: 3
isPlayingDefeatAnimation: 0 isPlayingDefeatAnimation: 0
--- !u!251 &1767761847 --- !u!251 &1767761847
PlatformEffector2D: PlatformEffector2D:
@ -50654,11 +50654,11 @@ MonoBehaviour:
xRight: 0 xRight: 0
movementVectorHorizontal: {x: 1, y: 0} movementVectorHorizontal: {x: 1, y: 0}
isVertical: 1 isVertical: 1
rangeVertical: 2 rangeVertical: 3
yUp: 0 yUp: 0
yDown: 0 yDown: 0
movementVectorVertical: {x: 0, y: 1} movementVectorVertical: {x: 0, y: 1}
moveSpeed: 2.5 moveSpeed: 2
isPlayingDefeatAnimation: 0 isPlayingDefeatAnimation: 0
--- !u!251 &2042660774 --- !u!251 &2042660774
PlatformEffector2D: PlatformEffector2D:

11
Assets/Scenes/GrenouilleVillage.unity
View File

@ -7124,6 +7124,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
pinned: 0 pinned: 0
pinnedTambourine: {fileID: 0}
isHorizontal: 1 isHorizontal: 1
rangeHorizontal: 4.48 rangeHorizontal: 4.48
xLeft: 1.57 xLeft: 1.57
@ -9096,6 +9097,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
pinned: 0 pinned: 0
pinnedTambourine: {fileID: 0}
isHorizontal: 1 isHorizontal: 1
rangeHorizontal: 0.7 rangeHorizontal: 0.7
xLeft: 2 xLeft: 2
@ -42116,6 +42118,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
pinned: 0 pinned: 0
pinnedTambourine: {fileID: 0}
isHorizontal: 1 isHorizontal: 1
rangeHorizontal: 1.21 rangeHorizontal: 1.21
xLeft: 0.03 xLeft: 0.03
@ -44947,6 +44950,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
pinned: 0 pinned: 0
pinnedTambourine: {fileID: 0}
isHorizontal: 1 isHorizontal: 1
rangeHorizontal: 2.03 rangeHorizontal: 2.03
xLeft: 0 xLeft: 0
@ -48029,6 +48033,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
pinned: 0 pinned: 0
pinnedTambourine: {fileID: 0}
isHorizontal: 1 isHorizontal: 1
rangeHorizontal: 1.21 rangeHorizontal: 1.21
xLeft: 0.03 xLeft: 0.03
@ -52246,9 +52251,9 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: -2 m_SortingOrder: -10
m_Sprite: {fileID: 21300000, guid: 22183c3d48b869f448732f46fda3b201, type: 3} m_Sprite: {fileID: 21300000, guid: 22183c3d48b869f448732f46fda3b201, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1} m_Color: {r: 1, g: 0.72156864, b: 0.41960785, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
m_DrawMode: 0 m_DrawMode: 0
@ -52688,6 +52693,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
pinned: 0 pinned: 0
pinnedTambourine: {fileID: 0}
isHorizontal: 1 isHorizontal: 1
rangeHorizontal: 2.03 rangeHorizontal: 2.03
xLeft: 0 xLeft: 0
@ -60661,6 +60667,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
pinned: 0 pinned: 0
pinnedTambourine: {fileID: 0}
isHorizontal: 1 isHorizontal: 1
rangeHorizontal: 0.59 rangeHorizontal: 0.59
xLeft: 0.03 xLeft: 0.03