Merge branch 'lmg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg

Assets/01.Scenes/99.LMG/ShipSideRestaurant.renderTexture

@@ -12,8 +12,8 @@ RenderTexture:
     Hash: 00000000000000000000000000000000
   m_IsAlphaChannelOptional: 0
   serializedVersion: 6
-  m_Width: 1920
+  m_Width: 10000
-  m_Height: 1080
+  m_Height: 2000
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthStencilFormat: 94

Assets/01.Scenes/Old/03994.Sail.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a112c759d6baf534395f264997825a2a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/09.Shaders/Curved_Shader/BendingSprite.shadergraph

@@ -658,7 +658,7 @@
     "hlslDeclarationOverride": 0,
     "m_Hidden": false,
     "m_Value": {
-        "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"dd92cbf097a58ac47aacb73549069f60\",\"type\":3}}",
+        "m_SerializedTexture": "",
         "m_Guid": ""
     },
     "isMainTexture": false,

Assets/12.Models/Sail/WallColumn.png.meta

@@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: 61a8a3df32714eb4c8369252172accce
+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: 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: iOS
+    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: 

Assets/Amazing Assets/Curved World/Example Scenes/Files/Universal Settings/Post Processing Profile.asset

@@ -173,7 +173,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3}
   m_Name: DepthOfField
   m_EditorClassIdentifier: 
-  active: 1
+  active: 0
   mode:
     m_OverrideState: 1
     m_Value: 2

Assets/Toon Water URP/Curved Toon Water Material 1.mat

@@ -39,12 +39,13 @@ Material:
     - Vector1_A524D234: 0
     - Vector1_B9CC1720: 0
     - Vector1_E71BB35E: 0.99
-    - _Wave_Height: 0.3
+    - _Wave_Height: 0.1
     - _Wave_Speed: 0.05
     m_Colors:
     - Color_1139F668: {r: 0.22241013, g: 0.6862745, b: 0.7058824, a: 0.36078432}
     - Color_198818EE: {r: 0, g: 0.25882354, b: 1, a: 0.83137256}
     - Color_626750DD: {r: 2, g: 2, b: 2, a: 1}
+    - Vector2_1E1B6943: {r: 1, g: 1, b: 0, a: 0}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
 --- !u!114 &6768849871664622749

Assets/Toon Water URP/Curved Toon Water Material 2.mat

@@ -133,8 +133,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - Color_1139F668: {r: 0.14101492, g: 0.2832799, b: 0.28930807, a: 0.36078432}
+    - Color_1139F668: {r: 0.483624, g: 0.72257394, b: 0.735849, a: 0.36078432}
-    - Color_198818EE: {r: 0, g: 0.3838906, b: 0.93710685, a: 0.83137256}
+    - Color_198818EE: {r: 0.016751582, g: 0.32192707, b: 0.7610062, a: 0.21568628}
     - Color_626750DD: {r: 1.6455986, g: 2.337602, b: 2.3678749, a: 1}
     - Color_77A2EDE9: {r: 31.626795, g: 31.626795, b: 31.626795, a: 0.21960784}
     - Vector2_1E1B6943: {r: 1, g: 5, b: 0, a: 0}

Assets/Toon Water URP/Curved Toon Water Shader.shadergraph

@@ -3252,8 +3252,8 @@
     "m_ObjectId": "06e054090df1402ea51e9bded04cbb6d",
     "m_Title": "Fresnel",
     "m_Position": {
-        "x": -42.666748046875,
+        "x": -42.0,
-        "y": -978.6666870117188
+        "y": -978.9998779296875
     }
 }
 
@@ -4508,8 +4508,8 @@
     "m_ObjectId": "1bbff5234f2c4b92832f844222e0362f",
     "m_Title": "Calculate UVs",
     "m_Position": {
-        "x": -3502.666748046875,
+        "x": -3501.99951171875,
-        "y": 262.66656494140627
+        "y": 262.0
     }
 }
 
@@ -11542,8 +11542,8 @@
     "m_ObjectId": "87e14a641c1d4bc6b7f82422c382e1f0",
     "m_Title": "Planar Reflection",
     "m_Position": {
-        "x": -1388.6666259765625,
+        "x": -1387.9998779296875,
-        "y": -1990.6666259765625
+        "y": -1990.999755859375
     }
 }
 
@@ -12014,8 +12014,8 @@
     "m_ObjectId": "8f5b78c2c6884f4a9ce7b9c4bcc3d37b",
     "m_Title": "Other Lights Specular",
     "m_Position": {
-        "x": -764.6666259765625,
+        "x": -763.9998779296875,
-        "y": 2252.6669921875
+        "y": 2252.0
     }
 }
 
@@ -13066,8 +13066,8 @@
     "m_ObjectId": "a61c097103fa45cebe8abbdb292982c7",
     "m_Title": "Calculate Foam",
     "m_Position": {
-        "x": -2895.333251953125,
+        "x": -2895.0,
-        "y": 999.333251953125
+        "y": 999.0
     }
 }
 
@@ -15566,8 +15566,8 @@
     "m_ObjectId": "ca0af7d94af04602a2328fb3cda13141",
     "m_Title": "Calculate Foam UVs",
     "m_Position": {
-        "x": -3524.666748046875,
+        "x": -3523.999267578125,
-        "y": 1661.33349609375
+        "y": 1661.0
     }
 }
 
@@ -16786,8 +16786,8 @@
     "m_ObjectId": "e1d328964827494098160b25dd0e053c",
     "m_Title": "Generate Normals",
     "m_Position": {
-        "x": -2487.333251953125,
+        "x": -2486.999755859375,
-        "y": 348.66656494140627
+        "y": 347.99993896484377
     }
 }
 
@@ -17521,8 +17521,8 @@
     "m_ObjectId": "eb30c1030929435f80c1f702bdf64863",
     "m_Title": "Refraction",
     "m_Position": {
-        "x": -1357.3333740234375,
+        "x": -1356.9998779296875,
-        "y": 152.66668701171876
+        "y": 152.0
     }
 }
 
@@ -17959,8 +17959,8 @@
     "m_ObjectId": "f2277552366946468919c6cd85bba5a7",
     "m_Title": "Calculate Water Color Based On Depth",
     "m_Position": {
-        "x": -1758.6666259765625,
+        "x": -1757.9998779296875,
-        "y": -511.3333740234375
+        "y": -511.99993896484377
     }
 }
 
@@ -18287,8 +18287,8 @@
     "m_ObjectId": "f73efc0d442d4fea93b236459693b1b6",
     "m_Title": "Directional Light Specular",
     "m_Position": {
-        "x": -1392.6666259765625,
+        "x": -1391.9998779296875,
-        "y": 1208.66650390625
+        "y": 1208.0
     }
 }