diff --git a/FlufflParty/Packages/manifest.json b/FlufflParty/Packages/manifest.json
index 9c0c792..5bffc7c 100644
--- a/FlufflParty/Packages/manifest.json
+++ b/FlufflParty/Packages/manifest.json
@@ -4,6 +4,7 @@
"com.unity.adaptiveperformance.samsung.android": "4.0.2",
"com.unity.collab-proxy": "1.17.7",
"com.unity.feature.development": "1.0.1",
+ "com.unity.formats.fbx": "4.1.3",
"com.unity.ide.rider": "3.0.18",
"com.unity.ide.visualstudio": "2.0.17",
"com.unity.ide.vscode": "1.2.5",
diff --git a/FlufflParty/Packages/packages-lock.json b/FlufflParty/Packages/packages-lock.json
index 8aa26df..05277c1 100644
--- a/FlufflParty/Packages/packages-lock.json
+++ b/FlufflParty/Packages/packages-lock.json
@@ -1,5 +1,12 @@
{
"dependencies": {
+ "com.autodesk.fbx": {
+ "version": "4.1.2",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {},
+ "url": "https://packages.unity.com"
+ },
"com.unity.adaptiveperformance": {
"version": "4.0.1",
"depth": 0,
@@ -47,8 +54,8 @@
"depth": 0,
"source": "builtin",
"dependencies": {
- "com.unity.ide.visualstudio": "2.0.17",
- "com.unity.ide.rider": "3.0.18",
+ "com.unity.ide.visualstudio": "2.0.16",
+ "com.unity.ide.rider": "3.0.16",
"com.unity.ide.vscode": "1.2.5",
"com.unity.editorcoroutines": "1.0.0",
"com.unity.performance.profile-analyzer": "1.1.1",
@@ -56,6 +63,16 @@
"com.unity.testtools.codecoverage": "1.2.2"
}
},
+ "com.unity.formats.fbx": {
+ "version": "4.1.3",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.timeline": "1.5.2",
+ "com.autodesk.fbx": "4.1.2"
+ },
+ "url": "https://packages.unity.com"
+ },
"com.unity.ide.rider": {
"version": "3.0.18",
"depth": 0,
@@ -112,7 +129,7 @@
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
- "version": "1.7.0",
+ "version": "1.6.0",
"depth": 1,
"source": "registry",
"dependencies": {
diff --git a/FlufflParty/ProjectSettings/ProjectVersion.txt b/FlufflParty/ProjectSettings/ProjectVersion.txt
index 1a9f85a..3643b02 100644
--- a/FlufflParty/ProjectSettings/ProjectVersion.txt
+++ b/FlufflParty/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.17f1
-m_EditorVersionWithRevision: 2021.3.17f1 (3e8111cac19d)
+m_EditorVersion: 2021.3.16f1
+m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f)
diff --git a/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset
index 299540d..bac6747 100644
--- a/FlufflParty/UserSettings/EditorUserSettings.asset
+++ b/FlufflParty/UserSettings/EditorUserSettings.asset
@@ -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
diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml
index 86fa9ef..ad06000 100644
--- a/Server/.idea/workspace.xml
+++ b/Server/.idea/workspace.xml
@@ -33,22 +33,22 @@
- {
- "keyToString": {
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "WebServerToolWindowFactoryState": "false",
- "last_opened_file_path": "C:/flufflparty/Server",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "project.structure.last.edited": "Artifacts",
- "project.structure.proportion": "0.0",
- "project.structure.side.proportion": "0.2",
- "vue.rearranger.settings.migration": "true"
+
+}]]>
@@ -90,6 +90,7 @@
+
diff --git a/Server/out/artifacts/Server_jar/Server.jar b/Server/out/artifacts/Server_jar/Server.jar
index 753337c..b3b5253 100644
Binary files a/Server/out/artifacts/Server_jar/Server.jar and b/Server/out/artifacts/Server_jar/Server.jar differ
diff --git a/Server/out/production/Server/Client.class b/Server/out/production/Server/Client.class
index c4ff6b8..3515d47 100644
Binary files a/Server/out/production/Server/Client.class and b/Server/out/production/Server/Client.class differ
diff --git a/Server/out/production/Server/Main.class b/Server/out/production/Server/Main.class
index 69e2ad8..6d7e370 100644
Binary files a/Server/out/production/Server/Main.class and b/Server/out/production/Server/Main.class differ
diff --git a/Server/out/production/Server/Room$1.class b/Server/out/production/Server/Room$1.class
index 45ff557..926e363 100644
Binary files a/Server/out/production/Server/Room$1.class and b/Server/out/production/Server/Room$1.class differ
diff --git a/Server/out/production/Server/Room$2.class b/Server/out/production/Server/Room$2.class
index 8ec9296..edc1ff8 100644
Binary files a/Server/out/production/Server/Room$2.class and b/Server/out/production/Server/Room$2.class differ
diff --git a/Server/out/production/Server/Room.class b/Server/out/production/Server/Room.class
index 91a0473..ee692f6 100644
Binary files a/Server/out/production/Server/Room.class and b/Server/out/production/Server/Room.class differ
diff --git a/Server/out/production/Server/Server$1.class b/Server/out/production/Server/Server$1.class
index 3bd2f6c..95e4757 100644
Binary files a/Server/out/production/Server/Server$1.class and b/Server/out/production/Server/Server$1.class differ
diff --git a/Server/out/production/Server/Server.class b/Server/out/production/Server/Server.class
index dc4654e..e5f47dd 100644
Binary files a/Server/out/production/Server/Server.class and b/Server/out/production/Server/Server.class differ
diff --git a/Server/out/production/Server/Vector3.class b/Server/out/production/Server/Vector3.class
index f77b642..2ecd97a 100644
Binary files a/Server/out/production/Server/Vector3.class and b/Server/out/production/Server/Vector3.class differ
diff --git a/Server/src/Room.java b/Server/src/Room.java
index a651df7..8558809 100644
--- a/Server/src/Room.java
+++ b/Server/src/Room.java
@@ -270,6 +270,20 @@ public class Room
/**
* //the timeout check action
*/
+
+ case 10:
+ for (int i = 0; i < players.length; i++)
+ {
+ //Sync to OTHER players
+ if (i != player)
+ {
+ //!!data processing!!
+ //------------------------------action---player-------item index--------free space--------
+ players[i].output.write(new byte[]{10, (byte)player, readData[1], 0, 0, 0, 0, 0, 0, 0});
+ }
+ }
+ break;
+
case 126:
//!!server action!!
players[player].lastTimeSendTimeOutCheck = System.currentTimeMillis();