diff --git a/BlueWater/Assets/01.Scenes/02.Main/NavMesh-Water Object.asset b/BlueWater/Assets/01.Scenes/02.Main/NavMesh-Water Object.asset deleted file mode 100644 index 65454bbef..000000000 Binary files a/BlueWater/Assets/01.Scenes/02.Main/NavMesh-Water Object.asset and /dev/null differ diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta b/BlueWater/Assets/01.Scenes/02.Ocean.meta similarity index 67% rename from BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta rename to BlueWater/Assets/01.Scenes/02.Ocean.meta index b4ec97874..2f85a92a3 100644 --- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta +++ b/BlueWater/Assets/01.Scenes/02.Ocean.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 078b8f13a17171b49892ad10426d5af0 +guid: 0d2f9ae90bf27654b9950aea040f0191 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/BlueWater/Assets/01.Scenes/02.Ocean.unity b/BlueWater/Assets/01.Scenes/02.Ocean.unity index 4e46cf885..8a17f4470 100644 --- a/BlueWater/Assets/01.Scenes/02.Ocean.unity +++ b/BlueWater/Assets/01.Scenes/02.Ocean.unity @@ -14,31 +14,31 @@ OcclusionCullingSettings: RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 9 - m_Fog: 0 + m_Fog: 1 m_FogColor: {r: 0.7989498, g: 0.8867924, b: 0.88501716, a: 1} m_FogMode: 3 - m_FogDensity: 0.003 + m_FogDensity: 0.0015 m_LinearFogStart: 0 m_LinearFogEnd: 300 m_AmbientSkyColor: {r: 0.63919544, g: 0.9581202, b: 1.018868, a: 1.5} m_AmbientEquatorColor: {r: 0.63198096, g: 0.82505363, b: 0.91142833, a: 1.341825} m_AmbientGroundColor: {r: 0.31599048, g: 0.41252682, b: 0.45571417, a: 1.341825} m_AmbientIntensity: 1 - m_AmbientMode: 1 + m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 2100000, guid: 7fece7608763947d9ba913243fda1296, type: 2} + m_SkyboxMaterial: {fileID: 2100000, guid: 3d48ebb64507a6e43bba7a5ef43f06ec, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 m_HaloTexture: {fileID: 0} m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 1 + m_DefaultReflectionMode: 0 m_DefaultReflectionResolution: 128 m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.7008067, g: 0.7856395, b: 0.82016635, a: 1} + m_Sun: {fileID: 55264370} + m_IndirectSpecularColor: {r: 0.11325848, g: 0.48708493, b: 0.73601764, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: @@ -257,6 +257,124 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 4.01, y: 5.9083214, z: 5.49} m_Center: {x: 0.0027588608, y: 2.9541607, z: -0.016290905} +--- !u!1 &55264368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 55264371} + - component: {fileID: 55264370} + - component: {fileID: 55264369} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &55264369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 55264368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 +--- !u!108 &55264370 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 55264368} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.9814458, b: 0.9009434, a: 1} + m_Intensity: 1.2 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &55264371 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 55264368} + serializedVersion: 2 + m_LocalRotation: {x: 0.29150948, y: 0.49833268, z: -0.19743386, w: 0.7922794} + m_LocalPosition: {x: -3.2468147, y: 14.788792, z: 161.03754} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 41.2, y: 63.7, z: -1.6990001} --- !u!1001 &59777445 PrefabInstance: m_ObjectHideFlags: 0 @@ -746,12 +864,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 107190133} 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: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 357776295} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &155713052 GameObject: @@ -1068,14 +1186,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 168896972} serializedVersion: 2 - m_LocalRotation: {x: 0.18301274, y: 0.6830127, z: -0.18301274, w: 0.6830127} - m_LocalPosition: {x: -71.941025, y: 21.420008, z: 0.00000399121} + m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} + m_LocalPosition: {x: -37.3, y: 21.420004, z: -34.641014} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 263106988} m_Father: {fileID: 649179607} - m_LocalEulerAnglesHint: {x: 30, y: 90, z: 0} + m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} --- !u!114 &168896974 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1578,8 +1696,8 @@ Transform: 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_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -104.3, y: 5.01, z: 30.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1597,7 +1715,7 @@ Transform: - {fileID: 800408618} - {fileID: 1389301165} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!114 &200595901 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2308,6 +2426,40 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: -0.09900001, y: 2.229, z: 0.049000002} m_TimeToStationary: 0.5 +--- !u!1 &280786783 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 280786784} + m_Layer: 0 + m_Name: DestructiveObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &280786784 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 280786783} + 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: 1977426170} + - {fileID: 1876117046} + - {fileID: 1508474650} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &317689561 GameObject: m_ObjectHideFlags: 3 @@ -3132,8 +3284,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 357776292} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -17.4, y: 0, z: 47.6} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3142,8 +3294,9 @@ Transform: - {fileID: 100546466} - {fileID: 1775595014} - {fileID: 541711049} + - {fileID: 107190135} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1001 &392546456 PrefabInstance: m_ObjectHideFlags: 0 @@ -3598,7 +3751,7 @@ GameObject: - component: {fileID: 476261171} m_Layer: 9 m_Name: ShipPlayer - m_TagString: Player + m_TagString: ShipPlayer m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3628,48 +3781,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 176cfac66084d4bfb9b4c9f11c4b137f, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: 15 - k__BackingField: 1.5 - 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} - k__BackingField: {fileID: 0} - k__BackingField: - serializedVersion: 2 - m_Bits: 0 autoInit: 1 - maxSpeed: 10 - acceleration: 4 + maxSpeed: 15 + acceleration: 10 deceleration: 2 - turnSpeed: 1 + turnSpeed: 2 + k__BackingField: 100 + k__BackingField: 0 + k__BackingField: 500 cannon: {fileID: 1612917925} cannonCooldown: 1 chargingSpeed: 1 @@ -3678,6 +3797,10 @@ MonoBehaviour: isReloading: 0 chargingGauge: 0 previousGauge: 0 + boostPower: 2 + boostMaxTime: 3 + boostRecoveryTime: 1.5 + isBoosting: 0 waterLayer: serializedVersion: 2 m_Bits: 16 @@ -3809,7 +3932,7 @@ Rigidbody: m_UseGravity: 0 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 0 + m_Constraints: 96 m_CollisionDetection: 0 --- !u!4 &476261175 Transform: @@ -3819,7 +3942,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 476261169} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -37.3, y: -1.58, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3829,7 +3952,7 @@ Transform: - {fileID: 1084613024} - {fileID: 1925782815} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &476261176 BoxCollider: m_ObjectHideFlags: 0 @@ -7104,8 +7227,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 776161953} serializedVersion: 2 - m_LocalRotation: {x: 0.18301274, y: 0.6830127, z: -0.18301274, w: 0.6830127} - m_LocalPosition: {x: -71.941025, y: 21.420008, z: 0.00000399121} + m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} + m_LocalPosition: {x: -37.3, y: 21.420004, z: -34.641014} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7450,7 +7573,6 @@ RectTransform: - {fileID: 409443062} - {fileID: 271798703} - {fileID: 197341959} - - {fileID: 7415601899565865879} m_Father: {fileID: 2105062291} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -8997,48 +9119,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 176cfac66084d4bfb9b4c9f11c4b137f, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: 15 - k__BackingField: 1.5 - 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} - k__BackingField: {fileID: 0} - k__BackingField: - serializedVersion: 2 - m_Bits: 0 autoInit: 1 maxSpeed: 5 acceleration: 2 deceleration: 2 turnSpeed: 1 + k__BackingField: 100 + k__BackingField: 0 + k__BackingField: 500 cannon: {fileID: 0} cannonCooldown: 1 chargingSpeed: 1 @@ -9047,6 +9135,10 @@ MonoBehaviour: isReloading: 0 chargingGauge: 0 previousGauge: 0 + boostPower: 2 + boostMaxTime: 3 + boostRecoveryTime: 1.5 + isBoosting: 0 waterLayer: serializedVersion: 2 m_Bits: 0 @@ -10621,6 +10713,266 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 1040971782} +--- !u!1001 &1446558449 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2105062291} + m_Modifications: + - target: {fileID: 3071491898345723473, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3071491898345723473, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3071491898345723473, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3071491898345723473, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3071491898345723473, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_SizeDelta.x + value: 14.25 + objectReference: {fileID: 0} + - target: {fileID: 3071491898345723473, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276924355341542, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 6935276924355341542, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6935276924355341542, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 6935276924355341542, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276924355341542, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_SizeDelta.x + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6935276924355341542, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276924459582013, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 6935276924459582013, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6935276924459582013, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 6935276924459582013, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161161, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_Value + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161161, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_MaxValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161161, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_Direction + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161161, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_WholeNumbers + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_SizeDelta.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_SizeDelta.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925009161207, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_Name + value: ShipBoostSlider + objectReference: {fileID: 0} + - target: {fileID: 6935276925344686068, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925344686068, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925344686068, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925344686068, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925499279574, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925499279574, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6935276925499279574, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 6935276925479934990, guid: 380b9020d37774c7a9f587a854c1e063, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 380b9020d37774c7a9f587a854c1e063, type: 3} +--- !u!224 &1446558450 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6935276925009161206, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + m_PrefabInstance: {fileID: 1446558449} + m_PrefabAsset: {fileID: 0} --- !u!1 &1464480066 GameObject: m_ObjectHideFlags: 0 @@ -10722,7 +11074,7 @@ Transform: m_GameObject: {fileID: 1464480066} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -39.61, y: -2.39, z: 7.75} + m_LocalPosition: {x: -50.93, y: -18.53, z: 5.39} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -10753,8 +11105,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1485085414} serializedVersion: 2 - m_LocalRotation: {x: 0.38022426, y: 0.6187545, z: -0.46297544, w: 0.50815964} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.380228, y: 0.61875033, z: -0.46297237, w: 0.50816464} + m_LocalPosition: {x: -0.00016403198, y: 0, z: -0.0008239746} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -10889,6 +11241,298 @@ Transform: type: 3} m_PrefabInstance: {fileID: 159487885} m_PrefabAsset: {fileID: 0} +--- !u!1 &1508474649 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1508474650} + - component: {fileID: 1508474654} + - component: {fileID: 1508474653} + - component: {fileID: 1508474652} + - component: {fileID: 1508474651} + m_Layer: 21 + m_Name: Cube (2) + m_TagString: DestructiveObject + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1508474650 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508474649} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -25.75, y: 1.05, z: 33.52} + m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 280786784} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1508474651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508474649} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b69f7e57a6e2a641936534835f324ea, type: 3} + m_Name: + m_EditorClassIdentifier: + autoInit: 1 + k__BackingField: 500 + power: 10 + damageCooldown: 2 + isHitting: 0 + rayfire: {fileID: 1508474652} + rb: {fileID: 0} +--- !u!114 &1508474652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508474649} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb6e52f37bca2404fac00b69fd8d21f8, type: 3} + m_Name: + m_EditorClassIdentifier: + initialization: 1 + simulationType: 1 + objectType: 0 + demolitionType: 3 + physics: + mt: 5 + material: {fileID: 0} + massBy: 0 + mass: 1 + ct: 0 + pc: 1 + ine: 0 + gr: 1 + si: 6 + st: 0.005 + dm: 0.7 + rigidBody: {fileID: 0} + meshCollider: {fileID: 0} + clusterColliders: [] + ignoreList: + exclude: 0 + solidity: 1 + destructible: 0 + activation: + loc: 0 + off: 0 + vel: 0 + dmg: 0 + act: 0 + imp: 0 + con: 0 + uny: 0 + atb: 0 + l: 0 + lay: 0 + cnt: {fileID: 0} + limitations: + col: 0 + sol: 0.1 + tag: Untagged + depth: 1 + time: 0.2 + size: 0.1 + vis: 0 + bld: 0 + bound: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + meshDemolition: + am: 50 + var: 0 + dpf: 0.5 + bias: 0 + sd: 1 + use: 0 + cld: 1 + cls: 0 + sim: 4 + inp: 9 + prp: + col: 0 + szF: 0 + dec: 0 + rem: 0 + l: 1 + lay: 0 + t: 1 + tag: + ch: + tp: 0 + frm: 3 + frg: 4 + skp: 0 + sht: {fileID: 0} + rotStart: {x: 0, y: 0, z: 0, w: 1} + clusterDemolition: + connectivity: 0 + minimumArea: 0 + minimumSize: 0 + percentage: 0 + seed: 0 + type: 0 + ratio: 15 + units: 1 + shardArea: 100 + shardDemolition: 0 + minAmount: 3 + maxAmount: 6 + demolishable: 1 + collapse: + type: 1 + start: 0 + end: 75 + steps: 10 + duration: 15 + var: 0 + seed: 0 + clsCount: 1 + cluster: + id: -1 + tm: {fileID: 0} + depth: 0 + pos: {x: 0, y: 0, z: 0} + rot: {x: 0, y: 0, z: 0, w: 0} + scl: {x: 0, y: 0, z: 0} + bound: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + demolishable: 1 + rigid: {fileID: 0} + shards: [] + cachedHost: 0 + areaCollapse: 0 + minimumArea: 0 + maximumArea: 0 + sizeCollapse: 0 + minimumSize: 0 + maximumSize: 0 + randomCollapse: 0 + minorClusters: [] + cn: 0 + nd: 0 + am: 0 + referenceDemolition: + reference: {fileID: 0} + randomList: [] + action: 0 + addRigid: 1 + inheritScale: 1 + inheritMaterials: 0 + materials: + iMat: {fileID: 0} + oMat: {fileID: 0} + mScl: 0.1 + uvE: 0 + uvC: {x: 0, y: 0} + cE: 0 + cC: {r: 0, g: 0, b: 0, a: 0} + damage: + en: 0 + max: 100 + cur: 0 + col: 0 + mlt: 1 + shr: 0 + fading: + onDemolition: 1 + onActivation: 0 + byOffset: 0 + lifeType: 4 + lifeTime: 7 + lifeVariation: 3 + fadeType: 0 + fadeTime: 5 + sizeFilter: 0 + shardAmount: 5 + reset: + transform: 1 + damage: 1 + connectivity: 0 + action: 0 + destroyDelay: 1 + mesh: 4 + fragments: 0 + initialized: 0 + rfMeshes: [] + fragments: [] + cacheRotation: {x: 0, y: 0, z: 0, w: 0} + transForm: {fileID: 0} + rootChild: {fileID: 0} + rootParent: {fileID: 0} + meshFilter: {fileID: 0} + meshRenderer: {fileID: 0} + skr: {fileID: 0} + rest: {fileID: 0} + sound: {fileID: 0} +--- !u!23 &1508474653 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508474649} + 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 &1508474654 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508474649} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1537919015 stripped Transform: m_CorrespondingSourceObject: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, @@ -11118,7 +11762,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: cb277eb3bee9d44b1b2a96c20ce470e5, type: 2} + - {fileID: 2100000, guid: 5fafa8676906446259d1790e3543945a, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11208,7 +11852,7 @@ MonoBehaviour: m_OverrideVoxelSize: 0 m_VoxelSize: 0.16666667 m_MinRegionArea: 2 - m_NavMeshData: {fileID: 23800000, guid: 1d6d589a2ce0c4e7c96e54c2effb8b63, type: 2} + m_NavMeshData: {fileID: 23800000, guid: 33e399d90365b9d4c979ca3993b66866, type: 2} m_BuildHeightMesh: 0 --- !u!65 &1560348107 BoxCollider: @@ -12672,6 +13316,112 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1771297321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1771297325} + - component: {fileID: 1771297324} + - component: {fileID: 1771297323} + - component: {fileID: 1771297322} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1771297322 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771297321} + 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 &1771297323 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771297321} + 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 &1771297324 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771297321} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1771297325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771297321} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -26.02928, y: -187.3, z: -32.508316} + m_LocalScale: {x: 500, y: 500, z: 500} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1774795243 PrefabInstance: m_ObjectHideFlags: 0 @@ -13052,6 +13802,71 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: -0.09900001, y: 2.229, z: 0.049000002} m_TimeToStationary: 0.5 +--- !u!1 &1806659890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1806659892} + - component: {fileID: 1806659891} + m_Layer: 0 + m_Name: Reflection Probe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!215 &1806659891 +ReflectionProbe: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806659890} + m_Enabled: 1 + serializedVersion: 2 + m_Type: 0 + m_Mode: 1 + m_RefreshMode: 0 + m_TimeSlicingMode: 0 + m_Resolution: 256 + m_UpdateFrequency: 0 + m_BoxSize: {x: 512, y: 512, z: 512} + m_BoxOffset: {x: 0, y: 0, z: 0} + m_NearClip: 0.3 + m_FarClip: 1000 + m_ShadowDistance: 0 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_CullingMask: + serializedVersion: 2 + m_Bits: 39 + m_IntensityMultiplier: 1 + m_BlendDistance: 1 + m_HDR: 0 + m_BoxProjection: 0 + m_RenderDynamicObjects: 0 + m_UseOcclusionCulling: 0 + m_Importance: 1 + m_CustomBakedTexture: {fileID: 0} +--- !u!4 &1806659892 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806659890} + serializedVersion: 2 + m_LocalRotation: {x: 0.021742871, y: 0.19392985, z: -0.0042992886, w: 0.98076504} + m_LocalPosition: {x: -50.32606, y: -4.394351, z: -107.878975} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1841847360 PrefabInstance: m_ObjectHideFlags: 0 @@ -13182,6 +13997,298 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: -0.09900001, y: 2.229, z: 0.049000002} m_TimeToStationary: 0.5 +--- !u!1 &1876117045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1876117046} + - component: {fileID: 1876117050} + - component: {fileID: 1876117049} + - component: {fileID: 1876117048} + - component: {fileID: 1876117047} + m_Layer: 21 + m_Name: Cube (1) + m_TagString: DestructiveObject + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1876117046 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876117045} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -42.46, y: 1.05, z: 33.52} + m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 280786784} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1876117047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876117045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b69f7e57a6e2a641936534835f324ea, type: 3} + m_Name: + m_EditorClassIdentifier: + autoInit: 1 + k__BackingField: 1000 + power: 10 + damageCooldown: 2 + isHitting: 0 + rayfire: {fileID: 1876117048} + rb: {fileID: 0} +--- !u!114 &1876117048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876117045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb6e52f37bca2404fac00b69fd8d21f8, type: 3} + m_Name: + m_EditorClassIdentifier: + initialization: 1 + simulationType: 1 + objectType: 0 + demolitionType: 3 + physics: + mt: 5 + material: {fileID: 0} + massBy: 0 + mass: 1 + ct: 0 + pc: 1 + ine: 0 + gr: 1 + si: 6 + st: 0.005 + dm: 0.7 + rigidBody: {fileID: 0} + meshCollider: {fileID: 0} + clusterColliders: [] + ignoreList: + exclude: 0 + solidity: 1 + destructible: 0 + activation: + loc: 0 + off: 0 + vel: 0 + dmg: 0 + act: 0 + imp: 0 + con: 0 + uny: 0 + atb: 0 + l: 0 + lay: 0 + cnt: {fileID: 0} + limitations: + col: 0 + sol: 0.1 + tag: Untagged + depth: 1 + time: 0.2 + size: 0.1 + vis: 0 + bld: 0 + bound: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + meshDemolition: + am: 50 + var: 0 + dpf: 0.5 + bias: 0 + sd: 1 + use: 0 + cld: 1 + cls: 0 + sim: 4 + inp: 9 + prp: + col: 0 + szF: 0 + dec: 0 + rem: 0 + l: 1 + lay: 0 + t: 1 + tag: + ch: + tp: 0 + frm: 3 + frg: 4 + skp: 0 + sht: {fileID: 0} + rotStart: {x: 0, y: 0, z: 0, w: 1} + clusterDemolition: + connectivity: 0 + minimumArea: 0 + minimumSize: 0 + percentage: 0 + seed: 0 + type: 0 + ratio: 15 + units: 1 + shardArea: 100 + shardDemolition: 0 + minAmount: 3 + maxAmount: 6 + demolishable: 1 + collapse: + type: 1 + start: 0 + end: 75 + steps: 10 + duration: 15 + var: 0 + seed: 0 + clsCount: 1 + cluster: + id: -1 + tm: {fileID: 0} + depth: 0 + pos: {x: 0, y: 0, z: 0} + rot: {x: 0, y: 0, z: 0, w: 0} + scl: {x: 0, y: 0, z: 0} + bound: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + demolishable: 1 + rigid: {fileID: 0} + shards: [] + cachedHost: 0 + areaCollapse: 0 + minimumArea: 0 + maximumArea: 0 + sizeCollapse: 0 + minimumSize: 0 + maximumSize: 0 + randomCollapse: 0 + minorClusters: [] + cn: 0 + nd: 0 + am: 0 + referenceDemolition: + reference: {fileID: 0} + randomList: [] + action: 0 + addRigid: 1 + inheritScale: 1 + inheritMaterials: 0 + materials: + iMat: {fileID: 0} + oMat: {fileID: 0} + mScl: 0.1 + uvE: 0 + uvC: {x: 0, y: 0} + cE: 0 + cC: {r: 0, g: 0, b: 0, a: 0} + damage: + en: 0 + max: 100 + cur: 0 + col: 0 + mlt: 1 + shr: 0 + fading: + onDemolition: 1 + onActivation: 0 + byOffset: 0 + lifeType: 4 + lifeTime: 7 + lifeVariation: 3 + fadeType: 0 + fadeTime: 5 + sizeFilter: 0 + shardAmount: 5 + reset: + transform: 1 + damage: 1 + connectivity: 0 + action: 0 + destroyDelay: 1 + mesh: 4 + fragments: 0 + initialized: 0 + rfMeshes: [] + fragments: [] + cacheRotation: {x: 0, y: 0, z: 0, w: 0} + transForm: {fileID: 0} + rootChild: {fileID: 0} + rootParent: {fileID: 0} + meshFilter: {fileID: 0} + meshRenderer: {fileID: 0} + skr: {fileID: 0} + rest: {fileID: 0} + sound: {fileID: 0} +--- !u!23 &1876117049 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876117045} + 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 &1876117050 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876117045} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1876415829 PrefabInstance: m_ObjectHideFlags: 0 @@ -13811,6 +14918,298 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8c9e74631c8994b8cb728cde8efae49a, type: 3} +--- !u!1 &1977426169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1977426170} + - component: {fileID: 1977426173} + - component: {fileID: 1977426172} + - component: {fileID: 1977426176} + - component: {fileID: 1977426175} + m_Layer: 21 + m_Name: Cube + m_TagString: DestructiveObject + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1977426170 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977426169} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.1, y: 1.05, z: 29.1} + m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 280786784} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1977426172 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977426169} + 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 &1977426173 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977426169} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1977426175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977426169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b69f7e57a6e2a641936534835f324ea, type: 3} + m_Name: + m_EditorClassIdentifier: + autoInit: 1 + k__BackingField: 100 + power: 10 + damageCooldown: 2 + isHitting: 0 + rayfire: {fileID: 1977426176} + rb: {fileID: 0} +--- !u!114 &1977426176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977426169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb6e52f37bca2404fac00b69fd8d21f8, type: 3} + m_Name: + m_EditorClassIdentifier: + initialization: 1 + simulationType: 1 + objectType: 0 + demolitionType: 3 + physics: + mt: 5 + material: {fileID: 0} + massBy: 0 + mass: 1 + ct: 0 + pc: 1 + ine: 0 + gr: 1 + si: 6 + st: 0.005 + dm: 0.7 + rigidBody: {fileID: 0} + meshCollider: {fileID: 0} + clusterColliders: [] + ignoreList: + exclude: 0 + solidity: 1 + destructible: 0 + activation: + loc: 0 + off: 0 + vel: 0 + dmg: 0 + act: 0 + imp: 0 + con: 0 + uny: 0 + atb: 0 + l: 0 + lay: 0 + cnt: {fileID: 0} + limitations: + col: 0 + sol: 0.1 + tag: Untagged + depth: 1 + time: 0.2 + size: 0.1 + vis: 0 + bld: 0 + bound: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + meshDemolition: + am: 50 + var: 0 + dpf: 0.5 + bias: 0 + sd: 1 + use: 0 + cld: 1 + cls: 0 + sim: 4 + inp: 9 + prp: + col: 0 + szF: 0 + dec: 0 + rem: 0 + l: 1 + lay: 0 + t: 1 + tag: + ch: + tp: 0 + frm: 3 + frg: 4 + skp: 0 + sht: {fileID: 0} + rotStart: {x: 0, y: 0, z: 0, w: 1} + clusterDemolition: + connectivity: 0 + minimumArea: 0 + minimumSize: 0 + percentage: 0 + seed: 0 + type: 0 + ratio: 15 + units: 1 + shardArea: 100 + shardDemolition: 0 + minAmount: 3 + maxAmount: 6 + demolishable: 1 + collapse: + type: 1 + start: 0 + end: 75 + steps: 10 + duration: 15 + var: 0 + seed: 0 + clsCount: 1 + cluster: + id: -1 + tm: {fileID: 0} + depth: 0 + pos: {x: 0, y: 0, z: 0} + rot: {x: 0, y: 0, z: 0, w: 0} + scl: {x: 0, y: 0, z: 0} + bound: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + demolishable: 1 + rigid: {fileID: 0} + shards: [] + cachedHost: 0 + areaCollapse: 0 + minimumArea: 0 + maximumArea: 0 + sizeCollapse: 0 + minimumSize: 0 + maximumSize: 0 + randomCollapse: 0 + minorClusters: [] + cn: 0 + nd: 0 + am: 0 + referenceDemolition: + reference: {fileID: 0} + randomList: [] + action: 0 + addRigid: 1 + inheritScale: 1 + inheritMaterials: 0 + materials: + iMat: {fileID: 0} + oMat: {fileID: 0} + mScl: 0.1 + uvE: 0 + uvC: {x: 0, y: 0} + cE: 0 + cC: {r: 0, g: 0, b: 0, a: 0} + damage: + en: 0 + max: 100 + cur: 0 + col: 0 + mlt: 1 + shr: 0 + fading: + onDemolition: 1 + onActivation: 0 + byOffset: 0 + lifeType: 4 + lifeTime: 7 + lifeVariation: 3 + fadeType: 0 + fadeTime: 5 + sizeFilter: 0 + shardAmount: 5 + reset: + transform: 1 + damage: 1 + connectivity: 0 + action: 0 + destroyDelay: 1 + mesh: 4 + fragments: 0 + initialized: 0 + rfMeshes: [] + fragments: [] + cacheRotation: {x: 0, y: 0, z: 0, w: 0} + transForm: {fileID: 0} + rootChild: {fileID: 0} + rootParent: {fileID: 0} + meshFilter: {fileID: 0} + meshRenderer: {fileID: 0} + skr: {fileID: 0} + rest: {fileID: 0} + sound: {fileID: 0} --- !u!1001 &1994471366 PrefabInstance: m_ObjectHideFlags: 0 @@ -14251,7 +15650,9 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 868726320} + - {fileID: 7415601899565865879} - {fileID: 480975273} + - {fileID: 1446558450} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -14292,8 +15693,8 @@ MonoBehaviour: k__BackingField: {fileID: 7415601899565865896} k__BackingField: 0.5 k__BackingField: 10 - k__BackingField: {fileID: 0} processBarOffset: {x: 0, y: 0, z: 0} + k__BackingField: {fileID: 0} --- !u!1001 &2114222814 PrefabInstance: m_ObjectHideFlags: 0 @@ -18304,7 +19705,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7415601899565865879 RectTransform: m_ObjectHideFlags: 0 @@ -18319,11 +19720,11 @@ RectTransform: m_Children: - {fileID: 7415601898974556764} - {fileID: 7415601898274685978} - m_Father: {fileID: 868726320} + m_Father: {fileID: 2105062291} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: 100} m_SizeDelta: {x: 100, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7415601899565865896 @@ -18507,7 +19908,7 @@ RectTransform: m_Father: {fileID: 7415601898274685978} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 5, y: 10} m_Pivot: {x: 0.5, y: 0.5} @@ -18597,7 +19998,7 @@ RectTransform: m_Father: {fileID: 7415601898878557319} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -19129,13 +20530,16 @@ SceneRoots: - {fileID: 649179607} - {fileID: 1341654437} - {fileID: 734248431} + - {fileID: 55264371} + - {fileID: 1806659892} - {fileID: 1540310984} - - {fileID: 107190135} - {fileID: 2105062291} - {fileID: 1560348101} - {fileID: 476261175} - {fileID: 1181634882} - {fileID: 357776295} - {fileID: 200595900} - - {fileID: 1574668128} - {fileID: 1464480070} + - {fileID: 1574668128} + - {fileID: 1771297325} + - {fileID: 280786784} diff --git a/BlueWater/Assets/01.Scenes/02.Ocean/NavMesh-Water Object.asset b/BlueWater/Assets/01.Scenes/02.Ocean/NavMesh-Water Object.asset new file mode 100644 index 000000000..70ea13541 Binary files /dev/null and b/BlueWater/Assets/01.Scenes/02.Ocean/NavMesh-Water Object.asset differ diff --git a/BlueWater/Assets/01.Scenes/02.Main/NavMesh-Water Object.asset.meta b/BlueWater/Assets/01.Scenes/02.Ocean/NavMesh-Water Object.asset.meta similarity index 79% rename from BlueWater/Assets/01.Scenes/02.Main/NavMesh-Water Object.asset.meta rename to BlueWater/Assets/01.Scenes/02.Ocean/NavMesh-Water Object.asset.meta index 385ad85f0..5a7e00d3e 100644 --- a/BlueWater/Assets/01.Scenes/02.Main/NavMesh-Water Object.asset.meta +++ b/BlueWater/Assets/01.Scenes/02.Ocean/NavMesh-Water Object.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d6d589a2ce0c4e7c96e54c2effb8b63 +guid: 33e399d90365b9d4c979ca3993b66866 NativeFormatImporter: externalObjects: {} mainObjectFileID: 23800000 diff --git a/BlueWater/Assets/02.Scripts/BlueWater.cs b/BlueWater/Assets/02.Scripts/BlueWater.cs index 9736b8601..d9cdc41b8 100644 --- a/BlueWater/Assets/02.Scripts/BlueWater.cs +++ b/BlueWater/Assets/02.Scripts/BlueWater.cs @@ -171,6 +171,15 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""interactions"": """", ""initialStateCheck"": false }, + { + ""name"": ""ShiftKey"", + ""type"": ""Button"", + ""id"": ""6e363e5e-d384-4b7e-a9df-91159f5523ad"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, { ""name"": ""BuildMode"", ""type"": ""Button"", @@ -413,6 +422,17 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""isComposite"": false, ""isPartOfComposite"": false }, + { + ""name"": """", + ""id"": ""8d33ba7e-c3f4-4c6d-bd6a-11a48f13fdb6"", + ""path"": ""/shift"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Keyboard&Mouse"", + ""action"": ""ShiftKey"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, { ""name"": """", ""id"": ""3d467a6e-a464-4bbb-b64f-e3317989fb87"", @@ -602,6 +622,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable m_Player_UseSkill = m_Player.FindAction("UseSkill", throwIfNotFound: true); m_Player_Mouse0 = m_Player.FindAction("Mouse0", throwIfNotFound: true); m_Player_Mouse1 = m_Player.FindAction("Mouse1", throwIfNotFound: true); + m_Player_ShiftKey = m_Player.FindAction("ShiftKey", throwIfNotFound: true); m_Player_BuildMode = m_Player.FindAction("BuildMode", throwIfNotFound: true); // Camera m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true); @@ -689,6 +710,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable private readonly InputAction m_Player_UseSkill; private readonly InputAction m_Player_Mouse0; private readonly InputAction m_Player_Mouse1; + private readonly InputAction m_Player_ShiftKey; private readonly InputAction m_Player_BuildMode; public struct PlayerActions { @@ -710,6 +732,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable public InputAction @UseSkill => m_Wrapper.m_Player_UseSkill; public InputAction @Mouse0 => m_Wrapper.m_Player_Mouse0; public InputAction @Mouse1 => m_Wrapper.m_Player_Mouse1; + public InputAction @ShiftKey => m_Wrapper.m_Player_ShiftKey; public InputAction @BuildMode => m_Wrapper.m_Player_BuildMode; public InputActionMap Get() { return m_Wrapper.m_Player; } public void Enable() { Get().Enable(); } @@ -768,6 +791,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable @Mouse1.started += instance.OnMouse1; @Mouse1.performed += instance.OnMouse1; @Mouse1.canceled += instance.OnMouse1; + @ShiftKey.started += instance.OnShiftKey; + @ShiftKey.performed += instance.OnShiftKey; + @ShiftKey.canceled += instance.OnShiftKey; @BuildMode.started += instance.OnBuildMode; @BuildMode.performed += instance.OnBuildMode; @BuildMode.canceled += instance.OnBuildMode; @@ -823,6 +849,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable @Mouse1.started -= instance.OnMouse1; @Mouse1.performed -= instance.OnMouse1; @Mouse1.canceled -= instance.OnMouse1; + @ShiftKey.started -= instance.OnShiftKey; + @ShiftKey.performed -= instance.OnShiftKey; + @ShiftKey.canceled -= instance.OnShiftKey; @BuildMode.started -= instance.OnBuildMode; @BuildMode.performed -= instance.OnBuildMode; @BuildMode.canceled -= instance.OnBuildMode; @@ -995,6 +1024,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable void OnUseSkill(InputAction.CallbackContext context); void OnMouse0(InputAction.CallbackContext context); void OnMouse1(InputAction.CallbackContext context); + void OnShiftKey(InputAction.CallbackContext context); void OnBuildMode(InputAction.CallbackContext context); } public interface ICameraActions diff --git a/BlueWater/Assets/02.Scripts/BlueWater.inputactions b/BlueWater/Assets/02.Scripts/BlueWater.inputactions index 0aa82a415..fdce3aeb0 100644 --- a/BlueWater/Assets/02.Scripts/BlueWater.inputactions +++ b/BlueWater/Assets/02.Scripts/BlueWater.inputactions @@ -149,6 +149,15 @@ "interactions": "", "initialStateCheck": false }, + { + "name": "ShiftKey", + "type": "Button", + "id": "6e363e5e-d384-4b7e-a9df-91159f5523ad", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, { "name": "BuildMode", "type": "Button", @@ -391,6 +400,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "8d33ba7e-c3f4-4c6d-bd6a-11a48f13fdb6", + "path": "/shift", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "ShiftKey", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "3d467a6e-a464-4bbb-b64f-e3317989fb87", diff --git a/BlueWater/Assets/02.Scripts/Character/Player/Type/ShipPlayer.cs b/BlueWater/Assets/02.Scripts/Character/Player/Type/ShipPlayer.cs index 9041939ff..bec63cf9e 100644 --- a/BlueWater/Assets/02.Scripts/Character/Player/Type/ShipPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/ShipPlayer.cs @@ -7,16 +7,26 @@ using UnityEngine.InputSystem; namespace BlueWaterProject { [SelectionBase] - public class ShipPlayer : Player + public class ShipPlayer : MonoBehaviour, IDestructible { [Title("초기화 방식")] [SerializeField] private bool autoInit = true; [Title("쉽의 기본 설정")] - [Tooltip("최대 스피드")] public float maxSpeed = 10f; - [Tooltip("가속 수치")] public float acceleration = 2f; - [Tooltip("감속 수치")] public float deceleration = 2f; - [Tooltip("회전 속도")] public float turnSpeed = 10f; + [Tooltip("최대 스피드")] + [SerializeField] private float maxSpeed = 10f; + [Tooltip("가속 수치")] + [SerializeField] private float acceleration = 2f; + [Tooltip("감속 수치")] + [SerializeField] private float deceleration = 2f; + [Tooltip("회전 속도")] + [SerializeField] private float turnSpeed = 10f; + [Tooltip("배의 최대 체력")] + [field: SerializeField] public float MaxHp { get; private set; } = 100; + [Tooltip("배의 현재 체력")] + [field: SerializeField] public float CurrentHp { get; private set; } + [Tooltip("배의 힘(충돌)")] + [field: SerializeField] public int Strength { get; set; } = 500; [Title("캐논")] [SerializeField] private Cannon cannon; @@ -27,20 +37,24 @@ namespace BlueWaterProject [SerializeField] private bool isReloading; [SerializeField] private float chargingGauge; [SerializeField] private float previousGauge; + + [Title("부스트")] + [SerializeField] private float boostPower = 2f; + [SerializeField] private float boostMaxTime = 3f; + [SerializeField] private float boostRecoveryTime = 1.5f; + [SerializeField] private bool isBoosting; - // public Rigidbody projectilePrefab; - // public Transform launchPoint; - // public float timeOfFlight; - // public Transform predictedPos; - + private PlayerInput playerInput; private Rigidbody rb; private GameObject directionIndicator; [SerializeField] private LayerMask waterLayer; + private Vector2 movementInput; [Button("셋팅 초기화")] private void Init() { + playerInput = GetComponent(); rb = GetComponent(); playerInput = GetComponent(); cannon = transform.Find("Cannon").GetComponent(); @@ -49,49 +63,52 @@ namespace BlueWaterProject directionIndicator.SetActive(false); waterLayer = LayerMask.GetMask("Water"); + + SetCurrentHp(MaxHp); } #region Unity Function - protected override void Awake() + private void Awake() { - base.Awake(); - if (autoInit) { Init(); } } - protected override void OnEnable() + private void OnEnable() { - base.OnEnable(); - playerInput.actions.FindAction("Mouse0").started += _ => ChargeCannon(); playerInput.actions.FindAction("Mouse0").canceled += _ => FireCannon(); playerInput.actions.FindAction("Mouse1").started += _ => ToggleFireMode(); + playerInput.actions.FindAction("ShiftKey").started += _ => ShipBoost(); + playerInput.actions.FindAction("ShiftKey").canceled += _ => ShipStopBoost(); } - protected override void OnDisable() + private void OnDisable() { - playerInput.actions.FindAction("Mouse0").started += _ => ChargeCannon(); - playerInput.actions.FindAction("Mouse0").canceled += _ => FireCannon(); - playerInput.actions.FindAction("Mouse1").started += _ => ToggleFireMode(); + playerInput.actions.FindAction("Mouse0").started -= _ => ChargeCannon(); + playerInput.actions.FindAction("Mouse0").canceled -= _ => FireCannon(); + playerInput.actions.FindAction("Mouse1").started -= _ => ToggleFireMode(); + playerInput.actions.FindAction("ShiftKey").started -= _ => ShipBoost(); + playerInput.actions.FindAction("ShiftKey").canceled -= _ => ShipStopBoost(); } - protected override void Start() + private void Start() { } - protected override void FixedUpdate() + private void FixedUpdate() { HandleMovement(); } - protected override void Update() + private void Update() { HandleFireCannon(); + HandleBoost(); } #endregion @@ -100,16 +117,37 @@ namespace BlueWaterProject private void MoveShipPlayer() { - var desiredVelocity = transform.forward * (movementInput.y * maxSpeed); - var speedChange = (movementInput.y != 0 ? acceleration : deceleration) * Time.fixedDeltaTime; - rb.velocity = Vector3.MoveTowards(rb.velocity, desiredVelocity, speedChange); + // var desiredVelocity = transform.forward * (movementInput.y * maxSpeed); + // var speedChange = (movementInput.y != 0 ? acceleration : deceleration) * Time.fixedDeltaTime; + // rb.velocity = Vector3.MoveTowards(rb.velocity, desiredVelocity, speedChange); + + var speedChange = 0f; + Vector3 targetVelocity; + if (movementInput == Vector2.zero) + { + speedChange = deceleration * Time.fixedDeltaTime; + targetVelocity = Vector3.zero; + } + else + { + var boost = isBoosting ? boostPower : 1f; + var moveDirection = new Vector3(movementInput.x, 0, movementInput.y).normalized * (maxSpeed * boost); + speedChange = acceleration * boost * Time.fixedDeltaTime; + targetVelocity = moveDirection; + } + rb.velocity = Vector3.MoveTowards(rb.velocity, targetVelocity, speedChange); } private void RotatePlayer() { - var turn = movementInput.x; - var turnRotation = Quaternion.Euler(0f, turn * turnSpeed, 0f); - rb.MoveRotation(rb.rotation * turnRotation); + // var turn = movementInput.x; + // var turnRotation = Quaternion.Euler(0f, turn * turnSpeed, 0f); + // rb.MoveRotation(rb.rotation * turnRotation); + + if (rb.velocity == Vector3.zero) return; + + var targetRotation = Quaternion.LookRotation(rb.velocity.normalized, Vector3.up); + rb.rotation = Quaternion.Slerp(rb.rotation, targetRotation, Time.fixedDeltaTime * turnSpeed); } private void HandleMovement() @@ -155,9 +193,30 @@ namespace BlueWaterProject UiManager.Inst.OceanUi.ProcessBar.SetFillAmount(chargingGauge); } + private void HandleBoost() + { + if (isBoosting) + { + UiManager.Inst.OceanUi.ShipBoostSlider.value += Time.deltaTime * (1f / boostMaxTime); + if (UiManager.Inst.OceanUi.ShipBoostSlider.value >= 1f) + { + ShipStopBoost(); + } + } + else + { + UiManager.Inst.OceanUi.ShipBoostSlider.value -= Time.deltaTime * (1f / boostRecoveryTime); + } + } + #endregion #region Interaction Key + + public virtual void OnMove(InputValue value) // WASD + { + movementInput = value.Get(); + } private void OnTargeting(InputValue value) //Q { @@ -200,7 +259,7 @@ namespace BlueWaterProject if (isReloading) { - StartCoroutine(UiManager.Inst.OceanUi.ProcessBar.ShakeSliderCoroutine()); + StartCoroutine(UiManager.Inst.OceanUi.ProcessBar.ShakeProcessBarCoroutine()); } else { @@ -232,7 +291,13 @@ namespace BlueWaterProject if (!isFireMode) { + chargingCannon = false; + chargingGauge = 0f; + previousGauge = chargingGauge; + UiManager.Inst.OceanUi.ProcessBar.SetFillAmount(0f); + UiManager.Inst.OceanUi.ProcessBar.SetRotateZ(previousGauge * -360f); UiManager.Inst.OceanUi.ProcessBar.SetRotateZ(0f); + UiManager.Inst.OceanUi.ProcessBar.SetSliderValue(0f); } } @@ -254,6 +319,50 @@ namespace BlueWaterProject UiManager.Inst.OceanUi.ProcessBar.SetActiveReloadSlider(false); } + private void ShipBoost() + { + if (UiManager.Inst.OceanUi.ShipBoostSlider.value >= 1f) + { + isBoosting = false; + } + else + { + isBoosting = true; + } + } + + private void ShipStopBoost() + { + if (!isBoosting) return; + + isBoosting = false; + } + #endregion + + #region IDamageable + + public void TakeDamage(float attackerPower, Vector3? attackPos = null) + { + var changeHp = Mathf.Max(CurrentHp - attackerPower, 0f); + + SetCurrentHp(changeHp); + + if (CurrentHp == 0f) + { + Die(); + } + + print("오브젝트 충돌 - 현재 체력 : " + CurrentHp); + } + + public void Die() + { + print("배 파괴 - 현재 체력 : " + CurrentHp); + } + + #endregion + + public void SetCurrentHp(float value) => CurrentHp = value; } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/DestructiveObject.cs b/BlueWater/Assets/02.Scripts/DestructiveObject.cs new file mode 100644 index 000000000..a89450882 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/DestructiveObject.cs @@ -0,0 +1,88 @@ +using RayFire; +using Sirenix.OdinInspector; +using UnityEngine; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + public class DestructiveObject : MonoBehaviour + { + [Title("초기화 방식")] + [SerializeField] private bool autoInit = true; + + [Title("기본 설정")] + [field: SerializeField] public int Strength { get; private set; } = 100; + [SerializeField] private float power = 10f; + [SerializeField] private float damageCooldown = 2f; + [SerializeField] private bool isHitting; + + [SerializeField] private RayfireRigid rayfire; + [SerializeField] private Rigidbody rb; + + [Button("셋팅 초기화")] + private void Init() + { + rayfire = GetComponent(); + } + + private void Awake() + { + if (autoInit) + { + Init(); + } + } + + private void Start() + { + rb = GetComponent(); + + rb.isKinematic = true; + } + + private void OnCollisionEnter(Collision other) + { + if (other.collider.CompareTag("ShipPlayer")) + { + var iDestructible = other.collider.GetComponent(); + var otherStrength = iDestructible.Strength; + + if (otherStrength > Strength) + { + DestroyObject(); + } + else if (otherStrength < Strength) + { + if (isHitting) return; + + Hit(iDestructible); + } + else + { + DestroyObject(); + Hit(iDestructible); + } + } + else if (other.collider.CompareTag("Missile")) + { + DestroyObject(); + } + } + + private void DestroyObject() + { + rb.isKinematic = false; + rayfire.Demolish(); + } + + private void Hit(IDestructible iDestructible) + { + isHitting = true; + iDestructible.TakeDamage(power); + + if (!gameObject.activeSelf) return; + + StartCoroutine(Utils.CoolDown(damageCooldown, () => isHitting = false)); + } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/DestructiveObject.cs.meta b/BlueWater/Assets/02.Scripts/DestructiveObject.cs.meta new file mode 100644 index 000000000..42a5b9870 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/DestructiveObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9b69f7e57a6e2a641936534835f324ea +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Interface/IDestructible.cs b/BlueWater/Assets/02.Scripts/Interface/IDestructible.cs new file mode 100644 index 000000000..aa0afcef7 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Interface/IDestructible.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + public interface IDestructible : IDamageable + { + public int Strength { get; set; } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Interface/IDestructible.cs.meta b/BlueWater/Assets/02.Scripts/Interface/IDestructible.cs.meta new file mode 100644 index 000000000..84d6302cf --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Interface/IDestructible.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 56fa2f33a534b3046933e9b2dc37bcee +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/OceanUi.cs b/BlueWater/Assets/02.Scripts/OceanUi.cs index 900010125..12aacf219 100644 --- a/BlueWater/Assets/02.Scripts/OceanUi.cs +++ b/BlueWater/Assets/02.Scripts/OceanUi.cs @@ -8,6 +8,8 @@ using Random = UnityEngine.Random; // ReSharper disable once CheckNamespace namespace BlueWaterProject { + #region ProcessBar Class + [Serializable] public class ProcessBar { @@ -39,34 +41,37 @@ namespace BlueWaterProject public void SetRotateZ(float value) => PreviousGaugeLine.rotation = Quaternion.Euler(0f, 0f, value); public void SetActiveReloadSlider(bool value) => ReloadSlider.gameObject.SetActive(value); public void SetSliderValue(float value) => ReloadSlider.value = value; - public IEnumerator ShakeSliderCoroutine() + public IEnumerator ShakeProcessBarCoroutine() { if (isShaking) yield break; isShaking = true; reloadingAttackSound.Play(); var time = 0f; - var sliderOriginalPos = ReloadSlider.transform.localPosition; + var processBarOriginalPos = Obj.transform.localPosition; while (time < ShakeDuration) { - if (!ReloadSlider.gameObject.activeSelf) + if (!Obj.gameObject.activeSelf) { - ReloadSlider.transform.localPosition = sliderOriginalPos; + Obj.transform.localPosition = processBarOriginalPos; isShaking = false; yield break; } time += Time.deltaTime; var shakeAmount = Random.Range(-1f, 1f) * ShakePower; - ReloadSlider.transform.localPosition = new Vector3(sliderOriginalPos.x + shakeAmount, sliderOriginalPos.y, sliderOriginalPos.z); + var processBarLocalPos = Obj.transform.localPosition; + Obj.transform.localPosition = new Vector3(processBarLocalPos.x + shakeAmount, processBarLocalPos.y, processBarLocalPos.z); yield return null; } - ReloadSlider.transform.localPosition = sliderOriginalPos; + Obj.transform.localPosition = processBarOriginalPos; isShaking = false; } } + #endregion + public class OceanUi : MonoBehaviour { [Title("초기화 방식")] @@ -74,11 +79,33 @@ namespace BlueWaterProject [field: Title("UI")] [field: SerializeField] public ProcessBar ProcessBar { get; set; } - [field: SerializeField] public Image CannonFill { get; set; } [SerializeField] private Vector3 processBarOffset = Vector3.zero; + [field: SerializeField] public Slider ShipBoostSlider { get; set; } + private Canvas canvas; + [Button("셋팅 초기화")] + private void Init() + { + canvas = GetComponent(); + if (!canvas) + { + Debug.LogError("canvas is null error"); + return; + } + + var processBar = canvas.transform.Find("ProcessBar").gameObject; + var fill = processBar.transform.Find("Fill").GetComponent(); + var previousGaugeLine = processBar.transform.Find("PreviousGaugeLine").transform; + var reloadSlider = canvas.transform.Find("ReloadSlider").GetComponent(); + ProcessBar = new ProcessBar(processBar, fill, previousGaugeLine, reloadSlider); + ProcessBar.SetActiveReloadSlider(false); + + ShipBoostSlider = canvas.transform.Find("ShipBoostSlider").GetComponent(); + ShipBoostSlider.value = 0f; + } + private void Awake() { if (autoInit) @@ -99,23 +126,5 @@ namespace BlueWaterProject ProcessBar.SetPosition(result); } } - - [Button("셋팅 초기화")] - private void Init() - { - canvas = GetComponent(); - if (!canvas) - { - Debug.LogError("canvas is null error"); - return; - } - - var processBar = canvas.transform.Find("ProcessBar").gameObject; - var fill = processBar.transform.Find("Fill").GetComponent(); - var previousGaugeLine = processBar.transform.Find("PreviousGaugeLine").transform; - var reloadSlider = processBar.transform.Find("ReloadSlider").GetComponent(); - ProcessBar = new ProcessBar(processBar, fill, previousGaugeLine, reloadSlider); - ProcessBar.SetActiveReloadSlider(false); - } } } \ No newline at end of file diff --git a/BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeFireOBJ.prefab b/BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeFireOBJ.prefab index 41719cd11..974298a28 100644 --- a/BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeFireOBJ.prefab +++ b/BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeFireOBJ.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 13576440} - component: {fileID: 5479992} - component: {fileID: 11464288} - m_Layer: 0 + m_Layer: 25 m_Name: GrenadeFireOBJ m_TagString: Missile m_Icon: {fileID: 0} 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 deleted file mode 100644 index de4e3b6b0..000000000 --- a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for Buto Integration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 384510c7b..000000000 --- a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3643c0d76ec153646b1203880bfb64ed -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta b/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta deleted file mode 100644 index 508065e3b..000000000 --- a/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f -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 deleted file mode 100644 index 2ac65e5d2..000000000 --- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 69d7b56dd..000000000 --- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9aacf6f3043624194bb6f6fe9a580786 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/Mirror.unitypackage.meta b/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/Mirror.unitypackage.meta deleted file mode 100644 index 234a0528c..000000000 --- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/Mirror.unitypackage.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: b1d738c46034bc244bd356692577373c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 147990 - packageName: Dynamic Water Physics 2 - packageVersion: 2.21 - assetPath: Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/Mirror.unitypackage - uploadId: 628762 diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/PUN2.unitypackage.meta b/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/PUN2.unitypackage.meta deleted file mode 100644 index d61a90fe7..000000000 --- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/PUN2.unitypackage.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 2d6d5d59d45ce8a4784ba6c47984a23e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 147990 - packageName: Dynamic Water Physics 2 - packageVersion: 2.21 - assetPath: Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/PUN2.unitypackage - uploadId: 628762 diff --git a/BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta b/BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta deleted file mode 100644 index 4801b3793..000000000 --- a/BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 560a88da2bbc70140bed167f0ba7fe37 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta b/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta deleted file mode 100644 index 77d64a86c..000000000 --- a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: fb01be13d6e88ca488dda82150319bfc -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta b/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta deleted file mode 100644 index 05e590027..000000000 --- a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 117dcc671050f5247bd8743b91ecaab7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Scripts/CommonAssemblyDefinitions.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Scripts/CommonAssemblyDefinitions.unitypackage.meta deleted file mode 100644 index e0511c7a7..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Scripts/CommonAssemblyDefinitions.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4d9b575363cdb56408d92f7d7f0e5216 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta deleted file mode 100644 index f5aa0671a..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 171c5051d845c4545a6679cdcb9e8290 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta deleted file mode 100644 index c69333695..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e381f1e638a8aec4dbd9a7be673b56e2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Devion Inventory Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Devion Inventory Support.unitypackage.meta deleted file mode 100644 index 732786965..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Devion Inventory Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 01db744855bbae74481522d48fd63008 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Dialogue System Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Dialogue System Support.unitypackage.meta deleted file mode 100644 index df78745df..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Dialogue System Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e5f625ae60b99fe4ab78d44cfb58ce5a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Easy Save Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Easy Save Support.unitypackage.meta deleted file mode 100644 index 2cb925d8d..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Easy Save Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b606e558541a7b14593ea370c1a31da1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Emerald AI Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Emerald AI Support.unitypackage.meta deleted file mode 100644 index a7f1c72c4..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Emerald AI Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c13a7e89fcc1f5544b4debda9d682854 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/HUD Navigation System Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/HUD Navigation System Support.unitypackage.meta deleted file mode 100644 index 2eee81088..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/HUD Navigation System Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9d6eeb26838ae2140a98c7b012c07610 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Invector Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Invector Support.unitypackage.meta deleted file mode 100644 index e6aed81e8..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Invector Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 46615cbdbe482664aaf8d3fe2af274c8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Engine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Engine Support.unitypackage.meta deleted file mode 100644 index 114b57f38..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Engine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 92b78aa6c7b02924c907a69383e7722f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Pro Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Pro Support.unitypackage.meta deleted file mode 100644 index e3e83c440..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Inventory Pro Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 169dbd692ce7b8a4083e3e77421ce8d0 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/PlayMaker Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/PlayMaker Support.unitypackage.meta deleted file mode 100644 index a4685751c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/PlayMaker Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9a785472f49cbc0419f4e80050360f8a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/RPG Builder Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/RPG Builder Support.unitypackage.meta deleted file mode 100644 index fbd8fb4f7..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/RPG Builder Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: acc7135a62c70bb40bfd196dcc0dbf58 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Rewired Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Rewired Support.unitypackage.meta deleted file mode 100644 index f70412ace..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Rewired Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 43b92591c923d1543bc95a9b89918a6c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Tactical Shooter AI Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Tactical Shooter AI Support.unitypackage.meta deleted file mode 100644 index 483b1b4ee..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Tactical Shooter AI Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4c1d290c89eb9a146a0c3fc3c5d97639 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/TopDown Engine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/TopDown Engine Support.unitypackage.meta deleted file mode 100644 index ab6547345..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/TopDown Engine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 79d6a8f7106f5a949afdf0f9fce6e5c9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/DialogueSystemAssemblyDefinitions.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/DialogueSystemAssemblyDefinitions.unitypackage.meta deleted file mode 100644 index 779ce70d7..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/DialogueSystemAssemblyDefinitions.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5db5e6540b70aa44a8b8f0be7cbc03a4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Action-RPG Starter Kit Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Action-RPG Starter Kit Support.unitypackage.meta deleted file mode 100644 index d7e98901c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Action-RPG Starter Kit Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b81586c5bf3938042babe319ccb6b693 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Adventure Creator Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Adventure Creator Support.unitypackage.meta deleted file mode 100644 index e77cf7050..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Adventure Creator Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 29400b82342c15b44bebd36e5f253c7a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Articy Localization Importer.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Articy Localization Importer.unitypackage.meta deleted file mode 100644 index fa28f522d..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Articy Localization Importer.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e3dca3dc2724503479b532ec6f801f2f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Behavior Designer Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Behavior Designer Support.unitypackage.meta deleted file mode 100644 index 7edcebbc6..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Behavior Designer Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5a3da110bff34d54eb93d1c3c7755741 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Bolt Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Bolt Support.unitypackage.meta deleted file mode 100644 index 8a0a24231..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Bolt Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 590bfaf71ac68024e96342bd38a2e799 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinema Director Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinema Director Support.unitypackage.meta deleted file mode 100644 index c0d6f8b51..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinema Director Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 89c6283ed4a7a914db4ed32d9fe4be1b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinemachine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinemachine Support.unitypackage.meta deleted file mode 100644 index 3058450f9..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Cinemachine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2133c1709cbeab043b2c0d4a09f8c560 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Core GameKit Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Core GameKit Support.unitypackage.meta deleted file mode 100644 index 43bbdb349..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Core GameKit Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 61a9883a71fe42f4cb3a2538927c5b54 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Corgi Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Corgi Support.unitypackage.meta deleted file mode 100644 index 142c11269..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Corgi Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 107656dc7c8decd4b98ddacdb4c63d9c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Customizable SciFi Holo Interface Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Customizable SciFi Holo Interface Support.unitypackage.meta deleted file mode 100644 index 90e706ffe..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Customizable SciFi Holo Interface Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 69578b34b0b99fd408db1f26e709204b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Deftly Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Deftly Support.unitypackage.meta deleted file mode 100644 index f84ff6cae..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Deftly Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 890975c726da4f447a9fdbb24e0ac5a6 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Devion Inventory Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Devion Inventory Support.unitypackage.meta deleted file mode 100644 index 61ed6b0ff..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Devion Inventory Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1977e46ddf171054ba06e70c3a17b562 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/DoozyUI Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/DoozyUI Support.unitypackage.meta deleted file mode 100644 index a1d105521..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/DoozyUI Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d04dae1efd4c20f42801fa99bfb48c71 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Easy Save Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Easy Save Support.unitypackage.meta deleted file mode 100644 index c7f0244c3..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Easy Save Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f48e38a1694a4a94ba7bfa99b5bb8da7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Emerald AI Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Emerald AI Support.unitypackage.meta deleted file mode 100644 index 6fcb0ff62..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Emerald AI Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a760ee77bdfe6fc4fbfeb4e74d81e9ee -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FMOD Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FMOD Support.unitypackage.meta deleted file mode 100644 index 6e8698d0c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FMOD Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7ac1fca502db8634ca8a220957ce0efe -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FaceFX Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FaceFX Support.unitypackage.meta deleted file mode 100644 index e3d258ed1..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/FaceFX Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 03276c81a3b7e1f4f8b9a2c42d29ccb5 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Feel Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Feel Support.unitypackage.meta deleted file mode 100644 index 23f5f93d3..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Feel Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4c2fe1e05f53ce540a7e6629e37e62ba -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/GameFlow Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/GameFlow Support.unitypackage.meta deleted file mode 100644 index 0106a1a8b..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/GameFlow Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 41dc081f41d06ad4cb3a976e3bc784ff -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/I2 Localization Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/I2 Localization Support.unitypackage.meta deleted file mode 100644 index 003412ed2..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/I2 Localization Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7224afe475473f5479a4be84354c0ffe -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ICode Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ICode Support.unitypackage.meta deleted file mode 100644 index 5b2af6965..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ICode Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6566ea9453ea9a54c8adda4ce157bfe5 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Ink Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Ink Support.unitypackage.meta deleted file mode 100644 index 3abdc52eb..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Ink Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8a6eaa4e4e356664da332e906c4116ca -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Invector Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Invector Support.unitypackage.meta deleted file mode 100644 index 8ef2b7160..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Invector Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d78d339535406c443be8ab962fe3faed -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Engine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Engine Support.unitypackage.meta deleted file mode 100644 index fb47a3b13..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Engine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6556a12f622b9f84a87c93e43a05c57a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Pro Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Pro Support.unitypackage.meta deleted file mode 100644 index 7d71c3032..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Inventory Pro Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7adde0d8ab9d11c4f8958df473963096 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/JLC Importer.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/JLC Importer.unitypackage.meta deleted file mode 100644 index 1ffa302e6..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/JLC Importer.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2e0d514b37da90b43aca77d71d4ea274 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/KGFMapSystem Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/KGFMapSystem Support.unitypackage.meta deleted file mode 100644 index 3338c5cab..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/KGFMapSystem Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f73b81d6a28009a4d8a6cfa24e4f6670 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LipSync Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LipSync Support.unitypackage.meta deleted file mode 100644 index 404d7df03..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LipSync Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 14eb0de10b56d7d48aa47c34c085763a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LivelyChatBubbles Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LivelyChatBubbles Support.unitypackage.meta deleted file mode 100644 index 5fc7b1dd0..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/LivelyChatBubbles Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: bab8f8e2fd66cc94eb0381c12da4f8a1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Localization Package Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Localization Package Support.unitypackage.meta deleted file mode 100644 index 7c9911a59..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Localization Package Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 853d51cc63a44614b8aa108c20970d53 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Look Animator Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Look Animator Support.unitypackage.meta deleted file mode 100644 index e738a83c6..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Look Animator Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0acaab50ea80e2740907f9fb8e96d5cb -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Makinom Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Makinom Support.unitypackage.meta deleted file mode 100644 index 7b8a0965e..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Makinom Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 00d3be9741969ee4abb41a0d36893d12 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Master Audio Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Master Audio Support.unitypackage.meta deleted file mode 100644 index b5500005c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Master Audio Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a84c2fae02ab66e4bb10f4b632b4e59f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Motion Controller Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Motion Controller Support.unitypackage.meta deleted file mode 100644 index cb39d0c46..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Motion Controller Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ff46b33770bc0e04da5553db516b2791 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI HUD Text Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI HUD Text Support.unitypackage.meta deleted file mode 100644 index 1178f5136..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI HUD Text Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d4762985b08cf424d8a389bd106e9c41 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI Support.unitypackage.meta deleted file mode 100644 index db86fe4fa..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NGUI Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 82f4200e470c7a2459f54ef829fd130b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NWT Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NWT Support.unitypackage.meta deleted file mode 100644 index 875d48c5f..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/NWT Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8f7926653749bc042b66acaf162cb653 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ORK Framework Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ORK Framework Support.unitypackage.meta deleted file mode 100644 index 322dacae5..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/ORK Framework Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d8244e47333fea34cabbe75f30b489cd -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PlayMaker Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PlayMaker Support.unitypackage.meta deleted file mode 100644 index bd5783f2c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PlayMaker Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a60eb26401f5d2e40a3f8ad3a0cdd2ae -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PostProcessing Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PostProcessing Support.unitypackage.meta deleted file mode 100644 index d72afa945..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/PostProcessing Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d20f46daec1cff04b8767c37cbc64dfd -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Builder Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Builder Support.unitypackage.meta deleted file mode 100644 index 74a4995e0..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Builder Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1e0bc8e64ca5a204ab01fcb065ad3ea4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Kit Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Kit Support.unitypackage.meta deleted file mode 100644 index 53088a15e..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RPG Kit Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0439b345dc19afc4e9e38a45964c21d2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RTVoice Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RTVoice Support.unitypackage.meta deleted file mode 100644 index 4cbcf2da1..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/RTVoice Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2f034bb78093baf41a5b14693eefb6ba -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Realistic FPS Prefab Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Realistic FPS Prefab Support.unitypackage.meta deleted file mode 100644 index 7333ab59c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Realistic FPS Prefab Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 37a76039173f99b4fac971349e64b845 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rewired Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rewired Support.unitypackage.meta deleted file mode 100644 index 0b16186df..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rewired Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 12f5d0647e98dad4cba5773dbfe617ee -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rog Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rog Support.unitypackage.meta deleted file mode 100644 index 8c7dd3ad8..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Rog Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cfa06a72ad668b64e84eb67a6653c27a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SALSA Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SALSA Support.unitypackage.meta deleted file mode 100644 index c61dba0db..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SALSA Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5f372c15f48325e4da788631806fbd37 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SLATE Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SLATE Support.unitypackage.meta deleted file mode 100644 index 95b095986..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SLATE Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d48ea718ba1476a4baa5cd9e66f6ed78 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Speech Recognition System Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Speech Recognition System Support.unitypackage.meta deleted file mode 100644 index 0e841d4ce..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Speech Recognition System Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 21b40e7d71233864788700238fab175d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Spine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Spine Support.unitypackage.meta deleted file mode 100644 index 91b6a3344..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Spine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 44688b79fc3aa6a44b5c47a92a453722 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SuperTextMesh Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SuperTextMesh Support.unitypackage.meta deleted file mode 100644 index e419dfc71..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/SuperTextMesh Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c6b5601000159b44594b95b58dc95e5e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TK2D Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TK2D Support.unitypackage.meta deleted file mode 100644 index d9d990aa2..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TK2D Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1f67bb1f7a0ccac4bacceb5680482ca2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TalkIt Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TalkIt Support.unitypackage.meta deleted file mode 100644 index e9931906d..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TalkIt Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d418d21b145ca9e4289690cca70d800d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Text Animator Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Text Animator Support.unitypackage.meta deleted file mode 100644 index 0f17c6184..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Text Animator Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ba01c8813d9d8e645a60034600445394 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TopDown Engine Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TopDown Engine Support.unitypackage.meta deleted file mode 100644 index b9a67ae55..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/TopDown Engine Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 373fa280b9df46f45901d7ac3fea3beb -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Topdown Kit Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Topdown Kit Support.unitypackage.meta deleted file mode 100644 index d773fb0a6..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Topdown Kit Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d0b0bdbd9366c9e4fba085f618ca54ba -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/UniStorm Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/UniStorm Support.unitypackage.meta deleted file mode 100644 index ecff8931e..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/UniStorm Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c59e446cf466a424daed6859d731bc80 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Visual Scripting Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Visual Scripting Support.unitypackage.meta deleted file mode 100644 index 0c2561c1b..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Visual Scripting Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 494657561b44a1c489255e7049d56ad7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Wwise Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Wwise Support.unitypackage.meta deleted file mode 100644 index 434ea16b9..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Wwise Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0bfa1827c30ff98418b3b36047505a15 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Yarn2ImportAssemblyDefinitions.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Yarn2ImportAssemblyDefinitions.unitypackage.meta deleted file mode 100644 index cb4892c99..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/Yarn2ImportAssemblyDefinitions.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d3504844ffe57564caa188ff0f30bae8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/plyGame Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/plyGame Support.unitypackage.meta deleted file mode 100644 index b29068aeb..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/plyGame Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 40756660825b35747929372b595fa82f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Remastered Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Remastered Support.unitypackage.meta deleted file mode 100644 index 1a071722c..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Remastered Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c3c34eebf26184b4fb5b0a9dfd25567f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Support.unitypackage.meta deleted file mode 100644 index db5cf560a..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uMMORPG Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 185ff7b46f2f79a4287cdf5efb411fbb -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uRPG Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uRPG Support.unitypackage.meta deleted file mode 100644 index 8db8698b9..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uRPG Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 89146e181822a34479674ffc071163df -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSequencer Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSequencer Support.unitypackage.meta deleted file mode 100644 index 99afc5437..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSequencer Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 630bf89a42bf760458299c96a71e7f04 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSurvival Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSurvival Support.unitypackage.meta deleted file mode 100644 index 1f755345b..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Third Party Support/uSurvival Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8302722bd792b384e898fed750f555a9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/RayFire/Tutorial/Material/concrete_interior.mat b/BlueWater/Assets/RayFire/Tutorial/Material/concrete_interior.mat index ee7b8cc8a..a592bd8b9 100644 --- a/BlueWater/Assets/RayFire/Tutorial/Material/concrete_interior.mat +++ b/BlueWater/Assets/RayFire/Tutorial/Material/concrete_interior.mat @@ -116,7 +116,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.53773576, g: 0.53773576, b: 0.53773576, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.5377357, g: 0.5377357, b: 0.5377357, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/BlueWater/ProjectSettings/DynamicsManager.asset b/BlueWater/ProjectSettings/DynamicsManager.asset index 4d4142dd2..1797c2309 100644 --- a/BlueWater/ProjectSettings/DynamicsManager.asset +++ b/BlueWater/ProjectSettings/DynamicsManager.asset @@ -17,7 +17,7 @@ PhysicsManager: m_EnableAdaptiveForce: 0 m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 - m_LayerCollisionMatrix: 0400000000000000010000004026020000022000000000000800000000000000000000001826220208262000000000000000000008262000000000000000000000000000080200000000000000000000000000001026000000000000000000000000000000020000000000000000000000000000000000000000000000000000 + m_LayerCollisionMatrix: 0400000000000000010000004026020000000000000000000800000000000000000000000826220208262000000000000000000008262000000000000000000000000000080200000000000000000000000000000026000200000000000000000000000000022000000000000000000000000000000000000000000000000000 m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 0 diff --git a/BlueWater/ProjectSettings/TagManager.asset b/BlueWater/ProjectSettings/TagManager.asset index d4ef6920e..a9a7458f7 100644 --- a/BlueWater/ProjectSettings/TagManager.asset +++ b/BlueWater/ProjectSettings/TagManager.asset @@ -17,6 +17,10 @@ TagManager: - Grid - HitBox - DestructiveSkill + - Ship + - Water + - DestructiveObject + - ShipPlayer layers: - Default - TransparentFX