diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index d1a514918..069674ff7 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -2474,7 +2474,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 20, z: -10} + m_FollowOffset: {x: 0, y: 120, z: -10} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -5022,8 +5022,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 168896972} serializedVersion: 2 - m_LocalRotation: {x: 0.22591954, y: 0.000000029802322, z: -0.000000014901161, w: 0.974146} - m_LocalPosition: {x: -0.0000002384187, y: 11, z: -10.000001} + m_LocalRotation: {x: 0.2080406, y: 0.000000029802319, z: -0, w: 0.9781202} + m_LocalPosition: {x: -0.0000004768374, y: 15, z: -19.999998} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5051,7 +5051,7 @@ MonoBehaviour: m_LookAt: {fileID: 476261175} m_Follow: {fileID: 476261175} m_Lens: - FieldOfView: 80 + FieldOfView: 60 OrthographicSize: 5 NearClipPlane: 0.1 FarClipPlane: 300 @@ -7714,7 +7714,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 11, z: -10} + m_FollowOffset: {x: 0, y: 15, z: -20} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -7992,8 +7992,8 @@ Transform: m_GameObject: {fileID: 304932850} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.07, y: 3.39, z: -1.81} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_LocalPosition: {x: -0.16, y: 2.853, z: -2.07} + m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 476261175} @@ -10851,20 +10851,35 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 200595900} m_Modifications: + - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, + type: 3} + propertyPath: m_LocalScale.x + value: 1.5568 + objectReference: {fileID: 0} + - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, + type: 3} + propertyPath: m_LocalScale.y + value: 1.5568 + objectReference: {fileID: 0} + - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, + type: 3} + propertyPath: m_LocalScale.z + value: 1.5568 + objectReference: {fileID: 0} - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, type: 3} propertyPath: m_LocalPosition.x - value: 22.23 + value: -7.08 objectReference: {fileID: 0} - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, type: 3} propertyPath: m_LocalPosition.y - value: -2.88 + value: -7.27 objectReference: {fileID: 0} - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, type: 3} propertyPath: m_LocalPosition.z - value: -126.76 + value: -107.48 objectReference: {fileID: 0} - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, type: 3} @@ -11000,6 +11015,95 @@ Transform: type: 3} m_PrefabInstance: {fileID: 392014244} m_PrefabAsset: {fileID: 0} +--- !u!1001 &399387929 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 174086, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_Name + value: cannon (1) + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalScale.x + value: 0.534584 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalScale.y + value: 0.534584 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalScale.z + value: 0.534584 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalPosition.x + value: -37.261 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalPosition.z + value: -1.05 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.000011250376 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 179.999 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.98515815 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.17164908 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.y + value: -1.8189892e-12 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.0000038622334 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -19.767 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} --- !u!1001 &409023815 PrefabInstance: m_ObjectHideFlags: 0 @@ -13173,7 +13277,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 616a7216aa8754444908b58052d4b644, type: 3} m_Name: m_EditorClassIdentifier: - boatOffset: -1.75 + boatOffset: 0 --- !u!114 &476261171 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13323,7 +13427,7 @@ Transform: m_GameObject: {fileID: 519038850} serializedVersion: 2 m_LocalRotation: {x: 0.30631074, y: -0.6373176, z: 0.30631068, w: 0.6373177} - m_LocalPosition: {x: 19.93, y: 28.39, z: -1.8100033} + m_LocalPosition: {x: 19.84, y: 27.853, z: -2.0700016} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -14005,7 +14109,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &550705669 GameObject: m_ObjectHideFlags: 0 @@ -18560,7 +18664,7 @@ Camera: height: 1 near clip plane: 0.1 far clip plane: 300 - field of view: 80 + field of view: 60 orthographic: 0 orthographic size: 5 m_Depth: -1 @@ -18586,8 +18690,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 776161953} serializedVersion: 2 - m_LocalRotation: {x: 0.15974922, y: 0.68882525, z: -0.15974924, w: 0.6888252} - m_LocalPosition: {x: -47.3, y: 9.42, z: 0.0000011920929} + 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: [] @@ -28842,32 +28946,32 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 769b4ba8d88ef40e2abd78a4282a6951, type: 3} propertyPath: m_LocalPosition.x - value: -232.88 + value: 331.37354 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 769b4ba8d88ef40e2abd78a4282a6951, type: 3} propertyPath: m_LocalPosition.y - value: -26.87 + value: -14.599999 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 769b4ba8d88ef40e2abd78a4282a6951, type: 3} propertyPath: m_LocalPosition.z - value: 249.62 + value: -109.32228 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 769b4ba8d88ef40e2abd78a4282a6951, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: -0.4134331 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 769b4ba8d88ef40e2abd78a4282a6951, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 769b4ba8d88ef40e2abd78a4282a6951, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.9105345 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 769b4ba8d88ef40e2abd78a4282a6951, type: 3} @@ -28882,7 +28986,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 769b4ba8d88ef40e2abd78a4282a6951, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -228.841 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 769b4ba8d88ef40e2abd78a4282a6951, type: 3} @@ -28934,6 +29038,99 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769b4ba8d88ef40e2abd78a4282a6951, type: 3} +--- !u!1001 &1201548742 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 174086, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_Name + value: cannon + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalScale.x + value: 0.534584 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalScale.y + value: 0.534584 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalScale.z + value: 0.534584 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalPosition.x + value: -35.604 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalPosition.z + value: -1.05 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.000011250376 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 179.999 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.98226076 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.18752022 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.y + value: 2.7284843e-12 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.0000042193437 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -21.616 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.001 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} --- !u!1 &1207235157 GameObject: m_ObjectHideFlags: 0 @@ -40643,8 +40840,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871370245} serializedVersion: 2 - m_LocalRotation: {x: 0.5191833, y: -0, z: 0.000000029802322, w: 0.854663} - m_LocalPosition: {x: -0.0000002384187, y: 20, z: -10.000001} + m_LocalRotation: {x: 0.6764068, y: -0, z: -0, 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: @@ -40672,7 +40869,7 @@ MonoBehaviour: m_LookAt: {fileID: 476261175} m_Follow: {fileID: 476261175} m_Lens: - FieldOfView: 80 + FieldOfView: 60 OrthographicSize: 5 NearClipPlane: 0.1 FarClipPlane: 300 @@ -41567,6 +41764,95 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2001721430} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2006426738 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 174086, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_Name + value: cannon (2) + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalScale.x + value: 0.534584 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalScale.y + value: 0.534584 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalScale.z + value: 0.534584 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalPosition.x + value: -38.88 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalPosition.y + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalPosition.z + value: -1.05 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.000011250376 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 179.999 + objectReference: {fileID: 0} + - target: {fileID: 441816, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.99106306 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.13339457 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.y + value: -3.637979e-12 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.0000030014785 + objectReference: {fileID: 0} + - target: {fileID: 4261554260569550, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -15.332 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d68eddb8a44e25b44857e9e0c5f916e7, type: 3} --- !u!1 &2050259627 GameObject: m_ObjectHideFlags: 0 @@ -43954,3 +44240,6 @@ SceneRoots: - {fileID: 888439616} - {fileID: 1545641374} - {fileID: 1188875250} + - {fileID: 1201548742} + - {fileID: 399387929} + - {fileID: 2006426738} diff --git a/BlueWater/Assets/01.Scenes/02.Main/LightingData.asset b/BlueWater/Assets/01.Scenes/02.Main/LightingData.asset deleted file mode 100644 index 1cd4dc2f2..000000000 Binary files a/BlueWater/Assets/01.Scenes/02.Main/LightingData.asset and /dev/null differ diff --git a/BlueWater/Assets/01.Scenes/02.Main/LightingData.asset.meta b/BlueWater/Assets/01.Scenes/02.Main/LightingData.asset.meta deleted file mode 100644 index babe2b01c..000000000 --- a/BlueWater/Assets/01.Scenes/02.Main/LightingData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5736bec67810b487292714d0ee92c603 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 112000000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs b/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs index e5d609b27..8e237c03d 100644 --- a/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs +++ b/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs @@ -3,15 +3,15 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.AI; +using UnityEngine.UI; public class Boat : MonoBehaviour { private NavMeshAgent agent; private LineRenderer lineRenderer; - - private GameObject spot; - - private Coroutine draw; + private GameObject spot; //도착지점 표시 이미지 + private Coroutine draw; //경로 그리기 코루틴 + private Sprite typeCardSprite; public Vector3 target { get; set; } @@ -28,6 +28,7 @@ public class Boat : MonoBehaviour lineRenderer.enabled = false; spot = Instantiate(DataManager.Inst.mouseSpot); + typeCardSprite = transform.Find("TypeCard").GetComponent().sprite; } private void Start() diff --git a/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs b/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs index d49b33546..e4a96f900 100644 --- a/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs +++ b/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs @@ -15,6 +15,8 @@ public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, I public float maxDistance = 500f; private Coroutine scaleDown; + + private void Awake() { diff --git a/BlueWater/Assets/03.Materials/Water/Toon Water Material 2.mat b/BlueWater/Assets/03.Materials/Water/Toon Water Material 2.mat index 693b96a1c..a5c260dfd 100644 --- a/BlueWater/Assets/03.Materials/Water/Toon Water Material 2.mat +++ b/BlueWater/Assets/03.Materials/Water/Toon Water Material 2.mat @@ -109,7 +109,7 @@ Material: - _ZWrite: 1 m_Colors: - Color_1139F668: {r: 1, g: 1, b: 1, a: 0.21176471} - - Color_198818EE: {r: 0, g: 1.2057794, b: 1.498, a: 0.2} + - Color_198818EE: {r: 0, g: 0.45349112, b: 1.498, a: 0.2} - Color_626750DD: {r: 2, g: 2, b: 2, a: 1} - Color_77A2EDE9: {r: 31.626795, g: 31.626795, b: 31.626795, a: 1} - Vector2_1E1B6943: {r: 1, g: 1, b: 0, a: 0} diff --git a/BlueWater/Assets/05.Prefabs/Boat.prefab b/BlueWater/Assets/05.Prefabs/Boat.prefab index e498ad313..a27f92dfc 100644 --- a/BlueWater/Assets/05.Prefabs/Boat.prefab +++ b/BlueWater/Assets/05.Prefabs/Boat.prefab @@ -11,10 +11,10 @@ GameObject: - component: {fileID: 7008410020683778052} - component: {fileID: 1210205582334737798} - component: {fileID: 2943319250391778232} - - component: {fileID: 9122999611070572703} - component: {fileID: 9011106761725659084} - - component: {fileID: 8084239805898337567} - component: {fileID: 8032128772330494246} + - component: {fileID: 9122999611070572703} + - component: {fileID: 8084239805898337567} m_Layer: 0 m_Name: Boat m_TagString: Untagged @@ -36,6 +36,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8576618138905002859} + - {fileID: 539369722399348398} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1210205582334737798 @@ -86,19 +87,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &9122999611070572703 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2987405546353765599} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 616a7216aa8754444908b58052d4b644, type: 3} - m_Name: - m_EditorClassIdentifier: - boatOffset: 0 --- !u!195 &9011106761725659084 NavMeshAgent: m_ObjectHideFlags: 0 @@ -121,18 +109,6 @@ NavMeshAgent: m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 4 ---- !u!114 &8084239805898337567 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2987405546353765599} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6e95b875b6bbf4de2ba04d0321464461, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!120 &8032128772330494246 LineRenderer: serializedVersion: 2 @@ -237,6 +213,137 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!114 &9122999611070572703 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2987405546353765599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 616a7216aa8754444908b58052d4b644, type: 3} + m_Name: + m_EditorClassIdentifier: + boatOffset: 0 +--- !u!114 &8084239805898337567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2987405546353765599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e95b875b6bbf4de2ba04d0321464461, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6191172680477286550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 539369722399348398} + - component: {fileID: 3199219700708219732} + - component: {fileID: 9074941087019663456} + m_Layer: 0 + m_Name: TypeCard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &539369722399348398 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6191172680477286550} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2.649, z: 0} + m_LocalScale: {x: 1.5000001, y: 2.1202214, z: 1.9748865} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7008410020683778052} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3199219700708219732 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6191172680477286550} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1183024399 &9074941087019663456 +LookAtConstraint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6191172680477286550} + m_Enabled: 1 + serializedVersion: 2 + m_Weight: 1 + m_RotationAtRest: {x: 0, y: 0, z: 0} + m_RotationOffset: {x: 0, y: 0, z: 0} + m_Roll: 0 + m_WorldUpObject: {fileID: 0} + m_UseUpObject: 0 + m_Active: 1 + m_IsLocked: 1 + m_Sources: + - sourceTransform: {fileID: 0} + weight: 1 --- !u!1 &7437018900642618180 GameObject: m_ObjectHideFlags: 0