From 19804189f46e8e1d089f5f3e8878f9080ae318d7 Mon Sep 17 00:00:00 2001 From: Hugo Willaume Date: Thu, 30 May 2019 20:12:34 +0900 Subject: [PATCH] Started graphic elements of end of game UI --- .../Examples & Extras.meta => Menus/AfterGame.meta} | 2 +- Assets/Menus/AfterGame/EndOfGameLobbyManager.cs | 3 +++ Assets/Menus/AfterGame/EndOfGameLobbyManager.cs.meta | 11 +++++++++++ Assets/Menus/AfterGame/First.prefab | 3 +++ Assets/Menus/AfterGame/First.prefab.meta | 7 +++++++ Assets/Menus/AfterGame/Second.prefab | 3 +++ Assets/Menus/AfterGame/Second.prefab.meta | 7 +++++++ Assets/Menus/AfterGame/Third.prefab | 3 +++ Assets/Menus/AfterGame/Third.prefab.meta | 7 +++++++ Assets/Menus/Network/MenuNetwork.cs | 4 ++-- Assets/Menus/WaitingRoom/WaitingLobbyHostControls.cs | 4 ++-- .../TextMesh Pro/Resources/Fonts & Materials.meta | 8 ++++++++ Assets/Scenes/EndOfGameMenu.unity | 3 +++ Assets/Scenes/EndOfGameMenu.unity.meta | 7 +++++++ 14 files changed, 67 insertions(+), 5 deletions(-) rename Assets/{Plugins/TextMesh Pro/Examples & Extras.meta => Menus/AfterGame.meta} (77%) create mode 100644 Assets/Menus/AfterGame/EndOfGameLobbyManager.cs create mode 100644 Assets/Menus/AfterGame/EndOfGameLobbyManager.cs.meta create mode 100644 Assets/Menus/AfterGame/First.prefab create mode 100644 Assets/Menus/AfterGame/First.prefab.meta create mode 100644 Assets/Menus/AfterGame/Second.prefab create mode 100644 Assets/Menus/AfterGame/Second.prefab.meta create mode 100644 Assets/Menus/AfterGame/Third.prefab create mode 100644 Assets/Menus/AfterGame/Third.prefab.meta create mode 100644 Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta create mode 100644 Assets/Scenes/EndOfGameMenu.unity create mode 100644 Assets/Scenes/EndOfGameMenu.unity.meta diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras.meta b/Assets/Menus/AfterGame.meta similarity index 77% rename from Assets/Plugins/TextMesh Pro/Examples & Extras.meta rename to Assets/Menus/AfterGame.meta index d94c9b5..a37aa82 100644 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras.meta +++ b/Assets/Menus/AfterGame.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ce51c8e33b734b4db6086586558c53a3 +guid: 263acffaa5d7fe5409a53a61953eb613 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs b/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs new file mode 100644 index 0000000..9e86da1 --- /dev/null +++ b/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1228d0660aa0f6e05c66bbac69a46624784be09319ab4f6ad05e09187fd7debb +size 624 diff --git a/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs.meta b/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs.meta new file mode 100644 index 0000000..128ea60 --- /dev/null +++ b/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6717cf7fd06938d439d6a1afdbe2c161 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/AfterGame/First.prefab b/Assets/Menus/AfterGame/First.prefab new file mode 100644 index 0000000..86f07eb --- /dev/null +++ b/Assets/Menus/AfterGame/First.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c9271e7c90beca0cf6437910817e933c52c3b7a068a375a1bb3a2e1b63fcf6a +size 21684 diff --git a/Assets/Menus/AfterGame/First.prefab.meta b/Assets/Menus/AfterGame/First.prefab.meta new file mode 100644 index 0000000..31d5d03 --- /dev/null +++ b/Assets/Menus/AfterGame/First.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9e3c8fb4b83e53241a84d8a1cd51c303 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/AfterGame/Second.prefab b/Assets/Menus/AfterGame/Second.prefab new file mode 100644 index 0000000..faece17 --- /dev/null +++ b/Assets/Menus/AfterGame/Second.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3492e6862f7a6f15dbfc1904b012128d5135eed55fa444800304afaa9b1b147 +size 21836 diff --git a/Assets/Menus/AfterGame/Second.prefab.meta b/Assets/Menus/AfterGame/Second.prefab.meta new file mode 100644 index 0000000..de07934 --- /dev/null +++ b/Assets/Menus/AfterGame/Second.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 38f63e92ad092694f928318962690efa +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/AfterGame/Third.prefab b/Assets/Menus/AfterGame/Third.prefab new file mode 100644 index 0000000..853517d --- /dev/null +++ b/Assets/Menus/AfterGame/Third.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62c4d09745e1b4f36ee596b6d82426266499399527f485e685b36e31d918ffe7 +size 21842 diff --git a/Assets/Menus/AfterGame/Third.prefab.meta b/Assets/Menus/AfterGame/Third.prefab.meta new file mode 100644 index 0000000..2baa7e3 --- /dev/null +++ b/Assets/Menus/AfterGame/Third.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a7c3fff12e0d94f4891a4e26c8bc1d6e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Network/MenuNetwork.cs b/Assets/Menus/Network/MenuNetwork.cs index 2f87e5c..6d8ff62 100644 --- a/Assets/Menus/Network/MenuNetwork.cs +++ b/Assets/Menus/Network/MenuNetwork.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbc1f1238de36c9806f08fad986fb5a9d9c18a46f8ef8eb35c19340b77341c75 -size 3535 +oid sha256:478647fb1b2ad656facf411da980ec6b732b140c57567378f4c5a746c2e301bb +size 3545 diff --git a/Assets/Menus/WaitingRoom/WaitingLobbyHostControls.cs b/Assets/Menus/WaitingRoom/WaitingLobbyHostControls.cs index f1ed931..d161c1d 100644 --- a/Assets/Menus/WaitingRoom/WaitingLobbyHostControls.cs +++ b/Assets/Menus/WaitingRoom/WaitingLobbyHostControls.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e15a7ec4dbf22e40357c69c152c3dcdc0b00ee6a25e5fe6a291c48c73da5c9e4 -size 1370 +oid sha256:82eec00a5574471a040e56dbeeaeb829f934d199e9ca13f513adbb874ca1bcc0 +size 1407 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/EndOfGameMenu.unity b/Assets/Scenes/EndOfGameMenu.unity new file mode 100644 index 0000000..dbd7be3 --- /dev/null +++ b/Assets/Scenes/EndOfGameMenu.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bae38cbb80812fd46be36403c778bed9552afdabc0c2e116d29364239c090d0d +size 58530 diff --git a/Assets/Scenes/EndOfGameMenu.unity.meta b/Assets/Scenes/EndOfGameMenu.unity.meta new file mode 100644 index 0000000..c33c1b3 --- /dev/null +++ b/Assets/Scenes/EndOfGameMenu.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a465d972c0bbef742b99ca943e0ce723 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: