diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index d94e904..6e2be6d 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -49,7 +49,7 @@ } - diff --git a/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png index 1f503aa..2184214 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png and b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png differ diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 81cb2ab..e0e4457 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -1992,9 +1992,9 @@ RectTransform: m_Father: {fileID: 1085729436} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -15.635, y: 15.416} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 15.139999, y: -15.584} m_SizeDelta: {x: 31.26941, y: 30.831497} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &370380621 @@ -2562,9 +2562,9 @@ RectTransform: m_Father: {fileID: 1756915504} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -15.635, y: -15.416} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 15.139999, y: -15.416} m_SizeDelta: {x: 31.26941, y: 30.831497} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &531419861 @@ -4566,9 +4566,9 @@ RectTransform: m_Father: {fileID: 370380620} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -65.744995, y: -0.0000066757} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 66.3, y: 0.0000076294} m_SizeDelta: {x: 69.4892, y: 25.6334} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1086516037 @@ -4627,7 +4627,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -4703,9 +4703,9 @@ RectTransform: m_Father: {fileID: 531419860} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -65.744995, y: -0.00000667572} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 65.744995, y: -0.00000667572} m_SizeDelta: {x: 69.4892, y: 25.6334} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1099173337 @@ -4764,7 +4764,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index ff4a1cf..4a49e76 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -83,6 +83,7 @@ +