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

# Conflicts:
#	Assets/lua/app/config/strings/ja/global.lua.bytes
#	Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes

Assets/prefabs/ui/activity/full_moon/full_moon_ui.prefab

@@ -851,7 +851,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -14613,6 +14613,10 @@ PrefabInstance:
       propertyPath: m_LocalScale.y
       value: 0.75
       objectReference: {fileID: 0}
+    - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 105
+      objectReference: {fileID: 0}
     - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -55
@@ -14943,6 +14947,10 @@ PrefabInstance:
       propertyPath: m_LocalScale.y
       value: 0.75
       objectReference: {fileID: 0}
+    - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 105
+      objectReference: {fileID: 0}
     - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -55
@@ -15273,6 +15281,10 @@ PrefabInstance:
       propertyPath: m_LocalScale.y
       value: 0.75
       objectReference: {fileID: 0}
+    - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 105
+      objectReference: {fileID: 0}
     - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -55
@@ -15607,6 +15619,10 @@ PrefabInstance:
       propertyPath: m_LocalScale.y
       value: 0.75
       objectReference: {fileID: 0}
+    - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 105
+      objectReference: {fileID: 0}
     - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -55
@@ -16080,6 +16096,10 @@ PrefabInstance:
       propertyPath: m_LocalScale.y
       value: 0.75
       objectReference: {fileID: 0}
+    - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 105
+      objectReference: {fileID: 0}
     - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -55
@@ -16410,6 +16430,10 @@ PrefabInstance:
       propertyPath: m_LocalScale.y
       value: 0.75
       objectReference: {fileID: 0}
+    - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 105
+      objectReference: {fileID: 0}
     - target: {fileID: 6794699306549832768, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -55

Assets/prefabs/ui/hero/hero_skin_ui.prefab

@@ -483,7 +483,7 @@ MonoBehaviour:
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
-  m_lineSpacing: -15
+  m_lineSpacing: -40
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
@@ -2257,7 +2257,7 @@ MonoBehaviour:
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
-  m_lineSpacing: -15
+  m_lineSpacing: -40
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
@@ -2732,7 +2732,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 24, y: 2}
-  m_SizeDelta: {x: 90, y: 40}
+  m_SizeDelta: {x: 95, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5280488853851400309
 CanvasRenderer: