From b9212ea1a39f8af4c4e58b8409be623f27ae83ea Mon Sep 17 00:00:00 2001 From: Hugo Willaume Date: Thu, 2 May 2019 19:46:40 +0900 Subject: [PATCH] Put in place the system for displaying the choice of weapons / cars / powers --- Assets/Menus/Lobby/ChoiceButton.cs | 3 +++ Assets/Menus/Lobby/ChoiceButton.cs.meta | 11 +++++++++++ .../TextMesh Pro/Resources/Fonts & Materials.meta | 8 ++++++++ Assets/Scenes/LobbyScene.unity | 4 ++-- ProjectSettings/QualitySettings.asset | 4 ++-- 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 Assets/Menus/Lobby/ChoiceButton.cs create mode 100644 Assets/Menus/Lobby/ChoiceButton.cs.meta create mode 100644 Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta diff --git a/Assets/Menus/Lobby/ChoiceButton.cs b/Assets/Menus/Lobby/ChoiceButton.cs new file mode 100644 index 0000000..2483a71 --- /dev/null +++ b/Assets/Menus/Lobby/ChoiceButton.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61634b40d6110adf40ae021516b422d525e4fb903cf9df3721d4576e7b4a965c +size 4871 diff --git a/Assets/Menus/Lobby/ChoiceButton.cs.meta b/Assets/Menus/Lobby/ChoiceButton.cs.meta new file mode 100644 index 0000000..2b768aa --- /dev/null +++ b/Assets/Menus/Lobby/ChoiceButton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cbe9124b58d89434399ada38f86f46ea +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: 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/Scenes/LobbyScene.unity b/Assets/Scenes/LobbyScene.unity index a3fd7c4..1752061 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:9246d06a92ef51958c078f5fbe87ad898ad5011c5e3efe55aaf09e9969774582 -size 141896 +oid sha256:b2c98614160a7381df8f921d7e43c43faf09523cafe544c2ddc83f3906b35548 +size 168495 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index d874023..038a509 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28218edb4a4ee16a3cb90f4a3f25e8e1c6fe1c8255adb1c10e21fff29cb7bd3c -size 6248 +oid sha256:de59c7263c2d6953662f6f468add454dd2dc24ed31f7d3993c07a4835b5763c2 +size 6263