diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index e97bad1..d94e904 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/CoinTemp.blend b/FlufflParty/Assets/BlenderFiles/CoinTemp.blend index e2c67b8..74aaeb2 100644 Binary files a/FlufflParty/Assets/BlenderFiles/CoinTemp.blend and b/FlufflParty/Assets/BlenderFiles/CoinTemp.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/CoinTemp.blend1 b/FlufflParty/Assets/BlenderFiles/CoinTemp.blend1 index b6688a0..e2c67b8 100644 Binary files a/FlufflParty/Assets/BlenderFiles/CoinTemp.blend1 and b/FlufflParty/Assets/BlenderFiles/CoinTemp.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png.meta index d8e19f9..0fe7aa3 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png.meta @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/FlufflParty/Assets/Prefabs/Player.prefab b/FlufflParty/Assets/Prefabs/Player.prefab index 1fc23fe..cf0f5dc 100644 --- a/FlufflParty/Assets/Prefabs/Player.prefab +++ b/FlufflParty/Assets/Prefabs/Player.prefab @@ -157,7 +157,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -996942129922571021, guid: cee4fb3a7beae5249b207eafcb7e0bff, type: 2} + - {fileID: -996942129922571021, guid: 30b250cb342768045acde7309e218e46, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -201,8 +201,8 @@ MonoBehaviour: m_Calls: [] m_text: aaaaaaaa m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: cee4fb3a7beae5249b207eafcb7e0bff, type: 2} - m_sharedMaterial: {fileID: -996942129922571021, guid: cee4fb3a7beae5249b207eafcb7e0bff, type: 2} + m_fontAsset: {fileID: 11400000, guid: 30b250cb342768045acde7309e218e46, type: 2} + m_sharedMaterial: {fileID: -996942129922571021, guid: 30b250cb342768045acde7309e218e46, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs index 02707fa..7efffe5 100644 --- a/FlufflParty/Assets/Scripts/Players/Player.cs +++ b/FlufflParty/Assets/Scripts/Players/Player.cs @@ -54,6 +54,10 @@ public abstract class Player : MonoBehaviour protected void AddCoins(int amount) { coins += amount; + if (coins < 0) + { + coins = 0; + } textCoinsInfo.text = coins + ""; PlayAnimation(AnimationType.Coin); } diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index 1bf3a38..8e37a6d 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -139,7 +139,7 @@ PlayerSettings: bundleVersion: 0.1 preloadedAssets: - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} - - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} + - {fileID: -6390619424234631034, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset index bac6747..299540d 100644 --- a/FlufflParty/UserSettings/EditorUserSettings.asset +++ b/FlufflParty/UserSettings/EditorUserSettings.asset @@ -12,10 +12,10 @@ EditorUserSettings: value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069 flags: 0 RecentlyUsedSceneGuid-2: - value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedSceneGuid-3: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b flags: 0 UnityRemoteDevice: value: 225f4d46245b0d4902070862342649191512