diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 000000000..1586a4833 --- /dev/null +++ b/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 70407dcc7..34bda1072 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -14,8 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_DefaultGroup: ae971df5c2b654af9a3670c7d1a6fc27 m_BuildRemoteCatalog: 0 + m_BundleLocalCatalog: 0 m_DisableCatalogUpdateOnStart: 0 - m_UniqueBundleIds: 0 + m_UniqueBundleIds: 1 m_RemoteCatalogBuildPath: m_Id: m_RemoteCatalogLoadPath: diff --git a/Assets/scenes/_levels/level_Island/Terrain.meta b/Assets/AddressableAssetsData/Switch.meta similarity index 77% rename from Assets/scenes/_levels/level_Island/Terrain.meta rename to Assets/AddressableAssetsData/Switch.meta index e05ad2612..ea2d99b7c 100644 --- a/Assets/scenes/_levels/level_Island/Terrain.meta +++ b/Assets/AddressableAssetsData/Switch.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f843f542f9d13484b98e281985ec0d7d +guid: 3084b8642a70a124b82bad00ce807e43 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/AddressableAssetsData/Switch/addressables_content_state.bin b/Assets/AddressableAssetsData/Switch/addressables_content_state.bin new file mode 100644 index 000000000..eff2a547c Binary files /dev/null and b/Assets/AddressableAssetsData/Switch/addressables_content_state.bin differ diff --git a/Assets/AddressableAssetsData/Switch/addressables_content_state.bin.meta b/Assets/AddressableAssetsData/Switch/addressables_content_state.bin.meta new file mode 100644 index 000000000..f74bd75d1 --- /dev/null +++ b/Assets/AddressableAssetsData/Switch/addressables_content_state.bin.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bcdfe59358921b54bb2c6ef27d775363 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/InputControls.inputactions b/Assets/Data/InputControls.inputactions index a2adfe9bc..fb8341483 100644 --- a/Assets/Data/InputControls.inputactions +++ b/Assets/Data/InputControls.inputactions @@ -13,14 +13,6 @@ "processors": "AxisDeadzone(min=0.1,max=1)", "interactions": "" }, - { - "name": "Time", - "type": "Value", - "id": "637a3778-b50e-41a0-8669-f7b1698fc4ca", - "expectedControlType": "", - "processors": "AxisDeadzone(min=0.1,max=1)", - "interactions": "" - }, { "name": "Steering", "type": "Value", @@ -387,94 +379,6 @@ "action": "Freeze", "isComposite": false, "isPartOfComposite": false - }, - { - "name": "", - "id": "b7d3341c-7abe-48e6-a68e-b27eb3927b79", - "path": "/buttonNorth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Time", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "Dpad horizontal", - "id": "3c94f068-2cc6-4d07-a76a-3835151e0b0e", - "path": "1DAxis", - "interactions": "", - "processors": "", - "groups": "", - "action": "Time", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "negative", - "id": "aa687506-3f38-4cdc-8f14-f77ce23789d9", - "path": "/dpad/left", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Time", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "positive", - "id": "59cadf6b-f60d-4a7e-9b9c-a21ecfdfb51e", - "path": "/dpad/right", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Time", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Keyboard", - "id": "e8db53d1-5ded-40fe-965b-727f321a403a", - "path": "1DAxis", - "interactions": "", - "processors": "", - "groups": "", - "action": "Time", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "negative", - "id": "d5357c68-6b8a-4c12-996c-801c5a015beb", - "path": "/1", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Time", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "positive", - "id": "9a495693-8098-4d83-b2d6-711526e83c37", - "path": "/2", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Time", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "38dc845f-f219-4b56-947c-542a4cf33da6", - "path": "/primaryTouch/tapCount", - "interactions": "MultiTap", - "processors": "", - "groups": "TouchScreen", - "action": "Time", - "isComposite": false, - "isPartOfComposite": false } ] } diff --git a/Assets/InputSystem.inputsettings.asset b/Assets/InputSystem.inputsettings.asset new file mode 100644 index 000000000..1b236efa7 --- /dev/null +++ b/Assets/InputSystem.inputsettings.asset @@ -0,0 +1,26 @@ +%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: c46f07b5ed07e4e92aa78254188d3d10, type: 3} + m_Name: InputSystem.inputsettings + m_EditorClassIdentifier: + m_SupportedDevices: [] + m_UpdateMode: 1 + m_CompensateForScreenOrientation: 1 + m_FilterNoiseOnCurrent: 0 + m_DefaultDeadzoneMin: 0.125 + m_DefaultDeadzoneMax: 0.925 + m_DefaultButtonPressPoint: 0.5 + m_DefaultTapTime: 0.2 + m_DefaultSlowTapTime: 0.5 + m_DefaultHoldTime: 0.4 + m_TapRadius: 5 + m_MultiTapDelayTime: 0.75 diff --git a/Assets/InputSystem.inputsettings.asset.meta b/Assets/InputSystem.inputsettings.asset.meta new file mode 100644 index 000000000..4b90dd0e0 --- /dev/null +++ b/Assets/InputSystem.inputsettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b1cda8115d00ede46a9497b8eb9ae516 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/BushTest.mat b/Assets/Materials/BushTest.mat index a069fc4a6..de797887a 100644 --- a/Assets/Materials/BushTest.mat +++ b/Assets/Materials/BushTest.mat @@ -135,8 +135,7 @@ Material: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _SpecColor: {r: 0.11320739, g: 0.11320739, b: 0.11320739, a: 0.5} - m_BuildTextureStacks: [] + - _SpecColor: {r: 0.11320736, g: 0.11320736, b: 0.11320736, a: 0.5} --- !u!114 &7331025373869863914 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/Assets/Objects/Levels/Island/Terrain_1_0.asset b/Assets/Objects/Levels/Island/Terrain_1_0.asset index 0e8e7edec..2cf939438 100644 Binary files a/Assets/Objects/Levels/Island/Terrain_1_0.asset and b/Assets/Objects/Levels/Island/Terrain_1_0.asset differ diff --git a/Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat b/Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat index 7e060a939..46fea3a04 100644 --- a/Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat +++ b/Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat @@ -24,7 +24,7 @@ Material: m_Shader: {fileID: 4800000, guid: 7cd247c7cbda54323b0e395ea419af3d, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat b/Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat index 23bc0b859..bd6ad163e 100644 --- a/Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat +++ b/Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat @@ -24,7 +24,7 @@ Material: m_Shader: {fileID: 4800000, guid: 7cd247c7cbda54323b0e395ea419af3d, type: 3} m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat b/Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat index 29a730d22..5e26a8d9e 100644 --- a/Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat +++ b/Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat @@ -11,7 +11,7 @@ Material: m_Shader: {fileID: 4800000, guid: 7cd247c7cbda54323b0e395ea419af3d, type: 3} m_ShaderKeywords: _GLOSSINESS_FROM_BASE_ALPHA _NORMALMAP _SPECULAR_COLOR m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat b/Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat index 612053f34..638eb4c02 100644 --- a/Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat +++ b/Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat @@ -11,7 +11,7 @@ Material: m_Shader: {fileID: 4800000, guid: 7cd247c7cbda54323b0e395ea419af3d, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat b/Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat index 8077d3e8f..ce7b70960 100644 --- a/Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat +++ b/Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat @@ -11,7 +11,7 @@ Material: m_Shader: {fileID: 4800000, guid: 7cd247c7cbda54323b0e395ea419af3d, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Objects/environment/Clouds/Clouds.mat b/Assets/Objects/environment/Clouds/Clouds.mat index 09b3fb46a..b6b8a4408 100644 --- a/Assets/Objects/environment/Clouds/Clouds.mat +++ b/Assets/Objects/environment/Clouds/Clouds.mat @@ -25,7 +25,7 @@ Material: type: 3} m_ShaderKeywords: m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Objects/environment/Trees/Materials/Bushes.mat b/Assets/Objects/environment/Trees/Materials/Bushes.mat index f0a760851..095c46faf 100644 --- a/Assets/Objects/environment/Trees/Materials/Bushes.mat +++ b/Assets/Objects/environment/Trees/Materials/Bushes.mat @@ -13,7 +13,7 @@ Material: m_ShaderKeywords: BOOLEAN_5C6B42CA_ON BOOLEAN_D0D03BFD_ON VERTEX_ANIMATION_ON _CORRECTNORMALS _NORMALMAP _VERTEXANIMATION m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Objects/environment/Trees/Materials/Trees.mat b/Assets/Objects/environment/Trees/Materials/Trees.mat index f49d7ca14..c8c0749aa 100644 --- a/Assets/Objects/environment/Trees/Materials/Trees.mat +++ b/Assets/Objects/environment/Trees/Materials/Trees.mat @@ -13,7 +13,7 @@ Material: m_ShaderKeywords: BOOLEAN_5C6B42CA_ON BOOLEAN_D0D03BFD_ON VERTEX_ANIMATION_ON _CORRECTNORMALS _NORMALMAP _VERTEXANIMATION m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 stringTagMap: {} @@ -109,6 +109,7 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: + - Color_C30C7CA3: {r: 1, g: 1, b: 1, a: 0} - WindDirection: {r: 0.4, g: 0.4, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Objects/environment/Trees/Materials/Trees_billboards.mat b/Assets/Objects/environment/Trees/Materials/Trees_billboards.mat index cdc1888c5..91e3e9004 100644 --- a/Assets/Objects/environment/Trees/Materials/Trees_billboards.mat +++ b/Assets/Objects/environment/Trees/Materials/Trees_billboards.mat @@ -13,7 +13,7 @@ Material: m_ShaderKeywords: BOOLEAN_7021FEFA_ON BOOLEAN_D0D03BFD_ON _ALPHATEST_ON _CORRECTNORMALS _NORMALMAP _OCCLUSIONMAP m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} @@ -33,4 +33,5 @@ Material: - BOOLEAN_5C6B42CA: 0 - BOOLEAN_7021FEFA: 1 - Vector1_19FBDA45: 0.5 - m_Colors: [] + m_Colors: + - Color_C30C7CA3: {r: 1, g: 1, b: 1, a: 0} diff --git a/Assets/Objects/props/houses/Materials/Matr_BuildingsJettys.mat b/Assets/Objects/props/houses/Materials/Matr_BuildingsJettys.mat index cf7bbbcbc..0f74faf7a 100644 --- a/Assets/Objects/props/houses/Materials/Matr_BuildingsJettys.mat +++ b/Assets/Objects/props/houses/Materials/Matr_BuildingsJettys.mat @@ -25,7 +25,7 @@ Material: type: 3} m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/Assets/Resources/FirstPersonCharacter.prefab b/Assets/Resources/FirstPersonCharacter.prefab new file mode 100644 index 000000000..8c8e0d66d --- /dev/null +++ b/Assets/Resources/FirstPersonCharacter.prefab @@ -0,0 +1,283 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1203376030261627652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1203376030261627651} + - component: {fileID: 1203376030261627648} + - component: {fileID: 1203376030261627649} + - component: {fileID: 1203376030261627650} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1203376030261627651 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203376030261627652} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1203376031101775135} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1203376030261627648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203376030261627652} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1203376030261627649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203376030261627652} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 10 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0.5 + m_VerticalDamping: 0.5 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &1203376030261627650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203376030261627652} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 1 + m_FollowOffset: {x: 0, y: 0, z: -10} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 +--- !u!1 &1203376030672308022 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1203376030672308018} + - component: {fileID: 1203376030672308019} + - component: {fileID: 1203376030672308020} + - component: {fileID: 1203376030672308021} + - component: {fileID: 1203376030672308017} + m_Layer: 0 + m_Name: FirstPersonCharacter + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1203376030672308018 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203376030672308022} + 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: 1203376031101775135} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!143 &1203376030672308019 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203376030672308022} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Height: 2.3200002 + m_Radius: 0.5 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 1.1600001, z: 0} +--- !u!114 &1203376030672308020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203376030672308022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a343570c5b9740b45b62e566abd743cc, type: 3} + m_Name: + m_EditorClassIdentifier: + Paused: 0 + m_Camera: {fileID: 1203376031101775135} + m_Input: {fileID: 1203376030672308021} + PlayerHeight: 1.82 + PlayerRadius: 0.5 + PlayerWeight: 3 + MoveSpeed: 3 + MaximumFallVelocity: 12 + TurnSpeed: 180 + EnableJump: 1 + JumpImpulse: 7 + PitchSpeed: 180 + MaxPitch: 80 +--- !u!114 &1203376030672308021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203376030672308022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cfde70461151044393814cb1c21024b, type: 3} + m_Name: + m_EditorClassIdentifier: + useKeyboardAndMouse: 1 + useGamepad: 1 + LookExponent: 2 + MovementDeadZone: 0.15 + LookDeadZone: 0.15 + MovementHorizontalAxis: Horizontal + MovementVerticalAxis: Vertical + LookHorizontalAxis: Look X + LookVerticalAxis: Look Y + MouseHorizontalAxis: Mouse X + MouseVerticalAxis: Mouse Y + JumpButton: Jump +--- !u!54 &1203376030672308017 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203376030672308022} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 2 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!1 &1203376031101775104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1203376031101775135} + - component: {fileID: 1203376031101775134} + m_Layer: 0 + m_Name: VirtualCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1203376031101775135 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203376031101775104} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.82, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1203376030261627651} + m_Father: {fileID: 1203376030672308018} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1203376031101775134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203376031101775104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 40 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + Dutch: 0 + LensShift: {x: 0, y: 0} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_TypeName: Cinemachine.CinemachineBrain+VcamActivatedEvent, Cinemachine, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1203376030261627651} diff --git a/Assets/Resources/FirstPersonCharacter.prefab.meta b/Assets/Resources/FirstPersonCharacter.prefab.meta new file mode 100644 index 000000000..4ab840785 --- /dev/null +++ b/Assets/Resources/FirstPersonCharacter.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 51569ce51883c7e4d9dabc5321d38077 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/FullScreenFadeManager.prefab b/Assets/Resources/FullScreenFadeManager.prefab new file mode 100644 index 000000000..1f202f148 --- /dev/null +++ b/Assets/Resources/FullScreenFadeManager.prefab @@ -0,0 +1,202 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1138337785565518664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1138337785565518665} + - component: {fileID: 1138337785565518667} + - component: {fileID: 1138337785565518666} + m_Layer: 5 + m_Name: FullScreenMatte + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1138337785565518665 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138337785565518664} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1138337785731963864} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1138337785565518667 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138337785565518664} + m_CullTransparentMesh: 0 +--- !u!114 &1138337785565518666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138337785565518664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!1 &1138337785731963871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1138337785731963864} + - component: {fileID: 1138337785731963866} + - component: {fileID: 1138337785731963865} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1138337785731963864 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138337785731963871} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1138337785565518665} + m_Father: {fileID: 1138337785854297217} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &1138337785731963866 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138337785731963871} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 1 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 32765 + m_TargetDisplay: 0 +--- !u!114 &1138337785731963865 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138337785731963871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!1 &1138337785854297223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1138337785854297217} + - component: {fileID: 1138337785854297216} + m_Layer: 0 + m_Name: Default_FullScreenFadeManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1138337785854297217 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138337785854297223} + 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: 1138337785731963864} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1138337785854297216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138337785854297223} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3c1731f7f8331345a352b2b9c05f2cb, type: 3} + m_Name: + m_EditorClassIdentifier: + FullScreenFadePlane: {fileID: 1138337785565518666} diff --git a/Assets/Resources/FullScreenFadeManager.prefab.meta b/Assets/Resources/FullScreenFadeManager.prefab.meta new file mode 100644 index 000000000..10b5eaa94 --- /dev/null +++ b/Assets/Resources/FullScreenFadeManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 723b7b3c16593624ba967539a9695ae0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GameSaveManager.prefab b/Assets/Resources/GameSaveManager.prefab new file mode 100644 index 000000000..dcd9798c3 --- /dev/null +++ b/Assets/Resources/GameSaveManager.prefab @@ -0,0 +1,264 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4126731527077413761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4126731527077413760} + - component: {fileID: 4126731527077413766} + - component: {fileID: 4126731527077413767} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4126731527077413760 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126731527077413761} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4126731527289085647} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -32, y: 32} + m_SizeDelta: {x: 512, y: 32} + m_Pivot: {x: 1, y: 0} +--- !u!222 &4126731527077413766 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126731527077413761} + m_CullTransparentMesh: 0 +--- !u!114 &4126731527077413767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126731527077413761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 2 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Accessing Data... Do not turn off computer or quit game. +--- !u!1 &4126731527289085640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4126731527289085647} + - component: {fileID: 4126731527289085645} + - component: {fileID: 4126731527289085646} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4126731527289085647 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126731527289085640} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 4126731527077413760} + m_Father: {fileID: 4126731527728584135} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &4126731527289085645 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126731527289085640} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &4126731527289085646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126731527289085640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!1 &4126731527728584129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4126731527728584135} + - component: {fileID: 4126731527728584128} + - component: {fileID: 4126731527728584132} + - component: {fileID: 4126731527728584133} + - component: {fileID: 4126731527728584134} + m_Layer: 0 + m_Name: Default_GameSaveManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4126731527728584135 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126731527728584129} + 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: 4126731527289085647} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4126731527728584128 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126731527728584129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a94c60800d516b4980b9f68a5ab6cb5, type: 3} + m_Name: + m_EditorClassIdentifier: + OnLoad: + - {fileID: 4126731527728584133} + - {fileID: 4126731527728584132} + OnSave: + - {fileID: 4126731527728584133} + - {fileID: 4126731527728584132} +--- !u!114 &4126731527728584132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126731527728584129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ce142628ca19c2489cf2183fc2d934f, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: DelayedLogic + Delay: 3 + OnDelayComplete: + - {fileID: 4126731527728584134} + OnCanceled: [] +--- !u!114 &4126731527728584133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126731527728584129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 846d5f33f7af4014ea15adf7a92dc953, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: ToggleGameObjectAction + Targets: + - GameObject: {fileID: 4126731527289085640} + State: 1 +--- !u!114 &4126731527728584134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4126731527728584129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 846d5f33f7af4014ea15adf7a92dc953, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: ToggleGameObjectAction + Targets: + - GameObject: {fileID: 4126731527289085640} + State: 0 diff --git a/Assets/Resources/GameSaveManager.prefab.meta b/Assets/Resources/GameSaveManager.prefab.meta new file mode 100644 index 000000000..1088d4f43 --- /dev/null +++ b/Assets/Resources/GameSaveManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a9ab74a93653f07489a2cb00a2f49891 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/I2Languages.asset b/Assets/Resources/I2Languages.asset new file mode 100644 index 000000000..7678e9f73 --- /dev/null +++ b/Assets/Resources/I2Languages.asset @@ -0,0 +1,39 @@ +%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: 2f0b0c553be8edd4682e9180fdd13e37, type: 3} + m_Name: I2Languages + m_EditorClassIdentifier: + mSource: + UserAgreesToHaveItOnTheScene: 0 + UserAgreesToHaveItInsideThePluginsFolder: 0 + GoogleLiveSyncIsUptoDate: 1 + mTerms: [] + CaseInsensitiveTerms: 0 + OnMissingTranslation: 1 + mTerm_AppName: + mLanguages: [] + IgnoreDeviceLanguage: 0 + _AllowUnloadingLanguages: 0 + Google_WebServiceURL: + Google_SpreadsheetKey: + Google_SpreadsheetName: + Google_LastUpdatedVersion: + Google_Password: change_this + GoogleUpdateFrequency: 3 + GoogleInEditorCheckFrequency: 2 + GoogleUpdateSynchronization: 1 + GoogleUpdateDelay: 0 + Assets: [] + Spreadsheet_LocalFileName: + Spreadsheet_LocalCSVSeparator: ',' + Spreadsheet_LocalCSVEncoding: utf-8 + Spreadsheet_SpecializationAsRows: 1 diff --git a/Assets/Resources/I2Languages.asset.meta b/Assets/Resources/I2Languages.asset.meta new file mode 100644 index 000000000..64d81a582 --- /dev/null +++ b/Assets/Resources/I2Languages.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d96d9a68d7e47fd4b902acecd49822e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/LevelStreamingManager.prefab b/Assets/Resources/LevelStreamingManager.prefab new file mode 100644 index 000000000..fb4590551 --- /dev/null +++ b/Assets/Resources/LevelStreamingManager.prefab @@ -0,0 +1,607 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4237660105901699951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4237660105901699950} + m_Layer: 5 + m_Name: LoadingUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4237660105901699950 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660105901699951} + 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: 4237660106701817725} + - {fileID: 4237660106123981089} + - {fileID: 4237660106447583619} + - {fileID: 4237660107457405504} + m_Father: {fileID: 4237660107855997384} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 32, y: 32} + m_SizeDelta: {x: 480, y: 32} + m_Pivot: {x: 0, y: 0} +--- !u!1 &4237660106043442134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4237660106043442133} + - component: {fileID: 4237660106043442131} + - component: {fileID: 4237660106043442132} + m_Layer: 5 + m_Name: DebugText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4237660106043442133 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106043442134} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4237660107855997384} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 32, y: -32} + m_SizeDelta: {x: 320, y: -128} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4237660106043442131 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106043442134} + m_CullTransparentMesh: 0 +--- !u!114 &4237660106043442132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106043442134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &4237660106123981090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4237660106123981089} + - component: {fileID: 4237660106123981119} + - component: {fileID: 4237660106123981088} + m_Layer: 5 + m_Name: Percentage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4237660106123981089 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106123981090} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4237660105901699950} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 16} + m_Pivot: {x: 1, y: 1} +--- !u!222 &4237660106123981119 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106123981090} + m_CullTransparentMesh: 0 +--- !u!114 &4237660106123981088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106123981090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 2 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 100% +--- !u!1 &4237660106447583620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4237660106447583619} + - component: {fileID: 4237660106447583617} + - component: {fileID: 4237660106447583618} + m_Layer: 5 + m_Name: ProgressBarBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4237660106447583619 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106447583620} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4237660105901699950} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 240, y: -16} + m_SizeDelta: {x: 480, y: 8} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &4237660106447583617 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106447583620} + m_CullTransparentMesh: 0 +--- !u!114 &4237660106447583618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106447583620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.33962262, g: 0.33962262, b: 0.33962262, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!1 &4237660106662749796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4237660106662749793} + - component: {fileID: 4237660106662749794} + - component: {fileID: 4237660106662749795} + - component: {fileID: 4237660106662749792} + m_Layer: 5 + m_Name: Default_LevelStreamingManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4237660106662749793 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106662749796} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 4237660107855997384} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &4237660106662749794 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106662749796} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 1 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 32766 + m_TargetDisplay: 0 +--- !u!114 &4237660106662749795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106662749796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &4237660106662749792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106662749796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9f78c0b7259f604da294b52e1208e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + LoadingRoot: {fileID: 4237660107855997385} + ProgressBar: {fileID: 4237660107457405505} + ProgressBarContainer: {fileID: 4237660106447583620} + LoadingText: {fileID: 4237660106701817724} + PercentageText: {fileID: 4237660106123981088} + DelayBeforeLoad: 1 + DelayAfterLoad: 1 + DebugText: {fileID: 4237660106043442132} + EnableDebug: 0 +--- !u!1 &4237660106701817726 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4237660106701817725} + - component: {fileID: 4237660106701817723} + - component: {fileID: 4237660106701817724} + m_Layer: 5 + m_Name: Loading + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4237660106701817725 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106701817726} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4237660105901699950} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 96, y: 16} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4237660106701817723 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106701817726} + m_CullTransparentMesh: 0 +--- !u!114 &4237660106701817724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660106701817726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Loading... + +' +--- !u!1 &4237660107457405505 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4237660107457405504} + - component: {fileID: 4237660107457405534} + - component: {fileID: 4237660107457405535} + m_Layer: 5 + m_Name: ProgressBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4237660107457405504 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660107457405505} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4237660105901699950} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: -16} + m_SizeDelta: {x: 40, y: 8} + m_Pivot: {x: 0, y: 0} +--- !u!222 &4237660107457405534 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660107457405505} + m_CullTransparentMesh: 0 +--- !u!114 &4237660107457405535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660107457405505} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!1 &4237660107855997385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4237660107855997384} + - component: {fileID: 4237660107855997382} + - component: {fileID: 4237660107855997383} + m_Layer: 5 + m_Name: LoadingRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4237660107855997384 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660107855997385} + 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: 4237660105901699950} + - {fileID: 4237660106043442133} + m_Father: {fileID: 4237660106662749793} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4237660107855997382 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660107855997385} + m_CullTransparentMesh: 0 +--- !u!114 &4237660107855997383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4237660107855997385} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 diff --git a/Assets/Resources/LevelStreamingManager.prefab.meta b/Assets/Resources/LevelStreamingManager.prefab.meta new file mode 100644 index 000000000..92a1bd864 --- /dev/null +++ b/Assets/Resources/LevelStreamingManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1199be26f85318642849e89bbe054aa1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/VirtualCameraManager.prefab b/Assets/Resources/VirtualCameraManager.prefab new file mode 100644 index 000000000..26e41eea9 --- /dev/null +++ b/Assets/Resources/VirtualCameraManager.prefab @@ -0,0 +1,196 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3027554877427853619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3027554877427853612} + - component: {fileID: 3027554877427853613} + - component: {fileID: 2796896273931921891} + - component: {fileID: 3027554877427853618} + - component: {fileID: 3027554877427853615} + - component: {fileID: 4455758893611994523} + m_Layer: 0 + m_Name: VirtualCameraManager + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3027554877427853612 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3027554877427853619} + m_LocalRotation: {x: -0.2058242, y: 0.53439623, z: -0.13606744, w: -0.80841994} + m_LocalPosition: {x: 7.1058645, y: 4.024516, z: -5.1810875} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &3027554877427853613 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3027554877427853619} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.1 + far clip plane: 5000 + field of view: 40 + orthographic: 0 + orthographic size: 5 + 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: 1 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &2796896273931921891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3027554877427853619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a050287a9067304195c4fe5661de7e2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!81 &3027554877427853618 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3027554877427853619} + m_Enabled: 1 +--- !u!114 &3027554877427853615 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3027554877427853619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowDebugText: 0 + m_ShowCameraFrustum: 1 + m_IgnoreTimeScale: 0 + m_WorldUpOverride: {fileID: 0} + m_UpdateMethod: 2 + m_DefaultBlend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CustomBlends: {fileID: 0} + m_CameraCutEvent: + m_PersistentCalls: + m_Calls: [] + m_TypeName: Cinemachine.CinemachineBrain+BrainEvent, Cinemachine, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_CameraActivatedEvent: + m_PersistentCalls: + m_Calls: [] + m_TypeName: Cinemachine.CinemachineBrain+VcamActivatedEvent, Cinemachine, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &4455758893611994523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3027554877427853619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 3027554877427853612} + volumeLayer: + serializedVersion: 2 + m_Bits: 256 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 1 + antialiasingMode: 1 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] diff --git a/Assets/Resources/VirtualCameraManager.prefab.meta b/Assets/Resources/VirtualCameraManager.prefab.meta new file mode 100644 index 000000000..51af90f04 --- /dev/null +++ b/Assets/Resources/VirtualCameraManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3c96a72ce3dacc141a568f1995ee1105 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Boat/HumanController.cs b/Assets/Scripts/Boat/HumanController.cs index fcea555d6..3f119d157 100644 --- a/Assets/Scripts/Boat/HumanController.cs +++ b/Assets/Scripts/Boat/HumanController.cs @@ -27,8 +27,6 @@ private void Awake() _controls.BoatControls.Reset.performed += ResetBoat; _controls.BoatControls.Freeze.performed += FreezeBoat; - - _controls.BoatControls.Time.performed += SelectTime; } public override void OnEnable() diff --git a/Assets/Scripts/Editor/LinkGameViewCamera.prefab b/Assets/Scripts/Editor/LinkGameViewCamera.prefab new file mode 100644 index 000000000..56d3e6fa9 --- /dev/null +++ b/Assets/Scripts/Editor/LinkGameViewCamera.prefab @@ -0,0 +1,145 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &251524200295667666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5260567718057574709} + - component: {fileID: 2925269175919186199} + - component: {fileID: 6053316668851367148} + - component: {fileID: 3512864635622911572} + m_Layer: 0 + m_Name: LinkGameViewCamera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5260567718057574709 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251524200295667666} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &2925269175919186199 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251524200295667666} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -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: 1 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &6053316668851367148 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251524200295667666} + m_Enabled: 1 +--- !u!114 &3512864635622911572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251524200295667666} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 5260567718057574709} + volumeLayer: + serializedVersion: 2 + m_Bits: 256 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 1 + antialiasingMode: 1 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] diff --git a/Assets/Scripts/Editor/LinkGameViewCamera.prefab.meta b/Assets/Scripts/Editor/LinkGameViewCamera.prefab.meta new file mode 100644 index 000000000..6df18f1aa --- /dev/null +++ b/Assets/Scripts/Editor/LinkGameViewCamera.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 06c1498f28fc872469470c64d14027c4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/SamplePlayFromHere.cs b/Assets/Scripts/Editor/SamplePlayFromHere.cs new file mode 100644 index 000000000..de2746644 --- /dev/null +++ b/Assets/Scripts/Editor/SamplePlayFromHere.cs @@ -0,0 +1,30 @@ +using UnityEditor; +using UnityEngine; +using GameplayIngredients.Editor; + +static class SamplePlayFromHere +{ + [InitializeOnLoadMethod] + static void SetupPlayFromHere() + { + PlayFromHere.OnPlayFromHere += PlayFromHere_OnPlayFromHere; + } + + private static void PlayFromHere_OnPlayFromHere(Vector3 position, Vector3 forward) + { + // Get the FirstPersonCharacter prefab in Resources and instantiate it + var prefab = (GameObject)Resources.Load("FirstPersonCharacter"); + var player = GameObject.Instantiate(prefab); + player.name = "(Play from Here) " + prefab.name; + + // position the character correctly, so the current POV matches the player's height + var controller = player.GetComponent(); + player.transform.position = new Vector3(position.x, position.y - controller.PlayerHeight, position.z); + + // orient the player correctly + var orient = forward; + orient.Scale(new Vector3(1, 0, 1)); + player.transform.forward = orient; + + } +} diff --git a/Assets/Scripts/Editor/SamplePlayFromHere.cs.meta b/Assets/Scripts/Editor/SamplePlayFromHere.cs.meta new file mode 100644 index 000000000..d72fd278b --- /dev/null +++ b/Assets/Scripts/Editor/SamplePlayFromHere.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6b666fefd76623d4aa8d60aa166c683f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameSystem/InputControls.cs b/Assets/Scripts/GameSystem/InputControls.cs index 802583756..a6c9901e8 100644 --- a/Assets/Scripts/GameSystem/InputControls.cs +++ b/Assets/Scripts/GameSystem/InputControls.cs @@ -26,14 +26,6 @@ public @InputControls() ""processors"": ""AxisDeadzone(min=0.1,max=1)"", ""interactions"": """" }, - { - ""name"": ""Time"", - ""type"": ""Value"", - ""id"": ""637a3778-b50e-41a0-8669-f7b1698fc4ca"", - ""expectedControlType"": """", - ""processors"": ""AxisDeadzone(min=0.1,max=1)"", - ""interactions"": """" - }, { ""name"": ""Steering"", ""type"": ""Value"", @@ -400,94 +392,6 @@ public @InputControls() ""action"": ""Freeze"", ""isComposite"": false, ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""b7d3341c-7abe-48e6-a68e-b27eb3927b79"", - ""path"": ""/buttonNorth"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Time"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": ""Dpad horizontal"", - ""id"": ""3c94f068-2cc6-4d07-a76a-3835151e0b0e"", - ""path"": ""1DAxis"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""Time"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""negative"", - ""id"": ""aa687506-3f38-4cdc-8f14-f77ce23789d9"", - ""path"": ""/dpad/left"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Time"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""positive"", - ""id"": ""59cadf6b-f60d-4a7e-9b9c-a21ecfdfb51e"", - ""path"": ""/dpad/right"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Time"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""Keyboard"", - ""id"": ""e8db53d1-5ded-40fe-965b-727f321a403a"", - ""path"": ""1DAxis"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""Time"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""negative"", - ""id"": ""d5357c68-6b8a-4c12-996c-801c5a015beb"", - ""path"": ""/1"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Time"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""positive"", - ""id"": ""9a495693-8098-4d83-b2d6-711526e83c37"", - ""path"": ""/2"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Time"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": """", - ""id"": ""38dc845f-f219-4b56-947c-542a4cf33da6"", - ""path"": ""/primaryTouch/tapCount"", - ""interactions"": ""MultiTap"", - ""processors"": """", - ""groups"": ""TouchScreen"", - ""action"": ""Time"", - ""isComposite"": false, - ""isPartOfComposite"": false } ] } @@ -536,7 +440,6 @@ public @InputControls() // BoatControls m_BoatControls = asset.FindActionMap("BoatControls", throwIfNotFound: true); m_BoatControls_Trottle = m_BoatControls.FindAction("Trottle", throwIfNotFound: true); - m_BoatControls_Time = m_BoatControls.FindAction("Time", throwIfNotFound: true); m_BoatControls_Steering = m_BoatControls.FindAction("Steering", throwIfNotFound: true); m_BoatControls_Reset = m_BoatControls.FindAction("Reset", throwIfNotFound: true); m_BoatControls_Freeze = m_BoatControls.FindAction("Freeze", throwIfNotFound: true); @@ -590,7 +493,6 @@ public void Disable() private readonly InputActionMap m_BoatControls; private IBoatControlsActions m_BoatControlsActionsCallbackInterface; private readonly InputAction m_BoatControls_Trottle; - private readonly InputAction m_BoatControls_Time; private readonly InputAction m_BoatControls_Steering; private readonly InputAction m_BoatControls_Reset; private readonly InputAction m_BoatControls_Freeze; @@ -599,7 +501,6 @@ public struct BoatControlsActions private @InputControls m_Wrapper; public BoatControlsActions(@InputControls wrapper) { m_Wrapper = wrapper; } public InputAction @Trottle => m_Wrapper.m_BoatControls_Trottle; - public InputAction @Time => m_Wrapper.m_BoatControls_Time; public InputAction @Steering => m_Wrapper.m_BoatControls_Steering; public InputAction @Reset => m_Wrapper.m_BoatControls_Reset; public InputAction @Freeze => m_Wrapper.m_BoatControls_Freeze; @@ -615,9 +516,6 @@ public void SetCallbacks(IBoatControlsActions instance) @Trottle.started -= m_Wrapper.m_BoatControlsActionsCallbackInterface.OnTrottle; @Trottle.performed -= m_Wrapper.m_BoatControlsActionsCallbackInterface.OnTrottle; @Trottle.canceled -= m_Wrapper.m_BoatControlsActionsCallbackInterface.OnTrottle; - @Time.started -= m_Wrapper.m_BoatControlsActionsCallbackInterface.OnTime; - @Time.performed -= m_Wrapper.m_BoatControlsActionsCallbackInterface.OnTime; - @Time.canceled -= m_Wrapper.m_BoatControlsActionsCallbackInterface.OnTime; @Steering.started -= m_Wrapper.m_BoatControlsActionsCallbackInterface.OnSteering; @Steering.performed -= m_Wrapper.m_BoatControlsActionsCallbackInterface.OnSteering; @Steering.canceled -= m_Wrapper.m_BoatControlsActionsCallbackInterface.OnSteering; @@ -634,9 +532,6 @@ public void SetCallbacks(IBoatControlsActions instance) @Trottle.started += instance.OnTrottle; @Trottle.performed += instance.OnTrottle; @Trottle.canceled += instance.OnTrottle; - @Time.started += instance.OnTime; - @Time.performed += instance.OnTime; - @Time.canceled += instance.OnTime; @Steering.started += instance.OnSteering; @Steering.performed += instance.OnSteering; @Steering.canceled += instance.OnSteering; @@ -680,7 +575,6 @@ public InputControlScheme TouchScreenScheme public interface IBoatControlsActions { void OnTrottle(InputAction.CallbackContext context); - void OnTime(InputAction.CallbackContext context); void OnSteering(InputAction.CallbackContext context); void OnReset(InputAction.CallbackContext context); void OnFreeze(InputAction.CallbackContext context); diff --git a/Assets/scenes/demo_Island/Lightmap-0_comp_light.exr b/Assets/scenes/demo_Island/Lightmap-0_comp_light.exr new file mode 100644 index 000000000..0a2cf3ce3 --- /dev/null +++ b/Assets/scenes/demo_Island/Lightmap-0_comp_light.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0f1df5cdc78473cc8dfc3726ef13b30995cce45a476c5ce97253c201a31aedd +size 4076885 diff --git a/Assets/scenes/demo_Island/Lightmap-0_comp_light.exr.meta b/Assets/scenes/demo_Island/Lightmap-0_comp_light.exr.meta new file mode 100644 index 000000000..a98ca0634 --- /dev/null +++ b/Assets/scenes/demo_Island/Lightmap-0_comp_light.exr.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: a13a9d762575fdb4994c4502ac44e3af +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scenes/main_menu.unity b/Assets/scenes/main_menu.unity index cfe51c5d2..15c143612 100644 --- a/Assets/scenes/main_menu.unity +++ b/Assets/scenes/main_menu.unity @@ -136,6 +136,11 @@ PrefabInstance: propertyPath: m_Name value: Main Camera objectReference: {fileID: 0} + - target: {fileID: 7003470173341666312, guid: 530da10d6c4d9442e9e8d5eeb77a25d8, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} - target: {fileID: 7003470173341666312, guid: 530da10d6c4d9442e9e8d5eeb77a25d8, type: 3} propertyPath: m_LocalPosition.x @@ -151,6 +156,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 68.17 objectReference: {fileID: 0} + - target: {fileID: 7003470173341666312, guid: 530da10d6c4d9442e9e8d5eeb77a25d8, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.74999654 + objectReference: {fileID: 0} - target: {fileID: 7003470173341666312, guid: 530da10d6c4d9442e9e8d5eeb77a25d8, type: 3} propertyPath: m_LocalRotation.x @@ -166,16 +176,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.11519858 objectReference: {fileID: 0} - - target: {fileID: 7003470173341666312, guid: 530da10d6c4d9442e9e8d5eeb77a25d8, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.74999654 - objectReference: {fileID: 0} - - target: {fileID: 7003470173341666312, guid: 530da10d6c4d9442e9e8d5eeb77a25d8, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 7003470173341666312, guid: 530da10d6c4d9442e9e8d5eeb77a25d8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -193,8 +193,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7003470173341666315, guid: 530da10d6c4d9442e9e8d5eeb77a25d8, type: 3} - propertyPath: near clip plane - value: 0.5 + propertyPath: field of view + value: 45 objectReference: {fileID: 0} - target: {fileID: 7003470173341666315, guid: 530da10d6c4d9442e9e8d5eeb77a25d8, type: 3} @@ -203,46 +203,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7003470173341666315, guid: 530da10d6c4d9442e9e8d5eeb77a25d8, type: 3} - propertyPath: field of view - value: 45 + propertyPath: near clip plane + value: 0.5 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 530da10d6c4d9442e9e8d5eeb77a25d8, type: 3} ---- !u!84 &734953135 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: WaterDepthMap - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 3 - m_Width: 1024 - m_Height: 1024 - m_AntiAliasing: 1 - m_MipCount: -1 - m_DepthFormat: 2 - m_ColorFormat: 142 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_EnableCompatibleFormat: 1 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 --- !u!1 &852178392 GameObject: m_ObjectHideFlags: 0 @@ -403,6 +368,41 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!84 &1270728255 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WaterDepthMap + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 1024 + m_Height: 1024 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 142 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 --- !u!1 &1603626283 GameObject: m_ObjectHideFlags: 1 @@ -484,6 +484,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 356481386930133056, guid: 56de8e58d1a974ab880e61b104d7ef98, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1297213354555609066, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} propertyPath: m_AnchoredPosition.y @@ -491,34 +496,39 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2396697376959644701, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_AnchorMin.y - value: 0 + propertyPath: m_AnchorMax.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 2396697376959644701, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_AnchorMax.y - value: 0 + propertyPath: m_AnchorMin.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 2396697376959644701, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 + propertyPath: m_SizeDelta.x + value: 1855.9142 objectReference: {fileID: 0} - target: {fileID: 2396697376959644701, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 + propertyPath: m_AnchoredPosition.x + value: 977.9571 objectReference: {fileID: 0} - target: {fileID: 2396697376959644701, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_SizeDelta.x - value: 0 + propertyPath: m_AnchoredPosition.y + value: -150 objectReference: {fileID: 0} - target: {fileID: 2483712070395034532, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} propertyPath: m_AnchoredPosition.y value: -20 objectReference: {fileID: 0} + - target: {fileID: 4376516045305876914, guid: 56de8e58d1a974ab880e61b104d7ef98, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4376516045305876914, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} propertyPath: m_AnchorMin.y @@ -526,7 +536,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4376516045305876914, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_AnchorMax.y + propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4376516045305876914, guid: 56de8e58d1a974ab880e61b104d7ef98, @@ -539,35 +549,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4376516045305876914, guid: 56de8e58d1a974ab880e61b104d7ef98, + - target: {fileID: 4612491773756503954, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_SizeDelta.x - value: 0 + propertyPath: m_AnchorMax.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 4612491773756503954, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4612491773756503954, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_AnchorMax.y - value: 0 + propertyPath: m_SizeDelta.x + value: 1855.9142 objectReference: {fileID: 0} - target: {fileID: 4612491773756503954, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 977.9571 objectReference: {fileID: 0} - target: {fileID: 4612491773756503954, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4612491773756503954, guid: 56de8e58d1a974ab880e61b104d7ef98, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 5222232652279626277, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} @@ -586,18 +591,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6677724032156829383, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_LocalRotation.x - value: 0.07858013 + propertyPath: m_LocalPosition.x + value: -2.8925436 objectReference: {fileID: 0} - target: {fileID: 6677724032156829383, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_LocalRotation.y - value: 0.91455495 + propertyPath: m_LocalPosition.y + value: 2.7719994 objectReference: {fileID: 0} - target: {fileID: 6677724032156829383, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_LocalRotation.z - value: -0.2158971 + propertyPath: m_LocalPosition.z + value: 3.044201 objectReference: {fileID: 0} - target: {fileID: 6677724032156829383, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} @@ -606,24 +611,44 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6677724032156829383, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_LocalPosition.x - value: -2.8925436 + propertyPath: m_LocalRotation.x + value: 0.07858009 objectReference: {fileID: 0} - target: {fileID: 6677724032156829383, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_LocalPosition.y - value: 2.7719994 + propertyPath: m_LocalRotation.y + value: 0.91455495 objectReference: {fileID: 0} - target: {fileID: 6677724032156829383, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} - propertyPath: m_LocalPosition.z - value: 3.044201 + propertyPath: m_LocalRotation.z + value: -0.21589711 + objectReference: {fileID: 0} + - target: {fileID: 6677724033928456943, guid: 56de8e58d1a974ab880e61b104d7ef98, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.07858009 + objectReference: {fileID: 0} + - target: {fileID: 6677724033928456943, guid: 56de8e58d1a974ab880e61b104d7ef98, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.21589711 + objectReference: {fileID: 0} + - target: {fileID: 7328028028769070031, guid: 56de8e58d1a974ab880e61b104d7ef98, + type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 7417488473820929829, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} propertyPath: m_AnchoredPosition.y value: -20 objectReference: {fileID: 0} + - target: {fileID: 7907029380085608247, guid: 56de8e58d1a974ab880e61b104d7ef98, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7907029380085608247, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} propertyPath: m_LocalPosition.x @@ -639,6 +664,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7907029380085608247, guid: 56de8e58d1a974ab880e61b104d7ef98, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7907029380085608247, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} propertyPath: m_LocalRotation.x @@ -654,16 +684,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7907029380085608247, guid: 56de8e58d1a974ab880e61b104d7ef98, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7907029380085608247, guid: 56de8e58d1a974ab880e61b104d7ef98, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7907029380085608247, guid: 56de8e58d1a974ab880e61b104d7ef98, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -705,13 +725,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1390411985989647940, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} - propertyPath: m_Enabled - value: 1 + propertyPath: _depthTex + value: objectReference: {fileID: 0} - target: {fileID: 1390411985989647940, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} - propertyPath: _depthTex - value: + propertyPath: m_Enabled + value: 1 objectReference: {fileID: 0} - target: {fileID: 3093802692011532849, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} @@ -723,6 +743,11 @@ PrefabInstance: propertyPath: m_Name value: MainMenuLevel objectReference: {fileID: 0} + - target: {fileID: 3093802692063803097, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3093802692063803097, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.x @@ -738,6 +763,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3093802692063803097, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3093802692063803097, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalRotation.x @@ -753,16 +783,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3093802692063803097, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3093802692063803097, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 3093802692063803097, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -778,6 +798,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3098304137253435410, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalPosition.x + value: -48.017036 + objectReference: {fileID: 0} + - target: {fileID: 3098304137253435410, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalPosition.z + value: 79.15643 + objectReference: {fileID: 0} + - target: {fileID: 3098304137253435410, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.8534069 + objectReference: {fileID: 0} - target: {fileID: 3098304137253435410, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalRotation.x @@ -793,20 +828,20 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.19601993 objectReference: {fileID: 0} - - target: {fileID: 3098304137253435410, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.8534069 - objectReference: {fileID: 0} - - target: {fileID: 3098304137253435410, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304137776122239, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.x - value: -48.017036 + value: -103.41802 objectReference: {fileID: 0} - - target: {fileID: 3098304137253435410, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304137776122239, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.z - value: 79.15643 + value: 76.07407 + objectReference: {fileID: 0} + - target: {fileID: 3098304137776122239, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7384489 objectReference: {fileID: 0} - target: {fileID: 3098304137776122239, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} @@ -823,20 +858,20 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.32809758 objectReference: {fileID: 0} - - target: {fileID: 3098304137776122239, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7384489 - objectReference: {fileID: 0} - - target: {fileID: 3098304137776122239, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138053265053, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.x - value: -103.41802 + value: 113.631226 objectReference: {fileID: 0} - - target: {fileID: 3098304137776122239, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138053265053, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.z - value: 76.07407 + value: 49.215836 + objectReference: {fileID: 0} + - target: {fileID: 3098304138053265053, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.89808434 objectReference: {fileID: 0} - target: {fileID: 3098304138053265053, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} @@ -853,20 +888,20 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.14849196 objectReference: {fileID: 0} - - target: {fileID: 3098304138053265053, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.89808434 - objectReference: {fileID: 0} - - target: {fileID: 3098304138053265053, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138102840013, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.x - value: 113.631226 + value: 70.615265 objectReference: {fileID: 0} - - target: {fileID: 3098304138053265053, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138102840013, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.z - value: 49.215836 + value: 63.53189 + objectReference: {fileID: 0} + - target: {fileID: 3098304138102840013, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.1955011 objectReference: {fileID: 0} - target: {fileID: 3098304138102840013, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} @@ -883,20 +918,20 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.024456222 objectReference: {fileID: 0} - - target: {fileID: 3098304138102840013, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.1955011 - objectReference: {fileID: 0} - - target: {fileID: 3098304138102840013, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138388918550, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.x - value: 70.615265 + value: -24.485832 objectReference: {fileID: 0} - - target: {fileID: 3098304138102840013, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138388918550, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.z - value: 63.53189 + value: 78.70347 + objectReference: {fileID: 0} + - target: {fileID: 3098304138388918550, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.6991671 objectReference: {fileID: 0} - target: {fileID: 3098304138388918550, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} @@ -913,20 +948,20 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.20833462 objectReference: {fileID: 0} - - target: {fileID: 3098304138388918550, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.6991671 - objectReference: {fileID: 0} - - target: {fileID: 3098304138388918550, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138435011316, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.x - value: -24.485832 + value: 147.28241 objectReference: {fileID: 0} - - target: {fileID: 3098304138388918550, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138435011316, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.z - value: 78.70347 + value: -12.134232 + objectReference: {fileID: 0} + - target: {fileID: 3098304138435011316, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.4996427 objectReference: {fileID: 0} - target: {fileID: 3098304138435011316, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} @@ -943,20 +978,20 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.110401824 objectReference: {fileID: 0} - - target: {fileID: 3098304138435011316, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.4996427 - objectReference: {fileID: 0} - - target: {fileID: 3098304138435011316, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138527245096, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.x - value: 147.28241 + value: 94.293884 objectReference: {fileID: 0} - - target: {fileID: 3098304138435011316, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138527245096, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.z - value: -12.134232 + value: 75.29604 + objectReference: {fileID: 0} + - target: {fileID: 3098304138527245096, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.67954904 objectReference: {fileID: 0} - target: {fileID: 3098304138527245096, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} @@ -973,20 +1008,20 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.16498607 objectReference: {fileID: 0} - - target: {fileID: 3098304138527245096, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.67954904 - objectReference: {fileID: 0} - - target: {fileID: 3098304138527245096, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138538213638, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.x - value: 94.293884 + value: -99.99582 objectReference: {fileID: 0} - - target: {fileID: 3098304138527245096, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138538213638, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.z - value: 75.29604 + value: 82.39697 + objectReference: {fileID: 0} + - target: {fileID: 3098304138538213638, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.6192733 objectReference: {fileID: 0} - target: {fileID: 3098304138538213638, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} @@ -1003,20 +1038,20 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.112876415 objectReference: {fileID: 0} - - target: {fileID: 3098304138538213638, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.6192733 - objectReference: {fileID: 0} - - target: {fileID: 3098304138538213638, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138945262799, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.x - value: -99.99582 + value: 146.97679 objectReference: {fileID: 0} - - target: {fileID: 3098304138538213638, guid: 705cc40ed7b2348689ba68fd4bc915b3, + - target: {fileID: 3098304138945262799, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.z - value: 82.39697 + value: -17.14093 + objectReference: {fileID: 0} + - target: {fileID: 3098304138945262799, guid: 705cc40ed7b2348689ba68fd4bc915b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.038853228 objectReference: {fileID: 0} - target: {fileID: 3098304138945262799, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} @@ -1033,21 +1068,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.0030338985 objectReference: {fileID: 0} - - target: {fileID: 3098304138945262799, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.038853228 - objectReference: {fileID: 0} - - target: {fileID: 3098304138945262799, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalPosition.x - value: 146.97679 - objectReference: {fileID: 0} - - target: {fileID: 3098304138945262799, guid: 705cc40ed7b2348689ba68fd4bc915b3, - type: 3} - propertyPath: m_LocalPosition.z - value: -17.14093 - objectReference: {fileID: 0} - target: {fileID: 5772596621923325528, guid: 705cc40ed7b2348689ba68fd4bc915b3, type: 3} propertyPath: m_LocalPosition.x diff --git a/Packages/manifest.json b/Packages/manifest.json index ba1530e51..ac97bfc99 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,15 +1,16 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.addressables": "1.8.4", + "com.unity.addressables": "1.16.10", "com.unity.build-report-inspector": "0.2.2-preview", "com.unity.burst": "1.2.3", "com.unity.cinemachine": "2.6.0", "com.unity.ide.rider": "2.0.5", "com.unity.ide.visualstudio": "2.0.1", - "com.unity.ide.vscode": "1.2.1", + "com.unity.ide.vscode": "1.2.3", "com.unity.inputsystem": "1.0.0", - "com.unity.mathematics": "1.1.0", + "com.unity.inputsystem.switch": "file:E:/Nintendo/Switch/UnityForNintendoSwitch/Packages/com.unity.inputsystem.switch@0.1.1-preview", + "com.unity.mathematics": "1.2.1", "com.unity.memoryprofiler": "0.2.4-preview.1", "com.unity.render-pipelines.universal": "7.4.1", "com.unity.terrain-tools": "3.0.1-preview", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 21072e533..c9a5478d3 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,11 +7,11 @@ "dependencies": {} }, "com.unity.addressables": { - "version": "1.8.4", + "version": "1.16.10", "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.7.3", + "com.unity.scriptablebuildpipeline": "1.14.1", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" @@ -49,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.0", + "version": "1.0.5", "depth": 2, "source": "registry", "dependencies": {}, @@ -72,7 +72,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.1", + "version": "1.2.3", "depth": 0, "source": "registry", "dependencies": {}, @@ -85,8 +85,16 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.inputsystem.switch": { + "version": "file:E:/Nintendo/Switch/UnityForNintendoSwitch/Packages/com.unity.inputsystem.switch@0.1.1-preview", + "depth": 0, + "source": "local", + "dependencies": { + "com.unity.inputsystem": "1.0.0-preview.1" + } + }, "com.unity.mathematics": { - "version": "1.1.0", + "version": "1.2.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -121,7 +129,7 @@ "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.7.3", + "version": "1.14.1", "depth": 1, "source": "registry", "dependencies": {}, @@ -144,11 +152,11 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.14", + "version": "1.1.19", "depth": 1, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.0", + "com.unity.ext.nunit": "1.0.5", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, @@ -175,7 +183,8 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.modules.ui": "1.0.0" + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" } }, "com.verasl.water-system": { diff --git a/ProjectSettings/BurstAotSettings_Switch.json b/ProjectSettings/BurstAotSettings_Switch.json new file mode 100644 index 000000000..ec0089d85 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_Switch.json @@ -0,0 +1,11 @@ +{ + "MonoBehaviour": { + "m_Enabled": true, + "m_EditorHideFlags": 0, + "m_Name": "", + "m_EditorClassIdentifier": "Unity.Burst.Editor:Unity.Burst.Editor:BurstPlatformAotSettings", + "DisableOptimisations": false, + "DisableSafetyChecks": true, + "DisableBurstCompilation": false + } +} \ No newline at end of file diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 378b04168..855d34eda 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -17,3 +17,5 @@ EditorBuildSettings: m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: 3f119a19757f84dac85ee298b9dd65d3, type: 2} + com.unity.input.settings: {fileID: 11400000, guid: b1cda8115d00ede46a9497b8eb9ae516, + type: 2} diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index dbcc67721..6c8cac65a 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -6,301 +6,29 @@ InputManager: serializedVersion: 2 m_Axes: - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: left - positiveButton: right - altNegativeButton: a - altPositiveButton: d - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 2 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: down - positiveButton: up - altNegativeButton: s - altPositiveButton: w - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 0 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Accellerate - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: up - altNegativeButton: - altPositiveButton: w - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 2 - axis: 7 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 + m_Name: Enable Debug Button 1 descriptiveName: descriptiveNegativeName: negativeButton: positiveButton: left ctrl altNegativeButton: - altPositiveButton: mouse 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left alt - altNegativeButton: - altPositiveButton: mouse 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left shift - altNegativeButton: - altPositiveButton: mouse 2 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: space - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse X - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse Y - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse ScrollWheel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: + altPositiveButton: joystick button 8 gravity: 0 dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 2 - joyNum: 0 - - serializedVersion: 3 - m_Name: Reverse - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: down - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 0 - type: 2 - axis: 4 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 0 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 1 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 2 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 3 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: return - altNegativeButton: - altPositiveButton: joystick button 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: enter - altNegativeButton: - altPositiveButton: space - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Cancel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: escape - altNegativeButton: - altPositiveButton: joystick button 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 + sensitivity: 0 snap: 0 invert: 0 type: 0 axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: Enable Debug Button 1 + m_Name: Enable Debug Button 2 descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: left ctrl + positiveButton: backspace altNegativeButton: - altPositiveButton: joystick button 8 + altPositiveButton: joystick button 9 gravity: 0 dead: 0 sensitivity: 0 @@ -310,13 +38,13 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: Enable Debug Button 2 + m_Name: Debug Reset descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: backspace + positiveButton: left alt altNegativeButton: - altPositiveButton: joystick button 9 + altPositiveButton: joystick button 1 gravity: 0 dead: 0 sensitivity: 0 @@ -469,19 +197,3 @@ InputManager: type: 2 axis: 5 joyNum: 0 - - serializedVersion: 3 - m_Name: Debug Reset - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left alt - altNegativeButton: - altPositiveButton: joystick button 1 - gravity: 0 - dead: 0 - sensitivity: 0 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 59b1561c0..ca9e773f0 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -9,8 +9,30 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_EnablePreviewPackages: 1 - oneTimeWarningShown: 1 + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 0 + m_Modified: 0 + m_Name: + m_Url: + m_Scopes: + - + m_SelectedScopeIndex: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 00beffd5d..2b1abf609 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -113,10 +113,13 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnableLateAcquireNextImage: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -129,6 +132,7 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 11400000, guid: b1cda8115d00ede46a9497b8eb9ae516, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -239,6 +243,7 @@ PlayerSettings: metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: BVPN9UFA9B iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -604,7 +609,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchApplicationID: 0x01004b9000490000 + switchApplicationID: 0x0100888888880000 switchNSODependencies: switchTitleNames_0: switchTitleNames_1: @@ -672,16 +677,16 @@ PlayerSettings: switchMainThreadStackSize: 1048576 switchPresenceGroupId: switchLogoHandling: 0 - switchReleaseVersion: 0 + switchReleaseVersion: 1 switchDisplayVersion: 1.0.0 - switchStartupUserAccount: 0 + switchStartupUserAccount: 1 switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: switchUserAccountSaveDataSize: 0 switchUserAccountSaveDataJournalSize: 0 - switchApplicationAttribute: 0 + switchApplicationAttribute: 1 switchCardSpecSize: -1 switchCardSpecClock: -1 switchRatingsMask: 0 @@ -754,6 +759,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -796,6 +802,8 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: - libc.prx @@ -831,22 +839,23 @@ PlayerSettings: webGLThreadsSupport: 0 webGLWasmStreaming: 0 scriptingDefineSymbols: - 1: - 4: - 7: - 13: - 14: + 1: TextMeshPro + 4: TextMeshPro + 7: TextMeshPro + 13: TextMeshPro + 14: TextMeshPro 17: 18: - 19: - 21: + 19: TextMeshPro + 21: TextMeshPro 23: 24: - 25: + 25: TextMeshPro 26: - 27: - 28: - 29: + 27: TextMeshPro + 28: TextMeshPro + 29: TextMeshPro + 30: TextMeshPro platformArchitecture: iPhone: 1 scriptingBackend: @@ -917,6 +926,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 0 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 396a5f349..57673098f 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.2f1 -m_EditorVersionWithRevision: 2019.4.2f1 (20b4642a3455) +m_EditorVersion: 2019.4.16f1 +m_EditorVersionWithRevision: 2019.4.16f1 (e05b6e02d63e)