Puuush

FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml

@@ -169,7 +169,7 @@
       <workItem from="1681056387914" duration="882000" />
       <workItem from="1681415672515" duration="5000" />
       <workItem from="1681479671396" duration="22217000" />
-      <workItem from="1681565663292" duration="267000" />
+      <workItem from="1681565663292" duration="642000" />
     </task>
     <servers />
   </component>

FlufflParty/Assets/Scenes/Minigames/TestGame.unity

@@ -228,7 +228,6 @@ GameObject:
   - component: {fileID: 1017695557}
   - component: {fileID: 1017695556}
   - component: {fileID: 1017695555}
-  - component: {fileID: 1017695558}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -302,15 +301,84 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1017695558
+--- !u!1 &1628201355
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1628201359}
+  - component: {fileID: 1628201358}
+  - component: {fileID: 1628201357}
+  - component: {fileID: 1628201356}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1628201356
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1017695554}
+  m_GameObject: {fileID: 1628201355}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: ddf3c4ab225c68d4d8849a8a6a231bc0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &1628201357
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1628201355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1628201358
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1628201355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1628201359
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1628201355}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

FlufflParty/ProjectSettings/ProjectSettings.asset

@@ -137,9 +137,7 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.16
-  preloadedAssets:
+  preloadedAssets: []
-  - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2}
-  - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

FlufflParty/UserSettings/EditorUserSettings.asset

@@ -18,13 +18,13 @@ EditorUserSettings:
       value: 000757055c0d5e580e5f5920492209441415497e2f7972607c704e62b5b66d3a
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+      value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 0254505450065d02585f5573157b0744424f1b282e2971342f2b1c37b2e6663e
+      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
+      value: 0254505450065d02585f5573157b0744424f1b282e2971342f2b1c37b2e6663e
       flags: 0
     UnityRemoteDevice:
       value: 225f4d46245b0d4902070862342649191512

Server/.idea/workspace.xml

@@ -33,23 +33,23 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
+  <component name="PropertiesComponent">{
-  "keyToString": {
+  &quot;keyToString&quot;: {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    "RunOnceActivity.ShowReadmeOnStart": "true",
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    "WebServerToolWindowFactoryState": "false",
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    "last_opened_file_path": "D:/Unity/flufflparty/Server",
+    &quot;last_opened_file_path&quot;: &quot;D:/Unity/flufflparty/Server&quot;,
-    "node.js.detected.package.eslint": "true",
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    "node.js.detected.package.tslint": "true",
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    "node.js.selected.package.eslint": "(autodetect)",
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    "node.js.selected.package.tslint": "(autodetect)",
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    "project.structure.last.edited": "Artifacts",
+    &quot;project.structure.last.edited&quot;: &quot;Artifacts&quot;,
-    "project.structure.proportion": "0.0",
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    "project.structure.side.proportion": "0.2",
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    "settings.editor.selected.configurable": "preferences.sourceCode.Java",
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.sourceCode.Java&quot;,
-    "vue.rearranger.settings.migration": "true"
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager">
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Main" />
@@ -103,6 +103,7 @@
       <workItem from="1681217780586" duration="94000" />
       <workItem from="1681218296017" duration="162000" />
       <workItem from="1681481242206" duration="13939000" />
+      <workItem from="1681566184866" duration="68000" />
     </task>
     <servers />
   </component>