diff --git a/Assets/AudioResources/Music/bgm_0.wav b/Assets/AudioResources/Music/bgm_0.wav deleted file mode 100644 index 3280538..0000000 Binary files a/Assets/AudioResources/Music/bgm_0.wav and /dev/null differ diff --git a/Assets/AudioResources/Music/bgm_0.wav.meta b/Assets/AudioResources/Music/bgm_0.wav.meta deleted file mode 100644 index b9c2e3a..0000000 --- a/Assets/AudioResources/Music/bgm_0.wav.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: f03afcd094e19824e8549f6fec3655ef -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 1 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - loadInBackground: 1 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AudioResources/Sounds/ONE_SHOT_SPACE_TEAR.wav b/Assets/AudioResources/Sounds/ONE_SHOT_SPACE_TEAR.wav deleted file mode 100644 index 057652b..0000000 Binary files a/Assets/AudioResources/Sounds/ONE_SHOT_SPACE_TEAR.wav and /dev/null differ diff --git a/Assets/AudioResources/Sounds/ONE_SHOT_SPACE_TEAR.wav.meta b/Assets/AudioResources/Sounds/ONE_SHOT_SPACE_TEAR.wav.meta deleted file mode 100644 index fe80e2c..0000000 --- a/Assets/AudioResources/Sounds/ONE_SHOT_SPACE_TEAR.wav.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: 82a8d17c2698c834f96370756847edec -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index 3dee5c0..7d47a06 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -13,7 +13,10 @@ MonoBehaviour: m_Name: DefaultPrefabObjects m_EditorClassIdentifier: _prefabs: + - {fileID: 6527384552577148640, guid: 7b71eecaf6568a847b4b8415852f9e98, type: 3} - {fileID: 4320456058255827552, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3} + - {fileID: 394654179909484550, guid: 9f3e27e33167d704e941e42ded557111, type: 3} + - {fileID: 394654179909484550, guid: 5934082513feac04a9b875fc86abe70b, type: 3} - {fileID: 394654179909484550, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3} - {fileID: 8475222101369129519, guid: 8cf33e8e99a9b0c4c8f29ff725650de6, type: 3} - {fileID: 4512293259955182956, guid: 44611030e61220d42ab7c37ba3c0ea92, type: 3} diff --git a/Assets/FishNet/Demos/Prefabs/NetworkManager.prefab b/Assets/FishNet/Demos/Prefabs/NetworkManager.prefab deleted file mode 100644 index fce3e55..0000000 --- a/Assets/FishNet/Demos/Prefabs/NetworkManager.prefab +++ /dev/null @@ -1,208 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &7443408887813606051 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7443408887813606049} - - component: {fileID: 7443408887813606050} - - component: {fileID: 934570884} - - component: {fileID: 7443408887813606060} - m_Layer: 0 - m_Name: NetworkManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7443408887813606049 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7443408887813606051} - 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: 4393252310584637084} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7443408887813606050 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7443408887813606051} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2c95dfde7d73b54dbbdc23155d35d36, type: 3} - m_Name: - m_EditorClassIdentifier: - _logging: {fileID: 0} - _spawnablePrefabs: {fileID: 11400000, guid: ec64eb18c93ab344892891f33edbf82a, type: 2} - _refreshDefaultPrefabs: 0 - _runInBackground: 1 - _dontDestroyOnLoad: 1 - _persistence: 0 ---- !u!114 &934570884 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7443408887813606051} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7d331f979d46e8e4a9fc90070c596d44, type: 3} - m_Name: - m_EditorClassIdentifier: - _defaultConditions: - - {fileID: 11400000, guid: 2033f54fd2794464bae08fa5a55c8996, type: 2} ---- !u!114 &7443408887813606060 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7443408887813606051} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 211a9f6ec51ddc14f908f5acc0cd0423, type: 3} - m_Name: - m_EditorClassIdentifier: - _playerPrefab: {fileID: 0} - _addToDefaultScene: 1 - Spawns: [] ---- !u!1001 &2130063410 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7443408887813606049} - m_Modifications: - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310969058995, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - propertyPath: m_Name - value: NetworkHudCanvas - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0570b6f7f713dc44a90463654bbcd8d0, type: 3} ---- !u!224 &4393252310584637084 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4393252310969058990, guid: 0570b6f7f713dc44a90463654bbcd8d0, - type: 3} - m_PrefabInstance: {fileID: 2130063410} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/UI/Boost Capacity Meter.prefab b/Assets/Prefabs/UI/Boost Capacity Meter.prefab new file mode 100644 index 0000000..02a34cf --- /dev/null +++ b/Assets/Prefabs/UI/Boost Capacity Meter.prefab @@ -0,0 +1,565 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &362453346046610988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3083789153837574760} + - component: {fileID: 3171920632073528640} + - component: {fileID: 1605836814067261208} + m_Layer: 5 + m_Name: Boost Hint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3083789153837574760 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362453346046610988} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7548755371474331641} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 90, y: 17} + m_SizeDelta: {x: 400, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3171920632073528640 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362453346046610988} + m_CullTransparentMesh: 1 +--- !u!114 &1605836814067261208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362453346046610988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Blue Blitz + + Player 2' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3a3809aa93488384890eda99d44622af, type: 2} + m_sharedMaterial: {fileID: -5770721753118985583, guid: 3a3809aa93488384890eda99d44622af, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 5.8925743, z: 119.90157, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &465023623272294950 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7548755371474331641} + - component: {fileID: 5447731489736910818} + - component: {fileID: 5281775441835194232} + m_Layer: 5 + m_Name: Boost Capacity Meter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7548755371474331641 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 465023623272294950} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1257945641683216260} + - {fileID: 1405743078410823761} + - {fileID: 5289558018997041265} + - {fileID: 3083789153837574760} + - {fileID: 9157305499955993008} + m_Father: {fileID: 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!222 &5447731489736910818 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 465023623272294950} + m_CullTransparentMesh: 1 +--- !u!114 &5281775441835194232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 465023623272294950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e3ef46bd7908ba4b8fd45a5572217b6, type: 3} + m_Name: + m_EditorClassIdentifier: + fillImage: {fileID: 8507542878675567407} + fillSpriteGood: {fileID: 21300000, guid: 2494447685b6ad94e914547f7685e6fd, type: 3} + fillSpriteWarn: {fileID: 21300000, guid: 7a44315aed4063b4bb7cb0091e2e3dcd, type: 3} + hint: {fileID: 1605836814067261208} +--- !u!1 &1035491807898773886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9157305499955993008} + - component: {fileID: 5246673491076760579} + - component: {fileID: 3283238702002348591} + m_Layer: 5 + m_Name: Boost Hint (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9157305499955993008 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035491807898773886} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7548755371474331641} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -20, y: 0} + m_SizeDelta: {x: 400, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5246673491076760579 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035491807898773886} + m_CullTransparentMesh: 1 +--- !u!114 &3283238702002348591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035491807898773886} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Boost Capacity + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3a3809aa93488384890eda99d44622af, type: 2} + m_sharedMaterial: {fileID: -5770721753118985583, guid: 3a3809aa93488384890eda99d44622af, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 39.35 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: -1.1903992, z: -1.8912734, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3242923733097028582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5289558018997041265} + - component: {fileID: 1254777704104084940} + - component: {fileID: 8507542878675567407} + m_Layer: 5 + m_Name: Boost Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5289558018997041265 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3242923733097028582} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10.6, y: -0.25, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7548755371474331641} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 32, y: 0} + m_SizeDelta: {x: 58, y: 588} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1254777704104084940 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3242923733097028582} + m_CullTransparentMesh: 1 +--- !u!114 &8507542878675567407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3242923733097028582} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2494447685b6ad94e914547f7685e6fd, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6602542006986332440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1257945641683216260} + - component: {fileID: 3727983979867189723} + - component: {fileID: 2985630377428659948} + m_Layer: 5 + m_Name: Boost Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1257945641683216260 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6602542006986332440} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 8, y: -0.3, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7548755371474331641} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 32, y: 0} + m_SizeDelta: {x: 70, y: 600} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3727983979867189723 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6602542006986332440} + m_CullTransparentMesh: 1 +--- !u!114 &2985630377428659948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6602542006986332440} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 793f7104e438d314196b825a8e6eb54a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 0 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 1 + m_PixelsPerUnitMultiplier: 10 +--- !u!1 &8509949133522541447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1405743078410823761} + - component: {fileID: 9209084889605901495} + - component: {fileID: 5584361840344460511} + m_Layer: 5 + m_Name: Boost Fill Shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1405743078410823761 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8509949133522541447} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10.5, y: -0.26, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7548755371474331641} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 33.3, y: -3} + m_SizeDelta: {x: 58, y: 588} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9209084889605901495 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8509949133522541447} + m_CullTransparentMesh: 1 +--- !u!114 &5584361840344460511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8509949133522541447} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d2e38eb2d19da344597ff1c0e9d68a59, type: 3} + 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 diff --git a/Assets/FishNet/Demos/Prefabs/NetworkManager.prefab.meta b/Assets/Prefabs/UI/Boost Capacity Meter.prefab.meta similarity index 74% rename from Assets/FishNet/Demos/Prefabs/NetworkManager.prefab.meta rename to Assets/Prefabs/UI/Boost Capacity Meter.prefab.meta index ae648e6..0c47800 100644 --- a/Assets/FishNet/Demos/Prefabs/NetworkManager.prefab.meta +++ b/Assets/Prefabs/UI/Boost Capacity Meter.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0b650fca685f2eb41a86538aa883e4c1 +guid: ece147409d177604bb59e8bbd21316da PrefabImporter: externalObjects: {} userData: diff --git a/Assets/RenderingPipeline/URP Renderer.asset b/Assets/RenderingPipeline/URP Renderer.asset index 1fa6d0f..9c15fc7 100644 --- a/Assets/RenderingPipeline/URP Renderer.asset +++ b/Assets/RenderingPipeline/URP Renderer.asset @@ -49,9 +49,9 @@ MonoBehaviour: passOperation: 2 failOperation: 0 zFailOperation: 0 - m_ShadowTransparentReceive: 1 + m_ShadowTransparentReceive: 0 m_RenderingMode: 0 m_DepthPrimingMode: 0 m_CopyDepthMode: 1 m_AccurateGbufferNormals: 0 - m_IntermediateTextureMode: 1 + m_IntermediateTextureMode: 0 diff --git a/Assets/RenderingPipeline/URP.asset b/Assets/RenderingPipeline/URP.asset index 952cef3..ca177ba 100644 --- a/Assets/RenderingPipeline/URP.asset +++ b/Assets/RenderingPipeline/URP.asset @@ -20,9 +20,9 @@ MonoBehaviour: - {fileID: 11400000, guid: 6347cf3d701d4894ea009e5283565066, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 0 - m_RequireOpaqueTexture: 0 - m_OpaqueDownsampling: 1 - m_SupportsTerrainHoles: 1 + m_RequireOpaqueTexture: 1 + m_OpaqueDownsampling: 3 + m_SupportsTerrainHoles: 0 m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 m_MSAA: 2 @@ -36,14 +36,14 @@ MonoBehaviour: m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 0 m_MainLightShadowmapResolution: 2048 - m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsRenderingMode: 2 m_AdditionalLightsPerObjectLimit: 4 m_AdditionalLightShadowsSupported: 0 m_AdditionalLightsShadowmapResolution: 2048 m_AdditionalLightsShadowResolutionTierLow: 256 m_AdditionalLightsShadowResolutionTierMedium: 512 m_AdditionalLightsShadowResolutionTierHigh: 1024 - m_ReflectionProbeBlending: 0 + m_ReflectionProbeBlending: 1 m_ReflectionProbeBoxProjection: 0 m_ShadowDistance: 50 m_ShadowCascadeCount: 1 @@ -83,7 +83,7 @@ MonoBehaviour: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} m_PrefilteringModeMainLightShadows: 0 - m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLight: 1 m_PrefilteringModeAdditionalLightShadows: 0 m_PrefilterXRKeywords: 1 m_PrefilteringModeForwardPlus: 0 diff --git a/Assets/Scenes/Arena.unity b/Assets/Scenes/Arena.unity index 703d88e..5f10144 100644 --- a/Assets/Scenes/Arena.unity +++ b/Assets/Scenes/Arena.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.16318765, g: 0.16640459, b: 0.19442183, a: 1} + m_IndirectSpecularColor: {r: 0.16326728, g: 0.16644119, b: 0.17437215, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -241,7 +241,7 @@ Transform: m_Children: [] m_Father: {fileID: 1533660267} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &664696267 +--- !u!1 &491610117 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -249,22 +249,22 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 664696269} - - component: {fileID: 664696268} + - component: {fileID: 491610119} + - component: {fileID: 491610118} m_Layer: 0 - m_Name: Post Processing Volume + m_Name: Global Volume m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &664696268 +--- !u!114 &491610118 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 664696267} + m_GameObject: {fileID: 491610117} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} @@ -274,17 +274,17 @@ MonoBehaviour: priority: 0 blendDistance: 0 weight: 1 - sharedProfile: {fileID: 11400000, guid: 370f519260c4e8345bb4ecadf6199694, type: 2} ---- !u!4 &664696269 + sharedProfile: {fileID: 11400000, guid: 1d9ae5f0e4543a242868bcbfaf41acfd, type: 2} +--- !u!4 &491610119 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 664696267} + m_GameObject: {fileID: 491610117} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -23.223543, y: -4.569291, z: 27.381897} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.000015258789, y: -0.0000104904175, z: 0.000091552734} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -350,7 +350,7 @@ Camera: width: 1 height: 1 near clip plane: 0.01 - far clip plane: 200 + far clip plane: 10000 field of view: 60 orthographic: 0 orthographic size: 100 @@ -378,10 +378,11 @@ Transform: m_GameObject: {fileID: 963194225} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -30} + m_LocalPosition: {x: 0, y: 0, z: -35} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1739259224} m_Father: {fileID: 1533660267} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &963194229 @@ -396,7 +397,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 20df0926ff00f0e4dab5fd8ea03a31d2, type: 3} m_Name: m_EditorClassIdentifier: - MaxAdditionalDistance: 15 + MaxAdditionalDistance: 60 + FarOutBias: 0.1 + MaxFollowDistance: 30 + FollowSpeed: 2 + TiltFactor: 1 + ZoomOutMargin: 150 + ZoomInMargin: 200 + MinZoomSpeed: 0.3 + MaxZoomSpeed: 0.3 --- !u!114 &963194230 MonoBehaviour: m_ObjectHideFlags: 0 @@ -409,20 +418,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} m_Name: m_EditorClassIdentifier: - m_RenderShadows: 0 + m_RenderShadows: 1 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 m_Cameras: [] - m_RendererIndex: -1 + m_RendererIndex: 0 m_VolumeLayerMask: serializedVersion: 2 m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 m_RenderPostProcessing: 1 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 + m_Antialiasing: 2 + m_AntialiasingQuality: 0 m_StopNaN: 0 m_Dithering: 0 m_ClearDepth: 1 @@ -499,7 +508,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 23.909143, y: 23.909143, z: 23.909143} + m_LocalScale: {x: 28.000002, y: 28.000002, z: 28.000002} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1533660267} @@ -566,11 +575,11 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: ede4fd81521fbf14290f76017e016f6d, type: 2} - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} propertyPath: m_LocalScale.x - value: 70 + value: 80 objectReference: {fileID: 0} - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} propertyPath: m_LocalScale.y - value: 70 + value: 50 objectReference: {fileID: 0} - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} propertyPath: m_LocalScale.z @@ -586,7 +595,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} propertyPath: m_LocalRotation.w @@ -618,7 +627,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} propertyPath: m_ConstrainProportionsScale - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3956523934073451991, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} propertyPath: m_Layer @@ -770,6 +779,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1739259224 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + m_PrefabInstance: {fileID: 802266895056699867} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2129209321 PrefabInstance: m_ObjectHideFlags: 0 @@ -780,15 +794,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} propertyPath: m_LocalScale.x - value: 11.954572 + value: 14.000001 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} propertyPath: m_LocalScale.y - value: 11.954572 + value: 14.000001 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} propertyPath: m_LocalScale.z - value: 11.954572 + value: 14.000001 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} propertyPath: m_LocalPosition.x @@ -857,10 +871,67 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} m_PrefabInstance: {fileID: 2129209321} m_PrefabAsset: {fileID: 0} +--- !u!1001 &802266895056699867 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 963194228} + m_Modifications: + - target: {fileID: 3749816391370857719, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_Name + value: Star Particles + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalPosition.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.w + value: 0.24189089 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.x + value: -0.18702833 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.y + value: -0.6103804 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7307155 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 280.732 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -6.773 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -137.755 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1533660267} - {fileID: 1659830377} - - {fileID: 664696269} + - {fileID: 491610119} diff --git a/Assets/Scenes/FreeFlyArena.unity b/Assets/Scenes/FreeFlyArena.unity new file mode 100644 index 0000000..e8b5115 --- /dev/null +++ b/Assets/Scenes/FreeFlyArena.unity @@ -0,0 +1,1477 @@ +%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: 0.5 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 2100000, guid: 16bc8a9d5451ca44d8f70575adbece3a, 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: 256 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.16326728, g: 0.16644119, b: 0.17437215, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + 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: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + 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: 35cf9e59af9af2a48a33e72c26b01e42, type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: 4797dd9f74598204ebd566b2383c4151, type: 2} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + 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 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &3628760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3628763} + - component: {fileID: 3628762} + - component: {fileID: 3628761} + m_Layer: 0 + m_Name: Point Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &3628761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3628760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!108 &3628762 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3628760} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 17.48 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + 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: 6e-44, z: 8e-45, w: 1.143e-41} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &3628763 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3628760} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -40} + m_LocalScale: {x: 0.47818288, y: 0.47818288, z: 0.47818288} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1533660267} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &66553448 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1533660267} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.y + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.z + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.x + value: -45 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.y + value: 45 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f88952575386a74419857c5007be9f49, type: 2} + - target: {fileID: 919132149155446097, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_Name + value: Hex Sphere (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} +--- !u!1 &66553449 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8164078558771037576, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + m_PrefabInstance: {fileID: 66553448} + m_PrefabAsset: {fileID: 0} +--- !u!4 &66553450 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + m_PrefabInstance: {fileID: 66553448} + m_PrefabAsset: {fileID: 0} +--- !u!1 &491610117 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 491610119} + - component: {fileID: 491610118} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &491610118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491610117} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 1d9ae5f0e4543a242868bcbfaf41acfd, type: 2} +--- !u!4 &491610119 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491610117} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.000015258789, y: -0.0000104904175, z: 0.000091552734} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &546645672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 546645673} + - component: {fileID: 546645676} + - component: {fileID: 546645675} + - component: {fileID: 546645674} + m_Layer: 3 + m_Name: Nimble Zone (3) + m_TagString: Zone + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &546645673 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546645672} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 90, z: -0} + m_LocalScale: {x: 30, y: 30, z: 30} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1533660267} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &546645674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546645672} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 456d6ebbd09c16d488cbe8451ae0e5f6, type: 3} + m_Name: + m_EditorClassIdentifier: + forcesManager: {fileID: 1659830376} + renderedZoneObject: {fileID: 1837077821} + outsideGravityFunction: 1 + zone: 0 + rippleFrequency: 12 + rippleDensity: 14 + rippleAmplitude: 0.1 + rippleRadius: 1.62 + rippleDuration: 1.2 + impactVelocityModifier: 1 + minImpact: 0.5 + maxVelocity: 70 +--- !u!135 &546645675 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546645672} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &546645676 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546645672} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &641732920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 641732921} + - component: {fileID: 641732924} + - component: {fileID: 641732923} + - component: {fileID: 641732922} + m_Layer: 3 + m_Name: Nimble Zone (2) + m_TagString: Zone + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &641732921 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641732920} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 45, y: 45, z: 0} + m_LocalScale: {x: 30, y: 30, z: 30} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1533660267} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &641732922 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641732920} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 456d6ebbd09c16d488cbe8451ae0e5f6, type: 3} + m_Name: + m_EditorClassIdentifier: + forcesManager: {fileID: 1659830376} + renderedZoneObject: {fileID: 1703043550} + outsideGravityFunction: 3 + zone: 0 + rippleFrequency: 12 + rippleDensity: 14 + rippleAmplitude: 0.1 + rippleRadius: 1.62 + rippleDuration: 1.2 + impactVelocityModifier: 1 + minImpact: 0.5 + maxVelocity: 70 +--- !u!135 &641732923 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641732920} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &641732924 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641732920} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &963194225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 963194228} + - component: {fileID: 963194227} + - component: {fileID: 963194226} + - component: {fileID: 963194229} + - component: {fileID: 963194230} + m_Layer: 0 + m_Name: Match Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &963194226 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 +--- !u!20 &963194227 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 17.185572 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.01 + far clip plane: 10000 + field of view: 60 + orthographic: 0 + orthographic size: 100 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + 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 &963194228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -35} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1577903593} + m_Father: {fileID: 1533660267} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &963194229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 20df0926ff00f0e4dab5fd8ea03a31d2, type: 3} + m_Name: + m_EditorClassIdentifier: + MaxAdditionalDistance: 22 + FarOutBias: 0.1 + MaxFollowDistance: -1 + FollowSpeed: 2 + TiltFactor: 1.5 + ZoomOutMargin: 86 + ZoomInMargin: 115 + MinZoomSpeed: 0.4 + MaxZoomSpeed: 0.5 +--- !u!114 &963194230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 0 + m_RequiresOpaqueTextureOption: 1 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: 0 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 1 + m_Antialiasing: 3 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!1 &1185564589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1185564593} + - component: {fileID: 1185564592} + - component: {fileID: 1185564590} + - component: {fileID: 1185564594} + m_Layer: 3 + m_Name: Nimble Zone + m_TagString: Zone + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!135 &1185564590 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1185564589} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1185564592 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1185564589} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1185564593 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1185564589} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 30, y: 30, z: 30} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1533660267} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1185564594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1185564589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 456d6ebbd09c16d488cbe8451ae0e5f6, type: 3} + m_Name: + m_EditorClassIdentifier: + forcesManager: {fileID: 1659830376} + renderedZoneObject: {fileID: 2129209322} + outsideGravityFunction: 0 + zone: 0 + rippleFrequency: 12 + rippleDensity: 14 + rippleAmplitude: 0.1 + rippleRadius: 1.62 + rippleDuration: 1.2 + impactVelocityModifier: 1 + minImpact: 0.5 + maxVelocity: 70 +--- !u!1001 &1361581063 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1533660267} + m_Modifications: + - target: {fileID: -8098169881513260187, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_Name + value: Play Zone + objectReference: {fileID: 0} + - target: {fileID: -8098169881513260187, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8098169881513260187, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8098169881513260187, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} + - target: {fileID: -5424748951385635051, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -990798463411063789, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -990798463411063789, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ede4fd81521fbf14290f76017e016f6d, type: 2} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalScale.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalScale.y + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalScale.z + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalPosition.y + value: -75 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3956523934073451991, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8385590999942887681, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8385590999942887681, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ede4fd81521fbf14290f76017e016f6d, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: -8098169881513260187, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + insertIndex: -1 + addedObject: {fileID: 1361581066} + - targetCorrespondingSourceObject: {fileID: -8098169881513260187, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + insertIndex: -1 + addedObject: {fileID: 1361581065} + m_SourcePrefab: {fileID: 3150474306388093854, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} +--- !u!1 &1361581064 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8098169881513260187, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + m_PrefabInstance: {fileID: 1361581063} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1361581065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1361581064} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 11d0b965686c4cc49b5f0339ff3988fa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &1361581066 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1361581064} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.5, y: 0.1, z: 1.5} + m_Center: {x: 0, y: 0, z: -0.75} +--- !u!4 &1361581067 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3447742079981357586, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3} + m_PrefabInstance: {fileID: 1361581063} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1533660266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1533660267} + m_Layer: 5 + m_Name: Arena Placement + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1533660267 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533660266} + m_LocalRotation: {x: 0.07749675, y: -0.98628813, z: -0.14069444, w: -0.037883684} + m_LocalPosition: {x: 0, y: 0, z: -196.77985} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 2129209323} + - {fileID: 1185564593} + - {fileID: 66553450} + - {fileID: 1931144360} + - {fileID: 1703043549} + - {fileID: 641732921} + - {fileID: 1837077820} + - {fileID: 546645673} + - {fileID: 1361581067} + - {fileID: 3628763} + - {fileID: 963194228} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: -16.463, y: -183.163, z: -8.528} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -27.944416, y: 0.7098665} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1577903592 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 963194228} + m_Modifications: + - target: {fileID: 3749816391370857719, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_Name + value: Star Particles + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalPosition.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.w + value: 0.24189089 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.x + value: -0.18702833 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.y + value: -0.6103804 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7307155 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 280.732 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -6.773 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -137.755 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} +--- !u!4 &1577903593 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + m_PrefabInstance: {fileID: 1577903592} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1659830375 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1659830377} + - component: {fileID: 1659830376} + m_Layer: 0 + m_Name: Instance Affecting Forces Manager + m_TagString: ForceManager + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!114 &1659830376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1659830375} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 43ef4d013b0b69441b281fc229a05bb3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1659830377 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1659830375} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.2926183, y: -3.045012, z: 56.52621} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1703043548 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1533660267} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.y + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.z + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.x + value: 45 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.y + value: 45 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0b85436977069a64eb9b750c7849bcf8, type: 2} + - target: {fileID: 919132149155446097, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_Name + value: Hex Sphere (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} +--- !u!4 &1703043549 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + m_PrefabInstance: {fileID: 1703043548} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1703043550 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8164078558771037576, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + m_PrefabInstance: {fileID: 1703043548} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1837077819 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1533660267} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.y + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.z + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f8c45b4875e354a428a0ae0c5d546b7d, type: 2} + - target: {fileID: 919132149155446097, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_Name + value: Hex Sphere (3) + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} +--- !u!4 &1837077820 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + m_PrefabInstance: {fileID: 1837077819} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1837077821 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8164078558771037576, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + m_PrefabInstance: {fileID: 1837077819} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1931144359 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1931144360} + - component: {fileID: 1931144363} + - component: {fileID: 1931144362} + - component: {fileID: 1931144361} + m_Layer: 3 + m_Name: Nimble Zone (1) + m_TagString: Zone + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1931144360 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1931144359} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -45, y: 45, z: 0} + m_LocalScale: {x: 30, y: 30, z: 30} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1533660267} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1931144361 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1931144359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 456d6ebbd09c16d488cbe8451ae0e5f6, type: 3} + m_Name: + m_EditorClassIdentifier: + forcesManager: {fileID: 1659830376} + renderedZoneObject: {fileID: 66553449} + outsideGravityFunction: 2 + zone: 0 + rippleFrequency: 12 + rippleDensity: 14 + rippleAmplitude: 0.1 + rippleRadius: 1.62 + rippleDuration: 1.2 + impactVelocityModifier: 1 + minImpact: 0.5 + maxVelocity: 70 +--- !u!135 &1931144362 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1931144359} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1931144363 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1931144359} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &2129209321 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1533660267} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.y + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalScale.z + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 78cb0d90576fe15439f3fd294d5eaaba, type: 2} + - target: {fileID: 919132149155446097, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + propertyPath: m_Name + value: Hex Sphere + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} +--- !u!1 &2129209322 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8164078558771037576, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + m_PrefabInstance: {fileID: 2129209321} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2129209323 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} + m_PrefabInstance: {fileID: 2129209321} + m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1533660267} + - {fileID: 1659830377} + - {fileID: 491610119} diff --git a/Assets/Scenes/FreeFlyArena.unity.meta b/Assets/Scenes/FreeFlyArena.unity.meta new file mode 100644 index 0000000..a828cd7 --- /dev/null +++ b/Assets/Scenes/FreeFlyArena.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2daa5335e14901d4bbcd312c05395c71 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameManagement.unity b/Assets/Scenes/GameManagement.unity index 9597ced..b4e28c2 100644 --- a/Assets/Scenes/GameManagement.unity +++ b/Assets/Scenes/GameManagement.unity @@ -123,88 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &241643520 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 934570884, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: _defaultConditions.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4393252310584637057, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606050, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: _logging - value: - objectReference: {fileID: 11400000, guid: 1b221f26a1118094c81531b27f6fad43, type: 2} - - target: {fileID: 7443408887813606050, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: _spawnablePrefabs - value: - objectReference: {fileID: 11400000, guid: bb50798712a8fcd40b22abbc470201fb, type: 2} - - target: {fileID: 7443408887813606050, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: _dontDestroyOnLoad - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_Name - value: NetworkManager - objectReference: {fileID: 0} - - target: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} --- !u!1 &618141847 GameObject: m_ObjectHideFlags: 0 @@ -587,12 +505,14 @@ MonoBehaviour: PlayerManager: {fileID: 4324267968298468629, guid: bf1ba420952f8cd4e8e6e02554c13bac, type: 3} AudioManager: {fileID: 4421901766771881742, guid: d2fa91ae61bbe6644b3847b83f0f21fb, type: 3} startCamera: {fileID: 1164443743} - IsTestRun: 1 - TestScene: 3 + CurrentScene: 0 + IsTestRun: 0 + TestScene: 4 + TestSceneRule: 0 + TestSceneArena: 2 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1196590533} - - {fileID: 241643520} - {fileID: 1164443747} diff --git a/Assets/Scenes/InGameUI.unity b/Assets/Scenes/InGameUI.unity index 64727cf..31fe6aa 100644 --- a/Assets/Scenes/InGameUI.unity +++ b/Assets/Scenes/InGameUI.unity @@ -155,8 +155,13 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 920984440} - {fileID: 1950397572} - - {fileID: 1638297261} + - {fileID: 723891191} + - {fileID: 1472618150} + - {fileID: 1501063437} + - {fileID: 886944250} + - {fileID: 374405367} - {fileID: 1686910808} - {fileID: 630834203} m_Father: {fileID: 0} @@ -234,8 +239,12 @@ MonoBehaviour: m_EditorClassIdentifier: boostCapacities: - {fileID: 1950397573} - - {fileID: 1638297263} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} joinPrompts: + - {fileID: 886944251} + - {fileID: 374405368} - {fileID: 1686910811} - {fileID: 630834206} --- !u!1 &41121971 @@ -337,6 +346,34 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1178560132} m_Modifications: + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: No + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textAlignment + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} propertyPath: m_SizeDelta.y value: -12.6 @@ -497,34 +534,6 @@ PrefabInstance: propertyPath: m_Name value: No Button objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_text - value: No - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textAlignment - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.lineCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.pageCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.wordCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.characterCount - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -730,7 +739,7 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!1 &276342405 +--- !u!1 &374405366 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -738,42 +747,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 276342406} - - component: {fileID: 276342408} - - component: {fileID: 276342407} + - component: {fileID: 374405367} + - component: {fileID: 374405370} + - component: {fileID: 374405369} + - component: {fileID: 374405368} m_Layer: 5 - m_Name: Boost Hint (1) + m_Name: Join Prompt 2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &276342406 + m_IsActive: 0 +--- !u!224 &374405367 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 276342405} - m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_GameObject: {fileID: 374405366} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1638297261} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 30, y: 0} - m_SizeDelta: {x: 400, y: 50} + m_Father: {fileID: 29650259} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.75, y: 0.56} + m_AnchorMax: {x: 0.75, y: 0.56} + m_AnchoredPosition: {x: 0, y: -150} + m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &276342407 +--- !u!114 &374405368 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 276342405} + m_GameObject: {fileID: 374405366} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5fd8bee062070746b93d5d5c406d83d, type: 3} + m_Name: + m_EditorClassIdentifier: + playerNumber: 2 + textMesh: {fileID: 374405369} +--- !u!114 &374405369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374405366} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -787,9 +811,12 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Boost Capacity + m_text: 'Player 2 -' + + To join press + + any button' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3a3809aa93488384890eda99d44622af, type: 2} m_sharedMaterial: {fileID: -5770721753118985583, guid: 3a3809aa93488384890eda99d44622af, type: 2} @@ -816,15 +843,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 39.35 - m_fontSizeBase: 20 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -852,19 +879,19 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: -1.1903992, z: -1.8912734, w: 0} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &276342408 +--- !u!222 &374405370 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 276342405} + m_GameObject: {fileID: 374405366} m_CullTransparentMesh: 1 --- !u!1 &393150819 GameObject: @@ -939,7 +966,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_TargetDisplay: 0 --- !u!114 &393150824 MonoBehaviour: @@ -984,6 +1011,34 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1986215051} m_Modifications: + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: Yes + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textAlignment + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} propertyPath: m_SizeDelta.y value: -12.6 @@ -1136,34 +1191,6 @@ PrefabInstance: propertyPath: m_Name value: Yes Button objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_text - value: Yes - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textAlignment - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.lineCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.pageCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.wordCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.characterCount - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1630,7 +1657,7 @@ GameObject: - component: {fileID: 630834204} - component: {fileID: 630834206} m_Layer: 5 - m_Name: Join Prompt 2 + m_Name: Join Prompt 4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1652,7 +1679,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.75, y: 0.56} m_AnchorMax: {x: 0.75, y: 0.56} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 150} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &630834204 @@ -1769,7 +1796,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5fd8bee062070746b93d5d5c406d83d, type: 3} m_Name: m_EditorClassIdentifier: - playerNumber: 2 + playerNumber: 4 textMesh: {fileID: 630834204} --- !u!1 &710247468 GameObject: @@ -1905,6 +1932,136 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 710247468} m_CullTransparentMesh: 1 +--- !u!1001 &723891190 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 29650259} + m_Modifications: + - target: {fileID: 465023623272294950, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Name + value: Boost Capacity Meter 2 + objectReference: {fileID: 0} + - target: {fileID: 465023623272294950, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_SizeDelta.x + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_SizeDelta.y + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchoredPosition.x + value: -192 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchoredPosition.y + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchoredPosition.x + value: 84 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ece147409d177604bb59e8bbd21316da, type: 3} +--- !u!224 &723891191 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + m_PrefabInstance: {fileID: 723891190} + m_PrefabAsset: {fileID: 0} --- !u!1 &754823974 GameObject: m_ObjectHideFlags: 0 @@ -2039,6 +2196,230 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 754823974} m_CullTransparentMesh: 1 +--- !u!1 &886944249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 886944250} + - component: {fileID: 886944253} + - component: {fileID: 886944252} + - component: {fileID: 886944251} + m_Layer: 5 + m_Name: Join Prompt 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &886944250 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886944249} + 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_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 29650259} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.25, y: 0.56} + m_AnchorMax: {x: 0.25, y: 0.56} + m_AnchoredPosition: {x: 0, y: -150} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &886944251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886944249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5fd8bee062070746b93d5d5c406d83d, type: 3} + m_Name: + m_EditorClassIdentifier: + playerNumber: 1 + textMesh: {fileID: 886944252} +--- !u!114 &886944252 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886944249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "Player 1\n\nTo join press \nany button" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3a3809aa93488384890eda99d44622af, type: 2} + m_sharedMaterial: {fileID: -5770721753118985583, guid: 3a3809aa93488384890eda99d44622af, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &886944253 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886944249} + m_CullTransparentMesh: 1 +--- !u!1 &920984439 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 920984440} + - component: {fileID: 920984442} + - component: {fileID: 920984441} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &920984440 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 920984439} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 29650259} + 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 &920984441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 920984439} + 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, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + 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 &920984442 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 920984439} + m_CullTransparentMesh: 1 --- !u!1 &1048663012 GameObject: m_ObjectHideFlags: 0 @@ -2126,7 +2507,7 @@ AudioListener: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1048663012} - m_Enabled: 1 + m_Enabled: 0 --- !u!20 &1048663016 Camera: m_ObjectHideFlags: 0 @@ -2159,7 +2540,7 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 1000 + far clip plane: 3000 field of view: 60 orthographic: 0 orthographic size: 5 @@ -2236,7 +2617,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_TargetDisplay: 0 --- !u!222 &1076256086 CanvasRenderer: @@ -2288,81 +2669,6 @@ MonoBehaviour: UIEventSystem: {fileID: 1374265919} MenuButtons: {fileID: 1986215050} FocusButtonRematch: {fileID: 465155851} ---- !u!1 &1117377654 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1117377655} - - component: {fileID: 1117377657} - - component: {fileID: 1117377656} - m_Layer: 5 - m_Name: Boost Border - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1117377655 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117377654} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1950397572} - 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: -6, y: -12} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1117377656 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117377654} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d88b7dcbfff5f2d46a43979db1a7695f, type: 3} - 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 &1117377657 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117377654} - m_CullTransparentMesh: 1 --- !u!1 &1154956208 GameObject: m_ObjectHideFlags: 0 @@ -2454,142 +2760,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1154956208} m_CullTransparentMesh: 0 ---- !u!1 &1169853196 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1169853197} - - component: {fileID: 1169853199} - - component: {fileID: 1169853198} - m_Layer: 5 - m_Name: Boost Hint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1169853197 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1169853196} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1950397572} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 61.96, y: 50} - m_SizeDelta: {x: 400, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1169853198 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1169853196} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'Blue Blitz - - Player 2' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3a3809aa93488384890eda99d44622af, type: 2} - m_sharedMaterial: {fileID: -5770721753118985583, guid: 3a3809aa93488384890eda99d44622af, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 32 - m_fontSizeBase: 32 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 5.8925743, z: 119.90157, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1169853199 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1169853196} - m_CullTransparentMesh: 1 --- !u!1 &1178560131 GameObject: m_ObjectHideFlags: 0 @@ -2671,6 +2841,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2011926118} m_Modifications: + - target: {fileID: 5415181396576777827, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} propertyPath: m_AnchoredPosition.y value: -4 @@ -2853,10 +3027,6 @@ PrefabInstance: propertyPath: m_Name value: Exit Button objectReference: {fileID: 0} - - target: {fileID: 5415181396576777827, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2886,6 +3056,34 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1986215051} m_Modifications: + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: No + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textAlignment + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} propertyPath: m_SizeDelta.y value: -12.6 @@ -3046,34 +3244,6 @@ PrefabInstance: propertyPath: m_Name value: No Button objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_text - value: No - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textAlignment - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.lineCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.pageCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.wordCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.characterCount - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3170,6 +3340,34 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1178560132} m_Modifications: + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: Yes + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textAlignment + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 106129460808279082, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} propertyPath: m_SizeDelta.y value: -12.6 @@ -3318,34 +3516,6 @@ PrefabInstance: propertyPath: m_Name value: Yes Button objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_text - value: Yes - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textAlignment - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.lineCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.pageCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.wordCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_textInfo.characterCount - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3522,72 +3692,246 @@ RectTransform: m_AnchoredPosition: {x: -0, y: 0} m_SizeDelta: {x: 3000, y: 3000} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1638297260 -GameObject: +--- !u!1001 &1472618149 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1638297261} - - component: {fileID: 1638297265} - - component: {fileID: 1638297263} - m_Layer: 5 - m_Name: Boost Capacity Meter 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1638297261 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 29650259} + m_Modifications: + - target: {fileID: 465023623272294950, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Name + value: Boost Capacity Meter 3 + objectReference: {fileID: 0} + - target: {fileID: 465023623272294950, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_SizeDelta.x + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_SizeDelta.y + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchoredPosition.x + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchoredPosition.y + value: -400 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ece147409d177604bb59e8bbd21316da, type: 3} +--- !u!224 &1472618150 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + m_PrefabInstance: {fileID: 1472618149} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1638297260} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2029587189} - - {fileID: 1854845147} - - {fileID: 2044771019} - - {fileID: 276342406} - m_Father: {fileID: 29650259} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -128, y: 380} - m_SizeDelta: {x: 64, y: 700} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1638297263 -MonoBehaviour: +--- !u!1001 &1501063436 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 29650259} + m_Modifications: + - target: {fileID: 465023623272294950, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Name + value: Boost Capacity Meter 4 + objectReference: {fileID: 0} + - target: {fileID: 465023623272294950, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3283238702002348591, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_VerticalAlignment + value: 512 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_SizeDelta.x + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_SizeDelta.y + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchoredPosition.x + value: -192 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchoredPosition.y + value: -400 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchoredPosition.x + value: 84 + objectReference: {fileID: 0} + - target: {fileID: 9157305499955993008, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ece147409d177604bb59e8bbd21316da, type: 3} +--- !u!224 &1501063437 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + m_PrefabInstance: {fileID: 1501063436} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1638297260} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7e3ef46bd7908ba4b8fd45a5572217b6, type: 3} - m_Name: - m_EditorClassIdentifier: - goodColor: {r: 0.30588236, g: 0.972549, b: 0.31764707, a: 100} - criticalColor: {r: 1, g: 0.1764706, b: 0.050980393, a: 100} - playerNumber: 1 - fillImage: {fileID: 2029587190} - hint: {fileID: 2044771020} ---- !u!222 &1638297265 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1638297260} - m_CullTransparentMesh: 1 --- !u!1 &1686910807 GameObject: m_ObjectHideFlags: 0 @@ -3601,7 +3945,7 @@ GameObject: - component: {fileID: 1686910809} - component: {fileID: 1686910811} m_Layer: 5 - m_Name: Join Prompt 1 + m_Name: Join Prompt 3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3623,7 +3967,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.25, y: 0.56} m_AnchorMax: {x: 0.25, y: 0.56} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 150} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1686910809 @@ -3735,7 +4079,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5fd8bee062070746b93d5d5c406d83d, type: 3} m_Name: m_EditorClassIdentifier: - playerNumber: 1 + playerNumber: 3 textMesh: {fileID: 1686910809} --- !u!1 &1689429891 GameObject: @@ -4205,81 +4549,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1854845146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1854845147} - - component: {fileID: 1854845149} - - component: {fileID: 1854845148} - m_Layer: 5 - m_Name: Boost Border - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1854845147 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1854845146} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1638297261} - 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: -6, y: -12} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1854845148 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1854845146} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d88b7dcbfff5f2d46a43979db1a7695f, type: 3} - 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 &1854845149 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1854845146} - m_CullTransparentMesh: 1 --- !u!1 &1864663334 GameObject: m_ObjectHideFlags: 0 @@ -4741,81 +5010,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1910183686 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1910183687} - - component: {fileID: 1910183689} - - component: {fileID: 1910183688} - m_Layer: 5 - m_Name: Boost Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1910183687 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1910183686} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1950397572} - 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: -6, y: -12} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1910183688 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1910183686} - 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.16470589, g: 0.85882354, b: 0.3764706, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9fea0a5c93799134d86fc9398c75503b, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 1 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1910183689 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1910183686} - m_CullTransparentMesh: 1 --- !u!1 &1947006993 GameObject: m_ObjectHideFlags: 0 @@ -5072,72 +5266,22 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 ---- !u!1 &1950397571 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1950397572} - - component: {fileID: 1950397575} - - component: {fileID: 1950397573} - m_Layer: 5 - m_Name: Boost Capacity Meter 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1950397572 +--- !u!224 &1950397572 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + m_PrefabInstance: {fileID: 2952306402587041938} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1950397571} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1910183687} - - {fileID: 1117377655} - - {fileID: 1169853197} - - {fileID: 2013057028} - m_Father: {fileID: 29650259} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 128, y: 380} - m_SizeDelta: {x: 64, y: 700} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1950397573 +--- !u!114 &1950397573 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5281775441835194232, guid: ece147409d177604bb59e8bbd21316da, type: 3} + m_PrefabInstance: {fileID: 2952306402587041938} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1950397571} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7e3ef46bd7908ba4b8fd45a5572217b6, type: 3} m_Name: m_EditorClassIdentifier: - goodColor: {r: 0.30709326, g: 0.9716981, b: 0.3194007, a: 1} - criticalColor: {r: 1, g: 0.17720306, b: 0.051886797, a: 100} - playerNumber: 2 - fillImage: {fileID: 1910183688} - hint: {fileID: 1169853198} ---- !u!222 &1950397575 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1950397571} - m_CullTransparentMesh: 1 --- !u!1 &1986215050 GameObject: m_ObjectHideFlags: 0 @@ -5298,7 +5442,7 @@ AudioListener: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1999342447} - m_Enabled: 1 + m_Enabled: 0 --- !u!20 &1999342455 Camera: m_ObjectHideFlags: 0 @@ -5331,7 +5475,7 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 1000 + far clip plane: 3000 field of view: 60 orthographic: 0 orthographic size: 5 @@ -5415,353 +5559,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &2013057027 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2013057028} - - component: {fileID: 2013057030} - - component: {fileID: 2013057029} - m_Layer: 5 - m_Name: Boost Hint (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2013057028 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013057027} - m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1950397572} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -30, y: 0} - m_SizeDelta: {x: 400, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2013057029 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013057027} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'Boost Capacity - -' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3a3809aa93488384890eda99d44622af, type: 2} - m_sharedMaterial: {fileID: -5770721753118985583, guid: 3a3809aa93488384890eda99d44622af, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 39.35 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: -1.1903992, z: -1.8912734, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &2013057030 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013057027} - m_CullTransparentMesh: 1 ---- !u!1 &2029587188 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2029587189} - - component: {fileID: 2029587191} - - component: {fileID: 2029587190} - m_Layer: 5 - m_Name: Boost Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2029587189 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2029587188} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1638297261} - 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: -6, y: -12} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2029587190 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2029587188} - 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.16470589, g: 0.85882354, b: 0.3764706, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9fea0a5c93799134d86fc9398c75503b, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 1 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2029587191 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2029587188} - m_CullTransparentMesh: 1 ---- !u!1 &2044771018 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2044771019} - - component: {fileID: 2044771021} - - component: {fileID: 2044771020} - m_Layer: 5 - m_Name: Boost Hint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2044771019 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2044771018} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1638297261} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 61.96, y: 50} - m_SizeDelta: {x: 400, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2044771020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2044771018} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'Red Menace - - Player 1' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3a3809aa93488384890eda99d44622af, type: 2} - m_sharedMaterial: {fileID: -5770721753118985583, guid: 3a3809aa93488384890eda99d44622af, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 32 - m_fontSizeBase: 32 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 5.8925743, z: 119.90157, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &2044771021 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2044771018} - m_CullTransparentMesh: 1 --- !u!1 &2052728256 GameObject: m_ObjectHideFlags: 0 @@ -6027,6 +5824,107 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} +--- !u!1001 &2952306402587041938 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 29650259} + m_Modifications: + - target: {fileID: 465023623272294950, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Name + value: Boost Capacity Meter 1 + objectReference: {fileID: 0} + - target: {fileID: 465023623272294950, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_SizeDelta.x + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_SizeDelta.y + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchoredPosition.x + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_AnchoredPosition.y + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548755371474331641, guid: ece147409d177604bb59e8bbd21316da, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ece147409d177604bb59e8bbd21316da, type: 3} --- !u!224 &5206668380250943642 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5031447595725426495, guid: e269e0cd8b46eb94a8c118dc84754c33, type: 3} diff --git a/Assets/Scenes/MainMenu.meta b/Assets/Scenes/MainMenu.meta new file mode 100644 index 0000000..4a5a64b --- /dev/null +++ b/Assets/Scenes/MainMenu.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32de988e1e1e4e246a23a96290759f27 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index fe47882..479d366 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: a09b019153231a5479d827455b0a3dff, type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -515,7 +515,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.68602705, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -694,7 +694,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.6698078, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1817,7 +1817,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 85895445} - - component: {fileID: 85895450} - component: {fileID: 85895449} - component: {fileID: 85895448} - component: {fileID: 85895447} @@ -1855,7 +1854,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 85895444} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} m_Name: @@ -1905,7 +1904,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -1917,9 +1916,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -2005,14 +2004,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &85895450 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 85895444} - m_Mesh: {fileID: 0} --- !u!1 &87333393 GameObject: m_ObjectHideFlags: 0 @@ -2507,7 +2498,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 107967433} - - component: {fileID: 107967438} - component: {fileID: 107967437} - component: {fileID: 107967436} - component: {fileID: 107967435} @@ -2545,7 +2535,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 107967432} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} m_Name: @@ -2595,7 +2585,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -2607,9 +2597,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -2695,14 +2685,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &107967438 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107967432} - m_Mesh: {fileID: 0} --- !u!1 &114868271 GameObject: m_ObjectHideFlags: 0 @@ -4322,7 +4304,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -4335,8 +4317,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -4386,7 +4368,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 202214545} - - component: {fileID: 202214550} - component: {fileID: 202214549} - component: {fileID: 202214548} - component: {fileID: 202214547} @@ -4424,7 +4405,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 202214544} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} m_Name: @@ -4474,7 +4455,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -4486,9 +4467,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -4574,14 +4555,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &202214550 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 202214544} - m_Mesh: {fileID: 0} --- !u!1 &202859276 GameObject: m_ObjectHideFlags: 0 @@ -4761,7 +4734,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.6698078, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5636,7 +5609,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.6698078, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6421,7 +6394,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7201,7 +7174,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.68602705, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7334,8 +7307,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 741838669} - {fileID: 947241301} + - {fileID: 741838669} + - {fileID: 1819197327} + - {fileID: 518253459} m_Father: {fileID: 1587051624} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -7377,6 +7352,199 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 517324375} m_CullTransparentMesh: 0 +--- !u!1001 &518253458 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 517324376} + m_Modifications: + - target: {fileID: 3132460205455581372, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: Free Flight + objectReference: {fileID: 0} + - target: {fileID: 3132460205455581372, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_fontSize + value: 45.55 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_SizeDelta.y + value: 77.3 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00002980232 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalRotation.z + value: 1.1641532e-10 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206892685566439831, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.9999924 + objectReference: {fileID: 0} + - target: {fileID: 5388172141496654257, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 938928009} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Navigation.m_SelectOnUp + value: + objectReference: {fileID: 1819197328} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Navigation.m_SelectOnLeft + value: + objectReference: {fileID: 1876351060} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 938928009} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: LocalFreeFlightButtonClick + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: SlimUI.ModernMenu.SlimUIMainMenu, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument + value: + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: Local Match (4 Player max.) + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5429341922959870843, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Name + value: Btn_NewFreeFlight + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 817319833dd713d45af5c2121e9649c7, type: 3} +--- !u!224 &518253459 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + m_PrefabInstance: {fileID: 518253458} + m_PrefabAsset: {fileID: 0} +--- !u!114 &518253460 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + m_PrefabInstance: {fileID: 518253458} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &522115366 GameObject: m_ObjectHideFlags: 0 @@ -7604,7 +7772,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 556166308} - - component: {fileID: 556166311} - component: {fileID: 556166310} - component: {fileID: 556166309} m_Layer: 0 @@ -7675,7 +7842,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -7688,8 +7855,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -7767,14 +7934,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &556166311 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 556166307} - m_Mesh: {fileID: 0} --- !u!1 &564896901 GameObject: m_ObjectHideFlags: 0 @@ -8210,6 +8369,124 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 581249762} m_CullTransparentMesh: 0 +--- !u!1 &587972017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 587972020} + - component: {fileID: 587972019} + - component: {fileID: 587972018} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &587972018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587972017} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!108 &587972019 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587972017} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 3 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + 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: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &587972020 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587972017} + serializedVersion: 2 + m_LocalRotation: {x: 0.21875338, y: -0.2520944, z: 0.058614783, w: 0.9408293} + m_LocalPosition: {x: 361.6, y: 31, z: -245.9} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 26.179, y: -30, z: 0} --- !u!1 &599109983 GameObject: m_ObjectHideFlags: 0 @@ -9086,9 +9363,13 @@ PrefabInstance: value: objectReference: {fileID: 938928009} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_Navigation.m_SelectOnDown + propertyPath: m_Navigation.m_SelectOnUp value: objectReference: {fileID: 947241302} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Navigation.m_SelectOnDown + value: + objectReference: {fileID: 1819197328} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_Navigation.m_SelectOnLeft value: @@ -9099,15 +9380,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 938928009} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: LoadLocalScene + value: Local1v1MatchButtonClick objectReference: {fileID: 0} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName @@ -9115,7 +9400,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument @@ -9384,7 +9669,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 755935998} - - component: {fileID: 755936001} - component: {fileID: 755936000} - component: {fileID: 755935999} m_Layer: 0 @@ -9455,7 +9739,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -9468,8 +9752,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -9547,14 +9831,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &755936001 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 755935997} - m_Mesh: {fileID: 0} --- !u!1 &758331498 GameObject: m_ObjectHideFlags: 0 @@ -9735,7 +10011,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 772295130} - - component: {fileID: 772295133} - component: {fileID: 772295132} - component: {fileID: 772295131} m_Layer: 0 @@ -9806,7 +10081,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -9819,8 +10094,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -9898,14 +10173,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &772295133 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 772295129} - m_Mesh: {fileID: 0} --- !u!1 &789359440 GameObject: m_ObjectHideFlags: 0 @@ -10143,7 +10410,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.68602705, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -11001,10 +11268,10 @@ Camera: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 938928007} - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.03773582, g: 0.028750122, b: 0.024029884, a: 1} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -11026,7 +11293,7 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 1000 + far clip plane: 10000 field of view: 60 orthographic: 0 orthographic size: 5 @@ -11039,7 +11306,7 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 1 - m_AllowMSAA: 0 + m_AllowMSAA: 1 m_AllowDynamicResolution: 1 m_ForceIntoRT: 1 m_OcclusionCulling: 0 @@ -11086,6 +11353,7 @@ MonoBehaviour: hoverSound: {fileID: 977995661} sliderSound: {fileID: 1000976352} swooshSound: {fileID: 264769952} + starParticles: {fileID: 998543771} --- !u!4 &938928010 Transform: m_ObjectHideFlags: 0 @@ -11097,12 +11365,13 @@ Transform: 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_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 977995660} - {fileID: 1883605747} - {fileID: 1000976351} - {fileID: 264769953} + - {fileID: 998543770} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &938928011 @@ -11129,7 +11398,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} m_Name: m_EditorClassIdentifier: - m_RenderShadows: 1 + m_RenderShadows: 0 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 @@ -11296,7 +11565,13 @@ PrefabInstance: m_Modifications: - target: {fileID: 3132460205455581372, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_text - value: Online Match (coming soon) + value: 'Enter Online Lobby + +' + objectReference: {fileID: 0} + - target: {fileID: 3132460205455581372, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_fontSize + value: 45.55 objectReference: {fileID: 0} - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_Pivot.x @@ -11391,7 +11666,7 @@ PrefabInstance: value: objectReference: {fileID: 938928009} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} - propertyPath: m_Navigation.m_SelectOnUp + propertyPath: m_Navigation.m_SelectOnDown value: objectReference: {fileID: 741838670} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} @@ -11404,7 +11679,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -11412,7 +11687,7 @@ PrefabInstance: objectReference: {fileID: 938928009} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: LoadOnlineScene + value: Position3 objectReference: {fileID: 0} - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName @@ -11621,7 +11896,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 961422959} - - component: {fileID: 961422962} - component: {fileID: 961422961} - component: {fileID: 961422960} m_Layer: 0 @@ -11692,7 +11966,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -11705,8 +11979,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -11784,14 +12058,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &961422962 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 961422958} - m_Mesh: {fileID: 0} --- !u!1 &969844554 GameObject: m_ObjectHideFlags: 0 @@ -12298,7 +12564,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -12323,6 +12589,55 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 979098231} m_CullTransparentMesh: 0 +--- !u!1 &988818204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 988818206} + - component: {fileID: 988818205} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &988818205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 988818204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 1d9ae5f0e4543a242868bcbfaf41acfd, type: 2} +--- !u!4 &988818206 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 988818204} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &998007829 GameObject: m_ObjectHideFlags: 0 @@ -12477,7 +12792,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.6698078, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -12502,6 +12817,73 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 998007829} m_CullTransparentMesh: 0 +--- !u!1001 &998543769 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 938928010} + m_Modifications: + - target: {fileID: 3749816391370857719, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_Name + value: Star Particles + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalPosition.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.w + value: -0.2744564 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.x + value: 0.14863308 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.y + value: 0.6539686 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalRotation.z + value: 0.689135 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 280.601 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -56.9 + objectReference: {fileID: 0} + - target: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -88.13 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} +--- !u!4 &998543770 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7380269251330496775, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + m_PrefabInstance: {fileID: 998543769} + m_PrefabAsset: {fileID: 0} +--- !u!1 &998543771 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3749816391370857719, guid: 86949d7de375bf64a812cbb78cab3b0a, type: 3} + m_PrefabInstance: {fileID: 998543769} + m_PrefabAsset: {fileID: 0} --- !u!1 &1000976350 GameObject: m_ObjectHideFlags: 0 @@ -12784,7 +13166,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -13289,7 +13671,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1049062246} - - component: {fileID: 1049062250} - component: {fileID: 1049062249} - component: {fileID: 1049062248} - component: {fileID: 1049062247} @@ -13361,7 +13742,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -13373,9 +13754,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 516 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -13461,14 +13842,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1049062250 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1049062245} - m_Mesh: {fileID: 0} --- !u!1 &1057918427 GameObject: m_ObjectHideFlags: 0 @@ -13972,7 +14345,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.68602705, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -14351,7 +14724,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1126477048} - - component: {fileID: 1126477051} - component: {fileID: 1126477050} - component: {fileID: 1126477049} m_Layer: 0 @@ -14422,7 +14794,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -14435,8 +14807,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -14514,14 +14886,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1126477051 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1126477047} - m_Mesh: {fileID: 0} --- !u!1 &1127731181 GameObject: m_ObjectHideFlags: 0 @@ -14849,7 +15213,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1153743166} - - component: {fileID: 1153743169} - component: {fileID: 1153743168} - component: {fileID: 1153743167} m_Layer: 0 @@ -14920,7 +15283,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -14933,8 +15296,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -15012,14 +15375,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1153743169 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1153743165} - m_Mesh: {fileID: 0} --- !u!1 &1156765905 GameObject: m_ObjectHideFlags: 0 @@ -15029,7 +15384,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1156765906} - - component: {fileID: 1156765911} - component: {fileID: 1156765910} - component: {fileID: 1156765909} - component: {fileID: 1156765908} @@ -15067,7 +15421,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156765905} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} m_Name: @@ -15117,7 +15471,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -15129,9 +15483,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -15217,14 +15571,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1156765911 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1156765905} - m_Mesh: {fileID: 0} --- !u!1 &1157836009 GameObject: m_ObjectHideFlags: 0 @@ -15654,8 +16000,8 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1181854790} - m_LocalRotation: {x: 0.015344907, y: -0.58969563, z: 0.006879348, w: -0.80745053} - m_LocalPosition: {x: 0, y: 0, z: -17.54812} + m_LocalRotation: {x: 0, y: 0.58988005, z: 0, w: 0.8074909} + m_LocalPosition: {x: 0, y: 0, z: -12.5} m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: @@ -15666,10 +16012,10 @@ RectTransform: - {fileID: 603611387} - {fileID: 1807567364} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 90.00001, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 72.297, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 26.446497, y: -2.1135802} + m_AnchoredPosition: {x: 42.4, y: -1.8} m_SizeDelta: {x: 2560, y: 1440} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1189758873 @@ -15802,7 +16148,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5388246411556146967, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_Color.g - value: 0.53922683 + value: 0.6862745 objectReference: {fileID: 0} - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_text @@ -15964,7 +16310,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1199170925} - - component: {fileID: 1199170928} - component: {fileID: 1199170927} - component: {fileID: 1199170926} m_Layer: 0 @@ -16035,7 +16380,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -16048,8 +16393,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -16127,14 +16472,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1199170928 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199170924} - m_Mesh: {fileID: 0} --- !u!1 &1210911739 GameObject: m_ObjectHideFlags: 0 @@ -16144,7 +16481,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1210911740} - - component: {fileID: 1210911743} - component: {fileID: 1210911742} - component: {fileID: 1210911741} m_Layer: 0 @@ -16215,7 +16551,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -16228,8 +16564,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -16307,14 +16643,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1210911743 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1210911739} - m_Mesh: {fileID: 0} --- !u!1 &1231475441 GameObject: m_ObjectHideFlags: 0 @@ -16324,7 +16652,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1231475442} - - component: {fileID: 1231475447} - component: {fileID: 1231475446} - component: {fileID: 1231475445} - component: {fileID: 1231475444} @@ -16362,7 +16689,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1231475441} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} m_Name: @@ -16412,7 +16739,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -16424,9 +16751,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -16512,14 +16839,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1231475447 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1231475441} - m_Mesh: {fileID: 0} --- !u!1 &1234827738 GameObject: m_ObjectHideFlags: 0 @@ -16529,7 +16848,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1234827739} - - component: {fileID: 1234827743} - component: {fileID: 1234827742} - component: {fileID: 1234827741} - component: {fileID: 1234827740} @@ -16601,7 +16919,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -16614,8 +16932,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 1 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -16701,14 +17019,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1234827743 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1234827738} - m_Mesh: {fileID: 0} --- !u!114 &1251967721 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} @@ -17081,7 +17391,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1281372667} - - component: {fileID: 1281372672} - component: {fileID: 1281372671} - component: {fileID: 1281372670} - component: {fileID: 1281372669} @@ -17119,7 +17428,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1281372666} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} m_Name: @@ -17169,7 +17478,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -17181,9 +17490,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -17269,14 +17578,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1281372672 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1281372666} - m_Mesh: {fileID: 0} --- !u!1 &1298638630 GameObject: m_ObjectHideFlags: 0 @@ -17325,7 +17626,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1299218898} - - component: {fileID: 1299218901} - component: {fileID: 1299218900} - component: {fileID: 1299218899} m_Layer: 0 @@ -17396,7 +17696,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -17409,8 +17709,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 1 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -17488,14 +17788,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1299218901 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1299218897} - m_Mesh: {fileID: 0} --- !u!1 &1306011132 GameObject: m_ObjectHideFlags: 0 @@ -19026,7 +19318,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1420125408} - - component: {fileID: 1420125411} - component: {fileID: 1420125410} - component: {fileID: 1420125409} m_Layer: 0 @@ -19097,7 +19388,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -19110,8 +19401,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -19189,14 +19480,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1420125411 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1420125407} - m_Mesh: {fileID: 0} --- !u!1 &1434569350 GameObject: m_ObjectHideFlags: 0 @@ -20808,7 +21091,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.6698078, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -21079,7 +21362,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.68602705, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -21574,7 +21857,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.68602705, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -21753,7 +22036,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.6698078, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -22076,7 +22359,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.153} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -22860,7 +23143,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.0627451} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -23718,7 +24001,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1763907127} - - component: {fileID: 1763907130} - component: {fileID: 1763907129} - component: {fileID: 1763907128} m_Layer: 0 @@ -23789,7 +24071,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -23802,8 +24084,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -23881,14 +24163,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1763907130 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763907126} - m_Mesh: {fileID: 0} --- !u!1 &1764244899 GameObject: m_ObjectHideFlags: 0 @@ -24160,7 +24434,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.68602705, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -24378,7 +24652,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5388246411556146967, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_Color.g - value: 0.53922683 + value: 0.6862745 objectReference: {fileID: 0} - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} propertyPath: m_text @@ -24580,7 +24854,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.6698078, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -25365,6 +25639,199 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &1819197326 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 517324376} + m_Modifications: + - target: {fileID: 3132460205455581372, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: Local Match (2v2) + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_SizeDelta.y + value: 77.3 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00002980232 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalRotation.z + value: 1.1641532e-10 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5206892685566439831, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.9999924 + objectReference: {fileID: 0} + - target: {fileID: 5388172141496654257, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 938928009} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Navigation.m_SelectOnUp + value: + objectReference: {fileID: 741838670} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Navigation.m_SelectOnDown + value: + objectReference: {fileID: 518253460} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Navigation.m_SelectOnLeft + value: + objectReference: {fileID: 1876351060} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 938928009} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Local2v2MatchButtonClick + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: SlimUI.ModernMenu.SlimUIMainMenu, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument + value: + objectReference: {fileID: 0} + - target: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_text + value: Local Match (4 Player max.) + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5389521700824258581, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5429341922959870843, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + propertyPath: m_Name + value: Btn_NewLocalMatch2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 817319833dd713d45af5c2121e9649c7, type: 3} +--- !u!224 &1819197327 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5206668379868315107, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + m_PrefabInstance: {fileID: 1819197326} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1819197328 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5388222474218088325, guid: 817319833dd713d45af5c2121e9649c7, type: 3} + m_PrefabInstance: {fileID: 1819197326} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1819854196 GameObject: m_ObjectHideFlags: 0 @@ -25604,7 +26071,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.6698078, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -25638,7 +26105,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1825651421} - - component: {fileID: 1825651424} - component: {fileID: 1825651423} - component: {fileID: 1825651422} m_Layer: 0 @@ -25709,7 +26175,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -25722,8 +26188,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -25801,14 +26267,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1825651424 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1825651420} - m_Mesh: {fileID: 0} --- !u!1 &1837912199 GameObject: m_ObjectHideFlags: 0 @@ -25968,7 +26426,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1841748686} - - component: {fileID: 1841748691} - component: {fileID: 1841748690} - component: {fileID: 1841748689} - component: {fileID: 1841748688} @@ -26006,7 +26463,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1841748685} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} m_Name: @@ -26056,7 +26513,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -26068,9 +26525,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -26156,14 +26613,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1841748691 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841748685} - m_Mesh: {fileID: 0} --- !u!1 &1861047991 GameObject: m_ObjectHideFlags: 0 @@ -26173,7 +26622,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1861047992} - - component: {fileID: 1861047997} - component: {fileID: 1861047996} - component: {fileID: 1861047995} - component: {fileID: 1861047994} @@ -26211,7 +26659,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1861047991} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} m_Name: @@ -26261,7 +26709,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -26273,9 +26721,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -26361,14 +26809,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1861047997 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1861047991} - m_Mesh: {fileID: 0} --- !u!1 &1863704358 GameObject: m_ObjectHideFlags: 0 @@ -26889,7 +27329,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1894474381} - - component: {fileID: 1894474385} - component: {fileID: 1894474384} - component: {fileID: 1894474383} - component: {fileID: 1894474382} @@ -26961,7 +27400,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -26974,8 +27413,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -27061,14 +27500,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1894474385 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1894474380} - m_Mesh: {fileID: 0} --- !u!1 &1897604802 GameObject: m_ObjectHideFlags: 0 @@ -27429,7 +27860,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1911254418} - - component: {fileID: 1911254423} - component: {fileID: 1911254422} - component: {fileID: 1911254421} - component: {fileID: 1911254420} @@ -27467,7 +27897,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1911254417} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} m_Name: @@ -27517,7 +27947,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -27529,9 +27959,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -27617,14 +28047,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1911254423 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1911254417} - m_Mesh: {fileID: 0} --- !u!1 &1911926738 GameObject: m_ObjectHideFlags: 0 @@ -27634,7 +28056,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1911926739} - - component: {fileID: 1911926744} - component: {fileID: 1911926743} - component: {fileID: 1911926742} - component: {fileID: 1911926741} @@ -27672,7 +28093,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1911926738} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} m_Name: @@ -27722,7 +28143,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -27734,9 +28155,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -27822,14 +28243,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1911926744 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1911926738} - m_Mesh: {fileID: 0} --- !u!1 &1946977537 GameObject: m_ObjectHideFlags: 0 @@ -27987,7 +28400,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.68602705, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -28134,7 +28547,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1988713656} - - component: {fileID: 1988713659} - component: {fileID: 1988713658} - component: {fileID: 1988713657} m_Layer: 0 @@ -28205,7 +28617,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -28218,8 +28630,8 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 513 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -28297,14 +28709,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1988713659 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1988713655} - m_Mesh: {fileID: 0} --- !u!1 &1989585369 GameObject: m_ObjectHideFlags: 0 @@ -30526,6 +30930,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2135850790} m_CullTransparentMesh: 0 +--- !u!1001 &3402300259991487632 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2998810591680941183, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} + propertyPath: m_LocalPosition.x + value: 541 + objectReference: {fileID: 0} + - target: {fileID: 2998810591680941183, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} + propertyPath: m_LocalPosition.y + value: 29 + objectReference: {fileID: 0} + - target: {fileID: 2998810591680941183, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} + propertyPath: m_LocalPosition.z + value: -105 + objectReference: {fileID: 0} + - target: {fileID: 2998810591680941183, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} + propertyPath: m_LocalRotation.w + value: 0.028210564 + objectReference: {fileID: 0} + - target: {fileID: 2998810591680941183, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} + propertyPath: m_LocalRotation.x + value: 0.49754447 + objectReference: {fileID: 0} + - target: {fileID: 2998810591680941183, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} + propertyPath: m_LocalRotation.y + value: 0.0042817052 + objectReference: {fileID: 0} + - target: {fileID: 2998810591680941183, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} + propertyPath: m_LocalRotation.z + value: -0.8669691 + objectReference: {fileID: 0} + - target: {fileID: 2998810591680941183, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.034 + objectReference: {fileID: 0} + - target: {fileID: 2998810591680941183, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -59.657 + objectReference: {fileID: 0} + - target: {fileID: 2998810591680941183, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -177.439 + objectReference: {fileID: 0} + - target: {fileID: 5526268523112756472, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} + propertyPath: m_Name + value: Debris Particles + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1e116d6cc8fae1943a06cac33f31f17c, type: 3} --- !u!1001 &3971885707390609059 PrefabInstance: m_ObjectHideFlags: 0 @@ -30891,3 +31352,6 @@ SceneRoots: - {fileID: 1181854795} - {fileID: 243932831} - {fileID: 509067253} + - {fileID: 587972020} + - {fileID: 3402300259991487632} + - {fileID: 988818206} diff --git a/Assets/Scenes/MainMenu/LightingData.asset b/Assets/Scenes/MainMenu/LightingData.asset new file mode 100644 index 0000000..5ea0612 Binary files /dev/null and b/Assets/Scenes/MainMenu/LightingData.asset differ diff --git a/Assets/Scenes/MainMenu/LightingData.asset.meta b/Assets/Scenes/MainMenu/LightingData.asset.meta new file mode 100644 index 0000000..4b830f8 --- /dev/null +++ b/Assets/Scenes/MainMenu/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a09b019153231a5479d827455b0a3dff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu/ReflectionProbe-0.exr b/Assets/Scenes/MainMenu/ReflectionProbe-0.exr new file mode 100644 index 0000000..fc9f849 Binary files /dev/null and b/Assets/Scenes/MainMenu/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/MainMenu/ReflectionProbe-0.exr.meta b/Assets/Scenes/MainMenu/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..2f8aa95 --- /dev/null +++ b/Assets/Scenes/MainMenu/ReflectionProbe-0.exr.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9f6ed0b1f9ca22441ae1b7be60c3136f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ScriptedAssets/Arenas/FourPlayerArena.asset b/Assets/ScriptedAssets/Arenas/FourPlayerArena.asset new file mode 100644 index 0000000..02777ba --- /dev/null +++ b/Assets/ScriptedAssets/Arenas/FourPlayerArena.asset @@ -0,0 +1,21 @@ +%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: e8e34096b6ebcdd41a24bcf4ecc8ec4d, type: 3} + m_Name: FourPlayerArena + m_EditorClassIdentifier: + minPlayerCount: 4 + maxPlayerCount: 4 + spawnPositions: + - {x: -6, y: -3, z: 0} + - {x: 6, y: -3, z: 0} + - {x: -6, y: 3, z: 0} + - {x: 6, y: 3, z: 0} diff --git a/Assets/ScriptedAssets/Arenas/FourPlayerArena.asset.meta b/Assets/ScriptedAssets/Arenas/FourPlayerArena.asset.meta new file mode 100644 index 0000000..950c66b --- /dev/null +++ b/Assets/ScriptedAssets/Arenas/FourPlayerArena.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 285ce50b1fcb2a74da2d90aaeb4cab6f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: arenas + assetBundleVariant: diff --git a/Assets/ScriptedAssets/Arenas/FreeFlyArena.asset b/Assets/ScriptedAssets/Arenas/FreeFlyArena.asset new file mode 100644 index 0000000..ce4e8fc --- /dev/null +++ b/Assets/ScriptedAssets/Arenas/FreeFlyArena.asset @@ -0,0 +1,21 @@ +%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: e8e34096b6ebcdd41a24bcf4ecc8ec4d, type: 3} + m_Name: FreeFlyArena + m_EditorClassIdentifier: + minPlayerCount: 1 + maxPlayerCount: 4 + spawnPositions: + - {x: 0, y: 0, z: 0} + - {x: 5, y: 0, z: 0} + - {x: -5, y: 0, z: 0} + - {x: 0, y: -5, z: 0} diff --git a/Assets/ScriptedAssets/Arenas/FreeFlyArena.asset.meta b/Assets/ScriptedAssets/Arenas/FreeFlyArena.asset.meta new file mode 100644 index 0000000..7cd20eb --- /dev/null +++ b/Assets/ScriptedAssets/Arenas/FreeFlyArena.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 699dc075f65beab488b3a176f98ac585 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: arenas + assetBundleVariant: diff --git a/Assets/ScriptedAssets/BaseProperties.meta b/Assets/ScriptedAssets/BaseProperties.meta new file mode 100644 index 0000000..25e0013 --- /dev/null +++ b/Assets/ScriptedAssets/BaseProperties.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9349de02905e01548b9cd42181a8f441 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ScriptedAssets/Rules/FreeFlyRule.asset b/Assets/ScriptedAssets/Rules/FreeFlyRule.asset new file mode 100644 index 0000000..4be66de --- /dev/null +++ b/Assets/ScriptedAssets/Rules/FreeFlyRule.asset @@ -0,0 +1,20 @@ +%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: 80e0298be80685d4ea378da65443763a, type: 3} + m_Name: FreeFlyRule + m_EditorClassIdentifier: + winCondition: 0 + rounds: 1 + lives: 1 + score: 0 + time: -1 + suddenDeath: 0 diff --git a/Assets/ScriptedAssets/Rules/FreeFlyRule.asset.meta b/Assets/ScriptedAssets/Rules/FreeFlyRule.asset.meta new file mode 100644 index 0000000..438fde8 --- /dev/null +++ b/Assets/ScriptedAssets/Rules/FreeFlyRule.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6b37c3124f398e4fbe472f570480cbe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: rules + assetBundleVariant: diff --git a/Assets/Scripts/CameraOperator.cs b/Assets/Scripts/CameraOperator.cs index 194296d..4332056 100644 --- a/Assets/Scripts/CameraOperator.cs +++ b/Assets/Scripts/CameraOperator.cs @@ -1,22 +1,53 @@ using System; +using System.Collections; using System.Collections.Generic; +using System.Data.Common; using System.Linq; +using System.Reflection; +using log4net; +using PrimeTween; +using Unity.Mathematics; using Unity.VisualScripting; +using UnityEditor.Rendering; using UnityEngine; using UnityEngine.Rendering.Universal; using static UnityEngine.Mathf; public class CameraOperator : MonoBehaviour { + + private static ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private Dictionary players = new Dictionary(); [SerializeField] - private int MaxAdditionalDistance = 15; + private int MaxAdditionalDistance = 30; + [SerializeField] + private float FarOutBias = 0.3f; + [SerializeField] + private float MaxFollowDistance = 100f; + [SerializeField] + [Tooltip("Target Offset/ (Framerate * (1/FollowSpeed))")] + private float FollowSpeed = 2f; + [SerializeField] + [Tooltip("Lower values make the camera tilt harder to keep the mid point centered")] + private float TiltFactor = 1.5f; + [SerializeField] + private float ZoomOutMargin = Screen.height / 4; + [SerializeField] + private float ZoomInMargin = Screen.height / 3; + [SerializeField] + private float MinZoomSpeed = 0.4f; + [SerializeField] + private float MaxZoomSpeed = 0.5f; + private Vector3 _currentZoomSpeed = Vector3.zero; private float InitialDistance = 0; private float MaxDistance; + private float ZoomTriggerXDistance = 0; + private float ZoomTriggerYDistance = 0; + private Camera cam; private void Awake() @@ -27,46 +58,82 @@ public class CameraOperator : MonoBehaviour MaxDistance = InitialDistance - MaxAdditionalDistance; } - public void AddPlayer(GameObject player) + public void AddCharacter(GameObject ship) { - players[player.GetInstanceID()] = player; + players[ship.GetInstanceID()] = ship; } - public void RemovePlayer(int id) + public void RemoveCharacter(GameObject ship) { - players.Remove(id); + players.Remove(ship.GetInstanceID()); + ZoomTriggerXDistance = 0; + ZoomTriggerYDistance = 0; } /// - /// Rotates the camera to point at the center between the players. + /// Tilts the camera to point at the center between the players. + /// Zooms to keep players in frame. + /// Follows the players mid-point. /// - private void LateUpdate() + private void FixedUpdate() { - CenterBetweenPlayers(); - AdjustZoom(); - } - - private void CenterBetweenPlayers() - { - if (players.Count < 1) + Vector3 center = CalculatePlayersCenter(); + if (players.Count == 1) + { + FollowPosition(players.First().Value.transform.localPosition); + FacePlayersCenter(center - transform.localPosition); + } + else if (players.Count > 0) + { + FollowPosition(center); + FacePlayersCenter(center); + AdjustZoom(); + } + else { return; } - float x = transform.localPosition.x; - float y = transform.localPosition.y; - float z = transform.localPosition.z; + } + + private Vector3 CalculatePlayersCenter() + { + Vector3 center = new Vector3(); + if (players.Count < 1) + { + return transform.localPosition; + } + Vector3 furthestPoint = new Vector3(); foreach (GameObject p in players.Values) { if (p.IsDestroyed()) continue; - Vector3 position = p.transform.localPosition; - z = position.z; - x += position.x; - y += position.y; + Vector3 position; + position = p.transform.localPosition; + center += position; + if ((position - center).magnitude > furthestPoint.magnitude) + { + furthestPoint = position - center; + } } + center /= players.Count(); + + // TODO: Competing furthest points cause jitter + if (FarOutBias > 0 && players.Count > 2) + { + center += (center - furthestPoint) * FarOutBias; + } + + return center; + } + + private void FacePlayersCenter(Vector3 center) + { + var x = center.x; + var y = center.y; + var z = center.z; x /= players.Count(); y /= players.Count(); - float a = z - InitialDistance; + float a = z - transform.localPosition.z * TiltFactor; float cXAxis = (float)Sqrt(Pow(a, 2) + Pow(x, 2)); float cYAxis = (float)Sqrt(Pow(a, 2) + Pow(y, 2)); Vector3 xyRotation = new Vector3(Rad2Deg * Acos(a / cYAxis) * -Math.Sign(y), @@ -75,8 +142,10 @@ public class CameraOperator : MonoBehaviour { transform.localEulerAngles = xyRotation / 2; } + } - private void AdjustZoom() + + private void CalculateMaxInterPlayerDistance() { if (players.Count < 2) { @@ -87,6 +156,7 @@ public class CameraOperator : MonoBehaviour float maxXDistance = 0; float maxYDistance = 0; + foreach (GameObject player in players.Values) { var screenPos1 = cam.WorldToScreenPoint(player.transform.position); @@ -104,16 +174,90 @@ public class CameraOperator : MonoBehaviour maxYDistance = Abs(distance.y); } } - if (maxXDistance < Screen.width - Margin - && maxYDistance < Screen.height - Margin) + } + + private void AdjustZoom() + { + if (players.Count < 2) { - if (transform.localPosition.z < InitialDistance + 0.1f) - transform.localPosition += new Vector3(0, 0, 0.1f); return; } - if (transform.localPosition.z > MaxDistance - 0.1f) - transform.localPosition -= new Vector3(0, 0, 0.1f); + float maxXPos = 0; + float maxYPos = 0; + float minXPos = -1; + float minYPos = -1; + + foreach (GameObject player in players.Values) + { + var screenPos = cam.WorldToScreenPoint(player.transform.position); + if (minXPos == -1) + minXPos = screenPos.x; + if (minYPos == -1) + minYPos = screenPos.y; + if (screenPos.x < minXPos) + minXPos = screenPos.x; + if (screenPos.y < minYPos) + minYPos = screenPos.y; + if (screenPos.x > maxXPos) + maxXPos = screenPos.x; + if (screenPos.y > maxYPos) + maxYPos = screenPos.y; + } + + + + + + if (maxXPos < Screen.width - ZoomInMargin + && maxYPos < Screen.height - ZoomInMargin + && minXPos > ZoomInMargin + && minYPos > ZoomInMargin) + // Anti-Shake + // && (ZoomTriggerXDistance < maxXDistance - 3f + // || ZoomTriggerYDistance < maxYDistance - 3f)) + { + if (transform.localPosition.z < InitialDistance) + { + Vector3 target = transform.localPosition + new Vector3(0, 0, MinZoomSpeed); + transform.localPosition = + Vector3.SmoothDamp(transform.localPosition, target, ref _currentZoomSpeed, 0.0003f); + } + return; + } + + if (maxXPos > Screen.width - ZoomOutMargin + || maxYPos > Screen.height - ZoomOutMargin + || minXPos < ZoomOutMargin + || minYPos < ZoomOutMargin) + { + if (transform.localPosition.z > MaxDistance) + { + Vector3 target = transform.localPosition - new Vector3(0, 0, MaxZoomSpeed); + transform.localPosition = + Vector3.SmoothDamp(transform.localPosition, target, ref _currentZoomSpeed, 0.0007f); + } + } } + + private void FollowPosition(Vector3 position) + { + Vector3 offset = position - transform.localPosition; + offset.z = 0; + + Vector3 ignoreZ = new Vector3(transform.localPosition.x, transform.localPosition.y, 0); + if (offset.magnitude < 1) + { + return; + } + if (MaxFollowDistance != -1 + && ignoreZ.magnitude > MaxFollowDistance + && (ignoreZ + offset).magnitude > ignoreZ.magnitude) + { + return; + } + + transform.localPosition += offset / ((1 / Time.deltaTime) * (1 / FollowSpeed)); + } } \ No newline at end of file diff --git a/Assets/Scripts/HitFeedbackTestObjectBehavior.cs b/Assets/Scripts/HitFeedbackTestObjectBehavior.cs index a09560c..d38c1e4 100644 --- a/Assets/Scripts/HitFeedbackTestObjectBehavior.cs +++ b/Assets/Scripts/HitFeedbackTestObjectBehavior.cs @@ -45,7 +45,8 @@ public class HitFeedbackTestObjectBehavior : MonoBehaviour { // Get and apply the current Gravity - currentGravity = forceManager.GetGravityForInstance(instanceID)(transform); + Transform gravitySource = forceManager.GetGravitySourceForInstance(instanceID); + currentGravity = forceManager.GetGravityForInstance(instanceID)(gravitySource, transform); body.AddForce(currentGravity, ForceMode.Acceleration); diff --git a/Assets/Scripts/LockRotation.cs b/Assets/Scripts/LockRotation.cs new file mode 100644 index 0000000..b2d0155 --- /dev/null +++ b/Assets/Scripts/LockRotation.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class LockRotation : MonoBehaviour +{ + Quaternion initialRotation; + + void Start() + { + initialRotation = transform.rotation; + } + + void LateUpdate() + { + transform.rotation = initialRotation; + } +} diff --git a/Assets/Scripts/LockRotation.cs.meta b/Assets/Scripts/LockRotation.cs.meta new file mode 100644 index 0000000..16ef7bf --- /dev/null +++ b/Assets/Scripts/LockRotation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f8eae9659bf53b146a59d63a6e6443c4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ManageableAudio.cs b/Assets/Scripts/ManageableAudio.cs index 5ea8ee7..0c9b045 100644 --- a/Assets/Scripts/ManageableAudio.cs +++ b/Assets/Scripts/ManageableAudio.cs @@ -116,7 +116,7 @@ public class ManageableAudio : MonoBehaviour /// Destroy the object after fade out? public void FadeOutAudio(float duration = 1, bool destroyedAfter = false) { - if (IsUpdating) + if (IsUpdating || AudioSource.IsDestroyed()) { return; } diff --git a/Assets/Scripts/Managers/CharacterManager.cs b/Assets/Scripts/Managers/CharacterManager.cs index a50338b..cdda939 100644 --- a/Assets/Scripts/Managers/CharacterManager.cs +++ b/Assets/Scripts/Managers/CharacterManager.cs @@ -95,7 +95,7 @@ namespace Managers foreach (Player p in players) { - GameObject shipObject = Instantiate(p.character.shipObject); + GameObject shipObject = Instantiate(p.character.shipPrefab); p.spawnedCharacter = shipObject; shipObject.TryGetComponent(out Ship ship); ship.state = new ShipHandling.ShipState(); @@ -127,7 +127,7 @@ namespace Managers var MatchArena = MatchManager.G.MatchArena; List spawned = new List(); - GameObject shipObject = Instantiate(player.character.shipObject); + GameObject shipObject = Instantiate(player.character.shipPrefab); player.spawnedCharacter = shipObject; shipObject.TryGetComponent(out Ship ship); ship.state = new ShipHandling.ShipState(); diff --git a/Assets/Scripts/Managers/ControlsManager.cs b/Assets/Scripts/Managers/ControlsManager.cs index b89b0ab..5cad2d1 100644 --- a/Assets/Scripts/Managers/ControlsManager.cs +++ b/Assets/Scripts/Managers/ControlsManager.cs @@ -62,7 +62,7 @@ namespace Managers } else { - unassignedPlayers.Add(p.playerNumber, p); + unassignedPlayers.TryAdd(p.playerNumber, p); } } StartControlSchemeDetection(); diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index f53e2f1..ea4fd42 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -14,12 +14,13 @@ using UnityEngine.Networking; /// /// The available scenes in the order they are in the build settings. /// -public enum Scenes +public enum SceneEnum { GameMangement, MainMenu, InGameUI, Arena, + FreeFlyArena } namespace Managers @@ -57,8 +58,14 @@ namespace Managers [SerializeField] private GameObject startCamera; + [HideInInspector] + public SceneEnum CurrentScene = SceneEnum.GameMangement; + public bool IsTestRun = false; - public Scenes TestScene = Scenes.Arena; + public SceneEnum TestScene = SceneEnum.Arena; + public int TestSceneRule = 0; + public int TestSceneArena = 0; + public event EventHandler CustomSceneLoaded; @@ -67,6 +74,7 @@ namespace Managers G = this; if (!IsTestRun) ShowStartScreen(); LogManager.ConfigureLogging(); + //Application.targetFrameRate = 60; Log.Info("Awake"); } @@ -164,8 +172,9 @@ namespace Managers { SceneManager.SetActiveScene(args.SceneRef); startCamera.SetActive(false); - }, Scenes.MainMenu); - SceneManager.LoadSceneAsync((int)Scenes.MainMenu, LoadSceneMode.Additive); + CurrentScene = SceneEnum.MainMenu; + }, SceneEnum.MainMenu); + SceneManager.LoadSceneAsync((int)SceneEnum.MainMenu, LoadSceneMode.Additive); Log.Info("Main menu scene loaded."); } @@ -174,12 +183,13 @@ namespace Managers /// and starting their appropriate processes. /// /// Scene id of the chosen arena. - public IEnumerator SetupLocalMatchFromMainMenu() + public IEnumerator SetupLocalMatchFromMainMenu(int ruleIndex, int arenaIndex) { - MatchManager.LoadMatchRules(0); - MatchManager.LoadArenaProperties(0); + MatchManager.LoadMatchRules(ruleIndex); + MatchManager.LoadArenaProperties(arenaIndex); MatchManager.AssignMatchObjects(); - PlayerManager.LocalMatchJoinPlayers(MatchManager.ArenaProperties.minPlayerCount); + PlayerManager.LocalMatchJoinPlayers(MatchManager.ArenaProperties.minPlayerCount, + MatchManager.ArenaProperties.maxPlayerCount); // TODO: This is in place of a character choosing menu etc. foreach (Player p in PlayerManager.MatchPlayers) { @@ -210,19 +220,21 @@ namespace Managers /// /// The match scene which will be loaded /// - public IEnumerator SetupTestMatch(Scenes scene) + public IEnumerator SetupTestMatch(SceneEnum scene) { yield return null; SceneManager.LoadScene((int)scene, LoadSceneMode.Additive); + CurrentScene = scene; yield return null; - SceneManager.LoadScene((int)Scenes.InGameUI, LoadSceneMode.Additive); + SceneManager.LoadScene((int)SceneEnum.InGameUI, LoadSceneMode.Additive); yield return null; SceneManager.SetActiveScene(SceneManager.GetSceneByBuildIndex((int)scene)); yield return null; - MatchManager.LoadMatchRules(0); - MatchManager.LoadArenaProperties(0); + MatchManager.LoadMatchRules(TestSceneRule); + MatchManager.LoadArenaProperties(TestSceneArena); MatchManager.AssignMatchObjects(); - PlayerManager.LocalMatchJoinPlayers(MatchManager.ArenaProperties.minPlayerCount); + PlayerManager.LocalMatchJoinPlayers(MatchManager.ArenaProperties.minPlayerCount, + MatchManager.ArenaProperties.maxPlayerCount); foreach (Player p in PlayerManager.MatchPlayers) { CharacterManager.AssignShipFixed(p); @@ -279,7 +291,7 @@ namespace Managers /// The method which will be executed /// once the scene is loaded. /// The scene which will trigger the method when loaded. - public void SingleUseSceneLoadedMethodCaller(CustomOnSceneLoaded method, Scenes sceneEnum) + public void SingleUseSceneLoadedMethodCaller(CustomOnSceneLoaded method, SceneEnum sceneEnum) { // This is used because SceneManager.sceneLoaded only passes ref and loadMode. // I want add the sceneEnum to this, to check if the the sceneLoaded event @@ -354,14 +366,31 @@ namespace Managers /// List the loaded prefabs will be added to public static void LoadPrefabsFromBundle(string name, in List prefabList) { - var audioAssetBundle = AssetBundle.LoadFromFile(Path.Combine(Application.streamingAssetsPath, name)); - if (audioAssetBundle == null) +#if !UNITY_WEBGL + AssetBundle assetBundle = AssetBundle.LoadFromFile(Path.Combine(Application.streamingAssetsPath, name)); +#else + string uri = "file:///" + Application.dataPath + "/AssetBundles/" + name; + UnityWebRequest request + = UnityWebRequestAssetBundle.GetAssetBundle(uri, 0); + request.SendWebRequest(); + while (!request.isDone) + { + // Yeah I know 🤡 + // But I will explain myself: + // I want these resources loaded, they are required for the game to run at all. + // When using WebGL or running on Android, I cannot get AssetBundles from disk without + // UnityWebRequest. I would have to use addressables and that would be too much time cost + // right now! + } + AssetBundle assetBundle = DownloadHandlerAssetBundle.GetContent(request); +#endif + if (assetBundle == null) { Log.Error("Failed to load arenas asset bundle!"); return; } List gos = new List(); - gos.AddRange(audioAssetBundle.LoadAllAssets()); + gos.AddRange(assetBundle.LoadAllAssets()); foreach (GameObject go in gos) { @@ -402,16 +431,31 @@ namespace Managers /// /// Name of the asset bundle /// List the loaded prefabs will be added to - public static void LoadAssetsFromBundle(string name, in List prefabList) - where T : UnityEngine.Object + public static void LoadAssetsFromBundle(string name, in List assetsList) where T : UnityEngine.Object { - var arenasAssetBundle = AssetBundle.LoadFromFile(Path.Combine(Application.streamingAssetsPath, name)); - if (arenasAssetBundle == null) +#if !UNITY_WEBGL + var assetBundle = AssetBundle.LoadFromFile(Path.Combine(Application.streamingAssetsPath, name)); +#else + string uri = "file:///" + Application.dataPath + "/AssetBundles/" + name; + UnityWebRequest request + = UnityWebRequestAssetBundle.GetAssetBundle(uri, 0); + while (!request.isDone) + { + // Yeah I know 🤡 + // But I will explain myself: + // I want these resources loaded, they are required for the game to run at all. + // When using WebGL or running on Android, I cannot get AssetBundles from disk without + // UnityWebRequest. I would have to use addressables and that would be too much time cost + // right now! + } + AssetBundle assetBundle = DownloadHandlerAssetBundle.GetContent(request); +#endif + if (assetBundle == null) { Log.Error("Failed to load arenas asset bundle!"); return; } - prefabList.AddRange(arenasAssetBundle.LoadAllAssets()); + assetsList.AddRange(assetBundle.LoadAllAssets()); } } @@ -424,12 +468,12 @@ namespace Managers public class SceneLoadEventArgs : EventArgs { - public SceneLoadEventArgs(Scenes sceneEnum, Scene sceneRef) + public SceneLoadEventArgs(SceneEnum sceneEnum, Scene sceneRef) { SceneEnum = sceneEnum; SceneRef = sceneRef; } - public Scenes SceneEnum { get; set; } + public SceneEnum SceneEnum { get; set; } public Scene SceneRef { get; set; } } diff --git a/Assets/Scripts/Managers/MatchManager.cs b/Assets/Scripts/Managers/MatchManager.cs index c217d26..f2657b2 100644 --- a/Assets/Scripts/Managers/MatchManager.cs +++ b/Assets/Scripts/Managers/MatchManager.cs @@ -8,8 +8,6 @@ using UnityEditor; using UnityEngine; using GameLogic; using System.Threading.Tasks; -using System.Text.RegularExpressions; -using Unity.VisualScripting; using System.Linq; /// @@ -64,6 +62,7 @@ namespace Managers public GameObject MatchArena; public GameObject MatchCamera; + public SceneEnum MatchScene; public event Action OnStartPressed; /// @@ -149,7 +148,8 @@ namespace Managers if (p.character.shipName == update.Ship.props.shipName) { updatedPlayer = p; - Log.Debug($"Players: {p.name} match statistic will be updated."); + Log.Debug($"Players: {p.playerName}'s match statistic will be updated."); + break; } } if (updatedPlayer == null) @@ -168,13 +168,27 @@ namespace Managers { Log.Info("Match has ended, winner will be declared."); AnnounceMatchWinner(CurrentMatchResult); + return; } - else + if (CurrentMatchResult.IsRoundWon) { Log.Info($"Round {CurrentMatchResult.RoundsPlayed} of {MatchRule.rounds} has ended." + $"{CurrentMatchResult.Winner?.playerName} won this round."); AnnounceRoundWinner(CurrentMatchResult); } + else + { + foreach (var mps in MatchPlayerStatistics) + { + if (mps.Value.IsOut) + { + MatchCamera.GetComponent().RemoveCharacter(mps.Key.spawnedCharacter); + mps.Key.spawnedCharacter.TryGetComponent(out Ship ship); + ship.state.IsFrozen = true; + ship.boostUI.SetIsOut(mps.Key); + } + } + } } @@ -255,12 +269,12 @@ namespace Managers await Tween.Delay(2f * 0.66f); UIManager.G.ShowMatchEndMenu(MatchArena.transform); - MatchCamera.SetActive(false); + MatchCamera.GetComponent().enabled = false; } async public void StartRematch() { - MatchCamera.SetActive(true); + MatchCamera.GetComponent().enabled = true; ResetMatch(); UIManager.G.Announcments.QueueAnnounceText("Starting rematch.", 0.3f); @@ -278,9 +292,10 @@ namespace Managers async public void AnnounceRoundWinner(GameResult mr) { var winnerStats = MatchPlayerStatistics[mr.Winner]; + // TODO: Confusing UIManager.G.Announcments.QueueAnnounceText($"{mr.Winner.playerName}" + " has won the Round! \n" + - $"They won {winnerStats.RoundsWon} out of {MatchRule.rounds}.", + $"They won {winnerStats.RoundsWon} rounds \n need {MatchRule.rounds} to win.", 3f); await Tween.Delay(3f * 0.33f); @@ -388,7 +403,7 @@ namespace Managers { ContinueMatch(); UIManager.G.HidePauseMenu(); - MatchCamera.SetActive(true); + MatchCamera.GetComponent().enabled = true; return; } if (matchState != MatchState.Match) @@ -397,8 +412,8 @@ namespace Managers return; } matchState = MatchState.Pause; - UIManager.G.ShowPauseMenu(MatchArena.transform); - MatchCamera.SetActive(false); + UIManager.G.ShowPauseMenu(MatchCamera.transform); + MatchCamera.GetComponent().enabled = false; } async private void ContinueMatch() @@ -428,6 +443,10 @@ namespace Managers shipGO.TryGetComponent(out Ship ship); shipGO.TryGetComponent(out Rigidbody body); + ship.boostUI.SetIsIn(mp); + MatchCamera.GetComponent().AddCharacter(shipGO); + ship.state.IsFrozen = false; + ship.state.boostCapacity = ship.props.maxBoostCapacity; body.velocity = Vector3.zero; diff --git a/Assets/Scripts/Managers/PlayerManager.cs b/Assets/Scripts/Managers/PlayerManager.cs index a57dd59..ed4949b 100644 --- a/Assets/Scripts/Managers/PlayerManager.cs +++ b/Assets/Scripts/Managers/PlayerManager.cs @@ -1,14 +1,9 @@ -using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Runtime.InteropServices.WindowsRuntime; -using System.Xml.Serialization; using log4net; -using Unity.VisualScripting; using UnityEngine; using UnityEngine.InputSystem; -using UnityEngine.Video; namespace Managers { @@ -51,7 +46,7 @@ namespace Managers /// add them to the player list. /// /// Minimum number of players - public void LocalMatchJoinPlayers(int minPlayers) + public void LocalMatchJoinPlayers(int minPlayers, int maxPlayers) { if (MatchPlayers.Count < minPlayers) { @@ -60,6 +55,10 @@ namespace Managers CreateLocalPlayer(i + 1); } } + if (MatchPlayers.Count > maxPlayers) + { + MatchPlayers.RemoveRange(maxPlayers, MatchPlayers.Count - maxPlayers); + } } /// @@ -101,7 +100,7 @@ namespace Managers public void OnPlayerJoined(PlayerInput pi) { - cameraOperator.AddPlayer(pi.gameObject); + cameraOperator.AddCharacter(pi.gameObject); } } diff --git a/Assets/Scripts/Managers/UIManager.cs b/Assets/Scripts/Managers/UIManager.cs index 8147d1d..63946de 100644 --- a/Assets/Scripts/Managers/UIManager.cs +++ b/Assets/Scripts/Managers/UIManager.cs @@ -107,9 +107,10 @@ namespace Managers Ship s = p.spawnedCharacter.GetComponent(); s.boostUI = hUD.boostCapacities[p.playerNumber - 1].GetComponent(); s.boostUI.SetPlayerName(p); - hUD.boostCapacities[p.playerNumber - 1].gameObject.SetActive(true); + s.boostUI.gameObject.SetActive(true); } - MatchMusic = AudioManager.G.GetGlobalSound("match_music", 1, true); + // TODO: This belongs somewhere? + MatchMusic = AudioManager.G.GetGlobalSoundRandom("match_music", true); MatchMusic.PlayAudio(true); } diff --git a/Assets/Scripts/MatchLogic.cs b/Assets/Scripts/MatchLogic.cs index 56ea836..d62f3aa 100644 --- a/Assets/Scripts/MatchLogic.cs +++ b/Assets/Scripts/MatchLogic.cs @@ -80,7 +80,6 @@ namespace GameLogic public void UpdateGameResult(Dictionary mps, MatchRule rules) { int outPlayers = mps.Count(p => p.Value.IsOut); - // TODO: blatant error here right now if (outPlayers == mps.Count - 1) { Winner = mps.First(p => p.Value.IsOut != true).Key; @@ -96,7 +95,7 @@ namespace GameLogic foreach (Player p in mps.Keys) { - if (mps[p].RoundsWon > rules.rounds / 2) + if (mps[p].RoundsWon == rules.rounds) { IsMatchWon = true; Winner = p; @@ -105,17 +104,13 @@ namespace GameLogic } } - if (RoundsPlayed == rules.rounds) + if (IsRoundWon) { - IsMatchWon = true; - Winner = mps.Aggregate((p1, p2) => - p1.Value.RoundsWon > p2.Value.RoundsWon ? p1 : p2).Key; - Opponents = mps.Keys.Where(player => player != Winner).ToList(); - return; - } - foreach (var statistic in mps.Values) - { - statistic.IsOut = false; + foreach (var statistic in mps.Values) + { + statistic.IsOut = false; + } + } } } diff --git a/Assets/Scripts/UI/BoostCapacityUI.cs b/Assets/Scripts/UI/BoostCapacityUI.cs index 73d9dc2..1b311a9 100644 --- a/Assets/Scripts/UI/BoostCapacityUI.cs +++ b/Assets/Scripts/UI/BoostCapacityUI.cs @@ -7,12 +7,11 @@ using UnityEngine.UI; /// public class BoostCapacityUI : MonoBehaviour { - public Color goodColor = Color.green; - public Color criticalColor = Color.red; - [SerializeField] private int playerNumber = 0; [SerializeField] private Image fillImage; + [SerializeField] private Sprite fillSpriteGood; + [SerializeField] private Sprite fillSpriteWarn; [SerializeField] private TextMeshProUGUI hint; - private float minBoostRatio = 0.3f; + private float minBoostRatio = 0.5f; /// /// Ratio of capacity to max capacity under which the @@ -26,7 +25,18 @@ public class BoostCapacityUI : MonoBehaviour public void SetPlayerName(Player p) { - hint.SetText($"{p.character.shipName} \n {p.playerName}"); + hint.SetText($"{p.playerName}\n{p.character.shipName}"); + } + + public void SetIsOut(Player p) + { + hint.SetText($"{p.playerName}\nOUT!"); + UpdateFill(0); + } + public void SetIsIn(Player p) + { + SetPlayerName(p); + //UpdateFill(1); } /// @@ -36,13 +46,13 @@ public class BoostCapacityUI : MonoBehaviour public void UpdateFill(float fill) { fillImage.fillAmount = fill; - if (fillImage.fillAmount <= minBoostRatio) + if (fill <= minBoostRatio) { - fillImage.color = criticalColor; + fillImage.sprite = fillSpriteWarn; } else { - fillImage.color = goodColor; + fillImage.sprite = fillSpriteGood; } } } diff --git a/Assets/Scripts/UI/JoinPrompt.cs b/Assets/Scripts/UI/JoinPrompt.cs index fc0ea59..1093813 100644 --- a/Assets/Scripts/UI/JoinPrompt.cs +++ b/Assets/Scripts/UI/JoinPrompt.cs @@ -12,6 +12,7 @@ public class JoinPrompt : MonoBehaviour public void PromptInput(Player player) { this.player = player; + textMesh.text = $"{player.playerName} \n \n To join press\n any button"; ControlsManager.G.PlayerControlAssigned += (o, playerControl) => PromptFinished(playerControl); } diff --git a/Assets/Scripts/UI/MatchEndMenu.cs b/Assets/Scripts/UI/MatchEndMenu.cs index a41798a..4ef26cd 100644 --- a/Assets/Scripts/UI/MatchEndMenu.cs +++ b/Assets/Scripts/UI/MatchEndMenu.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Reflection; using log4net; using Managers; +using PrimeTween; using SlimUI.ModernMenu; using UnityEngine; using UnityEngine.EventSystems; @@ -29,12 +30,25 @@ public class MatchEndMenu : MonoBehaviour public void Show(Transform transform) { - gameObject.transform.position = transform.position; - gameObject.transform.rotation = transform.rotation; + gameObject.transform.SetPositionAndRotation( + transform.position, + transform.rotation); Canvas.enabled = true; - Camera.transform.position = MatchManager.G.MatchCamera.transform.position; - Camera.transform.rotation = MatchManager.G.MatchCamera.transform.rotation; + + Vector3 centeredPosition = Camera.transform.position; + Quaternion centeredRotation = Camera.transform.rotation; + + Camera.transform.SetPositionAndRotation( + MatchManager.G.MatchCamera.transform.position, + MatchManager.G.MatchCamera.transform.rotation); + Camera.SetActive(true); + + Sequence.Create() + .Group(Tween.Position(Camera.transform, centeredPosition, 1f)) + .Group(Tween.Rotation(Camera.transform, centeredRotation, 1f)); + + UIEventSystem.SetActive(true); MenuButtons.SetActive(true); eventSystem.SetSelectedGameObject(FocusButtonRematch, null); @@ -50,6 +64,7 @@ public class MatchEndMenu : MonoBehaviour public void OnRematch() { MatchManager.G.StartRematch(); + UIManager.G.hUD?.Show(); Hide(); } @@ -62,13 +77,14 @@ public class MatchEndMenu : MonoBehaviour private IEnumerator StartSceneTransition() { Canvas.enabled = false; - SceneManager.LoadScene((int)Scenes.MainMenu, LoadSceneMode.Additive); + SceneManager.LoadScene((int)SceneEnum.MainMenu, LoadSceneMode.Additive); yield return new WaitForSeconds(0.2f); GameObject menu = GameObject.Find("Main Menu Camera"); if (menu != null && menu.TryGetComponent(out SlimUIMainMenu menuScript)) { UIManager.G.HideHUD(); - menuScript.MenuTransition(Camera.GetComponent().transform); + menuScript.MenuTransition(Camera.GetComponent().transform, + GameManager.G.CurrentScene); } else { diff --git a/Assets/Scripts/UI/PauseMenu.cs b/Assets/Scripts/UI/PauseMenu.cs index 38dfc48..389f14a 100644 --- a/Assets/Scripts/UI/PauseMenu.cs +++ b/Assets/Scripts/UI/PauseMenu.cs @@ -31,11 +31,10 @@ public class PauseMenu : MonoBehaviour public void Show(Transform transform) { - gameObject.transform.position = transform.position; - gameObject.transform.rotation = transform.rotation; + gameObject.transform.SetPositionAndRotation( + transform.position, + transform.rotation); Canvas.enabled = true; - Camera.transform.position = MatchManager.G.MatchCamera.transform.position; - Camera.transform.rotation = MatchManager.G.MatchCamera.transform.rotation; Camera.SetActive(true); UIEventSystem.SetActive(true); PauseMenuButtons.SetActive(true); @@ -64,13 +63,14 @@ public class PauseMenu : MonoBehaviour private IEnumerator StartSceneTransition() { Canvas.enabled = false; - SceneManager.LoadScene((int)Scenes.MainMenu, LoadSceneMode.Additive); + SceneManager.LoadScene((int)SceneEnum.MainMenu, LoadSceneMode.Additive); yield return new WaitForSeconds(0.2f); GameObject menu = GameObject.Find("Main Menu Camera"); if (menu != null && menu.TryGetComponent(out SlimUIMainMenu menuScript)) { UIManager.G.HideHUD(); - menuScript.MenuTransition(Camera.GetComponent().transform); + menuScript.MenuTransition(Camera.GetComponent().transform, + GameManager.G.CurrentScene); } else { diff --git a/Assets/Shaders/URP_PBRLitRipples.shader b/Assets/Shaders/URP_PBRLitRipples.shader index e7aafeb..62363eb 100644 --- a/Assets/Shaders/URP_PBRLitRipples.shader +++ b/Assets/Shaders/URP_PBRLitRipples.shader @@ -103,8 +103,6 @@ Shader "CustomShaders/GlossyPBRRipples" { half _ClearCoatSmoothness; CBUFFER_END - // This section has the definitions for spawning multiple ripples on the surface. - // The maximum is hard set to five right now. half _ShaderTime; half _SpikeEase(half x){ @@ -141,8 +139,11 @@ Shader "CustomShaders/GlossyPBRRipples" { Name "ForwardLit" Tags { "LightMode"="UniversalForward" "RenderType" = "Transparent" - "Queue"="Transparent" + "Queue"="Transparent" } + + ZTest LEqual + ZWrite Off Blend One OneMinusSrcAlpha @@ -288,7 +289,7 @@ Shader "CustomShaders/GlossyPBRRipples" { _RippleAmplitudes[i], _RippleStartTimes[i], _RippleDurations[i]); - IN.positionOS.xyz += IN.normalOS * ripple_displacement; + IN.positionOS += IN.normalOS * ripple_displacement; #if _MANUAL_RIPPLE ripple_displacement += _ComputeManualRipple(IN.positionOS.xyz, @@ -298,7 +299,7 @@ Shader "CustomShaders/GlossyPBRRipples" { _ManualRippleDensity, _ManualRippleAmplitude, _ManualRippleAnim); - IN.positionOS.xyz += IN.normalOS * ripple_displacement; + IN.positionOS += IN.normalOS * ripple_displacement; #endif // if _TestRipple diff --git a/Assets/SkySeries Freebie/FreebieHdri/PlanetaryEarth4k.hdr.meta b/Assets/SkySeries Freebie/FreebieHdri/PlanetaryEarth4k.hdr.meta index f07d334..6b53f80 100644 --- a/Assets/SkySeries Freebie/FreebieHdri/PlanetaryEarth4k.hdr.meta +++ b/Assets/SkySeries Freebie/FreebieHdri/PlanetaryEarth4k.hdr.meta @@ -1,11 +1,12 @@ fileFormatVersion: 2 guid: 3675d0c3c874f6b479bab57eb7e68c90 -timeCreated: 1513181457 -licenseType: Store TextureImporter: - fileIDToRecycleName: - 8900000: generatedCubemap - serializedVersion: 4 + internalIDToNameTable: + - first: + 89: 8900000 + second: generatedCubemap + externalObjects: {} + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -13,6 +14,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,7 +23,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -28,10 +36,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -40,38 +51,93 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 2 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Standalone + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] - spritePackingTag: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MainMenuCam.controller b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MainMenuCam.controller index 5a4e3e3..710f02e 100644 --- a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MainMenuCam.controller +++ b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MainMenuCam.controller @@ -1,5 +1,82 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8578602902800555225 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: BackToIdle + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102000013453325910} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-7256240611029464102 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LobbyToMain + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8578602902800555225} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 1539a9b40b69b154cbd453d5d0a52f4c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-801132523892439263 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: BackToIdleTrigger + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7256240611029464102} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -9,12 +86,18 @@ AnimatorController: m_Name: MainMenuCam serializedVersion: 5 m_AnimatorParameters: - - m_Name: Animate - m_Type: 1 + - m_Name: BackToIdleTrigger + m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: BackToIdle + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 1 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -28,132 +111,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &1101000011363516390 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 4 - m_ConditionEvent: Animate - m_EventTreshold: 0.5 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102000011105936396} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.6121902 - m_TransitionOffset: 0 - m_ExitTime: 0.08540394 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101000012277135804 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102000013453325910} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.106870145 - m_TransitionOffset: 1.6111782 - m_ExitTime: 0.4124761 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101000013721245820 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 3 - m_ConditionEvent: Animate - m_EventTreshold: 0.5 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102000010031421648} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.39605603 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &1102000010031421648 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: MenuCamPos1 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101000011363516390} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: b76126072d190ec48a87cfb4172e4f3f, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102000011105936396 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: MenuCamPos2 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101000012277135804} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 31c7aa033cec5e24ea90edc627167f6c, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &1102000013453325910 AnimatorState: serializedVersion: 6 @@ -164,8 +121,7 @@ AnimatorState: m_Name: MenuCamIdle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101000013721245820} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -190,22 +146,184 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102000010031421648} - m_Position: {x: 270, y: -10, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102000011105936396} - m_Position: {x: 520, y: 50, z: 0} - serializedVersion: 1 m_State: {fileID: 1102000013453325910} - m_Position: {x: 270, y: 120, z: 0} + m_Position: {x: 200, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6524286288309831991} + m_Position: {x: -40, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7256240611029464102} + m_Position: {x: -40, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8128414424818317656} + m_Position: {x: 470, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3137385165257022253} + m_Position: {x: 470, y: 120, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 48, y: 24, z: 0} - m_EntryPosition: {x: 40, y: 130, z: 0} + m_AnyStatePosition: {x: 290, y: -90, z: 0} + m_EntryPosition: {x: 220, y: 210, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1102000013453325910} +--- !u!1102 &3137385165257022253 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SettingsToMain + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6678422832963957900} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 31c7aa033cec5e24ea90edc627167f6c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &6524286288309831991 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FlyToLobby + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -801132523892439263} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: b645752c43fd1f34fb7f7dc64918aa24, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6678422832963957900 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: BackToIdle + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102000013453325910} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0.0033246914 + m_ExitTime: 1.0013385 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &8062426104988877161 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: BackToIdleTrigger + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7256240611029464102} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.3763342 + m_TransitionOffset: 0.071253546 + m_ExitTime: 0.19944894 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &8128414424818317656 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FlyToSettings + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8395507218130684741} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: b76126072d190ec48a87cfb4172e4f3f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8395507218130684741 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: BackToIdleTrigger + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3137385165257022253} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.00000004381102 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamIdle.anim b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamIdle.anim index aa86714..851418f 100644 Binary files a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamIdle.anim and b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamIdle.anim differ diff --git a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos1.anim b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos1.anim index f67666f..b980f87 100644 --- a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos1.anim +++ b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos1.anim @@ -19,7 +19,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 360} + value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -27,22 +27,13 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.21666667 - value: {x: 0.82436454, y: 40.885445, z: 359.41666} - inSlope: {x: -6.393165, y: 199.56163, z: -5.1205325} - outSlope: {x: -6.393165, y: 199.56163, z: -5.1205325} + time: 0.8333333 + value: {x: 0, y: 70.613, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.07919187, z: 0.07050497} - - serializedVersion: 3 - time: 0.71666664 - value: {x: -0.95400006, y: 72.325005, z: 358.345} - inSlope: {x: 0, y: 2.5265267, z: 0} - outSlope: {x: 0, y: 2.5265267, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.16939403, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -54,25 +45,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.00000348383, y: -0.00000033424934, z: -0.000010895799} - inSlope: {x: 0, y: 0, z: -1.0298092} - outSlope: {x: 0, y: 0, z: -1.0298092} + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.21666667 - value: {x: 3.7068954, y: -1.2468567, z: -20.477808} - inSlope: {x: 11.372988, y: -5.5485106, z: -15.308612} - outSlope: {x: 11.372988, y: -5.5485106, z: -15.308612} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.13999994, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.71666664 - value: {x: 5.499524, y: -2.4446285, z: -24.067497} + time: 0.8333333 + value: {x: 21.9, y: -2.09, z: -20.24} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -117,7 +99,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.71666664 + m_StopTime: 0.8333333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -139,28 +121,19 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.00000348383 + value: 0 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.21666667 - value: 3.7068954 - inSlope: 11.372988 - outSlope: 11.372988 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.13999994 - - serializedVersion: 3 - time: 0.71666664 - value: 5.499524 + time: 0.8333333 + value: 21.9 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -171,35 +144,26 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - flags: 16 + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: -0.00000033424934 + value: 0 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.21666667 - value: -1.2468567 - inSlope: -5.5485106 - outSlope: -5.5485106 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.71666664 - value: -2.4446285 + time: 0.8333333 + value: -2.09 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -210,35 +174,26 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - flags: 16 + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: -0.000010895799 - inSlope: -1.0298092 - outSlope: -1.0298092 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: -20.477808 - inSlope: -15.308612 - outSlope: -15.308612 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.71666664 - value: -24.067497 + value: 0 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -20.24 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -249,7 +204,7 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - flags: 16 + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -259,25 +214,16 @@ AnimationClip: value: 0 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.21666667 - value: 0.82436454 - inSlope: -6.393165 - outSlope: -6.393165 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.71666664 - value: -0.95400006 + time: 0.8333333 + value: 0 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -288,7 +234,7 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - flags: 16 + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -298,27 +244,18 @@ AnimationClip: value: 0 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.21666667 - value: 40.885445 - inSlope: 199.56163 - outSlope: 199.56163 - tangentMode: 0 + time: 0.8333333 + value: 70.613 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.07919187 - - serializedVersion: 3 - time: 0.71666664 - value: 72.325005 - inSlope: 2.5265267 - outSlope: 2.5265267 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.16939403 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -327,35 +264,26 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - flags: 16 + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 360 + value: 0 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.21666667 - value: 359.41666 - inSlope: -5.1205325 - outSlope: -5.1205325 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.07050497 - - serializedVersion: 3 - time: 0.71666664 - value: 358.345 + time: 0.8333333 + value: 0 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -366,7 +294,7 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - flags: 16 + flags: 0 m_EulerEditorCurves: - serializedVersion: 2 curve: diff --git a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos2.anim b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos2.anim index 1246feb..7fd82e8 100644 Binary files a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos2.anim and b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos2.anim differ diff --git a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos3.anim b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos3.anim new file mode 100644 index 0000000..adb27f8 --- /dev/null +++ b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos3.anim @@ -0,0 +1,337 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MenuCamPos3 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: -1.748, y: -69.367, z: 0.811} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: -22.43, y: -2.74, z: -18.67} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -22.43 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -2.74 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -18.67 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -1.748 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -69.367 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.811 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos3.anim.meta b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos3.anim.meta new file mode 100644 index 0000000..7bba812 --- /dev/null +++ b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos3.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b645752c43fd1f34fb7f7dc64918aa24 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos4.anim b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos4.anim new file mode 100644 index 0000000..79c440f --- /dev/null +++ b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos4.anim @@ -0,0 +1,337 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MenuCamPos4 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -1.748, y: -69.367, z: 0.811} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -22.29, y: -2.74, z: -18.71} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0.00000348383, y: -0.00000033424934, z: -0.000010895799} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -22.29 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.00000348383 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.74 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -0.00000033424934 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -18.71 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -0.000010895799 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.748 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -69.367 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.811 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos4.anim.meta b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos4.anim.meta new file mode 100644 index 0000000..2110477 --- /dev/null +++ b/Assets/SlimUI/Modern Menu 1/Animations/Camera/MenuCamPos4.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1539a9b40b69b154cbd453d5d0a52f4c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SlimUI/Modern Menu 1/Prefabs/Buttons/Btn_MainMenu.prefab b/Assets/SlimUI/Modern Menu 1/Prefabs/Buttons/Btn_MainMenu.prefab index 3fc132d..7a33079 100644 --- a/Assets/SlimUI/Modern Menu 1/Prefabs/Buttons/Btn_MainMenu.prefab +++ b/Assets/SlimUI/Modern Menu 1/Prefabs/Buttons/Btn_MainMenu.prefab @@ -81,7 +81,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: Local Match (2v2) m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} m_sharedMaterial: {fileID: -7766214204018960760, guid: 3c4448e26b9824f499067d5cba19c732, type: 2} @@ -108,7 +108,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 + m_fontSize: 45.55 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -212,7 +212,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.53922683, b: 0, a: 1} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/SlimUI/Modern Menu 1/Scripts/Managers/SlimUIMainMenu.cs b/Assets/SlimUI/Modern Menu 1/Scripts/Managers/SlimUIMainMenu.cs index 6cc88ab..1b5e79c 100644 --- a/Assets/SlimUI/Modern Menu 1/Scripts/Managers/SlimUIMainMenu.cs +++ b/Assets/SlimUI/Modern Menu 1/Scripts/Managers/SlimUIMainMenu.cs @@ -15,10 +15,12 @@ namespace SlimUI.ModernMenu public class SlimUIMainMenu : MonoBehaviour { private static readonly ILog Log = LogManager.GetLogger(typeof(SlimUIMainMenu)); - private Animator CameraObject; + private Animator CameraAnimator; private event EventHandler CustomSceneLoaded; private GameManager GM; private ManageableAudio MainMenuMusic; + private int RuleIndex; + private int ArenaIndex; // campaign button sub menu [Header("MENUS")] @@ -90,6 +92,10 @@ namespace SlimUI.ModernMenu [Tooltip("The GameObject holding the Audio Source component for the SWOOSH SOUND when switching to the Settings Screen")] public AudioSource swooshSound; + [Header("VFX")] + [Tooltip("Particle system for volumetric stars in the main menu")] + public GameObject starParticles; + void Awake() { SceneManager.activeSceneChanged += CameraOnSceneActive; @@ -98,7 +104,8 @@ namespace SlimUI.ModernMenu void Start() { GM = GameManager.G; - CameraObject = transform.GetComponent(); + CameraAnimator = transform.GetComponent(); + CameraAnimator.Play("MenuCamIdle"); playMenu.SetActive(false); exitMenu.SetActive(false); if (extrasMenu) extrasMenu.SetActive(false); @@ -156,6 +163,20 @@ namespace SlimUI.ModernMenu exitMenu.SetActive(false); } + public void Local1v1MatchButtonClick() + { + LoadLocalMatch(3, 0, 0); + } + public void Local2v2MatchButtonClick() + { + LoadLocalMatch(3, 0, 1); + } + + public void LocalFreeFlightButtonClick() + { + LoadLocalMatch(4, 1, 2); + } + /// /// Currently starts loading a scene from the availabe scene enums, /// asynchronously. @@ -164,16 +185,19 @@ namespace SlimUI.ModernMenu /// the match start routine in the GameManager. /// /// The scene id which will be loaded (see Scenes enum) - public void LoadLocalScene(int sceneId) + public void LoadLocalMatch(int sceneId, int ruleIndex, int arenaIndex) { + RuleIndex = ruleIndex; + ArenaIndex = arenaIndex; if (GM != null) { - if (((Scenes)sceneId).ToString() == "Arena") + // Playable scenes come after ID 3 in the build order + if (sceneId >= 3) { - GM.SingleUseSceneLoadedMethodCaller(LocalArenaTransition, Scenes.Arena); + GM.SingleUseSceneLoadedMethodCaller(LocalArenaTransition, (SceneEnum)sceneId); } } - StartCoroutine(LoadAsynchronously((Scenes)sceneId)); + LoadAsynchronously((SceneEnum)sceneId); } /// @@ -188,12 +212,12 @@ namespace SlimUI.ModernMenu { if (GM != null) { - if (((Scenes)sceneId).ToString() == "Arena") + if (sceneId >= 3) { - GM.SingleUseSceneLoadedMethodCaller(OnlineArenaTransition, Scenes.Arena); + GM.SingleUseSceneLoadedMethodCaller(OnlineArenaTransition, (SceneEnum)sceneId); } } - StartCoroutine(LoadAsynchronously((Scenes)sceneId)); + LoadAsynchronously((SceneEnum)sceneId); } /// @@ -205,7 +229,9 @@ namespace SlimUI.ModernMenu private void LocalArenaTransition(SceneLoadEventArgs args) { SceneManager.SetActiveScene(args.SceneRef); + GameManager.G.CurrentScene = args.SceneEnum; Log.Info("Camera will fly to scene: " + args.SceneRef.name); + starParticles.SetActive(false); GameObject target = GameObject.Find("Match Camera"); if (target != null) { @@ -245,7 +271,9 @@ namespace SlimUI.ModernMenu private void OnlineArenaTransition(SceneLoadEventArgs args) { SceneManager.SetActiveScene(args.SceneRef); + GameManager.G.CurrentScene = args.SceneEnum; Log.Info("Camera will fly to scene: " + args.SceneRef.name); + starParticles.SetActive(false); GameObject target = GameObject.Find("Match Camera"); if (target != null) { @@ -280,9 +308,9 @@ namespace SlimUI.ModernMenu /// Defines a delegate which animates a camera flight and /// gives it to the game manager to execute once the scene is loaded. /// - /// The scene which when loaded triggers the event + - /// delegate execution - public void MenuTransition(Transform cameraTransform) + /// The camera which will fly the transition + /// The scene which is unloaded after the transition + public void MenuTransition(Transform cameraTransform, SceneEnum unloadScene) { Log.Info("Camera will fly to the main menu scene"); optionsCanvas.SetActive(false); @@ -294,10 +322,10 @@ namespace SlimUI.ModernMenu .Group(Tween.Rotation(cameraTransform, target.transform.rotation, 2f)) .ChainCallback(() => { - SceneManager.SetActiveScene(SceneManager.GetSceneByBuildIndex((int)Scenes.MainMenu)); + SceneManager.SetActiveScene(SceneManager.GetSceneByBuildIndex((int)SceneEnum.MainMenu)); optionsCanvas.SetActive(true); - SceneManager.UnloadSceneAsync((int)Scenes.InGameUI); - SceneManager.UnloadSceneAsync((int)Scenes.Arena); + SceneManager.UnloadSceneAsync((int)SceneEnum.InGameUI); + SceneManager.UnloadSceneAsync((int)unloadScene); }); } else @@ -315,7 +343,7 @@ namespace SlimUI.ModernMenu private IEnumerator SwitchToLocalInGameScene() { MainMenuMusic.FadeOutAudio(2, true); - AsyncOperation o = SceneManager.LoadSceneAsync((int)Scenes.InGameUI, + AsyncOperation o = SceneManager.LoadSceneAsync((int)SceneEnum.InGameUI, LoadSceneMode.Additive); while (!o.isDone) @@ -323,8 +351,8 @@ namespace SlimUI.ModernMenu yield return false; } yield return new WaitForSeconds(0.1f); - yield return StartCoroutine(GM.SetupLocalMatchFromMainMenu()); - SceneManager.UnloadSceneAsync((int)Scenes.MainMenu); + yield return StartCoroutine(GM.SetupLocalMatchFromMainMenu(RuleIndex, ArenaIndex)); + SceneManager.UnloadSceneAsync((int)SceneEnum.MainMenu); } /// @@ -336,7 +364,7 @@ namespace SlimUI.ModernMenu private IEnumerator SwitchToOnlineInGameScene() { MainMenuMusic.FadeOutAudio(2, true); - AsyncOperation o = SceneManager.LoadSceneAsync((int)Scenes.InGameUI, + AsyncOperation o = SceneManager.LoadSceneAsync((int)SceneEnum.InGameUI, LoadSceneMode.Additive); while (!o.isDone) @@ -345,23 +373,28 @@ namespace SlimUI.ModernMenu } yield return new WaitForSeconds(0.1f); yield return StartCoroutine(GM.SetupOnlineMatchFromMainMenu()); - SceneManager.UnloadSceneAsync((int)Scenes.MainMenu); + SceneManager.UnloadSceneAsync((int)SceneEnum.MainMenu); } public void DisablePlayCampaign() { playMenu.SetActive(false); } + public void Position3() + { + DisablePlayCampaign(); + CameraAnimator.Play("FlyToLobby"); + } public void Position2() { DisablePlayCampaign(); - CameraObject.SetFloat("Animate", 1); + CameraAnimator.Play("FlyToSettings"); } public void Position1() { - CameraObject.SetFloat("Animate", 0); + CameraAnimator.SetTrigger("BackToIdleTrigger"); } void DisablePanels() @@ -484,7 +517,7 @@ namespace SlimUI.ModernMenu } // Load Bar syncing animation - IEnumerator LoadAsynchronously(Scenes sceneEnum) + async void LoadAsynchronously(SceneEnum sceneEnum) { AsyncOperation operation = SceneManager.LoadSceneAsync((int)sceneEnum, LoadSceneMode.Additive); @@ -499,10 +532,10 @@ namespace SlimUI.ModernMenu loadProgressText.text = "Loading " + math.round(normProgress * 100).ToString() + "%"; if (progress >= 0.85f) { - yield return Tween.Delay(0.5f).ToYieldInstruction(); + await Tween.Delay(0.5f); operation.allowSceneActivation = true; } - yield return Tween.Delay(0.04f).ToYieldInstruction(); + await Tween.Delay(0.04f); } while (!operation.isDone); } @@ -514,7 +547,7 @@ namespace SlimUI.ModernMenu /// Newly active scene private void CameraOnSceneActive(Scene oldScene, Scene newScene) { - if (newScene == SceneManager.GetSceneByBuildIndex((int)Scenes.MainMenu)) + if (newScene == SceneManager.GetSceneByBuildIndex((int)SceneEnum.MainMenu)) { if (gameObject.TryGetComponent(out Camera camera)) { diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/FiraCode-Bold SDF.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/FiraCode-Bold SDF.asset index 61ab981..225e50b 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/FiraCode-Bold SDF.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/FiraCode-Bold SDF.asset @@ -2750,7 +2750,8 @@ Material: m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - BEVEL_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -2784,7 +2785,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _Ambient: 0.5 + - _Ambient: 1 - _Bevel: 0.5 - _BevelClamp: 0 - _BevelOffset: 0 @@ -2794,7 +2795,7 @@ Material: - _BumpOutline: 0 - _ColorMask: 15 - _CullMode: 0 - - _Diffuse: 0.5 + - _Diffuse: 0.437 - _FaceDilate: 0 - _FaceUVSpeedX: 0 - _FaceUVSpeedY: 0 @@ -2803,7 +2804,7 @@ Material: - _GlowOuter: 0.05 - _GlowPower: 0.75 - _GradientScale: 6 - - _LightAngle: 3.1416 + - _LightAngle: 3.23 - _MaskSoftnessX: 0 - _MaskSoftnessY: 0 - _OutlineSoftness: 0 @@ -2811,7 +2812,7 @@ Material: - _OutlineUVSpeedY: 0 - _OutlineWidth: 0 - _PerspectiveFilter: 0.875 - - _Reflectivity: 10 + - _Reflectivity: 5 - _ScaleRatioA: 0.8333333 - _ScaleRatioB: 0.6770833 - _ScaleRatioC: 0.6770833 @@ -2819,7 +2820,7 @@ Material: - _ScaleY: 1 - _ShaderFlags: 0 - _Sharpness: 0 - - _SpecularPower: 2 + - _SpecularPower: 0 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 @@ -2838,7 +2839,7 @@ Material: m_Colors: - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _FaceColor: {r: 1.319508, g: 1.319508, b: 1.319508, a: 1} - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/UI/BoostBarBorder.png b/Assets/UI/BoostBarBorder.png new file mode 100644 index 0000000..510c611 Binary files /dev/null and b/Assets/UI/BoostBarBorder.png differ diff --git a/Assets/UI/BoostBarBorder.png.meta b/Assets/UI/BoostBarBorder.png.meta new file mode 100644 index 0000000..0d59944 --- /dev/null +++ b/Assets/UI/BoostBarBorder.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 793f7104e438d314196b825a8e6eb54a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 1 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 0 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1 + spriteBorder: {x: 20, y: 20, z: 20, w: 20} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/BoostBarFillGreen.png b/Assets/UI/BoostBarFillGreen.png new file mode 100644 index 0000000..ff9b6e3 Binary files /dev/null and b/Assets/UI/BoostBarFillGreen.png differ diff --git a/Assets/UI/BoostBarFillGreen.png.meta b/Assets/UI/BoostBarFillGreen.png.meta new file mode 100644 index 0000000..6bdc27b --- /dev/null +++ b/Assets/UI/BoostBarFillGreen.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 2494447685b6ad94e914547f7685e6fd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 0 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/BoostBarFillOrange.png b/Assets/UI/BoostBarFillOrange.png new file mode 100644 index 0000000..97d0d1c Binary files /dev/null and b/Assets/UI/BoostBarFillOrange.png differ diff --git a/Assets/UI/BoostBarFillOrange.png.meta b/Assets/UI/BoostBarFillOrange.png.meta new file mode 100644 index 0000000..405ffab --- /dev/null +++ b/Assets/UI/BoostBarFillOrange.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 7a44315aed4063b4bb7cb0091e2e3dcd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/BoostBarFillShadow.png b/Assets/UI/BoostBarFillShadow.png new file mode 100644 index 0000000..a08cec0 Binary files /dev/null and b/Assets/UI/BoostBarFillShadow.png differ diff --git a/Assets/UI/BoostBarFillShadow.png.meta b/Assets/UI/BoostBarFillShadow.png.meta new file mode 100644 index 0000000..efb4357 --- /dev/null +++ b/Assets/UI/BoostBarFillShadow.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: d2e38eb2d19da344597ff1c0e9d68a59 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index be1345d..a0f3c95 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -19,7 +19,7 @@ PhysicsManager: m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 m_LayerCollisionMatrix: ffffffffffffffffffffffff4fffffffd7ffffffe7fffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - m_SimulationMode: 2 + m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 m_InvokeCollisionCallbacks: 1 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index d248808..b550d46 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -17,6 +17,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Arena.unity guid: aef08b83b609dcd499343450af09a6ae + - enabled: 1 + path: Assets/Scenes/FreeFlyArena.unity + guid: 2daa5335e14901d4bbcd312c05395c71 m_configObjects: com.unity.adaptiveperformance.loader_settings: {fileID: 11400000, guid: 4b98f800e99c70140ac675a637d71d3a, type: 2} com.unity.adaptiveperformance.simulator.provider_settings: {fileID: 11400000, guid: ca0b3f0ddb119254a95ed5dd5346429b, type: 2} diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index cb8bb1d..b71b65c 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -38,7 +38,7 @@ Physics2DSettings: m_IslandSolverJointCostScale: 10 m_IslandSolverBodiesPerJob: 50 m_IslandSolverContactsPerJob: 50 - m_SimulationMode: 2 + m_SimulationMode: 0 m_QueriesHitTriggers: 1 m_QueriesStartInColliders: 1 m_CallbacksOnDisable: 1