From 367d5ed7522c2da2b46b34d81dd13d42ab3f3460 Mon Sep 17 00:00:00 2001 From: Hugo Willaume Date: Thu, 23 May 2019 15:56:51 +0900 Subject: [PATCH 1/2] Added script to get the correct car prefab (and weapon later, currently disabled) from the player identity --- ...ins.Rider.Unity.Editor.Plugin.Repacked.dll | 4 ++-- .../Resources/Fonts & Materials.meta | 8 ++++++++ Assets/Scripts/SceneInitialization.meta | 8 ++++++++ .../SceneInitialization/CarInitializer.cs | 3 +++ .../CarInitializer.cs.meta | 20 +++++++++++++++++++ .../NetworkTestLaunchManager.cs | 0 .../NetworkTestLaunchManager.cs.meta | 0 7 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta create mode 100644 Assets/Scripts/SceneInitialization.meta create mode 100644 Assets/Scripts/SceneInitialization/CarInitializer.cs create mode 100644 Assets/Scripts/SceneInitialization/CarInitializer.cs.meta rename Assets/Scripts/{ => SceneInitialization}/NetworkTestLaunchManager.cs (100%) rename Assets/Scripts/{ => SceneInitialization}/NetworkTestLaunchManager.cs.meta (100%) diff --git a/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll b/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll index 3531f1e..7567b0a 100644 --- a/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll +++ b/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6af8463c246acd3a42aeb7f6885b6caa5b4e76db173b29ff0335b90210ef640c -size 1350656 +oid sha256:73f30e4bdea5de1180722029149177d7c97f061aeb36dc7f1a626f24c8d32fd0 +size 817664 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta new file mode 100644 index 0000000..55df787 --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 731f1baa9d144a9897cb1d341c2092b8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SceneInitialization.meta b/Assets/Scripts/SceneInitialization.meta new file mode 100644 index 0000000..11028c1 --- /dev/null +++ b/Assets/Scripts/SceneInitialization.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7eb63a258c7d8384ab2ebeb41579eecd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SceneInitialization/CarInitializer.cs b/Assets/Scripts/SceneInitialization/CarInitializer.cs new file mode 100644 index 0000000..3b8571d --- /dev/null +++ b/Assets/Scripts/SceneInitialization/CarInitializer.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09ac02f987c56be1f2af9164c6f0ad2c70ff835ebbaf0698f81f6aaa7d8584a9 +size 1918 diff --git a/Assets/Scripts/SceneInitialization/CarInitializer.cs.meta b/Assets/Scripts/SceneInitialization/CarInitializer.cs.meta new file mode 100644 index 0000000..5f32c18 --- /dev/null +++ b/Assets/Scripts/SceneInitialization/CarInitializer.cs.meta @@ -0,0 +1,20 @@ +fileFormatVersion: 2 +guid: 6730e9056ecc88c478c9e31a7a015aca +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: + - LightCar: {fileID: 2193745503433322958, guid: 80eb47f1eeb97c543a16ad9daa42364e, + type: 3} + - MediumCar: {fileID: 4786026965939563618, guid: 1c389d213e32dce4299a5f1323c437ea, + type: 3} + - HeavyCar: {fileID: 23044736461324762, guid: 687465781237140468bf8260666deae7, + type: 3} + - MachineGun: {instanceID: 0} + - Sniper: {instanceID: 0} + - Shotgun: {instanceID: 0} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NetworkTestLaunchManager.cs b/Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs similarity index 100% rename from Assets/Scripts/NetworkTestLaunchManager.cs rename to Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs diff --git a/Assets/Scripts/NetworkTestLaunchManager.cs.meta b/Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs.meta similarity index 100% rename from Assets/Scripts/NetworkTestLaunchManager.cs.meta rename to Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs.meta From 56d094755915803b0419289978553c9072e9ff83 Mon Sep 17 00:00:00 2001 From: Hugo Willaume Date: Thu, 23 May 2019 17:14:15 +0900 Subject: [PATCH 2/2] Added number of players in PlayerIdentity --- Assets/Menus/Lobby/ChoiceButton.cs | 4 ++-- Assets/Menus/Network/PlayerIdentity.cs | 4 ++-- Assets/Menus/WaitingRoom/WaitingRoomManager.cs | 4 ++-- Assets/Scenes/LobbyScene.unity | 4 ++-- .../Scripts/SceneInitialization/NetworkTestLaunchManager.cs | 4 ++-- ProjectSettings/EditorBuildSettings.asset | 4 ++-- ProjectSettings/GraphicsSettings.asset | 4 ++-- ProjectSettings/UnityConnectSettings.asset | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Assets/Menus/Lobby/ChoiceButton.cs b/Assets/Menus/Lobby/ChoiceButton.cs index 05e42d2..ca959d3 100644 --- a/Assets/Menus/Lobby/ChoiceButton.cs +++ b/Assets/Menus/Lobby/ChoiceButton.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b0d70a5afe43fcda053fafe055c261b20b0cae0ff939894555ff164fd29b8cf -size 4913 +oid sha256:f6ddd91b0c030d9f0aaa275a0442ad8c2182bab09170d37828fa26cd753525de +size 4855 diff --git a/Assets/Menus/Network/PlayerIdentity.cs b/Assets/Menus/Network/PlayerIdentity.cs index f5828ca..3dcf82c 100644 --- a/Assets/Menus/Network/PlayerIdentity.cs +++ b/Assets/Menus/Network/PlayerIdentity.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b207dfad1f5610eb09d50c084ff9ddb2eddd76e79217f3de56a02bb111ec254f -size 351 +oid sha256:bced47de427fe655ba99b22cd1cb9683e214e7e62037a9766094db4a6bd07d39 +size 384 diff --git a/Assets/Menus/WaitingRoom/WaitingRoomManager.cs b/Assets/Menus/WaitingRoom/WaitingRoomManager.cs index 476e235..128bb3d 100644 --- a/Assets/Menus/WaitingRoom/WaitingRoomManager.cs +++ b/Assets/Menus/WaitingRoom/WaitingRoomManager.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a50b2f57cdcd926893fae1975ce5146e15b43e7029e3db050272bfc43aa4be5f -size 4482 +oid sha256:bec8f6a6099436086f43ba845e936ec78940e01ade9fb64f84ef2b84e06ccd97 +size 4596 diff --git a/Assets/Scenes/LobbyScene.unity b/Assets/Scenes/LobbyScene.unity index dcd3d58..3a86f4a 100644 --- a/Assets/Scenes/LobbyScene.unity +++ b/Assets/Scenes/LobbyScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ea473be3d831df127ea15471233afa3d6c12f8fadfd43011ffb8e9f1636bed0 -size 267895 +oid sha256:cefc3a0563ae3d4ce11d02b3079164719aa9a4f1f73a597985f5264febbc6a46 +size 267887 diff --git a/Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs b/Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs index d8a2634..bf127e7 100644 --- a/Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs +++ b/Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec5360613e97d8d295a4867bdf0def43bfa07272e61acf7c8ff89c3d129e156a -size 1286 +oid sha256:1a554900f7068cb45f332c812297ed0f8792be99a2cf7818acdab30e58685dfa +size 1238 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index b037fb2..732603b 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a10b012043232327506a4aee1490d145d6e6176d620bf88358bb6384ee20243a -size 754 +oid sha256:46cf77e1c7d4a819696ffa92de1940d8db696c772c823ff423162c1fd306ecb2 +size 558 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index a3d0fac..05bd48c 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f328dc3005d7577c0066fca9581eceb40065873bf8d1ff67d7a17278b8d2989 -size 2152 +oid sha256:b9d17ff3c5231a288e150a8e8ea770b9a7b83baaceaba54e20603955b234b4e0 +size 2290 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index e1e71c9..82513ef 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e06370b3d2256d4dbc8892f59a8467d9f9785f034a4836a6790380252eb4916 +oid sha256:40f4069ef87c987912306c30baf267eeb27081af1429e14caab0908e123c30e2 size 853