diff --git a/Assets/Art/animation/CameraController.controller b/Assets/Art/animation/CameraController.controller index 20ae8ee..c631807 100644 --- a/Assets/Art/animation/CameraController.controller +++ b/Assets/Art/animation/CameraController.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Enemy1 + m_Name: Player_Near m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -37,29 +37,80 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -4912816998625314055} - m_Position: {x: 30, y: -10, z: 0} + m_Position: {x: 200, y: -20, z: 0} - serializedVersion: 1 m_State: {fileID: 529454290501807675} - m_Position: {x: 260, y: -20, z: 0} - - serializedVersion: 1 - m_State: {fileID: 6840702861683222165} - m_Position: {x: 490, y: -20, z: 0} + m_Position: {x: 550, y: -60, z: 0} - serializedVersion: 1 m_State: {fileID: 6520950340159754818} - m_Position: {x: 380, y: 70, z: 0} + m_Position: {x: 800, y: 90, z: 0} - serializedVersion: 1 m_State: {fileID: -459109085753184346} - m_Position: {x: 140, y: 70, z: 0} + m_Position: {x: 210, y: 210, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: 4506480134184134739} + - {fileID: 4531484484517022894} + - {fileID: -679735541322988862} + - {fileID: -1126859450401326222} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: -60, y: -290, z: 0} - m_EntryPosition: {x: -210, y: 320, z: 0} + m_AnyStatePosition: {x: 450, y: 100, z: 0} + m_EntryPosition: {x: 60, y: 450, z: 0} m_ExitPosition: {x: 400, y: -290, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -459109085753184346} +--- !u!1101 &-1126859450401326222 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: TriggerState + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -459109085753184346} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-679735541322988862 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: TriggerState + m_EventTreshold: 3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6520950340159754818} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-459109085753184346 AnimatorState: serializedVersion: 6 @@ -94,7 +145,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: CameraController serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: TriggerState + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -115,7 +172,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Enemy2 + m_Name: Player_Far m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -134,6 +191,56 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &4506480134184134739 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: TriggerState + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4912816998625314055} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &4531484484517022894 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: TriggerState + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 529454290501807675} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &6520950340159754818 AnimatorState: serializedVersion: 6 @@ -141,33 +248,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Global - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &6840702861683222165 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Enemy3 + m_Name: CloseUp m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/Assets/GameRes/AlwaysRes/CameraVcams Blends.asset b/Assets/GameRes/AlwaysRes/CameraVcams Blends.asset new file mode 100644 index 0000000..695f68f --- /dev/null +++ b/Assets/GameRes/AlwaysRes/CameraVcams Blends.asset @@ -0,0 +1,70 @@ +%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: 36baaa8bdcb9d8b49b9199833965d2c3, type: 3} + m_Name: CameraVcams Blends + m_EditorClassIdentifier: + m_CustomBlends: + - m_From: '**ANY CAMERA**' + m_To: CM vcam1_CloseUp + m_Blend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + - m_From: '**ANY CAMERA**' + m_To: CM vcam1_player_Near + m_Blend: + m_Style: 1 + m_Time: 1 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + - m_From: CM vcam1_player_Near + m_To: CM vcam1_player_Far + m_Blend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + - m_From: CM vcam1_player_Far + m_To: CM vcam1_player_Near + m_Blend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + - m_From: '**ANY CAMERA**' + m_To: CM vcam1_Normal + m_Blend: + m_Style: 1 + m_Time: 1 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 diff --git a/Assets/GameRes/AlwaysRes/CameraVcams Blends.asset.meta b/Assets/GameRes/AlwaysRes/CameraVcams Blends.asset.meta new file mode 100644 index 0000000..2b3b60c --- /dev/null +++ b/Assets/GameRes/AlwaysRes/CameraVcams Blends.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a25c32e89705e046983fe564f1631b5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameRes/Audio/BGM/bgmBattle.mp3 b/Assets/GameRes/Audio/BGM/bgmBattle.mp3 deleted file mode 100644 index 1ef7ec2..0000000 Binary files a/Assets/GameRes/Audio/BGM/bgmBattle.mp3 and /dev/null differ diff --git a/Assets/GameRes/Audio/BGM/bgmBattle.mp3.meta b/Assets/GameRes/Audio/BGM/bgmBattle.mp3.meta deleted file mode 100644 index 08b2e9b..0000000 --- a/Assets/GameRes/Audio/BGM/bgmBattle.mp3.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: d011199bd11380c4aac99cdb89a54349 -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: {} - forceToMono: 1 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameRes/Audio/BGM/bgmHome.mp3 b/Assets/GameRes/Audio/BGM/bgmHome.mp3 deleted file mode 100644 index 3d65ebf..0000000 Binary files a/Assets/GameRes/Audio/BGM/bgmHome.mp3 and /dev/null differ diff --git a/Assets/GameRes/Audio/BGM/bgmHome.mp3.meta b/Assets/GameRes/Audio/BGM/bgmHome.mp3.meta deleted file mode 100644 index 070a5d8..0000000 --- a/Assets/GameRes/Audio/BGM/bgmHome.mp3.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: edda127d7a1adfb489846964c1399968 -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: {} - forceToMono: 1 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameRes/Audio/BGM/bgmNormal.mp3 b/Assets/GameRes/Audio/BGM/bgmNormal.mp3 deleted file mode 100644 index 6440085..0000000 Binary files a/Assets/GameRes/Audio/BGM/bgmNormal.mp3 and /dev/null differ diff --git a/Assets/GameRes/Audio/BGM/bgmNormal.mp3.meta b/Assets/GameRes/Audio/BGM/bgmNormal.mp3.meta deleted file mode 100644 index ee1ed0a..0000000 --- a/Assets/GameRes/Audio/BGM/bgmNormal.mp3.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: 1767d244015edce469a42732235e2e84 -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: {} - forceToMono: 1 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameRes/AutoSource/GraphCaches/GraphCache_Part1.bytes b/Assets/GameRes/AutoSource/GraphCaches/GraphCache_Part1.bytes new file mode 100644 index 0000000..713f36b Binary files /dev/null and b/Assets/GameRes/AutoSource/GraphCaches/GraphCache_Part1.bytes differ diff --git a/Assets/GameRes/Scenes/MainScene.unity.meta b/Assets/GameRes/AutoSource/GraphCaches/GraphCache_Part1.bytes.meta similarity index 62% rename from Assets/GameRes/Scenes/MainScene.unity.meta rename to Assets/GameRes/AutoSource/GraphCaches/GraphCache_Part1.bytes.meta index 2908827..7366fcb 100644 --- a/Assets/GameRes/Scenes/MainScene.unity.meta +++ b/Assets/GameRes/AutoSource/GraphCaches/GraphCache_Part1.bytes.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: f8bb5673c3bae9e4384de506cd61b38b -DefaultImporter: +guid: 76e02fa1a687fa842bb9821ee3bcce1e +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/GameRes/AutoSource/Part/Part1.prefab b/Assets/GameRes/AutoSource/Part/Part1.prefab index 8eb1c3c..89a0e86 100644 --- a/Assets/GameRes/AutoSource/Part/Part1.prefab +++ b/Assets/GameRes/AutoSource/Part/Part1.prefab @@ -2706,6 +2706,37 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1 &2951899695186880099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 25658124931772993} + m_Layer: 0 + m_Name: CreatePos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &25658124931772993 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951899695186880099} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.33, y: 26.54, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7896263081528720634} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3028825735974966724 GameObject: m_ObjectHideFlags: 0 @@ -7049,6 +7080,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7896263081528720634} + - component: {fileID: 2762688269040569008} m_Layer: 0 m_Name: Part1 m_TagString: Untagged @@ -7070,8 +7102,27 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 616514602959178244} + - {fileID: 3706760904711950241} + - {fileID: 25658124931772993} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2762688269040569008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8707143915496760953} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2198455a7d46404bab676464cf70ce14, type: 3} + m_Name: + m_EditorClassIdentifier: + mapCacheData: {fileID: 4900000, guid: eb538f7c02817f2448aca956bb0c6050, type: 3} + cameraCollider: {fileID: 4977006423313078515} + createPos: {fileID: 25658124931772993} + completeConditionNumber: 10 + playerBaseSpeed: 4 --- !u!1 &8864768695506071259 GameObject: m_ObjectHideFlags: 0 @@ -7462,6 +7513,87 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1 &9076449540582646482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3706760904711950241} + - component: {fileID: 4977006423313078515} + m_Layer: 0 + m_Name: CameraBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3706760904711950241 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9076449540582646482} + 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: 7896263081528720634} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &4977006423313078515 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9076449540582646482} + m_Enabled: 1 + 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: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + 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_Points: + m_Paths: + - - {x: 10, y: 29} + - {x: -10, y: 29} + - {x: -10, y: -1} + - {x: 10, y: -1} + m_UseDelaunayMesh: 0 --- !u!1 &9184564038324742349 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameRes/Scenes/InitScene.unity b/Assets/GameRes/Scenes/InitScene.unity index 792a28d..535ce7c 100644 --- a/Assets/GameRes/Scenes/InitScene.unity +++ b/Assets/GameRes/Scenes/InitScene.unity @@ -679,6 +679,102 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4df116eebd24a984d949044a8237c142, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &148489005 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 148489007} + - component: {fileID: 148489006} + - component: {fileID: 148489008} + m_Layer: 0 + m_Name: CM vcam1_Normal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &148489006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 148489005} + 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: 60 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 320005371} +--- !u!4 &148489007 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 148489005} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000001560446, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.12002945} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 320005371} + m_Father: {fileID: 1944799158} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &148489008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 148489005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00b2d199b96b516448144ab30fb26aed, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ApplyAfter: 1 + m_ChannelMask: -1 + m_Gain: 1 + m_Use2DDistance: 1 + m_UseCameraSpace: 0 + m_ReactionSettings: + m_SecondaryNoise: {fileID: 0} + m_AmplitudeGain: 0 + m_FrequencyGain: 0 + m_Duration: 0 + m_NoiseOffsets: {x: -945.2395, y: -240.24667, z: 109.429474} --- !u!1 &187771246 GameObject: m_ObjectHideFlags: 0 @@ -774,6 +870,68 @@ MonoBehaviour: m_EffectColor: {r: 0.8867924, g: 0.8867924, b: 0.8867924, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &320005370 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 320005371} + - component: {fileID: 320005373} + - component: {fileID: 320005372} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &320005371 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320005370} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 95.920044, y: -1306.2698, z: 5739.9976} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 148489007} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &320005372 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320005370} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2} + m_PivotOffset: {x: 0.5, y: 0.5, z: 0} + m_AmplitudeGain: 1 + m_FrequencyGain: 0.5 + mNoiseOffsets: {x: -79.48648, y: -746.67334, z: -1.0031738} +--- !u!114 &320005373 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320005370} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &355335388 PrefabInstance: m_ObjectHideFlags: 0 @@ -926,6 +1084,143 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 505887312} m_CullTransparentMesh: 1 +--- !u!1 &559641485 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 559641486} + - component: {fileID: 559641489} + - component: {fileID: 559641488} + - component: {fileID: 559641487} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &559641486 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559641485} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 95.920044, y: -1306.2698, z: 5739.9976} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1956134146} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &559641487 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559641485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_TargetMovementOnly: 1 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_CameraDistance: 5 + m_DeadZoneWidth: 0.25 + m_DeadZoneHeight: 0.2 + m_DeadZoneDepth: 0 + m_UnlimitedSoftZone: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 + m_GroupFramingMode: 2 + m_AdjustmentMode: 0 + m_GroupFramingSize: 0.8 + m_MaxDollyIn: 5000 + m_MaxDollyOut: 5000 + m_MinimumDistance: 1 + m_MaximumDistance: 5000 + m_MinimumFOV: 3 + m_MaximumFOV: 60 + m_MinimumOrthoSize: 1 + m_MaximumOrthoSize: 5000 +--- !u!114 &559641488 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559641485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2} + m_PivotOffset: {x: 0.5, y: 0.5, z: 0} + m_AmplitudeGain: 1 + m_FrequencyGain: 0.5 + mNoiseOffsets: {x: -79.48648, y: -746.67334, z: -1.0031738} +--- !u!114 &559641489 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559641485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &629963847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 629963848} + m_Layer: 0 + m_Name: closeUpTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &629963848 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629963847} + 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: 1344272198} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &896528012 GameObject: m_ObjectHideFlags: 0 @@ -1058,8 +1353,9 @@ GameObject: - component: {fileID: 902809062} - component: {fileID: 902809061} - component: {fileID: 902809063} + - component: {fileID: 902809064} m_Layer: 0 - m_Name: CM vcam1_player + m_Name: CM vcam1_player_Near m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1113,7 +1409,7 @@ Transform: m_GameObject: {fileID: 902809060} serializedVersion: 2 m_LocalRotation: {x: 0.00000001560446, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.5386075, y: -7.511631, z: 0.12002945} + m_LocalPosition: {x: -2.31, y: -4.389999, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1142,7 +1438,22 @@ MonoBehaviour: m_AmplitudeGain: 0 m_FrequencyGain: 0 m_Duration: 0 - m_NoiseOffsets: {x: 0, y: 0, z: 0} + m_NoiseOffsets: {x: 77.47183, y: 742.04846, z: -873.8286} +--- !u!114 &902809064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902809060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f453f694addf4275988fac205bc91968, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BoundingShape2D: {fileID: 1944799163} + m_Damping: 1.5 + m_MaxWindowSize: -1 --- !u!1 &1153590224 GameObject: m_ObjectHideFlags: 0 @@ -1202,6 +1513,118 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: volumeProfile: {fileID: 11400000, guid: aeadef30decdbc64c95f6ce2e8f5a54f, type: 2} +--- !u!1 &1201757649 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1201757651} + - component: {fileID: 1201757650} + - component: {fileID: 1201757652} + - component: {fileID: 1201757653} + m_Layer: 0 + m_Name: CM vcam1_player_Far + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1201757650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1201757649} + 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: 355335390} + m_Lens: + FieldOfView: 60 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1919159969} +--- !u!4 &1201757651 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1201757649} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000001560446, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.31, y: -4.3899994, z: -15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1919159969} + m_Father: {fileID: 1944799158} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1201757652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1201757649} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00b2d199b96b516448144ab30fb26aed, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ApplyAfter: 1 + m_ChannelMask: -1 + m_Gain: 1 + m_Use2DDistance: 1 + m_UseCameraSpace: 0 + m_ReactionSettings: + m_SecondaryNoise: {fileID: 0} + m_AmplitudeGain: 0 + m_FrequencyGain: 0 + m_Duration: 0 + m_NoiseOffsets: {x: -683.2471, y: -735.84265, z: -704.9739} +--- !u!114 &1201757653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1201757649} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f453f694addf4275988fac205bc91968, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BoundingShape2D: {fileID: 1944799163} + m_Damping: 0.5 + m_MaxWindowSize: -1 --- !u!1 &1230494199 GameObject: m_ObjectHideFlags: 0 @@ -1250,7 +1673,7 @@ MonoBehaviour: data: dataString: UEsDBBQAAAgIAABAIezAzJGNYgIAABkFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFtVMty2jAU/RVG65KxXWigu5YQ0kUSJrSTjTfCusYaZMmjR4Bk+PfqyjJ2aL2xfM59nPuQPwiXpoHCKr3SnD0qBuT7iOCZfBn15AMc6U7JDX+HzuaVM1uhEQ02L9Ry5fEU3YyqwWpe/JA7gcaJB53kpdL1ku1goYw1Hi6pMOAprSx6Sw99jMjRv8ZzdDn5U3aLp3d/miejsz8WIC3o3rQzTG5mCT5ZNG+tnSwErRtgKL13ytLoNcmCmfRFRYvk5usU0yghuImiiD01oegXesKSGae+wKACA1XAd5XFsEPH57I0YKNCTU93XPs+tRHJT9U2r6Zm38p6o8JhjjSbBUlt0Md/+HEa6FKr+qHLmyaYw1a82HuFBTV20N0hfPdZuJMHKvZ0K+C1AvmkVlo5yTxptUNXZyC76z8vpS0qKPY93kq9Al3znxnF2WAN51D9cSF4vQ1tn7TARqjQ67ABoP1gfnnBYT9MDOFRVPHHwG+6Gy5SJO65NtZTsUqJ8rbKaTQly9AzrMbZhdISAhxFNyCpsKe1D2OvR3jFDdJeMfcUr0xMHrnuJly5BLi3T5Iraq0Ol2GZSh0ewVTPzgouoReNxJPv00JJ2W7YsCed28bpkhYDt53j7PNqkWkyyQDotEhgMk3n8/Ht7WT7bbZNZ/OygJIyEnaPS18nFetWaGyPn5rsg0u/Z92fZLTStAnbzjQ9rPh7rQYt57JUm0IDyOc2wkU4aJ/EX0q2ZNw3aAPWchnmTT5yIlSxB5ZfAuWh0uXRapr3UXLS8DdlEcnJIvw6coLwZZfXGt44HDB5F+xMzn8BUEsDBBQAAAgIAABAIey/sM2JbQAAAHgAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNEz0jM011FQSi9KLMgoBooYgjilmSkgdrSSqYGJUWpqommyQaqJqaGlpa65uUmSmUWSoYVlWnJqWmKKUixQfUllQapfYm4qRE9AYklGWmZeSmZeup57UWaKO8hopdhaAFBLAQItABQAAAgIAABAIezAzJGNYgIAABkFAAALACQAAAAAAAAAAAAAAAAAAABncmFwaDAuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLAQItABQAAAgIAABAIey/sM2JbQAAAHgAAAAJACQAAAAAAAAAAAAAAK8CAABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwUGAAAAAAIAAgC4AAAAZwMAAAAA upgradeData: - file_cachedStartup: {fileID: 4900000, guid: eb538f7c02817f2448aca956bb0c6050, type: 3} + file_cachedStartup: {fileID: 0} data_cachedStartup: cacheStartup: 0 showNavGraphs: 1 @@ -1263,7 +1686,7 @@ MonoBehaviour: unwalkableNodeDebugSize: 0.3 logPathResults: 1 maxNearestNodeDistance: 100 - scanOnStartup: 1 + scanOnStartup: 0 fullGetNearestSearch: 0 prioritizeGraphs: 0 prioritizeGraphsLimit: 1 @@ -1631,6 +2054,7 @@ Transform: m_Children: - {fileID: 1230494200} - {fileID: 355335390} + - {fileID: 629963848} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1344272199 @@ -1646,6 +2070,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: PlayerEntity: {fileID: 355335389} + ScenePart: {fileID: 0} + Pathfinder: {fileID: 1230494201} --- !u!1 &1575124293 GameObject: m_ObjectHideFlags: 0 @@ -1723,7 +2149,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowDebugText: 0 + m_ShowDebugText: 1 m_ShowCameraFrustum: 1 m_IgnoreTimeScale: 0 m_WorldUpOverride: {fileID: 0} @@ -1805,7 +2231,7 @@ Transform: m_GameObject: {fileID: 1575124293} serializedVersion: 2 m_LocalRotation: {x: 0.00000001560446, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.31, y: -4.389999, z: -12} + m_LocalPosition: {x: 0, y: 0, z: -11.879971} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2520,6 +2946,112 @@ MonoBehaviour: m_EditorClassIdentifier: showTime: 0.1 tvFpsInfo: {fileID: 187771248} +--- !u!1 &1919159968 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1919159969} + - component: {fileID: 1919159972} + - component: {fileID: 1919159971} + - component: {fileID: 1919159970} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1919159969 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919159968} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 95.920044, y: -1306.2698, z: 5739.9976} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1201757651} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1919159970 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919159968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: -15} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_TargetMovementOnly: 1 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_CameraDistance: 12 + m_DeadZoneWidth: 0.25 + m_DeadZoneHeight: 0.2 + m_DeadZoneDepth: 0 + m_UnlimitedSoftZone: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 + m_GroupFramingMode: 2 + m_AdjustmentMode: 0 + m_GroupFramingSize: 0.8 + m_MaxDollyIn: 5000 + m_MaxDollyOut: 5000 + m_MinimumDistance: 1 + m_MaximumDistance: 5000 + m_MinimumFOV: 3 + m_MaximumFOV: 60 + m_MinimumOrthoSize: 1 + m_MaximumOrthoSize: 5000 +--- !u!114 &1919159971 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919159968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NoiseProfile: {fileID: 11400000, guid: 554b0ed52734c154eab51f6cedd3a7d7, type: 2} + m_PivotOffset: {x: 0.25, y: 0.25, z: 0.25} + m_AmplitudeGain: 0.5 + m_FrequencyGain: 5 + mNoiseOffsets: {x: -79.48648, y: -746.67334, z: -1.0031738} +--- !u!114 &1919159972 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1919159968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1944799157 GameObject: m_ObjectHideFlags: 0 @@ -2529,6 +3061,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1944799158} + - component: {fileID: 1944799160} + - component: {fileID: 1944799159} + - component: {fileID: 1944799162} + - component: {fileID: 1944799163} m_Layer: 0 m_Name: CameraVcams m_TagString: Untagged @@ -2545,13 +3081,264 @@ Transform: m_GameObject: {fileID: 1944799157} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.77139246, y: 3.1216323, z: -12.120029} + m_LocalPosition: {x: 0, y: 0, z: -12} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 902809062} + - {fileID: 1201757651} + - {fileID: 148489007} + - {fileID: 1956134146} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1944799159 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1944799157} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 95713a5e0b3bf7245b10240f1686865c, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1944799160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1944799157} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 325a6a3050a061e4b8aa51386c30e8e1, 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_AnimatedTarget: {fileID: 1944799159} + m_LayerIndex: 0 + m_ShowDebugText: 0 + m_ChildCameras: + - {fileID: 902809061} + - {fileID: 1201757650} + - {fileID: 148489006} + - {fileID: 1956134145} + m_Instructions: + - m_FullHash: 1293887598 + m_VirtualCamera: {fileID: 902809061} + m_ActivateAfter: 0 + m_MinDuration: 0 + - m_FullHash: 1289917270 + m_VirtualCamera: {fileID: 1201757650} + m_ActivateAfter: 0 + m_MinDuration: 0 + - m_FullHash: -1018011081 + m_VirtualCamera: {fileID: 1956134145} + m_ActivateAfter: 0 + m_MinDuration: 0 + - m_FullHash: -153225821 + m_VirtualCamera: {fileID: 148489006} + m_ActivateAfter: 0 + m_MinDuration: 0 + m_DefaultBlend: + m_Style: 1 + m_Time: 0.5 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CustomBlends: {fileID: 11400000, guid: 9a25c32e89705e046983fe564f1631b5, type: 2} + m_ParentHash: + - m_Hash: 1293887598 + m_ParentHash: 756556552 + - m_Hash: 1289917270 + m_ParentHash: 756556552 + - m_Hash: -1018011081 + m_ParentHash: 756556552 + - m_Hash: -153225821 + m_ParentHash: 756556552 +--- !u!114 &1944799162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1944799157} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4f8145a01fd4f7ba6c04e2faccca4d2, type: 3} + m_Name: + m_EditorClassIdentifier: + mainCamera: {fileID: 1575124296} + cameraAnimator: {fileID: 1944799159} + closeUpTarget: {fileID: 629963848} + boxBorder: {fileID: 1944799163} + cameraState: 0 +--- !u!60 &1944799163 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1944799157} + m_Enabled: 1 + 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: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + 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_Points: + m_Paths: + - - {x: 0, y: 1} + - {x: -0.95105654, y: 0.30901697} + - {x: -0.5877852, y: -0.80901706} + - {x: 0.58778536, y: -0.80901694} + - {x: 0.9510565, y: 0.30901712} + m_UseDelaunayMesh: 0 +--- !u!1 &1956134144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1956134146} + - component: {fileID: 1956134145} + - component: {fileID: 1956134147} + m_Layer: 0 + m_Name: CM vcam1_CloseUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1956134145 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1956134144} + 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: 629963848} + m_Lens: + FieldOfView: 45 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 559641486} +--- !u!4 &1956134146 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1956134144} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000001560446, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.00000021564924, z: 7} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 559641486} + m_Father: {fileID: 1944799158} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1956134147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1956134144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00b2d199b96b516448144ab30fb26aed, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ApplyAfter: 1 + m_ChannelMask: -1 + m_Gain: 1 + m_Use2DDistance: 1 + m_UseCameraSpace: 0 + m_ReactionSettings: + m_SecondaryNoise: {fileID: 0} + m_AmplitudeGain: 0 + m_FrequencyGain: 0 + m_Duration: 0 + m_NoiseOffsets: {x: 146.17432, y: 549.1821, z: 680.0964} --- !u!1 &2003829798 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameRes/Scenes/MainScene.unity b/Assets/GameRes/Scenes/MainScene.unity deleted file mode 100644 index 68b38f3..0000000 --- a/Assets/GameRes/Scenes/MainScene.unity +++ /dev/null @@ -1,270 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &923207396 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 923207399} - - component: {fileID: 923207398} - - component: {fileID: 923207397} - m_Layer: 0 - m_Name: CM vcam1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &923207397 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 923207396} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 00b2d199b96b516448144ab30fb26aed, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ApplyAfter: 1 - m_ChannelMask: -1 - m_Gain: 1 - m_Use2DDistance: 1 - m_UseCameraSpace: 0 - m_ReactionSettings: - m_SecondaryNoise: {fileID: 0} - m_AmplitudeGain: 0 - m_FrequencyGain: 0 - m_Duration: 0 - m_NoiseOffsets: {x: 0, y: 0, z: 0} ---- !u!114 &923207398 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 923207396} - 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: 60 - OrthographicSize: 5 - NearClipPlane: 0.3 - FarClipPlane: 1000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 1038405353} ---- !u!4 &923207399 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 923207396} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1038405353} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1038405352 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1038405353} - - component: {fileID: 1038405354} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1038405353 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1038405352} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 95.920044, y: -1306.2698, z: 5739.9976} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 923207399} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1038405354 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1038405352} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 923207399} diff --git a/Assets/Scripts/Game/Component/CameraManager.cs b/Assets/Scripts/Game/Component/CameraManager.cs new file mode 100644 index 0000000..fb64bed --- /dev/null +++ b/Assets/Scripts/Game/Component/CameraManager.cs @@ -0,0 +1,62 @@ +using Cinemachine; +using Framework.Timer; +using Sirenix.Utilities; +using UnityEngine; + +namespace Game.Component +{ + public class CameraManager : MonoBehaviour + { + public enum CameraState + { + Normal = 0, // 正常 + Player_Near, // 在玩家附近 + Player_Far, // 在玩家远处 + CloseUp // 特写镜头 + } + + [SerializeField] private Camera mainCamera; + [SerializeField] private Animator cameraAnimator; + [SerializeField] private Transform closeUpTarget; + [SerializeField] private PolygonCollider2D boxBorder; + + public CameraState cameraState = CameraState.Normal; + private static readonly int TriggerState = Animator.StringToHash ("TriggerState"); + private TimeHandler _closeUpTimeHandler; + + + public void SetCameraState (CameraState state) + { + this.cameraState = state; + this.cameraAnimator.SetInteger (TriggerState , (int)state); + } + + public void SetCloseUpTarget (Transform target , float duration = 3) + { + this._closeUpTimeHandler?.Kill (); + var lastState = this.cameraState; + this.closeUpTarget.position = target.position; + SetCameraState (CameraState.CloseUp); + this._closeUpTimeHandler = GameUpdateMgr.Instance.CreateTimer (duration , () => + { + SetCameraState (lastState); + this._closeUpTimeHandler = null; + }); + } + + public void SetBoxCollider (PolygonCollider2D box) + { + this.boxBorder.offset = box.offset; + this.boxBorder.pathCount = box.pathCount; + this.boxBorder.points = box.points; + this.transform.GetComponentsInChildren ().ForEach (d => d.InvalidateCache ()); + } + + public static CameraManager Instance { get; private set; } + + private void Awake () + { + Instance = this; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/CameraManager.cs.meta b/Assets/Scripts/Game/Component/CameraManager.cs.meta new file mode 100644 index 0000000..8df49a1 --- /dev/null +++ b/Assets/Scripts/Game/Component/CameraManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c4f8145a01fd4f7ba6c04e2faccca4d2 +timeCreated: 1729479839 \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/MapContent.cs b/Assets/Scripts/Game/Component/MapContent.cs index 629656b..ae78b89 100644 --- a/Assets/Scripts/Game/Component/MapContent.cs +++ b/Assets/Scripts/Game/Component/MapContent.cs @@ -1,11 +1,15 @@ using System; +using Framework.Timer; using UnityEngine; namespace Game.Component { public class MapContent : MonoBehaviour { - public PlayerEntity PlayerEntity; + public PlayerEntity PlayerEntity; + [HideInInspector] public ScenePart ScenePart; + public AstarPath Pathfinder; + //玩家位置 public Vector2 PlayerPosition { private set; get; } @@ -16,13 +20,55 @@ namespace Game.Component { //全局特殊单例 Instance = this; + var componentInChildren = this.transform.GetComponentInChildren (); + if (componentInChildren != null) + { + SetPart (componentInChildren); + } } - private void Update () + + private void OnEnable () { - this.PlayerPosition = PlayerEntity.transform.position; + GameUpdateMgr.Instance.AddUpdater (DoUpdate); + } + + private void OnDisable () + { + GameUpdateMgr.Instance.RemoveUpdater (DoUpdate); + } + + private void DoUpdate () + { + this.PlayerPosition = this.PlayerEntity.transform.position; + } + + public void SetPart (ScenePart scenePart) + { + if (this.ScenePart != null) + { + GameObject.Destroy (this.ScenePart.gameObject); + } + + this.ScenePart = scenePart; + this.Pathfinder.data.SetData (this.ScenePart.mapCacheData.bytes); + CameraManager.Instance.SetBoxCollider (this.ScenePart.cameraCollider); + ResetPlayer (); + CameraManager.Instance.SetCameraState (CameraManager.CameraState.Player_Near); + } + + public void ResetPlayer () + { + this.PlayerEntity.transform.position = this.ScenePart.createPos.position; + this.PlayerEntity.gameObject.SetActive (true); + this.PlayerEntity.RefreshInit (); + //播放特效 + } + + public void OverlyCoin (int messageOverlyCoin) + { + // ReSharper disable once Unity.NoNullPropagation + this.ScenePart?.AddConditionNumber (messageOverlyCoin); } - - } } \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/PlayerEntity.cs b/Assets/Scripts/Game/Component/PlayerEntity.cs index d2a4c39..3b439a9 100644 --- a/Assets/Scripts/Game/Component/PlayerEntity.cs +++ b/Assets/Scripts/Game/Component/PlayerEntity.cs @@ -45,5 +45,13 @@ namespace Game.Component { this.transform.rotation = Quaternion.Euler (0 , 0 , this.transform.rotation.eulerAngles.z); } + + public void RefreshInit () + { + this.speedBuffTimer?.Kill (); + this.speedBuffTimer = null; + this.speedBuffOffset = 0; + //主角出生初始化 + } } } \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/ScenePart.cs b/Assets/Scripts/Game/Component/ScenePart.cs new file mode 100644 index 0000000..03feca4 --- /dev/null +++ b/Assets/Scripts/Game/Component/ScenePart.cs @@ -0,0 +1,26 @@ +using Sirenix.OdinInspector; +using UnityEngine; + +namespace Game.Component +{ + public class ScenePart : MonoBehaviour + { + public TextAsset mapCacheData; + public PolygonCollider2D cameraCollider; + public Transform createPos; + + public int completeConditionNumber = 10; + public float playerBaseSpeed = 4f; + + [LabelText ("当前完成数：")] private int _currentConditionNumber = 0; + + + public bool IsComplete => _currentConditionNumber >= completeConditionNumber; + + public bool AddConditionNumber (int number = 1) + { + this._currentConditionNumber += number; + return _currentConditionNumber >= completeConditionNumber; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/ScenePart.cs.meta b/Assets/Scripts/Game/Component/ScenePart.cs.meta new file mode 100644 index 0000000..87745ac --- /dev/null +++ b/Assets/Scripts/Game/Component/ScenePart.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2198455a7d46404bab676464cf70ce14 +timeCreated: 1729478564 \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/Editor/GameSceneTools.cs b/Assets/Scripts/Game/Component/SceneProp/Editor/GameSceneTools.cs index 22d19e0..fe50127 100644 --- a/Assets/Scripts/Game/Component/SceneProp/Editor/GameSceneTools.cs +++ b/Assets/Scripts/Game/Component/SceneProp/Editor/GameSceneTools.cs @@ -1,4 +1,5 @@ -using UnityEditor; +using Game.Component.Map; +using UnityEditor; using UnityEngine; namespace Game.Component.SceneProp.Editor @@ -135,7 +136,7 @@ namespace Game.Component.SceneProp.Editor } //创建敌人b - [MenuItem("GameObject/场景角色/创建敌人b" , false, 10)] + [MenuItem("GameObject/场景敌人/创建敌人b" , false, 10)] public static void CreateEnemyB (MenuCommand menuCommand) { var prefab = LoadPrefab ("Assets/GameRes/GamePool/enemy_B.prefab"); @@ -153,7 +154,7 @@ namespace Game.Component.SceneProp.Editor } //创建敌人c - [MenuItem("GameObject/场景角色/创建敌人c" , false, 10)] + [MenuItem("GameObject/场景敌人/创建敌人c" , false, 10)] public static void CreateEnemyC (MenuCommand menuCommand) { var prefab = LoadPrefab ("Assets/GameRes/GamePool/enemy_C.prefab"); @@ -171,7 +172,7 @@ namespace Game.Component.SceneProp.Editor } //创建敌人witch - [MenuItem("GameObject/场景角色/创建敌人witch" , false, 10)] + [MenuItem("GameObject/场景敌人/创建敌人witch" , false, 10)] public static void CreateEnemyWitch (MenuCommand menuCommand) { var prefab = LoadPrefab ("Assets/GameRes/GamePool/enemy_Witch.prefab"); @@ -187,5 +188,22 @@ namespace Game.Component.SceneProp.Editor Selection.activeObject = prop; Selection.activeTransform = prop.transform; } + + [MenuItem("GameObject/场景道具/创建地图链接" , false, 10)] + public static void CreateMapLink () + { + var pos = CreatePos (); + var prop = new GameObject("mapLink"); + prop.transform.position = pos; + prop.AddComponent (); + var target = Selection.activeTransform; + if (target != null) + { + prop.transform.SetParent (target); + } + Undo.RegisterCreatedObjectUndo(prop, "Create " + prop.name); + Selection.activeObject = prop; + Selection.activeTransform = prop.transform; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/EventTriggerProp.cs b/Assets/Scripts/Game/Component/SceneProp/EventTriggerProp.cs new file mode 100644 index 0000000..b5e1f38 --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/EventTriggerProp.cs @@ -0,0 +1,35 @@ +using Game.EventDefine; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace Game.Component.SceneProp +{ + public class EventTriggerProp : BaseProp + { + public enum TriggerType + { + None = 0, + GameComplete, + CloseUp + } + + public TriggerType _triggerType = TriggerType.None; + + [ShowIf ("_triggerType", TriggerType.CloseUp)] + public Transform _closeUpTarget = null; + + + protected override void OnTrigger (PlayerEntity entity) + { + switch (this._triggerType) + { + case TriggerType.CloseUp: + GameEventDefine.CloseUp.SendMessage (this._closeUpTarget); + break; + case TriggerType.GameComplete: + GameEventDefine.GameComplete.SendMessage (); + break; + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/EventTriggerProp.cs.meta b/Assets/Scripts/Game/Component/SceneProp/EventTriggerProp.cs.meta new file mode 100644 index 0000000..5e1a663 --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/EventTriggerProp.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 697c44ed14a44a66949bc556020b2960 +timeCreated: 1729479036 \ No newline at end of file diff --git a/Assets/Scripts/Game/EventDefine/GameEventDefine.cs b/Assets/Scripts/Game/EventDefine/GameEventDefine.cs index eb6776a..fe00ab6 100644 --- a/Assets/Scripts/Game/EventDefine/GameEventDefine.cs +++ b/Assets/Scripts/Game/EventDefine/GameEventDefine.cs @@ -106,5 +106,25 @@ namespace Game.EventDefine UniEvent.SendMessage (showTipBox); } } + + public class GameComplete : IEventMessage + { + private GameComplete () + { + } + + public static void SendMessage () => UniEvent.SendMessage (new GameComplete ()); + } + + public class CloseUp : IEventMessage + { + public Transform Target { get; private set; } + + private CloseUp () + { + } + + public static void SendMessage (Transform target) => UniEvent.SendMessage (new CloseUp () { Target = target }); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Game/FsmNode/GamePart.cs b/Assets/Scripts/Game/FsmNode/GamePart.cs deleted file mode 100644 index aa8d682..0000000 --- a/Assets/Scripts/Game/FsmNode/GamePart.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using Framework.Audio; -using Framework.FSMLite; -using Framework.UI; -using Game.EventDefine; -using IcecreamView; -using UnityEngine; -using Views; - -namespace Game.FsmNode -{ - public class GamePart : StateMachine - { - private int _lastPartLayer = -1; - private int _lastLevelIndex = -1; - - protected override void OnEnter (params object[] args) - { - AudioManager.Instance.PlayBGM(BgmAudio.NormalBgm , 0.65f); - } - - protected override void OnExit () - { - UIManager.Instance.CloseViewWithGroup (this.GetType ().FullName); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Game/FsmNode/GamePart.cs.meta b/Assets/Scripts/Game/FsmNode/GamePart.cs.meta deleted file mode 100644 index 9cae037..0000000 --- a/Assets/Scripts/Game/FsmNode/GamePart.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 33084e8a307b49648b468d7ae4123115 -timeCreated: 1717040492 \ No newline at end of file diff --git a/Assets/Scripts/Game/FsmNode/GameRelax.cs b/Assets/Scripts/Game/FsmNode/GameRelax.cs deleted file mode 100644 index 7ef928c..0000000 --- a/Assets/Scripts/Game/FsmNode/GameRelax.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using Framework.Audio; -using Framework.FSMLite; -using Framework.UI; -using Game.EventDefine; -using Game.Manager; -using Views; - -namespace Game.FsmNode -{ - public class GameRelax : StateMachine - { - protected override async void OnEnter (params object[] args) - { - AudioManager.Instance.PlayBGM(BgmAudio.NormalBgm , 0.65f); - //如果是从游戏关卡选择中返回休息，不刷新商店 - var isRefreshShop = this.stateMachineRunner.LastState != GameState.PartGame; - if (isRefreshShop) - { - RefreshShop (); - } - - } - - private void RefreshShop () - { - if (this.stateMachineRunner.LastState != GameState.PartGame) - { - } - } - - protected override void OnExit () - { - UIManager.Instance.CloseViewWithGroup (this.GetType ().FullName); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Game/FsmNode/GameRelax.cs.meta b/Assets/Scripts/Game/FsmNode/GameRelax.cs.meta deleted file mode 100644 index 1ca319e..0000000 --- a/Assets/Scripts/Game/FsmNode/GameRelax.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 72a83c4ee54e44ea8fd35c8f522ad3b7 -timeCreated: 1717040477 \ No newline at end of file diff --git a/Assets/Scripts/Game/FsmNode/GameRevert.cs b/Assets/Scripts/Game/FsmNode/GameRevert.cs index 78a0c8c..f0e1572 100644 --- a/Assets/Scripts/Game/FsmNode/GameRevert.cs +++ b/Assets/Scripts/Game/FsmNode/GameRevert.cs @@ -7,7 +7,7 @@ namespace Game.FsmNode { protected override void OnEnter (params object[] args) { - this.stateMachineRunner.OpenState (GameState.RelaxGame); + this.stateMachineRunner.OpenState (GameState.StartGame); } protected override void OnExit () diff --git a/Assets/Scripts/Game/FsmNode/GameStart.cs b/Assets/Scripts/Game/FsmNode/GameStart.cs index dabd039..ab7b084 100644 --- a/Assets/Scripts/Game/FsmNode/GameStart.cs +++ b/Assets/Scripts/Game/FsmNode/GameStart.cs @@ -13,11 +13,8 @@ namespace Game.FsmNode protected override async void OnEnter (params object[] args) { AudioManager.Instance.PlayBGM(BgmAudio.NormalBgm , 0.65f); - GameEventDefine.ChangeGameFsm.SendMessage (GameState.PartGame , true); + GameEventDefine.ChangeGameFsm.SendMessage (GameState.FightGame , true); UIManager.Instance.CloseLoading (null); - if (Account.Instance.AccountGameData.InitCardIds.Count > 0) - { - } } protected override void OnExit () diff --git a/Assets/Scripts/Game/GameFsm.cs b/Assets/Scripts/Game/GameFsm.cs index b0cb057..61af578 100644 --- a/Assets/Scripts/Game/GameFsm.cs +++ b/Assets/Scripts/Game/GameFsm.cs @@ -12,8 +12,6 @@ namespace Game AppendState(GameState.InitGame); AppendState(GameState.StartGame); AppendState(GameState.ContinueGame); - AppendState(GameState.RelaxGame); - AppendState(GameState.PartGame); AppendState(GameState.FightGame); AppendState(GameState.RevertGame); AppendState(GameState.SuccessGame); diff --git a/Assets/Scripts/Game/GameState.cs b/Assets/Scripts/Game/GameState.cs index 00c0aa2..d110d80 100644 --- a/Assets/Scripts/Game/GameState.cs +++ b/Assets/Scripts/Game/GameState.cs @@ -5,8 +5,6 @@ InitGame = 0, StartGame, ContinueGame, - RelaxGame, - PartGame, FightGame, RevertGame, SuccessGame, diff --git a/Assets/Scripts/Game/RoomManager.cs b/Assets/Scripts/Game/RoomManager.cs index 301d927..e00ce31 100644 --- a/Assets/Scripts/Game/RoomManager.cs +++ b/Assets/Scripts/Game/RoomManager.cs @@ -4,11 +4,13 @@ using System.Linq; using System.ScriptListener; using Cysharp.Threading.Tasks; using FJson; +using Framework.Asset; using Framework.Audio; using Framework.GamePool.manager; using Framework.Timer; using Framework.UI; using Framework.Utils.SingletonTemplate; +using Game.Component; using Game.Data; using Game.EventDefine; using IcecreamView; @@ -16,6 +18,7 @@ using StateSystem; using UniFramework.Event; using UnityEngine; using Views; +using Object = UnityEngine.Object; namespace Game { @@ -38,6 +41,8 @@ namespace Game public GameState CurrentGameState => this._gameFsm.CurrentState; + public int PartIndex = 1; + public RoomGlobalData RoomGlobalData { get => _roomGlobalData; @@ -50,6 +55,10 @@ namespace Game this._gameFsm.Active (GameState.InitGame , args); GameUpdateMgr.Instance.AddUpdater (DoUpdate); this.BindEvent (); + if (MapContent.Instance.ScenePart == null) + { + LoadScenePart (this.PartIndex); + } this._gameFsm.OpenState (GameState.StartGame); } @@ -102,6 +111,14 @@ namespace Game this.HasLock = false; } + public void LoadScenePart (int partIndex) + { + var loadName = $"AutoSource/Part/part{partIndex}.prefab"; + var scenePart = AssetManager.Instance.LoadAsset (loadName).GetComponent (); + var instantiate = Object.Instantiate (scenePart, MapContent.Instance.transform, true); + MapContent.Instance.SetPart (instantiate); + } + #region 事件 private void BindEvent () @@ -122,7 +139,7 @@ namespace Game if (obj is GameEventDefine.OverlyCoin message) { AudioManager.Instance.PlaySoundEffect (SeAudio.Gaming_GetCoin); - this.RoomGlobalData.OverlyCoin (message.overlyCoin , message.hasEcho); + MapContent.Instance.OverlyCoin (message.overlyCoin); GlobalEventDefine.RefreshView.SendMessage (); } }