diff --git a/BlueWater/Assets/01.Scenes/02.Ocean.unity b/BlueWater/Assets/01.Scenes/02.Ocean.unity index 87f105329..48aaa0c13 100644 --- a/BlueWater/Assets/01.Scenes/02.Ocean.unity +++ b/BlueWater/Assets/01.Scenes/02.Ocean.unity @@ -1882,7 +1882,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.13333334 + m_VoxelSize: 0.5 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: ed36e1064a49b084bac46d5debdc1de3, type: 2} m_BuildHeightMesh: 0 @@ -2131,7 +2131,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &252841256 stripped @@ -3409,7 +3409,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.13333334 + m_VoxelSize: 0.5 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: 5ea25972c984549389ea883b022806f2, type: 2} m_BuildHeightMesh: 0 @@ -7127,7 +7127,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.13333334 + m_VoxelSize: 0.5 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: 31dac17fce1ca4b4ba03670c1a4102d9, type: 2} m_BuildHeightMesh: 0 @@ -12204,7 +12204,7 @@ SpriteRenderer: m_Size: {x: 10, y: 10} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1001 &1284342734 @@ -18841,8 +18841,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1485085414} serializedVersion: 2 - m_LocalRotation: {x: 0.38026944, y: 0.61870486, z: -0.4629384, w: 0.50822} - m_LocalPosition: {x: -0.0019035339, y: 0, z: -0.009597778} + m_LocalRotation: {x: 0.38026953, y: 0.61870474, z: -0.46293837, w: 0.50822} + m_LocalPosition: {x: -0.0019073486, y: 0, z: -0.009613037} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -20900,54 +20900,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1770089208 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1770089210} - - component: {fileID: 1770089209} - m_Layer: 0 - m_Name: GameLifetimeScope - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1770089209 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1770089208} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f6d3174aef91e74449c5585531f446ac, type: 3} - m_Name: - m_EditorClassIdentifier: - parentReference: - TypeName: - autoRun: 1 - autoInjectGameObjects: [] ---- !u!4 &1770089210 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1770089208} - 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!1 &1771297321 GameObject: m_ObjectHideFlags: 0 @@ -40658,7 +40610,6 @@ SceneRoots: - {fileID: 734248431} - {fileID: 2125686127} - {fileID: 1341654437} - - {fileID: 1770089210} - {fileID: 55264371} - {fileID: 1806659892} - {fileID: 642763787} diff --git a/BlueWater/Assets/01.Scenes/Ocean5_art.unity b/BlueWater/Assets/01.Scenes/Ocean5_art.unity index d680f090c..ff13661f5 100644 --- a/BlueWater/Assets/01.Scenes/Ocean5_art.unity +++ b/BlueWater/Assets/01.Scenes/Ocean5_art.unity @@ -8299,14 +8299,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 168896972} serializedVersion: 2 - m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} - m_LocalPosition: {x: 99.2, y: 27.240004, z: 247.59872} + m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607} + m_LocalPosition: {x: 262.6, y: 23.370914, z: -88.91539} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 263106988} m_Father: {fileID: 649179607} - m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0} --- !u!114 &168896974 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12637,7 +12637,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &248719272 @@ -48609,8 +48609,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 776161953} serializedVersion: 2 - m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} - m_LocalPosition: {x: 99.2, y: 27.240004, z: 247.59872} + m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607} + m_LocalPosition: {x: 262.6, y: 23.370914, z: -88.91539} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -60129,7 +60129,7 @@ Transform: m_GameObject: {fileID: 975912075} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 99.2, y: -0.76, z: 290.9} + m_LocalPosition: {x: 262.6, y: -0.76, z: -43.6} m_LocalScale: {x: 0.77903, y: 0.77903, z: 0.77903} m_ConstrainProportionsScale: 0 m_Children: @@ -77430,7 +77430,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &1259008012 @@ -98081,7 +98081,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1f6878d8c33f6d147918f802eec4ddbf, type: 3} m_Name: m_EditorClassIdentifier: - waterMat: {fileID: 2100000, guid: 5fafa8676906446259d1790e3543945a, type: 2} + waterMat: {fileID: 2100000, guid: 2f7fdcfae4148604f85cba4c40b7c9d9, type: 2} waterLevelSource: 0 waterPlane: {fileID: 1560348099} waterLevel: 0 @@ -130126,7 +130126,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3e8c36fe9172849798f9c4fd87b77ec7, type: 3} m_Name: m_EditorClassIdentifier: - autoInit: 1 playerInput: {fileID: 0} projectileObject: {fileID: 0} visualLook: {fileID: 0} diff --git a/BlueWater/Assets/01.Scenes/Tycoon1.unity b/BlueWater/Assets/01.Scenes/Tycoon1.unity index d7b01febd..9fb0437d0 100644 --- a/BlueWater/Assets/01.Scenes/Tycoon1.unity +++ b/BlueWater/Assets/01.Scenes/Tycoon1.unity @@ -14137,7 +14137,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -243.47021, y: 9} + m_AnchoredPosition: {x: -243.4707, y: 9} m_SizeDelta: {x: 1654.9401, y: 2965.377} m_Pivot: {x: 0, y: 0.5} --- !u!114 &143139992 @@ -16953,6 +16953,114 @@ Transform: type: 3} m_PrefabInstance: {fileID: 167926703} m_PrefabAsset: {fileID: 0} +--- !u!1 &169071233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 169071237} + - component: {fileID: 169071236} + - component: {fileID: 169071235} + - component: {fileID: 169071234} + m_Layer: 0 + m_Name: Quad (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &169071234 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169071233} + 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: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &169071235 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169071233} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f8ce5d61a00d84f48ade35737c7835e9, 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 &169071236 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169071233} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &169071237 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169071233} + serializedVersion: 2 + m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607} + m_LocalPosition: {x: 8.031, y: 2.413, z: -1.463} + m_LocalScale: {x: 0.96647567, y: 1.601, z: 1.601} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0} --- !u!1001 &169921301 PrefabInstance: m_ObjectHideFlags: 0 @@ -28328,7 +28436,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -243.47021, y: 9} + m_AnchoredPosition: {x: -243.4707, y: 9} m_SizeDelta: {x: 1654.9401, y: 2965.377} m_Pivot: {x: 0, y: 0.5} --- !u!114 &304193848 @@ -40459,7 +40567,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.13333334 + m_VoxelSize: 0.5 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: 7f435cceb6d614cf0b149079d184c785, type: 2} m_BuildHeightMesh: 0 @@ -114299,6 +114407,114 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1358959392} m_PrefabAsset: {fileID: 0} +--- !u!1 &1359356899 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1359356903} + - component: {fileID: 1359356902} + - component: {fileID: 1359356901} + - component: {fileID: 1359356900} + m_Layer: 0 + m_Name: Quad (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1359356900 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359356899} + 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: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1359356901 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359356899} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e022a3ecd22674e46869c560636815fb, 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 &1359356902 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359356899} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1359356903 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359356899} + serializedVersion: 2 + m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607} + m_LocalPosition: {x: 8.779, y: 2.413, z: -1.463} + m_LocalScale: {x: 0.96647567, y: 1.601, z: 1.601} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0} --- !u!1001 &1359368101 PrefabInstance: m_ObjectHideFlags: 0 @@ -138406,8 +138622,8 @@ Transform: m_GameObject: {fileID: 1643551148} serializedVersion: 2 m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607} - m_LocalPosition: {x: 7.367, y: 2.413, z: -1.463} - m_LocalScale: {x: 0.96647567, y: 1.601, z: 1.601} + m_LocalPosition: {x: 7.19, y: 2.413, z: -1.463} + m_LocalScale: {x: 0.78, y: 1.601, z: 1.601} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -202311,3 +202527,5 @@ SceneRoots: - {fileID: 793130410} - {fileID: 3643229415841574932} - {fileID: 1643551152} + - {fileID: 169071237} + - {fileID: 1359356903} diff --git a/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs b/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs deleted file mode 100644 index 64b5b22c7..000000000 --- a/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs +++ /dev/null @@ -1,9 +0,0 @@ -using VContainer; -using VContainer.Unity; - -public class GameLifetimeScope : LifetimeScope -{ - protected override void Configure(IContainerBuilder builder) - { - } -} diff --git a/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs.meta b/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs.meta deleted file mode 100644 index 9f80f7e41..000000000 --- a/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: f6d3174aef91e74449c5585531f446ac \ No newline at end of file diff --git a/BlueWater/Assets/03.Images/Characters/Players/Materials/character03.mat b/BlueWater/Assets/03.Images/Characters/Players/Materials/character03.mat new file mode 100644 index 000000000..d49cab10a --- /dev/null +++ b/BlueWater/Assets/03.Images/Characters/Players/Materials/character03.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: character03 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 599e98e568db8e741bbbce4fec3cb145, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 599e98e568db8e741bbbce4fec3cb145, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, 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: [] + m_AllowLocking: 1 +--- !u!114 &818746417133068859 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/BlueWater/Assets/03.Images/Characters/Players/Materials/character03.mat.meta b/BlueWater/Assets/03.Images/Characters/Players/Materials/character03.mat.meta new file mode 100644 index 000000000..1d1f2c8c5 --- /dev/null +++ b/BlueWater/Assets/03.Images/Characters/Players/Materials/character03.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8ce5d61a00d84f48ade35737c7835e9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/03.Images/Characters/Players/Materials/character04.mat b/BlueWater/Assets/03.Images/Characters/Players/Materials/character04.mat new file mode 100644 index 000000000..75a5027e0 --- /dev/null +++ b/BlueWater/Assets/03.Images/Characters/Players/Materials/character04.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: character04 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHATEST_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2450 + stringTagMap: + RenderType: TransparentCutout + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 80d54fb065fe4474b9e8615cea05372b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 80d54fb065fe4474b9e8615cea05372b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 1 + - _AlphaToMask: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, 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: [] + m_AllowLocking: 1 +--- !u!114 &7388206760533183019 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/BlueWater/Assets/03.Images/Characters/Players/Materials/character04.mat.meta b/BlueWater/Assets/03.Images/Characters/Players/Materials/character04.mat.meta new file mode 100644 index 000000000..f90e5a4bf --- /dev/null +++ b/BlueWater/Assets/03.Images/Characters/Players/Materials/character04.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e022a3ecd22674e46869c560636815fb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/03.Images/Characters/Players/character03.png b/BlueWater/Assets/03.Images/Characters/Players/character03.png new file mode 100644 index 000000000..c998a000b Binary files /dev/null and b/BlueWater/Assets/03.Images/Characters/Players/character03.png differ diff --git a/BlueWater/Assets/03.Images/Characters/Players/character03.png.meta b/BlueWater/Assets/03.Images/Characters/Players/character03.png.meta new file mode 100644 index 000000000..0dacdbb6f --- /dev/null +++ b/BlueWater/Assets/03.Images/Characters/Players/character03.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 599e98e568db8e741bbbce4fec3cb145 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 100 + 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + 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/Characters/Players/character04.png b/BlueWater/Assets/03.Images/Characters/Players/character04.png new file mode 100644 index 000000000..34eaf8ada Binary files /dev/null and b/BlueWater/Assets/03.Images/Characters/Players/character04.png differ diff --git a/BlueWater/Assets/03.Images/Characters/Players/character04.png.meta b/BlueWater/Assets/03.Images/Characters/Players/character04.png.meta new file mode 100644 index 000000000..86485b08f --- /dev/null +++ b/BlueWater/Assets/03.Images/Characters/Players/character04.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 80d54fb065fe4474b9e8615cea05372b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 100 + 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + 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/Skills/Lines/Fills/LineFill_011.png b/BlueWater/Assets/03.Images/Skills/Lines/Fills/LineFill_011.png new file mode 100644 index 000000000..505470c6e Binary files /dev/null and b/BlueWater/Assets/03.Images/Skills/Lines/Fills/LineFill_011.png differ diff --git a/BlueWater/Assets/03.Images/Skills/Lines/Fills/LineFill_011.png.meta b/BlueWater/Assets/03.Images/Skills/Lines/Fills/LineFill_011.png.meta new file mode 100644 index 000000000..499b59cf3 --- /dev/null +++ b/BlueWater/Assets/03.Images/Skills/Lines/Fills/LineFill_011.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 9515963cf5e9c974ca7475bc21224a5e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 100 + 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + 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/Skills/Lines/Indicators/Line_011.png b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_011.png new file mode 100644 index 000000000..492dc5a16 Binary files /dev/null and b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_011.png differ diff --git a/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_011.png.meta b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_011.png.meta new file mode 100644 index 000000000..467263a21 --- /dev/null +++ b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_011.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 027aa27592829324881ce8cfaeee46af +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 100 + 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + 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/Skills/Lines/Indicators/Line_012.png b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_012.png new file mode 100644 index 000000000..32ada24bb Binary files /dev/null and b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_012.png differ diff --git a/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_012.png.meta b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_012.png.meta new file mode 100644 index 000000000..bff094114 --- /dev/null +++ b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_012.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 5ed96bdf1ff5ffd4982ac57899695328 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 100 + 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + 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/Skills/Lines/Indicators/Line_013.png b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_013.png new file mode 100644 index 000000000..b621e6af5 Binary files /dev/null and b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_013.png differ diff --git a/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_013.png.meta b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_013.png.meta new file mode 100644 index 000000000..cfcbf1757 --- /dev/null +++ b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_013.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: d8cda28c6c052264a93bf22dd859ddd3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 100 + 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + 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/Skills/Lines/Indicators/Line_014.png b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_014.png new file mode 100644 index 000000000..c85dd769b Binary files /dev/null and b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_014.png differ diff --git a/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_014.png.meta b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_014.png.meta new file mode 100644 index 000000000..afbfb56d3 --- /dev/null +++ b/BlueWater/Assets/03.Images/Skills/Lines/Indicators/Line_014.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: a6151ccb538d4c446868f265c10c2fc5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 100 + 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + 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.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 1.mat b/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 1.mat index 8ebbdde92..092a3346c 100644 --- a/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 1.mat +++ b/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 1.mat @@ -19,6 +19,7 @@ Material: - _NORMALMAP - _REFRACTION - _TRANSLUCENCY + - _WAVES m_InvalidKeywords: - _DEPTHEXP_ON - _ZCLIP_ON @@ -272,18 +273,18 @@ Material: - _VertexColorWaveFlattening: 0 - _WaveCount: 2 - _WaveDistance: 0.952 - - _WaveHeight: 0.5 + - _WaveHeight: 0.75 - _WaveNormalStr: 1 - _WaveSpeed: 2 - _WaveSteepness: 0.64 - _WaveTint: 0 - - _WavesOn: 0 + - _WavesOn: 1 - _WorkflowMode: 1 - _WorldSpaceUV: 1 - _ZClip: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0, g: 0.16451614, b: 0.34, a: 1} + - _BaseColor: {r: 0, g: 0.12239441, b: 0.34117648, a: 1} - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _DepthMapBounds: {r: -402.3, g: -459.43, b: 0.0012693577, a: 0} - _Direction: {r: 1, g: 1, b: 0, a: 0} diff --git a/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 2.mat b/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 2.mat new file mode 100644 index 000000000..a01bc92b8 --- /dev/null +++ b/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 2.mat @@ -0,0 +1,318 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: StylizedWater2_DynamicEffectsDemo 2 + m_Shader: {fileID: 482279110045391116, guid: d7b0192b9bf19c949900035fa781fdc4, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ADVANCED_SHADING + - _CAUSTICS + - _DISTANCE_NORMALS + - _FOAM + - _NORMALMAP + - _REFRACTION + - _TRANSLUCENCY + m_InvalidKeywords: + - _DEPTHEXP_ON + - _ZCLIP_ON + - _ZWRITE_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: _Cull _WavesOn + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: ec6f0adef15b52448a82f3f183525d84, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMapLarge: + m_Texture: {fileID: 2800000, guid: 88908a7c7a1f0ed418d1048378c17411, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMapSlope: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CausticsTex: + m_Texture: {fileID: 2800000, guid: 36b7496f7c0078b49a44468d3e120e62, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DepthTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FoamTex: + m_Texture: {fileID: 2800000, guid: e91f048fea6b6b94eb864b2124843ce9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FoamTexDynamic: + m_Texture: {fileID: 2800000, guid: 6a4aa5aa1ed7b9e4e9204a95f56f4d29, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IntersectionNoise: + m_Texture: {fileID: 2800000, guid: b8850342fb8b1e846ac3807e35ec1685, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normals: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _PlanarReflection: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _PlanarReflectionLeft: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Shadermap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _texcoord: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - Vector1_1942CF3A: 1 + - Vector1_BE75C478: 32 + - Vector1_E23F9E57: 0.5 + - Vector1_E796673B: 10 + - _ADVANCED_LIGHTING: 1 + - _AdvancedLighting: 1 + - _Advanced_Lighting: 1 + - _AlphaClip: 0 + - _AlphaCutoff: 0.5 + - _AnimationSpeed: 1 + - _Blend: 0 + - _BumpScale: 1 + - _CROSSPAN_INTERSECTIONOn: 1 + - _CausticsBrightness: 1 + - _CausticsDistortion: 0.106 + - _CausticsOn: 1 + - _CausticsSpeed: 0.080000006 + - _CausticsTiling: 0.2 + - _ColorAbsorption: 0.002 + - _CrossPan_IntersectionOn: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _Depth: 0.94 + - _DepthExp: 1 + - _DepthHorizontal: 1 + - _DepthMode: 0 + - _DepthTexture: 1 + - _DepthVertical: 4 + - _DisableDepthTexture: 0 + - _DistanceNormalsOn: 1 + - _DistanceNormalsTiling: 0.050000004 + - _DstBlend: 0 + - _EdgeFade: 20 + - _EnvironmentReflections: 1 + - _EnvironmentReflectionsOn: 1 + - _FlatShadingOn: 0 + - _FlowSpeed: 1 + - _FoamBaseAmount: 0.021 + - _FoamClipping: 0 + - _FoamDistortion: 1 + - _FoamOn: 1 + - _FoamOpacity: 0 + - _FoamSize: 0.01 + - _FoamSpeed: 0.01999994 + - _FoamSpeedDynamic: 0.1 + - _FoamSubSpeed: 0.1 + - _FoamSubSpeedDynamic: -1 + - _FoamSubTiling: 1.9300001 + - _FoamSubTilingDynamic: 2 + - _FoamTiling: 0.060000025 + - _FoamTilingDynamic: 0.07000002 + - _FoamWaveAmount: 2 + - _FoamWaveMask: 0 + - _FoamWaveMaskExp: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _HorizonDistance: 10.4 + - _IntersectionClipping: 0.395 + - _IntersectionFalloff: 1 + - _IntersectionLength: 2.27 + - _IntersectionRippleDist: 16 + - _IntersectionRippleStrength: 0.125 + - _IntersectionSize: 0.944 + - _IntersectionSource: 0 + - _IntersectionSpeed: 0.06999999 + - _IntersectionStyle: 0 + - _IntersectionTiling: 0.13999975 + - _IntersectionWaveDist: 33.28 + - _LightingMode: 2 + - _LightingOn: 1 + - _Metallic: 0 + - _Metallicness: 0.1 + - _NORMALMAPOn: 1 + - _NormalMap: 1 + - _NormalMapOn: 1 + - _NormalSpeed: 0.4 + - _NormalStrength: 0.02 + - _NormalSubSpeed: -0.1 + - _NormalSubTiling: 0.5 + - _NormalTiling: 0.4800001 + - _OcclusionStrength: 1 + - _PlanarReflectionsEnabled: 0 + - _PlanarReflectionsParams: 0 + - _PointSpotLightReflectionDistortion: 0.5 + - _PointSpotLightReflectionExp: 64 + - _PointSpotLightReflectionSize: 0 + - _PointSpotLightReflectionStrength: 10 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _ReflectionBlur: 0 + - _ReflectionDistortion: 0.393 + - _ReflectionFresnel: 20 + - _ReflectionLighting: 0 + - _ReflectionStrength: 1 + - _Reflectivity: 1 + - _RefractionAmount: 0.05 + - _RefractionChromaticAberration: 1 + - _RefractionOn: 1 + - _RefractionStrength: 0.315 + - _RimRize: 1 + - _RimTiling: 0.025 + - _RiverModeOn: 0 + - _SHARP_INERSECTIONOn: 1 + - _ShadingMode: 1 + - _ShadowStrength: 1 + - _ShoreLineLength: 0 + - _ShoreLineWaveDistance: 23 + - _ShoreLineWaveStr: 1 + - _SimpleLighting: 1 + - _SlopeAngleFalloff: 25 + - _SlopeAngleThreshold: 15 + - _SlopeFoam: 1 + - _SlopeSpeed: 4 + - _SlopeStretching: 0.5 + - _SlopeThreshold: 0.25 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SparkleIntensity: 0 + - _SparkleSize: 0 + - _SpecularHighlights: 1 + - _SpecularReflectionsOn: 1 + - _Speed: 1 + - _SrcBlend: 1 + - _SunReflectionDistortion: 0.5 + - _SunReflectionPerturbance: 0.386 + - _SunReflectionSize: 0.755 + - _SunReflectionStrength: 5 + - _Surface: 0 + - _TEXTURE_INTERSECTIONOn: 0 + - _TessMax: 100 + - _TessMin: 0 + - _TessValue: 32 + - _Texture_IntersectionOn: 1 + - _Tiling: 0.5 + - _Translucency: 1 + - _TranslucencyCurvatureMask: 1 + - _TranslucencyExp: 4 + - _TranslucencyOn: 1 + - _TranslucencyReflectionMask: 1 + - _TranslucencyStrength: 0.36 + - _TranslucencyStrengthDirect: 0.05 + - _UnderwaterRefractionOffset: 0.2 + - _UnderwaterSurfaceSmoothness: 0.8 + - _VertexColorDepth: 0 + - _VertexColorFoam: 0 + - _VertexColorWaveFlattening: 0 + - _WaveCount: 2 + - _WaveDistance: 0.952 + - _WaveHeight: 0.5 + - _WaveNormalStr: 1 + - _WaveSpeed: 2 + - _WaveSteepness: 0.64 + - _WaveTint: 0 + - _WavesOn: 0 + - _WorkflowMode: 1 + - _WorldSpaceUV: 1 + - _ZClip: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0, g: 0.16451614, b: 0.34, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _DepthMapBounds: {r: -402.3, g: -459.43, b: 0.0012693577, a: 0} + - _Direction: {r: 1, g: 1, b: 0, a: 0} + - _DistanceNormalsFadeDist: {r: 0, g: 100, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FoamColor: {r: 1, g: 1, b: 1, a: 1} + - _FoamTiling: {r: 0.1, g: 0.1, b: 0, a: 0} + - _HorizonColor: {r: 0.68, g: 1, b: 0.99, a: 0} + - _IntersectionColor: {r: 1, g: 1, b: 1, a: 1} + - _NormalTiling: {r: 0.5, g: 0.5, b: 0, a: 0} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _ShallowColor: {r: 0, g: 1, b: 0.9803922, a: 0} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _WaterColor: {r: 0.21176466, g: 0.6745098, b: 1, a: 1} + - _WaterShallowColor: {r: 0, g: 0.9394503, b: 1, a: 1} + - _WaveDirection: {r: 1, g: 1, b: 1, a: 1} + - _WaveFadeDistance: {r: 55.88745, g: 500, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &6498140463000427223 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 2.mat.meta b/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 2.mat.meta new file mode 100644 index 000000000..98464e791 --- /dev/null +++ b/BlueWater/Assets/03.Materials/Tycoon/StylizedWater2_DynamicEffectsDemo 2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f7fdcfae4148604f85cba4c40b7c9d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/New Terrain 3.asset b/BlueWater/Assets/New Terrain 3.asset index c00a1ec27..7b578986c 100644 Binary files a/BlueWater/Assets/New Terrain 3.asset and b/BlueWater/Assets/New Terrain 3.asset differ diff --git a/BlueWater/Packages/manifest.json b/BlueWater/Packages/manifest.json index b0316927d..4aeba47f4 100644 --- a/BlueWater/Packages/manifest.json +++ b/BlueWater/Packages/manifest.json @@ -18,7 +18,6 @@ "com.unity.timeline": "1.8.6", "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.8.0", - "jp.hadashikick.vcontainer": "https://github.com/hadashiA/VContainer.git?path=VContainer/Assets/VContainer#1.14.0", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/BlueWater/Packages/packages-lock.json b/BlueWater/Packages/packages-lock.json index 0c9d5506e..ffb5a1fc0 100644 --- a/BlueWater/Packages/packages-lock.json +++ b/BlueWater/Packages/packages-lock.json @@ -404,13 +404,6 @@ }, "url": "https://packages.unity.com" }, - "jp.hadashikick.vcontainer": { - "version": "https://github.com/hadashiA/VContainer.git?path=VContainer/Assets/VContainer#1.14.0", - "depth": 0, - "source": "git", - "dependencies": {}, - "hash": "d37fb21ba4d17f3a80effdc8119d985d8d150ebe" - }, "com.unity.modules.accessibility": { "version": "1.0.0", "depth": 0,