From 3d9a3c888c5459e2ca6081114ca2a488c53cc0c4 Mon Sep 17 00:00:00 2001 From: brausjonas Date: Mon, 27 Feb 2023 22:20:40 +0100 Subject: [PATCH] Working on android too (last push) --- FlufflParty/Assets/Scenes/WesternMap.unity | 10 +++++----- FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs | 2 +- FlufflParty/ProjectSettings/ProjectSettings.asset | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 06749eb..ede370a 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -10339,7 +10339,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -90.099976} + m_AnchoredPosition: {x: 0, y: -113.6} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1550019641 @@ -10682,8 +10682,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -45.100006} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.000019073, y: -56.85} + m_SizeDelta: {x: 202.8036, y: 53.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1600263023 MonoBehaviour: @@ -14460,8 +14460,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 161.41098, y: 37.503296, z: 45.18319} - m_Center: {x: -0.8694916, y: -1.9985962, z: 9.810416} + m_Size: {x: 223.44653, y: 86.49219, z: 45.18319} + m_Center: {x: -2.2122192, y: -11.080078, z: 9.810417} --- !u!54 &1988853067 Rigidbody: m_ObjectHideFlags: 0 diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs index f7f7a76..f42f36a 100644 --- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs +++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs @@ -51,7 +51,7 @@ public class PlayablePlayer : Player { //Generiere Würfelzahl von 1-6 wenn gerade gewürfelt werden darf - if ((Input.GetMouseButtonDown(0) && !uiHandler.MapOpen) && wurfelZahl == 0 && !wurfelt) + if ((Input.GetMouseButtonUp(0) && !uiHandler.MapOpen) && wurfelZahl == 0 && !wurfelt) { if(!Physics.Raycast(new Vector3(Input.mousePosition.x, Input.mousePosition.y, -200), Vector3.forward)) { diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index b33a346..44cfc7e 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -137,7 +137,9 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.1 - preloadedAssets: [] + preloadedAssets: + - {fileID: -6390619424234631034, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} + - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1