From ead1f1c1ab5f06d5d7a2dbd18fa3ff5ecf1a8840 Mon Sep 17 00:00:00 2001 From: M1_IDMhan Date: Wed, 20 Sep 2023 01:58:52 +0900 Subject: [PATCH] #31 Assault mode change with camera --- BlueWater/Assets/01.Scenes/02.Main.unity | 2667 +++++++++++++++-- .../Assets/02.Scripts/CameraController.cs | 39 +- BlueWater/Assets/02.Scripts/IslandInfo.cs | 9 +- BlueWater/Assets/02.Scripts/Player/Player.cs | 109 +- BlueWater/Assets/02.Scripts/Ui/UiManager.cs | 10 + ...erer-URP-Package-2021.2+.unitypackage.meta | 7 + .../2DRenderer-URP-Package.unitypackage.meta | 7 + .../URP Unlit Materials.unitypackage.meta | 7 + ...ort for Buto Integration.unitypackage.meta | 7 + .../Import for URP.unitypackage.meta | 7 + ...RP Upgrade (2020.3.45f1).unitypackage.meta | 7 + .../FeelTemplatesDemo.unitypackage.meta | 7 + .../NiceVibrations-v-1-7.unitypackage.meta | 7 + .../NiceVibrations-v-2-0-1.unitypackage.meta | 7 + .../NiceVibrations-v-3-9-0.unitypackage.meta | 7 + ...ender Pipeline] Built-In.unitypackage.meta | 7 + ...ipeline] Universal (URP).unitypackage.meta | 7 + ...emple-BuiltInRP-UModeler.unitypackage.meta | 7 + ...LostTemple-HDRP-UModeler.unitypackage.meta | 7 + .../LostTemple-HDRP.unitypackage.meta | 7 + .../LostTemple-URP-UModeler.unitypackage.meta | 7 + .../LostTemple-URP.unitypackage.meta | 7 + .../RainbowHierarchy.src.unitypackage.meta | 7 + ...tom Attribute Processors.unitypackage.meta | 7 + .../Demos/Custom Drawers.unitypackage.meta | 7 + .../Demos/Editor Windows.unitypackage.meta | 7 + .../Sample - RPG Editor.unitypackage.meta | 7 + 27 files changed, 2692 insertions(+), 296 deletions(-) create mode 100644 BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta create mode 100644 BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta create mode 100644 BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta create mode 100644 BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for Buto Integration.unitypackage.meta create mode 100644 BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta create mode 100644 BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta create mode 100644 BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta create mode 100644 BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta create mode 100644 BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta create mode 100644 BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta create mode 100644 BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta create mode 100644 BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index eb723a1ab..d647158fe 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -31959,151 +31959,6 @@ SkinnedMeshRenderer: m_Center: {x: -0.09022954, y: -0.04376401, z: 0.00000014901161} m_Extent: {x: 0.5396018, y: 0.35118246, z: 0.7707151} m_DirtyAABB: 0 ---- !u!1 &86707739 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 86707740} - - component: {fileID: 86707744} - - component: {fileID: 86707743} - - component: {fileID: 86707742} - - component: {fileID: 86707741} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &86707740 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 86707739} - 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: 1871370246} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &86707741 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 86707739} - 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, y: 0, z: 0} - m_AmplitudeGain: 1 - m_FrequencyGain: 1 - mNoiseOffsets: {x: 563.2293, y: -661.2322, z: 543.1609} ---- !u!114 &86707742 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 86707739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 120, z: -10} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 3 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 1 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 0 - m_AccelTime: 0.5 - m_DecelTime: 0.5 - m_InputAxisName: Mouse X - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 0 ---- !u!114 &86707743 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 86707739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0.36, z: 0.2} - m_LookaheadTime: 0.4 - m_LookaheadSmoothing: 6.3 - 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 &86707744 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 86707739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &86729086 GameObject: m_ObjectHideFlags: 0 @@ -38749,7 +38604,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_004 k__BackingField: enemy_view_sailor_004 @@ -42856,7 +42711,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_005 k__BackingField: enemy_view_sailor_005 @@ -43273,7 +43128,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_004 k__BackingField: enemy_view_sailor_004 @@ -47387,7 +47242,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_001 k__BackingField: enemy_view_sailor_001 @@ -57109,7 +56964,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_004 k__BackingField: enemy_view_sailor_004 @@ -70020,7 +69875,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_004 k__BackingField: enemy_view_sailor_004 @@ -73170,6 +73025,7 @@ Transform: - {fileID: 1019471549} - {fileID: 64749984} - {fileID: 800408618} + - {fileID: 965958328} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &200595901 @@ -73220,6 +73076,7 @@ MonoBehaviour: k__BackingField: [] k__BackingField: [] k__BackingField: [] + k__BackingField: {fileID: 0} --- !u!1 &200836094 GameObject: m_ObjectHideFlags: 0 @@ -101858,7 +101715,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_005 k__BackingField: enemy_view_sailor_005 @@ -120302,6 +120159,85 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &308513090 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 308513091} + - component: {fileID: 308513092} + m_Layer: 0 + m_Name: BottomRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &308513091 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 308513090} + serializedVersion: 2 + m_LocalRotation: {x: 0.6618745, y: 0.031248953, z: -0.02763417, w: 0.7484532} + m_LocalPosition: {x: -1.1368684e-13, y: 0, z: -0.0000009536744} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1108142675} + m_Father: {fileID: 817556450} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &308513092 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 308513090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + 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 + 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: 1108142675} --- !u!1 &308848314 GameObject: m_ObjectHideFlags: 0 @@ -123748,6 +123684,260 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 317256506} m_Mesh: {fileID: 4300486, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &317689561 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 317689562} + - component: {fileID: 317689565} + - component: {fileID: 317689564} + - component: {fileID: 317689563} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &317689562 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317689561} + 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: 855975652} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &317689563 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317689561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: -10, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.6 + 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 &317689564 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317689561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 60, z: -20} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &317689565 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317689561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &317732336 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 317732337} + - component: {fileID: 317732340} + - component: {fileID: 317732339} + - component: {fileID: 317732338} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &317732337 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317732336} + 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: 1485085415} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &317732338 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317732336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: -30, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + 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 &317732339 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317732336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 60, z: -20} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &317732340 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317732336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &317782913 GameObject: m_ObjectHideFlags: 0 @@ -137488,34 +137678,65 @@ MonoBehaviour: - {fileID: 1844059654} - {fileID: 1150336692} k__BackingField: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: 102651116} + - {fileID: 193960498} + - {fileID: 1116049250} + - {fileID: 610959639} + - {fileID: 2061882957} + - {fileID: 153850397} + - {fileID: 1787703113} + - {fileID: 1635188895} + - {fileID: 1274067203} + - {fileID: 2074508414} + - {fileID: 114178036} + - {fileID: 896753125} + - {fileID: 392829934} + - {fileID: 1697804118} + - {fileID: 2052625681} + - {fileID: 1715251231} + - {fileID: 1466811821} + - {fileID: 258395295} + - {fileID: 1682210578} + - {fileID: 1030407093} + - {fileID: 113113716} + - {fileID: 123476098} + - {fileID: 911641953} + - {fileID: 583036930} + - {fileID: 1857339775} + - {fileID: 873251719} + - {fileID: 1182187158} k__BackingField: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: 102651116} + - {fileID: 193960498} + - {fileID: 1116049250} + - {fileID: 610959639} + - {fileID: 2061882957} + - {fileID: 153850397} + - {fileID: 1787703113} + - {fileID: 1635188895} + - {fileID: 1274067203} + - {fileID: 2074508414} + - {fileID: 114178036} + - {fileID: 896753125} + - {fileID: 392829934} + - {fileID: 1697804118} + - {fileID: 2052625681} + - {fileID: 1715251231} + - {fileID: 1466811821} + - {fileID: 258395295} + - {fileID: 1682210578} + - {fileID: 1030407093} + - {fileID: 113113716} + - {fileID: 123476098} + - {fileID: 911641953} + - {fileID: 583036930} + - {fileID: 1857339775} + - {fileID: 873251719} + - {fileID: 1182187158} - {fileID: 185969962} - {fileID: 1479349008} - {fileID: 420043699} + k__BackingField: {fileID: 541711048} --- !u!4 &357776295 Transform: m_ObjectHideFlags: 0 @@ -137533,6 +137754,7 @@ Transform: - {fileID: 1057364927} - {fileID: 385189801} - {fileID: 380829973} + - {fileID: 541711049} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &357806367 @@ -145892,6 +146114,133 @@ Transform: m_Children: [] m_Father: {fileID: 817719281} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &379435966 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 379435967} + - component: {fileID: 379435970} + - component: {fileID: 379435969} + - component: {fileID: 379435968} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &379435967 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 379435966} + 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: 1625123129} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &379435968 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 379435966} + 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: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.55 + 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 &379435969 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 379435966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 60, z: -3} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &379435970 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 379435966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &379576858 GameObject: m_ObjectHideFlags: 0 @@ -150600,7 +150949,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_005 k__BackingField: enemy_view_sailor_005 @@ -182283,6 +182632,10 @@ MonoBehaviour: timeOfFlight: 1 predictedPos: {fileID: 1287417561} k__BackingField: [] + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 --- !u!114 &476261172 MonoBehaviour: m_ObjectHideFlags: 0 @@ -182360,9 +182713,9 @@ Transform: - {fileID: 622062898} - {fileID: 631284636} - {fileID: 168896973} - - {fileID: 1871370246} - {fileID: 519038851} - {fileID: 304932851} + - {fileID: 817556450} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!65 &476261176 @@ -202001,6 +202354,85 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 528798271} m_Mesh: {fileID: 4300468, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &528996743 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 528996744} + - component: {fileID: 528996745} + m_Layer: 0 + m_Name: MiddleRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &528996744 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 528996743} + serializedVersion: 2 + m_LocalRotation: {x: 0.2898167, y: 0.7020172, z: -0.51931465, w: 0.39177847} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1737860738} + m_Father: {fileID: 541711049} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &528996745 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 528996743} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + 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 + 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: 1737860738} --- !u!1 &529156905 GameObject: m_ObjectHideFlags: 0 @@ -207317,6 +207749,146 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 541596817} m_Mesh: {fileID: 4300992, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &541711047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 541711049} + - component: {fileID: 541711048} + m_Layer: 0 + m_Name: IslandCam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &541711048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541711047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 5 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1753970468} + m_Follow: {fileID: 1753970468} + m_CommonLens: 1 + m_Lens: + FieldOfView: 40 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + 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_YAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 0 + m_AccelTime: 0.2 + m_DecelTime: 0.1 + m_InputAxisName: Mouse Y + m_InputAxisValue: 0 + m_InvertInput: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_Wrap: 0 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_YAxisRecentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 0 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: Mouse X + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_BindingMode: 5 + m_SplineCurvature: 0.2 + m_Orbits: + - m_Height: 150 + m_Radius: 30 + - m_Height: 100 + m_Radius: 25 + - m_Height: 60 + m_Radius: 20 + m_LegacyHeadingBias: 3.4028235e+38 + m_Rigs: + - {fileID: 1485085416} + - {fileID: 528996745} + - {fileID: 855975651} +--- !u!4 &541711049 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541711047} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.0216541, y: 60.5, z: -81.69936} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1485085415} + - {fileID: 528996744} + - {fileID: 855975652} + m_Father: {fileID: 357776295} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &541900280 GameObject: m_ObjectHideFlags: 0 @@ -223455,7 +224027,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_001 k__BackingField: enemy_view_sailor_001 @@ -233156,7 +233728,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_004 k__BackingField: enemy_view_sailor_004 @@ -268791,6 +269363,133 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 706329263} m_Mesh: {fileID: 4300950, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &706340499 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 706340500} + - component: {fileID: 706340503} + - component: {fileID: 706340502} + - component: {fileID: 706340501} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &706340500 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706340499} + 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: 1261799588} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &706340501 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706340499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: -30, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + 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 &706340502 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706340499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 60, z: -20} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &706340503 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706340499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &707572877 GameObject: m_ObjectHideFlags: 0 @@ -294669,6 +295368,133 @@ Transform: - {fileID: 257491641} m_Father: {fileID: 530869926} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &770439149 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 770439150} + - component: {fileID: 770439153} + - component: {fileID: 770439152} + - component: {fileID: 770439151} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &770439150 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770439149} + 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: 1828754146} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &770439151 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770439149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: -15, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.55 + 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 &770439152 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770439149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 60, z: -20} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &770439153 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770439149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &770582189 GameObject: m_ObjectHideFlags: 0 @@ -297377,10 +298203,10 @@ Camera: width: 1 height: 1 near clip plane: 0.1 - far clip plane: 300 - field of view: 60 + far clip plane: 5000 + field of view: 40 orthographic: 0 - orthographic size: 5 + orthographic size: 10 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -297404,8 +298230,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 776161953} serializedVersion: 2 - m_LocalRotation: {x: 0.14710693, y: 0.6916355, z: -0.14710693, w: 0.69163543} - m_LocalPosition: {x: -57.299995, y: 13.42, z: 0.0000023841858} + m_LocalRotation: {x: 0.27913794, y: 0.7157767, z: -0.50017965, w: 0.39945728} + m_LocalPosition: {x: -1.0216541, y: 60.5, z: -81.69936} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -297503,7 +298329,7 @@ MonoBehaviour: m_EditorClassIdentifier: dredgeCam: {fileID: 168896974} rotateSpeed: 200 - assaultCam: {fileID: 1871370247} + k__BackingField: {fileID: 817556451} inShipCam: {fileID: 519038852} takeAimCam: {fileID: 1036440297} sensitivity: 0.5 @@ -315544,6 +316370,146 @@ Transform: - {fileID: 378483819} m_Father: {fileID: 1287763339} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &817556449 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 817556450} + - component: {fileID: 817556451} + m_Layer: 0 + m_Name: AssaultCam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &817556450 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817556449} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: 2.9895594, y: 60.570004, z: -0.25007224} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1266809189} + - {fileID: 1625123129} + - {fileID: 308513091} + m_Father: {fileID: 476261175} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &817556451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817556449} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 0 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 550956241} + m_Follow: {fileID: 550956241} + m_CommonLens: 1 + m_Lens: + FieldOfView: 40 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + 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_YAxis: + Value: 0.5 + m_SpeedMode: 0 + m_MaxSpeed: 2 + m_AccelTime: 0.2 + m_DecelTime: 0.1 + m_InputAxisName: Mouse Y + m_InputAxisValue: 0 + m_InvertInput: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_Wrap: 0 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_YAxisRecentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: Mouse X + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_BindingMode: 5 + m_SplineCurvature: 0.2 + m_Orbits: + - m_Height: 60 + m_Radius: 3 + - m_Height: 60 + m_Radius: 3 + - m_Height: 60 + m_Radius: 3 + m_LegacyHeadingBias: 3.4028235e+38 + m_Rigs: + - {fileID: 1266809190} + - {fileID: 1625123130} + - {fileID: 308513092} --- !u!1 &817650781 GameObject: m_ObjectHideFlags: 0 @@ -329751,6 +330717,85 @@ SkinnedMeshRenderer: m_Center: {x: -2.450478, y: -0.037529632, z: -0.011102915} m_Extent: {x: 2.7497826, y: 0.20627628, z: 1.0783304} m_DirtyAABB: 0 +--- !u!1 &855975650 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 855975652} + - component: {fileID: 855975651} + m_Layer: 0 + m_Name: BottomRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &855975651 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855975650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + 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 + 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: 317689562} +--- !u!4 &855975652 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855975650} + serializedVersion: 2 + m_LocalRotation: {x: 0.27913806, y: 0.7157766, z: -0.5001796, w: 0.39945745} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 317689562} + m_Father: {fileID: 541711049} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &856176292 GameObject: m_ObjectHideFlags: 0 @@ -335575,7 +336620,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_captain_001 k__BackingField: enemy_view_captain_001 @@ -343421,7 +344466,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_004 k__BackingField: enemy_view_sailor_004 @@ -348658,7 +349703,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_001 k__BackingField: enemy_view_sailor_001 @@ -373401,6 +374446,146 @@ Transform: - {fileID: 1767486441} m_Father: {fileID: 1236226543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &965958327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 965958328} + - component: {fileID: 965958329} + m_Layer: 0 + m_Name: IslandCam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &965958328 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965958327} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 29.777853, y: 55.489998, z: -139.46535} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1261799588} + - {fileID: 1828754146} + - {fileID: 968560342} + m_Father: {fileID: 200595900} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &965958329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965958327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 0 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1753970468} + m_Follow: {fileID: 1753970468} + m_CommonLens: 1 + m_Lens: + FieldOfView: 40 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + 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_YAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 2 + m_AccelTime: 0.2 + m_DecelTime: 0.1 + m_InputAxisName: Mouse Y + m_InputAxisValue: 0 + m_InvertInput: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_Wrap: 0 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_YAxisRecentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: Mouse X + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_BindingMode: 5 + m_SplineCurvature: 0.2 + m_Orbits: + - m_Height: 150 + m_Radius: 30 + - m_Height: 100 + m_Radius: 25 + - m_Height: 60 + m_Radius: 20 + m_LegacyHeadingBias: 3.4028235e+38 + m_Rigs: + - {fileID: 1261799589} + - {fileID: 1828754147} + - {fileID: 968560343} --- !u!1 &966094083 GameObject: m_ObjectHideFlags: 0 @@ -374310,6 +375495,85 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &968560341 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 968560342} + - component: {fileID: 968560343} + m_Layer: 0 + m_Name: BottomRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &968560342 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968560341} + serializedVersion: 2 + m_LocalRotation: {x: 0.25302762, y: 0.7353853, z: -0.513882, w: 0.36209244} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1260490742} + m_Father: {fileID: 965958328} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &968560343 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 968560341} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + 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 + 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: 1260490742} --- !u!1 &968568872 GameObject: m_ObjectHideFlags: 0 @@ -397748,7 +399012,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_005 k__BackingField: enemy_view_sailor_005 @@ -426570,6 +427834,133 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1108039677} m_Mesh: {fileID: 4300958, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &1108142674 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1108142675} + - component: {fileID: 1108142678} + - component: {fileID: 1108142677} + - component: {fileID: 1108142676} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1108142675 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108142674} + 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: 308513091} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1108142676 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108142674} + 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: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.6 + 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 &1108142677 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108142674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 60, z: -3} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &1108142678 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108142674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1108260482 GameObject: m_ObjectHideFlags: 0 @@ -430103,7 +431494,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_004 k__BackingField: enemy_view_sailor_004 @@ -450252,6 +451643,133 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1168385110} m_Mesh: {fileID: 4300888, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &1168527627 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1168527628} + - component: {fileID: 1168527631} + - component: {fileID: 1168527630} + - component: {fileID: 1168527629} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1168527628 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168527627} + 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: 1266809189} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1168527629 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168527627} + 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: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + 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 &1168527630 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168527627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 60, z: -3} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &1168527631 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168527627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1169658855 GameObject: m_ObjectHideFlags: 0 @@ -455438,6 +456956,10 @@ MonoBehaviour: timeOfFlight: 0 predictedPos: {fileID: 0} k__BackingField: [] + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 --- !u!114 &1181634886 MonoBehaviour: m_ObjectHideFlags: 0 @@ -455911,7 +457433,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_001 k__BackingField: enemy_view_sailor_001 @@ -490160,6 +491682,133 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1260279824} m_Mesh: {fileID: 4300394, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &1260490741 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1260490742} + - component: {fileID: 1260490745} + - component: {fileID: 1260490744} + - component: {fileID: 1260490743} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1260490742 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260490741} + 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: 968560342} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1260490743 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260490741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: -10, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.6 + 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 &1260490744 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260490741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 60, z: -20} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &1260490745 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260490741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1260499316 GameObject: m_ObjectHideFlags: 0 @@ -490651,6 +492300,85 @@ SkinnedMeshRenderer: m_Center: {x: -3.037315, y: -0.16242945, z: 0.0017783642} m_Extent: {x: 1.6850129, y: 0.013213582, z: 0.91438246} m_DirtyAABB: 0 +--- !u!1 &1261799587 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1261799588} + - component: {fileID: 1261799589} + m_Layer: 0 + m_Name: TopRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1261799588 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1261799587} + serializedVersion: 2 + m_LocalRotation: {x: 0.27640846, y: 0.6998094, z: -0.5613672, w: 0.3445752} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 706340500} + m_Father: {fileID: 965958328} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1261799589 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1261799587} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + 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 + 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: 706340500} --- !u!1 &1261816929 GameObject: m_ObjectHideFlags: 0 @@ -492458,6 +494186,85 @@ SkinnedMeshRenderer: m_Center: {x: -2.5472252, y: -0.039566025, z: 0.000000834465} m_Extent: {x: 2.8465297, y: 0.20831269, z: 1.293692} m_DirtyAABB: 0 +--- !u!1 &1266809188 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1266809189} + - component: {fileID: 1266809190} + m_Layer: 0 + m_Name: TopRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1266809189 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266809188} + serializedVersion: 2 + m_LocalRotation: {x: 0.68862504, y: 0.030224524, z: -0.028751038, w: 0.7239167} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1168527628} + m_Father: {fileID: 817556450} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1266809190 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266809188} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + 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 + 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: 1168527628} --- !u!1 &1267039185 GameObject: m_ObjectHideFlags: 0 @@ -494189,10 +495996,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4557259710981358885} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 136.10861, y: 0} - m_SizeDelta: {x: 0, y: 50.0182} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 136.10861, y: -33.541847} + m_SizeDelta: {x: 118.05, y: 50.0182} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1270723821 MonoBehaviour: @@ -496036,7 +497843,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_captain_004 k__BackingField: enemy_view_captain_004 @@ -575755,7 +577562,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_captain_005 k__BackingField: enemy_view_captain_005 @@ -582020,6 +583827,85 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1484407837} m_PrefabAsset: {fileID: 0} +--- !u!1 &1485085414 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1485085415} + - component: {fileID: 1485085416} + m_Layer: 0 + m_Name: TopRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1485085415 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1485085414} + serializedVersion: 2 + m_LocalRotation: {x: 0.3049318, y: 0.68114924, z: -0.5463986, w: 0.38013285} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 317732337} + m_Father: {fileID: 541711049} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1485085416 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1485085414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + 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 + 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: 317732337} --- !u!1 &1485150430 GameObject: m_ObjectHideFlags: 0 @@ -633641,6 +635527,85 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625042518} m_Mesh: {fileID: 4300892, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &1625123128 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1625123129} + - component: {fileID: 1625123130} + m_Layer: 0 + m_Name: MiddleRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1625123129 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625123128} + serializedVersion: 2 + m_LocalRotation: {x: 0.6753436, y: 0.030742314, z: -0.02819636, w: 0.7363227} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 379435967} + m_Father: {fileID: 817556450} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1625123130 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625123128} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + 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 + 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: 379435967} --- !u!1 &1625993802 GameObject: m_ObjectHideFlags: 0 @@ -636815,7 +638780,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_004 k__BackingField: enemy_view_sailor_004 @@ -654290,7 +656255,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_005 k__BackingField: enemy_view_sailor_005 @@ -660166,7 +662131,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_005 k__BackingField: enemy_view_sailor_005 @@ -667256,7 +669221,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_005 k__BackingField: enemy_view_sailor_005 @@ -676175,6 +678140,133 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1737839228} m_Mesh: {fileID: 4300936, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &1737860737 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1737860738} + - component: {fileID: 1737860741} + - component: {fileID: 1737860740} + - component: {fileID: 1737860739} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1737860738 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737860737} + 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: 528996744} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1737860739 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737860737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: -15, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.55 + 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 &1737860740 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737860737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 5 + m_FollowOffset: {x: 0, y: 60, z: -20} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &1737860741 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737860737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1738472338 GameObject: m_ObjectHideFlags: 0 @@ -697799,7 +699891,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_004 k__BackingField: enemy_view_sailor_004 @@ -712270,6 +714362,85 @@ Transform: - {fileID: 1452754393} m_Father: {fileID: 656434486} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1828754145 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1828754146} + - component: {fileID: 1828754147} + m_Layer: 0 + m_Name: MiddleRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1828754146 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828754145} + serializedVersion: 2 + m_LocalRotation: {x: 0.2627075, y: 0.72124887, z: -0.53354126, w: 0.35513183} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 770439150} + m_Father: {fileID: 965958328} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1828754147 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828754145} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + 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 + 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: 770439150} --- !u!1 &1828816355 GameObject: m_ObjectHideFlags: 0 @@ -723035,7 +725206,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_001 k__BackingField: enemy_view_sailor_001 @@ -727690,78 +729861,6 @@ Transform: m_Children: [] m_Father: {fileID: 1709028010} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1871370245 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1871370246} - - component: {fileID: 1871370247} - m_Layer: 0 - m_Name: AssaultCam - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1871370246 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1871370245} - serializedVersion: 2 - m_LocalRotation: {x: 0.67640686, y: -0.0000002980232, z: 0.0000002980232, w: 0.7365283} - m_LocalPosition: {x: -0.0000002384187, y: 120, z: -10.000001} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 86707740} - m_Father: {fileID: 476261175} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1871370247 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1871370245} - 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: 0 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 476261175} - m_Follow: {fileID: 476261175} - m_Lens: - FieldOfView: 60 - OrthographicSize: 5 - NearClipPlane: 0.1 - FarClipPlane: 300 - 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: 86707740} --- !u!1 &1871465307 GameObject: m_ObjectHideFlags: 0 @@ -794902,7 +797001,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_005 k__BackingField: enemy_view_sailor_005 @@ -798526,7 +800625,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_004 k__BackingField: enemy_view_sailor_004 @@ -803360,7 +805459,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_sailor_004 k__BackingField: enemy_view_sailor_004 @@ -831116,7 +833215,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &924084479780432202 GameObject: m_ObjectHideFlags: 0 @@ -831400,7 +833499,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 25} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 225.1336, y: 67.083694} m_Pivot: {x: 0.5, y: 0} --- !u!224 &5567420439895731566 RectTransform: @@ -831485,9 +833584,9 @@ RectTransform: - {fileID: 98568810} m_Father: {fileID: 4557259710981358885} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 33.5418, y: -33.541847} m_SizeDelta: {x: 57.0836, y: 57.0837} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6464824812676776745 diff --git a/BlueWater/Assets/02.Scripts/CameraController.cs b/BlueWater/Assets/02.Scripts/CameraController.cs index edeaec021..a12e42f32 100644 --- a/BlueWater/Assets/02.Scripts/CameraController.cs +++ b/BlueWater/Assets/02.Scripts/CameraController.cs @@ -18,7 +18,7 @@ namespace BlueWaterProject public int rotateSpeed = 10; [Required("습격모드 카메라를 넣어주세요.")] - public CinemachineVirtualCamera assaultCam; + [field: SerializeField] public CinemachineFreeLook AssaultCam { get; set; } [Required("보트내부 카메라를 넣어주세요.")] public CinemachineVirtualCamera inShipCam; @@ -45,11 +45,12 @@ namespace BlueWaterProject { TakeCamMovement(); DredgeCamRotate(); + AssaultCamRotate(); } public void CamAssaultMode() { - assaultCam.Priority = 1; + AssaultCam.Priority = 1; dredgeCam.Priority = 0; inShipCam.Priority = 0; } @@ -57,7 +58,7 @@ namespace BlueWaterProject public void CamDredgeMode() { dredgeCam.Priority = 1; - assaultCam.Priority = 0; + AssaultCam.Priority = 0; inShipCam.Priority = 0; } @@ -65,7 +66,7 @@ namespace BlueWaterProject { inShipCam.Priority = 1; dredgeCam.Priority = 0; - assaultCam.Priority = 0; + AssaultCam.Priority = 0; } private void TakeCamMovement() @@ -92,7 +93,7 @@ namespace BlueWaterProject Quaternion.Euler(takeAimCam.transform.rotation.eulerAngles.x, yRotation, takeAimCam.transform.rotation.eulerAngles.z); } - public void DredgeCamRotate() + private void DredgeCamRotate() { if (Input.GetMouseButtonDown(1)) { @@ -109,5 +110,33 @@ namespace BlueWaterProject dredgeCamOrbitalTransposer.m_RecenterToTargetHeading.m_enabled = true; } } + + private void AssaultCamRotate() + { + if (Input.GetMouseButtonDown(1)) + { + //AssaultCam의 X Axis의 Speed를 변경 + AssaultCam.m_XAxis.m_MaxSpeed = 150; + AssaultCam.m_XAxis.m_InputAxisName = "Mouse X"; + + //AssaultCam의 Y Axis의 Speed를 변경 + AssaultCam.m_YAxis.m_MaxSpeed = 2; + AssaultCam.m_YAxis.m_InputAxisName = "Mouse Y"; + + AssaultCam.m_RecenterToTargetHeading.m_enabled = false; + } + else if (Input.GetMouseButtonUp(1)) + { + //AssaultCam의 X Axis의 Speed를 원래대로 + AssaultCam.m_XAxis.m_MaxSpeed = 0; + AssaultCam.m_XAxis.m_InputAxisName = ""; + + //AssaultCam의 Y Axis의 Speed를 원래대로 + AssaultCam.m_YAxis.m_MaxSpeed = 0; + AssaultCam.m_YAxis.m_InputAxisName = ""; + + AssaultCam.m_RecenterToTargetHeading.m_enabled = true; + } + } } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/IslandInfo.cs b/BlueWater/Assets/02.Scripts/IslandInfo.cs index fd273d4f8..74f6b9108 100644 --- a/BlueWater/Assets/02.Scripts/IslandInfo.cs +++ b/BlueWater/Assets/02.Scripts/IslandInfo.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using Cinemachine; using Sirenix.OdinInspector; using UnityEngine; @@ -19,6 +20,8 @@ namespace BlueWaterProject [field: SerializeField] public List TargetAllList { get; private set; } + [field: SerializeField] public CinemachineFreeLook IslandCam { get; private set; } + public IslandInfo() { IslandName = null; @@ -26,15 +29,17 @@ namespace BlueWaterProject UnitList = null; EnemyList = null; TargetAllList = null; + IslandCam = null; } - public IslandInfo(string islandName, List houseList, List unitList, List enemyList, List targetAllList) + public IslandInfo(string islandName, List houseList, List unitList, List enemyList, List targetAllList, CinemachineFreeLook islandCam) { IslandName = islandName; HouseList = houseList; UnitList = unitList; EnemyList = enemyList; TargetAllList = targetAllList; + IslandCam = islandCam; } #endregion @@ -109,6 +114,8 @@ namespace BlueWaterProject { TargetAllList.Add(house); } + + IslandCam = transform.Find("IslandCam").GetComponent(); } public void RemoveListElement(List list, Transform element) diff --git a/BlueWater/Assets/02.Scripts/Player/Player.cs b/BlueWater/Assets/02.Scripts/Player/Player.cs index 110991228..df8749bdc 100644 --- a/BlueWater/Assets/02.Scripts/Player/Player.cs +++ b/BlueWater/Assets/02.Scripts/Player/Player.cs @@ -45,25 +45,45 @@ namespace BlueWaterProject [field: SerializeField] public List Canons { get; private set; } = new (GlobalValue.MAX_CANON_COUNT); - public bool IsAssaultMode { get; set; } - public bool IsInShipMode { get; set; } - public bool IsDredgeMode { get; set; } - public bool IsTakeAim { get; set; } + [field: Title("Mode")] + [field: SerializeField] public bool IsAssaultMode { get; set; } + [field: SerializeField] public bool IsInShipMode { get; set; } + [field: SerializeField] public bool IsDredgeMode { get; set; } + [field: SerializeField] public bool IsTakeAim { get; set; } + + [Title("Interaction")] + public bool IsIslandInteraction { get; set; } + private float rayLength; + private LayerMask groundLayer; private void Init() { character = transform.Find("Character").gameObject; rb = GetComponent(); GetComponentsInChildren(Canons); + + rayLength = 15f; + groundLayer = LayerMask.GetMask("Ground"); } #region Unity Function + + private void OnDrawGizmosSelected() + { + Gizmos.color = Color.red; + Gizmos.DrawWireSphere(transform.position, GlobalValue.RADAR_RANGE); + } private void Awake() { Init(); } + private void Start() + { + SwitchDredgeMode(true); + } + private void FixedUpdate() { HandleMovement(); @@ -74,6 +94,7 @@ namespace BlueWaterProject FindInRadarRange(); FilterInCameraObjects(); LookAtTarget(); + Raycast8Direction(); } #endregion @@ -119,6 +140,12 @@ namespace BlueWaterProject } } + private void StopShipMovement() + { + rb.velocity = Vector3.zero; + rb.angularVelocity = Vector3.zero; + } + #endregion #region AssaultMode/DreadgeMode Switch @@ -134,6 +161,7 @@ namespace BlueWaterProject { SwitchTakeAim(false); SwitchInShipMode(false); + SwitchDredgeMode(false); GameManager.Inst.CameraController.CamAssaultMode(); UiManager.Inst.CardLayoutGroupAnimator.Play(); IsAssaultMode = true; @@ -145,6 +173,22 @@ namespace BlueWaterProject IsAssaultMode = false; } } + + private void SwitchDredgeMode(bool isOn) + { + if (isOn) + { + SwitchTakeAim(false); + SwitchAssaultMode(false); + SwitchInShipMode(false); + GameManager.Inst.CameraController.CamDredgeMode(); + IsDredgeMode = true; + } + else if (IsDredgeMode) + { + IsDredgeMode = false; + } + } #endregion @@ -172,13 +216,15 @@ namespace BlueWaterProject private void OnInteraction(InputValue value) //F { - + if (!IsIslandInteraction) return; + SwitchAssaultMode(true); + UiManager.Inst.DefaultInteractionOnOff(false); + StopShipMovement(); } private void OnInteractionHold(InputValue value) //F Hold { SwitchInShipMode(!IsInShipMode); - } private void SwitchInShipMode(bool isOn) @@ -187,6 +233,7 @@ namespace BlueWaterProject { SwitchTakeAim(false); SwitchAssaultMode(false); + SwitchDredgeMode(false); GameManager.Inst.CameraController.CamInShipMode(); IsInShipMode = true; } @@ -217,6 +264,7 @@ namespace BlueWaterProject { SwitchAssaultMode(false); SwitchInShipMode(false); + SwitchDredgeMode(false); GameManager.Inst.CameraController.CamTakeAim(true); Cursor.visible = false; Cursor.lockState = CursorLockMode.Locked; @@ -288,5 +336,54 @@ namespace BlueWaterProject } #endregion + + #region Raycast 8 Direction + + private void Raycast8Direction() + { + if (!IsDredgeMode) return; + + Vector3[] directions = + { + transform.forward, + -transform.forward, + transform.right, + -transform.right, + transform.forward + transform.right, + transform.forward - transform.right, + -transform.forward + transform.right, + -transform.forward - transform.right + }; + + Vector3 halfExtents = new Vector3(5, 5, 5); // 박스 크기의 절반을 나타내는 벡터값을 설정합니다. + var isOn = false; + + foreach (Vector3 dir in directions) + { + RaycastHit hit; + + if (Physics.BoxCast(transform.position, halfExtents, dir, out hit, Quaternion.identity, rayLength, groundLayer)) + { + isOn = true; + + var islandInfo = hit.transform.parent.parent.GetComponent(); + + if (GameManager.Inst.CameraController.AssaultCam != islandInfo.IslandCam) + GameManager.Inst.CameraController.AssaultCam = islandInfo.IslandCam; + + // 박스가 Ground 레이어에 닿았을 때 빨간색으로 표시 + Debug.DrawRay(transform.position, dir * rayLength, Color.red); + IsIslandInteraction = true; + break; + } + // 박스가 Ground 레이어에 닿지 않았을 때 녹색으로 표시 + Debug.DrawRay(transform.position, dir * rayLength, Color.green); + IsIslandInteraction = false; + } + + UiManager.Inst.DefaultInteractionOnOff(isOn); + } + + #endregion } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Ui/UiManager.cs b/BlueWater/Assets/02.Scripts/Ui/UiManager.cs index 1596b7fa7..a22ca2b60 100644 --- a/BlueWater/Assets/02.Scripts/Ui/UiManager.cs +++ b/BlueWater/Assets/02.Scripts/Ui/UiManager.cs @@ -29,6 +29,9 @@ namespace BlueWaterProject [Title("Enemy Marker")] private Image enemyMarker; // 적을 표시할 마커 (Image) private Transform enemyTarget; // 타겟 (적) + + [Title("InteractionUI")] + private Transform defaultInteraction; private void Init() @@ -44,6 +47,8 @@ namespace BlueWaterProject enemyMarker = transform.Find("EnemyMarker").GetComponent(); enemyMarker.sprite = DataManager.Inst.enemyMarker; + + defaultInteraction = transform.Find("DefaultInteraction"); } protected override void OnAwake() @@ -163,5 +168,10 @@ namespace BlueWaterProject { radar.gameObject.SetActive(isOn); } + + public void DefaultInteractionOnOff(bool isOn) + { + defaultInteraction.gameObject.SetActive(isOn); + } } } diff --git a/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta new file mode 100644 index 000000000..b7c4cd42b --- /dev/null +++ b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a55ee4efaad27d948ba5f03fc6d7bc80 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta new file mode 100644 index 000000000..559272344 --- /dev/null +++ b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed9b95dc6ed6d0647ad7f1a8f305385d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta b/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta new file mode 100644 index 000000000..cdb770faa --- /dev/null +++ b/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4ff1f29eab234cf4490d9bb383892c44 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for Buto Integration.unitypackage.meta b/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for Buto Integration.unitypackage.meta new file mode 100644 index 000000000..de4e3b6b0 --- /dev/null +++ b/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for Buto Integration.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f5789d13135b86645a366dac6583d1cd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta b/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta new file mode 100644 index 000000000..384510c7b --- /dev/null +++ b/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3643c0d76ec153646b1203880bfb64ed +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta b/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta new file mode 100644 index 000000000..a9c2e2131 --- /dev/null +++ b/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d7c4217783978e4abe6496ac71eee94 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta b/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta new file mode 100644 index 000000000..508065e3b --- /dev/null +++ b/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta new file mode 100644 index 000000000..b4ec97874 --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 078b8f13a17171b49892ad10426d5af0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta new file mode 100644 index 000000000..2ac65e5d2 --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f9406a33814af9c47b352e77f079d798 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta new file mode 100644 index 000000000..69d7b56dd --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9aacf6f3043624194bb6f6fe9a580786 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta new file mode 100644 index 000000000..be555027e --- /dev/null +++ b/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f4227764308e84f89a765fbf315e2945 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta new file mode 100644 index 000000000..350ee4c64 --- /dev/null +++ b/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 41e59f562b69648719f2424c438758f3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta new file mode 100644 index 000000000..d7e559c52 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b044a2387a61dac41bdf204adffdce9d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta new file mode 100644 index 000000000..8ac8bbf10 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd287c84e887ea24a8679e67aac7c074 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta new file mode 100644 index 000000000..589ee74d0 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta new file mode 100644 index 000000000..e22c323d5 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f211254f5bfad224ba88868f2c75432c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta new file mode 100644 index 000000000..ea9dafacc --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4368c9be31b3c174dbfd80f2caf98889 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta b/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta new file mode 100644 index 000000000..614e98f98 --- /dev/null +++ b/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 617b3f1032a08c14ebfedfa340767cdf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta new file mode 100644 index 000000000..1eadf09a3 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f597f19f656ba56eae4f6a3a7cc528f4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta new file mode 100644 index 000000000..f073d2ab4 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48e08dc33330d11e9d4a1b246c52e4f6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta new file mode 100644 index 000000000..130722af7 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed09910c0094cb27be8f3ca264680da3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta new file mode 100644 index 000000000..f9b8ed82b --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc355dd4cf1e6173beaeb22c2858cbe1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: