From 6900226e646f02e30ea6c9de735a97485d1d0ae3 Mon Sep 17 00:00:00 2001 From: "hugo.baldassin@epitech.eu" Date: Thu, 30 May 2019 09:15:33 +0200 Subject: [PATCH 1/5] [EDIT] some fixes and tweaks for the cars --- Assets/Prefabs/Core/HeavyCar Manager.prefab | 4 ++-- Assets/Prefabs/Core/LightCar Manager.prefab | 4 ++-- Assets/Prefabs/Core/MediumCar Manager.prefab | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/Prefabs/Core/HeavyCar Manager.prefab b/Assets/Prefabs/Core/HeavyCar Manager.prefab index e5b29b0..ee45997 100644 --- a/Assets/Prefabs/Core/HeavyCar Manager.prefab +++ b/Assets/Prefabs/Core/HeavyCar Manager.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82c6ca762c5deb4f1c2f976edd1015457e7b278d13699f3ea8b8fb1016af3c0e -size 35574 +oid sha256:d621bbfaaccc3501f3d54bc655daadf97ab2bf910aa6ff71edda6d02d99f8112 +size 36227 diff --git a/Assets/Prefabs/Core/LightCar Manager.prefab b/Assets/Prefabs/Core/LightCar Manager.prefab index af19c3e..dadbb38 100644 --- a/Assets/Prefabs/Core/LightCar Manager.prefab +++ b/Assets/Prefabs/Core/LightCar Manager.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:587228daad671e97dd90b19e745b8df78649a245d9789e599841ce266a737269 -size 18086 +oid sha256:e1992e59d8fcc40c4a5a078aa60f7293600bb50239b8157131a7420bd77ae6e3 +size 18686 diff --git a/Assets/Prefabs/Core/MediumCar Manager.prefab b/Assets/Prefabs/Core/MediumCar Manager.prefab index 0652a73..1102baf 100644 --- a/Assets/Prefabs/Core/MediumCar Manager.prefab +++ b/Assets/Prefabs/Core/MediumCar Manager.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f85d60c8619f12a6185402c5383d65129dec83f76b24eca714cc88a63d889124 -size 18727 +oid sha256:32ff89a5c2ab557c0b91290d80a86bdfcb65c42a3d189c8d65f8dc913658b22f +size 19331 From 19804189f46e8e1d089f5f3e8878f9080ae318d7 Mon Sep 17 00:00:00 2001 From: Hugo Willaume Date: Thu, 30 May 2019 20:12:34 +0900 Subject: [PATCH 2/5] 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: From 1e077fdd537a0ff37097edb42618e4e9d3c7aaf5 Mon Sep 17 00:00:00 2001 From: Hurlu Date: Fri, 31 May 2019 17:12:29 +0900 Subject: [PATCH 3/5] Finished the graphic aspect of the leaderboard --- Assets/Menus/AfterGame/EndOfGameLobbyManager.cs | 4 ++-- Assets/Menus/AfterGame/First.prefab | 4 ++-- Assets/Menus/AfterGame/Second.prefab | 4 ++-- Assets/Menus/AfterGame/Third++.prefab | 3 +++ .../AfterGame/Third++.prefab.meta} | 5 ++--- Assets/Menus/AfterGame/Third.prefab | 4 ++-- Assets/Menus/Lobby/LobbyCountdown.cs | 4 ++-- .../Fonts & Materials/Bangers SDF - Drop Shadow.mat | 4 ++-- Assets/Scenes/EndOfGameMenu.unity | 4 ++-- Assets/Scripts/Game Management/GameManager.cs | 4 ++-- ProjectSettings/EditorBuildSettings.asset | 4 ++-- ProjectSettings/QualitySettings.asset | 4 ++-- 12 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 Assets/Menus/AfterGame/Third++.prefab rename Assets/{Plugins/TextMesh Pro/Resources/Fonts & Materials.meta => Menus/AfterGame/Third++.prefab.meta} (57%) diff --git a/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs b/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs index 9e86da1..80f2fd7 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:1228d0660aa0f6e05c66bbac69a46624784be09319ab4f6ad05e09187fd7debb -size 624 +oid sha256:a5198081b0f5e73f05d52d079f75053d7a71785587d62d59fb44be4b9b72610a +size 991 diff --git a/Assets/Menus/AfterGame/First.prefab b/Assets/Menus/AfterGame/First.prefab index 86f07eb..dadebaa 100644 --- a/Assets/Menus/AfterGame/First.prefab +++ b/Assets/Menus/AfterGame/First.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c9271e7c90beca0cf6437910817e933c52c3b7a068a375a1bb3a2e1b63fcf6a -size 21684 +oid sha256:0687a62d268658f3728f90eb1517af911985932623f89dbb45e8325d3d510da6 +size 21679 diff --git a/Assets/Menus/AfterGame/Second.prefab b/Assets/Menus/AfterGame/Second.prefab index faece17..00629a1 100644 --- a/Assets/Menus/AfterGame/Second.prefab +++ b/Assets/Menus/AfterGame/Second.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3492e6862f7a6f15dbfc1904b012128d5135eed55fa444800304afaa9b1b147 -size 21836 +oid sha256:2e9fccf52fe6e26e1449e09332846f17951b4a6e5696afcfc3bd3bbd1f313c30 +size 21768 diff --git a/Assets/Menus/AfterGame/Third++.prefab b/Assets/Menus/AfterGame/Third++.prefab new file mode 100644 index 0000000..5141557 --- /dev/null +++ b/Assets/Menus/AfterGame/Third++.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f84df0839f992eee494322e20fea316127e4689669a7a960a900cbacc6aafb8 +size 21803 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta b/Assets/Menus/AfterGame/Third++.prefab.meta similarity index 57% rename from Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta rename to Assets/Menus/AfterGame/Third++.prefab.meta index 55df787..56bdb8a 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta +++ b/Assets/Menus/AfterGame/Third++.prefab.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 731f1baa9d144a9897cb1d341c2092b8 -folderAsset: yes -DefaultImporter: +guid: ea90f63e7af36d740a069069712e8830 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Menus/AfterGame/Third.prefab b/Assets/Menus/AfterGame/Third.prefab index 853517d..3cd42df 100644 --- a/Assets/Menus/AfterGame/Third.prefab +++ b/Assets/Menus/AfterGame/Third.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62c4d09745e1b4f36ee596b6d82426266499399527f485e685b36e31d918ffe7 -size 21842 +oid sha256:b7a11f01d299a8769a78aac9e1258a847c2614b3c583d011e7448e3d089f603a +size 21730 diff --git a/Assets/Menus/Lobby/LobbyCountdown.cs b/Assets/Menus/Lobby/LobbyCountdown.cs index 8a2c502..3d883c2 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:3fdd4155536d0c38f71fcf2243930d343b0bfb4b6e0790688cf543306a370ee2 -size 1201 +oid sha256:68b79b92f18279918ec5d683a489fe9afe501c83cf808da2365afc52f599f9ac +size 1216 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow.mat b/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow.mat index 4eb13dd..446c72f 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow.mat +++ b/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd694d4671df58d34c4498b8cc638dac139df1af814b84c1d1034b8bda535cf3 -size 3006 +oid sha256:f268262ea03423d06757f3d4b803a9e41322df8324c3941669226018c04e68a6 +size 3061 diff --git a/Assets/Scenes/EndOfGameMenu.unity b/Assets/Scenes/EndOfGameMenu.unity index dbd7be3..5726de1 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:bae38cbb80812fd46be36403c778bed9552afdabc0c2e116d29364239c090d0d -size 58530 +oid sha256:70a9e0f064eb78706c2330b945828fab13067ae2b6d2bfeb2c292afa7168b989 +size 61198 diff --git a/Assets/Scripts/Game Management/GameManager.cs b/Assets/Scripts/Game Management/GameManager.cs index 9ad92ac..6635f51 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:049187164ef3bfab3bf706c510ff224acc6e44570558218373316a507b961bde -size 7501 +oid sha256:94e56e5749e1f1d3026cfd15eaa45046aed93a4daf84eabac14401616bcfcaf3 +size 8065 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 8e41bc3..c03cb6d 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7fcb8036edc5d4cbcd477cab0753f3da2710500856b66766291217df173fbc0 -size 662 +oid sha256:e4234dd75eac3bd0e25ca72185464f1de469f7161a8470a61308a485da4bbe8a +size 764 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 From 9a7c031dcd747feb41ce04eb375f60f2b2bc4427 Mon Sep 17 00:00:00 2001 From: Hurlu Date: Sun, 2 Jun 2019 17:44:10 +0900 Subject: [PATCH 4/5] 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 From d5fda66113521a0ac226d74b95e9ba64c781fbf3 Mon Sep 17 00:00:00 2001 From: Hurlu Date: Sun, 2 Jun 2019 18:41:05 +0900 Subject: [PATCH 5/5] minor fixes --- Assets/Menus/AfterGame/EndOfGameLobbyManager.cs | 4 ++-- Assets/Menus/AfterGame/ScrollFix.cs | 2 +- Assets/Scenes/EndOfGameMenu.unity | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs b/Assets/Menus/AfterGame/EndOfGameLobbyManager.cs index d7c2526..d0809d5 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:a1b393664b9e6b6076d8b0834c5c9f9b6252aa4f04ea760f6bd401bc39f2ffec -size 3393 +oid sha256:c8920ac90a6b807e86dc8e1aa228d5112f384558d761d146b74e621d863b62e8 +size 3335 diff --git a/Assets/Menus/AfterGame/ScrollFix.cs b/Assets/Menus/AfterGame/ScrollFix.cs index a09f7a1..6537902 100644 --- a/Assets/Menus/AfterGame/ScrollFix.cs +++ b/Assets/Menus/AfterGame/ScrollFix.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03d026b58fa37a5166a05621be897c1c883044c11d6bb3843f9c5294b42fdec8 +oid sha256:749041255751b56d34f5f43eee274adce92b69b72a114b022d1403b5831aeeec size 584 diff --git a/Assets/Scenes/EndOfGameMenu.unity b/Assets/Scenes/EndOfGameMenu.unity index bda9542..caa6680 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:92f84fdbcb202bc5b5d96e6c7bd3143ab8083994267829a185ce3b4a4162a7cb -size 62198 +oid sha256:923a81f9d900ee01c4c88789a702a3d335d4100c390db04fe23c634ddd67cb7a +size 63669