From d63c43deb5a4d75a50d18986a8649066e08771fd Mon Sep 17 00:00:00 2001 From: brausjonas Date: Fri, 14 Apr 2023 22:40:50 +0200 Subject: [PATCH] Item Shop getting prices from linked items --- .../.idea/.idea.FlufflParty/.idea/workspace.xml | 2 +- FlufflParty/Assets/Scenes/WesternMap.unity | 11 +++++------ FlufflParty/Assets/Scripts/ItemShop.cs | 10 ++++++++++ .../Assets/Scripts/Players/PlayablePlayer.cs | 13 +++++-------- FlufflParty/ProjectSettings/ProjectSettings.asset | 6 +++--- Server/.idea/workspace.xml | 2 +- 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index c4276e8..c3d5224 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -165,7 +165,7 @@ - + diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 7a39053..47220ac 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -6042,7 +6042,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 5 + m_text: 0 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 30b250cb342768045acde7309e218e46, type: 2} m_sharedMaterial: {fileID: -996942129922571021, guid: 30b250cb342768045acde7309e218e46, type: 2} @@ -32820,7 +32820,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1235522789 RectTransform: m_ObjectHideFlags: 0 @@ -32861,6 +32861,7 @@ MonoBehaviour: items: - {fileID: 1547369680} - {fileID: 1261969992} + - {fileID: 200446444} --- !u!1 &1237875978 GameObject: m_ObjectHideFlags: 0 @@ -33354,9 +33355,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: '10 - -' + m_text: 0 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 30b250cb342768045acde7309e218e46, type: 2} m_sharedMaterial: {fileID: -996942129922571021, guid: 30b250cb342768045acde7309e218e46, type: 2} @@ -43781,7 +43780,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 3 + m_text: 0 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 30b250cb342768045acde7309e218e46, type: 2} m_sharedMaterial: {fileID: -996942129922571021, guid: 30b250cb342768045acde7309e218e46, type: 2} diff --git a/FlufflParty/Assets/Scripts/ItemShop.cs b/FlufflParty/Assets/Scripts/ItemShop.cs index 51aa58a..0991848 100644 --- a/FlufflParty/Assets/Scripts/ItemShop.cs +++ b/FlufflParty/Assets/Scripts/ItemShop.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; public class ItemShop : MonoBehaviour @@ -12,4 +13,13 @@ public class ItemShop : MonoBehaviour { currentPlayer = _currentPlayer; } + + private void Start() + { + foreach(UIItem ui in items) + { + TMP_Text text = ui.GetComponentInChildren(); + text.text = ui.item.Cost + ""; + } + } } diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs index eb94923..1e7a74a 100644 --- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs @@ -110,7 +110,7 @@ public class PlayablePlayer : Player jumpRequest = true; wurfelt = true; - wurfelZahl = Random.Range(4, 5); + wurfelZahl = Random.Range(1, 7); switch (activeItem) { @@ -255,10 +255,8 @@ public class PlayablePlayer : Player // } // break; case 2: - - - int randCoins1 = Random.Range(2, 12); - int randCoins2 = Random.Range(5, 10); + int randCoins1 = Random.Range(2, 6); + int randCoins2 = Random.Range(1, 4); int randCoins3 = Random.Range(-6, 0); RandomRotator rotator = uiHandler.rotator.GetComponent(); @@ -294,9 +292,8 @@ public class PlayablePlayer : Player } rotatorStopIndex = randomOption; - Invoke("StopRotator", 4); - Invoke("ActivateLayout1", 7.5f); - + Invoke("StopRotator", 2); + Invoke("ActivateLayout1", 5.5f); break; } diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index e767941..8c27b84 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -136,7 +136,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.14 + bundleVersion: 0.16 preloadedAssets: - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} @@ -160,13 +160,13 @@ PlayerSettings: androidMaxAspectRatio: 2.1 applicationIdentifier: Android: com.IOGameStudios.FlufflParty - Standalone: com.IO-Game-Studios.FlufflParty + Standalone: com.IOGameStudios.FlufflParty buildNumber: Standalone: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 - AndroidBundleVersionCode: 4 + AndroidBundleVersionCode: 6 AndroidMinSdkVersion: 26 AndroidTargetSdkVersion: 31 AndroidPreferredInstallLocation: 2 diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index beb32c6..a83d479 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -101,7 +101,7 @@ - +