diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index aa79894..c18480f 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -40,25 +40,25 @@
- {
+ "keyToString": {
+ "Discover.Launch.Via.Unity": "true",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "node.js.detected.package.eslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "vue.rearranger.settings.migration": "true"
},
- "keyToStringList": {
- "rider.external.source.directories": [
- "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\DecompilerCache",
- "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\SourcesCache",
- "C:\\Users\\braus\\AppData\\Local\\Symbols\\src"
+ "keyToStringList": {
+ "rider.external.source.directories": [
+ "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\DecompilerCache",
+ "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\SourcesCache",
+ "C:\\Users\\braus\\AppData\\Local\\Symbols\\src"
]
}
-}]]>
+}
@@ -168,7 +168,8 @@
-
+
+
diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs
index 1009efe..9e06565 100644
--- a/FlufflParty/Assets/Scripts/Client.cs
+++ b/FlufflParty/Assets/Scripts/Client.cs
@@ -89,6 +89,7 @@ public class Client : MonoBehaviour
g.SetActive(true);
}
+ MinigamesClient.currentInstance.Close();
SceneManager.UnloadSceneAsync(miniGamesMapping[currentMiniGameId]);
}
@@ -423,7 +424,6 @@ public class Client : MonoBehaviour
break;
case 101:
- Debug.Log("test");
UnloadMinigame();
break;
case 126:
diff --git a/FlufflParty/Assets/Scripts/MiniGames/MinigamesClient.cs b/FlufflParty/Assets/Scripts/MiniGames/MinigamesClient.cs
index 8db9db1..14610ec 100644
--- a/FlufflParty/Assets/Scripts/MiniGames/MinigamesClient.cs
+++ b/FlufflParty/Assets/Scripts/MiniGames/MinigamesClient.cs
@@ -13,9 +13,13 @@ public class MinigamesClient : MonoBehaviour
private Stream stream;
private Queue jobs = new Queue();
+
+ public static MinigamesClient currentInstance;
private void Start()
{
+ currentInstance = this;
+
client = new TcpClient("185.245.96.48", 8051);
stream = client.GetStream();
@@ -55,4 +59,10 @@ public class MinigamesClient : MonoBehaviour
jobs.Enqueue(new Job(read));
}
}
+
+ public void Close()
+ {
+ stream.Close();
+ client.Close();
+ }
}
diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt
index d7338c0..eb43382 100644
--- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt
+++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1920
height: 1117
m_ShowMode: 4
- m_Title: Hierarchy
+ m_Title: Project
m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -48,7 +48,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
- controlID: 94
+ controlID: 17
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -59,22 +59,24 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name:
+ m_Name: InspectorWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
- x: 1484
+ x: 1543
y: 0
- width: 436
+ width: 377
height: 1067
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 14}
+ m_ActualView: {fileID: 16}
m_Panes:
- - {fileID: 14}
+ - {fileID: 16}
+ - {fileID: 13}
+ - {fileID: 12}
m_Selected: 0
- m_LastSelected: 0
+ m_LastSelected: 2
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -92,13 +94,13 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 335
- height: 696
+ width: 347
+ height: 667
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 15}
+ m_ActualView: {fileID: 17}
m_Panes:
- - {fileID: 15}
+ - {fileID: 17}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &5
@@ -117,15 +119,15 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
- y: 696
- width: 1484
- height: 371
+ y: 667
+ width: 1543
+ height: 400
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
- m_ActualView: {fileID: 13}
+ m_ActualView: {fileID: 15}
m_Panes:
- - {fileID: 13}
- - {fileID: 18}
+ - {fileID: 15}
+ - {fileID: 20}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &6
@@ -218,12 +220,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1484
+ width: 1543
height: 1067
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
- controlID: 95
+ controlID: 18
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -243,12 +245,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1484
- height: 696
+ width: 1543
+ height: 667
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
- controlID: 96
+ controlID: 19
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -264,20 +266,76 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 335
+ x: 347
y: 0
- width: 1149
- height: 696
+ width: 1196
+ height: 667
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
- m_ActualView: {fileID: 16}
+ m_ActualView: {fileID: 18}
m_Panes:
- - {fileID: 16}
- - {fileID: 17}
- - {fileID: 12}
+ - {fileID: 18}
+ - {fileID: 19}
+ - {fileID: 14}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &12
+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: 11500000, guid: 95b8172b39a93e64981b6a57ccc39d67, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_MinSize: {x: 256, y: 400}
+ m_MaxSize: {x: 4000, y: 4000}
+ m_TitleContent:
+ m_Text: Collaborate
+ m_Image: {fileID: 0}
+ m_Tooltip:
+ m_Pos:
+ serializedVersion: 2
+ x: 1484
+ y: 73
+ width: 435
+ height: 1046
+ m_ViewDataDictionary: {fileID: 0}
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData: []
+--- !u!114 &13
+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: 12402, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_MinSize: {x: 300, y: 150}
+ m_MaxSize: {x: 4000, y: 4000}
+ m_TitleContent:
+ m_Text: Services
+ m_Image: {fileID: 0}
+ m_Tooltip:
+ m_Pos:
+ serializedVersion: 2
+ x: 1484
+ y: 73
+ width: 435
+ height: 1046
+ m_ViewDataDictionary: {fileID: 0}
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData: []
+--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -307,7 +365,7 @@ MonoBehaviour:
m_SaveData: []
m_ViewTransforms:
m_KeySerializationHelper:
- - {fileID: 8168425115790475650, guid: f664c60392a82504680ae1257b6e3645, type: 2}
+ - {fileID: 1990495500464979279, guid: 9518d5f73cb8c844aa4165b745c672cb, type: 2}
m_ValueSerializationHelper:
- e00: 1
e01: 0
@@ -326,9 +384,9 @@ MonoBehaviour:
e32: 0
e33: 1
m_PreviewAnimator: {fileID: 0}
- m_AnimatorController: {fileID: 9100000, guid: f664c60392a82504680ae1257b6e3645, type: 2}
+ m_AnimatorController: {fileID: 9100000, guid: 9518d5f73cb8c844aa4165b745c672cb, type: 2}
m_BreadCrumbs:
- - m_Target: {fileID: 8168425115790475650, guid: f664c60392a82504680ae1257b6e3645, type: 2}
+ - m_Target: {fileID: 1990495500464979279, guid: 9518d5f73cb8c844aa4165b745c672cb, type: 2}
m_ScrollPosition: {x: 0, y: 0}
stateMachineGraph: {fileID: 0}
stateMachineGraphGUI: {fileID: 0}
@@ -341,7 +399,7 @@ MonoBehaviour:
m_CurrentEditor: 0
m_LayerEditor:
m_SelectedLayerIndex: 0
---- !u!114 &13
+--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -362,9 +420,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
- y: 769
- width: 1483
- height: 350
+ y: 740
+ width: 1542
+ height: 379
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -382,22 +440,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets/Prefabs/Items
+ - Assets/Scripts/MiniGames
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- - Assets/Prefabs/Items
+ - Assets/Scripts/MiniGames
m_LastFoldersGridSize: -1
m_LastProjectPath: D:\Unity\flufflparty\FlufflParty
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
- scrollPos: {x: 0, y: 90}
- m_SelectedIDs: 52cb0000
- m_LastClickedID: 52050
- m_ExpandedIDs: 000000002a6100003661000042610000486100003c3e070000ca9a3b
+ scrollPos: {x: 0, y: 77}
+ m_SelectedIDs: ae610000
+ m_LastClickedID: 25006
+ m_ExpandedIDs: 000000008461000086610000886100008a6100008c61000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -425,7 +483,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 000000002a610000
+ m_ExpandedIDs: 000000008461000086610000886100008a6100008c610000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -469,7 +527,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 3}
+ m_ClientGUIView: {fileID: 5}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
@@ -481,7 +539,7 @@ MonoBehaviour:
m_GridSize: 64
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207
---- !u!114 &14
+--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -501,9 +559,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 1484
+ x: 1543
y: 73
- width: 435
+ width: 376
height: 1046
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -522,7 +580,7 @@ MonoBehaviour:
m_LockTracker:
m_IsLocked: 0
m_PreviewWindow: {fileID: 0}
---- !u!114 &15
+--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -544,8 +602,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 73
- width: 334
- height: 675
+ width: 346
+ height: 646
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -553,9 +611,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 30a30700
- m_LastClickedID: 500528
- m_ExpandedIDs: f473fdff4274fdff2e78fdff5e78fdffc48afdff128bfdff028ffdff328ffdfffcd7fdff4ad8fdff38dcfdff68dcfdffb8edfdff06eefdfff4f1fdff24f2fdff3cfbfdff8afbfdff78fffdffa8fffdffec0afeff3a0bfeff280ffeff580ffeffe61efefff640feff4441feff3245feff6245feffd851feff2652feff1456feff4456feff4859feff9659feff845dfeffb45dfeff5c66feffac66feff9a6afeffca6afeff6076feff9e76feff847afeffb47afeff6685feffa885feff2a88feff5288feffd489feff168afefffc8dfeff2c8efeffde99feff1e9afeff049efeff349efeff62a7feffa2a7feff88abfeffb8abfeff3eb3feff7eb3feff64b7feff94b7feff70bffeffb0bffeff96c3feffc6c3feff3acbfeff7acbfeff60cffeff90cffeff1cd7feff5cd7feff42dbfeff72dbfeffbaebfefffaebfeffe0effeff10f0feffe4f9feff24fafeff0afefeff3afefeff4006ffff8006ffff660affff960affff2a11ffff6a11ffff5015ffff8015ffff2e30ffff6e30ffff5434ffff8434ffff403bffff803bffff663fffff963ffffffe48ffff3e49ffff244dffff544dffff5855ffff9855ffff7e59ffffae59ffff1063ffff5063ffff3667ffff6667ffff586fffff986fffff7e73ffffae73ffffc47affff047bffffea7effff1a7fffffae85ffffee85ffffd489ffff048affffa292ffffe292ffffc896fffff896ffff7ca0ffffbca0ffffa2a4ffffd2a4ffff08adffff4cadffff32b1ffff62b1ffff9af9ffff0cfaffff06fbffff266400009edf000046a70300905605009856050022570500225a0500bc5a0500da5a0500665b0500d25b0500b8af0500d0ca050052c206007a9e070014a20700
+ m_SelectedIDs: 56170000
+ m_LastClickedID: 0
+ m_ExpandedIDs: 04fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -579,7 +637,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &16
+--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -599,10 +657,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 335
+ x: 347
y: 73
- width: 1147
- height: 675
+ width: 1194
+ height: 646
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -656,7 +714,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
- snapOffset: {x: 0, y: 0}
+ snapOffset: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: unity-transform-toolbar
@@ -832,14 +890,14 @@ MonoBehaviour:
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_SceneLighting: 1
- m_2DMode: 1
+ m_2DMode: 0
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: 1171.4, y: 610.7782, z: 6.662559}
+ m_Target: {x: 90.66765, y: 3.8298905, z: 122.9706}
speed: 2
- m_Value: {x: 1171.4, y: 610.7782, z: 6.662559}
+ m_Value: {x: 90.66765, y: 3.8298905, z: 122.9706}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -886,17 +944,17 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
- m_Target: {x: 0, y: 0, z: 0, w: 1}
+ m_Target: {x: -0.11699305, y: -0.868427, z: 0.4150107, w: -0.24478766}
speed: 2
- m_Value: {x: 0, y: 0, z: 0, w: 1}
+ m_Value: {x: -0.1169926, y: -0.86842364, z: 0.4150091, w: -0.24478672}
m_Size:
- m_Target: 520.9633
+ m_Target: 1.1898067
speed: 2
- m_Value: 520.9633
+ m_Value: 1.1898067
m_Ortho:
- m_Target: 1
+ m_Target: 0
speed: 2
- m_Value: 1
+ m_Value: 0
m_CameraSettings:
m_Speed: 1
m_SpeedNormalized: 0.5
@@ -910,14 +968,14 @@ MonoBehaviour:
m_FarClip: 10000
m_DynamicClip: 1
m_OcclusionCulling: 0
- m_LastSceneViewRotation: {x: 0.005803626, y: -0.8909532, z: 0.45403963, w: 0.0112172365}
+ m_LastSceneViewRotation: {x: -0.015836826, y: -0.97010744, z: 0.0658762, w: -0.23303676}
m_LastSceneViewOrtho: 0
m_ReplacementShader: {fileID: 0}
m_ReplacementString:
m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
---- !u!114 &17
+--- !u!114 &19
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -937,10 +995,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 335
+ x: 347
y: 73
- width: 1147
- height: 675
+ width: 1194
+ height: 646
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -978,7 +1036,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
- m_EnableMouseInput: 1
+ m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@@ -987,29 +1045,29 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 1147
- height: 654
- m_Scale: {x: 0.59739584, y: 0.59739584}
- m_Translation: {x: 573.5, y: 326.99997}
+ width: 1194
+ height: 625
+ m_Scale: {x: 0.5787037, y: 0.5787037}
+ m_Translation: {x: 597, y: 312.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -960
- y: -547.37573
- width: 1920
- height: 1094.7515
+ x: -1031.616
+ y: -540
+ width: 2063.232
+ height: 1080
m_MinimalGUI: 1
- m_defaultScale: 0.59739584
- m_LastWindowPixelSize: {x: 1147, y: 675}
+ m_defaultScale: 0.5787037
+ m_LastWindowPixelSize: {x: 1194, y: 646}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
---- !u!114 &18
+--- !u!114 &20
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1030,9 +1088,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
- y: 769
- width: 1483
- height: 350
+ y: 740
+ width: 1542
+ height: 379
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml
index ae5a2b1..69c3fb5 100644
--- a/Server/.idea/workspace.xml
+++ b/Server/.idea/workspace.xml
@@ -102,7 +102,7 @@
-
+