diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index 9ddb9d161..e1c642836 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -9955,7 +9955,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -32482,7 +32482,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 910f2fd54fe913648b37e911580e8068, type: 3} m_Name: m_EditorClassIdentifier: - islandInfo: {fileID: 0} + islandInfo: {fileID: 357776294} maxHp: 500 currentHp: 0 --- !u!65 &44403560 @@ -58439,7 +58439,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -59127,7 +59127,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearman_001 k__BackingField: enemy_view_spearman_001 @@ -70900,7 +70900,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -105508,7 +105508,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -142514,8 +142514,10 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: k__BackingField: [] + k__BackingField: [] k__BackingField: [] k__BackingField: [] + k__BackingField: [] k__BackingField: [] k__BackingField: {fileID: 0} --- !u!1 &200645398 @@ -195731,7 +195733,7 @@ MonoBehaviour: m_DecelTime: 0.5 m_InputAxisName: Mouse X m_InputAxisValue: 0 - m_InvertInput: 1 + m_InvertInput: 0 m_MinValue: -180 m_MaxValue: 180 m_Wrap: 1 @@ -224730,7 +224732,7 @@ GameObject: - component: {fileID: 304932854} - component: {fileID: 304932853} - component: {fileID: 304932852} - m_Layer: 8 + m_Layer: 13 m_Name: Character m_TagString: Untagged m_Icon: {fileID: 0} @@ -230614,6 +230616,113 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &314097976 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 314097977} + - component: {fileID: 314097980} + - component: {fileID: 314097979} + - component: {fileID: 314097978} + m_Layer: 0 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &314097977 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314097976} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1828981125} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &314097978 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314097976} + 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: 2 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &314097979 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314097976} + 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 &314097980 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314097976} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &314315632 GameObject: m_ObjectHideFlags: 0 @@ -263105,72 +263214,180 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: FirstIsland k__BackingField: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: 1256859591} + - {fileID: 1332914089} + - {fileID: 44403557} + k__BackingField: [] k__BackingField: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: 960843214} + - {fileID: 1824338966} + - {fileID: 592862598} + - {fileID: 662505007} + - {fileID: 1952154356} + - {fileID: 1176971736} + - {fileID: 1984327870} k__BackingField: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: 478950979} + - {fileID: 746381322} + - {fileID: 477084451} + - {fileID: 502421982} + - {fileID: 1653001668} + - {fileID: 1212277624} + - {fileID: 921691927} + - {fileID: 1579654054} + - {fileID: 606175340} + - {fileID: 1186929073} + - {fileID: 1948102759} + - {fileID: 413914899} + - {fileID: 1859056385} + - {fileID: 79672349} + - {fileID: 1940900959} + - {fileID: 542189888} + - {fileID: 1844889018} + - {fileID: 1003293609} + - {fileID: 913456111} + - {fileID: 1052707623} + - {fileID: 2000428719} + - {fileID: 1530535198} + - {fileID: 1804877637} + - {fileID: 1614831883} + - {fileID: 1139027911} + - {fileID: 997454883} + - {fileID: 78730972} + - {fileID: 711997127} + - {fileID: 1198735863} + - {fileID: 15537443} + - {fileID: 2103392751} + - {fileID: 1436784042} + - {fileID: 464578858} + - {fileID: 503348646} + - {fileID: 96162113} + - {fileID: 471166268} + - {fileID: 1724264296} + - {fileID: 1926145838} + - {fileID: 2028730771} + - {fileID: 1702537011} + - {fileID: 570503399} + - {fileID: 1340961127} + - {fileID: 951678651} + - {fileID: 1548352982} + - {fileID: 1644690212} + - {fileID: 1473772771} + - {fileID: 2130147187} + - {fileID: 2143350108} + - {fileID: 150660244} + - {fileID: 1434364148} + - {fileID: 1858686281} + - {fileID: 2064168778} + k__BackingField: + - {fileID: 478950979} + - {fileID: 746381322} + - {fileID: 477084451} + - {fileID: 502421982} + - {fileID: 1653001668} + - {fileID: 1212277624} + - {fileID: 921691927} + - {fileID: 1579654054} + - {fileID: 606175340} + - {fileID: 1186929073} + - {fileID: 1948102759} + - {fileID: 413914899} + - {fileID: 1859056385} + - {fileID: 79672349} + - {fileID: 1940900959} + - {fileID: 542189888} + - {fileID: 1844889018} + - {fileID: 1003293609} + - {fileID: 913456111} + - {fileID: 1052707623} + - {fileID: 2000428719} + - {fileID: 1530535198} + - {fileID: 1804877637} + - {fileID: 1614831883} + - {fileID: 1139027911} + - {fileID: 997454883} + - {fileID: 78730972} + - {fileID: 711997127} + - {fileID: 1198735863} + - {fileID: 15537443} + - {fileID: 2103392751} + - {fileID: 1436784042} + - {fileID: 464578858} + - {fileID: 503348646} + - {fileID: 96162113} + - {fileID: 471166268} + - {fileID: 1724264296} + - {fileID: 1926145838} + - {fileID: 2028730771} + - {fileID: 1702537011} + - {fileID: 570503399} + - {fileID: 1340961127} + - {fileID: 951678651} + - {fileID: 1548352982} + - {fileID: 1644690212} + - {fileID: 1473772771} + - {fileID: 2130147187} + - {fileID: 2143350108} + - {fileID: 150660244} + - {fileID: 1434364148} + - {fileID: 1858686281} + - {fileID: 2064168778} k__BackingField: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} + - {fileID: 478950979} + - {fileID: 746381322} + - {fileID: 477084451} + - {fileID: 502421982} + - {fileID: 1653001668} + - {fileID: 1212277624} + - {fileID: 921691927} + - {fileID: 1579654054} + - {fileID: 606175340} + - {fileID: 1186929073} + - {fileID: 1948102759} + - {fileID: 413914899} + - {fileID: 1859056385} + - {fileID: 79672349} + - {fileID: 1940900959} + - {fileID: 542189888} + - {fileID: 1844889018} + - {fileID: 1003293609} + - {fileID: 913456111} + - {fileID: 1052707623} + - {fileID: 2000428719} + - {fileID: 1530535198} + - {fileID: 1804877637} + - {fileID: 1614831883} + - {fileID: 1139027911} + - {fileID: 997454883} + - {fileID: 78730972} + - {fileID: 711997127} + - {fileID: 1198735863} + - {fileID: 15537443} + - {fileID: 2103392751} + - {fileID: 1436784042} + - {fileID: 464578858} + - {fileID: 503348646} + - {fileID: 96162113} + - {fileID: 471166268} + - {fileID: 1724264296} + - {fileID: 1926145838} + - {fileID: 2028730771} + - {fileID: 1702537011} + - {fileID: 570503399} + - {fileID: 1340961127} + - {fileID: 951678651} + - {fileID: 1548352982} + - {fileID: 1644690212} + - {fileID: 1473772771} + - {fileID: 2130147187} + - {fileID: 2143350108} + - {fileID: 150660244} + - {fileID: 1434364148} + - {fileID: 1858686281} + - {fileID: 2064168778} + - {fileID: 1256859591} + - {fileID: 1332914089} + - {fileID: 44403557} k__BackingField: {fileID: 541711048} --- !u!4 &357776295 Transform: @@ -303541,7 +303758,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearknight_001 k__BackingField: enemy_view_spearknight_001 @@ -340371,7 +340588,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -345146,7 +345363,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -348701,7 +348918,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_archer_001 k__BackingField: enemy_view_archer_001 @@ -350164,7 +350381,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_archer_001 k__BackingField: enemy_view_archer_001 @@ -367382,7 +367599,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_archer_001 k__BackingField: enemy_view_archer_001 @@ -368235,7 +368452,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -396857,7 +397074,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearman_001 k__BackingField: enemy_view_spearman_001 @@ -420823,7 +421040,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -436667,6 +436884,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 592846086} m_Mesh: {fileID: 4300758, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!114 &592862598 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8302608207570708049, guid: 2c88609e9752cd0449589fa539820435, + type: 3} + m_PrefabInstance: {fileID: 330024494} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ed17fd326510c349a4daf1dac3d88cc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &592870188 GameObject: m_ObjectHideFlags: 0 @@ -446926,7 +447155,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearknight_001 k__BackingField: enemy_view_spearknight_001 @@ -487998,6 +488227,18 @@ SkinnedMeshRenderer: m_Center: {x: -0.06498811, y: 0.020641163, z: 0.00000014901161} m_Extent: {x: 0.5143604, y: 0.28673673, z: 0.7707151} m_DirtyAABB: 0 +--- !u!114 &662505007 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8302608207570708049, guid: 2c88609e9752cd0449589fa539820435, + type: 3} + m_PrefabInstance: {fileID: 445695824} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ed17fd326510c349a4daf1dac3d88cc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &662530817 GameObject: m_ObjectHideFlags: 0 @@ -521763,7 +522004,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -544101,7 +544342,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_archer_001 k__BackingField: enemy_view_archer_001 @@ -625632,7 +625873,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 855975650} serializedVersion: 2 - m_LocalRotation: {x: 0.35711122, y: 0.63884616, z: -0.43483227, w: 0.52466005} + m_LocalRotation: {x: 0.3571113, y: 0.63884616, z: -0.4348322, w: 0.5246601} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -669379,7 +669620,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearman_001 k__BackingField: enemy_view_spearman_001 @@ -675792,7 +676033,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearknight_001 k__BackingField: enemy_view_spearknight_001 @@ -697978,7 +698219,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -703695,6 +703936,18 @@ Transform: - {fileID: 1400421327} m_Father: {fileID: 1494148014} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &960843214 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8302608207570708049, guid: 2c88609e9752cd0449589fa539820435, + type: 3} + m_PrefabInstance: {fileID: 504587697} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ed17fd326510c349a4daf1dac3d88cc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &960899381 GameObject: m_ObjectHideFlags: 0 @@ -729429,7 +729682,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -734162,7 +734415,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearman_001 k__BackingField: enemy_view_spearman_001 @@ -770637,7 +770890,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearman_001 k__BackingField: enemy_view_spearman_001 @@ -773042,6 +773295,112 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1055603305} m_Mesh: {fileID: 4300956, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &1055635914 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1055635915} + - component: {fileID: 1055635918} + - component: {fileID: 1055635917} + - component: {fileID: 1055635916} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1055635915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055635914} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 1, z: 5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1248116869} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1055635916 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055635914} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1055635917 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055635914} + 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 &1055635918 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055635914} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1055688407 GameObject: m_ObjectHideFlags: 0 @@ -835419,7 +835778,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_101 k__BackingField: enemy_view_swordknight_101 @@ -860852,6 +861211,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1176971734} m_PrefabAsset: {fileID: 0} +--- !u!114 &1176971736 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8302608207570708049, guid: 2c88609e9752cd0449589fa539820435, + type: 3} + m_PrefabInstance: {fileID: 1176971734} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ed17fd326510c349a4daf1dac3d88cc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1177043791 GameObject: m_ObjectHideFlags: 0 @@ -871904,7 +872275,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearknight_001 k__BackingField: enemy_view_spearknight_001 @@ -885422,7 +885793,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -894291,7 +894662,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_archer_001 k__BackingField: enemy_view_archer_001 @@ -920767,6 +921138,39 @@ Transform: - {fileID: 1137124969} m_Father: {fileID: 303664843} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1248116868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1248116869} + m_Layer: 0 + m_Name: InShipMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1248116869 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248116868} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1000, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1055635915} + - {fileID: 1828981125} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1248203897 GameObject: m_ObjectHideFlags: 0 @@ -926557,7 +926961,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 910f2fd54fe913648b37e911580e8068, type: 3} m_Name: m_EditorClassIdentifier: - islandInfo: {fileID: 0} + islandInfo: {fileID: 357776294} maxHp: 500 currentHp: 0 --- !u!65 &1256859594 @@ -986447,7 +986851,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 910f2fd54fe913648b37e911580e8068, type: 3} m_Name: m_EditorClassIdentifier: - islandInfo: {fileID: 0} + islandInfo: {fileID: 357776294} maxHp: 500 currentHp: 0 --- !u!65 &1332914092 @@ -991908,7 +992312,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -1059502,7 +1059906,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -1062189,7 +1062593,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_101 k__BackingField: enemy_view_swordknight_101 @@ -1088708,7 +1089112,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -1097194,7 +1097598,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1485085414} serializedVersion: 2 - m_LocalRotation: {x: 0.3802243, y: 0.61875445, z: -0.4629756, w: 0.5081595} + m_LocalRotation: {x: 0.38022426, y: 0.61875445, z: -0.46297544, w: 0.5081596} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1128675,7 +1129079,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -1140564,7 +1140968,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -1158276,6 +1158680,18 @@ MonoBehaviour: BackgroundTexture: {fileID: 0} IsBackgroundRecursive: 0 IsHidden: 0 + - Type: 0 + Name: + GameObject: {fileID: 1248116868} + Ordinal: 8 + Priority: 0 + IconType: 6000 + IconTexture: {fileID: 0} + IsIconRecursive: 0 + BackgroundType: 0 + BackgroundTexture: {fileID: 0} + IsBackgroundRecursive: 0 + IsHidden: 0 --- !u!4 &1574668128 Transform: m_ObjectHideFlags: 0 @@ -1163404,7 +1163820,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearknight_001 k__BackingField: enemy_view_spearknight_001 @@ -1188246,7 +1188662,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -1195134,7 +1195550,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625123128} serializedVersion: 2 - m_LocalRotation: {x: 0.6753436, y: 0.030742254, z: -0.028196301, w: 0.7363227} + m_LocalRotation: {x: 0.6753436, y: 0.030742314, z: -0.02819636, w: 0.7363227} m_LocalPosition: {x: -1.1368684e-13, y: 0, z: -0.0000009536744} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1210603,7 +1211019,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -1217738,7 +1218154,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_archer_101 k__BackingField: enemy_view_archer_101 @@ -1252463,7 +1252879,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -1267707,7 +1268123,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -1327016,7 +1327432,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -1341524,6 +1341940,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1824338964} m_PrefabAsset: {fileID: 0} +--- !u!114 &1824338966 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8302608207570708049, guid: 2c88609e9752cd0449589fa539820435, + type: 3} + m_PrefabInstance: {fileID: 1824338964} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ed17fd326510c349a4daf1dac3d88cc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1824490524 GameObject: m_ObjectHideFlags: 0 @@ -1344139,6 +1344567,38 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1828426795} m_Mesh: {fileID: 4300936, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &1828981124 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1828981125} + m_Layer: 13 + m_Name: InShipPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1828981125 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828981124} + 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: 314097977} + m_Father: {fileID: 1248116869} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1828982574 GameObject: m_ObjectHideFlags: 0 @@ -1354912,7 +1355372,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearman_101 k__BackingField: enemy_view_spearman_101 @@ -1363621,7 +1364081,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -1364254,7 +1364714,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearman_001 k__BackingField: enemy_view_spearman_001 @@ -1412432,7 +1412892,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -1424259,7 +1424719,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearman_001 k__BackingField: enemy_view_spearman_001 @@ -1428493,7 +1428953,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_spearknight_101 k__BackingField: enemy_view_spearknight_101 @@ -1432192,6 +1432652,18 @@ SkinnedMeshRenderer: m_Center: {x: -2.450478, y: -0.037529632, z: -0.011102915} m_Extent: {x: 2.7497826, y: 0.20627628, z: 1.0783304} m_DirtyAABB: 0 +--- !u!114 &1952154356 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8302608207570708049, guid: 2c88609e9752cd0449589fa539820435, + type: 3} + m_PrefabInstance: {fileID: 978915506} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ed17fd326510c349a4daf1dac3d88cc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1952634766 GameObject: m_ObjectHideFlags: 0 @@ -1452370,6 +1452842,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1984081336} m_Mesh: {fileID: 4300926, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!114 &1984327870 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8302608207570708049, guid: 2c88609e9752cd0449589fa539820435, + type: 3} + m_PrefabInstance: {fileID: 1068941452} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ed17fd326510c349a4daf1dac3d88cc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1984397995 GameObject: m_ObjectHideFlags: 0 @@ -1462518,7 +1463002,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -1481161,7 +1481645,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_101 k__BackingField: enemy_view_swordman_101 @@ -1508134,7 +1508618,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -1537898,7 +1538382,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordknight_001 k__BackingField: enemy_view_swordknight_001 @@ -1556662,7 +1557146,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_001 k__BackingField: enemy_view_swordman_001 @@ -1566247,7 +1566731,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} attackingIslandInfo: {fileID: 0} - defendingIslandInfo: {fileID: 0} + defendingIslandInfo: {fileID: 357776294} k__BackingField: k__BackingField: enemy_stat_swordman_101 k__BackingField: enemy_view_swordman_101 @@ -1569401,6 +1569885,7 @@ SceneRoots: - {fileID: 692722753} - {fileID: 357776295} - {fileID: 200595900} + - {fileID: 1248116869} - {fileID: 1545641374} - {fileID: 1188875250} - {fileID: 1178281512} diff --git a/BlueWater/Assets/02.Scripts/GameManager.cs b/BlueWater/Assets/02.Scripts/GameManager.cs index aef093744..32fb42ae0 100644 --- a/BlueWater/Assets/02.Scripts/GameManager.cs +++ b/BlueWater/Assets/02.Scripts/GameManager.cs @@ -6,6 +6,7 @@ using UnityEngine; // ReSharper disable once CheckNamespace namespace BlueWaterProject { + [DefaultExecutionOrder(-1)] public class GameManager : Singleton { [Title("Controller")] diff --git a/BlueWater/Assets/02.Scripts/GameManager.cs.meta b/BlueWater/Assets/02.Scripts/GameManager.cs.meta index 0b949f1a4..9e1811d26 100644 --- a/BlueWater/Assets/02.Scripts/GameManager.cs.meta +++ b/BlueWater/Assets/02.Scripts/GameManager.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: -1 + executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: diff --git a/BlueWater/Assets/02.Scripts/Player/Player.cs b/BlueWater/Assets/02.Scripts/Player/Player.cs index df8749bdc..233f073fe 100644 --- a/BlueWater/Assets/02.Scripts/Player/Player.cs +++ b/BlueWater/Assets/02.Scripts/Player/Player.cs @@ -10,51 +10,51 @@ namespace BlueWaterProject { [RequireComponent(typeof(Rigidbody))] [RequireComponent(typeof(PlayerInput))] + [SelectionBase] public class Player : MonoBehaviour { - [Title("Component")] + [Title("Component")] private Rigidbody rb; private Vector2 movementInput; - - [Title("쉽의 기본 설정")] - [Tooltip("최대 스피드")] - public float maxSpeed = 10f; - [Tooltip("가속 수치")] - public float acceleration = 2f; - [Tooltip("감속 수치")] - public float deceleration = 2f; - [Tooltip("회전 속도")] - public float turnSpeed = 10f; - - [Title("캐릭터의 기본 설정")] + + [Title("쉽의 기본 설정")] + [Tooltip("최대 스피드")] public float maxSpeed = 10f; + + [Tooltip("가속 수치")] public float acceleration = 2f; + [Tooltip("감속 수치")] public float deceleration = 2f; + [Tooltip("회전 속도")] public float turnSpeed = 10f; + + [Title("캐릭터의 기본 설정")] private GameObject character; - [Tooltip("캐릭터의 이동 속도")] - public float characterSpeed = 10f; - - [Title("레이더")] + [Tooltip("캐릭터의 이동 속도")] public float characterSpeed = 10f; + + [Title("레이더")] public Collider[] radar = new Collider[10]; - public List inCameraRadar = new (10); + public List inCameraRadar = new(10); public Transform target; public bool IsTargeting { get; private set; } - - [Title("캐논")] + + [Title("캐논")] public Rigidbody projectilePrefab; public Transform launchPoint; public float timeOfFlight; public Transform predictedPos; - [field: SerializeField] - public List Canons { get; private set; } = new (GlobalValue.MAX_CANON_COUNT); - + [field: SerializeField] public List Canons { get; private set; } = new(GlobalValue.MAX_CANON_COUNT); + [field: Title("Mode")] - [field: SerializeField] public bool IsAssaultMode { get; set; } + [field: SerializeField] + public bool IsAssaultMode { get; set; } + [field: SerializeField] public bool IsInShipMode { get; set; } [field: SerializeField] public bool IsDredgeMode { get; set; } [field: SerializeField] public bool IsTakeAim { get; set; } - - [Title("Interaction")] + + [Title("Interaction")] public bool IsIslandInteraction { get; set; } private float rayLength; private LayerMask groundLayer; + private Vector3 halfExtents; // 박스 크기의 절반을 나타내는 벡터값을 설정합니다. + private List directions = new(8); private void Init() { @@ -64,14 +64,26 @@ namespace BlueWaterProject rayLength = 15f; groundLayer = LayerMask.GetMask("Ground"); + halfExtents = new Vector3(5, 5, 5); + directions = new List(8) + { + transform.forward, + -transform.forward, + transform.right, + -transform.right, + transform.forward + transform.right, + transform.forward - transform.right, + -transform.forward + transform.right, + -transform.forward - transform.right + }; } #region Unity Function - + private void OnDrawGizmosSelected() { - Gizmos.color = Color.red; - Gizmos.DrawWireSphere(transform.position, GlobalValue.RADAR_RANGE); + RadarDrawGizmo(); + Raycast8DrawGizmo(); } private void Awake() @@ -98,14 +110,14 @@ namespace BlueWaterProject } #endregion - + #region Movement - + public void OnMove(InputValue value) // WASD { movementInput = value.Get(); } - + private void MoveShipPlayer() { var desiredVelocity = transform.forward * (movementInput.y * maxSpeed); @@ -122,11 +134,12 @@ namespace BlueWaterProject private void MoveCharacterPlayer() { - var movement = character.transform.rotation * new Vector3(-movementInput.y, 0, movementInput.x) * (characterSpeed * Time.deltaTime); + var movement = character.transform.rotation * new Vector3(-movementInput.y, 0, movementInput.x) * + (characterSpeed * Time.deltaTime); character.transform.position += movement; } - + private void HandleMovement() { if (IsInShipMode) @@ -139,22 +152,22 @@ namespace BlueWaterProject RotatePlayer(); } } - + private void StopShipMovement() { rb.velocity = Vector3.zero; rb.angularVelocity = Vector3.zero; } - + #endregion - + #region AssaultMode/DreadgeMode Switch private void OnAssaultMode(InputValue value) // V { SwitchAssaultMode(!IsAssaultMode); } - + private void SwitchAssaultMode(bool isOn) { if (isOn) @@ -173,7 +186,7 @@ namespace BlueWaterProject IsAssaultMode = false; } } - + private void SwitchDredgeMode(bool isOn) { if (isOn) @@ -193,16 +206,16 @@ namespace BlueWaterProject #endregion #region Interaction Key - + private void OnTargeting(InputValue value) //Q { - if(inCameraRadar.Count == 0) return; + if (inCameraRadar.Count == 0) return; IsTargeting = true; UiManager.Inst.RadarUIOnOff(IsTargeting); - + FindTarget(); } - + private void OnTargetingHold(InputValue value) //Q Hold { IsTargeting = false; @@ -211,7 +224,7 @@ namespace BlueWaterProject private void OnInteractionE(InputValue value) //E { - if(IsTargeting) UiManager.Inst.CheckRadarOverlap(); + if (IsTargeting) UiManager.Inst.CheckRadarOverlap(); } private void OnInteraction(InputValue value) //F @@ -221,7 +234,7 @@ namespace BlueWaterProject UiManager.Inst.DefaultInteractionOnOff(false); StopShipMovement(); } - + private void OnInteractionHold(InputValue value) //F Hold { SwitchInShipMode(!IsInShipMode); @@ -245,10 +258,10 @@ namespace BlueWaterProject } #endregion - + private void OnZkey(InputValue value) { - UiManager.Inst.AddCard(); + UiManager.Inst.AssaultCardInit(); } #region TakeAim @@ -257,7 +270,7 @@ namespace BlueWaterProject { SwitchTakeAim(!IsTakeAim); } - + private void SwitchTakeAim(bool isOn) { if (isOn) @@ -277,6 +290,7 @@ namespace BlueWaterProject Cursor.lockState = CursorLockMode.Confined; IsTakeAim = false; } + UiManager.Inst.AimOnOff(isOn); } @@ -286,7 +300,8 @@ namespace BlueWaterProject private void FindInRadarRange() { - Physics.OverlapSphereNonAlloc(transform.position, GlobalValue.RADAR_RANGE, radar, LayerMask.GetMask(GlobalValue.ENEMY_LAYER)); + Physics.OverlapSphereNonAlloc(transform.position, GlobalValue.RADAR_RANGE, radar, + LayerMask.GetMask(GlobalValue.ENEMY_LAYER)); } private void FilterInCameraObjects() @@ -295,13 +310,18 @@ namespace BlueWaterProject foreach (var col in radar) { if (col == null) continue; - 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) + 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); } } - inCameraRadar.Sort((a, b) => Vector3.Distance(transform.position, a.position).CompareTo(Vector3.Distance(transform.position, b.position))); + + inCameraRadar.Sort((a, b) => + Vector3.Distance(transform.position, a.position) + .CompareTo(Vector3.Distance(transform.position, b.position))); } private void FindTarget() @@ -312,14 +332,12 @@ namespace BlueWaterProject { if (trans.Find("TestTarget") == null) continue; if (target != null && trans.Find("TestTarget").transform == oldTarget) continue; - target = trans.Find("TestTarget").transform; // Set new target - break; // Exit the loop + target = trans.Find("TestTarget").transform; + break; } - // Check if target has changed if (target != oldTarget) { - // Call some method if target has changed UiManager.Inst.RadarTargetInit(); } } @@ -342,30 +360,18 @@ namespace BlueWaterProject private void Raycast8Direction() { if (!IsDredgeMode) return; - - Vector3[] directions = - { - transform.forward, - -transform.forward, - transform.right, - -transform.right, - transform.forward + transform.right, - transform.forward - transform.right, - -transform.forward + transform.right, - -transform.forward - transform.right - }; - Vector3 halfExtents = new Vector3(5, 5, 5); // 박스 크기의 절반을 나타내는 벡터값을 설정합니다. var isOn = false; foreach (Vector3 dir in directions) { RaycastHit hit; - if (Physics.BoxCast(transform.position, halfExtents, dir, out hit, Quaternion.identity, rayLength, groundLayer)) + if (Physics.BoxCast(transform.position, halfExtents, dir, out hit, Quaternion.identity, rayLength, + groundLayer)) { isOn = true; - + var islandInfo = hit.transform.parent.parent.GetComponent(); if (GameManager.Inst.CameraController.AssaultCam != islandInfo.IslandCam) @@ -376,6 +382,7 @@ namespace BlueWaterProject IsIslandInteraction = true; break; } + // 박스가 Ground 레이어에 닿지 않았을 때 녹색으로 표시 Debug.DrawRay(transform.position, dir * rayLength, Color.green); IsIslandInteraction = false; @@ -385,5 +392,36 @@ namespace BlueWaterProject } #endregion + + #region Gizmos + + private void Raycast8DrawGizmo() + { + Gizmos.color = IsIslandInteraction ? Color.red : Color.green; + + foreach (Vector3 dir in directions) + { + bool isHit = Physics.BoxCast(transform.position, halfExtents, dir, out RaycastHit hitInfo, Quaternion.identity, rayLength, groundLayer); + + if (isHit) + { + // 박스가 Ground 레이어에 닿았을 때 빨간색으로 표시 + Gizmos.DrawWireCube(transform.position + dir.normalized * hitInfo.distance, halfExtents * 2); + } + else + { + // 박스가 Ground 레이어에 닿지 않았을 때 녹색으로 표시 + Gizmos.DrawWireCube(transform.position + dir.normalized * rayLength, halfExtents * 2); + } + } + } + + private void RadarDrawGizmo() + { + Gizmos.color = Color.red; + Gizmos.DrawWireSphere(transform.position, GlobalValue.RADAR_RANGE); + } + + #endregion } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Ui/UiManager.cs b/BlueWater/Assets/02.Scripts/Ui/UiManager.cs index a22ca2b60..0af57b131 100644 --- a/BlueWater/Assets/02.Scripts/Ui/UiManager.cs +++ b/BlueWater/Assets/02.Scripts/Ui/UiManager.cs @@ -83,7 +83,7 @@ namespace BlueWaterProject Cursor.SetCursor(cursorTexture, hotSpot, CursorMode.Auto); } - private void AssaultCardInit() + public void AssaultCardInit() { for (int i = 0; i < DataManager.Inst.CardList.Count; i++) { diff --git a/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta new file mode 100644 index 000000000..b7c4cd42b --- /dev/null +++ b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a55ee4efaad27d948ba5f03fc6d7bc80 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta new file mode 100644 index 000000000..559272344 --- /dev/null +++ b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed9b95dc6ed6d0647ad7f1a8f305385d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta b/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta new file mode 100644 index 000000000..cdb770faa --- /dev/null +++ b/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4ff1f29eab234cf4490d9bb383892c44 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for Buto Integration.unitypackage.meta b/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for Buto Integration.unitypackage.meta new file mode 100644 index 000000000..de4e3b6b0 --- /dev/null +++ b/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for Buto Integration.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f5789d13135b86645a366dac6583d1cd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta b/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta new file mode 100644 index 000000000..384510c7b --- /dev/null +++ b/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3643c0d76ec153646b1203880bfb64ed +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta b/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta new file mode 100644 index 000000000..a9c2e2131 --- /dev/null +++ b/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d7c4217783978e4abe6496ac71eee94 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta b/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta new file mode 100644 index 000000000..508065e3b --- /dev/null +++ b/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta new file mode 100644 index 000000000..b4ec97874 --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 078b8f13a17171b49892ad10426d5af0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta new file mode 100644 index 000000000..2ac65e5d2 --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f9406a33814af9c47b352e77f079d798 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta new file mode 100644 index 000000000..69d7b56dd --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9aacf6f3043624194bb6f6fe9a580786 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta new file mode 100644 index 000000000..be555027e --- /dev/null +++ b/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f4227764308e84f89a765fbf315e2945 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta new file mode 100644 index 000000000..350ee4c64 --- /dev/null +++ b/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 41e59f562b69648719f2424c438758f3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta new file mode 100644 index 000000000..d7e559c52 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b044a2387a61dac41bdf204adffdce9d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta new file mode 100644 index 000000000..8ac8bbf10 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd287c84e887ea24a8679e67aac7c074 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta new file mode 100644 index 000000000..589ee74d0 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta new file mode 100644 index 000000000..e22c323d5 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f211254f5bfad224ba88868f2c75432c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta new file mode 100644 index 000000000..ea9dafacc --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4368c9be31b3c174dbfd80f2caf98889 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta b/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta new file mode 100644 index 000000000..614e98f98 --- /dev/null +++ b/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 617b3f1032a08c14ebfedfa340767cdf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta new file mode 100644 index 000000000..1eadf09a3 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f597f19f656ba56eae4f6a3a7cc528f4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta new file mode 100644 index 000000000..f073d2ab4 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48e08dc33330d11e9d4a1b246c52e4f6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta new file mode 100644 index 000000000..130722af7 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed09910c0094cb27be8f3ca264680da3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta new file mode 100644 index 000000000..f9b8ed82b --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc355dd4cf1e6173beaeb22c2858cbe1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/ProjectSettings/TagManager.asset b/BlueWater/ProjectSettings/TagManager.asset index b8bb0afde..70ee71eb8 100644 --- a/BlueWater/ProjectSettings/TagManager.asset +++ b/BlueWater/ProjectSettings/TagManager.asset @@ -28,7 +28,7 @@ TagManager: - Enemy - Weapon - HitBox - - + - ShipPlayer - - - Props