Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg

# Conflicts:
#	Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab
#	Assets/05.Prefabs/Maps/MapControllers/TitanSlimeMapController.prefab

.vsconfig

@@ -0,0 +1,6 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.VisualStudio.Workload.ManagedGame"
+  ]
+}

Assets/01.Scenes/99.Combat2.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8d7c5fa4f91e8794c815eb04eed45a1a
+guid: 46c51422ce076d34f9ffbafa51b6f336
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/03.Images/Props/Environment/IceTree01.png.meta

@@ -0,0 +1,141 @@
+fileFormatVersion: 2
+guid: 2f1a8eba5e11a784a93610279a4dbbf6
+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: 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: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/05.Prefabs/Maps/MapControllers/RhinocerosMapController.prefab

@@ -4038,7 +4038,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1759992658637499492, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 4.43
+      value: 28.71
       objectReference: {fileID: 0}
     - target: {fileID: 1759992658637499492, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3}
       propertyPath: m_LocalPosition.y

Assets/05.Prefabs/Props/Environment/Grass01.prefab

@@ -0,0 +1,75 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &1434937317393095998
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1187120820646086157, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 483bb2356ce34cd488c6351843081f8c, type: 3}
+    - target: {fileID: 1457417927784975283, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.7594932
+      objectReference: {fileID: 0}
+    - target: {fileID: 1457417927784975283, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.7594932
+      objectReference: {fileID: 0}
+    - target: {fileID: 1457417927784975283, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.7594932
+      objectReference: {fileID: 0}
+    - target: {fileID: 6371379574789148158, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_Name
+      value: Grass01
+      objectReference: {fileID: 0}
+    - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7894211412179069357, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}

Assets/05.Prefabs/Props/Environment/Grass01.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2061eac14338dc44bb46d8dec959f333
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/05.Prefabs/Props/Environment/IceTree01.prefab

@@ -0,0 +1,63 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &4049023742557649859
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3281663413899102263, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_Name
+      value: IceTree01
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320848118163047364, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 2f1a8eba5e11a784a93610279a4dbbf6, type: 3}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}

Assets/05.Prefabs/Props/Environment/IceTree01.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3770065ecdd9c6348989031b36c5324d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: