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

# Conflicts:
#	Assets/lua/app/ui/main_city/component/main_comp.lua.bytes

Assets/arts/effects/material/battle/sfx_piece_rongyan_b01/sfx_piece_rongyan_01.mat

@@ -24,7 +24,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _tex:
-        m_Texture: {fileID: 2800000, guid: a507bec21d0e67540bdae2fe5531adb2, type: 3}
+        m_Texture: {fileID: 2800000, guid: b440dcfd18fed594488d64075b51535e, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _tex_mask:

Assets/arts/effects/texture/other/fx_b6_ui013.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a507bec21d0e67540bdae2fe5531adb2
+guid: b440dcfd18fed594488d64075b51535e
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -41,7 +41,7 @@ TextureImporter:
   nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -75,18 +75,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    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
@@ -111,13 +99,25 @@ TextureImporter:
     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: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 
@@ -128,5 +128,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/textures/ui/battle.ab
   assetBundleVariant: 

Assets/arts/spines/characters/p0003/p0003.atlas.txt

@@ -2,52 +2,50 @@ p0003.png
 size:512,512
 filter:Linear,Linear
 eye_L
-bounds:147,338,12,23
-rotate:90
+bounds:134,278,12,23
 eye_R
-bounds:242,403,12,22
-eye_xuanyun
-bounds:2,53,22,22
-gutou
-bounds:29,253,70,53
+bounds:68,217,12,22
 rotate:90
+eye_xuanyun
+bounds:103,236,22,22
+gutou
+bounds:263,457,70,53
 hand_L_1
-bounds:472,434,33,27
+bounds:68,231,33,27
 hand_L_2
-bounds:2,103,29,29
+bounds:303,426,29,29
 offsets:0,1,29,30
 hand_L_3
-bounds:216,401,24,24
+bounds:373,486,24,24
 hand_R
-bounds:472,463,38,47
+bounds:263,408,38,47
 hand_R_1
-bounds:2,77,25,24
+bounds:29,135,25,24
 head_1
-bounds:68,400,112,110
+bounds:149,400,112,110
 head_2
-bounds:291,431,91,79
+bounds:68,303,91,79
+rotate:90
 hit_yan1
-bounds:2,33,16,18
+bounds:303,408,16,18
+rotate:90
 kulou
-bounds:68,336,77,62
+bounds:2,2,77,62
 offsets:0,1,77,63
 leg_L
-bounds:147,352,36,46
+bounds:29,161,36,46
 leg_R
-bounds:2,134,36,46
+bounds:335,464,36,46
 spine_1
-bounds:384,426,84,86
-rotate:90
+bounds:149,312,84,86
 spine_2
-bounds:182,427,107,83
+bounds:2,396,145,114
 spine_3
-bounds:29,187,64,41
-rotate:90
+bounds:68,260,64,41
 weapon_1
-bounds:2,325,64,185
+bounds:2,209,64,185
 yinying
-bounds:2,182,141,25
+bounds:2,66,141,25
 rotate:90
 zui
-bounds:182,401,24,32
-rotate:90
+bounds:235,366,24,32

Assets/arts/spines/characters/p0007/p0007.atlas.txt

@@ -2,12 +2,10 @@ p0007.png
 size:512,512
 filter:Linear,Linear
 eye_L
-bounds:83,100,9,22
-offsets:1,1,11,24
-eye_R
-bounds:213,410,9,22
-offsets:1,1,11,24
+bounds:213,409,10,21
 rotate:90
+eye_R
+bounds:180,318,10,21
 eye_xuanyun
 bounds:356,488,22,22
 guang

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2.atlas.txt

@@ -2,8 +2,7 @@ ui_battle_result_2.png
 size:1024,1024
 filter:Linear,Linear
 dunpaige_1
-bounds:843,840,67,64
-offsets:0,0,68,64
+bounds:655,351,73,27
 dunpaige_10
 bounds:162,9,83,39
 offsets:1,1,85,41
@@ -28,8 +27,9 @@ dunpaige_16
 bounds:247,1,44,40
 offsets:1,1,46,42
 dunpaige_17
-bounds:374,81,55,45
+bounds:321,44,55,45
 offsets:1,1,57,47
+rotate:90
 dunpaige_18
 bounds:655,757,123,134
 dunpaige_19
@@ -45,98 +45,98 @@ dunpaige_21
 bounds:780,812,61,79
 offsets:1,1,63,81
 dunpaige_3
-bounds:437,215,35,36
+bounds:757,618,35,36
 offsets:1,1,37,38
 dunpaige_4
-bounds:948,764,44,45
+bounds:368,50,44,45
 offsets:1,1,46,47
 dunpaige_5
 bounds:374,423,79,191
 offsets:1,1,82,193
 dunpaige_6
-bounds:839,695,30,33
+bounds:848,667,30,33
 offsets:1,2,32,36
 dunpaige_7
-bounds:428,171,37,42
+bounds:373,6,37,42
 offsets:1,1,39,44
 dunpaige_8
-bounds:765,641,51,71
+bounds:896,833,51,71
 offsets:1,1,53,73
-rotate:90
 dunpaige_9
-bounds:843,763,51,75
+bounds:843,829,51,75
 offsets:1,1,53,77
 fashi_1
-bounds:994,807,29,29
+bounds:794,625,29,29
 offsets:1,1,31,31
 fashi_10
-bounds:912,841,24,63
+bounds:999,832,24,63
 offsets:1,1,26,65
 fashi_11
 bounds:655,661,108,94
 offsets:1,1,110,96
 fashi_12
-bounds:765,694,72,54
+bounds:843,755,72,54
 offsets:1,1,74,56
+rotate:90
 fashi_13
-bounds:994,838,29,36
+bounds:745,462,29,36
 offsets:1,1,31,38
 fashi_14
 bounds:655,462,101,88
 rotate:90
 fashi_15
-bounds:431,95,31,36
+bounds:739,424,31,36
 offsets:1,1,33,38
 fashi_16
-bounds:994,876,50,29
+bounds:374,97,50,29
 offsets:1,1,52,31
-rotate:90
 fashi_17
-bounds:843,730,31,36
+bounds:739,386,31,36
 offsets:1,1,33,38
-rotate:90
 fashi_18
-bounds:437,57,27,36
+bounds:810,656,27,36
 offsets:1,1,29,38
+rotate:90
 fashi_19
-bounds:428,133,34,36
+bounds:757,580,34,36
 offsets:1,1,36,38
 fashi_2
-bounds:896,775,25,63
+bounds:821,685,25,63
 offsets:1,1,27,65
 fashi_20
-bounds:334,3,38,37
+bounds:334,4,38,37
 offsets:1,1,40,39
 rotate:90
 fashi_21
 bounds:171,89,148,116
 fashi_22
-bounds:948,811,51,44
+bounds:848,702,51,44
 rotate:90
 fashi_3
-bounds:263,43,62,44
+bounds:953,769,62,44
 offsets:1,1,64,46
+rotate:90
 fashi_4
 bounds:455,514,100,64
 offsets:1,1,102,66
 rotate:90
 fashi_5
-bounds:655,349,70,29
+bounds:953,897,70,29
 offsets:1,1,72,31
 fashi_6
 bounds:803,906,132,117
 fashi_7
-bounds:881,742,19,12
+bounds:937,907,19,12
 offsets:1,1,21,14
 rotate:90
 fashi_8
-bounds:437,43,19,12
+bounds:757,566,19,12
 offsets:1,1,21,14
 fashi_9
-bounds:994,776,29,29
+bounds:437,217,29,29
 offsets:1,1,31,31
 fashi_sui1
-bounds:373,1,28,43
+bounds:765,656,28,43
 rotate:90
 fashi_sui2
 bounds:293,1,40,39
@@ -146,11 +146,11 @@ bounds:1,207,371,407
 guang2
 bounds:1,616,537,407
 heimei_1
-bounds:373,31,62,48
-heimei_10
-bounds:327,43,56,44
-offsets:0,1,57,45
+bounds:949,833,62,48
 rotate:90
+heimei_10
+bounds:263,43,56,44
+offsets:0,1,57,45
 heimei_11
 bounds:171,50,90,37
 heimei_12
@@ -161,16 +161,16 @@ heimei_13
 bounds:655,380,82,80
 offsets:1,0,83,80
 heimei_14
-bounds:938,864,54,62
+bounds:765,686,54,62
 offsets:1,1,56,64
 heimei_15
-bounds:757,574,52,65
+bounds:899,766,52,65
 offsets:1,1,54,67
 heimei_2
-bounds:437,253,23,63
+bounds:999,767,23,63
 offsets:1,1,25,65
 heimei_3
-bounds:923,776,23,63
+bounds:745,500,23,63
 offsets:1,1,25,65
 heimei_4
 bounds:374,221,95,61
@@ -179,9 +179,8 @@ rotate:90
 heimei_5
 bounds:655,893,146,130
 heimei_6
-bounds:418,9,20,15
+bounds:825,639,20,15
 offsets:1,2,23,18
-rotate:90
 heimei_7
 bounds:521,588,26,15
 offsets:2,1,29,18
@@ -191,7 +190,7 @@ bounds:937,928,95,84
 offsets:1,1,97,86
 rotate:90
 heimei_9
-bounds:811,571,26,68
+bounds:437,248,26,68
 tf
 bounds:540,357,666,113
 rotate:90

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2.atlas.txt.meta

@@ -3,5 +3,5 @@ guid: 4629a8e1e37aff54fb52f32d7a1f1b20
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2.png.meta

@@ -116,5 +116,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2.skel.bytes.meta

@@ -3,5 +3,5 @@ guid: f2a8ed3dd340f6845a6e8e9d5f7b6c04
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2_atlas.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2_material.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2_skeletondata.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/first/ui/common_bg_2.png.meta

@@ -50,7 +50,7 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
   textureType: 0
   textureShape: 1
@@ -75,6 +75,42 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    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: iPhone
+    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: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/first/ui/common_board_2.png.meta

@@ -1,132 +0,0 @@
-fileFormatVersion: 2
-guid: fae9e7155a31e9d47a2492dcb472b22f
-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: 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: 32, y: 32, z: 32, w: 32}
-  spriteGenerateFallbackPhysicsShape: 0
-  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: Standalone
-    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: iPhone
-    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: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    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: first/first.ab
-  assetBundleVariant: