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

# Conflicts:
#	Assets/lua/app/config/strings/cn/global.lua.bytes

Assets/lua/app/config/task_dungeon_armor.lua.bytes

@@ -1,4 +1,4 @@
 bf_encrypt_luai)1X+H-ø8GH:uua0
-3D9xI4k5MR0qYxsFX9Z#4Y^Y
]
'SZ#
QJ\	1XxI4k5MR0qpk*reD2¸I4 µMRzq±ér²%Å38I´ µMRzq°ér2$Å38I¶ µMRzñ°ér²$Å38I· µMRzqqírò¤À_xI5M5ÍR:qqi+seD9xI4k1H&I
m>6XZk5MR0qqz:reD9xI4x0MR0qqi8afD9xI4k5^F0qqi8re@<(@
+3D9xI4k5MR0qYxsFX9Z#4Y^Y
]
'SZ#
QJ\	1XxI4k5MR0qpk*reD2¸I4 µMRzq±ér²%Å38I´ µMRzq°ér2$Å38I¶ µMRzñ°ér²$Å38I· µMRzqqírò¤À_xI5M5ÍR:qqi+seD9xI4k1H&I
m>6XZk5MR0qqz:reD9xI4x0MR0qqi8afD9xI4k5^L0qqi8re@<(@
 1K1_9reD8xI4k5_R0qpi8rgD9xJ4k5IR0qti8rcD9xN4k5ER0qxi8roD9xB4k5AR0q|i8rjD9xY4k5]R0qci8rwD9xK4k5^&Q6\#\'k
 G =B|qi8`eD9*[S$5 qqi*reD8xI4njf

Assets/prefabs/ui/hero/hero_detail_ui.prefab

@@ -10624,9 +10624,9 @@ RectTransform:
   m_Father: {fileID: 8820886354291304681}
   m_RootOrder: 0
   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: 40}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 500, y: 80}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &5127045946293745891

Assets/proto/protocol.bytes

@@ -1,5 +1,5 @@
 
-ψ
+¿ˆ
 pb/proto/protocol.protocspb"ž

 Gift
 act_type
 
(RactType
@@ -350,7 +350,7 @@ chapter_id
 
(R	chapterId
 err_code
 
(2
.cspb.ErrCodeRerrCode"
 costs (2.cspb.RewardRcosts"(
 ChapterArmorInfo
-stars
 (Rstars" 
+stars
 (Rstars"<EFBFBD>
 ChapterArmorChallenge(
 max_challenge_id
 
(RmaxChallengeIdI
 
@@ -361,8 +361,7 @@ farm_count (2*.cspb.ChapterArmorChallenge.FarmCountEntryR	farmCount
 star_rewards (2,.cspb.ChapterArmorChallenge.StarRewardsEntryRstarRewardsO
 fund_rewards (2,.cspb.ChapterArmorChallenge.FundRewardsEntryRfundRewards7
 	gift_info 
(2.cspb.ChapterArmorGiftInfoRgiftInfoh
-total_challenge_count (24.cspb.ChapterArmorChallenge.TotalChallengeCountEntryRtotalChallengeCount
-ad	 
(RadT
+total_challenge_count (24.cspb.ChapterArmorChallenge.TotalChallengeCountEntryRtotalChallengeCountT
 ArmorInfoEntry
 key
 
(Rkey,
 value 
(2.cspb.ChapterArmorInfoRvalue:8
<