merge

Assets/lua/app/server/data/server_bag_data.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 485d93d345cfb5745aee09b4ece3c0b2
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/data/server_bag_data.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/data/server_base_data.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9135da9d96df6c84eb87e42de1861982
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/data/server_base_data.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/data/server_chapter_data.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c8c31019e41ac3442ba68cd4d42da11e
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/data/server_chapter_data.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/data/server_formation_data.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a11737af93dd2194290e079d7ff735d0
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/data/server_formation_data.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/data/server_hero_data.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1b653dbe158c74546ae9a3d47c1b9efb
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/data/server_hero_data.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/data/server_item_data.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1873d486d0ecec44f9d35f0aff877993
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/data/server_item_data.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/data/server_player_data.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 130f97d7e056d214c8595e1cd1262bfb
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/data/server_player_data.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/data/server_tutorial_data.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a8f882241e504c041ae086b7de6bb54d
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/data/server_tutorial_data.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/manager/server_chapter_manager.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 343e348dfe57f2c4f95db95a4fb84444
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/manager/server_chapter_manager.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/manager/server_formation_manager.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 561ca0625eb6aa741b12c8ac8e9e15dc
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/manager/server_formation_manager.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/manager/server_hero_manager.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4fc6b0dfd227f2c46a23ef3e5ac59215
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/manager/server_hero_manager.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/manager/server_tutorial_manager.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 63a1838dbfe97e74f925979737eec95e
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/manager/server_tutorial_manager.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/server_data_const.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3af3c6198d026654fb26065b3a74571d
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/server_data_const.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/server_data_manager.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b3f8ed29b70c2f4489309c2650d2978a
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/server_data_manager.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/server/server_game_data.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 49f175feec4b3384ca1a4c2a84d971d9
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/server/server_game_data.lua.bytes.ab
-  assetBundleVariant: 

Assets/prefabs/ui/hero/hero_detail_ui.prefab

@@ -464,8 +464,8 @@ RectTransform:
   m_Children:
   - {fileID: 7402852988677530968}
   - {fileID: 8335102383607932721}
-  - {fileID: 8396702131301176704}
   - {fileID: 6710246215471342977}
+  - {fileID: 8396702131301176704}
   m_Father: {fileID: 3121552964615492639}
   m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4705,7 +4705,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_AnchorMax.x
@@ -4820,7 +4820,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
       propertyPath: m_AnchorMax.x

Assets/proto/protocol.bytes

@@ -1,6 +1,6 @@
 
-žc
+<EFBFBD>c
-pb/proto/protocol.protocspb"ž
+pb/proto/protocol.protocspb"<EFBFBD>
 
 BattlePass1
 tasks
 (2.cspb.BattlePass.TasksEntryRtasks
@@ -16,16 +16,18 @@ TasksEntry
 key
 
(Rkey&
 value 
(2.cspb.TaskSingleRvalue:8
")
 BattlePassTaskRewardReq
-id
 
(Rid"¹

+id
 
(Rid"<EFBFBD>

 BattlePassTaskRewardRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode$
+err_code
 
(2
+.cspb.ErrCodeRerrCode$
 task 
(2.cspb.TaskSingleRtask
 level 
(Rlevel
 exp 
(Rexp&
 rewards (2.cspb.RewardRrewards"
-BattlePassRewardReq"¢

+BattlePassRewardReq"<EFBFBD>

 BattlePassRewardRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode
+err_code
 
(2
+.cspb.ErrCodeRerrCode
 claimed 
(Rclaimed
 pro_claimed 
(R
 proClaimed&
@@ -35,7 +37,7 @@ proClaimed&
 ChapterInfo
 total_count
 
(R
 totalCount
-index (Rindex"à

+index (Rindex"<EFBFBD>

 Chapter$
 max_chapter_id
 
(RmaxChapterId
 max_wave 
(RmaxWaveA
@@ -47,7 +49,8 @@ totalCount
 
 chapter_id
 
(R	chapterId"~
 ChapterStartRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode
+err_code
 
(2
+.cspb.ErrCodeRerrCode
 
 chapter_id 
(R	chapterId"
 costs (2.cspb.RewardRcosts"d
@@ -55,9 +58,10 @@ chapter_id 
(R	chapterId"
 win
 
(Rwin
 
 chapter_id 
(R	chapterId
-	pass_wave 
(RpassWave"©

+	pass_wave 
(RpassWave"<EFBFBD>

 ChapterSettlementRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode&
+err_code
 
(2
+.cspb.ErrCodeRerrCode&
 rewards (2.cspb.RewardRrewards$
 max_chapter_id 
(RmaxChapterId
 max_wave 
(RmaxWave"H
@@ -66,8 +70,9 @@ chapter_id 
(R	chapterId
 chapter_id
 
(R	chapterId
 wave 
(Rwave"g
 ChapterBoxRewardRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode&
+err_code
 
(2
-rewards (2.cspb.RewardRrewards"ˆ

+.cspb.ErrCodeRerrCode&
+rewards (2.cspb.RewardRrewards"<22>

 Reward
 type
 
(Rtype
 item 
(2
@@ -89,22 +94,28 @@ chapter_id
 
(R	chapterId
 id
 
(Rid
 ts 
(Rts"M
 EnergyLimit#
-
diamond_count
 
(RdiamondCount
+
+diamond_count
 
(RdiamondCount
 ad_count 
(RadCount"
-EnergyByDiamondReq"À

+EnergyByDiamondReq"<EFBFBD>

 EnergyByDiamondRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode4
+err_code
 
(2
+.cspb.ErrCodeRerrCode4
 energy_limit 
(2.cspb.EnergyLimitRenergyLimit&
 rewards (2.cspb.RewardRrewards"
 costs (2.cspb.RewardRcosts"
-
EnergyByADReq"—

+
-
EnergyByADRsp(
+EnergyByADReq"<22>

-err_code
 
(2
.cspb.ErrCodeRerrCode4
+
+EnergyByADRsp(
+err_code
 
(2
+.cspb.ErrCodeRerrCode4
 energy_limit 
(2.cspb.EnergyLimitRenergyLimit&
 rewards (2.cspb.RewardRrewards"
 FundData!
 free_awarded
 (RfreeAwarded&
-pay_low_awarded (R
payLowAwarded(
+pay_low_awarded (R
+payLowAwarded(
 pay_high_awarded (RpayHighAwarded"}
 Fund+
 funds
 (2.cspb.Fund.FundsEntryRfundsH
@@ -117,9 +128,10 @@ FundsEntry
 level 
(Rlevel"<
 FundAwardReq,
 
-id_with_lv
 (2.cspb.IdWithLvRidWithLv"Ž

+id_with_lv
 (2.cspb.IdWithLvRidWithLv"<EFBFBD>

 FundAwardRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode,
+err_code
 
(2
+.cspb.ErrCodeRerrCode,
 
 id_with_lv (2.cspb.IdWithLvRidWithLv&
 rewards (2.cspb.RewardRrewards"k
@@ -131,22 +143,25 @@ id_with_lv (2.cspb.IdWithLvRidWithLv&
 GuideFundMarkReq
 id
 
(Rid"<
 GuideFundMarkRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode" 
+err_code
 
(2
+.cspb.ErrCodeRerrCode" 
 HeroUpgradeReq
 id
 
(Rid"~
 HeroUpgradeRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode
+err_code
 
(2
+.cspb.ErrCodeRerrCode
 hero 
(2
 .cspb.HeroRhero"
 costs (2.cspb.RewardRcosts"
 HeroPutOnReq
-id
 
(Rid"«

+id
 
(Rid"<EFBFBD>

 HeroPutOnRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode6
+err_code
 
(2
+.cspb.ErrCodeRerrCode6
 heroes (2.cspb.HeroPutOnRsp.HeroesEntryRheroes9
 HeroesEntry
 key
 
(Rkey
-value 
(Rvalue:8
"¶

+value 
(Rvalue:8
"<EFBFBD>

 Mail
 id
 
(Rid
 title 
(	Rtitle
@@ -160,40 +175,49 @@ id_with_lv (2.cspb.IdWithLvRidWithLv&
 .cspb.MailRmails"
 MailListReq"Y
 MailListRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode 
+err_code
 
(2
+.cspb.ErrCodeRerrCode 
 mails (2
 .cspb.MailRmails"
 MailReadReq
 ids
 (Rids"I
 MailReadRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode
+err_code
 
(2
+.cspb.ErrCodeRerrCode
 ids (Rids""
 MailExtractReq
 ids
 (Rids"t
 MailExtractRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode
+err_code
 
(2
+.cspb.ErrCodeRerrCode
 ids (Rids&
 rewards (2.cspb.RewardRrewards"!
-
MailDeleteReq
+
+MailDeleteReq
 ids
 (Rids"K
-
MailDeleteRsp(
+
-err_code
 
(2
.cspb.ErrCodeRerrCode
+MailDeleteRsp(
+err_code
 
(2
+.cspb.ErrCodeRerrCode
 ids (Rids"
 
 NewMailNtf"
 MailCycleReq"8
 MailCycleRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode" 

+err_code
 
(2
+.cspb.ErrCodeRerrCode"<22>

 Gift
 	mall_type
 
(RmallType
 id 
(Rid
 	buy_count 
(RbuyCount"
-
latest_buy_at 
(RlatestBuyAt*
+
-latest_order_uuid (	RlatestOrderUuid"ä

+latest_buy_at 
(RlatestBuyAt*
+latest_order_uuid (	RlatestOrderUuid"<22>

 Mall 
 gifts
 (2
 .cspb.GiftRgiftsA
-
trigger_gifts (2.cspb.Mall.TriggerGiftsEntryRtriggerGifts6
+
+trigger_gifts (2.cspb.Mall.TriggerGiftsEntryRtriggerGifts6
 latest_mon_card_award_at 
(RlatestMonCardAwardAt?
 TriggerGiftsEntry
 key
 
(Rkey
@@ -201,10 +225,11 @@ NewMailNtf"
 
 MallPayReq
 	mall_type
 
(RmallType
-id 
(Rid"À

+id 
(Rid"<EFBFBD>

 
 MallPayRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode&
+err_code
 
(2
+.cspb.ErrCodeRerrCode&
 rewards (2.cspb.RewardRrewards
 uuid 
(	Ruuid
 recharge_id 
(R
@@ -214,13 +239,15 @@ rechargeId
 MallPaidResultReq
 uuid
 (	Ruuid
 channel 
(Rchannel
-	pay_token 
(	RpayToken"¬

+	pay_token 
(	RpayToken"<EFBFBD>

 MallPaidResultRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode
+err_code
 
(2
+.cspb.ErrCodeRerrCode
 gift (2
 .cspb.GiftRgift&
 rewards (2.cspb.RewardRrewards%
-duplicate_uuid (	R
duplicateUuid"_
+duplicate_uuid (	R
+duplicateUuid"_
 MallActTriggerGiftNtf
 	mall_type
 
(RmallType
 id 
(Rid
@@ -230,14 +257,16 @@ MallPayNtf&
 rewards (2.cspb.RewardRrewards
 	mall_type 
(RmallType
 id 
(Rid"
-MonCardRewardReq"œ

+MonCardRewardReq"<EFBFBD>

 MonCardRewardRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode&
+err_code
 
(2
+.cspb.ErrCodeRerrCode&
 rewards (2.cspb.RewardRrewards6
 latest_mon_card_award_at 
(RlatestMonCardAwardAt"
 AdFreeDailyGiftReq"f
 AdFreeDailyGiftRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode&
+err_code
 
(2
+.cspb.ErrCodeRerrCode&
 rewards (2.cspb.RewardRrewards"u
 Pig
 
@@ -250,10 +279,11 @@ addDiamond
 PigLevelDownRsp".
 PigLevelDownNtf
 pig
 
(2	.cspb.PigRpig",
-
PigLevelUpNtf
+
+PigLevelUpNtf
 pig
 
(2	.cspb.PigRpig"/
 PigPlayUpdateNtf
-pig
 
(2	.cspb.PigRpig"¡

+pig
 
(2	.cspb.PigRpig"<EFBFBD>

 	BasicInfo
 name
 
(	Rname
 level 
(Rlevel
@@ -261,7 +291,7 @@ addDiamond
 avatar 
(Ravatar
 
 pay_amount 
(R	payAmount!
-name_changed 
(RnameChanged"¿
+name_changed 
(RnameChanged"<EFBFBD>
 
 ClientInfo
 	bundle_id
 
(	RbundleId
@@ -275,7 +305,7 @@ ClientInfo
 network_type	 
(	RnetworkType
 language
  
(	Rlanguage
-timezone 
(	Rtimezone"÷
+timezone 
(	Rtimezone"<EFBFBD>
 Bag*
 items
 (2.cspb.Bag.ItemsEntryRitems-
 heroes (2.cspb.Bag.HeroesEntryRheroes9
@@ -305,16 +335,17 @@ onlineTime"{
 key
 
(Rkey
 value 
(Rvalue:8
"
 Request
-id
 
(Rid"š

+id
 
(Rid"<EFBFBD>

 AuthReq
 type
 
(	Rtype
 id 
(	Rid
 token 
(	Rtoken1
 client_info 
(2.cspb.ClientInfoR
 clientInfo"
-sync 
(2.cspb.SyncDataRsync"å

+sync 
(2.cspb.SyncDataRsync"<EFBFBD>

 AuthRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode
+err_code
 
(2
+.cspb.ErrCodeRerrCode
 id 
(	Rid
 token 
(	Rtoken
 email 
(	Remail
@@ -328,35 +359,44 @@ facebookId"C
 id 
(	Rid
 token 
(	Rtoken"3
 BindRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode"D
+err_code
 
(2
+.cspb.ErrCodeRerrCode"D
 ExistReq
 type
 
(	Rtype
 id 
(	Rid
 token 
(	Rtoken"4
 ExistRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode"
+err_code
 
(2
+.cspb.ErrCodeRerrCode"
 	DeleteReq"5
 	DeleteRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode"'
+err_code
 
(2
+.cspb.ErrCodeRerrCode"'
 ReconnectReq
-recv_id
 
(
RrecvId"Q
+recv_id
 
(
+RrecvId"Q
 ReconnectRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode
+err_code
 
(2
-send_id 
(
RsendId"
+.cspb.ErrCodeRerrCode
+send_id 
(
+RsendId"
 HeartbeatReq"8
 HeartbeatRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode"
+err_code
 
(2
+.cspb.ErrCodeRerrCode"
 GMReq
 args
 (	Rargs"1
 GMRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode"\
+err_code
 
(2
+.cspb.ErrCodeRerrCode"\
 LoginReq1
 client_info
 
(2.cspb.ClientInfoR
 clientInfo
 
-skip_guide 
(R	skipGuide"Ê
+skip_guide 
(R	skipGuide"<EFBFBD>
 LoginRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode*
+err_code
 
(2
+.cspb.ErrCodeRerrCode*
 today_first_login 
(RtodayFirstLogin
 today_ts 
(RtodayTs
 now_ts 
(RnowTs.
@@ -374,42 +414,51 @@ fight_info 
(2.cspb.FightInfoR	fightInfo
 
 task_daily 
(2.cspb.TaskDailyR	taskDaily+
 	seven_day 
(2.cspb.SevenDayRsevenDay1
-battle_pass
 
(2.cspb.BattlePassR
+battle_pass
+ 
(2.cspb.BattlePassR
 battlePass+
 	mail_info 
(2.cspb.MailInfoRmailInfo
 fund 
(2
 .cspb.FundRfund'
-chapter 
(2
.cspb.ChapterRchapter
+chapter 
(2
+.cspb.ChapterRchapter
 pig 
(2	.cspb.PigRpig3
 energyLimit 
(2.cspb.EnergyLimitRenergyLimit"U
 PipedReq
-id
 
(
Rid
+id
 
(
+Rid
 ts 
(Rts
-msg_id 
(
RmsgId
+msg_id 
(
+RmsgId
 data 
(Rdata",
 SyncData 
 pip
 (2.cspb.PipedReqRpip"9
 
 KickOutNtf+
 reason
 
(2.cspb.KickOutReasonRreason"#
-
ChangeNameReq
+
+ChangeNameReq
 name
 
(	Rname"q
-
ChangeNameRsp(
+
-err_code
 
(2
.cspb.ErrCodeRerrCode
+ChangeNameRsp(
+err_code
 
(2
+.cspb.ErrCodeRerrCode
 name 
(	Rname"
 costs (2.cspb.RewardRcosts"
 
 WatchADReq"6
 
 WatchADRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode"S
+err_code
 
(2
+.cspb.ErrCodeRerrCode"S
 	TaskTutor
 id
 
(Rid
 progress 
(Rprogress
 finished 
(Rfinished"
-TaskTutorRewardReq"‹

+TaskTutorRewardReq"<EFBFBD>

 TaskTutorRewardRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode#
+err_code
 
(2
+.cspb.ErrCodeRerrCode#
 task 
(2.cspb.TaskTutorRtask&
 rewards (2.cspb.RewardRrewards"R
 
@@ -420,7 +469,7 @@ TaskSingle
 	TaskMulti
 id
 
(Rid
 progress 
(Rprogress
-stage 
(Rstage"‰

+stage 
(Rstage"<EFBFBD>

 	TaskDaily0
 tasks
 (2.cspb.TaskDaily.TasksEntryRtasksJ
 
@@ -428,11 +477,12 @@ TasksEntry
 key
 
(Rkey&
 value 
(2.cspb.TaskSingleRvalue:8
"$
 TaskDailyRewardReq
-id
 
(Rid"Œ

+id
 
(Rid"<EFBFBD>

 TaskDailyRewardRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode$
+err_code
 
(2
+.cspb.ErrCodeRerrCode$
 task 
(2.cspb.TaskSingleRtask&
-rewards (2.cspb.RewardRrewards"·
+rewards (2.cspb.RewardRrewards"<EFBFBD>
 SevenDay
 open_day_ts
 
(R	openDayTs
 	login_day 
(RloginDay/
@@ -446,9 +496,10 @@ TasksEntry
 key
 
(Rkey
 value 
(Rvalue:8
")
 SevenDayTaskRewardReq
-ids
 (Rids"ó

+ids
 (Rids"<EFBFBD>

 SevenDayTaskRewardRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode<
+err_code
 
(2
+.cspb.ErrCodeRerrCode<
 tasks (2&.cspb.SevenDayTaskRewardRsp.TasksEntryRtasks&
 rewards (2.cspb.RewardRrewardsJ
 
@@ -456,14 +507,15 @@ TasksEntry
 key
 
(Rkey&
 value 
(2.cspb.TaskSingleRvalue:8
"#
 SevenDayRewardReq
-id
 
(Rid"á

+id
 
(Rid"<EFBFBD>

 SevenDayRewardRsp(
-err_code
 
(2
.cspb.ErrCodeRerrCode>
+err_code
 
(2
+.cspb.ErrCodeRerrCode>
 Claimed (2$.cspb.SevenDayRewardRsp.ClaimedEntryRClaimed&
 rewards (2.cspb.RewardRrewards:
 ClaimedEntry
 key
 
(Rkey
-value 
(Rvalue:8
*®
+value 
(Rvalue:8
*<EFBFBD>
 ErrCode
 SUCCESS
 
@@ -483,56 +535,59 @@ TasksEntry
 PLAYER_LEVEL_NOT_ENOUGHl
 REWARD_CLAIMEDm
 TIME_OUTn
-
FUNC_NOT_OPENo
+
-SIGN_IS_FINISHEDÈ

+FUNC_NOT_OPENo
-ACCELERATION_TIME_ERROR¬
+SIGN_IS_FINISHED<10>

-DUNGEON_COUNT_NOT_ENOUGH<10>
+ACCELERATION_TIME_ERROR<10>
-DUNGEON_TYPE_INVALID‘
+DUNGEON_COUNT_NOT_ENOUGH<10>
-DUNGEON_DIFF_INVALID’
+DUNGEON_TYPE_INVALID<10>
-DUNGEON_AD_ADD_LIMIT“"
+DUNGEON_DIFF_INVALID<10>
-MASTERY_PREV_LEVEL_NOT_ENOUGHØ
+DUNGEON_AD_ADD_LIMIT<10>"
-RUNE_LEVEL_MAXÙ
+MASTERY_PREV_LEVEL_NOT_ENOUGH<10>
-RUNE_NO_NEXTÚ
+RUNE_LEVEL_MAX<10>
-CHAPTER_BEYOND_MAX_STAGE„!
+RUNE_NO_NEXT<10>
-CHAPTER_STAGE_ALREADY_REWARD…
+CHAPTER_BEYOND_MAX_STAGE<10>!
-CHAPTER_WAVE_NOT_ENOUGH†!
+CHAPTER_STAGE_ALREADY_REWARD<10>
-MALL_PAY_ORDER_CREATE_FAILEDè
+CHAPTER_WAVE_NOT_ENOUGH<10>!
-MALL_PAY_ORDER_NOT_FOUNDé 
+MALL_PAY_ORDER_CREATE_FAILED<10>
-MALL_PAY_ORDER_ID_NOT_MATCHê
+MALL_PAY_ORDER_NOT_FOUND<10> 
-MALL_PAY_ORDER_STATE_ERRORë
+MALL_PAY_ORDER_ID_NOT_MATCH<10>
-MALL_PAY_COUNT_LIMITEDì
+MALL_PAY_ORDER_STATE_ERROR<10>
-MALL_PAY_OUT_OF_TIMEí
+MALL_PAY_COUNT_LIMITED<10>
-MALL_PAY_GIFT_NOT_TRIGGERî#
+MALL_PAY_OUT_OF_TIME<10>
-MALL_PAY_FIRST_PAY_NOT_SATISFYï 
+MALL_PAY_GIFT_NOT_TRIGGER<10>#
-MALL_PAY_MON_CARD_NOT_FOUNDð 
+MALL_PAY_FIRST_PAY_NOT_SATISFY<10> 
-MALL_PAY_AD_FREE_DAILY_GIFTñ
+MALL_PAY_MON_CARD_NOT_FOUND<10> 
-MALL_PAY_DUPLICATEò
+MALL_PAY_AD_FREE_DAILY_GIFT<10>
-
IDLE_EXTRA_CDÌ
+MALL_PAY_DUPLICATE<10>
-FUND_HAS_AWARDED°	
+
-FUND_NOT_SATISFIED±	
+IDLE_EXTRA_CD<10>
-TASK_TUTOR_NOT_REACHED”
+FUND_HAS_AWARDED<10>	
+FUND_NOT_SATISFIED<10>	
+TASK_TUTOR_NOT_REACHED<10>
 
-TASK_DAILY_NOT_REACHED•
+TASK_DAILY_NOT_REACHED<EFBFBD>
 
-TASK_DAILY_CLAIMED–
+TASK_DAILY_CLAIMED<EFBFBD>
 
-TASK_SEVEN_DAY_NOT_REACHED—
+TASK_SEVEN_DAY_NOT_REACHED<EFBFBD>
 
-TASK_SEVEN_DAY_CLAIMED˜
+TASK_SEVEN_DAY_CLAIMED<EFBFBD>
 "
-TASK_SEVEN_DAY_REWARD_CLAIMED™
+TASK_SEVEN_DAY_REWARD_CLAIMED<EFBFBD>
 $
-TASK_SEVEN_DAY_DATE_NOT_REACHEDš
+TASK_SEVEN_DAY_DATE_NOT_REACHED<EFBFBD>
 '
-"TASK_SEVEN_DAY_FINISHED_NOT_ENOUGH›
+"TASK_SEVEN_DAY_FINISHED_NOT_ENOUGH<EFBFBD>
 &
-!COLLECTION_EQUIP_LEVEL_NOT_ENOUGHø
+!COLLECTION_EQUIP_LEVEL_NOT_ENOUGH<EFBFBD>
 !
-BATTLE_PASS_TASK_NOT_REACHEDÜ
+BATTLE_PASS_TASK_NOT_REACHED<10>
-BATTLE_PASS_TASK_CLAIMEDÝ
+BATTLE_PASS_TASK_CLAIMED<10>
-ENERGY_BY_DIAMOND_LIMITÀ
+ENERGY_BY_DIAMOND_LIMIT<10>
-ENERGY_BY_AD_LIMITÁ*L
+ENERGY_BY_AD_LIMIT<10>*L
-
KickOutReason
+
+KickOutReason
 MAINTAIN
 	FLOW_CTRL

 	FORBIDDEN