diff --git a/Assets/Prefabs/Minigames/Airplane/PlaceholderSpawns/BouncySurface.prefab b/Assets/Prefabs/Minigames/Airplane/PlaceholderSpawns/BouncySurface.prefab index 7fc004ed..ab1a695d 100644 --- a/Assets/Prefabs/Minigames/Airplane/PlaceholderSpawns/BouncySurface.prefab +++ b/Assets/Prefabs/Minigames/Airplane/PlaceholderSpawns/BouncySurface.prefab @@ -93,7 +93,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6f1ff69bae8e49188f439a8e5cdb7dfc, type: 3} m_Name: m_EditorClassIdentifier: AppleHillsScripts::Minigames.Airplane.Interactive.AirplaneBouncySurface - bounceMultiplier: 1.5 + bounceMultiplier: 1.1 bounceDirection: {x: 0, y: 1} useReflection: 1 minBounceVelocity: 20 diff --git a/Assets/Scenes/MiniGames/ValentineNoteDelivery.unity b/Assets/Scenes/MiniGames/ValentineNoteDelivery.unity index e1b5e0a0..5418b387 100644 --- a/Assets/Scenes/MiniGames/ValentineNoteDelivery.unity +++ b/Assets/Scenes/MiniGames/ValentineNoteDelivery.unity @@ -495,6 +495,7 @@ GameObject: - component: {fileID: 263322554} - component: {fileID: 263322553} - component: {fileID: 263322555} + - component: {fileID: 263322556} m_Layer: 0 m_Name: FlightCamera m_TagString: Untagged @@ -527,7 +528,7 @@ MonoBehaviour: CustomLookAtTarget: 0 Lens: FieldOfView: 60 - OrthographicSize: 32.4 + OrthographicSize: 40 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -579,6 +580,104 @@ MonoBehaviour: RotationDamping: {x: 1, y: 1, z: 1} QuaternionDamping: 1 FollowOffset: {x: 0, y: 0, z: -10} +--- !u!114 &263322556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 263322552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f453f694addf4275988fac205bc91968, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineConfiner2D + BoundingShape2D: {fileID: 307517411} + Damping: 0.5 + SlowingDistance: 5 + OversizeWindow: + Enabled: 0 + MaxWindowSize: 0 + Padding: 0 + m_LegacyMaxWindowSize: -2 +--- !u!1 &307517409 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 307517410} + - component: {fileID: 307517411} + m_Layer: 0 + m_Name: CameraLimiter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &307517410 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307517409} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &307517411 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307517409} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 1600, y: 440} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 3500, y: 900} + m_EdgeRadius: 0 --- !u!1 &377530944 GameObject: m_ObjectHideFlags: 0 @@ -620,6 +719,7 @@ GameObject: m_Component: - component: {fileID: 595230075} - component: {fileID: 595230074} + - component: {fileID: 595230076} m_Layer: 0 m_Name: IntroCamera m_TagString: Untagged @@ -685,6 +785,26 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &595230076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 595230073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f453f694addf4275988fac205bc91968, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineConfiner2D + BoundingShape2D: {fileID: 307517411} + Damping: 0.5 + SlowingDistance: 5 + OversizeWindow: + Enabled: 0 + MaxWindowSize: 0 + Padding: 0 + m_LegacyMaxWindowSize: -2 --- !u!1 &597044885 GameObject: m_ObjectHideFlags: 0 @@ -1114,6 +1234,7 @@ GameObject: m_Component: - component: {fileID: 761345711} - component: {fileID: 761345710} + - component: {fileID: 761345712} m_Layer: 0 m_Name: AimingCamera m_TagString: Untagged @@ -1146,7 +1267,7 @@ MonoBehaviour: CustomLookAtTarget: 0 Lens: FieldOfView: 60 - OrthographicSize: 15 + OrthographicSize: 20 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -1179,6 +1300,26 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &761345712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761345709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f453f694addf4275988fac205bc91968, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineConfiner2D + BoundingShape2D: {fileID: 307517411} + Damping: 0.5 + SlowingDistance: 5 + OversizeWindow: + Enabled: 0 + MaxWindowSize: 0 + Padding: 0 + m_LegacyMaxWindowSize: -2 --- !u!1 &830587229 GameObject: m_ObjectHideFlags: 0 @@ -3709,16 +3850,13 @@ MonoBehaviour: poolMode: 0 pools: - prefabs: - - {fileID: 497267990420767357, guid: dc32284941c693c4f9e422f4197ca61e, type: 3} - {fileID: 1917678391913987792, guid: 989121c9099e41e469824ddeaf0e34a5, type: 3} - - {fileID: 7032677151789119314, guid: 7dc33e43acead834ba6a231b67cfd2d9, type: 3} + - {fileID: 497267990420767357, guid: dc32284941c693c4f9e422f4197ca61e, type: 3} unlockTime: 0 description: Base pool of positive obstacles overrideMinDistance: 0 overrideMaxDistance: 0 - - prefabs: - - {fileID: 1186710456879913970, guid: 006b956651124704dbae5bd4faab3152, type: 3} - - {fileID: 2434350760695575337, guid: f3188909ff4e845499a5cbfd0ae93101, type: 3} + - prefabs: [] unlockTime: 0 description: Base pool of negative obstacles overrideMinDistance: 0 @@ -3978,6 +4116,7 @@ GameObject: - component: {fileID: 1842736651} - component: {fileID: 1842736650} - component: {fileID: 1842736652} + - component: {fileID: 1842736653} m_Layer: 0 m_Name: TargetCamera m_TagString: Untagged @@ -4010,7 +4149,7 @@ MonoBehaviour: CustomLookAtTarget: 0 Lens: FieldOfView: 60 - OrthographicSize: 20 + OrthographicSize: 40 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -4062,6 +4201,26 @@ MonoBehaviour: RotationDamping: {x: 1, y: 1, z: 1} QuaternionDamping: 1 FollowOffset: {x: 0, y: 0, z: -10} +--- !u!114 &1842736653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1842736649} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f453f694addf4275988fac205bc91968, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineConfiner2D + BoundingShape2D: {fileID: 307517411} + Damping: 0.5 + SlowingDistance: 5 + OversizeWindow: + Enabled: 0 + MaxWindowSize: 0 + Padding: 0 + m_LegacyMaxWindowSize: -2 --- !u!1 &1930014901 GameObject: m_ObjectHideFlags: 0 @@ -4665,6 +4824,7 @@ GameObject: m_Component: - component: {fileID: 2041347574} - component: {fileID: 2041347573} + - component: {fileID: 2041347575} m_Layer: 0 m_Name: NextPersonCamera m_TagString: Untagged @@ -4730,6 +4890,26 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2041347575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041347572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f453f694addf4275988fac205bc91968, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineConfiner2D + BoundingShape2D: {fileID: 307517411} + Damping: 0.5 + SlowingDistance: 5 + OversizeWindow: + Enabled: 0 + MaxWindowSize: 0 + Padding: 0 + m_LegacyMaxWindowSize: -2 --- !u!1 &2049960991 GameObject: m_ObjectHideFlags: 0 @@ -5300,6 +5480,7 @@ SceneRoots: - {fileID: 761345711} - {fileID: 1842736651} - {fileID: 263322554} + - {fileID: 307517410} - {fileID: 1017291799} - {fileID: 1064542409} - {fileID: 1701327424} diff --git a/Assets/Settings/AirplaneSettings.asset b/Assets/Settings/AirplaneSettings.asset index ebab573f..cbc19e74 100644 --- a/Assets/Settings/AirplaneSettings.asset +++ b/Assets/Settings/AirplaneSettings.asset @@ -43,8 +43,8 @@ MonoBehaviour: bobbingAbilityConfig: abilityName: Air Hop abilityIcon: {fileID: -1386115237479607260, guid: ba6d4f958f29f8b45a8f670d869733fe, type: 3} - cooldownDuration: 3 - bobForce: {x: 10, y: 30} + cooldownDuration: 2 + bobForce: {x: -5, y: 15} dropPlaneConfig: displayName: Drop Plane prefab: {fileID: 2043346932243838886, guid: 86ef40d088d54a34d984edd9fce258bf, type: 3} @@ -61,12 +61,12 @@ MonoBehaviour: abilityIcon: {fileID: -5545584635573524598, guid: 333a17a4395130b46984c04bbb6e09ea, type: 3} cooldownDuration: 4 dropForce: 35 - dropDistance: 50 + dropDistance: 20 zeroHorizontalVelocity: 1 defaultAirplaneType: 1 slingshotSettings: maxDragDistance: 5 - baseLaunchForce: 50 + baseLaunchForce: 55 minForceMultiplier: 0.1 maxForceMultiplier: 1 trajectoryPoints: 20 @@ -75,17 +75,17 @@ MonoBehaviour: autoRegisterInput: 1 airplaneMass: 1 maxFlightTime: 60 - introDuration: 2 - personIntroDuration: 2 + introDuration: 1.5 + personIntroDuration: 1.5 evaluationDuration: 2 targetFlybyLingerDuration: 1.5 targetFlybyCameraBlendTime: 1 preSpawnBeyondTargetDistance: 50 targetMinDistance: 200 - targetMaxDistance: 300 - objectSpawnMinDistance: 5 - objectSpawnMaxDistance: 30 - positiveNegativeRatio: 0.7 + targetMaxDistance: 600 + objectSpawnMinDistance: 40 + objectSpawnMaxDistance: 100 + positiveNegativeRatio: 1 spawnDistanceAhead: 75 groundSpawnInterval: 30 recencyPenaltyDuration: 10