diff --git a/Assets/Materials/Industrial/Standard/BasicCube.mat b/Assets/Materials/Industrial/Standard/BasicCube.mat index 69c1c3f..25adebe 100644 --- a/Assets/Materials/Industrial/Standard/BasicCube.mat +++ b/Assets/Materials/Industrial/Standard/BasicCube.mat @@ -73,5 +73,5 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1} + - _Color: {r: 0.6886792, g: 0.6886792, b: 0.6886792, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Industrial/Standard/tire.mat b/Assets/Materials/Industrial/Standard/tire.mat index 63f1c38..6e8b31b 100644 --- a/Assets/Materials/Industrial/Standard/tire.mat +++ b/Assets/Materials/Industrial/Standard/tire.mat @@ -73,5 +73,5 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.2264151, g: 0.2264151, b: 0.2264151, a: 1} + - _Color: {r: 0.16037738, g: 0.16037738, b: 0.16037738, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/New Material 1.mat b/Assets/Materials/New Material 1.mat index 66c239a..7c725f5 100644 --- a/Assets/Materials/New Material 1.mat +++ b/Assets/Materials/New Material 1.mat @@ -40,7 +40,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: d8d47be058e02584eb064caabde289b0, type: 3} + m_Texture: {fileID: 2800000, guid: 70af04f9b611c8e439fbea5881b54b6b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/New Material 2.mat b/Assets/Materials/New Material 2.mat new file mode 100644 index 0000000..9936ad1 --- /dev/null +++ b/Assets/Materials/New Material 2.mat @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Material 2 + m_Shader: {fileID: 4800000, guid: cd2492e1f350477e916e76b5ca5e15b8, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _ObjectWidth: 0.5 + - _OcclusionStrength: 1 + - _OutlineWidth: 0.02 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0.9587312, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Prefab/Server/Internal.meta b/Assets/Materials/New Material 2.mat.meta similarity index 54% rename from Assets/Prefab/Server/Internal.meta rename to Assets/Materials/New Material 2.mat.meta index e57739f..65d7ff2 100644 --- a/Assets/Prefab/Server/Internal.meta +++ b/Assets/Materials/New Material 2.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 00f6e0cabd44e4d44a762e7894ca6e0b -folderAsset: yes -DefaultImporter: +guid: 285423502716c46418d6a49b50a6e682 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials/angryimg (1).png b/Assets/Materials/angryimg (1).png deleted file mode 100644 index fffaf75..0000000 Binary files a/Assets/Materials/angryimg (1).png and /dev/null differ diff --git a/Assets/Materials/angryimg (2).png b/Assets/Materials/angryimg (2).png deleted file mode 100644 index d38480b..0000000 Binary files a/Assets/Materials/angryimg (2).png and /dev/null differ diff --git a/Assets/Materials/angryimg (4).png b/Assets/Materials/angryimg (4).png new file mode 100644 index 0000000..98f75a7 Binary files /dev/null and b/Assets/Materials/angryimg (4).png differ diff --git a/Assets/Materials/angryimg (1).png.meta b/Assets/Materials/angryimg (4).png.meta similarity index 98% rename from Assets/Materials/angryimg (1).png.meta rename to Assets/Materials/angryimg (4).png.meta index 0215cf2..1bb9e48 100644 --- a/Assets/Materials/angryimg (1).png.meta +++ b/Assets/Materials/angryimg (4).png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dc627a4439c944249a53c2aa0bf9866c +guid: 7d6609c9fb516594babe1c1af0516645 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Materials/angryimg (5).png b/Assets/Materials/angryimg (5).png new file mode 100644 index 0000000..955d4ff Binary files /dev/null and b/Assets/Materials/angryimg (5).png differ diff --git a/Assets/Materials/angryimg (2).png.meta b/Assets/Materials/angryimg (5).png.meta similarity index 98% rename from Assets/Materials/angryimg (2).png.meta rename to Assets/Materials/angryimg (5).png.meta index 9e30750..6041510 100644 --- a/Assets/Materials/angryimg (2).png.meta +++ b/Assets/Materials/angryimg (5).png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d8d47be058e02584eb064caabde289b0 +guid: 70af04f9b611c8e439fbea5881b54b6b TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Photon/PhotonUnityNetworking/Code/Editor/PunSceneSettingsFile.asset b/Assets/Photon/PhotonUnityNetworking/Code/Editor/PunSceneSettingsFile.asset index 24ba77a..368cfae 100644 --- a/Assets/Photon/PhotonUnityNetworking/Code/Editor/PunSceneSettingsFile.asset +++ b/Assets/Photon/PhotonUnityNetworking/Code/Editor/PunSceneSettingsFile.asset @@ -1,21 +1,16 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc3284eace5a64d4bb516df7d7effdb9, type: 3} - m_Name: PunSceneSettingsFile - m_EditorClassIdentifier: - SceneSettingsListFoldoutOpen: 1 - MinViewIdPerScene: - - sceneAsset: {fileID: 102900000, guid: 559222f4671e440cba71aecba1de3505, type: 3} - sceneName: SceneView_A - minViewId: 2 - - sceneAsset: {fileID: 102900000, guid: a81615022a16c489aac8daadf8f51fae, type: 3} - sceneName: SceneView_B - minViewId: 10 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc3284eace5a64d4bb516df7d7effdb9, type: 3} + m_Name: PunSceneSettingsFile + m_EditorClassIdentifier: + SceneSettingsListFoldoutOpen: 1 + MinViewIdPerScene: [] diff --git a/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset b/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset index cedf4b7..6bf2a66 100644 --- a/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset +++ b/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset @@ -18,7 +18,7 @@ MonoBehaviour: AppIdVoice: AppVersion: UseNameServer: 1 - FixedRegion: usw + FixedRegion: Server: Port: 0 Protocol: 0 @@ -26,14 +26,14 @@ MonoBehaviour: EnableLobbyStatistics: 0 NetworkLogging: 1 DevRegion: usw - PunLogging: 2 + PunLogging: 0 EnableSupportLogger: 0 RunInBackground: 1 StartInOfflineMode: 0 RpcList: + - BuildRobotRpc - ClickRpc - DestroyRpc - - BuildRobotRpc DisableAutoOpenWizard: 1 - ShowSettings: 1 + ShowSettings: 0 DevRegionSetOnce: 1 diff --git a/Assets/Prefab/Client/Internal.meta b/Assets/Prefab/Internal.meta similarity index 100% rename from Assets/Prefab/Client/Internal.meta rename to Assets/Prefab/Internal.meta diff --git a/Assets/Prefab/Client/Internal/3D.meta b/Assets/Prefab/Internal/3D.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D.meta rename to Assets/Prefab/Internal/3D.meta diff --git a/Assets/Prefab/Client/Internal/3D/Boulder1.prefab b/Assets/Prefab/Internal/3D/Boulder1.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/3D/Boulder1.prefab rename to Assets/Prefab/Internal/3D/Boulder1.prefab diff --git a/Assets/Prefab/Client/Internal/3D/Boulder1.prefab.meta b/Assets/Prefab/Internal/3D/Boulder1.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D/Boulder1.prefab.meta rename to Assets/Prefab/Internal/3D/Boulder1.prefab.meta diff --git a/Assets/Prefab/Client/Internal/3D/Boulder2.prefab b/Assets/Prefab/Internal/3D/Boulder2.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/3D/Boulder2.prefab rename to Assets/Prefab/Internal/3D/Boulder2.prefab diff --git a/Assets/Prefab/Client/Internal/3D/Boulder2.prefab.meta b/Assets/Prefab/Internal/3D/Boulder2.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D/Boulder2.prefab.meta rename to Assets/Prefab/Internal/3D/Boulder2.prefab.meta diff --git a/Assets/Prefab/Client/Internal/3D/Boulder3.prefab b/Assets/Prefab/Internal/3D/Boulder3.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/3D/Boulder3.prefab rename to Assets/Prefab/Internal/3D/Boulder3.prefab diff --git a/Assets/Prefab/Client/Internal/3D/Boulder3.prefab.meta b/Assets/Prefab/Internal/3D/Boulder3.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D/Boulder3.prefab.meta rename to Assets/Prefab/Internal/3D/Boulder3.prefab.meta diff --git a/Assets/Prefab/Client/Internal/3D/Boulder4.prefab b/Assets/Prefab/Internal/3D/Boulder4.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/3D/Boulder4.prefab rename to Assets/Prefab/Internal/3D/Boulder4.prefab diff --git a/Assets/Prefab/Client/Internal/3D/Boulder4.prefab.meta b/Assets/Prefab/Internal/3D/Boulder4.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D/Boulder4.prefab.meta rename to Assets/Prefab/Internal/3D/Boulder4.prefab.meta diff --git a/Assets/Prefab/Client/Internal/3D/BuildArea.prefab b/Assets/Prefab/Internal/3D/BuildArea.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/3D/BuildArea.prefab rename to Assets/Prefab/Internal/3D/BuildArea.prefab diff --git a/Assets/Prefab/Client/Internal/3D/BuildArea.prefab.meta b/Assets/Prefab/Internal/3D/BuildArea.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D/BuildArea.prefab.meta rename to Assets/Prefab/Internal/3D/BuildArea.prefab.meta diff --git a/Assets/Prefab/Client/Internal/3D/BuildRobot.prefab b/Assets/Prefab/Internal/3D/BuildRobot.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/3D/BuildRobot.prefab rename to Assets/Prefab/Internal/3D/BuildRobot.prefab diff --git a/Assets/Prefab/Client/Internal/3D/BuildRobot.prefab.meta b/Assets/Prefab/Internal/3D/BuildRobot.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D/BuildRobot.prefab.meta rename to Assets/Prefab/Internal/3D/BuildRobot.prefab.meta diff --git a/Assets/Prefab/Client/Internal/3D/BuildTerrain.prefab b/Assets/Prefab/Internal/3D/BuildTerrain.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/3D/BuildTerrain.prefab rename to Assets/Prefab/Internal/3D/BuildTerrain.prefab diff --git a/Assets/Prefab/Client/Internal/3D/BuildTerrain.prefab.meta b/Assets/Prefab/Internal/3D/BuildTerrain.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D/BuildTerrain.prefab.meta rename to Assets/Prefab/Internal/3D/BuildTerrain.prefab.meta diff --git a/Assets/Prefab/Client/Internal/3D/Highlands.prefab b/Assets/Prefab/Internal/3D/Highlands.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/3D/Highlands.prefab rename to Assets/Prefab/Internal/3D/Highlands.prefab diff --git a/Assets/Prefab/Client/Internal/3D/Highlands.prefab.meta b/Assets/Prefab/Internal/3D/Highlands.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D/Highlands.prefab.meta rename to Assets/Prefab/Internal/3D/Highlands.prefab.meta diff --git a/Assets/Prefab/Client/Internal/3D/baum hd fbx.prefab b/Assets/Prefab/Internal/3D/baum hd fbx.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/3D/baum hd fbx.prefab rename to Assets/Prefab/Internal/3D/baum hd fbx.prefab diff --git a/Assets/Prefab/Client/Internal/3D/baum hd fbx.prefab.meta b/Assets/Prefab/Internal/3D/baum hd fbx.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D/baum hd fbx.prefab.meta rename to Assets/Prefab/Internal/3D/baum hd fbx.prefab.meta diff --git a/Assets/Prefab/Client/Internal/3D/baum hd med fbx.prefab b/Assets/Prefab/Internal/3D/baum hd med fbx.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/3D/baum hd med fbx.prefab rename to Assets/Prefab/Internal/3D/baum hd med fbx.prefab diff --git a/Assets/Prefab/Client/Internal/3D/baum hd med fbx.prefab.meta b/Assets/Prefab/Internal/3D/baum hd med fbx.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D/baum hd med fbx.prefab.meta rename to Assets/Prefab/Internal/3D/baum hd med fbx.prefab.meta diff --git a/Assets/Prefab/Client/Internal/3D/baum hd pine fbx.prefab b/Assets/Prefab/Internal/3D/baum hd pine fbx.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/3D/baum hd pine fbx.prefab rename to Assets/Prefab/Internal/3D/baum hd pine fbx.prefab diff --git a/Assets/Prefab/Client/Internal/3D/baum hd pine fbx.prefab.meta b/Assets/Prefab/Internal/3D/baum hd pine fbx.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/3D/baum hd pine fbx.prefab.meta rename to Assets/Prefab/Internal/3D/baum hd pine fbx.prefab.meta diff --git a/Assets/Prefab/Client/Internal/Other.meta b/Assets/Prefab/Internal/Other.meta similarity index 100% rename from Assets/Prefab/Client/Internal/Other.meta rename to Assets/Prefab/Internal/Other.meta diff --git a/Assets/Prefab/Client/Internal/Other/Beacon.prefab b/Assets/Prefab/Internal/Other/Beacon.prefab similarity index 97% rename from Assets/Prefab/Client/Internal/Other/Beacon.prefab rename to Assets/Prefab/Internal/Other/Beacon.prefab index 2aec49b..de26705 100644 --- a/Assets/Prefab/Client/Internal/Other/Beacon.prefab +++ b/Assets/Prefab/Internal/Other/Beacon.prefab @@ -40,7 +40,7 @@ LineRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6226200332777473226} m_Enabled: 1 - m_CastShadows: 1 + m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_MotionVectors: 0 @@ -72,8 +72,8 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: 0, y: 0, z: -100} - - {x: 0, y: 0, z: 4000} + - {x: 0, y: 0, z: -4000} + - {x: 0, y: 0, z: 0} m_Parameters: serializedVersion: 3 widthMultiplier: 0.1 @@ -122,7 +122,7 @@ LineRenderer: m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 0 - numCapVertices: 0 + numCapVertices: 10 alignment: 0 textureMode: 0 shadowBias: 0.5 @@ -141,5 +141,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5470bb5450b74d2b8ff5961c5c9c7b18, type: 3} m_Name: m_EditorClassIdentifier: - multiplier: 1 + multiplier: 0.1 lineRenderer: {fileID: 6226200332777473225} diff --git a/Assets/Prefab/Client/Internal/Other/Beacon.prefab.meta b/Assets/Prefab/Internal/Other/Beacon.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/Other/Beacon.prefab.meta rename to Assets/Prefab/Internal/Other/Beacon.prefab.meta diff --git a/Assets/Prefab/Internal/Other/ClassicTagDirector.prefab b/Assets/Prefab/Internal/Other/ClassicTagDirector.prefab new file mode 100644 index 0000000..bcbae5e --- /dev/null +++ b/Assets/Prefab/Internal/Other/ClassicTagDirector.prefab @@ -0,0 +1,50 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2612124392210836543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2612124392210836541} + - component: {fileID: 2612124392210836542} + m_Layer: 0 + m_Name: ClassicTagDirector + m_TagString: GameDirector + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2612124392210836541 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2612124392210836543} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.84, y: 3.37, z: 1.45} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2612124392210836542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2612124392210836543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b9a56882be3f4a419451ddd12cf704eb, type: 3} + m_Name: + m_EditorClassIdentifier: + fullyLoaded: 0 + currentItActorNumber: -1 + lastItActorNumber: -1 + itTint: {r: 1, g: 0, b: 0, a: 1} + tagCooldownTime: 10 diff --git a/Assets/Prefab/Server/Internal/RobotParentServer.prefab.meta b/Assets/Prefab/Internal/Other/ClassicTagDirector.prefab.meta similarity index 74% rename from Assets/Prefab/Server/Internal/RobotParentServer.prefab.meta rename to Assets/Prefab/Internal/Other/ClassicTagDirector.prefab.meta index ac83333..2bb4ddc 100644 --- a/Assets/Prefab/Server/Internal/RobotParentServer.prefab.meta +++ b/Assets/Prefab/Internal/Other/ClassicTagDirector.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d41b0a1c395cb04da8b985101b6d47d +guid: be021f1431278624ba94e7d6f12e088a PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefab/Internal/Other/FreeplayDirector.prefab b/Assets/Prefab/Internal/Other/FreeplayDirector.prefab new file mode 100644 index 0000000..b2332e9 --- /dev/null +++ b/Assets/Prefab/Internal/Other/FreeplayDirector.prefab @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2572036287532900858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9078338514294247894} + - component: {fileID: 4140264822069007822} + m_Layer: 0 + m_Name: FreeplayDirector + m_TagString: GameDirector + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9078338514294247894 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2572036287532900858} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -200, y: 9, z: -400} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4140264822069007822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2572036287532900858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6fe279a7a5418e9803b13572ff62c5, type: 3} + m_Name: + m_EditorClassIdentifier: + fullyLoaded: 0 diff --git a/Assets/Prefab/Server/Parts/BasicCube.prefab.meta b/Assets/Prefab/Internal/Other/FreeplayDirector.prefab.meta similarity index 74% rename from Assets/Prefab/Server/Parts/BasicCube.prefab.meta rename to Assets/Prefab/Internal/Other/FreeplayDirector.prefab.meta index 39437c2..93dc7d3 100644 --- a/Assets/Prefab/Server/Parts/BasicCube.prefab.meta +++ b/Assets/Prefab/Internal/Other/FreeplayDirector.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0def106ce7d76154896662cae32641e3 +guid: cf1c247b6d0590b4588a589e80c9ff66 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefab/Client/Internal/Other/Main Camera.prefab b/Assets/Prefab/Internal/Other/Main Camera.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/Other/Main Camera.prefab rename to Assets/Prefab/Internal/Other/Main Camera.prefab diff --git a/Assets/Prefab/Client/Internal/Other/Main Camera.prefab.meta b/Assets/Prefab/Internal/Other/Main Camera.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/Other/Main Camera.prefab.meta rename to Assets/Prefab/Internal/Other/Main Camera.prefab.meta diff --git a/Assets/Prefab/Internal/Other/SinglePlayerDirector.prefab b/Assets/Prefab/Internal/Other/SinglePlayerDirector.prefab new file mode 100644 index 0000000..b16ece2 --- /dev/null +++ b/Assets/Prefab/Internal/Other/SinglePlayerDirector.prefab @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &633087595024629084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4815207827840863878} + - component: {fileID: 2541324036647193942} + m_Layer: 0 + m_Name: SinglePlayerDirector + m_TagString: GameDirector + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4815207827840863878 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633087595024629084} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -268.3477, y: 11.070056, z: -409.1089} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2541324036647193942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633087595024629084} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 23534a08e29b4f6eb2148b137cf166ee, type: 3} + m_Name: + m_EditorClassIdentifier: + fullyLoaded: 0 + numControllableBots: 0 + map: 0 + robotParentPrefab: {fileID: 4421177872403235923, guid: d5b926445abbe244f94ecf6a59e62e03, + type: 3} + startingPosition: {x: -268, y: 0, z: -410} + maxPlacementRadius: 20 + startingHeight: 3 diff --git a/Assets/Prefab/Server/Parts/BasicTire.prefab.meta b/Assets/Prefab/Internal/Other/SinglePlayerDirector.prefab.meta similarity index 74% rename from Assets/Prefab/Server/Parts/BasicTire.prefab.meta rename to Assets/Prefab/Internal/Other/SinglePlayerDirector.prefab.meta index 6ce44b0..a96b6d0 100644 --- a/Assets/Prefab/Server/Parts/BasicTire.prefab.meta +++ b/Assets/Prefab/Internal/Other/SinglePlayerDirector.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2bd135c565d69454cbbf91816972548f +guid: 5e1363b0a1e755f47ab4fecffdeba229 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefab/Client/Internal/Plugins.meta b/Assets/Prefab/Internal/Plugins.meta similarity index 100% rename from Assets/Prefab/Client/Internal/Plugins.meta rename to Assets/Prefab/Internal/Plugins.meta diff --git a/Assets/Prefab/Client/Internal/UI.meta b/Assets/Prefab/Internal/UI.meta similarity index 100% rename from Assets/Prefab/Client/Internal/UI.meta rename to Assets/Prefab/Internal/UI.meta diff --git a/Assets/Prefab/Client/Internal/UI/GameCanvas.prefab b/Assets/Prefab/Internal/UI/GameCanvas.prefab similarity index 99% rename from Assets/Prefab/Client/Internal/UI/GameCanvas.prefab rename to Assets/Prefab/Internal/UI/GameCanvas.prefab index 4580e4d..b2ceceb 100644 --- a/Assets/Prefab/Client/Internal/UI/GameCanvas.prefab +++ b/Assets/Prefab/Internal/UI/GameCanvas.prefab @@ -60,6 +60,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -137,6 +138,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -216,6 +218,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.81960785, g: 0.83137256, b: 0.83137256, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -345,6 +348,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.81960785, g: 0.83137256, b: 0.83137256, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -486,7 +490,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} @@ -526,3 +530,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerConnection: {fileID: 0} + singlePlayerRobot: {fileID: 0} diff --git a/Assets/Prefab/Client/Internal/UI/GameCanvas.prefab.meta b/Assets/Prefab/Internal/UI/GameCanvas.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/UI/GameCanvas.prefab.meta rename to Assets/Prefab/Internal/UI/GameCanvas.prefab.meta diff --git a/Assets/Prefab/Client/Internal/UI/MainButton.prefab b/Assets/Prefab/Internal/UI/MainButton.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/UI/MainButton.prefab rename to Assets/Prefab/Internal/UI/MainButton.prefab diff --git a/Assets/Prefab/Client/Internal/UI/MainButton.prefab.meta b/Assets/Prefab/Internal/UI/MainButton.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/UI/MainButton.prefab.meta rename to Assets/Prefab/Internal/UI/MainButton.prefab.meta diff --git a/Assets/Prefab/Client/Internal/UI/Options.prefab b/Assets/Prefab/Internal/UI/Options.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/UI/Options.prefab rename to Assets/Prefab/Internal/UI/Options.prefab diff --git a/Assets/Prefab/Client/Internal/UI/Options.prefab.meta b/Assets/Prefab/Internal/UI/Options.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/UI/Options.prefab.meta rename to Assets/Prefab/Internal/UI/Options.prefab.meta diff --git a/Assets/Prefab/Client/Internal/UI/OptionsNumeric.prefab b/Assets/Prefab/Internal/UI/OptionsNumeric.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/UI/OptionsNumeric.prefab rename to Assets/Prefab/Internal/UI/OptionsNumeric.prefab diff --git a/Assets/Prefab/Client/Internal/UI/OptionsNumeric.prefab.meta b/Assets/Prefab/Internal/UI/OptionsNumeric.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/UI/OptionsNumeric.prefab.meta rename to Assets/Prefab/Internal/UI/OptionsNumeric.prefab.meta diff --git a/Assets/Prefab/Client/Internal/UI/PlayerListItem.prefab b/Assets/Prefab/Internal/UI/PlayerListItem.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/UI/PlayerListItem.prefab rename to Assets/Prefab/Internal/UI/PlayerListItem.prefab diff --git a/Assets/Prefab/Client/Internal/UI/PlayerListItem.prefab.meta b/Assets/Prefab/Internal/UI/PlayerListItem.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/UI/PlayerListItem.prefab.meta rename to Assets/Prefab/Internal/UI/PlayerListItem.prefab.meta diff --git a/Assets/Prefab/Client/Internal/UI/ServerListItem.prefab b/Assets/Prefab/Internal/UI/ServerListItem.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/UI/ServerListItem.prefab rename to Assets/Prefab/Internal/UI/ServerListItem.prefab diff --git a/Assets/Prefab/Client/Internal/UI/ServerListItem.prefab.meta b/Assets/Prefab/Internal/UI/ServerListItem.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/UI/ServerListItem.prefab.meta rename to Assets/Prefab/Internal/UI/ServerListItem.prefab.meta diff --git a/Assets/Prefab/Client/Internal/UI/home screen.prefab b/Assets/Prefab/Internal/UI/home screen.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/UI/home screen.prefab rename to Assets/Prefab/Internal/UI/home screen.prefab diff --git a/Assets/Prefab/Client/Internal/UI/home screen.prefab.meta b/Assets/Prefab/Internal/UI/home screen.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/UI/home screen.prefab.meta rename to Assets/Prefab/Internal/UI/home screen.prefab.meta diff --git a/Assets/Prefab/Client/Internal/UI/singlevsmultiplayerscreen.prefab b/Assets/Prefab/Internal/UI/singlevsmultiplayerscreen.prefab similarity index 100% rename from Assets/Prefab/Client/Internal/UI/singlevsmultiplayerscreen.prefab rename to Assets/Prefab/Internal/UI/singlevsmultiplayerscreen.prefab diff --git a/Assets/Prefab/Client/Internal/UI/singlevsmultiplayerscreen.prefab.meta b/Assets/Prefab/Internal/UI/singlevsmultiplayerscreen.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Internal/UI/singlevsmultiplayerscreen.prefab.meta rename to Assets/Prefab/Internal/UI/singlevsmultiplayerscreen.prefab.meta diff --git a/Assets/Prefab/Client/Part.meta b/Assets/Prefab/Part.meta similarity index 100% rename from Assets/Prefab/Client/Part.meta rename to Assets/Prefab/Part.meta diff --git a/Assets/Prefab/Client/Part/Building.meta b/Assets/Prefab/Part/Building.meta similarity index 100% rename from Assets/Prefab/Client/Part/Building.meta rename to Assets/Prefab/Part/Building.meta diff --git a/Assets/Prefab/Client/Part/Building/BasicCube.prefab b/Assets/Prefab/Part/Building/BasicCube.prefab similarity index 100% rename from Assets/Prefab/Client/Part/Building/BasicCube.prefab rename to Assets/Prefab/Part/Building/BasicCube.prefab diff --git a/Assets/Prefab/Client/Part/Building/BasicCube.prefab.meta b/Assets/Prefab/Part/Building/BasicCube.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Part/Building/BasicCube.prefab.meta rename to Assets/Prefab/Part/Building/BasicCube.prefab.meta diff --git a/Assets/Prefab/Client/Part/Building/BasicTire.prefab b/Assets/Prefab/Part/Building/BasicTire.prefab similarity index 98% rename from Assets/Prefab/Client/Part/Building/BasicTire.prefab rename to Assets/Prefab/Part/Building/BasicTire.prefab index 02b3b80..55ad433 100644 --- a/Assets/Prefab/Client/Part/Building/BasicTire.prefab +++ b/Assets/Prefab/Part/Building/BasicTire.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 547571634575352020} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0.219, z: 0} m_LocalScale: {x: 0.42, y: 0.42, z: 0.35} m_Children: [] m_Father: {fileID: 3923196539191495623} @@ -105,7 +105,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2507080134120736427} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0.219, z: 0} m_LocalScale: {x: 0.42, y: 0.42, z: 0.35} m_Children: [] m_Father: {fileID: 3923196539191495623} diff --git a/Assets/Prefab/Client/Part/Building/BasicTire.prefab.meta b/Assets/Prefab/Part/Building/BasicTire.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Part/Building/BasicTire.prefab.meta rename to Assets/Prefab/Part/Building/BasicTire.prefab.meta diff --git a/Assets/Prefab/Client/Part/Building/RootCube.prefab b/Assets/Prefab/Part/Building/RootCube.prefab similarity index 100% rename from Assets/Prefab/Client/Part/Building/RootCube.prefab rename to Assets/Prefab/Part/Building/RootCube.prefab diff --git a/Assets/Prefab/Client/Part/Building/RootCube.prefab.meta b/Assets/Prefab/Part/Building/RootCube.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Part/Building/RootCube.prefab.meta rename to Assets/Prefab/Part/Building/RootCube.prefab.meta diff --git a/Assets/Prefab/Client/Part/Play.meta b/Assets/Prefab/Part/Play.meta similarity index 100% rename from Assets/Prefab/Client/Part/Play.meta rename to Assets/Prefab/Part/Play.meta diff --git a/Assets/Prefab/Client/Part/Play/BasicCube.prefab b/Assets/Prefab/Part/Play/BasicCube.prefab similarity index 100% rename from Assets/Prefab/Client/Part/Play/BasicCube.prefab rename to Assets/Prefab/Part/Play/BasicCube.prefab diff --git a/Assets/Prefab/Client/Part/Play/BasicCube.prefab.meta b/Assets/Prefab/Part/Play/BasicCube.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Part/Play/BasicCube.prefab.meta rename to Assets/Prefab/Part/Play/BasicCube.prefab.meta diff --git a/Assets/Prefab/Client/Part/Play/BasicTire.prefab b/Assets/Prefab/Part/Play/BasicTire.prefab similarity index 100% rename from Assets/Prefab/Client/Part/Play/BasicTire.prefab rename to Assets/Prefab/Part/Play/BasicTire.prefab diff --git a/Assets/Prefab/Client/Part/Play/BasicTire.prefab.meta b/Assets/Prefab/Part/Play/BasicTire.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Part/Play/BasicTire.prefab.meta rename to Assets/Prefab/Part/Play/BasicTire.prefab.meta diff --git a/Assets/Prefab/Server/Parts/BasicTire.prefab b/Assets/Prefab/Part/Play/BasicTireNew.prefab similarity index 69% rename from Assets/Prefab/Server/Parts/BasicTire.prefab rename to Assets/Prefab/Part/Play/BasicTireNew.prefab index 084d5f4..c165a2b 100644 --- a/Assets/Prefab/Server/Parts/BasicTire.prefab +++ b/Assets/Prefab/Part/Play/BasicTireNew.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &547571634575352020 +--- !u!1 &4907994996606414380 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2671464884503061119} - - component: {fileID: 101460585784136841} - - component: {fileID: 7419173851364262893} + - component: {fileID: 7392410137863072903} + - component: {fileID: 4822681404258310769} + - component: {fileID: 2698744406390869269} m_Layer: 0 m_Name: tire m_TagString: Untagged @@ -18,35 +18,35 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2671464884503061119 +--- !u!4 &7392410137863072903 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 547571634575352020} + m_GameObject: {fileID: 4907994996606414380} m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} m_LocalPosition: {x: 0.0046111047, y: 0.00038775802, z: 0.0012494624} m_LocalScale: {x: 0.42000002, y: 0.42, z: 0.34999996} m_Children: [] - m_Father: {fileID: 212465993580246236} + m_Father: {fileID: 4717303181411645988} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!33 &101460585784136841 +--- !u!33 &4822681404258310769 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 547571634575352020} + m_GameObject: {fileID: 4907994996606414380} m_Mesh: {fileID: -2053095641780547097, guid: ac6fb0eac9c94b242a4b5b9429eaae7e, type: 3} ---- !u!23 &7419173851364262893 +--- !u!23 &2698744406390869269 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 547571634575352020} + m_GameObject: {fileID: 4907994996606414380} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -79,7 +79,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1 &1244964786308779473 +--- !u!1 &5962365642613734836 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -87,7 +87,58 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 212465993580246236} + - component: {fileID: 5962365642613734839} + - component: {fileID: 7857893817308852959} + m_Layer: 0 + m_Name: BasicTireNew + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5962365642613734839 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5962365642613734836} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: -0.67, y: 0, z: -0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4717303181411645988} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!114 &7857893817308852959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5962365642613734836} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be0859d21da44b148e713fecf429690d, type: 3} + m_Name: + m_EditorClassIdentifier: + raycastDensity: 0 + radius: 0 + torque: 0 + contactDistance: 0.05 + mask: + serializedVersion: 2 + m_Bits: 768 +--- !u!1 &5963590619919090473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4717303181411645988} m_Layer: 0 m_Name: Mesh m_TagString: Untagged @@ -95,23 +146,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &212465993580246236 +--- !u!4 &4717303181411645988 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1244964786308779473} + m_GameObject: {fileID: 5963590619919090473} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2671464884503061119} - - {fileID: 8534128683558369429} - m_Father: {fileID: 3923196539191495623} + - {fileID: 7392410137863072903} + - {fileID: 3885126674971948653} + m_Father: {fileID: 5962365642613734839} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2507080134120736427 +--- !u!1 &7011857140887029843 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -119,9 +170,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8534128683558369429} - - component: {fileID: 1133792071207025285} - - component: {fileID: 5979628889411197899} + - component: {fileID: 3885126674971948653} + - component: {fileID: 5492675292409230461} + - component: {fileID: 1260451788162307379} m_Layer: 0 m_Name: hubcap m_TagString: Untagged @@ -129,35 +180,35 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8534128683558369429 +--- !u!4 &3885126674971948653 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2507080134120736427} + m_GameObject: {fileID: 7011857140887029843} m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} m_LocalPosition: {x: 0.0046111047, y: 0.00038775802, z: 0.0012494624} m_LocalScale: {x: 0.42000002, y: 0.42, z: 0.34999996} m_Children: [] - m_Father: {fileID: 212465993580246236} + m_Father: {fileID: 4717303181411645988} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!33 &1133792071207025285 +--- !u!33 &5492675292409230461 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2507080134120736427} + m_GameObject: {fileID: 7011857140887029843} m_Mesh: {fileID: 8509814184461198284, guid: 9cfc81236a4c97f468765fb275f4317e, type: 3} ---- !u!23 &5979628889411197899 +--- !u!23 &1260451788162307379 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2507080134120736427} + m_GameObject: {fileID: 7011857140887029843} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -190,66 +241,3 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1 &5299458965186968501 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3923196539191495623} - - component: {fileID: 3226723001406992128} - - component: {fileID: 4734048834668821019} - m_Layer: 0 - m_Name: BasicTire - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3923196539191495623 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5299458965186968501} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 212465993580246236} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3226723001406992128 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5299458965186968501} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 782460a61c9c454b9fda77e87e8e3e01, type: 3} - m_Name: - m_EditorClassIdentifier: - innerMesh: {fileID: 212465993580246236} - _tireComponent: {fileID: 4734048834668821019} - tireMeshRoot: {fileID: 0} - wheelCollider: {fileID: 0} ---- !u!114 &4734048834668821019 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5299458965186968501} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1416999b371041a993ba1d4cc6fa7c56, type: 3} - m_Name: - m_EditorClassIdentifier: - bearing: 0 - baseSteerAngle: 0 diff --git a/Assets/Prefab/Server/Internal/HighlandsServer.prefab.meta b/Assets/Prefab/Part/Play/BasicTireNew.prefab.meta similarity index 74% rename from Assets/Prefab/Server/Internal/HighlandsServer.prefab.meta rename to Assets/Prefab/Part/Play/BasicTireNew.prefab.meta index a2cf73f..d4d8a41 100644 --- a/Assets/Prefab/Server/Internal/HighlandsServer.prefab.meta +++ b/Assets/Prefab/Part/Play/BasicTireNew.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 474f64c78b0b41f41b4fd366448289e4 +guid: bfe9ac9062f0ace4d8c847e114ef675a PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefab/Client/Part/Play/RootCube.prefab b/Assets/Prefab/Part/Play/RootCube.prefab similarity index 100% rename from Assets/Prefab/Client/Part/Play/RootCube.prefab rename to Assets/Prefab/Part/Play/RootCube.prefab diff --git a/Assets/Prefab/Client/Part/Play/RootCube.prefab.meta b/Assets/Prefab/Part/Play/RootCube.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Part/Play/RootCube.prefab.meta rename to Assets/Prefab/Part/Play/RootCube.prefab.meta diff --git a/Assets/Prefab/Client/Part/Play/WheelColliderObject.prefab b/Assets/Prefab/Part/Play/WheelColliderObject.prefab similarity index 95% rename from Assets/Prefab/Client/Part/Play/WheelColliderObject.prefab rename to Assets/Prefab/Part/Play/WheelColliderObject.prefab index c2fd4e9..ef4f45d 100644 --- a/Assets/Prefab/Client/Part/Play/WheelColliderObject.prefab +++ b/Assets/Prefab/Part/Play/WheelColliderObject.prefab @@ -42,9 +42,9 @@ WheelCollider: m_Radius: 0.45 m_SuspensionSpring: spring: 35000 - damper: 4500 - targetPosition: 0.1 - m_SuspensionDistance: 0.1 + damper: 2000 + targetPosition: 0 + m_SuspensionDistance: 0.2 m_ForceAppPointDistance: 0 m_Mass: 20 m_WheelDampingRate: 0.25 diff --git a/Assets/Prefab/Client/Part/Play/WheelColliderObject.prefab.meta b/Assets/Prefab/Part/Play/WheelColliderObject.prefab.meta similarity index 100% rename from Assets/Prefab/Client/Part/Play/WheelColliderObject.prefab.meta rename to Assets/Prefab/Part/Play/WheelColliderObject.prefab.meta diff --git a/Assets/Prefab/Client/ScriptContainers.meta b/Assets/Prefab/ScriptContainers.meta similarity index 100% rename from Assets/Prefab/Client/ScriptContainers.meta rename to Assets/Prefab/ScriptContainers.meta diff --git a/Assets/Prefab/Client/ScriptContainers/UIUtility.prefab b/Assets/Prefab/ScriptContainers/UIUtility.prefab similarity index 100% rename from Assets/Prefab/Client/ScriptContainers/UIUtility.prefab rename to Assets/Prefab/ScriptContainers/UIUtility.prefab diff --git a/Assets/Prefab/Client/ScriptContainers/UIUtility.prefab.meta b/Assets/Prefab/ScriptContainers/UIUtility.prefab.meta similarity index 100% rename from Assets/Prefab/Client/ScriptContainers/UIUtility.prefab.meta rename to Assets/Prefab/ScriptContainers/UIUtility.prefab.meta diff --git a/Assets/Prefab/Server/Internal/HighlandsServer.prefab b/Assets/Prefab/Server/Internal/HighlandsServer.prefab deleted file mode 100644 index 2ec5b22..0000000 --- a/Assets/Prefab/Server/Internal/HighlandsServer.prefab +++ /dev/null @@ -1,204 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1850646932820784178 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1850646932820784179} - - component: {fileID: 1850646932820784176} - m_Layer: 8 - m_Name: Highlands_1_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1850646932820784179 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850646932820784178} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2048, y: 0, z: 2048} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1850646933706671832} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!154 &1850646932820784176 -TerrainCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850646932820784178} - m_Material: {fileID: 0} - m_Enabled: 1 - m_TerrainData: {fileID: 15600000, guid: 0e530954f4b4127458cc2f710223ebdd, type: 2} - m_EnableTreeColliders: 1 ---- !u!1 &1850646933561460984 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1850646933561460985} - - component: {fileID: 1850646933561460990} - m_Layer: 8 - m_Name: Highlands_0_0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1850646933561460985 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850646933561460984} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1850646933706671832} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!154 &1850646933561460990 -TerrainCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850646933561460984} - m_Material: {fileID: 0} - m_Enabled: 1 - m_TerrainData: {fileID: 15600000, guid: 380f9b8de5b605241a01a726135ec90d, type: 2} - m_EnableTreeColliders: 1 ---- !u!1 &1850646933706671835 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1850646933706671832} - m_Layer: 8 - m_Name: HighlandsServer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1850646933706671832 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850646933706671835} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2048, y: 0, z: -2058} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1850646933561460985} - - {fileID: 1850646934353379089} - - {fileID: 1850646934324700455} - - {fileID: 1850646932820784179} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1850646934324700454 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1850646934324700455} - - component: {fileID: 1850646934324700452} - m_Layer: 8 - m_Name: Highlands_0_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1850646934324700455 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850646934324700454} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 2048} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1850646933706671832} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!154 &1850646934324700452 -TerrainCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850646934324700454} - m_Material: {fileID: 0} - m_Enabled: 1 - m_TerrainData: {fileID: 15600000, guid: 14e74a956a0eefd4f8dbeca8ab914217, type: 2} - m_EnableTreeColliders: 1 ---- !u!1 &1850646934353379088 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1850646934353379089} - - component: {fileID: 1850646934353379094} - m_Layer: 8 - m_Name: Highlands_1_0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1850646934353379089 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850646934353379088} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2048, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1850646933706671832} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!154 &1850646934353379094 -TerrainCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850646934353379088} - m_Material: {fileID: 0} - m_Enabled: 1 - m_TerrainData: {fileID: 15600000, guid: 7e5d25eca13653645a2c443204619558, type: 2} - m_EnableTreeColliders: 1 diff --git a/Assets/Prefab/Server/Internal/RobotParentServer.prefab b/Assets/Prefab/Server/Internal/RobotParentServer.prefab deleted file mode 100644 index 23202f9..0000000 --- a/Assets/Prefab/Server/Internal/RobotParentServer.prefab +++ /dev/null @@ -1,405 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &3369653037415507782 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 171596509867255858} - m_Layer: 9 - m_Name: Structure - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &171596509867255858 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3369653037415507782} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 182512891468472644} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3702158555529064141 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2730901704424405784} - m_Layer: 9 - m_Name: Tires - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2730901704424405784 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3702158555529064141} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 428431369170529367} - - {fileID: 7147369648861061552} - m_Father: {fileID: 182512891468472644} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4421177872403235923 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1272174956009512011} - - component: {fileID: 3365832499811330419} - - component: {fileID: 4416227297937577906} - - component: {fileID: 6961367561186991285} - - component: {fileID: 754502169862115075} - - component: {fileID: 8922581642721579762} - - component: {fileID: 6574105224318105294} - - component: {fileID: 7812004616116019815} - - component: {fileID: -691069952085206052} - - component: {fileID: 6169384561132137689} - - component: {fileID: 686880663218978992} - - component: {fileID: 6681657717093209485} - - component: {fileID: 2849167643997509586} - m_Layer: 9 - m_Name: RobotParent - m_TagString: Robot - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1272174956009512011 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -268.3477, y: 11.070056, z: -409.1089} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 182512891468472644} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3365832499811330419 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41077f7c97bf417c81d90625762366e3, type: 3} - m_Name: - m_EditorClassIdentifier: - actorNumber: 0 ---- !u!114 &4416227297937577906 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 75e8e907f8ac0aa48b0af9fd10831697, type: 3} - m_Name: - m_EditorClassIdentifier: - internalNegation: 1 - robotBody: {fileID: 7328779365200919031} ---- !u!114 &6961367561186991285 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb32c9f34f230b4b821b016009f1541, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &754502169862115075 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5b872d487a8efa1448321c674f7f4379, type: 3} - m_Name: - m_EditorClassIdentifier: - robotBody: {fileID: 7328779365200919031} ---- !u!114 &8922581642721579762 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4a0c1182bdbae24c935fb9f4df8c753, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &6574105224318105294 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b9a56882be3f4a419451ddd12cf704eb, type: 3} - m_Name: - m_EditorClassIdentifier: - currentItActorNumber: -1 - lastItActorNumber: -1 - itTint: {r: 1, g: 0, b: 0, a: 0} - normalTint: {r: 1, g: 1, b: 1, a: 0} - tagCooldown: 5 ---- !u!114 &7812004616116019815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62fc75f1d7fee2f4eb8bfad607ed3299, type: 3} - m_Name: - m_EditorClassIdentifier: - playerConnectionObject: {fileID: 0} - playerConnection: {fileID: 0} - actorNumber: 0 ---- !u!54 &-691069952085206052 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - serializedVersion: 2 - m_Mass: 0.0000001 - m_Drag: 0.1 - m_AngularDrag: 0.1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &6169384561132137689 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ObservedComponentsFoldoutOpen: 1 - Group: 0 - prefixField: -1 - Synchronization: 3 - OwnershipTransfer: 0 - ObservedComponents: - - {fileID: 686880663218978992} - - {fileID: 6681657717093209485} - viewIdField: 0 - InstantiationId: 0 - isRuntimeInstantiated: 0 ---- !u!114 &686880663218978992 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8efc6b1d64977384eb3405357896c656, type: 3} - m_Name: - m_EditorClassIdentifier: - m_PositionModel: - SynchronizeEnabled: 1 - TeleportEnabled: 1 - TeleportIfDistanceGreaterThan: 10 - InterpolateOption: 4 - InterpolateMoveTowardsSpeed: 1 - InterpolateLerpSpeed: 5 - ExtrapolateOption: 0 - ExtrapolateSpeed: 1 - ExtrapolateIncludingRoundTripTime: 1 - ExtrapolateNumberOfStoredPositions: 1 - m_RotationModel: - SynchronizeEnabled: 1 - InterpolateOption: 2 - InterpolateRotateTowardsSpeed: 180 - InterpolateLerpSpeed: 5 - m_ScaleModel: - SynchronizeEnabled: 0 - InterpolateOption: 0 - InterpolateMoveTowardsSpeed: 1 - InterpolateLerpSpeed: 0 ---- !u!114 &6681657717093209485 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64179f3720bbfe947b7724caa67b7c1d, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SynchronizeVelocity: 1 - m_SynchronizeAngularVelocity: 1 - m_TeleportEnabled: 0 - m_TeleportIfDistanceGreaterThan: 3 ---- !u!114 &2849167643997509586 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c876e5bd458b46b793da92e38990a64f, type: 3} - m_Name: - m_EditorClassIdentifier: - actionHandler: {fileID: 4416227297937577906} - gamePartList: - - {fileID: 567264566145193179, guid: 52e8c1fd7f6b2404fb227d15c8ecc7e8, type: 3} - - {fileID: 5299458965186968501, guid: 0f865f8719734ee4abcf72f52d288e92, type: 3} - - {fileID: 2342486262294323141, guid: 0796e104400d28744b1992392d73c9f3, type: 3} - structureRoot: {fileID: 171596509867255858} - wheelColliderRoot: {fileID: 428431369170529367} - tireMeshRoot: {fileID: 7147369648861061552} - wheelColliderPrefab: {fileID: 157531082362127546, guid: 1fdd45156f5b319418587cd000aeee03, - type: 3} ---- !u!1 &6034424552130210897 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7147369648861061552} - m_Layer: 9 - m_Name: Meshes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7147369648861061552 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6034424552130210897} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2730901704424405784} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6591583031326451334 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 428431369170529367} - m_Layer: 9 - m_Name: WheelColliders - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &428431369170529367 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6591583031326451334} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2730901704424405784} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7328779365200919031 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 182512891468472644} - m_Layer: 9 - m_Name: Body - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &182512891468472644 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7328779365200919031} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2730901704424405784} - - {fileID: 171596509867255858} - m_Father: {fileID: 1272174956009512011} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefab/Server/Parts.meta b/Assets/Prefab/Server/Parts.meta deleted file mode 100644 index 804cf7b..0000000 --- a/Assets/Prefab/Server/Parts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1c658055f73a1ed4c96bb8fe37492140 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefab/Server/Parts/BasicCube.prefab b/Assets/Prefab/Server/Parts/BasicCube.prefab deleted file mode 100644 index 5f1ff5c..0000000 --- a/Assets/Prefab/Server/Parts/BasicCube.prefab +++ /dev/null @@ -1,126 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &567264566145193179 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 567264566145193178} - - component: {fileID: 718494814348611925} - m_Layer: 0 - m_Name: BasicCube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &567264566145193178 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 567264566145193179} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6584124639734904271} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &718494814348611925 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 567264566145193179} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.5, y: 0.5, z: 0.5} - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &6195532150528114078 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6584124639734904271} - - component: {fileID: 8248584775941371250} - - component: {fileID: 7678300726726975672} - m_Layer: 0 - m_Name: BasicCubeMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6584124639734904271 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6195532150528114078} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} - m_Children: [] - m_Father: {fileID: 567264566145193178} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8248584775941371250 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6195532150528114078} - m_Mesh: {fileID: -3691671829806257054, guid: 5ce65272dbbe84948afb82526961447b, type: 3} ---- !u!23 &7678300726726975672 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6195532150528114078} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: ff01f107900e6784eb2890a6644984e4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 diff --git a/Assets/Prefab/Server/Parts/RootCube.prefab b/Assets/Prefab/Server/Parts/RootCube.prefab deleted file mode 100644 index 3651a54..0000000 --- a/Assets/Prefab/Server/Parts/RootCube.prefab +++ /dev/null @@ -1,126 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2342486262294323141 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2342486262294323140} - - component: {fileID: 3361341170083732043} - m_Layer: 0 - m_Name: RootCube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2342486262294323140 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2342486262294323141} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8935978114069216977} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &3361341170083732043 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2342486262294323141} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.5, y: 0.5, z: 0.5} - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &8261723139981211264 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8935978114069216977} - - component: {fileID: 6135493551051980396} - - component: {fileID: 5608027250598767526} - m_Layer: 0 - m_Name: RootCubeMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8935978114069216977 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8261723139981211264} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} - m_Children: [] - m_Father: {fileID: 2342486262294323140} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6135493551051980396 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8261723139981211264} - m_Mesh: {fileID: -3691671829806257054, guid: 5ce65272dbbe84948afb82526961447b, type: 3} ---- !u!23 &5608027250598767526 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8261723139981211264} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 9b4009fd795c4d4468ab12ce1b4f8ac9, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 diff --git a/Assets/Prefab/Server/Parts/RootCube.prefab.meta b/Assets/Prefab/Server/Parts/RootCube.prefab.meta deleted file mode 100644 index 1300a47..0000000 --- a/Assets/Prefab/Server/Parts/RootCube.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8d01dc6250b9cde48875f18321bd8d01 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefab/Server/Parts/WheelColliderObject.prefab b/Assets/Prefab/Server/Parts/WheelColliderObject.prefab deleted file mode 100644 index c2fd4e9..0000000 --- a/Assets/Prefab/Server/Parts/WheelColliderObject.prefab +++ /dev/null @@ -1,63 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &157531082362127546 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 157531082362127547} - - component: {fileID: 157531082362127548} - m_Layer: 0 - m_Name: WheelColliderObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &157531082362127547 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157531082362127546} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!146 &157531082362127548 -WheelCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157531082362127546} - m_Center: {x: 0, y: 0, z: 0} - m_Radius: 0.45 - m_SuspensionSpring: - spring: 35000 - damper: 4500 - targetPosition: 0.1 - m_SuspensionDistance: 0.1 - m_ForceAppPointDistance: 0 - m_Mass: 20 - m_WheelDampingRate: 0.25 - m_ForwardFriction: - m_ExtremumSlip: 1 - m_ExtremumValue: 3 - m_AsymptoteSlip: 2 - m_AsymptoteValue: 2 - m_Stiffness: 1 - m_SidewaysFriction: - m_ExtremumSlip: 1 - m_ExtremumValue: 3 - m_AsymptoteSlip: 2 - m_AsymptoteValue: 2 - m_Stiffness: 1 - m_Enabled: 1 diff --git a/Assets/Prefab/Server/Parts/WheelColliderObject.prefab.meta b/Assets/Prefab/Server/Parts/WheelColliderObject.prefab.meta deleted file mode 100644 index a9d82b1..0000000 --- a/Assets/Prefab/Server/Parts/WheelColliderObject.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e3ca67a83c9fab6488ec61f6e327d6e5 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/PlayerConnectionObject.prefab b/Assets/Resources/PlayerConnectionObject.prefab index 9347661..5433112 100644 --- a/Assets/Resources/PlayerConnectionObject.prefab +++ b/Assets/Resources/PlayerConnectionObject.prefab @@ -49,6 +49,11 @@ MonoBehaviour: playerObject: {fileID: 0} startingPosition: {x: 0, y: 3, z: 0} cameraMotionScript: {fileID: 0} + classicTagDirector: {fileID: 2612124392210836542, guid: be021f1431278624ba94e7d6f12e088a, + type: 3} + freeplayDirector: {fileID: 4140264822069007822, guid: cf1c247b6d0590b4588a589e80c9ff66, + type: 3} + gameMode: 0 --- !u!114 &9022163172499462134 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/RobotParent.prefab b/Assets/Resources/RobotParent.prefab index 71aa99d..86f0fb1 100644 --- a/Assets/Resources/RobotParent.prefab +++ b/Assets/Resources/RobotParent.prefab @@ -75,10 +75,9 @@ GameObject: - component: {fileID: 4416227297937577906} - component: {fileID: 6961367561186991285} - component: {fileID: 754502169862115075} - - component: {fileID: 8922581642721579762} - - component: {fileID: 6574105224318105294} - component: {fileID: 7812004616116019815} - component: {fileID: 2849167643997509586} + - component: {fileID: 821732043234492994} - component: {fileID: -691069952085206052} - component: {fileID: 6169384561132137689} - component: {fileID: 686880663218978992} @@ -118,7 +117,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 41077f7c97bf417c81d90625762366e3, type: 3} m_Name: m_EditorClassIdentifier: - actorNumber: 0 + robotIndex: 0 --- !u!114 &4416227297937577906 MonoBehaviour: m_ObjectHideFlags: 0 @@ -131,7 +130,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 75e8e907f8ac0aa48b0af9fd10831697, type: 3} m_Name: m_EditorClassIdentifier: - internalNegation: 1 robotBody: {fileID: 7328779365200919031} --- !u!114 &6961367561186991285 MonoBehaviour: @@ -158,35 +156,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: robotBody: {fileID: 7328779365200919031} ---- !u!114 &8922581642721579762 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4a0c1182bdbae24c935fb9f4df8c753, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &6574105224318105294 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4421177872403235923} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b9a56882be3f4a419451ddd12cf704eb, type: 3} - m_Name: - m_EditorClassIdentifier: - currentItActorNumber: -1 - lastItActorNumber: -1 - itTint: {r: 1, g: 0, b: 0, a: 0} - normalTint: {r: 1, g: 1, b: 1, a: 0} - tagCooldown: 5 --- !u!114 &7812004616116019815 MonoBehaviour: m_ObjectHideFlags: 0 @@ -226,6 +195,22 @@ MonoBehaviour: tireMeshRoot: {fileID: 7147369648861061552} wheelColliderPrefab: {fileID: 157531082362127546, guid: 1fdd45156f5b319418587cd000aeee03, type: 3} +--- !u!114 &821732043234492994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4421177872403235923} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a706c80a273c1d04989f37232623b2e8, type: 3} + m_Name: + m_EditorClassIdentifier: + naturalFrequency: 10 + dampingRatio: 0.8 + forceShift: -0.05 + setSuspensionDistance: 1 --- !u!54 &-691069952085206052 Rigidbody: m_ObjectHideFlags: 0 @@ -431,7 +416,7 @@ PrefabInstance: - target: {fileID: 6226200332777473224, guid: aebaf5f4c0a04bc408451608aef0feae, type: 3} propertyPath: m_LocalRotation.x - value: 0.7071068 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 6226200332777473224, guid: aebaf5f4c0a04bc408451608aef0feae, type: 3} @@ -456,7 +441,7 @@ PrefabInstance: - target: {fileID: 6226200332777473224, guid: aebaf5f4c0a04bc408451608aef0feae, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 90 + value: -90 objectReference: {fileID: 0} - target: {fileID: 6226200332777473224, guid: aebaf5f4c0a04bc408451608aef0feae, type: 3} @@ -468,6 +453,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6226200332777473225, guid: aebaf5f4c0a04bc408451608aef0feae, + type: 3} + propertyPath: m_Parameters.widthMultiplier + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6226200332777473225, guid: aebaf5f4c0a04bc408451608aef0feae, type: 3} propertyPath: m_Positions.Array.data[0].z @@ -476,7 +466,22 @@ PrefabInstance: - target: {fileID: 6226200332777473225, guid: aebaf5f4c0a04bc408451608aef0feae, type: 3} propertyPath: m_Positions.Array.data[1].z - value: 1000 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6226200332777473225, guid: aebaf5f4c0a04bc408451608aef0feae, + type: 3} + propertyPath: m_Positions.Array.data[2].z + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 6226200332777473225, guid: aebaf5f4c0a04bc408451608aef0feae, + type: 3} + propertyPath: m_Positions.Array.data[3].z + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 6226200332777473225, guid: aebaf5f4c0a04bc408451608aef0feae, + type: 3} + propertyPath: m_Positions.Array.data[4].z + value: -4000 objectReference: {fileID: 0} - target: {fileID: 6226200332777473226, guid: aebaf5f4c0a04bc408451608aef0feae, type: 3} diff --git a/Assets/Scenes/Client/BuildScene.meta b/Assets/Scenes/BuildScene.meta similarity index 100% rename from Assets/Scenes/Client/BuildScene.meta rename to Assets/Scenes/BuildScene.meta diff --git a/Assets/Scenes/Client/BuildScene.unity b/Assets/Scenes/BuildScene.unity similarity index 100% rename from Assets/Scenes/Client/BuildScene.unity rename to Assets/Scenes/BuildScene.unity diff --git a/Assets/Scenes/Client/BuildScene.unity.meta b/Assets/Scenes/BuildScene.unity.meta similarity index 100% rename from Assets/Scenes/Client/BuildScene.unity.meta rename to Assets/Scenes/BuildScene.unity.meta diff --git a/Assets/Scenes/Client/BuildScene/LightingData.asset b/Assets/Scenes/BuildScene/LightingData.asset similarity index 100% rename from Assets/Scenes/Client/BuildScene/LightingData.asset rename to Assets/Scenes/BuildScene/LightingData.asset diff --git a/Assets/Scenes/Client/BuildScene/LightingData.asset.meta b/Assets/Scenes/BuildScene/LightingData.asset.meta similarity index 100% rename from Assets/Scenes/Client/BuildScene/LightingData.asset.meta rename to Assets/Scenes/BuildScene/LightingData.asset.meta diff --git a/Assets/Scenes/Client/BuildScene/Lightmap-0_comp_dir.png b/Assets/Scenes/BuildScene/Lightmap-0_comp_dir.png similarity index 100% rename from Assets/Scenes/Client/BuildScene/Lightmap-0_comp_dir.png rename to Assets/Scenes/BuildScene/Lightmap-0_comp_dir.png diff --git a/Assets/Scenes/Client/BuildScene/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/BuildScene/Lightmap-0_comp_dir.png.meta similarity index 100% rename from Assets/Scenes/Client/BuildScene/Lightmap-0_comp_dir.png.meta rename to Assets/Scenes/BuildScene/Lightmap-0_comp_dir.png.meta diff --git a/Assets/Scenes/Client/BuildScene/Lightmap-0_comp_light.exr b/Assets/Scenes/BuildScene/Lightmap-0_comp_light.exr similarity index 100% rename from Assets/Scenes/Client/BuildScene/Lightmap-0_comp_light.exr rename to Assets/Scenes/BuildScene/Lightmap-0_comp_light.exr diff --git a/Assets/Scenes/Client/BuildScene/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/BuildScene/Lightmap-0_comp_light.exr.meta similarity index 100% rename from Assets/Scenes/Client/BuildScene/Lightmap-0_comp_light.exr.meta rename to Assets/Scenes/BuildScene/Lightmap-0_comp_light.exr.meta diff --git a/Assets/Scenes/Client/BuildScene/Lightmap-0_comp_shadowmask.png b/Assets/Scenes/BuildScene/Lightmap-0_comp_shadowmask.png similarity index 100% rename from Assets/Scenes/Client/BuildScene/Lightmap-0_comp_shadowmask.png rename to Assets/Scenes/BuildScene/Lightmap-0_comp_shadowmask.png diff --git a/Assets/Scenes/Client/BuildScene/Lightmap-0_comp_shadowmask.png.meta b/Assets/Scenes/BuildScene/Lightmap-0_comp_shadowmask.png.meta similarity index 100% rename from Assets/Scenes/Client/BuildScene/Lightmap-0_comp_shadowmask.png.meta rename to Assets/Scenes/BuildScene/Lightmap-0_comp_shadowmask.png.meta diff --git a/Assets/Scenes/Client/BuildScene/ReflectionProbe-0.exr b/Assets/Scenes/BuildScene/ReflectionProbe-0.exr similarity index 100% rename from Assets/Scenes/Client/BuildScene/ReflectionProbe-0.exr rename to Assets/Scenes/BuildScene/ReflectionProbe-0.exr diff --git a/Assets/Scenes/Client/BuildScene/ReflectionProbe-0.exr.meta b/Assets/Scenes/BuildScene/ReflectionProbe-0.exr.meta similarity index 100% rename from Assets/Scenes/Client/BuildScene/ReflectionProbe-0.exr.meta rename to Assets/Scenes/BuildScene/ReflectionProbe-0.exr.meta diff --git a/Assets/Scenes/Client/SinglePlayerHighlands.unity b/Assets/Scenes/ClassicTagScene.unity similarity index 68% rename from Assets/Scenes/Client/SinglePlayerHighlands.unity rename to Assets/Scenes/ClassicTagScene.unity index 4157a3b..e84cd83 100644 --- a/Assets/Scenes/Client/SinglePlayerHighlands.unity +++ b/Assets/Scenes/ClassicTagScene.unity @@ -20,12 +20,12 @@ RenderSettings: m_FogDensity: 0.0003 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.07227186, g: 0.116970696, b: 0.17788847, a: 1} - m_AmbientEquatorColor: {r: 0.15292618, g: 0.23839766, b: 0.33245158, a: 1} - m_AmbientGroundColor: {r: 0.20507877, g: 0.2422812, b: 0.13286836, a: 1} + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.59607846, g: 0.8470589, b: 1, a: 1} + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 2100000, guid: d9dca9ae1786c394f9e79c637aa9a7bf, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -37,7 +37,7 @@ RenderSettings: m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 1890717199} + m_Sun: {fileID: 440914728} m_IndirectSpecularColor: {r: 0.70147353, g: 0.77973056, b: 0.7677025, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 @@ -57,8 +57,8 @@ LightmapSettings: serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 + m_AtlasSize: 2048 + m_AO: 1 m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 @@ -72,12 +72,12 @@ LightmapSettings: m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 - m_BakeBackend: 1 + m_BakeBackend: 2 m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 3 - m_PVREnvironmentSampleCount: 256 + m_PVRDirectSampleCount: 64 + m_PVRSampleCount: 1024 + m_PVRBounces: 4 + m_PVREnvironmentSampleCount: 512 m_PVREnvironmentReferencePointCount: 2048 m_PVRFilteringMode: 1 m_PVRDenoiserTypeDirect: 1 @@ -96,7 +96,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 + m_LightProbeSampleCountMultiplier: 6 m_LightingDataAsset: {fileID: 112000000, guid: e58304afc743964499bc5f03429ceced, type: 2} m_UseShadowmask: 1 @@ -122,7 +122,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &515073013 +--- !u!1 &440914727 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -130,142 +130,91 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 515073015} - - component: {fileID: 515073014} - - component: {fileID: 515073016} + - component: {fileID: 440914729} + - component: {fileID: 440914728} m_Layer: 0 - m_Name: Line + m_Name: Directional Light m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!120 &515073014 -LineRenderer: +--- !u!108 &440914728 +Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 515073013} + m_GameObject: {fileID: 440914727} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.9714286, b: 0.75, a: 1} + m_Intensity: 0.85 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: dd260ba19cd86c6489abbe011db2b291, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Positions: - - {x: 0, y: 0, z: -100} - - {x: 0, y: 0, z: 4000} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 0.1 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 0 - numCapVertices: 0 - alignment: 0 - textureMode: 0 - shadowBias: 0.5 - generateLightingData: 0 - m_UseWorldSpace: 0 - m_Loop: 0 ---- !u!4 &515073015 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 2.6473e-41, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &440914729 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 515073013} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -268.14832, y: 3211, z: -409} + m_GameObject: {fileID: 440914727} + m_LocalRotation: {x: 0.97910696, y: 0.010892968, z: -0.03060515, w: 0.20073426} + m_LocalPosition: {x: -0.84, y: 3.37, z: 1.45} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!114 &515073016 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 515073013} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5470bb5450b74d2b8ff5961c5c9c7b18, type: 3} - m_Name: - m_EditorClassIdentifier: - multiplier: 1 - lineRenderer: {fileID: 515073014} ---- !u!1 &863500501 + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 156.812, y: 3.4649963, z: -0.56399536} +--- !u!1 &727807795 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -273,9 +222,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 863500504} - - component: {fileID: 863500503} - - component: {fileID: 863500502} + - component: {fileID: 727807798} + - component: {fileID: 727807797} + - component: {fileID: 727807796} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -283,13 +232,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &863500502 +--- !u!114 &727807796 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 863500501} + m_GameObject: {fileID: 727807795} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} @@ -302,13 +251,13 @@ MonoBehaviour: m_InputActionsPerSecond: 10 m_RepeatDelay: 0.5 m_ForceModuleActive: 0 ---- !u!114 &863500503 +--- !u!114 &727807797 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 863500501} + m_GameObject: {fileID: 727807795} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} @@ -317,125 +266,33 @@ MonoBehaviour: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 ---- !u!4 &863500504 +--- !u!4 &727807798 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 863500501} + m_GameObject: {fileID: 727807795} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &934321747 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4421177872403235923, guid: d5b926445abbe244f94ecf6a59e62e03, - type: 3} - m_PrefabInstance: {fileID: 1388800953257134819} - m_PrefabAsset: {fileID: 0} ---- !u!4 &971807862 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 182512891468472644, guid: d5b926445abbe244f94ecf6a59e62e03, +--- !u!114 &925112124 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} - m_PrefabInstance: {fileID: 1388800953257134819} + m_PrefabInstance: {fileID: 6367326466070008697} m_PrefabAsset: {fileID: 0} ---- !u!1 &1890717198 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1890717200} - - component: {fileID: 1890717199} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &1890717199 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890717198} + m_GameObject: {fileID: 0} m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.9714286, b: 0.75, a: 1} - m_Intensity: 0.85 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 1 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 2.6473e-41, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &1890717200 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890717198} - m_LocalRotation: {x: 0.97910696, y: 0.010892968, z: -0.03060515, w: 0.20073426} - m_LocalPosition: {x: -0.84, y: 3.37, z: 1.45} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 156.812, y: 3.4649963, z: -0.56399536} ---- !u!1001 &2086131231 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9bf89071f7da6dc4493d9d18c52d8703, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1867437475 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -445,17 +302,17 @@ PrefabInstance: - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} propertyPath: m_LocalPosition.x - value: -282.4 + value: -2.74 objectReference: {fileID: 0} - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} propertyPath: m_LocalPosition.y - value: 15.5 + value: 4.21 objectReference: {fileID: 0} - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} propertyPath: m_LocalPosition.z - value: -407.57593 + value: -6.14 objectReference: {fileID: 0} - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} @@ -465,7 +322,7 @@ PrefabInstance: - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} propertyPath: m_LocalRotation.y - value: 0.9426629 + value: 0.3235903 objectReference: {fileID: 0} - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} @@ -475,7 +332,7 @@ PrefabInstance: - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} propertyPath: m_LocalRotation.w - value: 0.33374664 + value: 0.9461973 objectReference: {fileID: 0} - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} @@ -499,9 +356,9 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1467070168979876491, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} - propertyPath: centerObject + propertyPath: playerConnection value: - objectReference: {fileID: 971807862} + objectReference: {fileID: 925112124} - target: {fileID: 1467070168979876495, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} propertyPath: m_Name @@ -509,132 +366,143 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} ---- !u!1001 &1388800953257134819 +--- !u!114 &1867437476 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1467070168979876491, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + m_PrefabInstance: {fileID: 1867437475} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d71210dd3fa5bf4e8f5757635f94c76, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1918368601 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -691069952085206052, guid: d5b926445abbe244f94ecf6a59e62e03, - type: 3} - propertyPath: m_IsKinematic - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} propertyPath: m_LocalPosition.x - value: -268.3477 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} propertyPath: m_LocalPosition.y - value: 11.070056 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} propertyPath: m_LocalPosition.z - value: -409.1089 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} propertyPath: m_RootOrder - value: 5 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2849167643997509586, guid: d5b926445abbe244f94ecf6a59e62e03, - type: 3} - propertyPath: wheelColliderPrefab - value: - objectReference: {fileID: 157531082362127546, guid: 1fdd45156f5b319418587cd000aeee03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} - - target: {fileID: 4409296208398172241, guid: d5b926445abbe244f94ecf6a59e62e03, + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} - propertyPath: updateInterval - value: 0.05 + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4409296208398172241, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} - propertyPath: outlineWidth - value: 0.1 + propertyPath: m_SizeDelta.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4421177872403235923, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} - propertyPath: m_Name - value: RobotParent + propertyPath: m_SizeDelta.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6169384561132137689, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} - propertyPath: viewIdField - value: 2 + propertyPath: m_AnchorMin.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6574105224318105294, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} - propertyPath: itTint.r - value: 1 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6574105224318105294, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} - propertyPath: itTint.g + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6574105224318105294, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} - propertyPath: itTint.b + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6574105224318105294, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} - propertyPath: normalTint.r - value: 1 + propertyPath: m_Pivot.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6574105224318105294, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} - propertyPath: normalTint.g - value: 1 + propertyPath: m_Pivot.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6574105224318105294, guid: d5b926445abbe244f94ecf6a59e62e03, + - target: {fileID: 8838551436517846597, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} - propertyPath: normalTint.b - value: 1 + propertyPath: playerConnection + value: + objectReference: {fileID: 925112124} + - target: {fileID: 8838551436517846648, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_Name + value: GameCanvas objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d5b926445abbe244f94ecf6a59e62e03, type: 3} ---- !u!1001 &1850646933296018434 + m_SourcePrefab: {fileID: 100100000, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} +--- !u!1001 &2002095637 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -703,127 +571,103 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, type: 3} ---- !u!1001 &8838551436100300518 +--- !u!1001 &6367326466070008697 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834946, guid: 012663ac73c1ff443bd04f8c0d0f2b45, + type: 3} + propertyPath: m_Name + value: PlayerConnectionObject + objectReference: {fileID: 0} + - target: {fileID: 6367326465283834946, guid: 012663ac73c1ff443bd04f8c0d0f2b45, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 0} + - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} propertyPath: m_RootOrder - value: 3 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + propertyPath: cameraMotionScript + value: + objectReference: {fileID: 1867437476} + - target: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} - propertyPath: m_AnchorMax.y - value: 0 + propertyPath: startingPosition.x + value: -271 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} - propertyPath: m_Pivot.x - value: 0 + propertyPath: startingPosition.y + value: 99 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} - propertyPath: m_Pivot.y - value: 0 + propertyPath: startingPosition.z + value: -413 objectReference: {fileID: 0} - - target: {fileID: 8838551436517846597, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + - target: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} - propertyPath: singlePlayerRobot + propertyPath: playerObjectPrefab value: - objectReference: {fileID: 934321747} - - target: {fileID: 8838551436517846648, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + objectReference: {fileID: 4421177872403235923, guid: d5b926445abbe244f94ecf6a59e62e03, type: 3} - propertyPath: m_Name - value: GameCanvas - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} diff --git a/Assets/Scenes/Client/ClassicTagScene.unity.meta b/Assets/Scenes/ClassicTagScene.unity.meta similarity index 100% rename from Assets/Scenes/Client/ClassicTagScene.unity.meta rename to Assets/Scenes/ClassicTagScene.unity.meta diff --git a/Assets/Scenes/Client.meta b/Assets/Scenes/Client.meta deleted file mode 100644 index bc8bfeb..0000000 --- a/Assets/Scenes/Client.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 740a9b1b19af2634d81b57f8a34b6ab9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Client/ClassicTagScene.unity b/Assets/Scenes/Client/ClassicTagScene.unity deleted file mode 100644 index dcfadb9..0000000 --- a/Assets/Scenes/Client/ClassicTagScene.unity +++ /dev/null @@ -1,1242 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 1 - m_FogColor: {r: 0.44962355, g: 0.64472437, b: 0.77254903, a: 1} - m_FogMode: 3 - m_FogDensity: 0.0003 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 2100000, guid: d9dca9ae1786c394f9e79c637aa9a7bf, type: 2} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 440914728} - m_IndirectSpecularColor: {r: 0.70147353, g: 0.77973056, b: 0.7677025, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 2048 - m_AO: 1 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 2 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 64 - m_PVRSampleCount: 1024 - m_PVRBounces: 4 - m_PVREnvironmentSampleCount: 512 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 6 - m_LightingDataAsset: {fileID: 112000000, guid: e58304afc743964499bc5f03429ceced, - type: 2} - m_UseShadowmask: 1 ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &68195567 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 68195568} - - component: {fileID: 68195570} - - component: {fileID: 68195569} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &68195568 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 68195567} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1827914766} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &68195569 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 68195567} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 28b6d07166d6d8947a6671e5480cbf66, type: 3} - m_FontSize: 20 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Submit ---- !u!222 &68195570 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 68195567} - m_CullTransparentMesh: 0 ---- !u!1 &145544569 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 145544570} - - component: {fileID: 145544571} - m_Layer: 5 - m_Name: CooldownInput - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &145544570 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 145544569} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1907360993} - - {fileID: 1827914766} - m_Father: {fileID: 1918368602} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 99.9, y: -147.4} - m_SizeDelta: {x: 147, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &145544571 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 145544569} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8986c65f040cc0d4795d82d4b5068315, type: 3} - m_Name: - m_EditorClassIdentifier: - inGameUiScript: {fileID: 1918368603} - inputField: {fileID: 1907360994} ---- !u!1 &440914727 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 440914729} - - component: {fileID: 440914728} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &440914728 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440914727} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.9714286, b: 0.75, a: 1} - m_Intensity: 0.85 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 1 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 2.6473e-41, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &440914729 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440914727} - m_LocalRotation: {x: 0.97910696, y: 0.010892968, z: -0.03060515, w: 0.20073426} - m_LocalPosition: {x: -0.84, y: 3.37, z: 1.45} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 156.812, y: 3.4649963, z: -0.56399536} ---- !u!1 &527194685 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 527194686} - - component: {fileID: 527194688} - - component: {fileID: 527194687} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &527194686 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 527194685} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1907360993} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.5} - m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &527194687 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 527194685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 28b6d07166d6d8947a6671e5480cbf66, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: ---- !u!222 &527194688 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 527194685} - m_CullTransparentMesh: 0 ---- !u!1 &727807795 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 727807798} - - component: {fileID: 727807797} - - component: {fileID: 727807796} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &727807796 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 727807795} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &727807797 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 727807795} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &727807798 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 727807795} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &925112124 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - m_PrefabInstance: {fileID: 6367326466070008697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9bf89071f7da6dc4493d9d18c52d8703, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1266349153 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1266349154} - - component: {fileID: 1266349156} - - component: {fileID: 1266349155} - m_Layer: 5 - m_Name: Placeholder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1266349154 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1266349153} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1907360993} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.5} - m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1266349155 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1266349153} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 28b6d07166d6d8947a6671e5480cbf66, type: 3} - m_FontSize: 14 - m_FontStyle: 2 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Current cooldown is 5 ' ---- !u!222 &1266349156 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1266349153} - m_CullTransparentMesh: 0 ---- !u!1 &1827914765 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1827914766} - - component: {fileID: 1827914769} - - component: {fileID: 1827914768} - - component: {fileID: 1827914767} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1827914766 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1827914765} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 68195568} - m_Father: {fileID: 145544570} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -0.40000916, y: -22} - m_SizeDelta: {x: -0.80000305, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1827914767 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1827914765} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1827914768} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 145544571} - m_MethodName: SetCooldown - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1827914768 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1827914765} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1827914769 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1827914765} - m_CullTransparentMesh: 0 ---- !u!1001 &1867437475 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_LocalPosition.x - value: -2.74 - objectReference: {fileID: 0} - - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_LocalPosition.y - value: 4.21 - objectReference: {fileID: 0} - - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_LocalPosition.z - value: -6.14 - objectReference: {fileID: 0} - - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.3235903 - objectReference: {fileID: 0} - - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.9461973 - objectReference: {fileID: 0} - - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 37.760002 - objectReference: {fileID: 0} - - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1467070168979876491, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: playerConnection - value: - objectReference: {fileID: 925112124} - - target: {fileID: 1467070168979876495, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - propertyPath: m_Name - value: Main Camera - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} ---- !u!114 &1867437476 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1467070168979876491, guid: f85e687a1917adf4ab681b85bd75db5f, - type: 3} - m_PrefabInstance: {fileID: 1867437475} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4d71210dd3fa5bf4e8f5757635f94c76, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1907360992 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1907360993} - - component: {fileID: 1907360996} - - component: {fileID: 1907360995} - - component: {fileID: 1907360994} - m_Layer: 5 - m_Name: InputField - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1907360993 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1907360992} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1266349154} - - {fileID: 527194686} - m_Father: {fileID: 145544570} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0.14998627, y: 70} - m_SizeDelta: {x: -0.30002, y: 31.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1907360994 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1907360992} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1907360995} - m_TextComponent: {fileID: 527194687} - m_Placeholder: {fileID: 1266349155} - m_ContentType: 0 - m_InputType: 0 - m_AsteriskChar: 42 - m_KeyboardType: 0 - m_LineType: 0 - m_HideMobileInput: 0 - m_CharacterValidation: 0 - m_CharacterLimit: 0 - m_OnEndEdit: - m_PersistentCalls: - m_Calls: [] - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_CustomCaretColor: 0 - m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} - m_Text: - m_CaretBlinkRate: 0.85 - m_CaretWidth: 1 - m_ReadOnly: 0 ---- !u!114 &1907360995 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1907360992} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1907360996 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1907360992} - m_CullTransparentMesh: 0 ---- !u!1001 &1918368601 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8838551436517846597, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: playerConnection - value: - objectReference: {fileID: 925112124} - - target: {fileID: 8838551436517846648, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - propertyPath: m_Name - value: GameCanvas - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} ---- !u!224 &1918368602 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - m_PrefabInstance: {fileID: 1918368601} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1918368603 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8838551436517846597, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, - type: 3} - m_PrefabInstance: {fileID: 1918368601} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db8efec6d07c1d240ae0c36732b7729f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &2002095637 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_LocalPosition.x - value: -2048 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_LocalPosition.z - value: -2058 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671835, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, - type: 3} - propertyPath: m_Name - value: Highlands - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, type: 3} ---- !u!1001 &6367326466070008697 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 6367326465283834946, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_Name - value: PlayerConnectionObject - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834948, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: cameraMotionScript - value: - objectReference: {fileID: 1867437476} - - target: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: startingPosition.x - value: -271 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: startingPosition.y - value: 99 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: startingPosition.z - value: -413 - objectReference: {fileID: 0} - - target: {fileID: 6367326465283834949, guid: 012663ac73c1ff443bd04f8c0d0f2b45, - type: 3} - propertyPath: playerObjectPrefab - value: - objectReference: {fileID: 4421177872403235923, guid: d5b926445abbe244f94ecf6a59e62e03, - type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 012663ac73c1ff443bd04f8c0d0f2b45, type: 3} diff --git a/Assets/Scenes/Client/FreeplayScene.unity b/Assets/Scenes/FreeplayScene.unity similarity index 100% rename from Assets/Scenes/Client/FreeplayScene.unity rename to Assets/Scenes/FreeplayScene.unity diff --git a/Assets/Scenes/Client/FreeplayScene.unity.meta b/Assets/Scenes/FreeplayScene.unity.meta similarity index 100% rename from Assets/Scenes/Client/FreeplayScene.unity.meta rename to Assets/Scenes/FreeplayScene.unity.meta diff --git a/Assets/Scenes/Client/MainMenuScene.meta b/Assets/Scenes/MainMenuScene.meta similarity index 100% rename from Assets/Scenes/Client/MainMenuScene.meta rename to Assets/Scenes/MainMenuScene.meta diff --git a/Assets/Scenes/Client/MainMenuScene.unity b/Assets/Scenes/MainMenuScene.unity similarity index 81% rename from Assets/Scenes/Client/MainMenuScene.unity rename to Assets/Scenes/MainMenuScene.unity index b3f0359..652ccba 100644 --- a/Assets/Scenes/Client/MainMenuScene.unity +++ b/Assets/Scenes/MainMenuScene.unity @@ -122,6 +122,111 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &24373095 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 24373096} + - component: {fileID: 24373100} + - component: {fileID: 24373099} + - component: {fileID: 24373098} + - component: {fileID: 24373097} + m_Layer: 5 + m_Name: SinglePlayerSettingsPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &24373096 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24373095} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 338535882} + m_Father: {fileID: 1995372624} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &24373097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24373095} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e99856657774daca2ee2207aaa310ee, type: 3} + m_Name: + m_EditorClassIdentifier: + numControllableBotsSlider: {fileID: 1398574810} + mapSlider: {fileID: 860819220} + singlePlayerDirectorPrefab: {fileID: 2541324036647193942, guid: 5e1363b0a1e755f47ab4fecffdeba229, + type: 3} +--- !u!225 &24373098 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24373095} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &24373099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24373095} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.29223037, g: 0.3001847, b: 0.31132078, a: 0.98039216} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &24373100 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24373095} + m_CullTransparentMesh: 0 --- !u!1 &39753691 GameObject: m_ObjectHideFlags: 0 @@ -590,6 +695,41 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &167601645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 167601646} + m_Layer: 5 + m_Name: RobotViewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &167601646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 167601645} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1268258387} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -442.84, y: -1.651123} + m_SizeDelta: {x: 885.6842, y: -3.302185} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &197143584 GameObject: m_ObjectHideFlags: 0 @@ -1271,6 +1411,109 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &338535881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 338535882} + - component: {fileID: 338535885} + - component: {fileID: 338535884} + - component: {fileID: 338535883} + m_Layer: 5 + m_Name: Settings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &338535882 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338535881} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1850168928} + - {fileID: 842497960} + - {fileID: 1022098929} + m_Father: {fileID: 24373096} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0.0000038146973, y: 0} + m_SizeDelta: {x: 717.53125, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &338535883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338535881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!114 &338535884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338535881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3679245, g: 0.3679245, b: 0.3679245, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &338535885 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338535881} + m_CullTransparentMesh: 0 --- !u!1 &373321621 GameObject: m_ObjectHideFlags: 0 @@ -2160,7 +2403,6 @@ MonoBehaviour: serverSettingsHandler: {fileID: 633709699} roomWaitingPanel: {fileID: 499065857} uiUtility: {fileID: 626406189} - modalWindow: {fileID: 1937904441} waitingText: {fileID: 610658207} startButton: {fileID: 870731347} leaveButton: {fileID: 0} @@ -2257,10 +2499,10 @@ GameObject: - component: {fileID: 519420032} - component: {fileID: 519420031} - component: {fileID: 519420029} - - component: {fileID: 519420030} + - component: {fileID: 519420033} m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + m_Name: ViewCamera + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -2273,20 +2515,6 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_Enabled: 1 ---- !u!114 &519420030 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6fc42b6b0f483924682d465346ec246a, type: 3} - m_Name: - m_EditorClassIdentifier: - amount: 0.03 - viewObject: {fileID: 2117023047} --- !u!20 &519420031 Camera: m_ObjectHideFlags: 0 @@ -2297,7 +2525,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.79215693, g: 0.8117648, b: 0.83921576, a: 1} + m_BackGroundColor: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -2308,17 +2536,17 @@ Camera: serializedVersion: 2 x: 0 y: 0 - width: 1 - height: 1 + width: 0.5 + height: 0.5 near clip plane: 0.3 far clip plane: 5000 - field of view: 26.991467 + field of view: 50 orthographic: 0 orthographic size: 5 - m_Depth: -1 + m_Depth: 1 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 791 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -2337,13 +2565,26 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} - m_LocalRotation: {x: 0.13568045, y: -0, z: -0, w: 0.99075264} - m_LocalPosition: {x: 0, y: 2.75, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 15.596001, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519420033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6df2103f53eb4bb49abaaf86cfdee933, type: 3} + m_Name: + m_EditorClassIdentifier: + viewport: {fileID: 167601646} --- !u!1 &540452851 GameObject: m_ObjectHideFlags: 0 @@ -2418,38 +2659,183 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 540452851} m_CullTransparentMesh: 0 ---- !u!1 &581498066 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 581498067} - - component: {fileID: 581498070} - - component: {fileID: 581498069} - - component: {fileID: 581498068} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &581498067 -RectTransform: +--- !u!1001 &567443575 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 581498066} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 61410662} - m_Father: {fileID: 158454326} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1507810458} + m_Modifications: + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.000030517578 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769675, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_Name + value: OptionsNumeric + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769677, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: minValue + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769677, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: maxValue + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 8015789358591915485, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789359192187837, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d125780f00d30148bb2e5378f2cc9f3, type: 3} +--- !u!224 &567443576 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + m_PrefabInstance: {fileID: 567443575} + m_PrefabAsset: {fileID: 0} +--- !u!1 &581498066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 581498067} + - component: {fileID: 581498070} + - component: {fileID: 581498069} + - component: {fileID: 581498068} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &581498067 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 581498066} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 61410662} + m_Father: {fileID: 158454326} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2548,6 +2934,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 581498066} m_CullTransparentMesh: 0 +--- !u!114 &588305406 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8015789357783769677, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + m_PrefabInstance: {fileID: 567443575} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b9fa5a0da8d41a8b42e79e2181e633f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &610658205 GameObject: m_ObjectHideFlags: 0 @@ -2976,6 +3374,7 @@ MonoBehaviour: panelParent: {fileID: 1995372624} startPanel: {fileID: 1268258388} topBar: {fileID: 1225958588} + errorWindow: {fileID: 0} --- !u!222 &626406190 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3094,7 +3493,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 633709694} m_Enabled: 1 - m_Alpha: 0 + m_Alpha: 1 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 @@ -3113,6 +3512,7 @@ MonoBehaviour: gameModeOptionsSlider: {fileID: 1741906446} mapOptionsSlider: {fileID: 1360563102} maxPlayersOptionsSlider: {fileID: 1421432663} + gameLengthOptionsSlider: {fileID: 588305406} nameInputField: {fileID: 1998343545} --- !u!1 &662263520 GameObject: @@ -3493,6 +3893,7 @@ RectTransform: - {fileID: 2128065497} - {fileID: 1516764256} - {fileID: 662263521} + - {fileID: 1507810458} m_Father: {fileID: 116579568} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3546,7 +3947,7 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &732231022 +--- !u!1 &713649794 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3554,82 +3955,212 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 732231023} - - component: {fileID: 732231026} - - component: {fileID: 732231025} - - component: {fileID: 732231024} + - component: {fileID: 713649795} + - component: {fileID: 713649798} + - component: {fileID: 713649797} + - component: {fileID: 713649796} m_Layer: 5 - m_Name: Title + m_Name: Back m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &732231023 +--- !u!224 &713649795 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 732231022} + m_GameObject: {fileID: 713649794} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 39753692} - m_Father: {fileID: 1119922302} + - {fileID: 1988348530} + m_Father: {fileID: 1022098929} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &732231024 + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &713649796 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 732231022} + m_GameObject: {fileID: 713649794} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: 200 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &732231025 + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 713649797} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 626406189} + m_MethodName: SwitchToPanel + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 1268258388} + m_ObjectArgumentAssemblyTypeName: UnityEngine.CanvasGroup, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &713649797 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 732231022} + m_GameObject: {fileID: 713649794} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.83921576, g: 0.8980393, b: 0.89019614, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &713649798 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 713649794} + m_CullTransparentMesh: 0 +--- !u!1 &732231022 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 732231023} + - component: {fileID: 732231026} + - component: {fileID: 732231025} + - component: {fileID: 732231024} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &732231023 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732231022} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 39753692} + m_Father: {fileID: 1119922302} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &732231024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732231022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 200 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &732231025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732231022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.83921576, g: 0.8980393, b: 0.89019614, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 m_MaxSize: 100 m_Alignment: 4 m_AlignByGeometry: 0 @@ -4244,126 +4775,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 833903985} m_CullTransparentMesh: 0 ---- !u!1 &870731345 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 870731346} - - component: {fileID: 870731349} - - component: {fileID: 870731348} - - component: {fileID: 870731347} - m_Layer: 5 - m_Name: StartButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &870731346 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 870731345} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 620698563} - m_Father: {fileID: 374514047} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 195.8664, y: 109.41843} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &870731347 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 870731345} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 870731348} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &870731348 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 870731345} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &870731349 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 870731345} - m_CullTransparentMesh: 0 ---- !u!1 &893496203 +--- !u!1 &842497959 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4371,29 +4783,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 893496204} - - component: {fileID: 893496207} - - component: {fileID: 893496206} - - component: {fileID: 893496205} + - component: {fileID: 842497960} + - component: {fileID: 842497962} + - component: {fileID: 842497961} m_Layer: 5 - m_Name: Mesage + m_Name: Content m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &893496204 +--- !u!224 &842497960 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 893496203} + m_GameObject: {fileID: 842497959} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1937904437} + m_Children: + - {fileID: 880639691} + - {fileID: 1772497057} + m_Father: {fileID: 338535882} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -4401,13 +4814,13 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &893496205 +--- !u!114 &842497961 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 893496203} + m_GameObject: {fileID: 842497959} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} @@ -4421,37 +4834,572 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!114 &893496206 +--- !u!114 &842497962 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 893496203} + m_GameObject: {fileID: 842497959} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 5 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!1001 &860819218 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1772497057} + m_Modifications: + - target: {fileID: 3685272486346929760, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: options.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929760, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: options.Array.data[0] + value: Highlands + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929760, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: stringEnumRaw + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929766, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_Name + value: Options + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.000030517578 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3685272487686201840, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685272488292775824, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 70bc9ab7ed758264fbb137866ba0c402, type: 3} +--- !u!224 &860819219 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3685272486346929767, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + m_PrefabInstance: {fileID: 860819218} + m_PrefabAsset: {fileID: 0} +--- !u!114 &860819220 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3685272486346929760, guid: 70bc9ab7ed758264fbb137866ba0c402, + type: 3} + m_PrefabInstance: {fileID: 860819218} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7492d29bf30c4513937d9f831b6edc82, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &870731345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 870731346} + - component: {fileID: 870731349} + - component: {fileID: 870731348} + - component: {fileID: 870731347} + m_Layer: 5 + m_Name: StartButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &870731346 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870731345} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 620698563} + m_Father: {fileID: 374514047} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 195.8664, y: 109.41843} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &870731347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870731345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 870731348} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &870731348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870731345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &870731349 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 870731345} + m_CullTransparentMesh: 0 +--- !u!1 &876263770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 876263771} + - component: {fileID: 876263773} + - component: {fileID: 876263772} + m_Layer: 5 + m_Name: Separator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &876263771 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 876263770} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1850168928} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.000011444, y: -38.79544} + m_SizeDelta: {x: 448.61984, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &876263772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 876263770} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.83921576, g: 0.8980393, b: 0.89019614, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &876263773 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 876263770} + m_CullTransparentMesh: 0 +--- !u!1 &880639690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 880639691} + - component: {fileID: 880639694} + - component: {fileID: 880639693} + - component: {fileID: 880639692} + m_Layer: 5 + m_Name: NumRobots + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &880639691 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880639690} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1812238296} + - {fileID: 1398574809} + m_Father: {fileID: 842497960} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &880639692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880639690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.16470589} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &880639693 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880639690} + m_CullTransparentMesh: 0 +--- !u!114 &880639694 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880639690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 100 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &893496203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 893496204} + - component: {fileID: 893496207} + - component: {fileID: 893496206} + - component: {fileID: 893496205} + m_Layer: 5 + m_Name: Mesage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &893496204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 893496203} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1937904437} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &893496205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 893496203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 9999 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &893496206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 893496203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 'Could not create server with reason: @@ -4630,37 +5578,37 @@ PrefabInstance: - target: {fileID: 8168770671991800448, guid: df442ac7d92879244b42079a9d37607d, type: 3} propertyPath: m_LocalPosition.x - value: -3.44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8168770671991800448, guid: df442ac7d92879244b42079a9d37607d, type: 3} propertyPath: m_LocalPosition.y - value: -1.27 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8168770671991800448, guid: df442ac7d92879244b42079a9d37607d, type: 3} propertyPath: m_LocalPosition.z - value: 14.28 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8168770671991800448, guid: df442ac7d92879244b42079a9d37607d, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8168770671991800448, guid: df442ac7d92879244b42079a9d37607d, type: 3} propertyPath: m_LocalRotation.y - value: 0.7194974 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 8168770671991800448, guid: df442ac7d92879244b42079a9d37607d, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8168770671991800448, guid: df442ac7d92879244b42079a9d37607d, type: 3} propertyPath: m_LocalRotation.w - value: -0.6944952 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 8168770671991800448, guid: df442ac7d92879244b42079a9d37607d, type: 3} @@ -4675,7 +5623,7 @@ PrefabInstance: - target: {fileID: 8168770671991800448, guid: df442ac7d92879244b42079a9d37607d, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 8168770671991800448, guid: df442ac7d92879244b42079a9d37607d, type: 3} @@ -4690,6 +5638,90 @@ PrefabInstance: m_RemovedComponents: - {fileID: 8168770671991800449, guid: df442ac7d92879244b42079a9d37607d, type: 3} m_SourcePrefab: {fileID: 100100000, guid: df442ac7d92879244b42079a9d37607d, type: 3} +--- !u!1 &1022098928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1022098929} + - component: {fileID: 1022098931} + - component: {fileID: 1022098930} + m_Layer: 5 + m_Name: Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1022098929 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1022098928} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 713649795} + - {fileID: 1487630077} + m_Father: {fileID: 338535882} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1022098930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1022098928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 50 + m_Right: 50 + m_Top: 50 + m_Bottom: 50 + m_ChildAlignment: 0 + m_Spacing: 50 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!114 &1022098931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1022098928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 200 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1056603340 GameObject: m_ObjectHideFlags: 0 @@ -4974,6 +6006,7 @@ MonoBehaviour: gameModeOptionsSlider: {fileID: 0} mapOptionsSlider: {fileID: 0} maxPlayersOptionsSlider: {fileID: 0} + gameLengthOptionsSlider: {fileID: 0} nameInputField: {fileID: 1994487257} --- !u!225 &1113930115 CanvasGroup: @@ -5125,14 +6158,166 @@ CanvasRenderer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119922301} + m_GameObject: {fileID: 1119922301} + m_CullTransparentMesh: 0 +--- !u!224 &1156966902 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2370711524397418988, guid: fe5a27ed139b6ee4c9acb15e0600092e, + type: 3} + m_PrefabInstance: {fileID: 2370711525399191578} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1165198623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1165198626} + - component: {fileID: 1165198625} + m_Layer: 0 + m_Name: MainCamera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &1165198625 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1165198623} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 0 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1165198626 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1165198623} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2.75, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1165434047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1165434048} + - component: {fileID: 1165434050} + - component: {fileID: 1165434049} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1165434048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1165434047} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1772497057} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1165434049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1165434047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.83921576, g: 0.8980393, b: 0.89019614, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Map:' +--- !u!222 &1165434050 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1165434047} m_CullTransparentMesh: 0 ---- !u!224 &1156966902 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2370711524397418988, guid: fe5a27ed139b6ee4c9acb15e0600092e, - type: 3} - m_PrefabInstance: {fileID: 2370711525399191578} - m_PrefabAsset: {fileID: 0} --- !u!1 &1225958588 GameObject: m_ObjectHideFlags: 0 @@ -5260,6 +6445,7 @@ RectTransform: m_Children: - {fileID: 432976613} - {fileID: 318087247} + - {fileID: 167601646} m_Father: {fileID: 1995372624} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5587,6 +6773,84 @@ MonoBehaviour: type: 3} serverConnector: {fileID: 499065858} evenColor: {r: 0.46226418, g: 0.46226418, b: 0.46226418, a: 1} +--- !u!1 &1354881127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1354881128} + - component: {fileID: 1354881130} + - component: {fileID: 1354881129} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1354881128 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354881127} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1507810458} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1354881129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354881127} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.83921576, g: 0.8980393, b: 0.89019614, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Game Length (min):' +--- !u!222 &1354881130 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354881127} + m_CullTransparentMesh: 0 --- !u!1001 &1355714982 PrefabInstance: m_ObjectHideFlags: 0 @@ -5853,64 +7117,221 @@ GameObject: m_IsActive: 1 --- !u!224 &1374024140 RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1374024139} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1994487256} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1374024141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1374024139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &1374024142 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1374024139} + m_CullTransparentMesh: 0 +--- !u!1001 &1398574808 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 880639691} + m_Modifications: + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.000030517578 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769675, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_Name + value: OptionsNumeric + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769677, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: wholeNumbers + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8015789357783769677, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: maxValue + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8015789358591915485, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8015789359192187837, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d125780f00d30148bb2e5378f2cc9f3, type: 3} +--- !u!224 &1398574809 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8015789357783769674, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + m_PrefabInstance: {fileID: 1398574808} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1374024139} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1994487256} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.5} - m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1374024141 +--- !u!114 &1398574810 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8015789357783769677, guid: 7d125780f00d30148bb2e5378f2cc9f3, + type: 3} + m_PrefabInstance: {fileID: 1398574808} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1374024139} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: 5b9fa5a0da8d41a8b42e79e2181e633f, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: ---- !u!222 &1374024142 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1374024139} - m_CullTransparentMesh: 0 --- !u!114 &1421432663 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8015789357783769677, guid: 7d125780f00d30148bb2e5378f2cc9f3, @@ -6436,6 +7857,136 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1479442212} m_CullTransparentMesh: 0 +--- !u!1 &1487630076 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1487630077} + - component: {fileID: 1487630080} + - component: {fileID: 1487630079} + - component: {fileID: 1487630078} + m_Layer: 5 + m_Name: Continue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1487630077 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1487630076} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1973329315} + m_Father: {fileID: 1022098929} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1487630078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1487630076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1487630079} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 24373097} + m_MethodName: StartGame + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1487630079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1487630076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1487630080 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1487630076} + m_CullTransparentMesh: 0 --- !u!1 &1488468550 GameObject: m_ObjectHideFlags: 0 @@ -6573,47 +8124,144 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -0.5} m_SizeDelta: {x: -20, y: -13} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1506767671 +--- !u!114 &1506767671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506767669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} + m_FontSize: 30 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Enter text... +--- !u!222 &1506767672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506767669} + m_CullTransparentMesh: 0 +--- !u!1 &1507810457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1507810458} + - component: {fileID: 1507810461} + - component: {fileID: 1507810460} + - component: {fileID: 1507810459} + m_Layer: 5 + m_Name: GameLength + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1507810458 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507810457} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1354881128} + - {fileID: 567443576} + m_Father: {fileID: 699057896} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1507810459 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1506767669} + m_GameObject: {fileID: 1507810457} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + m_Color: {r: 1, g: 1, b: 1, a: 0.16470589} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} - m_FontSize: 30 - m_FontStyle: 2 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Enter text... ---- !u!222 &1506767672 + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1507810460 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1506767669} + m_GameObject: {fileID: 1507810457} m_CullTransparentMesh: 0 +--- !u!114 &1507810461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507810457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 100 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1516764255 GameObject: m_ObjectHideFlags: 0 @@ -7041,6 +8689,73 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1748836120} m_CullTransparentMesh: 0 +--- !u!1 &1772497056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1772497057} + - component: {fileID: 1772497059} + - component: {fileID: 1772497058} + m_Layer: 5 + m_Name: Map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1772497057 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772497056} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1165434048} + - {fileID: 860819219} + m_Father: {fileID: 842497960} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1772497058 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772497056} + m_CullTransparentMesh: 0 +--- !u!114 &1772497059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772497056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 100 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1001 &1775082388 PrefabInstance: m_ObjectHideFlags: 0 @@ -7199,15 +8914,176 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1777146394} - m_LocalRotation: {x: 0.97910696, y: 0.010892968, z: -0.03060515, w: 0.20073426} - m_LocalPosition: {x: -0.84, y: 3.37, z: 1.45} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 156.812, y: 3.4649963, z: -0.56399536} ---- !u!1 &1801893495 + m_GameObject: {fileID: 1777146394} + m_LocalRotation: {x: 0.4602022, y: 0.30508763, z: -0.7701875, w: 0.31929094} + m_LocalPosition: {x: -0.84, y: 3.37, z: 1.45} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 130.19699, y: 127.205, z: 19.084} +--- !u!1 &1801893495 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1801893496} + - component: {fileID: 1801893498} + - component: {fileID: 1801893497} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1801893496 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801893495} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 243816982} + m_Father: {fileID: 1119922302} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1801893497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801893495} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 9999 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &1801893498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801893495} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!1 &1812238295 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1812238296} + - component: {fileID: 1812238298} + - component: {fileID: 1812238297} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1812238296 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812238295} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 880639691} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1812238297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812238295} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.83921576, g: 0.8980393, b: 0.89019614, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Controllable Bots:' +--- !u!222 &1812238298 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812238295} + m_CullTransparentMesh: 0 +--- !u!1 &1818521284 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7215,43 +9091,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1801893496} - - component: {fileID: 1801893498} - - component: {fileID: 1801893497} + - component: {fileID: 1818521285} + - component: {fileID: 1818521286} m_Layer: 5 - m_Name: Content + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1801893496 +--- !u!224 &1818521285 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801893495} + m_GameObject: {fileID: 1818521284} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 243816982} - m_Father: {fileID: 1119922302} - m_RootOrder: 1 + - {fileID: 1911096547} + m_Father: {fileID: 668343369} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1801893497 +--- !u!114 &1818521286 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801893495} + m_GameObject: {fileID: 1818521284} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} @@ -7259,38 +9134,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: -1 + m_MinHeight: 100 m_PreferredWidth: -1 - m_PreferredHeight: 9999 + m_PreferredHeight: -1 m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!114 &1801893498 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801893495} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 1 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 ---- !u!1 &1818521284 +--- !u!1 &1850168927 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7298,8 +9148,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1818521285} - - component: {fileID: 1818521286} + - component: {fileID: 1850168928} + - component: {fileID: 1850168931} + - component: {fileID: 1850168930} + - component: {fileID: 1850168929} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -7307,33 +9159,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1818521285 +--- !u!224 &1850168928 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1818521284} + m_GameObject: {fileID: 1850168927} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1911096547} - m_Father: {fileID: 668343369} + - {fileID: 876263771} + m_Father: {fileID: 338535882} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1818521286 + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1850168929 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1818521284} + m_GameObject: {fileID: 1850168927} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} @@ -7341,12 +9193,53 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: 100 + m_MinHeight: 200 m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &1850168930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1850168927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.83921576, g: 0.8980393, b: 0.89019614, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Single Player Settings +--- !u!222 &1850168931 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1850168927} + m_CullTransparentMesh: 0 --- !u!1 &1911096546 GameObject: m_ObjectHideFlags: 0 @@ -7557,6 +9450,162 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &1973329314 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1973329315} + - component: {fileID: 1973329317} + - component: {fileID: 1973329316} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1973329315 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1973329314} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1487630077} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1973329316 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1973329314} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Continue +--- !u!222 &1973329317 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1973329314} + m_CullTransparentMesh: 0 +--- !u!1 &1988348529 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1988348530} + - component: {fileID: 1988348532} + - component: {fileID: 1988348531} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1988348530 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1988348529} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 713649795} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1988348531 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1988348529} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 277effe82d58fa34c9041017eb398c45, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Back +--- !u!222 &1988348532 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1988348529} + m_CullTransparentMesh: 0 --- !u!1 &1994487255 GameObject: m_ObjectHideFlags: 0 @@ -7729,6 +9778,7 @@ RectTransform: - {fileID: 499065853} - {fileID: 1341402375} - {fileID: 1113930113} + - {fileID: 24373096} m_Father: {fileID: 2146520060} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8428,12 +10478,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rotationsPerSecond: 0.05 ---- !u!4 &2117023047 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8168770671991800448, guid: df442ac7d92879244b42079a9d37607d, - type: 3} - m_PrefabInstance: {fileID: 1016800519} - m_PrefabAsset: {fileID: 0} --- !u!1 &2128065496 GameObject: m_ObjectHideFlags: 0 @@ -8640,7 +10684,7 @@ PrefabInstance: - target: {fileID: 2370711524397418978, guid: fe5a27ed139b6ee4c9acb15e0600092e, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2370711524397418978, guid: fe5a27ed139b6ee4c9acb15e0600092e, type: 3} @@ -8655,18 +10699,23 @@ PrefabInstance: - target: {fileID: 2370711524397418978, guid: fe5a27ed139b6ee4c9acb15e0600092e, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: LoadScene + value: SwitchToPanel objectReference: {fileID: 0} - target: {fileID: 2370711524397418978, guid: fe5a27ed139b6ee4c9acb15e0600092e, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine + value: UnityEngine.CanvasGroup, UnityEngine objectReference: {fileID: 0} - target: {fileID: 2370711524397418978, guid: fe5a27ed139b6ee4c9acb15e0600092e, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument value: SinglePlayerHighlands objectReference: {fileID: 0} + - target: {fileID: 2370711524397418978, guid: fe5a27ed139b6ee4c9acb15e0600092e, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 24373098} - target: {fileID: 2370711524397418979, guid: fe5a27ed139b6ee4c9acb15e0600092e, type: 3} propertyPath: m_Color.r diff --git a/Assets/Scenes/Client/MainMenuScene.unity.meta b/Assets/Scenes/MainMenuScene.unity.meta similarity index 100% rename from Assets/Scenes/Client/MainMenuScene.unity.meta rename to Assets/Scenes/MainMenuScene.unity.meta diff --git a/Assets/Scenes/Client/MainMenuScene/LightingData.asset b/Assets/Scenes/MainMenuScene/LightingData.asset similarity index 100% rename from Assets/Scenes/Client/MainMenuScene/LightingData.asset rename to Assets/Scenes/MainMenuScene/LightingData.asset diff --git a/Assets/Scenes/Client/MainMenuScene/LightingData.asset.meta b/Assets/Scenes/MainMenuScene/LightingData.asset.meta similarity index 100% rename from Assets/Scenes/Client/MainMenuScene/LightingData.asset.meta rename to Assets/Scenes/MainMenuScene/LightingData.asset.meta diff --git a/Assets/Scenes/Client/MainMenuScene/Lightmap-0_comp_dir.png b/Assets/Scenes/MainMenuScene/Lightmap-0_comp_dir.png similarity index 100% rename from Assets/Scenes/Client/MainMenuScene/Lightmap-0_comp_dir.png rename to Assets/Scenes/MainMenuScene/Lightmap-0_comp_dir.png diff --git a/Assets/Scenes/Client/MainMenuScene/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/MainMenuScene/Lightmap-0_comp_dir.png.meta similarity index 100% rename from Assets/Scenes/Client/MainMenuScene/Lightmap-0_comp_dir.png.meta rename to Assets/Scenes/MainMenuScene/Lightmap-0_comp_dir.png.meta diff --git a/Assets/Scenes/Client/MainMenuScene/Lightmap-0_comp_light.exr b/Assets/Scenes/MainMenuScene/Lightmap-0_comp_light.exr similarity index 100% rename from Assets/Scenes/Client/MainMenuScene/Lightmap-0_comp_light.exr rename to Assets/Scenes/MainMenuScene/Lightmap-0_comp_light.exr diff --git a/Assets/Scenes/Client/MainMenuScene/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/MainMenuScene/Lightmap-0_comp_light.exr.meta similarity index 100% rename from Assets/Scenes/Client/MainMenuScene/Lightmap-0_comp_light.exr.meta rename to Assets/Scenes/MainMenuScene/Lightmap-0_comp_light.exr.meta diff --git a/Assets/Scenes/Client/MainMenuScene/ReflectionProbe-0.exr b/Assets/Scenes/MainMenuScene/ReflectionProbe-0.exr similarity index 100% rename from Assets/Scenes/Client/MainMenuScene/ReflectionProbe-0.exr rename to Assets/Scenes/MainMenuScene/ReflectionProbe-0.exr diff --git a/Assets/Scenes/Client/MainMenuScene/ReflectionProbe-0.exr.meta b/Assets/Scenes/MainMenuScene/ReflectionProbe-0.exr.meta similarity index 100% rename from Assets/Scenes/Client/MainMenuScene/ReflectionProbe-0.exr.meta rename to Assets/Scenes/MainMenuScene/ReflectionProbe-0.exr.meta diff --git a/Assets/Scenes/Client/OldMainMenuScene.unity b/Assets/Scenes/OldMainMenuScene.unity similarity index 100% rename from Assets/Scenes/Client/OldMainMenuScene.unity rename to Assets/Scenes/OldMainMenuScene.unity diff --git a/Assets/Scenes/Client/OldMainMenuScene.unity.meta b/Assets/Scenes/OldMainMenuScene.unity.meta similarity index 100% rename from Assets/Scenes/Client/OldMainMenuScene.unity.meta rename to Assets/Scenes/OldMainMenuScene.unity.meta diff --git a/Assets/Scenes/Client/PidTest.unity b/Assets/Scenes/PidTest.unity similarity index 100% rename from Assets/Scenes/Client/PidTest.unity rename to Assets/Scenes/PidTest.unity diff --git a/Assets/Scenes/Client/PidTest.unity.meta b/Assets/Scenes/PidTest.unity.meta similarity index 100% rename from Assets/Scenes/Client/PidTest.unity.meta rename to Assets/Scenes/PidTest.unity.meta diff --git a/Assets/Scenes/Server.meta b/Assets/Scenes/Server.meta deleted file mode 100644 index 47fa3bb..0000000 --- a/Assets/Scenes/Server.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 451fb3226975529439c56640048f19b3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Server/FreeplaySceneServer.unity b/Assets/Scenes/Server/FreeplaySceneServer.unity deleted file mode 100644 index 7ea53fa..0000000 --- a/Assets/Scenes/Server/FreeplaySceneServer.unity +++ /dev/null @@ -1,271 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1001 &1764590332 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1850646933706671832, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_LocalPosition.x - value: -2048 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_LocalPosition.z - value: -2058 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671832, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1850646933706671835, guid: 474f64c78b0b41f41b4fd366448289e4, - type: 3} - propertyPath: m_Name - value: HighlandsServer - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 474f64c78b0b41f41b4fd366448289e4, type: 3} ---- !u!1001 &2011535589 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1272174956009512011, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_LocalPosition.x - value: -268.3477 - objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_LocalPosition.y - value: 11.070056 - objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_LocalPosition.z - value: -409.1089 - objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1272174956009512011, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4421177872403235923, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: m_Name - value: RobotParentServer - objectReference: {fileID: 0} - - target: {fileID: 6169384561132137689, guid: 7d41b0a1c395cb04da8b985101b6d47d, - type: 3} - propertyPath: viewIdField - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 6681657717093209485, guid: 7d41b0a1c395cb04da8b985101b6d47d, type: 3} - - {fileID: 686880663218978992, guid: 7d41b0a1c395cb04da8b985101b6d47d, type: 3} - - {fileID: 6169384561132137689, guid: 7d41b0a1c395cb04da8b985101b6d47d, type: 3} - - {fileID: 7812004616116019815, guid: 7d41b0a1c395cb04da8b985101b6d47d, type: 3} - - {fileID: 6574105224318105294, guid: 7d41b0a1c395cb04da8b985101b6d47d, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 7d41b0a1c395cb04da8b985101b6d47d, type: 3} diff --git a/Assets/Scenes/Server/FreeplaySceneServer.unity.meta b/Assets/Scenes/Server/FreeplaySceneServer.unity.meta deleted file mode 100644 index 75bd8f1..0000000 --- a/Assets/Scenes/Server/FreeplaySceneServer.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0e066b65d5a8e9f4d931cd3f5c6414f9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous.meta b/Assets/Scenes/SinglePlayer5KMMountainous.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous.meta rename to Assets/Scenes/SinglePlayer5KMMountainous.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/LightingData.asset b/Assets/Scenes/SinglePlayer5KMMountainous/LightingData.asset similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/LightingData.asset rename to Assets/Scenes/SinglePlayer5KMMountainous/LightingData.asset diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/LightingData.asset.meta b/Assets/Scenes/SinglePlayer5KMMountainous/LightingData.asset.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/LightingData.asset.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/LightingData.asset.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_dir.png b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_dir.png similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_dir.png rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_dir.png diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_dir.png.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_dir.png.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_dir.png.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_light.exr b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_light.exr similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_light.exr rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_light.exr diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_light.exr.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_light.exr.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_light.exr.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_shadowmask.png b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_shadowmask.png similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_shadowmask.png rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_shadowmask.png diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_shadowmask.png.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_shadowmask.png.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-0_comp_shadowmask.png.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-0_comp_shadowmask.png.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_dir.png b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_dir.png similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_dir.png rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_dir.png diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_dir.png.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_dir.png.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_dir.png.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_dir.png.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_light.exr b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_light.exr similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_light.exr rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_light.exr diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_light.exr.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_light.exr.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_light.exr.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_light.exr.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_shadowmask.png b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_shadowmask.png similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_shadowmask.png rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_shadowmask.png diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_shadowmask.png.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_shadowmask.png.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-1_comp_shadowmask.png.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-1_comp_shadowmask.png.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_dir.png b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_dir.png similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_dir.png rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_dir.png diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_dir.png.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_dir.png.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_dir.png.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_dir.png.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_light.exr b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_light.exr similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_light.exr rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_light.exr diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_light.exr.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_light.exr.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_light.exr.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_light.exr.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_shadowmask.png b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_shadowmask.png similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_shadowmask.png rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_shadowmask.png diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_shadowmask.png.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_shadowmask.png.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-2_comp_shadowmask.png.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-2_comp_shadowmask.png.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_dir.png b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_dir.png similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_dir.png rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_dir.png diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_dir.png.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_dir.png.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_dir.png.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_dir.png.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_light.exr b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_light.exr similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_light.exr rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_light.exr diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_light.exr.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_light.exr.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_light.exr.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_light.exr.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_shadowmask.png b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_shadowmask.png similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_shadowmask.png rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_shadowmask.png diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_shadowmask.png.meta b/Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_shadowmask.png.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/Lightmap-3_comp_shadowmask.png.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/Lightmap-3_comp_shadowmask.png.meta diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/ReflectionProbe-0.exr b/Assets/Scenes/SinglePlayer5KMMountainous/ReflectionProbe-0.exr similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/ReflectionProbe-0.exr rename to Assets/Scenes/SinglePlayer5KMMountainous/ReflectionProbe-0.exr diff --git a/Assets/Scenes/Client/SinglePlayer5KMMountainous/ReflectionProbe-0.exr.meta b/Assets/Scenes/SinglePlayer5KMMountainous/ReflectionProbe-0.exr.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayer5KMMountainous/ReflectionProbe-0.exr.meta rename to Assets/Scenes/SinglePlayer5KMMountainous/ReflectionProbe-0.exr.meta diff --git a/Assets/Scenes/SinglePlayerHighlands.unity b/Assets/Scenes/SinglePlayerHighlands.unity new file mode 100644 index 0000000..7828ae6 --- /dev/null +++ b/Assets/Scenes/SinglePlayerHighlands.unity @@ -0,0 +1,549 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 1 + m_FogColor: {r: 0.44962355, g: 0.64472437, b: 0.77254903, a: 1} + m_FogMode: 3 + m_FogDensity: 0.0003 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.07227186, g: 0.116970696, b: 0.17788847, a: 1} + m_AmbientEquatorColor: {r: 0.15292618, g: 0.23839766, b: 0.33245158, a: 1} + m_AmbientGroundColor: {r: 0.20507877, g: 0.2422812, b: 0.13286836, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.59607846, g: 0.8470589, b: 1, a: 1} + m_SkyboxMaterial: {fileID: 2100000, guid: d9dca9ae1786c394f9e79c637aa9a7bf, type: 2} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 1890717199} + m_IndirectSpecularColor: {r: 0.70147353, g: 0.77973056, b: 0.7677025, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 3 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 112000000, guid: e58304afc743964499bc5f03429ceced, + type: 2} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &863500501 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 863500504} + - component: {fileID: 863500503} + - component: {fileID: 863500502} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &863500502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863500501} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &863500503 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863500501} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &863500504 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863500501} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1890717198 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1890717200} + - component: {fileID: 1890717199} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1890717199 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890717198} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.9714286, b: 0.75, a: 1} + m_Intensity: 0.85 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 2.6473e-41, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1890717200 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890717198} + m_LocalRotation: {x: 0.97910696, y: 0.010892968, z: -0.03060515, w: 0.20073426} + m_LocalPosition: {x: -0.84, y: 3.37, z: 1.45} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 156.812, y: 3.4649963, z: -0.56399536} +--- !u!1001 &2086131231 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_LocalPosition.x + value: -282.4 + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_LocalPosition.y + value: 15.5 + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_LocalPosition.z + value: -407.57593 + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.9426629 + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.33374664 + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 37.760002 + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876490, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876491, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: centerObject + value: + objectReference: {fileID: 0} + - target: {fileID: 1467070168979876495, guid: f85e687a1917adf4ab681b85bd75db5f, + type: 3} + propertyPath: m_Name + value: Main Camera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f85e687a1917adf4ab681b85bd75db5f, type: 3} +--- !u!1001 &1850646933296018434 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_LocalPosition.x + value: -2048 + objectReference: {fileID: 0} + - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_LocalPosition.z + value: -2058 + objectReference: {fileID: 0} + - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1850646933706671832, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1850646933706671835, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, + type: 3} + propertyPath: m_Name + value: Highlands + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 255d5c8f01adab24f80cb3c9c01c2fe6, type: 3} +--- !u!1001 &8838551436100300518 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846596, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846597, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: singlePlayerRobot + value: + objectReference: {fileID: 0} + - target: {fileID: 8838551436517846648, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, + type: 3} + propertyPath: m_Name + value: GameCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6a29fc1a463aea942bd1b0e7a9ac0142, type: 3} diff --git a/Assets/Scenes/Client/SinglePlayerHighlands.unity.meta b/Assets/Scenes/SinglePlayerHighlands.unity.meta similarity index 100% rename from Assets/Scenes/Client/SinglePlayerHighlands.unity.meta rename to Assets/Scenes/SinglePlayerHighlands.unity.meta diff --git a/Assets/Scripts/Building/BuildHandler.cs b/Assets/Scripts/Building/BuildHandler.cs index 56fc263..4d5368f 100644 --- a/Assets/Scripts/Building/BuildHandler.cs +++ b/Assets/Scripts/Building/BuildHandler.cs @@ -178,26 +178,27 @@ private Vector3 GetWorldCenterOfMass() public void SaveDesign() { - - var robotCenterOfMass = GetWorldCenterOfMass(); LoadParts(); var structure = new RobotStructure(_parts, robotCenterOfMass); var structureJson = JsonUtility.ToJson(structure); - var file = new StreamWriter(SystemUtility.GetAndCreateRobotsDirectory() + RobotFileName); + var file = new FileStream(SystemUtility.GetAndCreateRobotsDirectory() + RobotFileName, FileMode.Create, + FileAccess.Write); + var writer = new StreamWriter(file); - file.Write(structureJson); - file.Close(); - + writer.Write(structureJson); + writer.Close(); } public static RobotStructure GetRobotStructure() { + var file = new FileStream(SystemUtility.GetAndCreateRobotsDirectory() + RobotFileName, + FileMode.Open, + FileAccess.Read); - var fileReader = new StreamReader( - SystemUtility.GetAndCreateRobotsDirectory() + BuildHandler.RobotFileName); + var fileReader = new StreamReader(file); var json = fileReader.ReadToEnd(); var structure = JsonUtility.FromJson(json); @@ -205,7 +206,6 @@ public static RobotStructure GetRobotStructure() fileReader.Close(); return structure; - } } diff --git a/Assets/Scripts/Cam/ViewportFollower.cs b/Assets/Scripts/Cam/ViewportFollower.cs new file mode 100644 index 0000000..7f5776e --- /dev/null +++ b/Assets/Scripts/Cam/ViewportFollower.cs @@ -0,0 +1,28 @@ +using System; +using UnityEngine; + +namespace Cam +{ + public class ViewportFollower : MonoBehaviour + { + public RectTransform viewport; + + private Camera _camera; + + public void Start() + { + _camera = GetComponent(); + } + + public void Update() + { + var size = Vector2.Scale(viewport.rect.size, viewport.lossyScale); + var rect = new Rect(viewport.position.x, viewport.position.y, size.x, size.y); + rect.x -= viewport.pivot.x * size.x; + rect.y -= viewport.pivot.y * size.y; + + _camera.rect = new Rect(rect.x / Screen.width, rect.y / Screen.height, + rect.width / Screen.width, rect.height / Screen.height); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Cam/ViewportFollower.cs.meta b/Assets/Scripts/Cam/ViewportFollower.cs.meta new file mode 100644 index 0000000..2017a0e --- /dev/null +++ b/Assets/Scripts/Cam/ViewportFollower.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6df2103f53eb4bb49abaaf86cfdee933 +timeCreated: 1589935708 \ No newline at end of file diff --git a/Assets/Scripts/GameDirection.meta b/Assets/Scripts/GameDirection.meta new file mode 100644 index 0000000..9ca8537 --- /dev/null +++ b/Assets/Scripts/GameDirection.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3c8e705886c946a391a887015a902094 +timeCreated: 1590292029 \ No newline at end of file diff --git a/Assets/Scripts/Networking/ClassicTagScript.cs b/Assets/Scripts/GameDirection/ClassicTagDirector.cs similarity index 56% rename from Assets/Scripts/Networking/ClassicTagScript.cs rename to Assets/Scripts/GameDirection/ClassicTagDirector.cs index 7b3896f..53001bb 100644 --- a/Assets/Scripts/Networking/ClassicTagScript.cs +++ b/Assets/Scripts/GameDirection/ClassicTagDirector.cs @@ -1,17 +1,92 @@ -using System; -using ExitGames.Client.Photon; +using ExitGames.Client.Photon; +using Main; +using Networking; using Photon.Pun; using Photon.Realtime; using UnityEngine; -namespace Networking +namespace GameDirection { - public class ClassicTagScript : MonoBehaviourPun, IOnEventCallback + public class ClassicTagDirector : GameDirector, IOnEventCallback { + public override GameModeEnum GameMode => GameModeEnum.ClassicTag; public int currentItActorNumber = -1; public int lastItActorNumber = -1; + public Color itTint = Color.red; + + public float tagCooldownTime = 5; + + private float _lastTagTime; + private PlayerConnection _playerConnection; + + public void OnEnable() + { + _lastTagTime = -tagCooldownTime; + _playerConnection = GameObject.FindGameObjectWithTag("ConnectionObject") + .GetComponent(); + + PhotonNetwork.AddCallbackTarget(this); + } + + public void OnDisable() + { + PhotonNetwork.RemoveCallbackTarget(this); + } + + public void OnEvent(EventData photonEvent) + { + if (photonEvent.Code != (byte) PhotonEventCode.NewIt) + return; + + _lastTagTime = Time.time; + print("reveived new it event!"); + SetNewIt(((int[]) photonEvent.CustomData)[0]); + } + + public void TryRaiseNewItEvent(int actorNumber) + { + if (Time.time - _lastTagTime < tagCooldownTime || !FullyLoaded) + return; + + _lastTagTime = Time.time; + const PhotonEventCode eventCode = PhotonEventCode.NewIt; + var content = new [] {actorNumber}; + var raiseEventOptions = new RaiseEventOptions { Receivers = ReceiverGroup.All }; + var sendOptions = new SendOptions { Reliability = true }; + print("Raising It Event!"); + PhotonNetwork.RaiseEvent((byte) eventCode, content, raiseEventOptions, sendOptions); + } + + protected override void OnFullyLoaded() + { + print("Setting initial it"); + currentItActorNumber = PhotonNetwork.MasterClient.ActorNumber; + lastItActorNumber = currentItActorNumber; + + CombineTintWithRobot(currentItActorNumber, itTint); + } + + private void SetNewIt(int actorNumber) + { + lastItActorNumber = currentItActorNumber; + currentItActorNumber = actorNumber; + + CombineTintWithRobot(currentItActorNumber, itTint); + CombineTintWithRobot(lastItActorNumber, itTint, true); // reset to old color + } + + private void CombineTintWithRobot(int actorNumber, Color tint, bool undo = false) + { + var robot = _playerConnection.robots[actorNumber]; + + robot.GetComponent().CombineTint(tint, undo); + } + + /*public int currentItActorNumber = -1; + public int lastItActorNumber = -1; + private PlayerConnection playerConnection; public Color itTint; @@ -95,19 +170,10 @@ public void SetNewIt(int actorNumber) } - public void RaiseNewItEvent(int actorNumber) - { - - var eventCode = PhotonEventCode.NewIt; - var content = new [] {actorNumber}; - var raiseEventOptions = new RaiseEventOptions { Receivers = ReceiverGroup.All }; - var sendOptions = new SendOptions { Reliability = true }; - PhotonNetwork.RaiseEvent((byte) eventCode, content, raiseEventOptions, sendOptions); - - } - public void OnTriggerEnter(Collider other) { + if (!enabled) + return; var collisionObjectRoot = other.transform.root; if (collisionObjectRoot.tag.Equals("Robot") && @@ -119,7 +185,8 @@ public void OnTriggerEnter(Collider other) } - } + }*/ + } } \ No newline at end of file diff --git a/Assets/Scripts/Networking/ClassicTagScript.cs.meta b/Assets/Scripts/GameDirection/ClassicTagDirector.cs.meta similarity index 100% rename from Assets/Scripts/Networking/ClassicTagScript.cs.meta rename to Assets/Scripts/GameDirection/ClassicTagDirector.cs.meta diff --git a/Assets/Scripts/GameDirection/FreeplayDirector.cs b/Assets/Scripts/GameDirection/FreeplayDirector.cs new file mode 100644 index 0000000..efbc76b --- /dev/null +++ b/Assets/Scripts/GameDirection/FreeplayDirector.cs @@ -0,0 +1,9 @@ +using Networking; + +namespace GameDirection +{ + public class FreeplayDirector : GameDirector + { + public override GameModeEnum GameMode => GameModeEnum.FreePlay; + } +} \ No newline at end of file diff --git a/Assets/Scripts/GameDirection/FreeplayDirector.cs.meta b/Assets/Scripts/GameDirection/FreeplayDirector.cs.meta new file mode 100644 index 0000000..74e1b20 --- /dev/null +++ b/Assets/Scripts/GameDirection/FreeplayDirector.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ea6fe279a7a5418e9803b13572ff62c5 +timeCreated: 1590292271 \ No newline at end of file diff --git a/Assets/Scripts/GameDirection/GameDirector.cs b/Assets/Scripts/GameDirection/GameDirector.cs new file mode 100644 index 0000000..fe64afc --- /dev/null +++ b/Assets/Scripts/GameDirection/GameDirector.cs @@ -0,0 +1,25 @@ +using Networking; +using UnityEngine; + +namespace GameDirection +{ + public abstract class GameDirector : MonoBehaviour + { + public abstract GameModeEnum GameMode { get; } + + public bool FullyLoaded + { + get => _fullyLoaded; + set + { + _fullyLoaded = value; + if (_fullyLoaded) + OnFullyLoaded(); + } + } + + private bool _fullyLoaded; + + protected virtual void OnFullyLoaded() {} + } +} \ No newline at end of file diff --git a/Assets/Scripts/GameDirection/GameDirector.cs.meta b/Assets/Scripts/GameDirection/GameDirector.cs.meta new file mode 100644 index 0000000..637b6af --- /dev/null +++ b/Assets/Scripts/GameDirection/GameDirector.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3b210d060a984afabf90b1d63cfab997 +timeCreated: 1590253662 \ No newline at end of file diff --git a/Assets/Scripts/GameDirection/SinglePlayerDirector.cs b/Assets/Scripts/GameDirection/SinglePlayerDirector.cs new file mode 100644 index 0000000..bd53696 --- /dev/null +++ b/Assets/Scripts/GameDirection/SinglePlayerDirector.cs @@ -0,0 +1,108 @@ +using System.Collections.Generic; +using Cam; +using Main; +using Networking; +using UI; +using UnityEngine; +using UnityEngine.SceneManagement; +using Utility; +using Random = UnityEngine.Random; + +namespace GameDirection +{ + + public class SinglePlayerDirector : GameDirector + { + public override GameModeEnum GameMode => GameModeEnum.SinglePlayer; + + public int numControllableBots; + public MapEnum map; + public GameObject robotParentPrefab; + public Vector3 startingPosition = new Vector3(-268, 0, -410); + public float maxPlacementRadius = 20f; + public float startingHeight = 3f; + + private InGameUIScript _inGameUiScript; + private CameraMotionScript _cameraMotionScript; + + public int SelectedRobot + { + get => _selectedRobot; + set + { + _selectedRobot = value % numControllableBots; + InternalSelectRobot(_selectedRobot); + } + } + + private int _selectedRobot; + + private readonly List _robotMains = new List(); + + public void Init() + { + DontDestroyOnLoad(gameObject); + SceneManager.sceneLoaded += OnSceneLoaded; + } + + private void OnSceneLoaded(Scene _1, LoadSceneMode _2) + { + SceneManager.sceneLoaded -= OnSceneLoaded; + SceneManager.sceneUnloaded += OnSceneUnloaded; + + _inGameUiScript = FindObjectOfType(); + _cameraMotionScript = Camera.main.GetComponent(); + + for (var i = 0; i < numControllableBots; i++) + PlaceRobot(i); + + SelectedRobot = 0; + } + + private void OnSceneUnloaded(Scene scene) + { + SceneManager.sceneUnloaded -= OnSceneUnloaded; + Destroy(gameObject); + } + + private void PlaceRobot(int index) + { + var xDisplacement = (Random.value * 2 - 1) + * maxPlacementRadius / Mathf.Sqrt(2); // +/- rad + var zDisplacement = (Random.value * 2 - 1) + * maxPlacementRadius / Mathf.Sqrt(2); + + var pos = new Vector3( + startingPosition.x + xDisplacement, + 0, + startingPosition.z + zDisplacement); + + pos.y = TerrainUtility.GetClosestCurrentTerrain(pos).SampleHeight(pos) + + startingHeight; + + var robot = Instantiate( + robotParentPrefab, pos, + Quaternion.Euler(0, Random.value * 360, 0)); + + _robotMains.Add(robot.GetComponent()); + _robotMains[_robotMains.Count - 1].robotIndex = index; + } + + public void SelectNextRobot() + { + SelectedRobot += 1; + } + + private void InternalSelectRobot(int index) + { + _cameraMotionScript.SetCenterObject(_robotMains[index].gameObject); + _inGameUiScript.singlePlayerRobot = _robotMains[index].gameObject; + } + + public void Update() + { + if (Input.GetKeyDown(KeyCode.Space)) + SelectNextRobot(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/GameDirection/SinglePlayerDirector.cs.meta b/Assets/Scripts/GameDirection/SinglePlayerDirector.cs.meta new file mode 100644 index 0000000..31acd1c --- /dev/null +++ b/Assets/Scripts/GameDirection/SinglePlayerDirector.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 23534a08e29b4f6eb2148b137cf166ee +timeCreated: 1589912737 \ No newline at end of file diff --git a/Assets/Scripts/Main/ActionHandler.cs b/Assets/Scripts/Main/ActionHandler.cs index ce74bdb..ca0be0a 100644 --- a/Assets/Scripts/Main/ActionHandler.cs +++ b/Assets/Scripts/Main/ActionHandler.cs @@ -1,60 +1,45 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using UnityEngine; namespace Main { public class ActionHandler : MonoBehaviour { - - public int internalNegation = 1; // Wheels should keep spinning in same direction regardless of user coord flipping - - [SerializeField] private GameObject robotBody; - - private readonly Dictionary _tireComponents = + private readonly Dictionary _tireComponents = new Dictionary(); private ResetState _resetState = ResetState.Normal; - private Rigidbody _rigidbody; private bool _resetting; + private Rigidbody _rigidbody; // we store these in case we want to reset the robot and we didn't start from 0,0,0 private Vector3 _startingPosition; private Quaternion _startingRotation; - private RobotMain _robotMain; - + [SerializeField] private GameObject robotBody; + private void Start() { - - _robotMain = GetComponent(); _rigidbody = GetComponent(); - LoadStartingPosition(); - } private void LoadStartingPosition() { - var t = transform; - + _startingPosition = t.position; _startingRotation = t.rotation; - } public void LoadTiresIntoDict() { - foreach (var tireComponent in transform.GetComponentsInChildren()) - { _tireComponents.Add(tireComponent.name, tireComponent); - } - } public void Update() { - switch (_resetState) { case ResetState.NeedToReset: @@ -76,7 +61,6 @@ public void Update() _resetState = ResetState.Normal; break; } - } private void UndoReset() @@ -87,7 +71,7 @@ private void UndoReset() private void RemoveBrakeForceOnTires() { - foreach (var tire in _tireComponents) + foreach (var tire in _tireComponents) tire.Value.WheelCollider.brakeTorque = 0; } @@ -98,19 +82,16 @@ public void ResetRobot() private void InternalResetRobot() { - transform.position = _startingPosition; transform.rotation = _startingRotation; robotBody.transform.localPosition = Vector3.zero; robotBody.transform.localRotation = Quaternion.identity; - + _rigidbody.velocity = Vector3.zero; _rigidbody.angularVelocity = Vector3.zero; _rigidbody.isKinematic = true; - internalNegation = 1; - foreach (var tire in _tireComponents.Values) { tire.WheelCollider.motorTorque = 0; @@ -121,35 +102,15 @@ private void InternalResetRobot() public void SetTireTorque(string tireName, float torque) { - var tireObject = _tireComponents[tireName + "Vis"]; tireObject.WheelCollider.motorTorque = torque; - - } - - public void AdjustTireOrientation() - { - foreach (var tire in _tireComponents.Values) - { - //tire.WheelCollider.motorTorque *= -1; - tire.bearing *= -1; - - var correction = 0; - - if (internalNegation == -1) - correction = 180; - - tire.baseSteerAngle = (tire.originalSteerAngle + correction) % 360; - } } public void SetTireSteering(string tireName, float bearing) { - var tireComponent = _tireComponents[tireName + "Vis"]; - tireComponent.bearing = internalNegation * bearing; + tireComponent.bearing = bearing; } - } } \ No newline at end of file diff --git a/Assets/Scripts/Main/Beacon.cs b/Assets/Scripts/Main/Beacon.cs new file mode 100644 index 0000000..231afa1 --- /dev/null +++ b/Assets/Scripts/Main/Beacon.cs @@ -0,0 +1,57 @@ +using System; +using UnityEngine; + +namespace Main +{ + public class Beacon : MonoBehaviour + { + public float multiplier = 1f; + public LineRenderer lineRenderer; + + private float _startingWidth; + + public void Start() + { + _startingWidth = lineRenderer.widthMultiplier; + //lineRenderer.colorGradient = GetGradient(); + } + + public void Update() + { + + var camTransform = Camera.main.transform; + var camDistance = (camTransform.position - transform.position).magnitude; + lineRenderer.widthMultiplier = camDistance * multiplier * _startingWidth; + lineRenderer.SetPosition(1, + new Vector3(0, 0, -lineRenderer.widthMultiplier / 2)); + } + + private Gradient GetGradient() + { + + const float alpha = 1.0f; + var gradient = new Gradient(); + gradient.SetKeys( + new [] + { + new GradientColorKey(Color.cyan, 0.0f), + new GradientColorKey(Color.cyan, 1.0f) + }, + new [] + { + new GradientAlphaKey(0.0f, 0.0f), + new GradientAlphaKey(alpha, 0.01f), + new GradientAlphaKey(alpha, 1.0f) + } + ); + + return gradient; + + } + + public void LateUpdate() + { + transform.rotation = Quaternion.Euler(90, 0, 0); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/LineScreenScaler.cs.meta b/Assets/Scripts/Main/Beacon.cs.meta similarity index 100% rename from Assets/Scripts/Main/LineScreenScaler.cs.meta rename to Assets/Scripts/Main/Beacon.cs.meta diff --git a/Assets/Scripts/Main/DesignLoaderPlay.cs b/Assets/Scripts/Main/DesignLoaderPlay.cs index 999c2d8..ad558a4 100644 --- a/Assets/Scripts/Main/DesignLoaderPlay.cs +++ b/Assets/Scripts/Main/DesignLoaderPlay.cs @@ -7,7 +7,7 @@ namespace Main { - public class DesignLoaderPlay : MonoBehaviourPun + public class DesignLoaderPlay : MonoBehaviour { [SerializeField] private RobotMain robotMain; @@ -22,25 +22,45 @@ public class DesignLoaderPlay : MonoBehaviourPun private Rigidbody _robotRigidbody; + private const float ColliderBuffer = 0.3f; + [PunRPC] public void BuildRobotRpc(object data) { - LoadPartListIntoDict(); - _robotRigidbody = GetComponent(); - var structure = RobotStructure.FromJson((string) data); - CreateParts(structure); + BuildRobot(); + } + + private void ReplaceColliders() + { + var newColliderRelativeBounds = new Bounds(Vector3.zero, Vector3.zero); + var buffer = new Vector3(1, 0, 1) * 2 * ColliderBuffer; - actionHandler.LoadTiresIntoDict(); - robotMain.AddSphereTrigger(); + foreach (var boxCollider in structureRoot.GetComponentsInChildren()) + { + var colliderBounds = new Bounds( + boxCollider.transform.localPosition, + boxCollider.size + buffer); + + newColliderRelativeBounds.Encapsulate(colliderBounds); + + Destroy(boxCollider); + } + + var newBoxCollider = structureRoot.gameObject.AddComponent(); + newBoxCollider.center = Vector3.zero; + newBoxCollider.size = newColliderRelativeBounds.size; + _robotRigidbody.centerOfMass = Vector3.zero; } - public void BuildRobotSinglePlayer() + public void BuildRobot() { LoadPartListIntoDict(); _robotRigidbody = GetComponent(); var structure = BuildHandler.GetRobotStructure(); CreateParts(structure); + ReplaceColliders(); + robotMain.OnPartsLoaded(); } diff --git a/Assets/Scripts/Main/EasySuspension.cs b/Assets/Scripts/Main/EasySuspension.cs new file mode 100644 index 0000000..53787a0 --- /dev/null +++ b/Assets/Scripts/Main/EasySuspension.cs @@ -0,0 +1,60 @@ +using System; +using UnityEngine; +using System.Collections; + +//[ExecuteInEditMode()] +public class EasySuspension : MonoBehaviour { + [Range(0, 20)] + public float naturalFrequency = 10; + + [Range(0, 3)] + public float dampingRatio = 0.8f; + + [Range(-1, 1)] + public float forceShift = 0.03f; + + public bool setSuspensionDistance = true; + + private float _mass; + + void Start () { + + print("Setting Suspension"); + // work out the stiffness and damper parameters based on the better spring model + foreach (WheelCollider wc in GetComponentsInChildren()) { + JointSpring spring = wc.suspensionSpring; + + spring.spring = Mathf.Pow(Mathf.Sqrt(wc.sprungMass) * naturalFrequency, 2); + spring.damper = 2 * dampingRatio * Mathf.Sqrt(spring.spring * wc.sprungMass); + + wc.suspensionSpring = spring; + + Vector3 wheelRelativeBody = transform.InverseTransformPoint(wc.transform.position); + float distance = GetComponent().centerOfMass.y - wheelRelativeBody.y + wc.radius; + + wc.forceAppPointDistance = distance - forceShift; + + // the following line makes sure the spring force at maximum droop is exactly zero + if (spring.targetPosition > 0 && setSuspensionDistance) + wc.suspensionDistance = wc.sprungMass * Physics.gravity.magnitude / (spring.targetPosition * spring.spring); + } + } + +// uncomment OnGUI to observe how parameters change + +/* + public void OnGUI() + { + foreach (WheelCollider wc in GetComponentsInChildren()) { + GUILayout.Label (string.Format("{0} sprung: {1}, k: {2}, d: {3}", wc.name, wc.sprungMass, wc.suspensionSpring.spring, wc.suspensionSpring.damper)); + } + + var rb = GetComponent (); + + GUILayout.Label ("Inertia: " + rb.inertiaTensor); + GUILayout.Label ("Mass: " + rb.mass); + GUILayout.Label ("Center: " + rb.centerOfMass); + } +*/ + +} diff --git a/Assets/Scripts/UI/CooldownInput.cs.meta b/Assets/Scripts/Main/EasySuspension.cs.meta similarity index 83% rename from Assets/Scripts/UI/CooldownInput.cs.meta rename to Assets/Scripts/Main/EasySuspension.cs.meta index 15f37a6..5e0c70c 100644 --- a/Assets/Scripts/UI/CooldownInput.cs.meta +++ b/Assets/Scripts/Main/EasySuspension.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8986c65f040cc0d4795d82d4b5068315 +guid: a706c80a273c1d04989f37232623b2e8 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Main/LineScreenScaler.cs b/Assets/Scripts/Main/LineScreenScaler.cs deleted file mode 100644 index 58c54a2..0000000 --- a/Assets/Scripts/Main/LineScreenScaler.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using UnityEngine; - -namespace Main -{ - public class LineScreenScaler : MonoBehaviour - { - public float multiplier = 1f; - public LineRenderer lineRenderer; - - private float _startingWidth; - - public void Start() - { - _startingWidth = lineRenderer.widthMultiplier; - } - - public void Update() - { - - transform.rotation = Quaternion.Euler(90, 0, 0); - - var camTransform = Camera.main.transform; - - var camDistanceX = transform.position.x - camTransform.position.x; - var camDistanceZ = transform.position.z - camTransform.position.z; - var camDistance = new Vector2(camDistanceX, camDistanceZ).magnitude; - lineRenderer.widthMultiplier = camDistance * multiplier * _startingWidth; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Main/Outliner.cs b/Assets/Scripts/Main/Outliner.cs new file mode 100644 index 0000000..9879f95 --- /dev/null +++ b/Assets/Scripts/Main/Outliner.cs @@ -0,0 +1,97 @@ +using System; +using System.Threading.Tasks; +using UnityEngine; +using Utility; + +namespace Main +{ + public class Outliner : MonoBehaviour + { + + public float baseWidth = 0.1f; + public Color color = Color.cyan; + public float updateInterval = 0.1f; + + private MeshRenderer _meshRenderer; + private MeshFilter _meshFilter; + private MeshFilter[] _childMeshFilters; + private Transform[] _childMeshTransforms; + private Material _outlineMaterial; + private Transform _transformCache; + + private int _colorId; + private int _outlineWidthId; + private int _objectWidthId; + + private float _lastUpdate; + + private const string ShaderName = "Unlit/Silhouette"; + + private Task _currentDrawTask; + + private static readonly Action DrawAction = outliner => + { + var instance = (Outliner) outliner; + + + }; + + public void Draw() + { + + var combinedMesh = MeshUtility.GetCombinedMeshes( + _childMeshFilters, + transform); + + _meshFilter.mesh = combinedMesh; + + _outlineMaterial.SetColor(_colorId, color); + _outlineMaterial.SetFloat(_outlineWidthId, baseWidth); + _outlineMaterial.SetFloat(_objectWidthId, combinedMesh.bounds.size.magnitude); + + _meshRenderer.material = _outlineMaterial; + + } + + public void Start() + { + _meshRenderer = GetComponent(); + _meshFilter = GetComponent(); + + if (!_meshRenderer) + _meshRenderer = gameObject.AddComponent(); + + if (!_meshFilter) + _meshFilter = gameObject.AddComponent(); + + _outlineMaterial = new Material(Shader.Find(ShaderName)); + _colorId = Shader.PropertyToID("_Color"); + _outlineWidthId = Shader.PropertyToID("_OutlineWidth"); + _objectWidthId = Shader.PropertyToID("_ObjectWidth"); + + _lastUpdate = -updateInterval; + + _childMeshFilters = MetaUtility.GetComponentsInProperChildren(gameObject); + _childMeshTransforms = new Transform[_childMeshFilters.Length]; + + _currentDrawTask = Task.Factory.StartNew(DrawAction, this); + + } + + public void Update() + { + if (Time.time - _lastUpdate < updateInterval + || _currentDrawTask.Status == TaskStatus.Running) + return; + + _lastUpdate = Time.time; + + _transformCache = transform; + for (var i = 0; i < _childMeshFilters.Length; i++) + _childMeshTransforms[i] = _childMeshFilters[i].transform; + + + _currentDrawTask = Task.Factory.StartNew(DrawAction, this); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/Outliner.cs.meta b/Assets/Scripts/Main/Outliner.cs.meta new file mode 100644 index 0000000..18d15b0 --- /dev/null +++ b/Assets/Scripts/Main/Outliner.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1516d7b8308d445ebae16e60e26f2c64 +timeCreated: 1589902934 \ No newline at end of file diff --git a/Assets/Scripts/Main/RobotDescription.cs b/Assets/Scripts/Main/RobotDescription.cs index 6e2f543..fa9c077 100644 --- a/Assets/Scripts/Main/RobotDescription.cs +++ b/Assets/Scripts/Main/RobotDescription.cs @@ -1,4 +1,5 @@ using System; +using GameDirection; using Networking; using Sensor; using UnityEngine; @@ -10,7 +11,7 @@ namespace Main public class RobotDescription { - private ClassicTagScript _classicTagScript; + private ClassicTagDirector _classicTagScript; private int _id; public Gyroscope gyroscope; @@ -22,7 +23,7 @@ public class RobotDescription public bool isIt; public string gameMode; - public RobotDescription(GameObject gameObject, GameModeEnum gameMode, int actorNumber = 0, ClassicTagScript classicTagScript = null) + public RobotDescription(GameObject gameObject, GameModeEnum gameMode, int actorNumber = 0, ClassicTagDirector classicTagScript = null) { lidar = new Lidar(gameObject); @@ -53,9 +54,7 @@ public void Update() if (gameMode.Equals("Classic Tag")) { - isIt = _classicTagScript.currentItActorNumber == _id; - } } diff --git a/Assets/Scripts/Main/RobotMain.cs b/Assets/Scripts/Main/RobotMain.cs index 27630c7..264dfa9 100644 --- a/Assets/Scripts/Main/RobotMain.cs +++ b/Assets/Scripts/Main/RobotMain.cs @@ -1,4 +1,5 @@ using System; +using GameDirection; using Networking; using Photon.Pun; using UnityEngine; @@ -8,30 +9,70 @@ namespace Main public class RobotMain : MonoBehaviour { + private static bool _showingBeacons; - public int actorNumber; - - private const float MaxAngularVelocity = 500f; + public int robotIndex; + + private const float MaxAngularVelocity = 120f; private const float TagBuffer = 0.3f; private const string BeaconName = "Beacon"; private RobotNetworkBridge _robotNetworkBridge; + private SinglePlayerDirector _singlePlayerDirector; + private GameObject _beaconObject; + private GameDirector _gameDirector; + private bool _partsAreLoaded; + private bool _shouldColor; + private Color _newColor; + + private const float TintCombineAmount = 0.9f; public void OnPartsLoaded() { + _partsAreLoaded = true; GetComponent().LoadTiresIntoDict(); + GetComponent().enabled = true; AddSphereTrigger(); + + if (_shouldColor) + CombineTint(_newColor); } - public void Start() + public void CombineTint(Color tint, bool undo = false) { + if (!_partsAreLoaded) + { + _shouldColor = true; + _newColor = tint; + } - SetMaximumAngularVelocities(); + float t; + if (undo) + { + t = 1f - 1f / (1f - TintCombineAmount); + } + // undoes combine; + else + { + t = TintCombineAmount; + } + foreach (var meshRenderer in GetComponentsInChildren()) + { + var originalColor = meshRenderer.material.color; + meshRenderer.material.color = Color.LerpUnclamped(originalColor, tint, t); + } + } + + public void Start() + { + SetMaximumAngularVelocities(); InitializeScripts(); + _beaconObject = transform.Find(BeaconName).gameObject; + _gameDirector = GameObject.FindGameObjectWithTag("GameDirector").GetComponent(); } - public void AddSphereTrigger() + private void AddSphereTrigger() { var bounds = new Bounds(); @@ -49,7 +90,6 @@ public void AddSphereTrigger() private void InitializeScripts() { - if (PhotonNetwork.InRoom) { _robotNetworkBridge = GetComponent(); @@ -59,17 +99,29 @@ private void InitializeScripts() { InitializeSinglePlayerScripts(); } - } public void Update() { KeyCheck(); + TryShowBeacons(); + } + + private void TryShowBeacons() + { + if ((_robotNetworkBridge && !_robotNetworkBridge.isLocal) + || (_singlePlayerDirector + && !(_singlePlayerDirector.SelectedRobot == robotIndex))) + + SetBeaconActive(_showingBeacons); + + else + SetBeaconActive(false); } - public void SetBeaconActive(bool show) + private void SetBeaconActive(bool show) { - transform.Find(BeaconName).gameObject.SetActive(show); + _beaconObject.SetActive(show); } public void ToggleBeaconActive() @@ -78,35 +130,42 @@ public void ToggleBeaconActive() beacon.SetActive(!beacon.activeSelf); } - private void InitializeSinglePlayerScripts() + private void InitializeSinglePlayerScripts() { + _singlePlayerDirector = FindObjectOfType(); + GetComponent().enabled = true; GetComponent().enabled = true; GetComponent().enabled = true; - GetComponent().BuildRobotSinglePlayer(); + GetComponent().BuildRobot(); } private void SetMaximumAngularVelocities() { - var rigidbodies = GetComponentsInChildren(); foreach (var rigidbody in rigidbodies) { - rigidbody.maxAngularVelocity = MaxAngularVelocity; - } - } private void KeyCheck() { - if (Input.GetKeyDown(KeyCode.Q)) + if (Input.GetKeyDown(KeyCode.Q) && robotIndex == 0) + _showingBeacons = !_showingBeacons; + } + + public void OnTriggerEnter(Collider other) + { + var collisionRoot = other.transform.root.gameObject; + if (_gameDirector.GameMode == GameModeEnum.ClassicTag && collisionRoot.CompareTag("Robot")) { - if (_robotNetworkBridge && !_robotNetworkBridge.isLocal) - ToggleBeaconActive(); + var tagDirector = (ClassicTagDirector) _gameDirector; + Debug.Log("Collided with a robot!"); + if (_robotNetworkBridge.actorNumber == tagDirector.currentItActorNumber) + tagDirector.TryRaiseNewItEvent(collisionRoot.GetComponent().actorNumber); } } } diff --git a/Assets/Scripts/Main/RobotMain.cs.meta b/Assets/Scripts/Main/RobotMain.cs.meta index 5ff11e6..f7f62aa 100644 --- a/Assets/Scripts/Main/RobotMain.cs.meta +++ b/Assets/Scripts/Main/RobotMain.cs.meta @@ -1,3 +1,11 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 41077f7c97bf417c81d90625762366e3 -timeCreated: 1589238518 \ No newline at end of file +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: -70 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/RobotStateSender.cs b/Assets/Scripts/Main/RobotStateSender.cs index 1679a5d..4e681d4 100644 --- a/Assets/Scripts/Main/RobotStateSender.cs +++ b/Assets/Scripts/Main/RobotStateSender.cs @@ -3,6 +3,7 @@ using System.IO.Pipes; using System.Text; using System.Threading.Tasks; +using GameDirection; using Networking; using Photon.Pun; using UnityEngine; @@ -12,7 +13,6 @@ namespace Main { public class RobotStateSender : MonoBehaviour { - public GameObject robotBody; private RobotDescription _robotStateDescription; @@ -20,8 +20,9 @@ public class RobotStateSender : MonoBehaviour private bool _connected; private SimplePlatform _platform; private Task _currentWriteTask; + private RobotMain _robotMain; - private const string PipeName = "RobotInfoPipe"; + private string PipeName = "RobotInfoPipe"; private const string MessageSeparator = ";"; private static readonly Action ConnectUpdateAndWritePosix = rss => @@ -38,7 +39,7 @@ public class RobotStateSender : MonoBehaviour { try { - rssCast._clientStream = new FileStream("/tmp/" + PipeName, FileMode.Open, FileAccess.Write); + rssCast._clientStream = new FileStream("/tmp/" + rssCast.PipeName, FileMode.Open, FileAccess.Write); break; } catch (IOException e) @@ -59,9 +60,7 @@ public class RobotStateSender : MonoBehaviour } finally { - rssCast._clientStream.Close(); - } }; @@ -74,6 +73,9 @@ public void Start() GetRoomVariables(out var gameMode, out var actorNumber, out var classicTagScript); _robotStateDescription = new RobotDescription(robotBody, gameMode, actorNumber, classicTagScript); + _robotMain = GetComponent(); + PipeName += _robotMain.robotIndex; + InitStream(); } @@ -185,7 +187,7 @@ private static string GetRobotDescription(RobotDescription robotDescriptionDescr private void GetRoomVariables( out GameModeEnum gameMode, out int actorNumber, - out ClassicTagScript classicTagScript) + out ClassicTagDirector classicTagScript) { gameMode = GameModeEnum.SinglePlayer; @@ -196,13 +198,12 @@ private void GetRoomVariables( { gameMode = (GameModeEnum) PhotonNetwork.CurrentRoom.CustomProperties["gameMode"]; - print(gameMode); - + var robotNetworkBridge = GetComponent(); actorNumber = robotNetworkBridge.actorNumber; if (gameMode == GameModeEnum.ClassicTag) { - classicTagScript = GetComponent(); + classicTagScript = GameObject.FindGameObjectWithTag("GameDirector").GetComponent(); } } diff --git a/Assets/Scripts/Main/SinglePlayerCreation.cs b/Assets/Scripts/Main/SinglePlayerCreation.cs new file mode 100644 index 0000000..d1dd26d --- /dev/null +++ b/Assets/Scripts/Main/SinglePlayerCreation.cs @@ -0,0 +1,32 @@ +using GameDirection; +using Networking; +using UI; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace Main +{ + public class SinglePlayerCreation : MonoBehaviour + { + public OptionsSliderNumeric numControllableBotsSlider; + public OptionsSlider mapSlider; + public SinglePlayerDirector singlePlayerDirectorPrefab; + + public const string HighlandsScene = "SinglePlayerHighlands"; + + public void StartGame() + { + + var directorObject = Instantiate(singlePlayerDirectorPrefab.gameObject); + var directorComponent = directorObject.GetComponent(); + + directorComponent.Init(); + directorComponent.map = (MapEnum) mapSlider.enumWrapper.Index; + directorComponent.numControllableBots = (int) numControllableBotsSlider.slider.value; + + print(directorComponent.numControllableBots); + SceneManager.LoadScene("SinglePlayerHighlands"); + + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/SinglePlayerCreation.cs.meta b/Assets/Scripts/Main/SinglePlayerCreation.cs.meta new file mode 100644 index 0000000..fd6193d --- /dev/null +++ b/Assets/Scripts/Main/SinglePlayerCreation.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1e99856657774daca2ee2207aaa310ee +timeCreated: 1589918964 \ No newline at end of file diff --git a/Assets/Scripts/Main/TireComponent.cs b/Assets/Scripts/Main/TireComponent.cs index 9930c3a..a2f1491 100644 --- a/Assets/Scripts/Main/TireComponent.cs +++ b/Assets/Scripts/Main/TireComponent.cs @@ -6,34 +6,22 @@ namespace Main public class TireComponent : MonoBehaviour { - public WheelCollider WheelCollider { get; set; } + //public WheelCollider WheelCollider { get; set; } + public WheelCollider WheelCollider; public float bearing; public float baseSteerAngle; - - public float originalSteerAngle; - - public void Start() - { - - originalSteerAngle = baseSteerAngle; - - } + public void ResetTireSteering() { - - baseSteerAngle = originalSteerAngle; bearing = 0; - } public void Update() { - WheelCollider.steerAngle = bearing + baseSteerAngle; - } } } \ No newline at end of file diff --git a/Assets/Scripts/Main/TireMeshAnimator.cs b/Assets/Scripts/Main/TireMeshAnimator.cs index ba3f5b4..0237d06 100644 --- a/Assets/Scripts/Main/TireMeshAnimator.cs +++ b/Assets/Scripts/Main/TireMeshAnimator.cs @@ -55,19 +55,9 @@ private void RotateInnerTireFromRpm() private void SyncDesiredRotationWithSteerAngle() { - - var correction = 0; - - if (_actionHandler.internalNegation == -1) - { - - correction = 180; - - } - _desiredLocalRotation = Quaternion.Euler( 0, - _tireComponent.originalSteerAngle + _actionHandler.internalNegation * _tireComponent.bearing, + _tireComponent.baseSteerAngle + _tireComponent.bearing, 0); } diff --git a/Assets/Scripts/Main/UserScriptInterpreter.cs b/Assets/Scripts/Main/UserScriptInterpreter.cs index e67bde0..2c4b413 100644 --- a/Assets/Scripts/Main/UserScriptInterpreter.cs +++ b/Assets/Scripts/Main/UserScriptInterpreter.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.IO.Pipes; -using System.Linq; using System.Threading; using System.Threading.Tasks; using UnityEngine; @@ -25,14 +24,15 @@ public class UserScriptInterpreter : MonoBehaviour private Task _currentVerifyConnectionTask; private Stream _clientStream; private StreamReader _clientReader; + private RobotMain _robotMain; private bool _connected; private bool _justStarted = true; - private const string PipeName = "EventQueuePipe"; - private const char Separator = ';'; - private const int PosixReadTimeout = 5; + private string PipeName = "EventQueuePipe"; + private const char Separator = ';'; + private static readonly Action GetEventsActionWindows = usi => { @@ -118,7 +118,8 @@ public class UserScriptInterpreter : MonoBehaviour { try { - usiCast._clientStream = new FileStream("/tmp/" + PipeName, FileMode.Open, FileAccess.Read); + usiCast._clientStream = new FileStream( + "/tmp/" + usiCast.PipeName, FileMode.Open, FileAccess.Read); break; } catch (IOException e) @@ -141,6 +142,8 @@ public void Start() _platform = SystemUtility.GetSimplePlatform(); _actionHandler = GetComponent(); + _robotMain = GetComponent(); + PipeName += _robotMain.robotIndex; InitStreams(); diff --git a/Assets/Scripts/Networking/PlayerConnection.cs b/Assets/Scripts/Networking/PlayerConnection.cs index ee2a328..aed7c0e 100644 --- a/Assets/Scripts/Networking/PlayerConnection.cs +++ b/Assets/Scripts/Networking/PlayerConnection.cs @@ -1,5 +1,7 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using Cam; +using GameDirection; using Main; using Photon.Pun; using Photon.Realtime; @@ -14,14 +16,18 @@ public class PlayerConnection : MonoBehaviourPunCallbacks { public GameObject playerObjectPrefab; - public GameObject playerObject; + [HideInInspector] public GameObject playerObject; public Vector3 startingPosition; public CameraMotionScript cameraMotionScript; public Dictionary robots; + public ClassicTagDirector classicTagDirector; + public FreeplayDirector freeplayDirector; + [HideInInspector] public GameModeEnum gameMode; + + private GameDirector _gameDirector; public void Start() { - robots = new Dictionary(); startingPosition.x += Random.Range(-10, 10); @@ -30,26 +36,39 @@ public void Start() var res = PhotonNetwork.Instantiate(playerObjectPrefab.name, startingPosition, Quaternion.identity); cameraMotionScript.SetCenterObject(res); - + gameMode = (GameModeEnum) PhotonNetwork.CurrentRoom.CustomProperties["gameMode"]; + + InstantiateGameDirector(); } - public void OnFullyLoaded() + private void InstantiateGameDirector() { - - if ((GameModeEnum) PhotonNetwork.CurrentRoom.CustomProperties["gameMode"] == GameModeEnum.ClassicTag) + switch (gameMode) { + case GameModeEnum.ClassicTag: + + _gameDirector = Instantiate(classicTagDirector.gameObject).GetComponent(); + break; + + case GameModeEnum.FreePlay: - robots[PhotonNetwork.LocalPlayer.ActorNumber].GetComponent().enabled = true; - + _gameDirector = Instantiate(freeplayDirector.gameObject).GetComponent(); + break; + + default: + + throw new NotImplementedException(); } - } - public override void OnPlayerLeftRoom(Player otherPlayer) + public void OnFullyLoaded() { + _gameDirector.FullyLoaded = true; + } + public override void OnPlayerLeftRoom(Player otherPlayer) + { robots.Remove(otherPlayer.ActorNumber); - } } } diff --git a/Assets/Scripts/Networking/RobotGrabber.cs.meta b/Assets/Scripts/Networking/RobotGrabber.cs.meta index f37c6ce..d8f0f42 100644 --- a/Assets/Scripts/Networking/RobotGrabber.cs.meta +++ b/Assets/Scripts/Networking/RobotGrabber.cs.meta @@ -1,3 +1,11 @@ -fileFormatVersion: 2 -guid: b3b5ff3fcf8e4718b8782876bf56c001 -timeCreated: 1586967204 \ No newline at end of file +fileFormatVersion: 2 +guid: b3b5ff3fcf8e4718b8782876bf56c001 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: -75 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Networking/RobotNetworkBridge.cs b/Assets/Scripts/Networking/RobotNetworkBridge.cs index bc529a3..715f429 100644 --- a/Assets/Scripts/Networking/RobotNetworkBridge.cs +++ b/Assets/Scripts/Networking/RobotNetworkBridge.cs @@ -41,7 +41,6 @@ public void Start() GetComponent().enabled = true; GetComponent().enabled = true; - } } diff --git a/Assets/Scripts/Networking/ServerDescription.cs b/Assets/Scripts/Networking/ServerDescription.cs index defcf17..e320c56 100644 --- a/Assets/Scripts/Networking/ServerDescription.cs +++ b/Assets/Scripts/Networking/ServerDescription.cs @@ -11,6 +11,6 @@ public class ServerDescription public GameModeEnum gameMode; public byte maxPlayers; public MapEnum map; - + public int gameLength; } } \ No newline at end of file diff --git a/Assets/Scripts/Sensor/Lidar.cs b/Assets/Scripts/Sensor/Lidar.cs index b0697ea..2aa52d6 100644 --- a/Assets/Scripts/Sensor/Lidar.cs +++ b/Assets/Scripts/Sensor/Lidar.cs @@ -12,6 +12,9 @@ public class Lidar : ISensor private GameObject _robotBody; private ActionHandler _actionHandler; private LayerMask _lidarMask; + private float _lastUpdate; + + private const float UpdateInterval = 0.2f; public FloatArrayContainer[] distanceMatrix; @@ -30,6 +33,7 @@ public Lidar(GameObject robotBody) horizontalDensity = 5; verticalDensity = 5; verticalFOVBounds = new float[] {-30, 30}; + _lastUpdate = -UpdateInterval; range = 300; @@ -53,6 +57,10 @@ private void InitDistanceMatrix() public void Update() { + if (Time.time - _lastUpdate < UpdateInterval) + return; + + _lastUpdate = Time.time; for (var i = 0; i < distanceMatrix.Length; i++) { diff --git a/Assets/Scripts/Sensor/Radar.cs b/Assets/Scripts/Sensor/Radar.cs index bfcab59..9eb2fe6 100644 --- a/Assets/Scripts/Sensor/Radar.cs +++ b/Assets/Scripts/Sensor/Radar.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using GameDirection; using Main; using Networking; using Photon.Pun; @@ -13,7 +14,7 @@ public class Radar : ISensor private GameObject _robotBody; private GameModeEnum _gameMode; - private ClassicTagScript _classicTagScript; + private ClassicTagDirector _classicTagScript; private PlayerConnection _playerConnection; public Vector3[] pings; @@ -29,7 +30,7 @@ public Radar(GameObject robot, GameModeEnum gameMode) { var robotRoot = _robotBody.transform.root.gameObject; - _classicTagScript = robotRoot.gameObject.GetComponent(); + _classicTagScript = GameObject.FindGameObjectWithTag("GameDirector").GetComponent(); _playerConnection = robotRoot.GetComponent().playerConnection; } diff --git a/Assets/Scripts/UI/CooldownInput.cs b/Assets/Scripts/UI/CooldownInput.cs deleted file mode 100644 index a246d35..0000000 --- a/Assets/Scripts/UI/CooldownInput.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Main; -using Networking; -using UnityEngine; -using UnityEngine.UI; - -namespace UI -{ - public class CooldownInput : MonoBehaviour - { - public InGameUIScript inGameUiScript; - public InputField inputField; - - private PlayerConnection _playerConnection; - private ClassicTagScript _classicTagScript; - - public void Start() - { - - _playerConnection = inGameUiScript.playerConnection; - - - } - - public void SetCooldown() - { - - if (!_classicTagScript) - { - - _classicTagScript = _playerConnection.playerObject.GetComponent(); - - } - - _classicTagScript.tagCooldown = float.Parse(inputField.text); - inputField.Select(); - inputField.text = ""; - inputField.placeholder.GetComponent().text = "Current cooldown is " + _classicTagScript.tagCooldown; - - } - - } -} diff --git a/Assets/Scripts/UI/ServerConnector.cs b/Assets/Scripts/UI/ServerConnector.cs index 3bc6156..723fdc6 100644 --- a/Assets/Scripts/UI/ServerConnector.cs +++ b/Assets/Scripts/UI/ServerConnector.cs @@ -16,7 +16,6 @@ public class ServerConnector : MonoBehaviourPunCallbacks [SerializeField] private ServerSettingsHandler serverSettingsHandler; [SerializeField] private CanvasGroup roomWaitingPanel; [SerializeField] private UiUtility uiUtility; - [SerializeField] private ModalWindow modalWindow; [SerializeField] private Text waitingText; [SerializeField] private Button startButton; [SerializeField] private Button leaveButton; @@ -25,8 +24,7 @@ public class ServerConnector : MonoBehaviourPunCallbacks [SerializeField] private GameObject topBar; private Hashtable _serverDescription; - private string _gameVersion; - + private readonly Dictionary _playerListItems = new Dictionary(); @@ -38,19 +36,13 @@ public class ServerConnector : MonoBehaviourPunCallbacks private bool _creatingServer; - public void Start() - { - - _gameVersion = Application.version; - - } - public void StartServer() { _creatingServer = true; if (!PhotonNetwork.IsConnected) { + PhotonNetwork.GameVersion = Application.version; PhotonNetwork.ConnectUsingSettings(); return; } @@ -115,14 +107,12 @@ public void JoinServer(string serverName) public override void OnCreateRoomFailed(short returnCode, string message) { _creatingServer = false; - modalWindow.SetMessage("Could not create server with error:\n" + message); - modalWindow.Open(); + uiUtility.RaiseError("Could not create server:\n" + message); } public override void OnJoinRoomFailed(short returnCode, string message) { - modalWindow.SetMessage("Could not join server with error:\n" + message); - modalWindow.Open(); + uiUtility.RaiseError("Could not join server:\n" + message); } private void AddAllCurrentPlayersToList() @@ -172,7 +162,7 @@ public void StartGame() break; case GameModeEnum.ClassicTag: - + PhotonNetwork.LoadLevel(ClassicTagSceneName); break; @@ -207,12 +197,12 @@ public override void OnPlayerLeftRoom(Player otherPlayer) public void LeaveRoom() { PhotonNetwork.Disconnect(); + startButton.onClick.RemoveListener(StartGame); foreach (var obj in _playerListItems.Values) Destroy(obj); _playerListItems.Clear(); - } public override void OnDisconnected(DisconnectCause cause) diff --git a/Assets/Scripts/UI/ServerSettingsHandler.cs b/Assets/Scripts/UI/ServerSettingsHandler.cs index 438c7ab..a383254 100644 --- a/Assets/Scripts/UI/ServerSettingsHandler.cs +++ b/Assets/Scripts/UI/ServerSettingsHandler.cs @@ -10,18 +10,22 @@ public class ServerSettingsHandler : MonoBehaviour [SerializeField] private OptionsSlider gameModeOptionsSlider; [SerializeField] private OptionsSlider mapOptionsSlider; [SerializeField] private OptionsSliderNumeric maxPlayersOptionsSlider; + [SerializeField] private OptionsSliderNumeric gameLengthOptionsSlider; [SerializeField] private InputField nameInputField; public Hashtable GetServerDescription() { - return new Hashtable + var result = new Hashtable { {"name", nameInputField.text}, {"gameMode", (GameModeEnum) gameModeOptionsSlider.enumWrapper.Index}, {"map", (MapEnum) mapOptionsSlider.enumWrapper.Index}, - {"maxPlayers", (byte) maxPlayersOptionsSlider.slider.value} + {"maxPlayers", (byte) maxPlayersOptionsSlider.slider.value}, + {"gameLength", (int) gameLengthOptionsSlider.slider.value} }; + + return result; } } } \ No newline at end of file diff --git a/Assets/Prefab/Client.meta b/Assets/Scripts/Unused.meta similarity index 77% rename from Assets/Prefab/Client.meta rename to Assets/Scripts/Unused.meta index 184a6c9..0e4a96d 100644 --- a/Assets/Prefab/Client.meta +++ b/Assets/Scripts/Unused.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 48dfbb295a884d540b92de434636cc50 +guid: 0082a8b4628fc1142ab324660bd1f901 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Unused/BetterWheelCollider.cs b/Assets/Scripts/Unused/BetterWheelCollider.cs new file mode 100644 index 0000000..8cfed65 --- /dev/null +++ b/Assets/Scripts/Unused/BetterWheelCollider.cs @@ -0,0 +1,43 @@ +using UnityEngine; + +namespace Unused +{ + public class BetterWheelCollider : MonoBehaviour + { + public int raycastDensity; + public float radius; + public float torque; + public float contactDistance = 0.05f; + public LayerMask mask; + + public void FixedUpdate() + { + var t = transform; + + var hitArray = new RaycastHit[raycastDensity]; + var numContacts = 0; + + for (var i = 0; i < raycastDensity; i++) + { + var orientation = + Quaternion.Euler(i * 360f / raycastDensity, 0, 0) + * t.forward; + var location = t.position + orientation * radius; + + if (!Physics.Raycast(location, orientation, + out var hit, contactDistance * 2, mask)) + continue; + + numContacts += 1; + } + + var totalForce = Vector3.zero; + + for (var i = 0; i < raycastDensity; i++) + { + var hit = hitArray[i]; + + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Unused/BetterWheelCollider.cs.meta b/Assets/Scripts/Unused/BetterWheelCollider.cs.meta new file mode 100644 index 0000000..c4d7cc3 --- /dev/null +++ b/Assets/Scripts/Unused/BetterWheelCollider.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: be0859d21da44b148e713fecf429690d +timeCreated: 1590081138 \ No newline at end of file diff --git a/Assets/Scripts/Tests/CameraPan.cs b/Assets/Scripts/Unused/CameraPan.cs similarity index 91% rename from Assets/Scripts/Tests/CameraPan.cs rename to Assets/Scripts/Unused/CameraPan.cs index 993ed1b..5f00d18 100644 --- a/Assets/Scripts/Tests/CameraPan.cs +++ b/Assets/Scripts/Unused/CameraPan.cs @@ -1,20 +1,20 @@ -using UnityEngine; - -namespace Tests -{ - public class CameraPan : MonoBehaviour - { - - public float amount; - public Transform viewObject; - - // Update is called once per frame - void Update() - { - - transform.RotateAround(viewObject.position, Vector3.up, amount); - transform.LookAt(viewObject.position); - - } - } -} +using UnityEngine; + +namespace Unused +{ + public class CameraPan : MonoBehaviour + { + + public float amount; + public Transform viewObject; + + // Update is called once per frame + void Update() + { + + transform.RotateAround(viewObject.position, Vector3.up, amount); + transform.LookAt(viewObject.position); + + } + } +} diff --git a/Assets/Scripts/Tests/CameraPan.cs.meta b/Assets/Scripts/Unused/CameraPan.cs.meta similarity index 100% rename from Assets/Scripts/Tests/CameraPan.cs.meta rename to Assets/Scripts/Unused/CameraPan.cs.meta diff --git a/Assets/Scripts/Unused/CylinderColliderGenerator.cs b/Assets/Scripts/Unused/CylinderColliderGenerator.cs new file mode 100644 index 0000000..0172d9b --- /dev/null +++ b/Assets/Scripts/Unused/CylinderColliderGenerator.cs @@ -0,0 +1,60 @@ +using System.Linq; +using UnityEngine; + +namespace Unused +{ + public class CylinderColliderGenerator : MonoBehaviour + { + public int density = 5; + public float radius = 1; + public float width = 1; + public PhysicMaterial material; + + public void BuildCylinderBoxes() + { + RemoveChildren(); + + var individualWidth = Mathf.Sqrt( + Mathf.Pow(radius - radius * Mathf.Cos(Mathf.PI / density), 2) + + Mathf.Pow(radius*Mathf.Sin(Mathf.PI / density ), 2)); + + var boxSize = new Vector3(width, individualWidth, radius*2); + + for (var i = 0; i < density; i++) + { + var obj = Instantiate(new GameObject(), transform); + var boxCollider = obj.AddComponent(); + boxCollider.size = boxSize; + boxCollider.transform.localRotation = + Quaternion.Euler(i * 180f / (density), 0, 0); + boxCollider.material = material; + } + + } + + public void BuildCylinderSpheres() + { + RemoveChildren(); + + for (var i = 0; i < density; i++) + { + var obj = Instantiate(new GameObject(), transform); + var sphereCollider = obj.AddComponent(); + sphereCollider.radius = width / 2; + obj.transform.localPosition = new Vector3(0, + (radius - width / 2)*Mathf.Sin(i * 2 * Mathf.PI / density), + (radius - width / 2)*Mathf.Cos(i * 2 * Mathf.PI / density)); + sphereCollider.material = material; + } + } + + private void RemoveChildren() + { + var children = transform.Cast().ToList(); + foreach (var child in children) + { + DestroyImmediate(child.gameObject); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Unused/CylinderColliderGenerator.cs.meta b/Assets/Scripts/Unused/CylinderColliderGenerator.cs.meta new file mode 100644 index 0000000..3751016 --- /dev/null +++ b/Assets/Scripts/Unused/CylinderColliderGenerator.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 281acc0ce1e5495489496bd89705c436 +timeCreated: 1590019085 \ No newline at end of file diff --git a/Assets/Prefab/Server.meta b/Assets/Scripts/Unused/Editor.meta similarity index 77% rename from Assets/Prefab/Server.meta rename to Assets/Scripts/Unused/Editor.meta index e6277cf..46620fd 100644 --- a/Assets/Prefab/Server.meta +++ b/Assets/Scripts/Unused/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a2b6966ed7c4e6a43ab0665ef03966e0 +guid: d40a5273de9849a3a2820527f948ac46 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Unused/Editor/CylinderColliderGeneratorEditor.cs b/Assets/Scripts/Unused/Editor/CylinderColliderGeneratorEditor.cs new file mode 100644 index 0000000..643f855 --- /dev/null +++ b/Assets/Scripts/Unused/Editor/CylinderColliderGeneratorEditor.cs @@ -0,0 +1,23 @@ +using UnityEditor; +using UnityEngine; +using Unused; + +namespace Editor +{ + [CustomEditor(typeof(CylinderColliderGenerator))] + public class CylinderColliderGeneratorEditor : UnityEditor.Editor + { + public override void OnInspectorGUI() + { + DrawDefaultInspector(); + + var baseComponent = (CylinderColliderGenerator) target; + + if (GUILayout.Button("Build Colliders With Spheres")) + baseComponent.BuildCylinderSpheres(); + + if (GUILayout.Button("Build Colliders With Boxes")) + baseComponent.BuildCylinderBoxes(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Unused/Editor/CylinderColliderGeneratorEditor.cs.meta b/Assets/Scripts/Unused/Editor/CylinderColliderGeneratorEditor.cs.meta new file mode 100644 index 0000000..2380fcf --- /dev/null +++ b/Assets/Scripts/Unused/Editor/CylinderColliderGeneratorEditor.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4612be8a4e064629a9dfbb40295a1722 +timeCreated: 1590020703 \ No newline at end of file diff --git a/Assets/Scripts/Tests/PidFollower.cs b/Assets/Scripts/Unused/PidFollower.cs similarity index 96% rename from Assets/Scripts/Tests/PidFollower.cs rename to Assets/Scripts/Unused/PidFollower.cs index b4a690b..b6d77a6 100644 --- a/Assets/Scripts/Tests/PidFollower.cs +++ b/Assets/Scripts/Unused/PidFollower.cs @@ -1,8 +1,7 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; -namespace Tests +namespace Unused { public class PidFollower : MonoBehaviour { diff --git a/Assets/Scripts/Tests/PidFollower.cs.meta b/Assets/Scripts/Unused/PidFollower.cs.meta similarity index 100% rename from Assets/Scripts/Tests/PidFollower.cs.meta rename to Assets/Scripts/Unused/PidFollower.cs.meta diff --git a/Assets/Scripts/Unused/RigidbodyFollower.cs b/Assets/Scripts/Unused/RigidbodyFollower.cs new file mode 100644 index 0000000..e461eb7 --- /dev/null +++ b/Assets/Scripts/Unused/RigidbodyFollower.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +namespace Unused +{ + public class RigidbodyFollower : MonoBehaviour + { + public Rigidbody structuralRigidbody; + + public void Update() + { + transform.position = structuralRigidbody.position; + structuralRigidbody.transform.localPosition = Vector3.zero; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Unused/RigidbodyFollower.cs.meta b/Assets/Scripts/Unused/RigidbodyFollower.cs.meta new file mode 100644 index 0000000..02e77de --- /dev/null +++ b/Assets/Scripts/Unused/RigidbodyFollower.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0e8ebd5b0fbf4595b509b67b0727fdae +timeCreated: 1590012164 \ No newline at end of file diff --git a/Assets/Scripts/Unused/TireMotor.cs b/Assets/Scripts/Unused/TireMotor.cs new file mode 100644 index 0000000..f023fff --- /dev/null +++ b/Assets/Scripts/Unused/TireMotor.cs @@ -0,0 +1,28 @@ +using UnityEngine; + +namespace Unused +{ + public class TireMotor : MonoBehaviour + { + + public bool invertTorque; + public float torque; + + private Rigidbody _rigidbody; + + public void Start() + { + _rigidbody = GetComponent(); + } + + public void FixedUpdate() + { + var trueTorque = torque; + + if (invertTorque) + trueTorque *= -1; + + _rigidbody.AddRelativeTorque(trueTorque, 0, 0, ForceMode.Force); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Unused/TireMotor.cs.meta b/Assets/Scripts/Unused/TireMotor.cs.meta new file mode 100644 index 0000000..723b652 --- /dev/null +++ b/Assets/Scripts/Unused/TireMotor.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: aa0fa5a12f8f4de38a973856d5b055ca +timeCreated: 1590011656 \ No newline at end of file diff --git a/Assets/Scripts/Main/WheelColliderFlippingBehaviour.cs b/Assets/Scripts/Unused/WheelColliderFlippingBehaviour.cs similarity index 92% rename from Assets/Scripts/Main/WheelColliderFlippingBehaviour.cs rename to Assets/Scripts/Unused/WheelColliderFlippingBehaviour.cs index 9eafdea..e57d60e 100644 --- a/Assets/Scripts/Main/WheelColliderFlippingBehaviour.cs +++ b/Assets/Scripts/Unused/WheelColliderFlippingBehaviour.cs @@ -1,56 +1,55 @@ -using UnityEngine; -using Utility; - -namespace Main -{ - public class WheelColliderFlippingBehaviour : MonoBehaviour - { - private ActionHandler _actionHandler; - private bool _flippedLastFrame; - - private Transform _robotBody; - - public void Start() - { - _actionHandler = GetComponent(); - _robotBody = transform.Find("Body"); - } - - public void Update() - { - // Up vector of robot parent should be straight up with forward coplanar with inner forward - - var terrainNormal = TerrainUtility.GetTerrainNormal(transform.position); - var robotBodyTransform = _robotBody.transform; // caching is slightly faster - var robotBodyRightVector = robotBodyTransform.right; - - var upVectorCorrectionMagnitude = Vector3.SignedAngle( - robotBodyTransform.up, terrainNormal, robotBodyRightVector); - - var upVectorCorrection = Quaternion.AngleAxis( - upVectorCorrectionMagnitude, robotBodyRightVector); - - var innerRotation = robotBodyTransform.rotation; - var outerRotation = upVectorCorrection * innerRotation; - - if (Vector3.Angle(robotBodyTransform.forward, outerRotation * Vector3.forward) > 90) - outerRotation = Quaternion.AngleAxis(180, outerRotation * Vector3.up) * outerRotation; - - transform.rotation = outerRotation; - robotBodyTransform.rotation = innerRotation; // fixes inner rotation because it gets pulled along with its parent - var flippedCurrently = robotBodyTransform.up.y < 0; - - if (flippedCurrently != _flippedLastFrame) - { - if (flippedCurrently) - _actionHandler.internalNegation = -1; - else - _actionHandler.internalNegation = 1; - - _actionHandler.AdjustTireOrientation(); - _flippedLastFrame = flippedCurrently; - } - - } - } +using UnityEngine; + +namespace Unused +{ + public class WheelColliderFlippingBehaviour : MonoBehaviour + { + /*private ActionHandler _actionHandler; + private bool _flippedLastFrame; + + private Transform _robotBody; + + public void Start() + { + _actionHandler = GetComponent(); + _robotBody = transform.Find("Body"); + } + + public void LateUpdate() + { + // Up vector of robot parent should be straight up with forward coplanar with inner forward + + var terrainNormal = TerrainUtility.GetTerrainNormal(transform.position); + var robotBodyTransform = _robotBody.transform; // caching is slightly faster + var robotBodyRightVector = robotBodyTransform.right; + + var upVectorCorrectionMagnitude = Vector3.SignedAngle( + robotBodyTransform.up, terrainNormal, robotBodyRightVector); + + var upVectorCorrection = Quaternion.AngleAxis( + upVectorCorrectionMagnitude, robotBodyRightVector); + + var innerRotation = robotBodyTransform.rotation; + var outerRotation = upVectorCorrection * innerRotation; + + if (Vector3.Angle(robotBodyTransform.forward, outerRotation * Vector3.forward) > 90) + outerRotation = Quaternion.AngleAxis(180, outerRotation * Vector3.up) * outerRotation; + + transform.rotation = outerRotation; + robotBodyTransform.rotation = innerRotation; // fixes inner rotation because it gets pulled along with its parent + var flippedCurrently = robotBodyTransform.up.y < 0; + + if (flippedCurrently != _flippedLastFrame) + { + if (flippedCurrently) + _actionHandler.internalNegation = -1; + else + _actionHandler.internalNegation = 1; + + _actionHandler.AdjustTireOrientation(); + _flippedLastFrame = flippedCurrently; + } + + }*/ + } } \ No newline at end of file diff --git a/Assets/Scripts/Main/WheelColliderFlippingBehaviour.cs.meta b/Assets/Scripts/Unused/WheelColliderFlippingBehaviour.cs.meta similarity index 100% rename from Assets/Scripts/Main/WheelColliderFlippingBehaviour.cs.meta rename to Assets/Scripts/Unused/WheelColliderFlippingBehaviour.cs.meta diff --git a/Assets/Scripts/Utility/MeshUtility.cs b/Assets/Scripts/Utility/MeshUtility.cs index 67b08e8..949d184 100644 --- a/Assets/Scripts/Utility/MeshUtility.cs +++ b/Assets/Scripts/Utility/MeshUtility.cs @@ -19,8 +19,7 @@ public static Mesh GetCombinedMeshes(MeshFilter[] meshFilters, Transform parent) var positionRelativeToParent = parent.InverseTransformPoint(objectTransform.position); - var rotationRelativeToParent = objectTransform.rotation - * Quaternion.Inverse(parent.rotation); + var rotationRelativeToParent = Quaternion.Inverse(parent.rotation) * objectTransform.rotation; var scaleRelativeToParent = objectTransform.localScale; var matrix = Matrix4x4.TRS( diff --git a/Assets/Scripts/Utility/UiUtility.cs b/Assets/Scripts/Utility/UiUtility.cs index 2de0c4f..8d1c6fb 100644 --- a/Assets/Scripts/Utility/UiUtility.cs +++ b/Assets/Scripts/Utility/UiUtility.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using UI; using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.UI; @@ -16,6 +17,7 @@ public class UiUtility : MonoBehaviour [SerializeField] private RectTransform panelParent; [SerializeField] private CanvasGroup startPanel; [SerializeField] private GameObject topBar; + [SerializeField] private ModalWindow errorWindow; public void Start() { @@ -96,6 +98,12 @@ public void ShowModalWindow(CanvasGroup window) EnableCanvasGroup(window); } + public void RaiseError(string error) + { + errorWindow.SetMessage(error); + errorWindow.Open(); + } + public void HideModalWindow(CanvasGroup window) { DisableCanvasGroupStatic(window); diff --git a/Assets/Shaders/OutlineOnly.shader b/Assets/Shaders/OutlineOnly.shader deleted file mode 100644 index e15b735..0000000 --- a/Assets/Shaders/OutlineOnly.shader +++ /dev/null @@ -1,136 +0,0 @@ -// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' - -Shader "Outlined/Silhouetted Diffuse" { - Properties { - _Color ("Main Color", Color) = (.5,.5,.5,1) - _OutlineColor ("Outline Color", Color) = (0,0,0,1) - _Outline ("Outline width", Range (0.0, 0.03)) = .005 - _MainTex ("Base (RGB)", 2D) = "white" { } - } - -CGINCLUDE -#include "UnityCG.cginc" - -struct appdata { - float4 vertex : POSITION; - float3 normal : NORMAL; -}; - -struct v2f { - float4 pos : POSITION; - float4 color : COLOR; -}; - -uniform float _Outline; -uniform float4 _OutlineColor; - -v2f vert(appdata v) { - // just make a copy of incoming vertex data but scaled according to normal direction - v2f o; - o.pos = UnityObjectToClipPos(v.vertex); - - float3 norm = mul ((float3x3)UNITY_MATRIX_IT_MV, v.normal); - float2 offset = TransformViewToProjection(norm.xy); - - o.pos.xy += offset * o.pos.z * _Outline; - o.color = _OutlineColor; - return o; -} -ENDCG - - SubShader { - Tags { "Queue" = "Transparent" } - - // note that a vertex shader is specified here but its using the one above - Pass { - Name "OUTLINE" - Tags { "LightMode" = "Always" } - Cull Off - ZWrite Off - ZTest Always - ColorMask RGB // alpha not used - - // you can choose what kind of blending mode you want for the outline - Blend SrcAlpha OneMinusSrcAlpha // Normal - //Blend One One // Additive - //Blend One OneMinusDstColor // Soft Additive - //Blend DstColor Zero // Multiplicative - //Blend DstColor SrcColor // 2x Multiplicative - -CGPROGRAM -#pragma vertex vert -#pragma fragment frag - -half4 frag(v2f i) :COLOR { - return i.color; -} -ENDCG - } - - Pass { - Name "BASE" - ZWrite On - ZTest LEqual - Blend SrcAlpha OneMinusSrcAlpha - Material { - Diffuse [_Color] - Ambient [_Color] - } - Lighting On - SetTexture [_MainTex] { - ConstantColor [_Color] - Combine texture * constant - } - SetTexture [_MainTex] { - Combine previous * primary DOUBLE - } - } - } - - SubShader { - Tags { "Queue" = "Transparent" } - - Pass { - Name "OUTLINE" - Tags { "LightMode" = "Always" } - Cull Front - ZWrite Off - ZTest Always - ColorMask RGB - - // you can choose what kind of blending mode you want for the outline - Blend SrcAlpha OneMinusSrcAlpha // Normal - //Blend One One // Additive - //Blend One OneMinusDstColor // Soft Additive - //Blend DstColor Zero // Multiplicative - //Blend DstColor SrcColor // 2x Multiplicative - - CGPROGRAM - #pragma vertex vert - #pragma exclude_renderers gles xbox360 ps3 - ENDCG - SetTexture [_MainTex] { combine primary } - } - - Pass { - Name "BASE" - ZWrite On - ZTest LEqual - Blend SrcAlpha OneMinusSrcAlpha - Material { - Diffuse [_Color] - Ambient [_Color] - } - Lighting On - SetTexture [_MainTex] { - ConstantColor [_Color] - Combine texture * constant - } - SetTexture [_MainTex] { - Combine previous * primary DOUBLE - } - } - } - - Fallback "Diffuse" -} \ No newline at end of file diff --git a/Assets/Shaders/OutlineOnly.shader.meta b/Assets/Shaders/OutlineOnly.shader.meta deleted file mode 100644 index a5a9358..0000000 --- a/Assets/Shaders/OutlineOnly.shader.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 4caaf30ffeb64901b0883131afd6c284 -timeCreated: 1589831447 \ No newline at end of file diff --git a/Assets/Shaders/Silhouette.shader b/Assets/Shaders/Silhouette.shader new file mode 100644 index 0000000..cac866a --- /dev/null +++ b/Assets/Shaders/Silhouette.shader @@ -0,0 +1,111 @@ +Shader "Unlit/Silhouette" +{ + Properties + { + _Color ("Color", Color) = (1, 1, 1, 1) + _OutlineWidth ("Outline Width", float) = 0.1 + _ObjectWidth("Object Width", float) = 1.0 + + } + SubShader + { + Tags { "Queue"="Overlay" } + + Pass { + + Name "Masking" + Cull back + ZTest Always + ZWrite Off + Stencil { // don't draw anything, but mark where the object is rendered + Ref 1 + Comp never + Fail replace + } + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + }; + + struct v2f + { + float4 vertex : SV_POSITION; + }; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + return (0.0, 0.0, 0.0, 0.0); + } + ENDCG + + + } + + Pass + { + Name "Silhouette" + Cull back + ZTest Always + ZWrite Off + Stencil { // only render where the object isn't + Ref 1 + Comp NotEqual + } + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + }; + + struct v2f + { + float4 vertex : SV_POSITION; + }; + + fixed4 _Color; + float _OutlineWidth; + float _ObjectWidth; + + v2f vert (appdata v) + { + v2f o; + + float4 objectOriginView = float4(UnityObjectToViewPos(float3(0.0, 0.0, 0.0)), 1.0); + float4 normal = normalize (v.vertex); + + o.vertex = v.vertex; + o.vertex += normal * _OutlineWidth * -objectOriginView.z / _ObjectWidth; + o.vertex = float4(UnityObjectToViewPos(o.vertex.xyz), 1.0); + o.vertex = mul (UNITY_MATRIX_P, o.vertex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + fixed4 col = _Color; + return col; + } + ENDCG + } + } +} \ No newline at end of file diff --git a/Assets/Shaders/Silhouette.shader.meta b/Assets/Shaders/Silhouette.shader.meta new file mode 100644 index 0000000..25ff4c8 --- /dev/null +++ b/Assets/Shaders/Silhouette.shader.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: cd2492e1f350477e916e76b5ca5e15b8 +timeCreated: 1589852371 \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index b4c73c2..64b98e4 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,13 +3,13 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.collab-proxy": "1.2.16", "com.unity.ide.rider": "2.0.2", - "com.unity.ide.vscode": "1.1.4", + "com.unity.ide.vscode": "1.2.0", "com.unity.multiplayer-hlapi": "1.0.4", "com.unity.probuilder": "4.2.3", "com.unity.purchasing": "2.0.6", "com.unity.quicksearch": "1.6.0-preview.6", "com.unity.terrain-tools": "3.0.1-preview", - "com.unity.test-framework": "1.1.13", + "com.unity.test-framework": "1.1.14", "com.unity.textmeshpro": "2.0.1", "com.unity.timeline": "1.2.13", "com.unity.ugui": "1.0.0", diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index cdc1f3e..c8e7ba8 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -3,25 +3,26 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 13 m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 m_SleepThreshold: 0.005 m_DefaultContactOffset: 0.01 - m_DefaultSolverIterations: 6 + m_DefaultSolverIterations: 30 m_DefaultSolverVelocityIterations: 1 m_QueriesHitBackfaces: 0 - m_QueriesHitTriggers: 1 + m_QueriesHitTriggers: 0 m_EnableAdaptiveForce: 0 m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: c9ffffffc8fcffffc8fcffffffffffffc8fcffffc8fcffffffffffffffffffffc9feffffc9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 m_ClothInterCollisionSettingsToggle: 0 + m_ClothGravity: {x: 0, y: -9.81, z: 0} m_ContactPairsMode: 0 m_BroadphaseType: 0 m_WorldBounds: @@ -31,4 +32,5 @@ PhysicsManager: m_FrictionType: 0 m_EnableEnhancedDeterminism: 0 m_EnableUnifiedHeightmaps: 1 - m_DefaultMaxAngluarSpeed: 7 + m_SolverType: 0 + m_DefaultMaxAngularSpeed: 7 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 9814467..4d9a817 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,19 +6,19 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/Client/MainMenuScene.unity + path: Assets/Scenes/MainMenuScene.unity guid: 0ffe852b5a5c3d54abfda1ee6bad2b2e - enabled: 1 - path: Assets/Scenes/Client/SinglePlayerHighlands.unity + path: Assets/Scenes/SinglePlayerHighlands.unity guid: 5b470470a772f524e979ff91bc9fa6c4 - enabled: 1 - path: Assets/Scenes/Client/FreeplayScene.unity + path: Assets/Scenes/FreeplayScene.unity guid: 55a204710925f3c44b914ffe86ca7b1b - enabled: 1 - path: Assets/Scenes/Client/ClassicTagScene.unity + path: Assets/Scenes/ClassicTagScene.unity guid: 1f88730a16979c84884e0ac01235c895 - enabled: 1 - path: Assets/Scenes/Client/BuildScene.unity + path: Assets/Scenes/BuildScene.unity guid: d950b2e5c72befc4798a2812dd7fa1fb m_configObjects: com.unity.input.settings: {fileID: 11400000, guid: fe530753d52a3804d9fb35248e1aa118, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2245a82..5188c13 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -119,7 +119,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.3.1-alpha.7 + bundleVersion: 0.3.2-alpha.3 preloadedAssets: - {fileID: 0} - {fileID: 0} @@ -217,22 +217,6 @@ PlayerSettings: uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 99a0e87..3814b77 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.3.12f1 -m_EditorVersionWithRevision: 2019.3.12f1 (84b23722532d) +m_EditorVersion: 2019.3.14f1 +m_EditorVersionWithRevision: 2019.3.14f1 (2b330bf6d2d8) diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 34db7c5..3eebe38 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Robot - ConnectionObject + - GameDirector layers: - Default - TransparentFX