jonas/flufflparty-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore game actions, when click UI

Browse Source
This commit is contained in:
brausjonas
2023-02-27 22:05:47 +01:00
parent 87a13f5b43
commit e20308842a
8 changed files with 88 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+1 -1
View File
@@ -51,7 +51,7 @@
}</component>
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
<configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="$USER_HOME$/OneDrive/Desktop/FlufflPartyBuild/FlufflParty.exe" />
<option name="EXE_PATH" value="$USER_HOME$/OneDrive/Desktop/FlufflPartyBuild\FlufflParty.exe" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="C:\Users\braus\OneDrive\Desktop\FlufflPartyTestBuild" />
<option name="PASS_PARENT_ENVS" value="1" />
FlufflParty/Assets/BlenderFiles/Textures/Button/ButtonCopy.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 11 KiB

FlufflParty/Assets/Scenes/Start.unity
+1 -1
View File
@@ -1110,7 +1110,7 @@ GameObject:
- component: {fileID: 352327431}
- component: {fileID: 352327430}
- component: {fileID: 352327429}
m_Layer: 0
m_Layer: 2
m_Name: Terrain
m_TagString: Untagged
m_Icon: {fileID: 0}
FlufflParty/Assets/Scenes/WesternMap.unity
+66 -12
View File
@@ -1337,6 +1337,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1202275724}
- {fileID: 1988853065}
m_Father: {fileID: 0}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2996,7 +2997,6 @@ GameObject:
m_Component:
- component: {fileID: 431546227}
- component: {fileID: 431546226}
- component: {fileID: 431546225}
m_Layer: 0
m_Name: MiniMapCamera
m_TagString: Untagged
@@ -3004,14 +3004,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &431546225
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 431546224}
m_Enabled: 1
--- !u!20 &431546226
Camera:
m_ObjectHideFlags: 0
@@ -3709,7 +3701,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &584878063
RectTransform:
m_ObjectHideFlags: 0
@@ -3729,8 +3721,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.00012207031, y: -1.232544}
m_SizeDelta: {x: -4.778, y: -2.465}
m_AnchoredPosition: {x: -0.00012207031, y: -0.66534424}
m_SizeDelta: {x: -4.778, y: -1.3364}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &584878064
MonoBehaviour:
@@ -14424,6 +14416,68 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1965297689}
m_CullTransparentMesh: 1
--- !u!1 &1988853064
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1988853065}
- component: {fileID: 1988853066}
- component: {fileID: 1988853067}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1988853065
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1988853064}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 457.7, y: 578.6, z: -118.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 179741698}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1988853066
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1988853064}
m_Material: {fileID: 0}
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}
--- !u!54 &1988853067
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1988853064}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 126
m_CollisionDetection: 0
--- !u!1001 &2019848015
PrefabInstance:
m_ObjectHideFlags: 0
FlufflParty/Assets/Scripts/Client.cs
+1 -1
View File
@@ -181,7 +181,7 @@ public class Client : MonoBehaviour
players[job.data[1]].textStarsInfo = playerInfoElements[job.data[1]].textStarsInfo;
players[job.data[1]].uiHandler = uiHandler;
players[job.data[1]].textLeftMoves = textLeftMoves;
players[job.data[1]].AddCoins(30);
players[job.data[1]].AddCoins(3);
players[job.data[1]].Init();
playerNameTexts[job.data[1]].text = Encoding.ASCII.GetString(name).Replace(" ", "");
FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+16 -10
View File
@@ -49,23 +49,29 @@ public class PlayablePlayer : Player
*/
if (activated && !name.Equals(""))
{
//Generiere Würfelzahl von 1-6 wenn gerade gewürfelt werden darf
if ((Input.GetMouseButtonDown(0) && !uiHandler.MapOpen) && wurfelZahl == 0 && !wurfelt)
{
wurfelt = true;
wurfelZahl = Random.Range(1, 7);
textLeftMoves.text = wurfelZahl + "";
if(!Physics.Raycast(new Vector3(Input.mousePosition.x, Input.mousePosition.y, -200), Vector3.forward))
{
wurfelt = true;
wurfelZahl = Random.Range(1, 7);
textLeftMoves.text = wurfelZahl + "";
client.SendWurfeln(wurfelZahl);
client.SendWurfeln(wurfelZahl);
//nächstes Feld anvisieren
TargetNextField();
//nächstes Feld anvisieren
TargetNextField();
//stop the dice
diceScript.StopRandom(wurfelZahl);
//delay for walk start
timeSinceWurfeln = Time.time;
}
//stop the dice
diceScript.StopRandom(wurfelZahl);
//delay for walk start
timeSinceWurfeln = Time.time;
}
}
}
FlufflParty/ProjectSettings/ProjectSettings.asset
+1 -3
View File
@@ -137,9 +137,7 @@ PlayerSettings:
16:9: 1
Others: 1
bundleVersion: 0.1
preloadedAssets:
- {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
- {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2}
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
FlufflParty/UserSettings/EditorUserSettings.asset
+2 -2
View File
@@ -12,10 +12,10 @@ EditorUserSettings:
value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069
flags: 0
RecentlyUsedSceneGuid-2:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
flags: 0
RecentlyUsedSceneGuid-3:
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512