씬 타이쿤+오션 수정

BlueWater/Assets/01.Scenes/Ocean5_art.unity

@@ -6759,6 +6759,99 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 155713052}
   m_CullTransparentMesh: 1
+--- !u!1 &161802008
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 161802011}
+  - component: {fileID: 161802010}
+  - component: {fileID: 161802009}
+  m_Layer: 0
+  m_Name: Terrain07
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 2147483647
+  m_IsActive: 1
+--- !u!154 &161802009
+TerrainCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 161802008}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_TerrainData: {fileID: 15600000, guid: 0e80fac79b056fc4a82c719df27b3eb8, type: 2}
+  m_EnableTreeColliders: 1
+--- !u!218 &161802010
+Terrain:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 161802008}
+  m_Enabled: 1
+  serializedVersion: 6
+  m_TerrainData: {fileID: 15600000, guid: 0e80fac79b056fc4a82c719df27b3eb8, type: 2}
+  m_TreeDistance: 5000
+  m_TreeBillboardDistance: 50
+  m_TreeCrossFadeLength: 5
+  m_TreeMaximumFullLODCount: 50
+  m_DetailObjectDistance: 80
+  m_DetailObjectDensity: 1
+  m_HeightmapPixelError: 5
+  m_SplatMapDistance: 1000
+  m_HeightmapMinimumLODSimplification: 0
+  m_HeightmapMaximumLOD: 0
+  m_ShadowCastingMode: 2
+  m_DrawHeightmap: 1
+  m_DrawInstanced: 0
+  m_DrawTreesAndFoliage: 1
+  m_StaticShadowCaster: 0
+  m_IgnoreQualitySettings: 0
+  m_ReflectionProbeUsage: 1
+  m_MaterialTemplate: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
+  m_BakeLightProbesForTrees: 1
+  m_PreserveTreePrototypeLayers: 0
+  m_DeringLightProbesForTrees: 1
+  m_ReceiveGI: 1
+  m_ScaleInLightmap: 0.0256
+  m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
+  m_GroupingID: 0
+  m_RenderingLayerMask: 1
+  m_AllowAutoConnect: 1
+  m_EnableHeightmapRayTracing: 1
+  m_EnableTreesAndDetailsRayTracing: 0
+  m_TreeMotionVectorModeOverride: 3
+--- !u!4 &161802011
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 161802008}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -500.5, y: -16.32125, z: -497.1}
+  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 &164632652
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7089,7 +7182,7 @@ Transform:
   m_GameObject: {fileID: 168896972}
   serializedVersion: 2
   m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
-  m_LocalPosition: {x: 248.1, y: 27.240002, z: 163.99873}
+  m_LocalPosition: {x: -327.5, y: 27.24001, z: -305.30127}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -22113,14 +22206,6 @@ MonoBehaviour:
   <MaxHp>k__BackingField: 100
   <CurrentHp>k__BackingField: 0
   <Strength>k__BackingField: 500
-  cannon: {fileID: 1612917925}
-  cannonCooldown: 1
-  chargingSpeed: 1
-  isFireMode: 0
-  chargingCannon: 0
-  isReloading: 0
-  chargingGauge: 0
-  previousGauge: 0
   boostPower: 2
   boostMaxTime: 3
   boostRecoveryTime: 1.5
@@ -43202,7 +43287,7 @@ Transform:
   m_GameObject: {fileID: 776161953}
   serializedVersion: 2
   m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
-  m_LocalPosition: {x: 248.1, y: 27.240002, z: 163.99873}
+  m_LocalPosition: {x: -327.5, y: 27.24001, z: -305.30127}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -44917,7 +45002,7 @@ Transform:
   m_GameObject: {fileID: 814251789}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 4.76, y: 1.62, z: 0.61}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -53068,14 +53153,6 @@ MonoBehaviour:
   <MaxHp>k__BackingField: 100
   <CurrentHp>k__BackingField: 0
   <Strength>k__BackingField: 500
-  cannon: {fileID: 4529632010256582}
-  cannonCooldown: 1
-  chargingSpeed: 1
-  isFireMode: 0
-  chargingCannon: 0
-  isReloading: 0
-  chargingGauge: 0
-  previousGauge: 0
   boostPower: 2
   boostMaxTime: 3
   boostRecoveryTime: 1.5
@@ -53325,7 +53402,7 @@ Transform:
   m_GameObject: {fileID: 975912075}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 248.1, y: -0.76, z: 207.3}
+  m_LocalPosition: {x: -327.5, y: -0.76, z: -262}
   m_LocalScale: {x: 0.77903, y: 0.77903, z: 0.77903}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -89371,18 +89448,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1611428482}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1612917925 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 7810505435716704953, guid: 8c9e74631c8994b8cb728cde8efae49a,
-    type: 3}
-  m_PrefabInstance: {fileID: 1939761122}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3e8c36fe9172849798f9c4fd87b77ec7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1616056077
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -94187,7 +94252,7 @@ Transform:
   m_GameObject: {fileID: 1727468377}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -292.4, y: 6.9, z: 376.7}
+  m_LocalPosition: {x: -292.4, y: 5.4, z: 376.7}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -115389,14 +115454,49 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   autoInit: 1
-  projectileObj: {fileID: 128572, guid: 8d387b0f65dfa4cdc965c4b56216e120, type: 3}
+  playerInput: {fileID: 0}
-  firePos: {fileID: 1286537730}
+  projectileObject: {fileID: 0}
-  fireAngle: 0.2
+  visualLook: {fileID: 0}
-  speed: 75
+  launchTransform: {fileID: 0}
-  height: 30
+  predictedLine: {fileID: 0}
+  hitMarker: {fileID: 0}
+  directionIndicator: {fileID: 0}
+  launchProcessBar:
+    <Obj>k__BackingField: {fileID: 0}
+    <Fill>k__BackingField: {fileID: 0}
+    <PreviousGaugeLine>k__BackingField: {fileID: 0}
+    <ReloadSlider>k__BackingField: {fileID: 0}
+    <ShakeDuration>k__BackingField: 0
+    <ShakePower>k__BackingField: 0
+  instantiateObjects: {fileID: 0}
+  gaugeChargingTime: 1
+  launchCooldown: 1
+  distanceCoefficient: 40
+  launchType: 0
+  launchSpeed: 20
+  launchAngle: 10
+  isUsingPredictLine: 0
+  lineMaxPoint: 100
+  lineInterval: 0.025
   randomCatch: {x: 1, y: 4}
+  mouseRayDistance: 500
+  rayDistance: 10
+  hitLayer:
+    serializedVersion: 2
+    m_Bits: 0
+  waterLayer:
+    serializedVersion: 2
+    m_Bits: 0
+  boidsLayer:
+    serializedVersion: 2
+    m_Bits: 0
   cameraShakePower: 2
   cameraShakeDuration: 0.3
+  isLaunchMode: 0
+  isCharging: 0
+  isReloading: 0
+  chargingGauge: 0
+  previousGauge: 0
 --- !u!23 &23474627402593889
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -116756,3 +116856,4 @@ SceneRoots:
   - {fileID: 1139350276}
   - {fileID: 641861587}
   - {fileID: 32156858}
+  - {fileID: 161802011}

BlueWater/Assets/03.Images/Tycoon/Materials/kitchen_table_top.mat

@@ -9,8 +9,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: kitchen_table_top
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
-  m_Parent: {fileID: 2100000, guid: c183d22c3eef9ea458a5e04a51213447, type: 2}
+  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 16
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _ALPHATEST_ON
   m_InvalidKeywords: []
@@ -30,15 +30,96 @@ Material:
         m_Texture: {fileID: 2800000, guid: f65ec1db9ee844f909876c0f16a4f824, 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: f65ec1db9ee844f909876c0f16a4f824, 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
-    m_Colors: []
+    - _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 &8838058183107425683

BlueWater/Assets/03.Images/Tycoon/Materials/mini_Signboard.mat

@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!114 &-3687640903105879750
-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
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -20,18 +7,19 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: sot_main
+  m_Name: mini_Signboard
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _ALPHATEST_ON
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2450
   stringTagMap:
-    RenderType: Opaque
+    RenderType: TransparentCutout
   disabledShaderPasses:
   - MOTIONVECTORS
   m_LockedProperties: 
@@ -39,7 +27,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: 1a60f4c42f5f0a440aa0d2917b676ff4, type: 3}
+        m_Texture: {fileID: 2800000, guid: e9f7d9aac6c8ecb40bad8e1b09fabaa3, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -63,7 +51,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 1a60f4c42f5f0a440aa0d2917b676ff4, type: 3}
+        m_Texture: {fileID: 2800000, guid: e9f7d9aac6c8ecb40bad8e1b09fabaa3, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -96,8 +84,9 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _AlphaClip: 0
+    - _AddPrecomputedVelocity: 0
-    - _AlphaToMask: 0
+    - _AlphaClip: 1
+    - _AlphaToMask: 1
     - _Blend: 0
     - _BlendModePreserveSpecular: 1
     - _BumpScale: 1
@@ -133,3 +122,16 @@ Material:
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
+--- !u!114 &6985180903445713467
+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

BlueWater/Assets/03.Images/Tycoon/Materials/mini_Signboard.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c183d22c3eef9ea458a5e04a51213447
+guid: 3e700d3325b19ff4bbb8d748ae9c5ddc
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

BlueWater/Assets/03.Images/Tycoon/Materials/sot.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: cauldron
+  m_Name: sot
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0

BlueWater/Assets/New Terrain 7.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0e80fac79b056fc4a82c719df27b3eb8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 15600000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: