From 9a7c031dcd747feb41ce04eb375f60f2b2bc4427 Mon Sep 17 00:00:00 2001 From: Hurlu Date: Sun, 2 Jun 2019 17:44:10 +0900 Subject: [PATCH] Finished graphical handling of leaderboard, network to be tested --- Assets/Menus/AfterGame/EndOfGameLobbyManager.cs | 4 ++-- Assets/Menus/AfterGame/First.prefab | 3 --- Assets/Menus/AfterGame/FirstLeaderboardPrefab.prefab | 3 +++ ...prefab.meta => FirstLeaderboardPrefab.prefab.meta} | 0 Assets/Menus/AfterGame/LeaderboardPrefabSetup.cs | 3 +++ Assets/Menus/AfterGame/LeaderboardPrefabSetup.cs.meta | 11 +++++++++++ Assets/Menus/AfterGame/ScoreDistributer.cs | 3 +++ Assets/Menus/AfterGame/ScoreDistributer.cs.meta | 11 +++++++++++ Assets/Menus/AfterGame/ScrollFix.cs | 3 +++ Assets/Menus/AfterGame/ScrollFix.cs.meta | 11 +++++++++++ Assets/Menus/AfterGame/Second.prefab | 3 --- Assets/Menus/AfterGame/SecondLeaderboardPrefab.prefab | 3 +++ ...refab.meta => SecondLeaderboardPrefab.prefab.meta} | 0 Assets/Menus/AfterGame/Third++.prefab | 3 --- .../Menus/AfterGame/Third++LeaderboardPrefab.prefab | 3 +++ ...efab.meta => Third++LeaderboardPrefab.prefab.meta} | 0 Assets/Menus/AfterGame/Third.prefab | 3 --- Assets/Menus/AfterGame/ThirdLeaderboardPrefab.prefab | 3 +++ ...prefab.meta => ThirdLeaderboardPrefab.prefab.meta} | 0 Assets/Menus/Lobby/CarDynamicModel.cs | 4 ++-- Assets/Scenes/EndOfGameMenu.unity | 4 ++-- Assets/Scenes/MainMenu.unity | 4 ++-- Assets/Scripts/Game Management/GameManager.cs | 4 ++-- Assets/Scripts/Game Management/Host Stats Tracker.cs | 4 ++-- 24 files changed, 66 insertions(+), 24 deletions(-) delete mode 100644 Assets/Menus/AfterGame/First.prefab create mode 100644 Assets/Menus/AfterGame/FirstLeaderboardPrefab.prefab rename Assets/Menus/AfterGame/{First.prefab.meta => FirstLeaderboardPrefab.prefab.meta} (100%) create mode 100644 Assets/Menus/AfterGame/LeaderboardPrefabSetup.cs create mode 100644 Assets/Menus/AfterGame/LeaderboardPrefabSetup.cs.meta create mode 100644 Assets/Menus/AfterGame/ScoreDistributer.cs create mode 100644 Assets/Menus/AfterGame/ScoreDistributer.cs.meta create mode 100644 Assets/Menus/AfterGame/ScrollFix.cs create mode 100644 Assets/Menus/AfterGame/ScrollFix.cs.meta delete mode 100644 Assets/Menus/AfterGame/Second.prefab create mode 100644 Assets/Menus/AfterGame/SecondLeaderboardPrefab.prefab rename Assets/Menus/AfterGame/{Second.prefab.meta => SecondLeaderboardPrefab.prefab.meta} (100%) delete mode 100644 Assets/Menus/AfterGame/Third++.prefab create mode 100644 Assets/Menus/AfterGame/Third++LeaderboardPrefab.prefab rename Assets/Menus/AfterGame/{Third++.prefab.meta => Third++LeaderboardPrefab.prefab.meta} (100%) delete mode 100644 Assets/Menus/AfterGame/Third.prefab create mode 100644 Assets/Menus/AfterGame/ThirdLeaderboardPrefab.prefab rename Assets/Menus/AfterGame/{Third.prefab.meta => ThirdLeaderboardPrefab.prefab.meta} (100%) diff --git a/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs b/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs index 80f2fd7..d7c2526 100644 --- a/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs +++ b/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5198081b0f5e73f05d52d079f75053d7a71785587d62d59fb44be4b9b72610a -size 991 +oid sha256:a1b393664b9e6b6076d8b0834c5c9f9b6252aa4f04ea760f6bd401bc39f2ffec +size 3393 diff --git a/Assets/Menus/AfterGame/First.prefab b/Assets/Menus/AfterGame/First.prefab deleted file mode 100644 index dadebaa..0000000 --- a/Assets/Menus/AfterGame/First.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0687a62d268658f3728f90eb1517af911985932623f89dbb45e8325d3d510da6 -size 21679 diff --git a/Assets/Menus/AfterGame/FirstLeaderboardPrefab.prefab b/Assets/Menus/AfterGame/FirstLeaderboardPrefab.prefab new file mode 100644 index 0000000..60c0dda --- /dev/null +++ b/Assets/Menus/AfterGame/FirstLeaderboardPrefab.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1704c352d610e17f7351c216a6c0ce929ff075115c6e1194a42e7187f6772380 +size 22273 diff --git a/Assets/Menus/AfterGame/First.prefab.meta b/Assets/Menus/AfterGame/FirstLeaderboardPrefab.prefab.meta similarity index 100% rename from Assets/Menus/AfterGame/First.prefab.meta rename to Assets/Menus/AfterGame/FirstLeaderboardPrefab.prefab.meta diff --git a/Assets/Menus/AfterGame/LeaderboardPrefabSetup.cs b/Assets/Menus/AfterGame/LeaderboardPrefabSetup.cs new file mode 100644 index 0000000..4b24818 --- /dev/null +++ b/Assets/Menus/AfterGame/LeaderboardPrefabSetup.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a30c4524e99ea1be917f1d04d9fd174505b3c45e77554dbba9968e89313554b +size 1006 diff --git a/Assets/Menus/AfterGame/LeaderboardPrefabSetup.cs.meta b/Assets/Menus/AfterGame/LeaderboardPrefabSetup.cs.meta new file mode 100644 index 0000000..720fff4 --- /dev/null +++ b/Assets/Menus/AfterGame/LeaderboardPrefabSetup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: df8ba536bcc5bfe48839320ab4bc14ef +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/AfterGame/ScoreDistributer.cs b/Assets/Menus/AfterGame/ScoreDistributer.cs new file mode 100644 index 0000000..0d10b8c --- /dev/null +++ b/Assets/Menus/AfterGame/ScoreDistributer.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa6c4f1a94e5cf290815e8fd863ddc8c9dd58f83787f1af7eda139c47c218915 +size 665 diff --git a/Assets/Menus/AfterGame/ScoreDistributer.cs.meta b/Assets/Menus/AfterGame/ScoreDistributer.cs.meta new file mode 100644 index 0000000..e29f6be --- /dev/null +++ b/Assets/Menus/AfterGame/ScoreDistributer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 427c2ef7c12ec244bb87b450722d8156 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/AfterGame/ScrollFix.cs b/Assets/Menus/AfterGame/ScrollFix.cs new file mode 100644 index 0000000..a09f7a1 --- /dev/null +++ b/Assets/Menus/AfterGame/ScrollFix.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03d026b58fa37a5166a05621be897c1c883044c11d6bb3843f9c5294b42fdec8 +size 584 diff --git a/Assets/Menus/AfterGame/ScrollFix.cs.meta b/Assets/Menus/AfterGame/ScrollFix.cs.meta new file mode 100644 index 0000000..fe8904d --- /dev/null +++ b/Assets/Menus/AfterGame/ScrollFix.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f5e9c69b7c0c2de439b1d50e97040c65 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/AfterGame/Second.prefab b/Assets/Menus/AfterGame/Second.prefab deleted file mode 100644 index 00629a1..0000000 --- a/Assets/Menus/AfterGame/Second.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e9fccf52fe6e26e1449e09332846f17951b4a6e5696afcfc3bd3bbd1f313c30 -size 21768 diff --git a/Assets/Menus/AfterGame/SecondLeaderboardPrefab.prefab b/Assets/Menus/AfterGame/SecondLeaderboardPrefab.prefab new file mode 100644 index 0000000..216bbbd --- /dev/null +++ b/Assets/Menus/AfterGame/SecondLeaderboardPrefab.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab01a01b8b904d289ad7ac8992f8373a60cde4bb4b5e862783e67e521d982f58 +size 22366 diff --git a/Assets/Menus/AfterGame/Second.prefab.meta b/Assets/Menus/AfterGame/SecondLeaderboardPrefab.prefab.meta similarity index 100% rename from Assets/Menus/AfterGame/Second.prefab.meta rename to Assets/Menus/AfterGame/SecondLeaderboardPrefab.prefab.meta diff --git a/Assets/Menus/AfterGame/Third++.prefab b/Assets/Menus/AfterGame/Third++.prefab deleted file mode 100644 index 5141557..0000000 --- a/Assets/Menus/AfterGame/Third++.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f84df0839f992eee494322e20fea316127e4689669a7a960a900cbacc6aafb8 -size 21803 diff --git a/Assets/Menus/AfterGame/Third++LeaderboardPrefab.prefab b/Assets/Menus/AfterGame/Third++LeaderboardPrefab.prefab new file mode 100644 index 0000000..4d2e645 --- /dev/null +++ b/Assets/Menus/AfterGame/Third++LeaderboardPrefab.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d635b449484234f7d61e646668952bbde76bc5b485ef26324695e2ebfe83b6a1 +size 22402 diff --git a/Assets/Menus/AfterGame/Third++.prefab.meta b/Assets/Menus/AfterGame/Third++LeaderboardPrefab.prefab.meta similarity index 100% rename from Assets/Menus/AfterGame/Third++.prefab.meta rename to Assets/Menus/AfterGame/Third++LeaderboardPrefab.prefab.meta diff --git a/Assets/Menus/AfterGame/Third.prefab b/Assets/Menus/AfterGame/Third.prefab deleted file mode 100644 index 3cd42df..0000000 --- a/Assets/Menus/AfterGame/Third.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7a11f01d299a8769a78aac9e1258a847c2614b3c583d011e7448e3d089f603a -size 21730 diff --git a/Assets/Menus/AfterGame/ThirdLeaderboardPrefab.prefab b/Assets/Menus/AfterGame/ThirdLeaderboardPrefab.prefab new file mode 100644 index 0000000..478822c --- /dev/null +++ b/Assets/Menus/AfterGame/ThirdLeaderboardPrefab.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d9ca336ba75fdba41e446d994ea11ae841757c2718b46dcdf4698f51bacba3f +size 22329 diff --git a/Assets/Menus/AfterGame/Third.prefab.meta b/Assets/Menus/AfterGame/ThirdLeaderboardPrefab.prefab.meta similarity index 100% rename from Assets/Menus/AfterGame/Third.prefab.meta rename to Assets/Menus/AfterGame/ThirdLeaderboardPrefab.prefab.meta diff --git a/Assets/Menus/Lobby/CarDynamicModel.cs b/Assets/Menus/Lobby/CarDynamicModel.cs index dec7b86..9ff483c 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:5598a2910af128267c2bd8a5b2447b518779f39676f0b4b3b5078b3f676009d2 -size 4235 +oid sha256:f7d5fcfb1458d318562c4833e5e7efb1e4911a9ab5a276463a2cfb73764312bb +size 4242 diff --git a/Assets/Scenes/EndOfGameMenu.unity b/Assets/Scenes/EndOfGameMenu.unity index 5726de1..bda9542 100644 --- a/Assets/Scenes/EndOfGameMenu.unity +++ b/Assets/Scenes/EndOfGameMenu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70a9e0f064eb78706c2330b945828fab13067ae2b6d2bfeb2c292afa7168b989 -size 61198 +oid sha256:92f84fdbcb202bc5b5d96e6c7bd3143ab8083994267829a185ce3b4a4162a7cb +size 62198 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index aadd4b6..e6e64dc 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:349d0defbd7bf1ee4d60971cdc04b2c7775896ca1c290bda414a9c8f8bf90339 -size 107105 +oid sha256:39adfc9f68a5f1000214919c6cc2650953ce081da66488ad4ec0d17ad90779d1 +size 107104 diff --git a/Assets/Scripts/Game Management/GameManager.cs b/Assets/Scripts/Game Management/GameManager.cs index 6635f51..75fd283 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:94e56e5749e1f1d3026cfd15eaa45046aed93a4daf84eabac14401616bcfcaf3 -size 8065 +oid sha256:33914acda7c3e25b432e021dcadd6ea72b217aa506a639ccb9c69018c52da00c +size 8233 diff --git a/Assets/Scripts/Game Management/Host Stats Tracker.cs b/Assets/Scripts/Game Management/Host Stats Tracker.cs index cb272e8..764cb9e 100644 --- a/Assets/Scripts/Game Management/Host Stats Tracker.cs +++ b/Assets/Scripts/Game Management/Host Stats Tracker.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d3b4f70b5679c35992da0738cb25365cfece5d3eda0eb336592b57aa2c1c25f -size 2419 +oid sha256:c889967884a6aad801826f85692306f4c3716a482cc059498bee404a23182aca +size 2503