diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index 9add6bf6c..843af14de 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -36,7 +36,7 @@ RenderSettings: m_DefaultReflectionResolution: 128 m_ReflectionBounces: 1 m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 8900000, guid: c1206bb3fa7b1d14e81afd040dc52409, type: 2} + m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1209931282} m_IndirectSpecularColor: {r: 0.7008067, g: 0.7856396, b: 0.82016647, a: 1} m_UseRadianceAmbientProbe: 0 @@ -13883,84 +13883,6 @@ Transform: - {fileID: 731623437} m_Father: {fileID: 62532374} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &447594507 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 447594508} - - component: {fileID: 447594510} - - component: {fileID: 447594509} - m_Layer: 5 - m_Name: Grid Canvas(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &447594508 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 447594507} - m_LocalRotation: {x: -0, y: 0.38268343, z: -0, w: 0.92387956} - m_LocalPosition: {x: 0, y: 0, z: 7.071067} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2009498920} - m_Father: {fileID: 1654043435} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -7.0710707, y: -10.000022} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0, y: 0} ---- !u!114 &447594509 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 447594507} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 2147483647 ---- !u!223 &447594510 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 447594507} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!54 &451666485 Rigidbody: m_ObjectHideFlags: 0 @@ -17575,50 +17497,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &558299737 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 558299738} - - component: {fileID: 558299739} - m_Layer: 0 - m_Name: Audio FX - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &558299738 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558299737} - 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: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &558299739 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558299737} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cec496125454a684bb93d5662d04938e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &563686341 stripped Transform: m_CorrespondingSourceObject: {fileID: 2213139629052044068, guid: 0f7ff4b7b8d5e4f09ac4fc513061cd59, @@ -19128,50 +19006,6 @@ Transform: - {fileID: 1632226838} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &683855805 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 683855806} - - component: {fileID: 683855807} - m_Layer: 0 - m_Name: Particle FX - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &683855806 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 683855805} - 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: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &683855807 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 683855805} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cec496125454a684bb93d5662d04938e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &685080178 PrefabInstance: m_ObjectHideFlags: 0 @@ -21522,50 +21356,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 821024739} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &824890874 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 824890875} - - component: {fileID: 824890876} - m_Layer: 0 - m_Name: Post FX - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &824890875 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 824890874} - 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: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &824890876 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 824890874} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cec496125454a684bb93d5662d04938e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &826994741 GameObject: m_ObjectHideFlags: 0 @@ -23309,13 +23099,13 @@ MonoBehaviour: parent: {fileID: 0} hideFXInHierarchy: 1 particleManager: - parent: {fileID: 683855806} + parent: {fileID: 0} _IsEnabled: 1 _OpenTab: 0 vfx: {fileID: 972093970} multiplier: 1 thunderManager: - parent: {fileID: 973498115} + parent: {fileID: 0} _IsEnabled: 1 _OpenTab: 0 vfx: {fileID: 972093970} @@ -23334,7 +23124,7 @@ MonoBehaviour: _OpenTab: 0 vfx: {fileID: 972093970} audioManager: - parent: {fileID: 558299738} + parent: {fileID: 0} _IsEnabled: 1 _OpenTab: 0 vfx: {fileID: 972093970} @@ -23342,7 +23132,7 @@ MonoBehaviour: weatherFXMixer: {fileID: 6122681528400141310, guid: 7657aaa11fc9748449b9a88b6a5dc9ca, type: 2} postFXManager: - parent: {fileID: 824890875} + parent: {fileID: 0} _IsEnabled: 1 _OpenTab: 0 vfx: {fileID: 972093970} @@ -23358,14 +23148,14 @@ MonoBehaviour: _IsEnabled: 1 _OpenTab: 0 vfx: {fileID: 972093970} - windZone: {fileID: 1620990231} + windZone: {fileID: 0} windMultiplier: 1 useWindzone: 1 generateWindzoneAtRuntime: 1 useShaderWind: 1 windFXes: [] customFXModule: - parent: {fileID: 1300941362} + parent: {fileID: 0} _IsEnabled: 1 _OpenTab: 0 vfx: {fileID: 972093970} @@ -23390,50 +23180,6 @@ MonoBehaviour: rainSpeed: 0 profile: {fileID: 11400000, guid: 9811ba7ef96ef254eb2034d42353f712, type: 2} precipitationFXes: [] ---- !u!1 &973498114 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 973498115} - - component: {fileID: 973498116} - m_Layer: 0 - m_Name: Thunder FX - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &973498115 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973498114} - 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: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &973498116 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973498114} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cec496125454a684bb93d5662d04938e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &991171997 PrefabInstance: m_ObjectHideFlags: 0 @@ -36819,50 +36565,6 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 2086678789} ---- !u!1 &1300941361 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1300941362} - - component: {fileID: 1300941363} - m_Layer: 0 - m_Name: Custom FX - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1300941362 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1300941361} - 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: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1300941363 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1300941361} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cec496125454a684bb93d5662d04938e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &1302515238 stripped Transform: m_CorrespondingSourceObject: {fileID: 412716, guid: e1c4cc5b9a7d0d7479734ea4167d417e, @@ -47747,65 +47449,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1619562077} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1620990230 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1620990233} - - component: {fileID: 1620990232} - - component: {fileID: 1620990231} - m_Layer: 0 - m_Name: Wind Zone - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!182 &1620990231 -WindZone: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1620990230} - m_Enabled: 1 - m_Mode: 0 - m_Radius: 20 - m_WindMain: 0.5 - m_WindTurbulence: 1 - m_WindPulseMagnitude: 0.5 - m_WindPulseFrequency: 0.01 ---- !u!114 &1620990232 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1620990230} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cec496125454a684bb93d5662d04938e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1620990233 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1620990230} - serializedVersion: 2 - m_LocalRotation: {x: -0.21193817, y: -0.35109416, z: -0.081917815, w: 0.9083527} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1621372727 PrefabInstance: m_ObjectHideFlags: 0 @@ -47992,7 +47635,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625123128} serializedVersion: 2 - m_LocalRotation: {x: 0.6753435, y: 0.030742656, z: -0.028196681, w: 0.73632264} + m_LocalRotation: {x: 0.6753435, y: 0.030742353, z: -0.028196404, w: 0.73632264} m_LocalPosition: {x: 0, y: 0, z: 0.00000047683716} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -48336,174 +47979,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b556d7a85528a84aac27247ff9eeb24, type: 3} ---- !u!1 &1654043434 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1654043435} - - component: {fileID: 1654043437} - - component: {fileID: 1654043436} - m_Layer: 31 - m_Name: EGB Pro Grid XY - m_TagString: Grid - m_Icon: {fileID: 2800000, guid: 7e4350e634f86ed4eb78f2b5857f4d89, type: 3} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1654043435 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1654043434} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 3.78, z: 10.8} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 447594508} - m_Father: {fileID: 8602645832870330531} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1654043436 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1654043434} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 40, y: 40, z: 0} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &1654043437 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1654043434} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28061f5e303cbcf4e97fb0b9bef94f5f, type: 3} - m_Name: - m_EditorClassIdentifier: - gridEditorMode: 2 - buildableGridObjectTypeSOList: [] - buildableEdgeObjectTypeSOList: [] - buildableFreeObjectTypeSOList: [] - gridAxis: 1 - gridWidth: 20 - gridLength: 20 - cellSize: 1 - gridOriginXZ: {x: -18.47821, y: -996.21, z: 8.660549} - gridOriginXY: {x: -18.47821, y: -1006.21, z: 18.66055} - useHolderPositionAsOrigin: 1 - showVerticalGridData: 1 - verticalGridsCount: 1 - gridHeight: 2 - changeHeightWithInput: 1 - autoDetectHeight: 0 - autoDetectHeightLayerMask: - serializedVersion: 2 - m_Bits: 3221225473 - showBuildableDistanceData: 0 - useBuildableDistance: 0 - distanceCheckObject: {fileID: 0} - distanceMin: 0 - distanceMax: 50 - showGridObjectCollisionData: 0 - mouseColliderLayerMask: - serializedVersion: 2 - m_Bits: 2147483648 - freeObjectCollidingLayerMask: - serializedVersion: 2 - m_Bits: 3221225473 - colliderSizeMultiplier: 2 - lockColliderOnHeightChange: 0 - showCanvasGridData: 1 - showEditorAndRuntimeCanvasGrid: 1 - gridCanvasPrefab: {fileID: 7023326040891081457, guid: b008e2f959515844dac4c16b66bf9c2b, - type: 3} - gridImageSprite: {fileID: 21300000, guid: 2eacf68fc32face47bf4335fb2cc57c1, type: 3} - showColor: {r: 0.47058824, g: 0.47058824, b: 0.47058824, a: 0.39215687} - hideColor: {r: 0.47058824, g: 0.47058824, b: 0.47058824, a: 0} - colorTransitionSpeed: 20 - showOnDefaultMode: 1 - showOnBuildMode: 1 - showOnDestructMode: 1 - showOnSelectedMode: 1 - lockCanvasGridOnHeightChange: 0 - showDebugGridData: 0 - showEditorAndRuntimeDebugGrid: 0 - editorGridLineColor: {r: 1, g: 1, b: 1, a: 1} - lockDebugGridOnHeightChange: 0 - showNodeGridData: 0 - showRuntimeNodeGrid: 0 - gridNodePrefab: - - {fileID: 7695809926237117888, guid: 7223ba8911998394d89308bd7b14aadd, type: 3} - - {fileID: 2555192278033704093, guid: 1e5873c3d2d49494395b19a5b78c1d35, type: 3} - - {fileID: 4722525440239903003, guid: 6107dac8e8a7bf74eb16182562da881d, type: 3} - gridNodeMarginPercentage: 95 - gridNodeLocalOffset: {x: 0, y: 0, z: 0} - showTextGridData: 0 - showRuntimeGridText: 0 - gridTextColor: {r: 0, g: 0, b: 0, a: 1} - gridTextSizeMultiplier: 1 - showCellValueText: 1 - gridTextPrefix: - gridTextSuffix: - gridTextLocalOffset: {x: 0, y: 0, z: 0} - showSaveAndLoadData: 0 - enableSaveAndLoad: 1 - uniqueSaveName: EasyGridBuilder_SaveData_ - saveLocation: /EasyGridBuilder Pro/LocalSaves/ - showConsoleText: 0 - showConsoleData: 0 - objectPlacement: 0 - objectDestruction: 0 - objectSelected: 0 - gridLevelChange: 0 - saveAndLoad: 1 - enableUnityEvents: 0 - showBaseEvent: 0 - OnSelectedBuildableChangedUnityEvent: - m_PersistentCalls: - m_Calls: [] - OnGridCellChangedUnityEvent: - m_PersistentCalls: - m_Calls: [] - OnActiveGridLevelChangedUnityEvent: - m_PersistentCalls: - m_Calls: [] - showObjectInteractEvents: 0 - OnObjectPlacedUnityEvent: - m_PersistentCalls: - m_Calls: [] - OnObjectRemovedUnityEvent: - m_PersistentCalls: - m_Calls: [] - OnObjectSelectedUnityEvent: - m_PersistentCalls: - m_Calls: [] - OnObjectDeselectedUnityEvent: - m_PersistentCalls: - m_Calls: [] --- !u!1 &1659153578 GameObject: m_ObjectHideFlags: 0 @@ -64831,81 +64306,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 3, y: 3, z: 1.5} m_Center: {x: -0.45, y: 1, z: 1} ---- !u!1 &2009498919 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2009498920} - - component: {fileID: 2009498922} - - component: {fileID: 2009498921} - m_Layer: 5 - m_Name: Grid Texture - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2009498920 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2009498919} - 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: 447594508} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2009498921 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2009498919} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.47058824, g: 0.47058824, b: 0.47058824, a: 0.39215687} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2eacf68fc32face47bf4335fb2cc57c1, type: 3} - m_Type: 2 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 100 ---- !u!222 &2009498922 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2009498919} - m_CullTransparentMesh: 1 --- !u!1 &2009738426 GameObject: m_ObjectHideFlags: 0 @@ -69762,7 +69162,7 @@ GameObject: m_Icon: {fileID: 2800000, guid: 391aaa0b581312941b814e87136835b7, type: 3} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &2011404477 MonoBehaviour: m_ObjectHideFlags: 0 @@ -69957,8 +69357,8 @@ Transform: m_GameObject: {fileID: 2011404476} serializedVersion: 2 m_LocalRotation: {x: 0.0000000037252899, y: -0, z: -0.0000000074505797, w: 1} - m_LocalPosition: {x: 10.984804, y: -984.95874, z: -1.4592438} - m_LocalScale: {x: 3.3818166, y: 3.3818166, z: 3.3818166} + m_LocalPosition: {x: -43.34256, y: 5.946846, z: -3.135458} + m_LocalScale: {x: 1.7320508, y: 1.7320508, z: 1.7320508} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1126090883} @@ -78786,6 +78186,8 @@ MonoBehaviour: - {fileID: 11400000, guid: f38a360c1f7a546c09dd44232211356c, type: 2} - {fileID: 11400000, guid: 49a93143605ba4e97a672d2d1a684e9d, type: 2} - {fileID: 11400000, guid: c0338dbe320764869b67713f9839f45f, type: 2} + - {fileID: 11400000, guid: bac3d3cf818b840bfbea2a7ec5d24c20, type: 2} + - {fileID: 11400000, guid: d9af7f5233dbc49188cc9824f1ebe820, type: 2} buildableEdgeObjectTypeSOList: [] buildableFreeObjectTypeSOList: [] gridAxis: 0 @@ -92745,7 +92147,6 @@ Transform: - {fileID: 8602645831212668567} - {fileID: 8602645831581826143} - {fileID: 6265547806802070458} - - {fileID: 1654043435} m_Father: {fileID: 1248116869} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &8651476940035728142 diff --git a/BlueWater/Assets/03.Images/InShip/2048/ship_obj_chickenroom01_2048.png b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_chickenroom01_2048.png new file mode 100644 index 000000000..da079ee08 Binary files /dev/null and b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_chickenroom01_2048.png differ diff --git a/BlueWater/Assets/03.Images/InShip/2048/ship_obj_chickenroom01_2048.png.meta b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_chickenroom01_2048.png.meta new file mode 100644 index 000000000..409f17586 --- /dev/null +++ b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_chickenroom01_2048.png.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 7cfbf3b02ed7b428f8157ea10eb894f0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 2048 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/03.Images/InShip/2048/ship_obj_rumbarrel01_2048.png b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_rumbarrel01_2048.png new file mode 100644 index 000000000..594017b2a Binary files /dev/null and b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_rumbarrel01_2048.png differ diff --git a/BlueWater/Assets/03.Images/InShip/2048/ship_obj_rumbarrel01_2048.png.meta b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_rumbarrel01_2048.png.meta new file mode 100644 index 000000000..a9e13e094 --- /dev/null +++ b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_rumbarrel01_2048.png.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 2a7f6d5a8f6c34a94bfe76499ae012e9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 2048 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/03.Images/InShip/2048/ship_obj_to01_2048.png b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_to01_2048.png new file mode 100644 index 000000000..01db59ce1 Binary files /dev/null and b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_to01_2048.png differ diff --git a/BlueWater/Assets/03.Images/InShip/2048/ship_obj_to01_2048.png.meta b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_to01_2048.png.meta new file mode 100644 index 000000000..833838e5a --- /dev/null +++ b/BlueWater/Assets/03.Images/InShip/2048/ship_obj_to01_2048.png.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: a36628df51ccb47419a8442646db57e1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 2048 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Chickenroom.asset b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Chickenroom.asset new file mode 100644 index 000000000..1c8726e8c --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Chickenroom.asset @@ -0,0 +1,42 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 65d2d645654a6df41b437ed3f8e35368, type: 3} + m_Name: Chickenroom + m_EditorClassIdentifier: + objectName: Chickenroom + buildableCategorySO: {fileID: 11400000, guid: 00d47d8fda444fb4f9e6779dcd31f855, + type: 2} + objectDescription: + objectToolTipDescription: + objectIcon: {fileID: 21300000, guid: 7cfbf3b02ed7b428f8157ea10eb894f0, type: 3} + objectPrefab: + - {fileID: 7796673692751978389, guid: 6aba37b0736104d86ab267b4fdb277f6, type: 3} + ghostPrefab: {fileID: 7796673692751978389, guid: 6aba37b0736104d86ab267b4fdb277f6, + type: 3} + placeableGhostMaterial: {fileID: 2100000, guid: 281380b3d50e1eb46b869b8c8aa1307c, + type: 2} + notPlaceableGhostMaterial: {fileID: 2100000, guid: 1fb75a46b45af6e49a32883c3bcb026a, + type: 2} + setBuiltObjectLayer: 0 + builtObjectLayer: + serializedVersion: 2 + m_Bits: 0 + showGridBelowObject: 1 + objectGridCanvas: {fileID: 7023326040891081457, guid: b008e2f959515844dac4c16b66bf9c2b, + type: 3} + gridImageSprite: {fileID: 21300000, guid: 89f923662002a7240b3f8939cdc9bc13, type: 3} + gridImagePlaceableColor: {r: 0.5019608, g: 0.83921576, b: 0.9921569, a: 1} + gridImageNotPlaceableColor: {r: 0.7075472, g: 0.23696157, b: 0.24224916, a: 1} + holdToPlace: 0 + placeAndDeselect: 0 + enableBuildCondition: 0 + buildConditionSO: {fileID: 0} diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Chickenroom.asset.meta b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Chickenroom.asset.meta new file mode 100644 index 000000000..7cf744b4a --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Chickenroom.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9af7f5233dbc49188cc9824f1ebe820 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Rumbbarrel.asset b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Rumbbarrel.asset new file mode 100644 index 000000000..445d3b0af --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Rumbbarrel.asset @@ -0,0 +1,42 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 65d2d645654a6df41b437ed3f8e35368, type: 3} + m_Name: Rumbbarrel + m_EditorClassIdentifier: + objectName: Rumbbarrel + buildableCategorySO: {fileID: 11400000, guid: 00d47d8fda444fb4f9e6779dcd31f855, + type: 2} + objectDescription: + objectToolTipDescription: + objectIcon: {fileID: 21300000, guid: 2a7f6d5a8f6c34a94bfe76499ae012e9, type: 3} + objectPrefab: + - {fileID: 7796673692751978389, guid: b803aedd3934243c79ee8cdc44d1c6c1, type: 3} + ghostPrefab: {fileID: 7796673692751978389, guid: b803aedd3934243c79ee8cdc44d1c6c1, + type: 3} + placeableGhostMaterial: {fileID: 2100000, guid: 281380b3d50e1eb46b869b8c8aa1307c, + type: 2} + notPlaceableGhostMaterial: {fileID: 2100000, guid: 1fb75a46b45af6e49a32883c3bcb026a, + type: 2} + setBuiltObjectLayer: 0 + builtObjectLayer: + serializedVersion: 2 + m_Bits: 0 + showGridBelowObject: 1 + objectGridCanvas: {fileID: 7023326040891081457, guid: b008e2f959515844dac4c16b66bf9c2b, + type: 3} + gridImageSprite: {fileID: 21300000, guid: 89f923662002a7240b3f8939cdc9bc13, type: 3} + gridImagePlaceableColor: {r: 0.5019608, g: 0.83921576, b: 0.9921569, a: 1} + gridImageNotPlaceableColor: {r: 0.7075472, g: 0.23696157, b: 0.24224916, a: 1} + holdToPlace: 0 + placeAndDeselect: 0 + enableBuildCondition: 0 + buildConditionSO: {fileID: 0} diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Rumbbarrel.asset.meta b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Rumbbarrel.asset.meta new file mode 100644 index 000000000..052816324 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Buildable Grid Object Type So Assets/Rumbbarrel.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bac3d3cf818b840bfbea2a7ec5d24c20 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Chair.prefab b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Chair.prefab index 82b93a2eb..ccd1a4385 100644 --- a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Chair.prefab +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Chair.prefab @@ -48,6 +48,11 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: rotateObjectForXZ + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: buildableGridObjectTypeSO @@ -65,6 +70,16 @@ PrefabInstance: propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} + - target: {fileID: 6350836898243288373, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: showObjectSpawnData + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6350836898243288373, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: useSpawnGameObjects + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6457023421511160379, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: m_Size.x diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Chickenroom.prefab b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Chickenroom.prefab new file mode 100644 index 000000000..1fb83cd52 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Chickenroom.prefab @@ -0,0 +1,162 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1339557744348280311 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalScale.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalScale.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalScale.z + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.92387956 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.38268343 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -45 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: objectScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: objectScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: buildableGridObjectTypeSO + value: + objectReference: {fileID: 11400000, guid: d9af7f5233dbc49188cc9824f1ebe820, + type: 2} + - target: {fileID: 5984269038528210271, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7cfbf3b02ed7b428f8157ea10eb894f0, + type: 3} + - target: {fileID: 5984269038528210271, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6457023421511160379, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7137341952126152044, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Size.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7137341952126152044, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Size.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7137341952126152044, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Size.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7137341952126152044, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7667327646639859884, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Name + value: Chickenroom + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Chickenroom.prefab.meta b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Chickenroom.prefab.meta new file mode 100644 index 000000000..61ab904f1 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Chickenroom.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6aba37b0736104d86ab267b4fdb277f6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Engin.prefab b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Engin.prefab index fc13ff9c3..ee381fc58 100644 --- a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Engin.prefab +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Engin.prefab @@ -11,17 +11,17 @@ PrefabInstance: - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: m_LocalScale.x - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: m_LocalScale.y - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: m_LocalScale.z - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} @@ -81,12 +81,12 @@ PrefabInstance: - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: objectScale.x - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} propertyPath: objectScale.z - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Rumbbarrel.prefab b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Rumbbarrel.prefab new file mode 100644 index 000000000..80ce7a349 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Rumbbarrel.prefab @@ -0,0 +1,162 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1339557744348280311 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalScale.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.76 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.92387956 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.38268343 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -45 + objectReference: {fileID: 0} + - target: {fileID: 2061692202436134468, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: objectScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: objectScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5680503881558313543, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: buildableGridObjectTypeSO + value: + objectReference: {fileID: 11400000, guid: bac3d3cf818b840bfbea2a7ec5d24c20, + type: 2} + - target: {fileID: 5984269038528210271, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 2a7f6d5a8f6c34a94bfe76499ae012e9, + type: 3} + - target: {fileID: 5984269038528210271, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6457023421511160379, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7137341952126152044, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Size.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7137341952126152044, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Size.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7137341952126152044, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Size.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7137341952126152044, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7667327646639859884, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_Name + value: Rumbbarrel + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9125499842164812386, guid: df9556fba23d04a5ea0331528bb1999a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df9556fba23d04a5ea0331528bb1999a, type: 3} diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Rumbbarrel.prefab.meta b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Rumbbarrel.prefab.meta new file mode 100644 index 000000000..dfce6e6ba --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Rumbbarrel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b803aedd3934243c79ee8cdc44d1c6c1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Vomit.prefab b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Vomit.prefab index 62cd10a59..a9b953c7a 100644 --- a/BlueWater/Assets/05.Prefabs/Props/InShipProps/Vomit.prefab +++ b/BlueWater/Assets/05.Prefabs/Props/InShipProps/Vomit.prefab @@ -71,10 +71,10 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 5a74b62dc6a77f84395b5ab237161f21, type: 3} + m_SortingLayerID: 2126259909 + m_SortingLayer: 1 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: a36628df51ccb47419a8442646db57e1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Fog.mat b/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Fog.mat index 370e3f7bb..6e30e3b4e 100644 --- a/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Fog.mat +++ b/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Fog.mat @@ -99,7 +99,7 @@ Material: - _FogIntensity1: 1 - _FogOffset: 0.85 - _FogOffset1: 1 - - _FogSmoothness: 338.18167 + - _FogSmoothness: 173.20508 - _FogSmoothness1: 100 - _GlossMapScale: 1 - _Glossiness: 0.5 diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Stylized Clouds.mat b/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Stylized Clouds.mat index e8e4abf50..4ec02a7e5 100644 --- a/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Stylized Clouds.mat +++ b/BlueWater/Assets/Distant Lands/Cozy Weather/Contents/Materials/Stylized Clouds.mat @@ -237,7 +237,7 @@ Material: - _SecondLayer: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 0} - _SecondLayer1: {r: 0.8396226, g: 0.8396226, b: 0.8396226, a: 0} - _ShadowDirection: {r: 0, g: 0, b: 0, a: 0} - - _StormDirection: {r: 0.8751074, g: -0, b: 0.48392874, a: 0} + - _StormDirection: {r: -0.9863876, g: -0, b: -0.1644367, a: 0} - _SunDirection: {r: 0.034127682, g: 0.9526184, b: 0.30224794, a: 0} - _SunDirection1: {r: 0, g: 0, b: 0, a: 0} - _TexturePanDirection: {r: 0.1, g: 1, b: 0.1, a: 0}