From a349fa23bda036f7b9932d4d760bc83f0e66ff9f Mon Sep 17 00:00:00 2001 From: Hugo Willaume Date: Thu, 9 May 2019 16:22:36 +0900 Subject: [PATCH] Generating objectives in the menus, displaying them to the player --- Assets/Menus/Lobby/CarDynamicModel.cs | 4 ++-- Assets/Menus/Lobby/EnsureTMPTextSize.cs | 3 +++ Assets/Menus/Lobby/EnsureTMPTextSize.cs.meta | 11 +++++++++++ Assets/Menus/Lobby/LobbyObjectiveInit.cs | 3 +++ Assets/Menus/Lobby/LobbyObjectiveInit.cs.meta | 11 +++++++++++ Assets/Menus/Lobby/Objective Content.prefab | 3 +++ Assets/Menus/Lobby/Objective Content.prefab.meta | 7 +++++++ Assets/Menus/Lobby/PlayerIdentity.cs | 3 --- Assets/Menus/Network/PlayerIdentity.cs | 3 +++ .../Menus/{Lobby => Network}/PlayerIdentity.cs.meta | 0 Assets/Menus/WaitingRoom/WaitingRoomManager.cs | 4 ++-- .../JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll | 4 ++-- .../TextMesh Pro/Resources/Fonts & Materials.meta | 8 ++++++++ Assets/Scenes/LobbyScene.unity | 4 ++-- Assets/Scripts/Game Management/GameManager.cs | 4 ++-- Assets/Scripts/Game Management/ObjectiveManager.cs | 4 ++-- 16 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 Assets/Menus/Lobby/EnsureTMPTextSize.cs create mode 100644 Assets/Menus/Lobby/EnsureTMPTextSize.cs.meta create mode 100644 Assets/Menus/Lobby/LobbyObjectiveInit.cs create mode 100644 Assets/Menus/Lobby/LobbyObjectiveInit.cs.meta create mode 100644 Assets/Menus/Lobby/Objective Content.prefab create mode 100644 Assets/Menus/Lobby/Objective Content.prefab.meta delete mode 100644 Assets/Menus/Lobby/PlayerIdentity.cs create mode 100644 Assets/Menus/Network/PlayerIdentity.cs rename Assets/Menus/{Lobby => Network}/PlayerIdentity.cs.meta (100%) create mode 100644 Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta diff --git a/Assets/Menus/Lobby/CarDynamicModel.cs b/Assets/Menus/Lobby/CarDynamicModel.cs index bc84e42..6428da5 100644 --- a/Assets/Menus/Lobby/CarDynamicModel.cs +++ b/Assets/Menus/Lobby/CarDynamicModel.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3bd97025d033f3e99bf146d4204dd8569ab1c83223d8aeaf7f42ec318395b87 -size 4081 +oid sha256:ad9fecfd200983444178189205036536fc5fc59d2045044a8c8604ffe5f12b78 +size 4382 diff --git a/Assets/Menus/Lobby/EnsureTMPTextSize.cs b/Assets/Menus/Lobby/EnsureTMPTextSize.cs new file mode 100644 index 0000000..693526d --- /dev/null +++ b/Assets/Menus/Lobby/EnsureTMPTextSize.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c248178128245ce2c1ba32c025b07af75e7c188e74966529d2bf60ff0d660f58 +size 594 diff --git a/Assets/Menus/Lobby/EnsureTMPTextSize.cs.meta b/Assets/Menus/Lobby/EnsureTMPTextSize.cs.meta new file mode 100644 index 0000000..48e81d6 --- /dev/null +++ b/Assets/Menus/Lobby/EnsureTMPTextSize.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7ac9a571c4fdbf04eb9fec7913e8292b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Lobby/LobbyObjectiveInit.cs b/Assets/Menus/Lobby/LobbyObjectiveInit.cs new file mode 100644 index 0000000..353d6ca --- /dev/null +++ b/Assets/Menus/Lobby/LobbyObjectiveInit.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6693d0c7e75b4a65a94ccaa311cc67a6901b3267249a9e8e931f81c05929c1e +size 987 diff --git a/Assets/Menus/Lobby/LobbyObjectiveInit.cs.meta b/Assets/Menus/Lobby/LobbyObjectiveInit.cs.meta new file mode 100644 index 0000000..9dbb448 --- /dev/null +++ b/Assets/Menus/Lobby/LobbyObjectiveInit.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7ec8fdf72720193439ec155ce00f34a7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Lobby/Objective Content.prefab b/Assets/Menus/Lobby/Objective Content.prefab new file mode 100644 index 0000000..be3e4ff --- /dev/null +++ b/Assets/Menus/Lobby/Objective Content.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bcec1df4eab5026703cc510509c127c5236ec053486b1aca6700baeab46528e +size 7925 diff --git a/Assets/Menus/Lobby/Objective Content.prefab.meta b/Assets/Menus/Lobby/Objective Content.prefab.meta new file mode 100644 index 0000000..6050d93 --- /dev/null +++ b/Assets/Menus/Lobby/Objective Content.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 44f5c43c00d0cc34fa6f3227f064e234 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Lobby/PlayerIdentity.cs b/Assets/Menus/Lobby/PlayerIdentity.cs deleted file mode 100644 index 7570508..0000000 --- a/Assets/Menus/Lobby/PlayerIdentity.cs +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07aef50acf6f1207dd84240943bcf8e9460aa37feceb72cad01acd3315cfd1f3 -size 437 diff --git a/Assets/Menus/Network/PlayerIdentity.cs b/Assets/Menus/Network/PlayerIdentity.cs new file mode 100644 index 0000000..f5828ca --- /dev/null +++ b/Assets/Menus/Network/PlayerIdentity.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b207dfad1f5610eb09d50c084ff9ddb2eddd76e79217f3de56a02bb111ec254f +size 351 diff --git a/Assets/Menus/Lobby/PlayerIdentity.cs.meta b/Assets/Menus/Network/PlayerIdentity.cs.meta similarity index 100% rename from Assets/Menus/Lobby/PlayerIdentity.cs.meta rename to Assets/Menus/Network/PlayerIdentity.cs.meta diff --git a/Assets/Menus/WaitingRoom/WaitingRoomManager.cs b/Assets/Menus/WaitingRoom/WaitingRoomManager.cs index de277c3..476e235 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:2d96b8f3fcf8890ed7e7b21534c6cf2f70dfa34f493fef04fee555aca1f2dcf1 -size 4490 +oid sha256:a50b2f57cdcd926893fae1975ce5146e15b43e7029e3db050272bfc43aa4be5f +size 4482 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 e71489b..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:d5c3ceb7b8289e903d1aca5e963428ffd325277be83feede83e8ce39f6a0a4a0 -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/Scenes/LobbyScene.unity b/Assets/Scenes/LobbyScene.unity index 642815e..d892cc1 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:c6bee26acbbc62d69de138e75abe9505ca3caad27672939b79fd835e1800b7f7 -size 298345 +oid sha256:1d25cb749c289c3fcc395364dfc2f4a09738bb7732a221a19b2a940ac09cd9ef +size 267878 diff --git a/Assets/Scripts/Game Management/GameManager.cs b/Assets/Scripts/Game Management/GameManager.cs index dfbf454..b0d48b2 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:a9b7873003297face5894bff58bfd0c45326b766f7f5f01dc1c956df094b35a6 -size 5842 +oid sha256:176730fb276757c003bb64c8711419bbd1eb0de2c36565a485af40ed04945222 +size 5838 diff --git a/Assets/Scripts/Game Management/ObjectiveManager.cs b/Assets/Scripts/Game Management/ObjectiveManager.cs index 58c7e33..d25fca2 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:2636d969049ee58a4ca605e75a66014f1c9f99d2f9270e640df1059cdc3fdf2d -size 4074 +oid sha256:bd0175b1a665072699af5eee554fe7874ee951cc6c84b75475c81bc2c05cb77c +size 4162