diff --git a/Assets/Data/GameModes/RaceTrack.asset b/Assets/Data/GameModes/RaceTrack.asset new file mode 100644 index 0000000..471bffd --- /dev/null +++ b/Assets/Data/GameModes/RaceTrack.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f6fb69b43b08ea7258b78c9f9aacf8dc028cfbb504e54761fe61e47b9d2be52 +size 605 diff --git a/Assets/Plugins/IngameDebugConsole/Android.meta b/Assets/Data/GameModes/RaceTrack.asset.meta similarity index 52% rename from Assets/Plugins/IngameDebugConsole/Android.meta rename to Assets/Data/GameModes/RaceTrack.asset.meta index 12049b6..60b0aa3 100644 --- a/Assets/Plugins/IngameDebugConsole/Android.meta +++ b/Assets/Data/GameModes/RaceTrack.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 3d7d7a61a5341904eb3c65af025b1d86 -folderAsset: yes -DefaultImporter: +guid: 9d7080ab94f66dd4eb9e7fc64e90c2ba +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Data/Networking/Server/Realtime/Racetrack GameMode.asset b/Assets/Data/Networking/Server/Realtime/Racetrack GameMode.asset new file mode 100644 index 0000000..5f0c6c8 --- /dev/null +++ b/Assets/Data/Networking/Server/Realtime/Racetrack GameMode.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fda289270a49936ec0e8b8c706af5bc5925fb98f79137721d778eb7d22bc322 +size 484 diff --git a/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta b/Assets/Data/Networking/Server/Realtime/Racetrack GameMode.asset.meta similarity index 52% rename from Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta rename to Assets/Data/Networking/Server/Realtime/Racetrack GameMode.asset.meta index f3769b1..8f0367d 100644 --- a/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta +++ b/Assets/Data/Networking/Server/Realtime/Racetrack GameMode.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: f6caae32d463529478f2186f47c2e3fe -folderAsset: yes -DefaultImporter: +guid: 67476b9198c3f3a4c9443aa82f727331 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Prefabs/Traps/InGroundTrap.prefab b/Assets/Prefabs/Traps/InGroundTrap.prefab index 36e3cf3..eadbde3 100644 --- a/Assets/Prefabs/Traps/InGroundTrap.prefab +++ b/Assets/Prefabs/Traps/InGroundTrap.prefab @@ -32,14 +32,7 @@ Transform: - {fileID: 3280778023726093299} - {fileID: 3280778022459986741} - {fileID: 3280778023471378434} - - {fileID: 3280420305989102954} - - {fileID: 3280420305136919339} - - {fileID: 3280420305197933621} - - {fileID: 3280420306532555509} - - {fileID: 3280420305176429574} - - {fileID: 3280420306353529516} - - {fileID: 3280420305258570972} - - {fileID: 3280420304827894398} + - {fileID: 1068379521905336273} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -55,68 +48,72 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 90d16cd20b1d52149ae6b3d4c15c79db, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &3281312545795134744 +--- !u!1001 &1063799847781320221 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} + propertyPath: m_Name + value: Cube_Pit + objectReference: {fileID: 0} + - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.x - value: -1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -1 objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalPosition.z - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_RootOrder - value: 9 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (5) - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} ---- !u!4 &3280420306353529516 stripped + m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3} +--- !u!4 &1068379521905336273 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, + m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - m_PrefabInstance: {fileID: 3281312545795134744} + m_PrefabInstance: {fileID: 1063799847781320221} m_PrefabAsset: {fileID: 0} --- !u!1001 &3281312545920754357 PrefabInstance: @@ -125,6 +122,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3280778023726093299} m_Modifications: + - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} + propertyPath: m_Name + value: FanceWooden2 (4) + objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -169,82 +170,19 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} - - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} - propertyPath: m_Name - value: FanceWooden2 (4) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} ---- !u!1001 &3281312546041179457 +--- !u!1001 &3281312546064687605 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.x - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_Name - value: Cube_GroundWGrass (3) + value: FanceWooden2 (3) objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} ---- !u!4 &3280420306532555509 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, - type: 3} - m_PrefabInstance: {fileID: 3281312546041179457} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3281312546064687605 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3281312547625224782} - m_Modifications: - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -293,10 +231,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: 0.9 objectReference: {fileID: 0} - - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} - propertyPath: m_Name - value: FanceWooden2 (3) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} --- !u!4 &3280778022459986741 stripped @@ -305,69 +239,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3281312546064687605} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3281312546572573406 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3281312547625224782} - m_Modifications: - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.x - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} ---- !u!4 &3280420305989102954 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, - type: 3} - m_PrefabInstance: {fileID: 3281312546572573406} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3281312546677354276 PrefabInstance: m_ObjectHideFlags: 0 @@ -375,6 +246,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3280778023471378434} m_Modifications: + - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} + propertyPath: m_Name + value: FanceWooden2 (4) + objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -419,75 +294,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} - - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} - propertyPath: m_Name - value: FanceWooden2 (4) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} ---- !u!1001 &3281312546914734952 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3281312547625224782} - m_Modifications: - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (6) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} ---- !u!4 &3280420305258570972 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, - type: 3} - m_PrefabInstance: {fileID: 3281312546914734952} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3281312547073059897 PrefabInstance: m_ObjectHideFlags: 0 @@ -495,6 +303,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3280778023765625369} m_Modifications: + - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} + propertyPath: m_Name + value: FanceWooden2 (4) + objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -539,10 +351,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} - - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} - propertyPath: m_Name - value: FanceWooden2 (4) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} --- !u!1001 &3281312547210150594 @@ -552,6 +360,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: + - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} + propertyPath: m_Name + value: FanceWooden2 (4) + objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.x value: -0.4 @@ -600,10 +412,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: 0.90000045 objectReference: {fileID: 0} - - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} - propertyPath: m_Name - value: FanceWooden2 (4) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} --- !u!4 &3280778023471378434 stripped @@ -619,6 +427,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3280778022459986741} m_Modifications: + - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} + propertyPath: m_Name + value: FanceWooden2 (4) + objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -663,208 +475,19 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} - - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} - propertyPath: m_Name - value: FanceWooden2 (4) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} ---- !u!1001 &3281312547296433311 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3281312547625224782} - m_Modifications: - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} ---- !u!4 &3280420305136919339 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, - type: 3} - m_PrefabInstance: {fileID: 3281312547296433311} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3281312547357447041 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3281312547625224782} - m_Modifications: - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} ---- !u!4 &3280420305197933621 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, - type: 3} - m_PrefabInstance: {fileID: 3281312547357447041} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3281312547370562482 +--- !u!1001 &3281312547451467993 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_Name - value: Cube_GroundWGrass (4) + value: FanceWooden2 (1) objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} ---- !u!4 &3280420305176429574 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, - type: 3} - m_PrefabInstance: {fileID: 3281312547370562482} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3281312547451467993 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3281312547625224782} - m_Modifications: - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -913,10 +536,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: 0.9 objectReference: {fileID: 0} - - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} - propertyPath: m_Name - value: FanceWooden2 (1) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} --- !u!4 &3280778023765625369 stripped @@ -925,76 +544,17 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3281312547451467993} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3281312547457088970 +--- !u!1001 &3281312547479691571 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_Name - value: Cube_GroundWGrass (7) + value: FanceWooden2 (2) objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} ---- !u!4 &3280420304827894398 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, - type: 3} - m_PrefabInstance: {fileID: 3281312547457088970} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3281312547479691571 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3281312547625224782} - m_Modifications: - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.x value: 0.4 @@ -1043,10 +603,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: 0.90000045 objectReference: {fileID: 0} - - target: {fileID: 1989401929107402, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} - propertyPath: m_Name - value: FanceWooden2 (2) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} --- !u!4 &3280778023726093299 stripped diff --git a/Assets/Scenes/GameMode Scenes/RacetrackGameMode.unity b/Assets/Scenes/GameMode Scenes/RacetrackGameMode.unity new file mode 100644 index 0000000..dea66ae --- /dev/null +++ b/Assets/Scenes/GameMode Scenes/RacetrackGameMode.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2532e240363c6624567e7f47cd6645a78f97e4c79dbc57ccb226fff8a749f9f +size 25946 diff --git a/Assets/Models.meta b/Assets/Scenes/GameMode Scenes/RacetrackGameMode.unity.meta similarity index 67% rename from Assets/Models.meta rename to Assets/Scenes/GameMode Scenes/RacetrackGameMode.unity.meta index 5346456..b0a6bea 100644 --- a/Assets/Models.meta +++ b/Assets/Scenes/GameMode Scenes/RacetrackGameMode.unity.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 296bd90e667df1f4697823a0aa45acf0 -folderAsset: yes +guid: 2e8fb4df326d1f94aae1c8e50b2cc9eb DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Menus/Lobby.unity b/Assets/Scenes/Menus/Lobby.unity index 65e6143..2f9edb5 100644 --- a/Assets/Scenes/Menus/Lobby.unity +++ b/Assets/Scenes/Menus/Lobby.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7eb9044982a7b19dbe900e3d7b96c9873bc4f317bf961a9b2d88badd10d7e630 -size 46625 +oid sha256:ca249b9342dd6d663f6c8d0895426161e19f3cd8caaef902aa231cf4fa32aa33 +size 46629 diff --git a/Assets/Scenes/RaceTrack 4-player alpha.unity b/Assets/Scenes/RaceTrack 4-player alpha.unity index 24d3617..2b3dbbf 100644 --- a/Assets/Scenes/RaceTrack 4-player alpha.unity +++ b/Assets/Scenes/RaceTrack 4-player alpha.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44b4324088c8dade10402a7c0554434853b15ee4d88936e007a70499bd05f4d3 -size 2604605 +oid sha256:24c6db4fde948d1c63d4ef470b917428c95c160a11ce344ea6670ba122666b64 +size 2639728 diff --git a/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs b/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs index 9f02624..b7b0cb4 100644 --- a/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs +++ b/Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs @@ -13,6 +13,7 @@ public class ColorGameMode : GameMode public string nextScene = "ServerTestScene"; List ConnectedClients; public Material OverlayMaterial; + public float scrollSpeed = 0.0f; //The rate at which the level will scroll past public int RoundCount { get; private set; } @@ -23,6 +24,17 @@ public class ColorGameMode : GameMode /// protected override void OnRoundEnd(PlayerData[] allPlayers) { + //Move the camera forward at a steady rate each round + if (scrollSpeed > 0.0f) + { + Camera.main.transform.Translate(scrollSpeed, 0, 0, Space.World); + Debug.Log("New camera position at x = " + Camera.main.transform.position.x); + } + else + { + Debug.Log("Not scrolling"); + } + RoundCount++; } @@ -45,7 +57,9 @@ public class ColorGameMode : GameMode /// Block moved onto protected override void OnPlayerFinishedMove(Character character, ClientData client, Block currentBlock) { - ClientData OwnedClient; + //Commented out because we don't do this in the racetrack mode, but I don't know what would break if I just deleted this + + /*ClientData OwnedClient; Material overlay = null; if (isOwned(currentBlock, out OwnedClient)) { @@ -77,7 +91,7 @@ public class ColorGameMode : GameMode BlocksOwned[client].Add(currentBlock); if (overlay != null) - currentBlock.StartCoroutine(AnimateBlock(overlay, 0.25f)); + currentBlock.StartCoroutine(AnimateBlock(overlay, 0.25f));*/ } protected override void OnRoundStart(PlayerData[] allPlayers) diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 550bec2..0f4a5ec 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a35213e026941835d1fac3130bacfea6df34bd4e07fcfcb45b34c2dd8f1547d2 -size 1775 +oid sha256:d9be158173aa5555933e44bfa66f3ea19bb0cb9804d6a2aa9a10eb8742e1d91f +size 1888