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

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

@@ -1,19 +1,40 @@
 ui_bounty_chestopen_1.png
-size:1024,1024
+size:512,512
 filter:Linear,Linear
 1
-bounds:584,461,284,244
+bounds:2,47,284,125
 1_1
-bounds:584,707,284,281
+bounds:2,174,274,160
+1_4
+bounds:2,336,275,174
 4
-bounds:870,787,54,65
+bounds:278,175,54,65
 offsets:3,4,60,73
+rotate:90
 5
-bounds:584,376,83,83
+bounds:376,224,83,83
 offsets:4,4,91,91
 6
-bounds:870,854,113,134
+bounds:376,397,113,134
 offsets:6,6,124,146
-7
+rotate:90
-bounds:2,2,580,986
+banguang2
-offsets:6,26,592,1013
+bounds:279,231,279,95
+offsets:1,0,282,104
+rotate:90
+banguang3
+bounds:463,279,47,116
+offsets:3,0,50,129
+dian
+bounds:179,17,28,93
+offsets:0,1,28,95
+rotate:90
+quan1
+bounds:345,205,23,24
+offsets:0,0,24,24
+xian
+bounds:2,15,175,30
+offsets:2,1,181,31
+xx
+bounds:376,309,85,86
+offsets:3,6,94,102

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

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

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

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

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

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

Assets/arts/spines/ui/ui_bounty_chestopen_1/ui_bounty_chestopen_1_atlas.asset.meta

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

Assets/arts/spines/ui/ui_bounty_chestopen_1/ui_bounty_chestopen_1_material.mat

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: ui_bounty_chestopen_1_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
@@ -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_bounty_chestopen_1/ui_bounty_chestopen_1_material.mat.meta

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

Assets/arts/spines/ui/ui_bounty_chestopen_1/ui_bounty_chestopen_1_skeletondata.asset.meta

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

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

@@ -1,19 +1,40 @@
 ui_bounty_chestopen_2.png
-size:1024,1024
+size:512,512
 filter:Linear,Linear
 1
-bounds:584,459,288,246
+bounds:166,45,288,142
+rotate:90
 1_1
-bounds:584,707,288,281
+bounds:2,55,278,162
+rotate:90
+1_4
+bounds:2,335,276,175
 4
-bounds:874,787,54,65
+bounds:395,28,54,65
 offsets:3,4,60,73
 5
-bounds:584,374,83,83
+bounds:310,10,83,83
 offsets:4,4,91,91
 6
-bounds:874,854,113,134
+bounds:280,376,113,134
 offsets:6,6,124,146
-7
+banguang2
-bounds:2,2,580,986
+bounds:310,95,279,95
-offsets:6,26,592,1013
+offsets:1,0,282,104
+rotate:90
+banguang3
+bounds:2,6,47,116
+offsets:3,0,50,129
+rotate:90
+dian
+bounds:482,417,28,93
+offsets:0,1,28,95
+quan1
+bounds:395,2,23,24
+offsets:0,0,24,24
+xian
+bounds:120,13,175,30
+offsets:2,1,181,31
+xx
+bounds:395,424,85,86
+offsets:3,6,94,102

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

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

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

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

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

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

Assets/arts/spines/ui/ui_bounty_chestopen_2/ui_bounty_chestopen_2_atlas.asset.meta

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

Assets/arts/spines/ui/ui_bounty_chestopen_2/ui_bounty_chestopen_2_material.mat

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: ui_bounty_chestopen_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
@@ -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_bounty_chestopen_2/ui_bounty_chestopen_2_material.mat.meta

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

Assets/arts/spines/ui/ui_bounty_chestopen_2/ui_bounty_chestopen_2_skeletondata.asset.meta

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

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

@@ -1,19 +1,41 @@
 ui_bounty_chestopen_3.png
-size:1024,1024
+size:512,512
 filter:Linear,Linear
 1
-bounds:584,451,290,248
+bounds:294,237,273,121
+rotate:90
 1_1
-bounds:584,701,290,288
+bounds:2,139,290,172
+1_4
+bounds:2,313,290,197
+offsets:0,1,290,198
 4
-bounds:876,788,54,65
+bounds:417,242,54,65
 offsets:3,4,60,73
 5
-bounds:584,366,83,83
+bounds:417,339,83,83
 offsets:4,4,91,91
 6
-bounds:876,855,113,134
+bounds:294,122,113,134
 offsets:6,6,124,146
-7
+rotate:90
-bounds:2,3,580,986
+banguang2
-offsets:6,26,592,1013
+bounds:2,42,279,95
+offsets:1,0,282,104
+banguang3
+bounds:283,73,47,116
+offsets:3,0,50,129
+rotate:90
+dian
+bounds:417,309,28,93
+offsets:0,1,28,95
+rotate:90
+quan1
+bounds:179,16,23,24
+offsets:0,0,24,24
+xian
+bounds:2,10,175,30
+offsets:2,1,181,31
+xx
+bounds:417,424,85,86
+offsets:3,6,94,102

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

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

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

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

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

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

Assets/arts/spines/ui/ui_bounty_chestopen_3/ui_bounty_chestopen_3_atlas.asset.meta

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

Assets/arts/spines/ui/ui_bounty_chestopen_3/ui_bounty_chestopen_3_material.mat

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: ui_bounty_chestopen_3_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
@@ -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_bounty_chestopen_3/ui_bounty_chestopen_3_material.mat.meta

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

Assets/arts/spines/ui/ui_bounty_chestopen_3/ui_bounty_chestopen_3_skeletondata.asset.meta

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

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

@@ -1,19 +1,39 @@
 ui_bounty_chestopen_4.png
-size:1024,1024
+size:512,512
 filter:Linear,Linear
 1
-bounds:584,446,278,261
+bounds:2,6,278,119
 1_1
-bounds:584,709,278,279
+bounds:2,127,272,166
+1_4
+bounds:2,295,278,199
 4
-bounds:864,787,54,65
+bounds:411,208,54,65
 offsets:3,4,60,73
 5
-bounds:584,361,83,83
+bounds:411,275,83,83
 offsets:4,4,91,91
 6
-bounds:864,854,113,134
+bounds:379,360,113,134
 offsets:6,6,124,146
-7
+banguang2
-bounds:2,2,580,986
+bounds:282,215,279,95
-offsets:6,26,592,1013
+offsets:1,0,282,104
+rotate:90
+banguang3
+bounds:282,9,47,116
+offsets:3,0,50,129
+dian
+bounds:331,32,28,93
+offsets:0,1,28,95
+quan1
+bounds:411,183,23,24
+offsets:0,0,24,24
+rotate:90
+xian
+bounds:379,183,175,30
+offsets:2,1,181,31
+rotate:90
+xx
+bounds:276,127,85,86
+offsets:3,6,94,102

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

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

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

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

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

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

Assets/arts/spines/ui/ui_bounty_chestopen_4/ui_bounty_chestopen_4_atlas.asset.meta

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

Assets/arts/spines/ui/ui_bounty_chestopen_4/ui_bounty_chestopen_4_material.mat

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: ui_bounty_chestopen_4_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
@@ -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_bounty_chestopen_4/ui_bounty_chestopen_4_material.mat.meta

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

Assets/arts/spines/ui/ui_bounty_chestopen_4/ui_bounty_chestopen_4_skeletondata.asset.meta

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

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

@@ -1,19 +1,41 @@
 ui_bounty_chestopen_5.png
-size:1024,1024
+size:512,512
 filter:Linear,Linear
 1
-bounds:584,453,288,256
+bounds:282,221,288,124
+rotate:90
 1_1
-bounds:584,711,288,277
+bounds:2,168,278,160
+1_4
+bounds:2,330,278,179
 4
-bounds:874,787,54,65
+bounds:294,116,54,65
 offsets:3,4,60,73
+rotate:90
 5
-bounds:584,368,83,83
+bounds:204,51,83,83
 offsets:4,4,91,91
 6
-bounds:874,854,113,134
+bounds:2,32,113,134
 offsets:6,6,124,146
-7
+banguang2
-bounds:2,2,580,986
+bounds:408,230,279,95
-offsets:6,26,592,1013
+offsets:1,0,282,104
+rotate:90
+banguang3
+bounds:282,172,47,116
+offsets:3,0,50,129
+rotate:90
+dian
+bounds:2,2,28,93
+offsets:0,1,28,95
+rotate:90
+quan1
+bounds:361,146,23,24
+offsets:0,0,24,24
+xian
+bounds:117,136,175,30
+offsets:2,1,181,31
+xx
+bounds:117,48,85,86
+offsets:3,6,94,102

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

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

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

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

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

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

Assets/arts/spines/ui/ui_bounty_chestopen_5/ui_bounty_chestopen_5_atlas.asset.meta

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

Assets/arts/spines/ui/ui_bounty_chestopen_5/ui_bounty_chestopen_5_material.mat

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: ui_bounty_chestopen_5_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
@@ -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_bounty_chestopen_5/ui_bounty_chestopen_5_material.mat.meta

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

Assets/arts/spines/ui/ui_bounty_chestopen_5/ui_bounty_chestopen_5_skeletondata.asset.meta

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

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

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

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

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

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

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

Assets/arts/spines/ui/ui_shop_box_1/ui_shop_box_1_atlas.asset.meta

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

Assets/arts/spines/ui/ui_shop_box_1/ui_shop_box_1_material.mat

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: ui_shop_box_1_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
@@ -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_shop_box_1/ui_shop_box_1_material.mat.meta

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

Assets/arts/spines/ui/ui_shop_box_1/ui_shop_box_1_skeletondata.asset.meta

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

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

@@ -1,25 +1,43 @@
 ui_shop_box_2.png
-size:1024,1024
+size:512,512
 filter:Linear,Linear
-2
+1
-bounds:584,729,286,259
+bounds:176,37,284,122
-2_1
-bounds:584,435,292,172
-offsets:1,2,294,175
 rotate:90
-2_2
+1_1
-bounds:584,149,284,122
+bounds:2,29,292,172
-offsets:1,1,286,124
+offsets:0,1,292,173
 rotate:90
+1_4
+bounds:2,323,284,187
 4
-bounds:584,82,54,65
+bounds:427,58,54,65
 offsets:3,4,60,73
+rotate:90
 5
-bounds:758,644,83,83
+bounds:427,114,83,83
 offsets:4,4,91,91
 6
-bounds:872,854,113,134
+bounds:288,376,113,134
 offsets:6,6,124,146
-7
+banguang2
-bounds:2,2,580,986
+bounds:300,95,279,95
-offsets:6,26,592,1013
+offsets:1,0,282,104
+rotate:90
+banguang3
+bounds:300,46,47,116
+offsets:3,0,50,129
+rotate:90
+dian
+bounds:397,104,28,93
+offsets:0,1,28,95
+quan1
+bounds:2,3,23,24
+offsets:0,0,24,24
+xian
+bounds:397,199,175,30
+offsets:2,1,181,31
+rotate:90
+xx
+bounds:403,424,85,86
+offsets:3,6,94,102

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

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

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

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

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

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

Assets/arts/spines/ui/ui_shop_box_2/ui_shop_box_2_atlas.asset.meta

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

Assets/arts/spines/ui/ui_shop_box_2/ui_shop_box_2_material.mat

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: ui_shop_box_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
@@ -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_shop_box_2/ui_shop_box_2_material.mat.meta

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

Assets/arts/spines/ui/ui_shop_box_2/ui_shop_box_2_skeletondata.asset.meta

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

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

@@ -1,25 +1,40 @@
 ui_shop_box_3.png
-size:1024,1024
+size:512,512
 filter:Linear,Linear
-3
+1
-bounds:583,726,292,264
+bounds:2,2,290,118
-3_1
+1_1
-bounds:583,428,296,174
+bounds:2,122,296,174
-offsets:1,2,298,177
+offsets:0,1,296,175
-rotate:90
+1_4
-3_2
+bounds:2,298,290,211
-bounds:583,136,290,118
-offsets:1,1,292,120
-rotate:90
 4
-bounds:583,69,54,65
+bounds:379,13,54,65
 offsets:3,4,60,73
 5
-bounds:759,641,83,83
+bounds:294,9,83,83
 offsets:4,4,91,91
 6
-bounds:877,856,113,134
+bounds:294,375,113,134
 offsets:6,6,124,146
-7
+banguang2
-bounds:1,4,580,986
+bounds:300,94,279,95
-offsets:6,26,592,1013
+offsets:1,0,282,104
+rotate:90
+banguang3
+bounds:397,80,47,116
+offsets:3,0,50,129
+dian
+bounds:409,393,28,93
+offsets:0,1,28,95
+rotate:90
+quan1
+bounds:435,54,23,24
+offsets:0,0,24,24
+xian
+bounds:397,198,175,30
+offsets:2,1,181,31
+rotate:90
+xx
+bounds:409,423,85,86
+offsets:3,6,94,102

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

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

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

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

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

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

Assets/arts/spines/ui/ui_shop_box_3/ui_shop_box_3_atlas.asset.meta

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

Assets/arts/spines/ui/ui_shop_box_3/ui_shop_box_3_material.mat

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: ui_shop_box_3_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
@@ -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_shop_box_3/ui_shop_box_3_material.mat.meta

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

Assets/arts/spines/ui/ui_shop_box_3/ui_shop_box_3_skeletondata.asset.meta

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