Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg

2024-09-05 18:41:14 +09:00 · 2024-09-05 18:41:14 +09:00 · 0a635bce74
commit 0a635bce74
parent 7ce2094032 2dc619b8df
8 changed files with 739 additions and 3407 deletions
--- a/Assets/01.Scenes/99.Tycoon41.unity
+++ b/Assets/01.Scenes/99.Tycoon41.unity
@ -4869,15 +4869,18 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _renderTexture: {fileID: 0}
  _liquidRenderer: {fileID: 2105041734}
-  _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3}
+  _reachedCollider: {fileID: 1035979623}
  _spawnTransform: {fileID: 427482135}
  _spawnLocation: {fileID: 218784750}
-  _reachedCollider: {fileID: 1035979623}
-  _objectPoolCount: 10000
+  _pushDirection: {x: 0, y: 0, z: 0}
+  _pushPower: 0
+  _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3}
  _liquidColor: {r: 0, g: 0.7294118, b: 1, a: 1}
-  _pouringRate: 20
  _liquidsPerSecond: 100
-  _currentLiquidAmount: 0
+  _maxLiquidCount: 400
+  _colorLerpSpeed: 0.5
+  _colorIntensity: 2
+  _objectPoolCount: 10000
 --- !u!1 &523582524
 GameObject:
  m_ObjectHideFlags: 0
@ -5074,7 +5077,7 @@ Transform:
  m_GameObject: {fileID: 545850347}
  serializedVersion: 2
  m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
-  m_LocalPosition: {x: 12.92, y: 25.711502, z: -20.48178}
+  m_LocalPosition: {x: 11.74, y: 25.711504, z: -35.34178}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -8776,15 +8779,18 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _renderTexture: {fileID: 2105041734}
  _liquidRenderer: {fileID: 379763496}
-  _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3}
+  _reachedCollider: {fileID: 400400199}
  _spawnTransform: {fileID: 1511911897}
  _spawnLocation: {fileID: 218784750}
-  _reachedCollider: {fileID: 400400199}
-  _objectPoolCount: 10000
+  _pushDirection: {x: 0, y: 0, z: 0}
+  _pushPower: 0
+  _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3}
  _liquidColor: {r: 0, g: 0.7294118, b: 1, a: 1}
-  _pouringRate: 20
  _liquidsPerSecond: 100
-  _currentLiquidAmount: 0
+  _maxLiquidCount: 400
+  _colorLerpSpeed: 0.5
+  _colorIntensity: 2
+  _objectPoolCount: 10000
 --- !u!1 &1049919588
 GameObject:
  m_ObjectHideFlags: 0
@ -8912,6 +8918,9 @@ MonoBehaviour:
  <TycoonUpgradeUi>k__BackingField: {fileID: 1496452083}
  <TycoonManagementUi>k__BackingField: {fileID: 102499729}
  <TycoonStageUi>k__BackingField: {fileID: 1733600343}
+  <BrewingUi>k__BackingField: {fileID: 0}
+  <DrinkUi>k__BackingField: {fileID: 0}
+  _fadeImage: {fileID: 0}
 --- !u!114 &1049919594
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -17185,7 +17194,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 475.5, y: -114.99893}
+  m_AnchoredPosition: {x: 475.5, y: -114.99902}
  m_SizeDelta: {x: 125, y: 320}
  m_Pivot: {x: 0, y: 1}
 --- !u!114 &1815544844
@ -19981,7 +19990,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 12.92
+      value: 11.74
      objectReference: {fileID: 0}
    - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
      propertyPath: m_LocalPosition.y
@ -19989,7 +19998,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 10.16
+      value: -4.7
      objectReference: {fileID: 0}
    - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
      propertyPath: m_LocalRotation.w
--- a/Assets/03.Images/Props/BlueHead.png
+++ b/Assets/03.Images/Props/BlueHead.png
--- a/Assets/03.Images/Props/BlueHead.png.meta
+++ b/Assets/03.Images/Props/BlueHead.png.meta
@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: 9fd77125fee64f943ae87b17e69d0d9a
+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: 7
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 512
+  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: 4
+    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: 4
+    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: 4
+    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: 4
+    buildTarget: WindowsStoreApps
+    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: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/03.Images/Props/dark.png
+++ b/Assets/03.Images/Props/dark.png
--- a/Assets/03.Images/Props/dark.png.meta
+++ b/Assets/03.Images/Props/dark.png.meta
@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: b57f93005908a754bb842b7dbcaddedd
+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: 7
+  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: 4
+    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: 4
+    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: 4
+    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: 4
+    buildTarget: WindowsStoreApps
+    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: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab
+++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab
--- a/Assets/05.Prefabs/Props/Furniture/99EXXXX.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/99EXXXX.prefab
@ -0,0 +1,107 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &8683294020589671588
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.47511
+      objectReference: {fileID: 0}
+    - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.10264
+      objectReference: {fileID: 0}
+    - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.05
+      objectReference: {fileID: 0}
+    - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2152858845316769879, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: b57f93005908a754bb842b7dbcaddedd, type: 3}
+    - target: {fileID: 5899354841691025914, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: b57f93005908a754bb842b7dbcaddedd, type: 3}
+    - target: {fileID: 6075426784951483330, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
+      propertyPath: m_Name
+      value: 99EXXXX
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 987a207f03b91fc49aaa62221cf11900, type: 3}
--- a/Assets/05.Prefabs/Props/Furniture/99EXXXX.prefab.meta
+++ b/Assets/05.Prefabs/Props/Furniture/99EXXXX.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4b02ff46d73dbc14abe6eec2dd37ff3f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: