#31 Assault mode camera view

2023-09-18 14:06:11 +09:00 · 2023-09-18 14:06:11 +09:00 · 30ad001eea
commit 30ad001eea
parent bfddfefed2
13 changed files with 572 additions and 33 deletions
--- a/BlueWater/Assets/01.Scenes/02.Main.unity
+++ b/BlueWater/Assets/01.Scenes/02.Main.unity
@ -12753,6 +12753,140 @@ SkinnedMeshRenderer:
    m_Center: {x: -3.1299572, y: -0.16242947, z: -0.0000011324883}
    m_Extent: {x: 1.5923705, y: 0.013213575, z: 0.91456443}
  m_DirtyAABB: 0
+--- !u!1 &98568809
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 98568810}
+  - component: {fileID: 98568812}
+  - component: {fileID: 98568811}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &98568810
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 98568809}
+  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: 1756569227}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 50.4494, y: 46.5397}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &98568811
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 98568809}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: F
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 40
+  m_fontSizeBase: 40
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 1
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &98568812
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 98568809}
+  m_CullTransparentMesh: 1
 --- !u!1 &99221293
 GameObject:
  m_ObjectHideFlags: 0
@ -23319,7 +23453,7 @@ MonoBehaviour:
    FieldOfView: 60
    OrthographicSize: 5
    NearClipPlane: 0.1
-    FarClipPlane: 1000
+    FarClipPlane: 300
    Dutch: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
@ -74516,7 +74650,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 470389805}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.395839, y: 0.5784403, z: -0.37892157, w: 0.6042655}
+  m_LocalRotation: {x: 0.39583895, y: 0.5784403, z: -0.37892157, w: 0.6042655}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -89103,7 +89237,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 562490840}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.41165066, y: 0.5682372, z: -0.39405745, w: 0.5936068}
+  m_LocalRotation: {x: 0.4116506, y: 0.56823725, z: -0.3940576, w: 0.5936067}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -120456,10 +120590,10 @@ Camera:
    width: 1
    height: 1
  near clip plane: 0.1
-  far clip plane: 5000
-  field of view: 40
+  far clip plane: 300
+  field of view: 60
  orthographic: 0
-  orthographic size: 10
+  orthographic size: 5
  m_Depth: -1
  m_CullingMask:
    serializedVersion: 2
@ -120483,8 +120617,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 776161953}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.39583904, y: 0.5784403, z: -0.3789216, w: 0.60426545}
-  m_LocalPosition: {x: -13.971405, y: 70.5, z: -93.509514}
+  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_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -174206,7 +174340,7 @@ MonoBehaviour:
  - m_Script
  m_LockStageInInspector: 
  m_StreamingVersion: 20170927
-  m_Priority: 10
+  m_Priority: 0
  m_StandbyUpdate: 2
  m_LookAt: {fileID: 1037063016}
  m_Follow: {fileID: 1037063016}
@ -174232,7 +174366,7 @@ MonoBehaviour:
  m_YAxis:
    Value: 0
    m_SpeedMode: 0
-    m_MaxSpeed: 2
+    m_MaxSpeed: 1
    m_AccelTime: 0.2
    m_DecelTime: 0.1
    m_InputAxisName: Mouse Y
@ -174256,7 +174390,7 @@ MonoBehaviour:
  m_XAxis:
    Value: 0
    m_SpeedMode: 0
-    m_MaxSpeed: 300
+    m_MaxSpeed: 150
    m_AccelTime: 0.1
    m_DecelTime: 0.1
    m_InputAxisName: Mouse X
@ -200236,6 +200370,140 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1270672277}
  m_Mesh: {fileID: 4300764, guid: 02ded044b8e0963439276550f50be6f9, type: 3}
+--- !u!1 &1270723819
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1270723820}
+  - component: {fileID: 1270723822}
+  - component: {fileID: 1270723821}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1270723820
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1270723819}
+  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: 1404969197}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 33.08222, y: 0}
+  m_SizeDelta: {x: 234.6546, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1270723821
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1270723819}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: Assault
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1270723822
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1270723819}
+  m_CullTransparentMesh: 1
 --- !u!1 &1270997748
 GameObject:
  m_ObjectHideFlags: 0
@ -224478,6 +224746,138 @@ SkinnedMeshRenderer:
    m_Center: {x: -0.09019899, y: 0.019462734, z: 0.00000014901161}
    m_Extent: {x: 0.5395713, y: 0.2879557, z: 0.7707151}
  m_DirtyAABB: 0
+--- !u!1001 &1404969196
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2105062291}
+    m_Modifications:
+    - target: {fileID: 891107659739759008, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_Name
+      value: Background - Brown (200ppu)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 348.9538
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 66.7232
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 291
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 12.9981
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1270723820}
+    - targetCorrespondingSourceObject: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1756569227}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4f8732bdd93394cc6bf9d0db2931226f, type: 3}
+--- !u!224 &1404969197 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4557259710163609033, guid: 4f8732bdd93394cc6bf9d0db2931226f,
+    type: 3}
+  m_PrefabInstance: {fileID: 1404969196}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1405466312
 GameObject:
  m_ObjectHideFlags: 0
@ -274252,6 +274652,134 @@ Animator:
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorStateOnDisable: 0
  m_WriteDefaultValuesOnDisable: 0
+--- !u!1001 &1756569226
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1404969197}
+    m_Modifications:
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 57.0836
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 57.0837
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -140.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7239819291482069975, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      propertyPath: m_Name
+      value: Background
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 98568810}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: fe6901937a8f844d4b04df17caf52d31, type: 3}
+--- !u!224 &1756569227 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6276464785821564862, guid: fe6901937a8f844d4b04df17caf52d31,
+    type: 3}
+  m_PrefabInstance: {fileID: 1756569226}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1756721744
 GameObject:
  m_ObjectHideFlags: 0
@ -289871,7 +290399,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1871370245}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.67640686, y: 0.00000023841855, z: -0.0000002980232, w: 0.7365282}
+  m_LocalRotation: {x: 0.67640686, y: -0.000000029802319, z: -0, w: 0.7365282}
  m_LocalPosition: {x: -0.0000002384187, y: 120, z: -10.000001}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -323691,7 +324219,7 @@ Canvas:
  m_OverridePixelPerfect: 0
  m_SortingBucketNormalizedSize: 0
  m_VertexColorAlwaysGammaSpace: 1
-  m_AdditionalShaderChannelsFlag: 0
+  m_AdditionalShaderChannelsFlag: 25
  m_UpdateRectTransformForStandalone: 0
  m_SortingLayerID: 0
  m_SortingOrder: 0
@ -323712,6 +324240,7 @@ RectTransform:
  - {fileID: 496180836}
  - {fileID: 528771113367838932}
  - {fileID: 1481322036}
+  - {fileID: 1404969197}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
--- a/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs
+++ b/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs
@ -54,7 +54,7 @@ namespace BlueWaterProject
            {
                new ConstraintSource
                {
-                    sourceTransform = Camera.main.transform,
+                    sourceTransform = GameManager.Inst.CameraController.MainCam.transform,
                    weight = 1
                }
            });
--- a/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs
+++ b/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs
@ -57,7 +57,7 @@ namespace BlueWaterProject
        public void OnDrag(PointerEventData eventData)
        {
            transform.position = Input.mousePosition;
-            var ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+            var ray = GameManager.Inst.CameraController.MainCam.ScreenPointToRay(Input.mousePosition);
            RaycastHit hit;
            if (Physics.Raycast(ray, out hit) && hit.collider.CompareTag("Ground"))
            {
@ -89,7 +89,7 @@ namespace BlueWaterProject

        private bool IsDroppedOnTarget()
        {
-            var ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+            var ray = GameManager.Inst.CameraController.MainCam.ScreenPointToRay(Input.mousePosition);
            RaycastHit hit;

            if (!Physics.Raycast(ray, out hit)) return false;
--- a/BlueWater/Assets/02.Scripts/CameraController.cs
+++ b/BlueWater/Assets/02.Scripts/CameraController.cs
@ -1,3 +1,4 @@
+using System;
 using Cinemachine;
 using Sirenix.OdinInspector;
 using UnityEngine;
@ -8,6 +9,7 @@ namespace BlueWaterProject
 {
    public class CameraController : MonoBehaviour
    {
+        public Camera MainCam { get; private set; }
        [Title("Dredge Cam")]
        [Required("드렛지 카메라를 넣어주세요.")]
        public CinemachineVirtualCamera dredgeCam;
@ -19,7 +21,7 @@ namespace BlueWaterProject
        public CinemachineVirtualCamera assaultCam;
    
        [Required("보트내부 카메라를 넣어주세요.")]
-        public CinemachineVirtualCamera InShipCam;
+        public CinemachineVirtualCamera inShipCam;
    
        [Required("조준 카메라를 넣어주세요.")]
        public CinemachineFreeLook takeAimCam;
@ -29,6 +31,11 @@ namespace BlueWaterProject
        [MinMaxSlider(2, 50, true)]
        public Vector2 heightLimits = new Vector2(2, 50);

+        private void Awake()
+        {
+            MainCam = Camera.main;
+        }
+
        private void Start()
        {
            dredgeCamOrbitalTransposer = dredgeCam.GetCinemachineComponent<CinemachineOrbitalTransposer>();
@ -44,19 +51,19 @@ namespace BlueWaterProject
        {
            assaultCam.Priority = 1;
            dredgeCam.Priority = 0;
-            InShipCam.Priority = 0;
+            inShipCam.Priority = 0;
        }
    
        public void CamDredgeMode()
        {
            dredgeCam.Priority = 1;
            assaultCam.Priority = 0;
-            InShipCam.Priority = 0;
+            inShipCam.Priority = 0;
        }
    
        public void CamInShipMode()
        {
-            InShipCam.Priority = 1;
+            inShipCam.Priority = 1;
            dredgeCam.Priority = 0;
            assaultCam.Priority = 0;
        }
--- a/BlueWater/Assets/02.Scripts/Player/Player.cs
+++ b/BlueWater/Assets/02.Scripts/Player/Player.cs
@ -247,7 +247,7 @@ namespace BlueWaterProject
            foreach (var col in radar)
            {
                if (col == null) continue;
-                var screenPoint = Camera.main.WorldToViewportPoint(col.transform.position);
+                var screenPoint = GameManager.Inst.CameraController.MainCam.WorldToViewportPoint(col.transform.position);
                if (screenPoint.z > 0 && screenPoint.x >= 0 && screenPoint.x <= 1 && screenPoint.y >= 0 && screenPoint.y <= 1)
                {
                    inCameraRadar.Add(col.transform);
--- a/BlueWater/Assets/02.Scripts/Ui/UiManager.cs
+++ b/BlueWater/Assets/02.Scripts/Ui/UiManager.cs
@ -141,7 +141,7 @@ namespace BlueWaterProject

            if (enemyTarget != null && GameManager.Inst.player.IsTargeting)
            {
-                Vector3 screenPos = Camera.main.WorldToScreenPoint(enemyTarget.position);
+                Vector3 screenPos = GameManager.Inst.CameraController.MainCam.WorldToScreenPoint(enemyTarget.position);

                if (screenPos.z > 0)
                {
--- a/BlueWater/Assets/03.Materials/InteractionArea.mat
+++ b/BlueWater/Assets/03.Materials/InteractionArea.mat
@ -20,7 +20,7 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: CanRemoveAnyone
+  m_Name: InteractionArea
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
--- a/BlueWater/Assets/03.Materials/InteractionArea.mat.meta
+++ b/BlueWater/Assets/03.Materials/InteractionArea.mat.meta
--- a/BlueWater/Packages/manifest.json
+++ b/BlueWater/Packages/manifest.json
@ -1,6 +1,6 @@
 {
  "dependencies": {
-    "com.unity.addressables": "1.21.14",
+    "com.unity.addressables": "1.21.15",
    "com.unity.ai.navigation": "1.1.4",
    "com.unity.cinemachine": "2.9.5",
    "com.unity.collab-proxy": "2.0.7",
@ -8,7 +8,7 @@
    "com.unity.feature.worldbuilding": "1.0.1",
    "com.unity.ide.rider": "3.0.24",
    "com.unity.ide.visualstudio": "2.0.18",
-    "com.unity.inputsystem": "1.6.3",
+    "com.unity.inputsystem": "1.7.0",
    "com.unity.postprocessing": "3.3.0",
    "com.unity.render-pipelines.universal": "15.0.6",
    "com.unity.test-framework": "1.3.7",
--- a/BlueWater/Packages/packages-lock.json
+++ b/BlueWater/Packages/packages-lock.json
@ -101,11 +101,11 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.addressables": {
-      "version": "1.21.14",
+      "version": "1.21.15",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.scriptablebuildpipeline": "1.21.7",
+        "com.unity.scriptablebuildpipeline": "1.21.8",
        "com.unity.modules.assetbundle": "1.0.0",
        "com.unity.modules.imageconversion": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0",
@ -124,7 +124,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.burst": {
-      "version": "1.8.7",
+      "version": "1.8.8",
      "depth": 1,
      "source": "registry",
      "dependencies": {
@ -220,7 +220,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.inputsystem": {
-      "version": "1.6.3",
+      "version": "1.7.0",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -288,7 +288,7 @@
      }
    },
    "com.unity.scriptablebuildpipeline": {
-      "version": "1.21.7",
+      "version": "1.21.8",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
--- a/BlueWater/ProjectSettings/ProjectSettings.asset
+++ b/BlueWater/ProjectSettings/ProjectSettings.asset
@ -127,6 +127,7 @@ PlayerSettings:
  switchAllowGpuScratchShrinking: 0
  switchNVNMaxPublicTextureIDCount: 0
  switchNVNMaxPublicSamplerIDCount: 0
+  switchMaxWorkerMultiple: 8
  switchNVNGraphicsFirmwareMemory: 32
  vulkanNumSwapchainBuffers: 3
  vulkanEnableSetSRGBWrite: 0
@ -146,6 +147,7 @@ PlayerSettings:
  isWsaHolographicRemotingEnabled: 0
  enableFrameTimingStats: 0
  enableOpenGLProfilerGPURecorders: 1
+  allowHDRDisplaySupport: 0
  useHDRDisplay: 0
  hdrBitDepth: 0
  m_ColorGamuts: 00000000
@ -688,7 +690,6 @@ PlayerSettings:
  switchSocketBufferEfficiency: 4
  switchSocketInitializeEnabled: 1
  switchNetworkInterfaceManagerInitializeEnabled: 1
-  switchPlayerConnectionEnabled: 1
  switchUseNewStyleFilepaths: 0
  switchUseLegacyFmodPriorities: 0
  switchUseMicroSleepForYield: 1
--- a/BlueWater/ProjectSettings/ProjectVersion.txt
+++ b/BlueWater/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
-m_EditorVersion: 2023.1.9f1
-m_EditorVersionWithRevision: 2023.1.9f1 (f3f94c8cdc49)
+m_EditorVersion: 2023.1.12f1
+m_EditorVersionWithRevision: 2023.1.12f1 (38370f5b2257)
--- a/BlueWater/ProjectSettings/TagManager.asset
+++ b/BlueWater/ProjectSettings/TagManager.asset
@ -11,6 +11,8 @@ TagManager:
  - Pirate
  - House
  - Unit
+  - Missile
+  - Area
  layers:
  - Default
  - TransparentFX