diff --git a/Assets/Prefabs/Managers.prefab b/Assets/Prefabs/Managers.prefab index 3a0115a..55f8805 100644 --- a/Assets/Prefabs/Managers.prefab +++ b/Assets/Prefabs/Managers.prefab @@ -1,5 +1,66 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3265376100503074144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8147740616816831829} + - component: {fileID: 651757028710057956} + m_Layer: 0 + m_Name: ZiplineObjectSpawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8147740616816831829 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3265376100503074144} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.19, y: -0.46499997, z: 2.09} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2256804901836316339} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &651757028710057956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3265376100503074144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d4b70d9c19a22d74b8c85690afb827f6, type: 3} + m_Name: + m_EditorClassIdentifier: + onZiplineObstaclePrefab: {fileID: 5488540336057008143, guid: a60f5f4b702681b43870b06f5492f798, type: 3} + betweenZiplinesObstaclePrefab: {fileID: 1101077831582084842, guid: 1f56e2386a64f9941acd2fc1c5eecf63, type: 3} + onZiplineMinSpawnInterval: 8 + onZiplineMaxSpawnInterval: 10 + onZiplineHangOffset: {x: 0, y: -2.15, z: 0} + betweenZiplinesMinSpawnInterval: 8 + betweenZiplinesMaxSpawnInterval: 10 + betweenZiplinesHangOffset: {x: 0, y: -1, z: 0} + betweenZiplinesRandomness: 0.25 + ziplines: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + enableSpawning: 1 --- !u!1 &5412168576371745707 GameObject: m_ObjectHideFlags: 0 @@ -31,6 +92,7 @@ Transform: m_Children: - {fileID: 618286124952384915} - {fileID: 1729588707412624039} + - {fileID: 8147740616816831829} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6560332851989473127 diff --git a/Assets/Prefabs/PlayerCapsule.prefab b/Assets/Prefabs/PlayerCapsule.prefab index 3a2b678..ca7f2f1 100644 --- a/Assets/Prefabs/PlayerCapsule.prefab +++ b/Assets/Prefabs/PlayerCapsule.prefab @@ -256,13 +256,13 @@ MonoBehaviour: m_EditorClassIdentifier: MoveSpeed: 4 SprintSpeed: 6 - lookSensitivity: {x: 1, y: 1} + lookSensitivity: {x: 3, y: 3} AimSensitivity: {x: 1.5, y: 1.5} - AimSpeed: 1.3333333 - AimTransitionTime: 0.15 - AimShoulderOffset: {x: 0.4, y: -0.1, z: 0.5} - AimShoulderFullPitchOffset: {x: 0.3, y: -0.05, z: 0.8} - AimRayOffset: 0.5 + AimSpeed: 1.333333 + AimTransitionTime: 0.1 + AimShoulderOffset: {x: 0.45, y: 0.1, z: 0.6} + AimShoulderFullPitchOffset: {x: 0.35, y: 0.2, z: 0.85} + AimRayOffset: 2 RotationSmoothTime: 0.12 SpeedChangeRate: 10 JumpHeight: 2 diff --git a/Assets/Prefabs/Zipline.prefab b/Assets/Prefabs/Zipline.prefab index b25721e..867a1df 100644 --- a/Assets/Prefabs/Zipline.prefab +++ b/Assets/Prefabs/Zipline.prefab @@ -73,6 +73,18 @@ MonoBehaviour: targetZip: {fileID: 0} cable: {fileID: 1409743947405648528} zipTransform: {fileID: 4212834925427053579} + leftParallelZipline: {fileID: 0} + rightParallelZipline: {fileID: 0} + switchCooldown: 0.5 + doubleTapWindow: 0.3 + switchTransitionDuration: 1 + switchWindupAmount: 0.8 + enableDodge: 1 + maxDodgeDistance: 0.01 + dodgeSpeed: 3 + dodgeReturnSpeed: 2 + dodgeRotationAngle: 60 + dodgeSmoothTime: 0.1 zipSpeed: 10 hangLocalOffset: {x: 0, y: -1.08, z: 0} exitForward: 0.6 @@ -85,6 +97,11 @@ MonoBehaviour: camFollowLerp: 12 zipping: 0 animationManager: {fileID: 0} + obstacleCheckDistance: 0.05 + obstacleCheckRadius: 0.05 + obstacleLayer: + serializedVersion: 2 + m_Bits: 1 --- !u!120 &1409743947405648528 LineRenderer: serializedVersion: 2 diff --git a/Assets/Scenes/JianwenMechanics.unity b/Assets/Scenes/JianwenMechanics.unity index ae34936..0cf488a 100644 --- a/Assets/Scenes/JianwenMechanics.unity +++ b/Assets/Scenes/JianwenMechanics.unity @@ -565,67 +565,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f79cdd8484aabdb4ba687befc6cea43a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &81864614 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 81864616} - - component: {fileID: 81864615} - m_Layer: 0 - m_Name: ZiplineObjectSpawner - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &81864615 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 81864614} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d4b70d9c19a22d74b8c85690afb827f6, type: 3} - m_Name: - m_EditorClassIdentifier: - onZiplineObstaclePrefab: {fileID: 5488540336057008143, guid: a60f5f4b702681b43870b06f5492f798, type: 3} - betweenZiplinesObstaclePrefab: {fileID: 1101077831582084842, guid: 1f56e2386a64f9941acd2fc1c5eecf63, type: 3} - onZiplineMinSpawnInterval: 8 - onZiplineMaxSpawnInterval: 10 - onZiplineHangOffset: {x: 0, y: -2.15, z: 0} - betweenZiplinesMinSpawnInterval: 8 - betweenZiplinesMaxSpawnInterval: 10 - betweenZiplinesHangOffset: {x: 0, y: -1, z: 0} - betweenZiplinesRandomness: 0.25 - ziplines: - - {fileID: 81305384} - - {fileID: 1340952120} - - {fileID: 435117237} - - {fileID: 789610633} - - {fileID: 1505869037} - - {fileID: 1662637136} - enableSpawning: 1 ---- !u!4 &81864616 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 81864614} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &82415272 GameObject: m_ObjectHideFlags: 0 @@ -8255,10 +8194,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 627451777632920414, guid: b988db11b27b8644bbd3b8d074554ee6, type: 3} - propertyPath: canPush - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1044206370189926961, guid: b988db11b27b8644bbd3b8d074554ee6, type: 3} propertyPath: animationManager value: @@ -8942,10 +8877,6 @@ PrefabInstance: propertyPath: m_Name value: OnZiplineObstacle objectReference: {fileID: 0} - - target: {fileID: 5488540336057008143, guid: a60f5f4b702681b43870b06f5492f798, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5840044420713898455, guid: a60f5f4b702681b43870b06f5492f798, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -9077,10 +9008,6 @@ PrefabInstance: propertyPath: m_Name value: Zipline1 objectReference: {fileID: 0} - - target: {fileID: 1582543866377477107, guid: e0d244083925df641b599032b01c4b3b, type: 3} - propertyPath: m_Layer - value: 11 - objectReference: {fileID: 0} - target: {fileID: 2647917230671439419, guid: e0d244083925df641b599032b01c4b3b, type: 3} propertyPath: m_LocalPosition.x value: 24.5 @@ -9121,42 +9048,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3414100932025189759, guid: e0d244083925df641b599032b01c4b3b, type: 3} - propertyPath: m_Layer - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 7429221701515789806, guid: e0d244083925df641b599032b01c4b3b, type: 3} - propertyPath: m_Layer - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 7794498724034685897, guid: e0d244083925df641b599032b01c4b3b, type: 3} - propertyPath: m_Layer - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 7905243041908624474, guid: e0d244083925df641b599032b01c4b3b, type: 3} - propertyPath: animator - value: - objectReference: {fileID: 1327055177} - target: {fileID: 7905243041908624474, guid: e0d244083925df641b599032b01c4b3b, type: 3} propertyPath: targetZip value: objectReference: {fileID: 1340952120} - - target: {fileID: 7905243041908624474, guid: e0d244083925df641b599032b01c4b3b, type: 3} - propertyPath: ziplineFOV - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 7905243041908624474, guid: e0d244083925df641b599032b01c4b3b, type: 3} - propertyPath: camLookUpPitch - value: -5 - objectReference: {fileID: 0} - target: {fileID: 7905243041908624474, guid: e0d244083925df641b599032b01c4b3b, type: 3} propertyPath: animationManager value: objectReference: {fileID: 1338489537} - - target: {fileID: 7905243041908624474, guid: e0d244083925df641b599032b01c4b3b, type: 3} - propertyPath: camLocalOffset.y - value: -0.5 - objectReference: {fileID: 0} - target: {fileID: 7905243041908624474, guid: e0d244083925df641b599032b01c4b3b, type: 3} propertyPath: maxDodgeDistance value: 0.01 @@ -9626,6 +9525,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 651757028710057956, guid: 9524933c7921977459973a0970add5f6, type: 3} + propertyPath: 'ziplines.Array.data[0]' + value: + objectReference: {fileID: 81305384} + - target: {fileID: 651757028710057956, guid: 9524933c7921977459973a0970add5f6, type: 3} + propertyPath: 'ziplines.Array.data[1]' + value: + objectReference: {fileID: 1340952120} + - target: {fileID: 651757028710057956, guid: 9524933c7921977459973a0970add5f6, type: 3} + propertyPath: 'ziplines.Array.data[2]' + value: + objectReference: {fileID: 435117237} + - target: {fileID: 651757028710057956, guid: 9524933c7921977459973a0970add5f6, type: 3} + propertyPath: 'ziplines.Array.data[3]' + value: + objectReference: {fileID: 789610633} + - target: {fileID: 651757028710057956, guid: 9524933c7921977459973a0970add5f6, type: 3} + propertyPath: 'ziplines.Array.data[4]' + value: + objectReference: {fileID: 1505869037} + - target: {fileID: 651757028710057956, guid: 9524933c7921977459973a0970add5f6, type: 3} + propertyPath: 'ziplines.Array.data[5]' + value: + objectReference: {fileID: 1662637136} - target: {fileID: 2256804901836316339, guid: 9524933c7921977459973a0970add5f6, type: 3} propertyPath: m_LocalPosition.x value: 4.19 @@ -9699,10 +9622,6 @@ PrefabInstance: propertyPath: m_Name value: BetweenZiplineObstacle objectReference: {fileID: 0} - - target: {fileID: 1101077831582084842, guid: 1f56e2386a64f9941acd2fc1c5eecf63, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6182274009385417723, guid: 1f56e2386a64f9941acd2fc1c5eecf63, type: 3} propertyPath: m_LocalPosition.x value: 1.13 @@ -9837,4 +9756,3 @@ SceneRoots: - {fileID: 896827811} - {fileID: 1324366311} - {fileID: 8361807558860476094} - - {fileID: 81864616}