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

Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset

@@ -41,123 +41,19 @@ MonoBehaviour:
     m_StrikethroughOffset: 6.8
     m_StrikethroughThickness: 2.03125
     m_TabWidth: 10
-  m_GlyphTable:
+  m_GlyphTable: []
-  - m_Index: 732
+  m_CharacterTable: []
-    m_Metrics:
-      m_Width: 26.5
-      m_Height: 5.1875
-      m_HorizontalBearingX: 2.75
-      m_HorizontalBearingY: 14.75
-      m_HorizontalAdvance: 32
-    m_GlyphRect:
-      m_X: 5
-      m_Y: 5
-      m_Width: 28
-      m_Height: 6
-    m_Scale: 1
-    m_AtlasIndex: 0
-  - m_Index: 66
-    m_Metrics:
-      m_Width: 17.28125
-      m_Height: 2.75
-      m_HorizontalBearingX: 0.453125
-      m_HorizontalBearingY: -2.203125
-      m_HorizontalAdvance: 18.140625
-    m_GlyphRect:
-      m_X: 42
-      m_Y: 5
-      m_Width: 18
-      m_Height: 3
-    m_Scale: 1
-    m_AtlasIndex: 0
-  - m_Index: 28118
-    m_Metrics:
-      m_Width: 30.265625
-      m_Height: 30.21875
-      m_HorizontalBearingX: 0.703125
-      m_HorizontalBearingY: 27.203125
-      m_HorizontalAdvance: 32
-    m_GlyphRect:
-      m_X: 69
-      m_Y: 5
-      m_Width: 31
-      m_Height: 32
-    m_Scale: 1
-    m_AtlasIndex: 0
-  - m_Index: 10720
-    m_Metrics:
-      m_Width: 30.71875
-      m_Height: 27.96875
-      m_HorizontalBearingX: 0.734375
-      m_HorizontalBearingY: 25.28125
-      m_HorizontalAdvance: 32
-    m_GlyphRect:
-      m_X: 5
-      m_Y: 20
-      m_Width: 32
-      m_Height: 29
-    m_Scale: 1
-    m_AtlasIndex: 0
-  m_CharacterTable:
-  - m_ElementType: 1
-    m_Unicode: 8230
-    m_GlyphIndex: 732
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 95
-    m_GlyphIndex: 66
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 39046
-    m_GlyphIndex: 28118
-    m_Scale: 1
-  - m_ElementType: 1
-    m_Unicode: 21462
-    m_GlyphIndex: 10720
-    m_Scale: 1
   m_AtlasTextures:
   - {fileID: 2800000, guid: b2be439f29024b44cb2a914e358192c4, type: 2}
   m_AtlasTextureIndex: 0
   m_IsMultiAtlasTexturesEnabled: 1
   m_ClearDynamicDataOnBuild: 0
-  m_UsedGlyphRects:
+  m_UsedGlyphRects: []
-  - m_X: 0
-    m_Y: 0
-    m_Width: 37
-    m_Height: 15
-  - m_X: 37
-    m_Y: 0
-    m_Width: 27
-    m_Height: 12
-  - m_X: 64
-    m_Y: 0
-    m_Width: 40
-    m_Height: 41
-  - m_X: 0
-    m_Y: 15
-    m_Width: 41
-    m_Height: 38
   m_FreeGlyphRects:
-  - m_X: 104
-    m_Y: 0
-    m_Width: 1943
-    m_Height: 2047
   - m_X: 0
-    m_Y: 53
+    m_Y: 0
     m_Width: 2047
-    m_Height: 1994
+    m_Height: 2047
-  - m_X: 41
-    m_Y: 41
-    m_Width: 2006
-    m_Height: 2006
-  - m_X: 37
-    m_Y: 12
-    m_Width: 27
-    m_Height: 3
-  - m_X: 41
-    m_Y: 12
-    m_Width: 23
-    m_Height: 2035
   m_fontInfo:
     Name: 
     PointSize: 0

Assets/prefabs/ui/bounty/bounty_buy_ui.prefab

@@ -548,9 +548,9 @@ MonoBehaviour:
   m_fontSize: 34
   m_fontSizeBase: 34
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 28
+  m_fontSizeMax: 34
   m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
@@ -621,8 +621,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -107, y: -243}
+  m_AnchoredPosition: {x: -96.5, y: -243}
-  m_SizeDelta: {x: 272, y: 51}
+  m_SizeDelta: {x: 293, y: 51}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5468852378091223966
 CanvasRenderer:
@@ -682,9 +682,9 @@ MonoBehaviour:
   m_fontSize: 22
   m_fontSizeBase: 22
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 28
+  m_fontSizeMax: 22
   m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
@@ -1338,8 +1338,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -107, y: -406}
+  m_AnchoredPosition: {x: -96.5, y: -406}
-  m_SizeDelta: {x: 272, y: 51}
+  m_SizeDelta: {x: 293, y: 51}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7445689520148252242
 CanvasRenderer:
@@ -1399,9 +1399,9 @@ MonoBehaviour:
   m_fontSize: 22
   m_fontSizeBase: 22
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 26
+  m_fontSizeMax: 22
   m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
@@ -2012,9 +2012,9 @@ MonoBehaviour:
   m_fontSize: 34
   m_fontSizeBase: 34
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 28
+  m_fontSizeMax: 34
   m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512

Assets/prefabs/ui/bounty/bounty_main_ui.prefab

@@ -1224,7 +1224,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 188, y: -363}
-  m_SizeDelta: {x: 216, y: 82}
+  m_SizeDelta: {x: 250, y: 82}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7454868131104788772
 CanvasRenderer:
@@ -3061,7 +3061,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 4}
-  m_SizeDelta: {x: 140, y: 50}
+  m_SizeDelta: {x: 220, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2860039695456571505
 CanvasRenderer:
@@ -3121,9 +3121,9 @@ MonoBehaviour:
   m_fontSize: 26
   m_fontSizeBase: 26
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 34
+  m_fontSizeMax: 26
   m_fontStyle: 0
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
@@ -3333,7 +3333,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 8}
+  m_AnchoredPosition: {x: 0, y: 14}
   m_SizeDelta: {x: 62, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2232266410298995376
@@ -3826,7 +3826,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 375.00034}
+  m_AnchoredPosition: {x: 0, y: 514.9996}
   m_SizeDelta: {x: 1280, y: 200}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &7899316638467391510