Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev

Assets/arts/atlas/ui/battle.asset

@@ -74,6 +74,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 1e5d2e40c3af5f243b1f8938cb92aa94, type: 3}
   - {fileID: 21300000, guid: 15034d8ea90095b4bab593f8633691a7, type: 3}
   - {fileID: 21300000, guid: 1d49491301b6b1b4789297bf68c168a1, type: 3}
+  - {fileID: 21300000, guid: d0aee8d1fbdc1c24ba90e2855e76d866, type: 3}
   - {fileID: 21300000, guid: 244d7eed152c55143a86488b35612615, type: 3}
   - {fileID: 21300000, guid: d721a218fed03994f9f4fcb6047c1e38, type: 3}
   - {fileID: 21300000, guid: adb1bb1275f590d458ba285b7d35c55c, type: 3}
@@ -100,6 +101,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 02ebf2f9ddc012242b20491c8c0425b7, type: 3}
   - {fileID: 21300000, guid: fa8f5962b2032c84a9836b6c7af7e0ee, type: 3}
   - {fileID: 21300000, guid: 4ee394b230d6d9c449c2a528c8a57c62, type: 3}
+  - {fileID: 21300000, guid: b1797d14a61badd4cbe95f19e3e5def1, type: 3}
   - {fileID: 21300000, guid: afcf9e53b76eef44dba33da9caa87fc3, type: 3}
   - {fileID: 21300000, guid: 260a5446c0f52084da7a05ddc0cecae8, type: 3}
   - {fileID: 21300000, guid: bb012b114a991f44c8583c6cc270981d, type: 3}
@@ -132,4 +134,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 4883eddf5771c424c964bc2e32f2cb09, type: 3}
   - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3}
   - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3}
-  spriteNameList: 73ef7596df354ed3e0354ed3919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a667213652f396c3f37aa723a01d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b8bf9b0e69c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e690d7ccc490e7ccc49132253d3c33f686cc43f686cc53f686ca4afbba06a2996ce6b2996ce6c2996ce6d2996cef90ee7ab029d3752958cd3a2415abdf4495bbdf4c767bdf4948dbdf4804ac0bb814ac0bb824ac0bbe0b6b5f6a45a15e809d618e85a4c581b1ddd9f90c7a6c0f42f42c0b73042c0b73142c0b7ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b35232cd4fd4681304c2f487156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b8592383b74c9784b74c978c8d63ad107222fd627da494f525e9106e14a26803e475062623b5b6
+  spriteNameList: 73ef7596df354ed3e0354ed3919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a667213652f396c3f37aa723a01d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b8bf9b0e69c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e690d7ccc490e7ccc49132253d3c33f686cc43f686cc53f686ca4afbba06a2996ce6b2996ce6c2996ce6d2996cef90ee7ab0196263e029d3752958cd3a2415abdf4495bbdf4c767bdf4948dbdf4804ac0bb814ac0bb824ac0bbe0b6b5f6a45a15e809d618e85a4c581b1ddd9f90c7a6c0f42f42c0b73042c0b73142c0b7ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b35232cd4fd4681304c2f41bed664187156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b8592383b74c9784b74c978c8d63ad107222fd627da494f525e9106e14a26803e475062623b5b6

Assets/arts/atlas/ui/battle.spriteatlas

@@ -74,6 +74,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3}
   - {fileID: 21300000, guid: c7fe3771679f6c54b985272020d00348, type: 3}
   - {fileID: 21300000, guid: 838c1c8120a67b34ab27b4317842f255, type: 3}
+  - {fileID: 21300000, guid: d0aee8d1fbdc1c24ba90e2855e76d866, type: 3}
   - {fileID: 21300000, guid: 09dc5de1bb43f8e4fb620fdf5c1fdd9e, type: 3}
   - {fileID: 21300000, guid: 63805602ca8fdd74b9a1696bbe71d217, type: 3}
   - {fileID: 21300000, guid: adb1bb1275f590d458ba285b7d35c55c, type: 3}
@@ -92,6 +93,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: afcf9e53b76eef44dba33da9caa87fc3, type: 3}
   - {fileID: 21300000, guid: cf73870457f688f4ca0a68c8941d6ee3, type: 3}
   - {fileID: 21300000, guid: 2bd64d14416f47c4b8320532d03d7b90, type: 3}
+  - {fileID: 21300000, guid: b1797d14a61badd4cbe95f19e3e5def1, type: 3}
   - {fileID: 21300000, guid: b2988864691ea9848b777a8d2fe5d32b, type: 3}
   - {fileID: 21300000, guid: ea9f61c48549694489d855a4a5f0bf77, type: 3}
   - {fileID: 21300000, guid: 1fa9f5e45de18674f978e6b5faf85d3e, type: 3}
@@ -194,6 +196,7 @@ SpriteAtlas:
   - yellow_1
   - battle_hinder_21
   - battle_hinder_24
+  - battle_obstacle_firesnake
   - battle_hinder_2
   - battle_skill_line_8
   - battle_obstacle_lamp
@@ -212,6 +215,7 @@ SpriteAtlas:
   - battle_pig
   - battle_obstacle_leaf
   - battle_obstacle_chest_1
+  - battle_obstacle_waternake
   - battle_obstacle_stone_1
   - battle_hinder_4
   - battle_obstacle_stalactite_3

Assets/arts/textures/ui/battle/battle_obstacle_firesnake.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: d0aee8d1fbdc1c24ba90e2855e76d866
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 1
+  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
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/textures/ui/battle/battle_obstacle_waternake.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: b1797d14a61badd4cbe95f19e3e5def1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 1
+  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
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: