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

Assets/arts/effects/models/ring_tom_002.FBX.meta

@@ -1,74 +1,147 @@
 fileFormatVersion: 2
 guid: 705104b11c10c6c4aaff768df4128f93
 ModelImporter:
-  serializedVersion: 16
-  fileIDToRecycleName:
-    100000: //RootNode
-    100002: ring_tom_002
-    100004: ring_tom_002_1
-    400000: //RootNode
-    400002: ring_tom_002
-    400004: ring_tom_002_1
-    2300000: //RootNode
-    2300002: ring_tom_002
-    2300004: ring_tom_002_1
-    3300000: //RootNode
-    3300002: ring_tom_002
-    3300004: ring_tom_002_1
-    4300000: ring_tom_002
-    4300002: ring_tom_002_1
-    9500000: //RootNode
+  serializedVersion: 20200
+  internalIDToNameTable:
+  - first:
+      1: 100000
+    second: //RootNode
+  - first:
+      1: 100002
+    second: ring_tom_002
+  - first:
+      1: 100004
+    second: ring_tom_002_1
+  - first:
+      4: 400000
+    second: //RootNode
+  - first:
+      4: 400002
+    second: ring_tom_002
+  - first:
+      4: 400004
+    second: ring_tom_002_1
+  - first:
+      23: 2300000
+    second: //RootNode
+  - first:
+      23: 2300002
+    second: ring_tom_002
+  - first:
+      23: 2300004
+    second: ring_tom_002_1
+  - first:
+      33: 3300000
+    second: //RootNode
+  - first:
+      33: 3300002
+    second: ring_tom_002
+  - first:
+      33: 3300004
+    second: ring_tom_002_1
+  - first:
+      43: 4300000
+    second: ring_tom_002
+  - first:
+      43: 4300002
+    second: ring_tom_002_1
+  - first:
+      95: 9500000
+    second: //RootNode
+  externalObjects: {}
   materials:
-    importMaterials: 1
+    materialImportMode: 0
     materialName: 0
     materialSearch: 1
+    materialLocation: 0
   animations:
     legacyGenerateAnimations: 4
     bakeSimulation: 0
+    resampleCurves: 1
     optimizeGameObjects: 0
     motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
     animationCompression: 1
-    animationRotationError: .5
-    animationPositionError: .5
-    animationScaleError: .5
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
     animationWrapMode: 0
     extraExposedTransformPaths: []
+    extraUserProperties: []
     clipAnimations: []
     isReadable: 1
   meshes:
     lODScreenPercentages: []
-    globalScale: .00999999978
+    globalScale: 0.01
     meshCompression: 0
     addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 0
     importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
+    fileIdsGeneration: 1
     swapUVChannels: 0
     generateSecondaryUV: 0
     useFileUnits: 1
-    optimizeMeshForGPU: 1
+    keepQuads: 0
     weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 1
     secondaryUVAngleDistortion: 8
     secondaryUVAreaDistortion: 15.000001
     secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 0
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
     secondaryUVPackMargin: 4
+    useFileScale: 0
   tangentSpace:
     normalSmoothAngle: 60
-    splitTangentsAcrossUV: 1
     normalImportMode: 0
-    tangentImportMode: 1
-  importAnimation: 1
-  copyAvatar: 0
+    tangentImportMode: 4
+    normalCalculationMode: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 0
   humanDescription:
+    serializedVersion: 3
     human: []
     skeleton: []
-    armTwist: .5
-    foreArmTwist: .5
-    upperLegTwist: .5
-    legTwist: .5
-    armStretch: .0500000007
-    legStretch: .0500000007
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
     feetSpacing: 0
+    globalScale: 0.01
     rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 0
   lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
   animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 1
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 0
   additionalBone: 0
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -91,24 +91,24 @@ TextureImporter:
     buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
+    textureFormat: 50
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
+    textureFormat: 47
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:

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

@@ -1,9 +1,9 @@
 fileFormatVersion: 2
 guid: 4c5d4ca2d97ec3743b80fd8254ce5796
 TextureImporter:
-  fileIDToRecycleName: {}
+  internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 9
+  serializedVersion: 11
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -23,6 +23,7 @@ TextureImporter:
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,12 +32,12 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: -1
-    wrapV: -1
-    wrapW: -1
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
   nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
@@ -54,11 +55,15 @@ TextureImporter:
   textureType: 0
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
   platformSettings:
-  - serializedVersion: 2
+  - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -69,7 +74,8 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-  - serializedVersion: 2
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -80,17 +86,31 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-  - serializedVersion: 2
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 3
-    textureCompression: 1
+    textureFormat: 47
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 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
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -98,10 +118,12 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 
+    internalID: 0
     vertices: []
     indices: 
     edges: []
     weights: []
+    secondaryTextures: []
   spritePackingTag: 
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0

Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt

@@ -1,4 +1,4 @@
-common_dec_2.png
+ui_common_dec_2.png
 size:256,256
 filter:Linear,Linear
 1

Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ac53dcec7ccde62429bdb02cb9cd966e
+guid: 49bf18802f6c8ba43b054b77095aa57d
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 10a12a062925f724fb56eea31c7557f9
+guid: 3da4af725c6267044a1e80fb6bf4cff8
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 149c435b7dfa73f4b87fab5d1c136342
+guid: 77a9433d7c777af49960f2bfc9a8037d
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset

@@ -10,8 +10,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
-  m_Name: common_dec_2_atlas
+  m_Name: ui_common_dec_2_atlas
   m_EditorClassIdentifier: 
-  atlasFile: {fileID: 4900000, guid: 149c435b7dfa73f4b87fab5d1c136342, type: 3}
+  atlasFile: {fileID: 4900000, guid: 49bf18802f6c8ba43b054b77095aa57d, type: 3}
   materials:
-  - {fileID: 2100000, guid: 6cc0c9a6b6902dd4190972a0bbc44dc5, type: 2}
+  - {fileID: 2100000, guid: 049da500b8b3c9145b4a8d3d6b8b3868, type: 2}

Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e2250f0115fc09047a40c1698e86bf56
+guid: c8061e76cb1ee1445867befd24305153
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat

@@ -7,9 +7,9 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: common_dec_2_material
+  m_Name: ui_common_dec_2_material
   m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
-  m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON
+  m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -20,7 +20,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 10a12a062925f724fb56eea31c7557f9, type: 3}
+        m_Texture: {fileID: 2800000, guid: 3da4af725c6267044a1e80fb6bf4cff8, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
@@ -32,7 +32,7 @@ Material:
     - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilRef: 1
-    - _StraightAlphaInput: 1
+    - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
     m_Colors:

Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6cc0c9a6b6902dd4190972a0bbc44dc5
+guid: 049da500b8b3c9145b4a8d3d6b8b3868
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
-  m_Name: common_dec_2_skeletondata
+  m_Name: ui_common_dec_2_skeletondata
   m_EditorClassIdentifier: 
   atlasAssets:
-  - {fileID: 11400000, guid: 9548220e18f7da74b9814a09dd4cf6b7, type: 2}
+  - {fileID: 11400000, guid: c8061e76cb1ee1445867befd24305153, type: 2}
   scale: 0.01
-  skeletonJSON: {fileID: 4900000, guid: ac53dcec7ccde62429bdb02cb9cd966e, type: 3}
+  skeletonJSON: {fileID: 4900000, guid: 77a9433d7c777af49960f2bfc9a8037d, type: 3}
   isUpgradingBlendModeMaterials: 0
   blendModeMaterials:
     requiresBlendModeMaterials: 0

Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9548220e18f7da74b9814a09dd4cf6b7
+guid: 04f2fbf456dd7df4f95972fcc8dc69ef
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/prefabs/ui/main_city/main_ui.prefab

@@ -1572,7 +1572,7 @@ PrefabInstance:
     - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: skeletonDataAsset
       value: 
-      objectReference: {fileID: 11400000, guid: e2250f0115fc09047a40c1698e86bf56, type: 2}
+      objectReference: {fileID: 11400000, guid: 04f2fbf456dd7df4f95972fcc8dc69ef, type: 2}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5