diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index 1d5a7bd..b52ff55 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -113,7 +113,8 @@
-
+
+
diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
index 12e50a7..2802548 100644
--- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
@@ -43,7 +43,7 @@ public class PlayablePlayer : Player
if ((Input.GetMouseButtonDown(0)) && wurfelZahl == 0 && !wurfelt)
{
wurfelt = true;
- wurfelZahl = Random.Range(3, 4);
+ wurfelZahl = Random.Range(1, 7);
client.SendWurfeln(wurfelZahl);
diff --git a/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset
index 14d6805..2bb28f9 100644
--- a/FlufflParty/UserSettings/EditorUserSettings.asset
+++ b/FlufflParty/UserSettings/EditorUserSettings.asset
@@ -9,10 +9,10 @@ EditorUserSettings:
value: 5604555501510a0955590d74437008441216412e7578276829704a6bb0b66c3a
flags: 0
RecentlyUsedSceneGuid-1:
- value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+ value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
flags: 0
RecentlyUsedSceneGuid-2:
- value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
+ value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512
diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt
index 4167bad..8007a72 100644
--- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt
+++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt
@@ -1,30 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_PixelRect:
- serializedVersion: 2
- x: 2180
- y: 184
- width: 641
- height: 664
- m_ShowMode: 0
- m_Title: Build Settings
- m_RootView: {fileID: 4}
- m_MinSize: {x: 640, y: 601}
- m_MaxSize: {x: 4000, y: 4021}
- m_Maximized: 0
---- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -43,62 +19,12 @@ MonoBehaviour:
width: 1920
height: 1117
m_ShowMode: 4
- m_Title: Game
- m_RootView: {fileID: 9}
+ m_Title: Project
+ m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
---- !u!114 &3
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: BuildPlayerWindow
- m_EditorClassIdentifier:
- m_Children: []
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 641
- height: 664
- m_MinSize: {x: 640, y: 580}
- m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 15}
- m_Panes:
- - {fileID: 15}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &4
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_Children:
- - {fileID: 3}
- m_Position:
- serializedVersion: 2
- x: 0
- y: 0
- width: 641
- height: 664
- m_MinSize: {x: 640, y: 601}
- m_MaxSize: {x: 4000, y: 4021}
- vertical: 0
- controlID: 22872
---- !u!114 &5
+--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -111,8 +37,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 12}
- - {fileID: 6}
+ - {fileID: 9}
+ - {fileID: 3}
m_Position:
serializedVersion: 2
x: 0
@@ -122,8 +48,8 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
- controlID: 104
---- !u!114 &6
+ controlID: 95
+--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -142,15 +68,15 @@ MonoBehaviour:
y: 0
width: 423
height: 1067
- m_MinSize: {x: 275, y: 50}
- m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 20}
+ m_MinSize: {x: 276, y: 71}
+ m_MaxSize: {x: 4001, y: 4021}
+ m_ActualView: {fileID: 16}
m_Panes:
- - {fileID: 20}
- - {fileID: 17}
+ - {fileID: 16}
+ - {fileID: 13}
m_Selected: 0
m_LastSelected: 1
---- !u!114 &7
+--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -169,14 +95,14 @@ MonoBehaviour:
y: 0
width: 355
height: 738
- m_MinSize: {x: 201, y: 221}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 21}
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
+ m_ActualView: {fileID: 17}
m_Panes:
- - {fileID: 21}
+ - {fileID: 17}
m_Selected: 0
m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -197,13 +123,13 @@ MonoBehaviour:
height: 329
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
- m_ActualView: {fileID: 19}
+ m_ActualView: {fileID: 15}
m_Panes:
- - {fileID: 19}
- - {fileID: 22}
+ - {fileID: 15}
+ - {fileID: 18}
m_Selected: 0
m_LastSelected: 1
---- !u!114 &9
+--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -216,9 +142,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 10}
- - {fileID: 5}
- - {fileID: 11}
+ - {fileID: 7}
+ - {fileID: 2}
+ - {fileID: 8}
m_Position:
serializedVersion: 2
x: 0
@@ -231,7 +157,7 @@ MonoBehaviour:
m_TopViewHeight: 30
m_UseBottomView: 1
m_BottomViewHeight: 20
---- !u!114 &10
+--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -253,7 +179,7 @@ MonoBehaviour:
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
m_LastLoadedLayoutName:
---- !u!114 &11
+--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -274,7 +200,7 @@ MonoBehaviour:
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
---- !u!114 &12
+--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -287,8 +213,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 13}
- - {fileID: 8}
+ - {fileID: 10}
+ - {fileID: 5}
m_Position:
serializedVersion: 2
x: 0
@@ -298,8 +224,8 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
- controlID: 94
---- !u!114 &13
+ controlID: 96
+--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -312,8 +238,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 7}
- - {fileID: 14}
+ - {fileID: 4}
+ - {fileID: 11}
m_Position:
serializedVersion: 2
x: 0
@@ -323,8 +249,8 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
- controlID: 95
---- !u!114 &14
+ controlID: 97
+--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -334,7 +260,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: GameView
+ m_Name: SceneView
m_EditorClassIdentifier:
m_Children: []
m_Position:
@@ -345,64 +271,14 @@ MonoBehaviour:
height: 738
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
- m_ActualView: {fileID: 23}
+ m_ActualView: {fileID: 12}
m_Panes:
- - {fileID: 16}
- - {fileID: 18}
- - {fileID: 23}
- m_Selected: 2
- m_LastSelected: 0
---- !u!114 &15
-MonoBehaviour:
- m_ObjectHideFlags: 52
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
- m_EditorClassIdentifier:
- m_MinSize: {x: 640, y: 580}
- m_MaxSize: {x: 4000, y: 4000}
- m_TitleContent:
- m_Text: Build Settings
- m_Image: {fileID: 0}
- m_Tooltip:
- m_Pos:
- serializedVersion: 2
- x: 2180
- y: 184
- width: 641
- height: 643
- m_ViewDataDictionary: {fileID: 0}
- m_OverlayCanvas:
- m_LastAppliedPresetName: Default
- m_SaveData: []
- m_TreeViewState:
- scrollPos: {x: 0, y: 0}
- m_SelectedIDs:
- m_LastClickedID: 0
- m_ExpandedIDs:
- m_RenameOverlay:
- m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
- m_EditFieldRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 0
- height: 0
- m_UserData: 0
- m_IsWaitingForDelay: 0
- m_IsRenaming: 0
- m_OriginalEventType: 11
- m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 0}
- m_SearchString:
---- !u!114 &16
+ - {fileID: 12}
+ - {fileID: 14}
+ - {fileID: 19}
+ m_Selected: 0
+ m_LastSelected: 2
+--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -660,9 +536,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: 96.25832, y: 3.0647492, z: 118.732544}
+ m_Target: {x: 94.996544, y: 7.7506104, z: 124.22771}
speed: 2
- m_Value: {x: 96.25832, y: 3.0647492, z: 118.732544}
+ m_Value: {x: 94.996544, y: 7.7506104, z: 124.22771}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -709,9 +585,9 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
- m_Target: {x: 0.12401545, y: 0.8428969, z: -0.22000046, w: 0.47514084}
+ m_Target: {x: -0.067620516, y: -0.81378967, z: 0.5690867, w: -0.09729589}
speed: 2
- m_Value: {x: 0.12401458, y: 0.842891, z: -0.21999891, w: 0.4751375}
+ m_Value: {x: -0.067615375, y: -0.8137278, z: 0.5690434, w: -0.09728849}
m_Size:
m_Target: 1.1898067
speed: 2
@@ -740,7 +616,7 @@ MonoBehaviour:
m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
---- !u!114 &17
+--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -768,7 +644,7 @@ MonoBehaviour:
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
---- !u!114 &18
+--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -798,25 +674,8 @@ MonoBehaviour:
m_SaveData: []
m_ViewTransforms:
m_KeySerializationHelper:
- - {fileID: 2595009610461881608, guid: 95bf48ec95818a24f99ffbd7739ed7e6, type: 2}
- {fileID: 575121510650230631, guid: 32f1ccb535c04d5499bee46726dc7754, type: 2}
m_ValueSerializationHelper:
- - e00: 0.6863158
- e01: 0
- e02: 0
- e03: -19.315796
- e10: 0
- e11: 0.6863158
- e12: 0
- e13: 240.93684
- e20: 0
- e21: 0
- e22: 1
- e23: 0
- e30: 0
- e31: 0
- e32: 0
- e33: 1
- e00: 1
e01: 0
e02: 0
@@ -849,7 +708,7 @@ MonoBehaviour:
m_CurrentEditor: 0
m_LayerEditor:
m_SelectedLayerIndex: 0
---- !u!114 &19
+--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -890,22 +749,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets/Scenes
+ - Assets/Scripts
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- - Assets/Scenes
+ - Assets/Scripts
m_LastFoldersGridSize: -1
m_LastProjectPath: F:\Projects\Unity\flufflparty\FlufflParty
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
- scrollPos: {x: 0, y: 212}
- m_SelectedIDs: 365e0000
- m_LastClickedID: 24118
- m_ExpandedIDs: 00000000c85d0000ca5d0000cc5d0000ce5d000000ca9a3b
+ scrollPos: {x: 0, y: 276}
+ m_SelectedIDs: 3c5e0000
+ m_LastClickedID: 24124
+ m_ExpandedIDs: 00000000ca5d0000cc5d0000ce5d0000d05d00003c5e000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -921,7 +780,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 8}
+ m_ClientGUIView: {fileID: 5}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@@ -933,7 +792,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000c85d0000ca5d0000cc5d0000ce5d0000
+ m_ExpandedIDs: 00000000ca5d0000cc5d0000ce5d0000d05d0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -977,7 +836,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 8}
+ m_ClientGUIView: {fileID: 5}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
@@ -989,7 +848,7 @@ MonoBehaviour:
m_GridSize: 64
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207
---- !u!114 &20
+--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1030,7 +889,7 @@ MonoBehaviour:
m_LockTracker:
m_IsLocked: 0
m_PreviewWindow: {fileID: 0}
---- !u!114 &21
+--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1063,7 +922,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: d0cafeff10cbfeff8ed1feffacd1feff48d4feff8ad4feff08dbfeff26dbfeff50ddfeff90ddfeffcce2feffeee2feff90e3feff52eafeffaaeafeffe2effeff00f0feff1a09ffff6009ffff980effffb60efffff018ffff3c19ffffa41fffffd21fffff3024ffff7024ffffd22afffffa2affff7e2effffc02effff2235ffff4a35ffffa043ffffde4affff104effff504effffb254ffffda54fffff85bffff0463ffff4a68ffff8a68ffffec6effff146fffffa07affffe07affff4281ffff6a81ffff3684ffff328bffff728bffffd491fffffc91ffff5098ffff9298fffff49effff1c9fffff48b0fffffeb0ffff5ae0ffff60e0ffffdae2ffffc8ecffff6cf2ffff5cf9ffff06fbffffb25f000022a5000040a5000084a6000094a6000066a70000d0a700007ca80000d0a80000fac100001ec20000a6c3000092c4000026c60000e6c60000569b01004e9d0100e4cd0100f4cd0100c6ce010030cf0100dccf010030d00100823502009a3b0200ce580200
+ m_ExpandedIDs: 02d4ffff52d4ffffb6daffffdedaffffe0deffff2edfffff92e5ffffbae5ffff4af2ffff06fbffff0c680000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1079,7 +938,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 7}
+ m_ClientGUIView: {fileID: 4}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@@ -1087,7 +946,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &22
+--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1115,7 +974,7 @@ MonoBehaviour:
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
---- !u!114 &23
+--- !u!114 &19
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml
index 6091090..f49e411 100644
--- a/Server/.idea/workspace.xml
+++ b/Server/.idea/workspace.xml
@@ -79,7 +79,7 @@
-
+