From 75e2c77d8348c7bc3c025f1250f130370181da13 Mon Sep 17 00:00:00 2001 From: Nathan Scutari Date: Fri, 24 May 2019 00:18:15 +0900 Subject: [PATCH] custom player spawn --- Assets/Menus/Lobby/LobbyCountdown.cs | 4 ++-- Assets/Menus/Lobby/LobbyObjectiveInit.cs | 4 ++-- Assets/Menus/Network/PlayerIdentity.cs | 4 ++-- Assets/Menus/WaitingRoom/WaitingRoomManager.cs | 4 ++-- .../Plugins/TextMesh Pro/Resources/Fonts & Materials.meta | 8 -------- Assets/Prefabs/Core/Arrow.prefab | 4 ++-- Assets/Resources/Fonts/AmazDooMLeft SDF.asset | 4 ++-- Assets/Resources/Fonts/AmazDooMRight SDF.asset | 4 ++-- Assets/Resources/Fonts/LiberationSans SDF.asset | 4 ++-- Assets/Resources/Fonts/big_noodle_titling SDF.asset | 4 ++-- Assets/Scenes/LobbyScene.unity | 4 ++-- Assets/Scenes/Local Simulator.unity | 4 ++-- Assets/Scripts/Game Management/GameManager.cs | 4 ++-- Assets/Scripts/Game Management/GameManagerNetwork.cs | 4 ++-- Assets/Scripts/Game Management/ObjectiveManager.cs | 4 ++-- Assets/Scripts/Game Management/PrefabStock.cs | 4 ++-- Assets/Scripts/Objectives/IObjective.cs | 4 ++-- Assets/Scripts/Objectives/Ob_Hold.cs | 4 ++-- Assets/Scripts/Objectives/Ob_Waypoints.cs | 4 ++-- .../WeaponSystem/Scripts/Weapon/CameraEffectComponent.cs | 4 ++-- ProjectSettings/EditorBuildSettings.asset | 4 ++-- ProjectSettings/QualitySettings.asset | 4 ++-- 22 files changed, 42 insertions(+), 50 deletions(-) delete mode 100644 Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta diff --git a/Assets/Menus/Lobby/LobbyCountdown.cs b/Assets/Menus/Lobby/LobbyCountdown.cs index 3828e32..8a2c502 100644 --- a/Assets/Menus/Lobby/LobbyCountdown.cs +++ b/Assets/Menus/Lobby/LobbyCountdown.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:232c60112fce074b4012f8099499de24705eee5f389dc30318d63e573027823f -size 1197 +oid sha256:3fdd4155536d0c38f71fcf2243930d343b0bfb4b6e0790688cf543306a370ee2 +size 1201 diff --git a/Assets/Menus/Lobby/LobbyObjectiveInit.cs b/Assets/Menus/Lobby/LobbyObjectiveInit.cs index fee34e4..a8c6567 100644 --- a/Assets/Menus/Lobby/LobbyObjectiveInit.cs +++ b/Assets/Menus/Lobby/LobbyObjectiveInit.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbb44214db84fec54c71848e6279fb456a92ce92ae8249727272af4aaa446407 -size 951 +oid sha256:73bbde24925c728cfbe906c9edec8251fe4ec074e250dcd9ec7673df3870cabf +size 1073 diff --git a/Assets/Menus/Network/PlayerIdentity.cs b/Assets/Menus/Network/PlayerIdentity.cs index 3dcf82c..017f341 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:bced47de427fe655ba99b22cd1cb9683e214e7e62037a9766094db4a6bd07d39 -size 384 +oid sha256:860f46a4bce0585e3db3bf10a818a9c0fdf8adfcc53d01f04001c96d325bb625 +size 549 diff --git a/Assets/Menus/WaitingRoom/WaitingRoomManager.cs b/Assets/Menus/WaitingRoom/WaitingRoomManager.cs index 128bb3d..17e8142 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:bec8f6a6099436086f43ba845e936ec78940e01ade9fb64f84ef2b84e06ccd97 -size 4596 +oid sha256:3a3adbb597788aa7a65d844b2b02158cf30f9ce80707e7fda3ef549a5eca20f5 +size 4548 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta deleted file mode 100644 index 55df787..0000000 --- a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 731f1baa9d144a9897cb1d341c2092b8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Core/Arrow.prefab b/Assets/Prefabs/Core/Arrow.prefab index 2fe5d3e..90f268b 100644 --- a/Assets/Prefabs/Core/Arrow.prefab +++ b/Assets/Prefabs/Core/Arrow.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:787f1745f3a3e510e2d9bb4cfc0107633e177913921011d361a9edc424ec2348 -size 4667 +oid sha256:7503c58a02050b39f9b2e06cd0317d293c14dac90e4c0e649a29c70d04fa4068 +size 4673 diff --git a/Assets/Resources/Fonts/AmazDooMLeft SDF.asset b/Assets/Resources/Fonts/AmazDooMLeft SDF.asset index 084a5cb..0460336 100644 --- a/Assets/Resources/Fonts/AmazDooMLeft SDF.asset +++ b/Assets/Resources/Fonts/AmazDooMLeft SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bca6b926d7ababbce0e1b5792f7f371ec613748bda50615a085e0abb8089708 -size 1099822 +oid sha256:13a800c5184851f3ed2a734b13dac3ea9aabb8e7af7b6fdf64dc49b8b70f6dec +size 1627240 diff --git a/Assets/Resources/Fonts/AmazDooMRight SDF.asset b/Assets/Resources/Fonts/AmazDooMRight SDF.asset index 14635d3..6744f19 100644 --- a/Assets/Resources/Fonts/AmazDooMRight SDF.asset +++ b/Assets/Resources/Fonts/AmazDooMRight SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e632a751cc8a0c7b9f4fe894ea9e99ac5553744a4702f2432d1ccbbc913272c -size 1099908 +oid sha256:002ff33742393fc870cb66e8d90574934d4aa7085d01391f6224058fb59cb39c +size 1627805 diff --git a/Assets/Resources/Fonts/LiberationSans SDF.asset b/Assets/Resources/Fonts/LiberationSans SDF.asset index 5c70eb6..4709ac0 100644 --- a/Assets/Resources/Fonts/LiberationSans SDF.asset +++ b/Assets/Resources/Fonts/LiberationSans SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79f303118db1d43f98b3ed41e71ea625a25a76f675f2aa833a93d8ae9d0c0dc1 -size 4354860 +oid sha256:7f4c78545b2d940c7cb0bd34ede6d3be97c52670723cb6bccfcc0c19c00aed62 +size 6452785 diff --git a/Assets/Resources/Fonts/big_noodle_titling SDF.asset b/Assets/Resources/Fonts/big_noodle_titling SDF.asset index 73c26ca..d019bf4 100644 --- a/Assets/Resources/Fonts/big_noodle_titling SDF.asset +++ b/Assets/Resources/Fonts/big_noodle_titling SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e8cd27c735c7e07ee78cfcf520bb8f16cebae1c2d90f7fd474ab9055e740786 -size 575687 +oid sha256:995663a0c6c8c91806ea5a8993470ccb22b13df8fe79567b0afbb470db368e84 +size 1152159 diff --git a/Assets/Scenes/LobbyScene.unity b/Assets/Scenes/LobbyScene.unity index 3a86f4a..ce1d454 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:cefc3a0563ae3d4ce11d02b3079164719aa9a4f1f73a597985f5264febbc6a46 -size 267887 +oid sha256:b2b461d682911a11c331de6f6c36432649e423c4f27237fc6b62b560c10df013 +size 268520 diff --git a/Assets/Scenes/Local Simulator.unity b/Assets/Scenes/Local Simulator.unity index a209de8..090077f 100644 --- a/Assets/Scenes/Local Simulator.unity +++ b/Assets/Scenes/Local Simulator.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:580657ba26ee7ebaaea8a6e2c3f41f0ec458a5159170a5318ecacfc414347009 -size 84800 +oid sha256:8b79701cb0900b7624c8a2353f6b791d5f282742594773659e2efdad671e5c70 +size 81671 diff --git a/Assets/Scripts/Game Management/GameManager.cs b/Assets/Scripts/Game Management/GameManager.cs index 7ee9666..ab5ca49 100644 --- a/Assets/Scripts/Game Management/GameManager.cs +++ b/Assets/Scripts/Game Management/GameManager.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74909641a8631ca73100e1b80b1d5fd24aa6500a6cf9840f4e2aedad6af30405 -size 6404 +oid sha256:edf7c269cd95a75e89d8be94516d38d262f448d121bba67bb0f79a9095e5435e +size 6502 diff --git a/Assets/Scripts/Game Management/GameManagerNetwork.cs b/Assets/Scripts/Game Management/GameManagerNetwork.cs index a58fd7f..ae80dff 100644 --- a/Assets/Scripts/Game Management/GameManagerNetwork.cs +++ b/Assets/Scripts/Game Management/GameManagerNetwork.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44bb95e4297162e76bf07b90ea64579cd32d9486d9c4b95337eac00a0b2de638 -size 2435 +oid sha256:af6fbabd8fccb63bf436750d9caff78da355d681e51c14c6234294a44b8d2f20 +size 2446 diff --git a/Assets/Scripts/Game Management/ObjectiveManager.cs b/Assets/Scripts/Game Management/ObjectiveManager.cs index b8b97fc..441e91e 100644 --- a/Assets/Scripts/Game Management/ObjectiveManager.cs +++ b/Assets/Scripts/Game Management/ObjectiveManager.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1e72963687c43755bcc5766aa4de108d0c302d19114e4653b8d72cfbb1a913e -size 4191 +oid sha256:8530e8640c30e019b0fc84bec481430cb60410e009ff4734902bd27d9aedb68a +size 4387 diff --git a/Assets/Scripts/Game Management/PrefabStock.cs b/Assets/Scripts/Game Management/PrefabStock.cs index 12084de..66b5a09 100644 --- a/Assets/Scripts/Game Management/PrefabStock.cs +++ b/Assets/Scripts/Game Management/PrefabStock.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:202846e687fb376fe8501ce0d2e7dfa068c64b762d76acf7e96eb0c1dbb1beb7 -size 170 +oid sha256:d4b41e32dc001f5c3301193c8a8b3bd09c8efd4ac55c9beb151d580601329e0a +size 2129 diff --git a/Assets/Scripts/Objectives/IObjective.cs b/Assets/Scripts/Objectives/IObjective.cs index 1dc8d02..ec99eb2 100644 --- a/Assets/Scripts/Objectives/IObjective.cs +++ b/Assets/Scripts/Objectives/IObjective.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18aec7934d4b1e5862a124855aea68f907c78a015ddf00a89ac7067f8b008d8c -size 643 +oid sha256:07128c69998608aed3c5dc6581ea113b640d6becca09f3106f7e1deabe6f1eac +size 658 diff --git a/Assets/Scripts/Objectives/Ob_Hold.cs b/Assets/Scripts/Objectives/Ob_Hold.cs index ec84628..64a5afe 100644 --- a/Assets/Scripts/Objectives/Ob_Hold.cs +++ b/Assets/Scripts/Objectives/Ob_Hold.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cc249683c1b0a199a9aa97b5ed1844d559b13edece6dcf9d5e574fc639b134f -size 2538 +oid sha256:2a129828ad170cb04d7ff3d8abc34aa00619c608139575f8991e82491cc7fc36 +size 2613 diff --git a/Assets/Scripts/Objectives/Ob_Waypoints.cs b/Assets/Scripts/Objectives/Ob_Waypoints.cs index 978ae4b..88d20bf 100644 --- a/Assets/Scripts/Objectives/Ob_Waypoints.cs +++ b/Assets/Scripts/Objectives/Ob_Waypoints.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e97ab781fa33a713fa83ff5be08c4bcd864e9847f6b127d633f4b13f22e4fc8 -size 2731 +oid sha256:e6dc59999c2db038ad0d6435f632c9327de3fc81e7408f2dd1d3cd37f84dac78 +size 2784 diff --git a/Assets/WeaponSystem/Scripts/Weapon/CameraEffectComponent.cs b/Assets/WeaponSystem/Scripts/Weapon/CameraEffectComponent.cs index 82c88c0..551a8f7 100644 --- a/Assets/WeaponSystem/Scripts/Weapon/CameraEffectComponent.cs +++ b/Assets/WeaponSystem/Scripts/Weapon/CameraEffectComponent.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b850b060c474164f439566729b33f29c2acc0d123cc60b96bd9cf0fc02d9633 -size 920 +oid sha256:54c11db9e09a768481eb39e093153599543595e432d0b646d70b0eeb92c7b15d +size 969 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 732603b..8e41bc3 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46cf77e1c7d4a819696ffa92de1940d8db696c772c823ff423162c1fd306ecb2 -size 558 +oid sha256:a7fcb8036edc5d4cbcd477cab0753f3da2710500856b66766291217df173fbc0 +size 662 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index ab5cd44..d874023 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d54bdad8f72739550b026c07fa5f646168c809a2b5a1ff5ee1610b4a59329e4 -size 6278 +oid sha256:28218edb4a4ee16a3cb90f4a3f25e8e1c6fe1c8255adb1c10e21fff29cb7bd3c +size 6248