diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index b27ff7c6e..f04bc593f 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -124,6 +124,144 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &18337140 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1545641374} + m_Modifications: + - target: {fileID: 149024, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_Name + value: CPT_Mountain_L_a_31 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalScale.x + value: 4.6676846 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalScale.y + value: 4.6676846 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalScale.z + value: 4.6676846 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalPosition.x + value: 145.90001 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalPosition.y + value: -3.2139359 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalPosition.z + value: 300.4 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9636133 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalRotation.y + value: -0.26730037 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -31.007 + objectReference: {fileID: 0} + - target: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 67410c66b3483a949be51600797550b9, type: 3} +--- !u!4 &18337141 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 447232, guid: 67410c66b3483a949be51600797550b9, + type: 3} + m_PrefabInstance: {fileID: 18337140} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &21664056 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1545641374} + m_Modifications: + - target: {fileID: 124886, guid: adb6ef5206fb32e409180e51378d299e, type: 3} + propertyPath: m_Name + value: CPT_Mountain_L_a_01 + objectReference: {fileID: 0} + - target: {fileID: 426072, guid: adb6ef5206fb32e409180e51378d299e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 426072, guid: adb6ef5206fb32e409180e51378d299e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 426072, guid: adb6ef5206fb32e409180e51378d299e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 426072, guid: adb6ef5206fb32e409180e51378d299e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 426072, guid: adb6ef5206fb32e409180e51378d299e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 426072, guid: adb6ef5206fb32e409180e51378d299e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 426072, guid: adb6ef5206fb32e409180e51378d299e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 426072, guid: adb6ef5206fb32e409180e51378d299e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 426072, guid: adb6ef5206fb32e409180e51378d299e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 426072, guid: adb6ef5206fb32e409180e51378d299e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: adb6ef5206fb32e409180e51378d299e, type: 3} +--- !u!4 &21664057 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 426072, guid: adb6ef5206fb32e409180e51378d299e, + type: 3} + m_PrefabInstance: {fileID: 21664056} + m_PrefabAsset: {fileID: 0} --- !u!1 &33181188 GameObject: m_ObjectHideFlags: 0 @@ -2203,7 +2341,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 167438, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} propertyPath: m_Name @@ -2223,15 +2361,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} propertyPath: m_LocalPosition.x - value: 30.188 + value: 59.818 objectReference: {fileID: 0} - target: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} propertyPath: m_LocalPosition.y - value: -4.0246 + value: -9.0346 objectReference: {fileID: 0} - target: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} propertyPath: m_LocalPosition.z - value: 98.724 + value: 39.264 objectReference: {fileID: 0} - target: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} propertyPath: m_LocalRotation.w @@ -2415,6 +2553,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &89802864 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 412716, guid: e1c4cc5b9a7d0d7479734ea4167d417e, + type: 3} + m_PrefabInstance: {fileID: 1519076350} + m_PrefabAsset: {fileID: 0} --- !u!1001 &95668302 PrefabInstance: m_ObjectHideFlags: 0 @@ -4692,12 +4836,12 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 2615590723695262313, guid: fbe5f9d69cf27974fa4899b0bcf542c8, type: 3} propertyPath: m_LocalScale.x - value: 0.79671 + value: 0.79670995 objectReference: {fileID: 0} - target: {fileID: 2615590723695262313, guid: fbe5f9d69cf27974fa4899b0bcf542c8, type: 3} @@ -4707,22 +4851,22 @@ PrefabInstance: - target: {fileID: 2615590723695262313, guid: fbe5f9d69cf27974fa4899b0bcf542c8, type: 3} propertyPath: m_LocalScale.z - value: 0.79671 + value: 0.79670995 objectReference: {fileID: 0} - target: {fileID: 2615590723695262313, guid: fbe5f9d69cf27974fa4899b0bcf542c8, type: 3} propertyPath: m_LocalPosition.x - value: 32.237 + value: 61.866997 objectReference: {fileID: 0} - target: {fileID: 2615590723695262313, guid: fbe5f9d69cf27974fa4899b0bcf542c8, type: 3} propertyPath: m_LocalPosition.y - value: 20.53 + value: 15.52 objectReference: {fileID: 0} - target: {fileID: 2615590723695262313, guid: fbe5f9d69cf27974fa4899b0bcf542c8, type: 3} propertyPath: m_LocalPosition.z - value: -102.79 + value: -162.25 objectReference: {fileID: 0} - target: {fileID: 2615590723695262313, guid: fbe5f9d69cf27974fa4899b0bcf542c8, type: 3} @@ -4775,7 +4919,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1565898989} m_Modifications: - target: {fileID: 1584552836330224030, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -4800,17 +4944,17 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.x - value: 40.2 + value: -1.1800003 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.y - value: 2.9 + value: -7.3399997 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.z - value: 79.5 + value: -9.470001 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -4820,7 +4964,7 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -6908,6 +7052,51 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &200595899 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 200595900} + m_Layer: 0 + m_Name: SecondMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &200595900 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 200595899} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -29.63, y: 5.01, z: 59.46} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 483111653} + - {fileID: 1302515238} + - {fileID: 621624933} + - {fileID: 1896587028} + - {fileID: 1565898989} + - {fileID: 834917485} + - {fileID: 1912080424} + - {fileID: 1010297106} + - {fileID: 1344744312} + - {fileID: 1274110287} + - {fileID: 1747236060} + - {fileID: 534668366} + - {fileID: 1148974803} + - {fileID: 1019471549} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &215214532 GameObject: m_ObjectHideFlags: 0 @@ -7693,6 +7882,87 @@ Transform: type: 3} m_PrefabInstance: {fileID: 270995263} m_PrefabAsset: {fileID: 0} +--- !u!1001 &288578274 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1545641374} + m_Modifications: + - target: {fileID: 166106, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_Name + value: CPT_Mountain_L_e_01 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalScale.x + value: 2.538 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalScale.y + value: 2.538 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalScale.z + value: 2.538 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalPosition.x + value: 96.28 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalPosition.y + value: -1.1139343 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalPosition.z + value: -133.8 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fdacde5ad93762547a059bc7c554eb7b, type: 3} +--- !u!4 &288578275 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 418808, guid: fdacde5ad93762547a059bc7c554eb7b, + type: 3} + m_PrefabInstance: {fileID: 288578274} + m_PrefabAsset: {fileID: 0} +--- !u!4 &295112140 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9, + type: 3} + m_PrefabInstance: {fileID: 460905033} + m_PrefabAsset: {fileID: 0} --- !u!1 &304932850 GameObject: m_ObjectHideFlags: 0 @@ -7705,8 +7975,8 @@ GameObject: - component: {fileID: 304932854} - component: {fileID: 304932853} - component: {fileID: 304932852} - m_Layer: 0 - m_Name: Capsule + m_Layer: 8 + m_Name: Character m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8454,7 +8724,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 1892735952842766, guid: 8b9a2ba22a03d6b4c83641727b7b7b93, type: 3} propertyPath: m_Name @@ -8462,7 +8732,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4473179001320916, guid: 8b9a2ba22a03d6b4c83641727b7b7b93, type: 3} propertyPath: m_LocalScale.x - value: 1.5 + value: 1.4999999 objectReference: {fileID: 0} - target: {fileID: 4473179001320916, guid: 8b9a2ba22a03d6b4c83641727b7b7b93, type: 3} propertyPath: m_LocalScale.y @@ -8470,19 +8740,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4473179001320916, guid: 8b9a2ba22a03d6b4c83641727b7b7b93, type: 3} propertyPath: m_LocalScale.z - value: 1.5 + value: 1.4999999 objectReference: {fileID: 0} - target: {fileID: 4473179001320916, guid: 8b9a2ba22a03d6b4c83641727b7b7b93, type: 3} propertyPath: m_LocalPosition.x - value: 14.48 + value: 44.11 objectReference: {fileID: 0} - target: {fileID: 4473179001320916, guid: 8b9a2ba22a03d6b4c83641727b7b7b93, type: 3} propertyPath: m_LocalPosition.y - value: 2.95 + value: -2.0600002 objectReference: {fileID: 0} - target: {fileID: 4473179001320916, guid: 8b9a2ba22a03d6b4c83641727b7b7b93, type: 3} propertyPath: m_LocalPosition.z - value: 50.96 + value: -8.5 objectReference: {fileID: 0} - target: {fileID: 4473179001320916, guid: 8b9a2ba22a03d6b4c83641727b7b7b93, type: 3} propertyPath: m_LocalRotation.w @@ -8527,7 +8797,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1565898989} m_Modifications: - target: {fileID: 1584552836330224030, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -8552,17 +8822,17 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.x - value: 40.5 + value: -0.88000107 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.y - value: 2.9 + value: -7.3399997 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.z - value: 37.6 + value: -51.370003 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -8572,7 +8842,7 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -8610,7 +8880,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 167438, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} propertyPath: m_Name @@ -8630,15 +8900,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} propertyPath: m_LocalPosition.x - value: 37 + value: 66.63 objectReference: {fileID: 0} - target: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} propertyPath: m_LocalPosition.y - value: -1.87 + value: -6.88 objectReference: {fileID: 0} - target: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} propertyPath: m_LocalPosition.z - value: 42.8 + value: -16.66 objectReference: {fileID: 0} - target: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} propertyPath: m_LocalRotation.w @@ -10578,22 +10848,22 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, type: 3} propertyPath: m_LocalPosition.x - value: -7.4 + value: 22.23 objectReference: {fileID: 0} - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, type: 3} propertyPath: m_LocalPosition.y - value: 2.13 + value: -2.88 objectReference: {fileID: 0} - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, type: 3} propertyPath: m_LocalPosition.z - value: -67.3 + value: -126.76 objectReference: {fileID: 0} - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, type: 3} @@ -10735,7 +11005,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1565898989} m_Modifications: - target: {fileID: 1584552836330224030, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -10760,17 +11030,17 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.x - value: -0.2 + value: -41.58 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.y - value: 2.9 + value: -7.3399997 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.z - value: 112.8 + value: 23.830002 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -10780,7 +11050,7 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -10818,7 +11088,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 888439616} m_Modifications: - target: {fileID: 167438, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} propertyPath: m_Name @@ -12879,12 +13149,12 @@ GameObject: m_Component: - component: {fileID: 476261175} - component: {fileID: 476261174} - - component: {fileID: 476261173} - component: {fileID: 476261172} - component: {fileID: 476261171} - component: {fileID: 476261170} - m_Layer: 0 - m_Name: Player (1) + - component: {fileID: 476261176} + m_Layer: 7 + m_Name: ShipPlayer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -12919,6 +13189,7 @@ MonoBehaviour: acceleration: 2 deceleration: 2 turnSpeed: 1 + characterSpeed: 10 --- !u!114 &476261172 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12950,27 +13221,6 @@ MonoBehaviour: m_DefaultActionMap: Player m_SplitScreenIndex: -1 m_Camera: {fileID: 0} ---- !u!65 &476261173 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 476261169} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.9821782, y: 1.1576467, z: 5.3873086} - m_Center: {x: 0, y: 0.5788233, z: 0} --- !u!54 &476261174 Rigidbody: m_ObjectHideFlags: 0 @@ -12979,7 +13229,7 @@ Rigidbody: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 476261169} serializedVersion: 4 - m_Mass: 1 + m_Mass: 100 m_Drag: 0.1 m_AngularDrag: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} @@ -13017,8 +13267,141 @@ Transform: - {fileID: 1871370246} - {fileID: 519038851} - {fileID: 304932851} + - {fileID: 499381930} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!65 &476261176 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476261169} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3.2818813, y: 1.5299377, z: 7.5536704} + m_Center: {x: -0.13152838, y: 1.5989544, z: 0.7570288} +--- !u!4 &483111653 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 406520, guid: a04e12c67e8230e4aa0ca4061ed89fa4, + type: 3} + m_PrefabInstance: {fileID: 1134388172} + m_PrefabAsset: {fileID: 0} +--- !u!1 &499381929 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 499381930} + - component: {fileID: 499381933} + - component: {fileID: 499381932} + - component: {fileID: 499381931} + m_Layer: 7 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &499381930 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499381929} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3.1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 476261175} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &499381931 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499381929} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &499381932 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499381929} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &499381933 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499381929} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &519038850 GameObject: m_ObjectHideFlags: 0 @@ -13044,7 +13427,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519038850} serializedVersion: 2 - m_LocalRotation: {x: 0.30631077, y: -0.6373176, z: 0.3063107, w: 0.6373177} + 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_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -13592,6 +13975,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 530900803} m_PrefabAsset: {fileID: 0} +--- !u!4 &534668366 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, + type: 3} + m_PrefabInstance: {fileID: 587373864} + m_PrefabAsset: {fileID: 0} --- !u!1 &550511695 GameObject: m_ObjectHideFlags: 0 @@ -13603,7 +13992,7 @@ GameObject: - component: {fileID: 550950427} - component: {fileID: 551760121} - component: {fileID: 552975269} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Prop_Cannon_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13621,7 +14010,7 @@ GameObject: - component: {fileID: 550960091} - component: {fileID: 551772243} - component: {fileID: 552983439} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Veh_Boat_Medium_01_Sails_Pirate m_TagString: Untagged m_Icon: {fileID: 0} @@ -13639,7 +14028,7 @@ GameObject: - component: {fileID: 550966701} - component: {fileID: 551764055} - component: {fileID: 552766431} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Veh_Extra_Barrel_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13657,7 +14046,7 @@ GameObject: - component: {fileID: 550972377} - component: {fileID: 551732665} - component: {fileID: 552961761} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Veh_Extra_Barrel_05 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13675,7 +14064,7 @@ GameObject: - component: {fileID: 550989785} - component: {fileID: 551747133} - component: {fileID: 552781131} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Prop_ShipWheel_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13693,7 +14082,7 @@ GameObject: - component: {fileID: 550955185} - component: {fileID: 551722441} - component: {fileID: 552758599} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Veh_Extra_Barrel_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13715,7 +14104,7 @@ GameObject: - component: {fileID: 64359694936570017} - component: {fileID: 64047883483704471} - component: {fileID: 64467893284287051} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Veh_Boat_Medium_01_Mast_Pirate m_TagString: Untagged m_Icon: {fileID: 0} @@ -13733,7 +14122,7 @@ GameObject: - component: {fileID: 551014015} - component: {fileID: 551712235} - component: {fileID: 552985597} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Veh_Extra_Barrel_06 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13751,7 +14140,7 @@ GameObject: - component: {fileID: 550984435} - component: {fileID: 551726881} - component: {fileID: 552976611} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Veh_Extra_Barrel_03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13767,7 +14156,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 551017359} - m_Layer: 0 + m_Layer: 7 m_Name: Attachments m_TagString: Untagged m_Icon: {fileID: 0} @@ -13785,7 +14174,7 @@ GameObject: - component: {fileID: 550907091} - component: {fileID: 551762935} - component: {fileID: 552981323} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Veh_Boat_Medium_01_Sails_Up_Pirate m_TagString: Untagged m_Icon: {fileID: 0} @@ -13803,7 +14192,7 @@ GameObject: - component: {fileID: 550938379} - component: {fileID: 551752923} - component: {fileID: 552740255} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Prop_Crate_03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13821,7 +14210,7 @@ GameObject: - component: {fileID: 551010877} - component: {fileID: 551724405} - component: {fileID: 552968525} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Veh_Extra_Barrel_04 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13839,7 +14228,7 @@ GameObject: - component: {fileID: 550989737} - component: {fileID: 551762425} - component: {fileID: 552974207} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Prop_Crate_Cannonballs_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13857,7 +14246,7 @@ GameObject: - component: {fileID: 550940759} - component: {fileID: 551801131} - component: {fileID: 552940251} - m_Layer: 0 + m_Layer: 7 m_Name: SM_Prop_CannonBalls_03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13875,7 +14264,7 @@ GameObject: - component: {fileID: 550956241} - component: {fileID: 551765495} - component: {fileID: 552936515} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook m_TagString: Untagged m_Icon: {fileID: 0} @@ -14887,6 +15276,12 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!4 &563686341 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, + type: 3} + m_PrefabInstance: {fileID: 341505330} + m_PrefabAsset: {fileID: 0} --- !u!1001 &567864081 PrefabInstance: m_ObjectHideFlags: 0 @@ -14982,22 +15377,22 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, type: 3} propertyPath: m_LocalPosition.x - value: 25.23 + value: 54.86 objectReference: {fileID: 0} - target: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, type: 3} propertyPath: m_LocalPosition.y - value: 11.13 + value: 6.12 objectReference: {fileID: 0} - target: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, type: 3} propertyPath: m_LocalPosition.z - value: 105.21 + value: 45.75 objectReference: {fileID: 0} - target: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, type: 3} @@ -15139,7 +15534,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 1290192323667180, guid: 387d93711c1d03a48b083591256c560c, type: 3} propertyPath: m_Name @@ -15159,15 +15554,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4109834554446322, guid: 387d93711c1d03a48b083591256c560c, type: 3} propertyPath: m_LocalPosition.x - value: -5.8 + value: 23.829998 objectReference: {fileID: 0} - target: {fileID: 4109834554446322, guid: 387d93711c1d03a48b083591256c560c, type: 3} propertyPath: m_LocalPosition.y - value: -0.1 + value: -5.11 objectReference: {fileID: 0} - target: {fileID: 4109834554446322, guid: 387d93711c1d03a48b083591256c560c, type: 3} propertyPath: m_LocalPosition.z - value: 84.27 + value: 24.809998 objectReference: {fileID: 0} - target: {fileID: 4109834554446322, guid: 387d93711c1d03a48b083591256c560c, type: 3} propertyPath: m_LocalRotation.w @@ -15206,6 +15601,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 387d93711c1d03a48b083591256c560c, type: 3} +--- !u!4 &621624933 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9, + type: 3} + m_PrefabInstance: {fileID: 85278623} + m_PrefabAsset: {fileID: 0} --- !u!1001 &623360154 PrefabInstance: m_ObjectHideFlags: 0 @@ -15301,7 +15702,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 6209097434605892902, guid: a003617243f099842ac3523a93f80e28, type: 3} @@ -15311,17 +15712,17 @@ PrefabInstance: - target: {fileID: 6728647862244700060, guid: a003617243f099842ac3523a93f80e28, type: 3} propertyPath: m_LocalPosition.x - value: 12.97 + value: 42.6 objectReference: {fileID: 0} - target: {fileID: 6728647862244700060, guid: a003617243f099842ac3523a93f80e28, type: 3} propertyPath: m_LocalPosition.y - value: 12.39 + value: 7.38 objectReference: {fileID: 0} - target: {fileID: 6728647862244700060, guid: a003617243f099842ac3523a93f80e28, type: 3} propertyPath: m_LocalPosition.z - value: -91.34 + value: -150.79999 objectReference: {fileID: 0} - target: {fileID: 6728647862244700060, guid: a003617243f099842ac3523a93f80e28, type: 3} @@ -15546,7 +15947,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 702430756} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 20.248936, y: 1.9699998, z: -144.2462} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -15590,7 +15991,7 @@ Transform: - {fileID: 76865013} - {fileID: 247736990} - {fileID: 830411006} - m_Father: {fileID: 0} + m_Father: {fileID: 888439616} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &703433724 GameObject: @@ -18021,7 +18422,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1565898989} m_Modifications: - target: {fileID: 1584552836330224030, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -18046,17 +18447,17 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.x - value: -1.6 + value: -42.98 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.y - value: 2.9 + value: -7.3399997 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.z - value: 106.7 + value: 17.729996 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -18066,7 +18467,7 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -18098,6 +18499,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} +--- !u!4 &746522049 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, + type: 3} + m_PrefabInstance: {fileID: 409023815} + m_PrefabAsset: {fileID: 0} --- !u!1001 &769581785 PrefabInstance: m_ObjectHideFlags: 0 @@ -22458,6 +22865,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 834680899} m_PrefabAsset: {fileID: 0} +--- !u!4 &834917485 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4473179001320916, guid: 8b9a2ba22a03d6b4c83641727b7b7b93, + type: 3} + m_PrefabInstance: {fileID: 333520174} + m_PrefabAsset: {fileID: 0} --- !u!1001 &855123502 PrefabInstance: m_ObjectHideFlags: 0 @@ -22642,7 +23055,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1565898989} m_Modifications: - target: {fileID: 1584552836330224030, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -22667,17 +23080,17 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.x - value: 43.1 + value: 1.7199974 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.y - value: 2.9 + value: -7.3399997 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.z - value: 108.5 + value: 19.529999 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -22687,7 +23100,7 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -22719,6 +23132,42 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} +--- !u!1 &888439615 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 888439616} + m_Layer: 0 + m_Name: FirstMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &888439616 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888439615} + 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: + - {fileID: 1037063016} + - {fileID: 1163660821} + - {fileID: 89802864} + - {fileID: 295112140} + - {fileID: 702430757} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &907324416 PrefabInstance: m_ObjectHideFlags: 0 @@ -22903,7 +23352,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1565898989} m_Modifications: - target: {fileID: 1584552836330224030, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -22928,17 +23377,17 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.x - value: -6.2 + value: -47.58 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.y - value: 2.9 + value: -7.3399997 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.z - value: 108.2 + value: 19.229996 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -22948,7 +23397,7 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -23486,6 +23935,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 998289114} m_PrefabAsset: {fileID: 0} +--- !u!4 &1010297106 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2615590723695262313, guid: fbe5f9d69cf27974fa4899b0bcf542c8, + type: 3} + m_PrefabInstance: {fileID: 131269470} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1019471549 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 428609209076618065, guid: 6b556d7a85528a84aac27247ff9eeb24, + type: 3} + m_PrefabInstance: {fileID: 1651115743} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1037063016 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 489124, guid: a70152ac9ec4ea14e94da160b98b6fad, + type: 3} + m_PrefabInstance: {fileID: 1958554124} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1037231083 PrefabInstance: m_ObjectHideFlags: 0 @@ -28012,7 +28479,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 122638, guid: a04e12c67e8230e4aa0ca4061ed89fa4, type: 3} propertyPath: m_Name @@ -28020,23 +28487,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 406520, guid: a04e12c67e8230e4aa0ca4061ed89fa4, type: 3} propertyPath: m_LocalScale.x - value: 1.0821 + value: 1.0821002 objectReference: {fileID: 0} - target: {fileID: 406520, guid: a04e12c67e8230e4aa0ca4061ed89fa4, type: 3} propertyPath: m_LocalScale.z - value: 1.3417189 + value: 1.341719 objectReference: {fileID: 0} - target: {fileID: 406520, guid: a04e12c67e8230e4aa0ca4061ed89fa4, type: 3} propertyPath: m_LocalPosition.x - value: 19.558 + value: 49.188 objectReference: {fileID: 0} - target: {fileID: 406520, guid: a04e12c67e8230e4aa0ca4061ed89fa4, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -5.01 objectReference: {fileID: 0} - target: {fileID: 406520, guid: a04e12c67e8230e4aa0ca4061ed89fa4, type: 3} propertyPath: m_LocalPosition.z - value: 99.173 + value: 39.712997 objectReference: {fileID: 0} - target: {fileID: 406520, guid: a04e12c67e8230e4aa0ca4061ed89fa4, type: 3} propertyPath: m_LocalRotation.w @@ -28075,6 +28542,24 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a04e12c67e8230e4aa0ca4061ed89fa4, type: 3} +--- !u!4 &1148974803 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, + type: 3} + m_PrefabInstance: {fileID: 1787012813} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1163660821 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 479930, guid: 35a790efcca549d489da6d25d7fb77ee, + type: 3} + m_PrefabInstance: {fileID: 1690550283} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1164813295 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, + type: 3} + m_PrefabInstance: {fileID: 929384143} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1172897725 PrefabInstance: m_ObjectHideFlags: 0 @@ -28318,6 +28803,7 @@ MonoBehaviour: acceleration: 2 deceleration: 2 turnSpeed: 1 + characterSpeed: 10 --- !u!114 &1181634886 MonoBehaviour: m_ObjectHideFlags: 0 @@ -28368,7 +28854,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 101042, guid: e1c4cc5b9a7d0d7479734ea4167d417e, type: 3} propertyPath: m_Name @@ -28388,15 +28874,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 412716, guid: e1c4cc5b9a7d0d7479734ea4167d417e, type: 3} propertyPath: m_LocalPosition.x - value: -19.7 + value: 9.929998 objectReference: {fileID: 0} - target: {fileID: 412716, guid: e1c4cc5b9a7d0d7479734ea4167d417e, type: 3} propertyPath: m_LocalPosition.y - value: 0.80931 + value: -4.2006903 objectReference: {fileID: 0} - target: {fileID: 412716, guid: e1c4cc5b9a7d0d7479734ea4167d417e, type: 3} propertyPath: m_LocalPosition.z - value: 56.5 + value: -2.959999 objectReference: {fileID: 0} - target: {fileID: 412716, guid: e1c4cc5b9a7d0d7479734ea4167d417e, type: 3} propertyPath: m_LocalRotation.w @@ -30552,6 +31038,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1247914565} m_PrefabAsset: {fileID: 0} +--- !u!4 &1274110287 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6728647862244700060, guid: a003617243f099842ac3523a93f80e28, + type: 3} + m_PrefabInstance: {fileID: 633494890} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1290909792 PrefabInstance: m_ObjectHideFlags: 0 @@ -30730,6 +31222,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1299073856} m_PrefabAsset: {fileID: 0} +--- !u!4 &1302515238 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 412716, guid: e1c4cc5b9a7d0d7479734ea4167d417e, + type: 3} + m_PrefabInstance: {fileID: 1185261930} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1323879268 PrefabInstance: m_ObjectHideFlags: 0 @@ -30997,6 +31495,12 @@ MonoBehaviour: m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 +--- !u!4 &1344744312 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 664878819238250479, guid: 726da43882bc7cf4794b6164bb2acaa5, + type: 3} + m_PrefabInstance: {fileID: 1375744721} + m_PrefabAsset: {fileID: 0} --- !u!1 &1345328515 GameObject: m_ObjectHideFlags: 0 @@ -32959,7 +33463,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 176149940216585557, guid: 726da43882bc7cf4794b6164bb2acaa5, type: 3} @@ -32969,17 +33473,17 @@ PrefabInstance: - target: {fileID: 664878819238250479, guid: 726da43882bc7cf4794b6164bb2acaa5, type: 3} propertyPath: m_LocalPosition.x - value: 37.38 + value: 67.01 objectReference: {fileID: 0} - target: {fileID: 664878819238250479, guid: 726da43882bc7cf4794b6164bb2acaa5, type: 3} propertyPath: m_LocalPosition.y - value: 12.38 + value: 7.37 objectReference: {fileID: 0} - target: {fileID: 664878819238250479, guid: 726da43882bc7cf4794b6164bb2acaa5, type: 3} propertyPath: m_LocalPosition.z - value: -125.03 + value: -184.48999 objectReference: {fileID: 0} - target: {fileID: 664878819238250479, guid: 726da43882bc7cf4794b6164bb2acaa5, type: 3} @@ -33344,6 +33848,81 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1402046060} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1402110344 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1545641374} + m_Modifications: + - target: {fileID: 136770, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_Name + value: CPT_Mountain_L_a_43 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalScale.x + value: 1.822 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalScale.y + value: 1.822 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalScale.z + value: 1.822 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalPosition.x + value: 49.40001 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalPosition.y + value: -24.653934 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalPosition.z + value: 122 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ef23a13955a67eb439f6fc137fc9752c, type: 3} +--- !u!4 &1402110345 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 414436, guid: ef23a13955a67eb439f6fc137fc9752c, + type: 3} + m_PrefabInstance: {fileID: 1402110344} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1414992333 PrefabInstance: m_ObjectHideFlags: 0 @@ -34233,13 +34812,25 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1489761832} m_PrefabAsset: {fileID: 0} +--- !u!4 &1490429362 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, + type: 3} + m_PrefabInstance: {fileID: 2069532218} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1498484014 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, + type: 3} + m_PrefabInstance: {fileID: 159487885} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1519076350 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 888439616} m_Modifications: - target: {fileID: 101042, guid: e1c4cc5b9a7d0d7479734ea4167d417e, type: 3} propertyPath: m_Name @@ -34306,6 +34897,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e1c4cc5b9a7d0d7479734ea4167d417e, type: 3} +--- !u!4 &1537919015 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, + type: 3} + m_PrefabInstance: {fileID: 878124045} + m_PrefabAsset: {fileID: 0} --- !u!1 &1540310982 GameObject: m_ObjectHideFlags: 0 @@ -34353,6 +34950,41 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1545641373 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1545641374} + m_Layer: 0 + m_Name: DistantView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1545641374 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1545641373} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 140.7, y: 3.3139343, z: -64.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 18337141} + - {fileID: 1402110345} + - {fileID: 288578275} + - {fileID: 21664057} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1555303302 PrefabInstance: m_ObjectHideFlags: 0 @@ -34600,6 +35232,44 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 100, y: 0.1, z: 100} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1565898988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1565898989} + m_Layer: 0 + m_Name: Trees + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1565898989 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565898988} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 71.01, y: 5.2299995, z: 29.510002} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1498484014} + - {fileID: 563686341} + - {fileID: 746522049} + - {fileID: 1164813295} + - {fileID: 1780634206} + - {fileID: 1537919015} + - {fileID: 1490429362} + m_Father: {fileID: 200595900} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1577864374 GameObject: m_ObjectHideFlags: 0 @@ -36607,22 +37277,22 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 428609209076618065, guid: 6b556d7a85528a84aac27247ff9eeb24, type: 3} propertyPath: m_LocalPosition.x - value: -29.63 + value: 0 objectReference: {fileID: 0} - target: {fileID: 428609209076618065, guid: 6b556d7a85528a84aac27247ff9eeb24, type: 3} propertyPath: m_LocalPosition.y - value: 5.01 + value: 0 objectReference: {fileID: 0} - target: {fileID: 428609209076618065, guid: 6b556d7a85528a84aac27247ff9eeb24, type: 3} propertyPath: m_LocalPosition.z - value: 59.46 + value: 0 objectReference: {fileID: 0} - target: {fileID: 428609209076618065, guid: 6b556d7a85528a84aac27247ff9eeb24, type: 3} @@ -36853,7 +37523,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 888439616} m_Modifications: - target: {fileID: 179664, guid: 35a790efcca549d489da6d25d7fb77ee, type: 3} propertyPath: m_Name @@ -37098,6 +37768,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1737010063} m_PrefabAsset: {fileID: 0} +--- !u!4 &1747236060 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, + type: 3} + m_PrefabInstance: {fileID: 388824494} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1748652150 PrefabInstance: m_ObjectHideFlags: 0 @@ -37471,13 +38147,19 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!4 &1780634206 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, + type: 3} + m_PrefabInstance: {fileID: 745940482} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1787012813 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 200595900} m_Modifications: - target: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, type: 3} @@ -37497,17 +38179,17 @@ PrefabInstance: - target: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, type: 3} propertyPath: m_LocalPosition.x - value: 36.105 + value: 65.735 objectReference: {fileID: 0} - target: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, type: 3} propertyPath: m_LocalPosition.y - value: 5.73 + value: 0.7199998 objectReference: {fileID: 0} - target: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, type: 3} propertyPath: m_LocalPosition.z - value: 43.501 + value: -15.959 objectReference: {fileID: 0} - target: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, type: 3} @@ -37517,7 +38199,7 @@ PrefabInstance: - target: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4635151295556709104, guid: fc7b80e569f7af842a9b060960ae6f73, type: 3} @@ -40067,6 +40749,12 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 525875010} +--- !u!4 &1896587028 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9, + type: 3} + m_PrefabInstance: {fileID: 349174604} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1909935235 PrefabInstance: m_ObjectHideFlags: 0 @@ -40156,6 +40844,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1909935235} m_PrefabAsset: {fileID: 0} +--- !u!4 &1912080424 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4109834554446322, guid: 387d93711c1d03a48b083591256c560c, + type: 3} + m_PrefabInstance: {fileID: 615407232} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1919805699 PrefabInstance: m_ObjectHideFlags: 0 @@ -40429,7 +41123,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 888439616} m_Modifications: - target: {fileID: 154606, guid: a70152ac9ec4ea14e94da160b98b6fad, type: 3} propertyPath: m_Name @@ -40465,15 +41159,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 489124, guid: a70152ac9ec4ea14e94da160b98b6fad, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 489124, guid: a70152ac9ec4ea14e94da160b98b6fad, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 489124, guid: a70152ac9ec4ea14e94da160b98b6fad, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 489124, guid: a70152ac9ec4ea14e94da160b98b6fad, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -42842,7 +43536,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1565898989} m_Modifications: - target: {fileID: 1584552836330224030, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -42867,17 +43561,17 @@ PrefabInstance: - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.x - value: 41.38 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.y - value: 10.24 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} propertyPath: m_LocalPosition.z - value: 88.97 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, type: 3} @@ -43234,29 +43928,7 @@ SceneRoots: - {fileID: 95668302} - {fileID: 1365765434} - {fileID: 1414992333} - - {fileID: 1958554124} - - {fileID: 1690550283} - - {fileID: 1519076350} - - {fileID: 460905033} - - {fileID: 702430757} - {fileID: 692722753} - - {fileID: 1134388172} - - {fileID: 1185261930} - - {fileID: 85278623} - - {fileID: 349174604} - - {fileID: 159487885} - - {fileID: 341505330} - - {fileID: 409023815} - - {fileID: 929384143} - - {fileID: 745940482} - - {fileID: 878124045} - - {fileID: 2069532218} - - {fileID: 333520174} - - {fileID: 615407232} - - {fileID: 131269470} - - {fileID: 1375744721} - - {fileID: 633494890} - - {fileID: 388824494} - - {fileID: 587373864} - - {fileID: 1787012813} - - {fileID: 1651115743} + - {fileID: 200595900} + - {fileID: 888439616} + - {fileID: 1545641374} diff --git a/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs b/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs index 055c2622c..5b4987ca0 100644 --- a/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs +++ b/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs @@ -9,31 +9,56 @@ namespace _02.Scripts.WaterAndShip [RequireComponent(typeof(PlayerInput))] public class Player : MonoBehaviour { - [Title("쉽의 기본 설정")] - [InfoBox("최대 스피드")] - public float maxSpeed = 10f; - [InfoBox("가속 수치")] - public float acceleration = 2f; - [InfoBox("감속 수치")] - public float deceleration = 2f; - [InfoBox("회전 속도")] - public float turnSpeed = 10f; - + [Title("Component")] private Rigidbody rb; private Vector2 movementInput; + + [Title("Child Object")] + private GameObject character; + + [Title("쉽의 기본 설정")] + [Tooltip("최대 스피드")] + public float maxSpeed = 10f; + [Tooltip("가속 수치")] + public float acceleration = 2f; + [Tooltip("감속 수치")] + public float deceleration = 2f; + [Tooltip("회전 속도")] + public float turnSpeed = 10f; + + [Title("캐릭터의 기본 설정")] + [Tooltip("캐릭터의 이동 속도")] + public float characterSpeed = 10f; + + public bool IsAssaultMode { get; set; } public bool IsInShipMode { get; set; } public bool IsdredgeMode { get; set; } + private void Init() + { + character = transform.Find("Character").gameObject; + rb = GetComponent(); + } + private void Awake() { - rb = GetComponent(); + Init(); } private void FixedUpdate() { - MovePlayer(); - RotatePlayer(); + if (IsInShipMode) + { + MoveCharacterPlayer(); + + } + else + { + MoveShipPlayer(); + RotatePlayer(); + } + } #region Movement @@ -43,7 +68,7 @@ namespace _02.Scripts.WaterAndShip movementInput = value.Get(); } - private void MovePlayer() + private void MoveShipPlayer() { var desiredVelocity = transform.forward * movementInput.y * maxSpeed; var speedChange = (movementInput.y != 0 ? acceleration : deceleration) * Time.fixedDeltaTime; @@ -56,6 +81,14 @@ namespace _02.Scripts.WaterAndShip var turnRotation = Quaternion.Euler(0f, turn * turnSpeed, 0f); rb.MoveRotation(rb.rotation * turnRotation); } + + private void MoveCharacterPlayer() + { + Vector3 movement = character.transform.rotation * + new Vector3(-movementInput.y, 0, movementInput.x) * characterSpeed * Time.deltaTime; + + character.transform.position += movement; + } #endregion diff --git a/BlueWater/ProjectSettings/DynamicsManager.asset b/BlueWater/ProjectSettings/DynamicsManager.asset index 429c890bc..b36075f98 100644 --- a/BlueWater/ProjectSettings/DynamicsManager.asset +++ b/BlueWater/ProjectSettings/DynamicsManager.asset @@ -18,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: 100000001000000010000000381f00001f080000080000000000000000000000080700000807000008070000181000000808000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_LayerCollisionMatrix: 100000001000000010000000381f00001f080000080000000000000000010000880700000807000008070000181000000808000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 0 diff --git a/BlueWater/ProjectSettings/TagManager.asset b/BlueWater/ProjectSettings/TagManager.asset index bdce17464..f1953fb9b 100644 --- a/BlueWater/ProjectSettings/TagManager.asset +++ b/BlueWater/ProjectSettings/TagManager.asset @@ -17,7 +17,7 @@ TagManager: - Water - UI - - - + - Ship - Player - Pirate - Enemy