Merge branch 'dev_spine' of https://git.wdd817.link/puxuan/c1_unity into dev_spine

Assets/lua/app/config/hero_fund.lua.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0803f9eae8ab44b1db68e781fb086ccf
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/lua/app/config/hero_star.lua.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d1c1839fabfe443a98d76dec709c606e
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/proto/protocol.bytes

@@ -1,5 +1,5 @@
 
-Þ®
+»²
 pb/proto/protocol.protocspb"ž

 Gift
 act_type
 
(RactType
@@ -641,12 +641,11 @@ proClaimed:
 rewards (2.cspb.RewardRrewards"?
 BountyBoughtNtf
 season
 
(Rseason
-level 
(Rlevel"l
+level 
(Rlevel"D
 ChapterInfo
 total_count
 
(R
 totalCount
-index (Rindex&
-mystery_box_idx (R
mysteryBoxIdx"‚
+index (Rindex"‚
 Chapter$
 max_chapter_id
 
(RmaxChapterId
 max_wave 
(RmaxWaveA
@@ -659,13 +658,12 @@ tryMulanAtQ
 ChapterStartReq
 
 chapter_id
 
(R	chapterId
-	try_mulan 
(RtryMulan"¦

+	try_mulan 
(RtryMulan"~
 ChapterStartRsp(
 err_code
 
(2
.cspb.ErrCodeRerrCode
 
 chapter_id 
(R	chapterId"
-costs (2.cspb.RewardRcosts&
-mystery_box_idx (R
mysteryBoxIdx"œ

+costs (2.cspb.RewardRcosts"œ

 ChapterSettlementReq
 win
 
(Rwin
 
@@ -1032,7 +1030,17 @@ TeamPlayer
 robot
 
(Rrobot
 id 
(	Rid
 name 
(	Rname
-level 
(Rlevel"
+level 
(Rlevel"'
+BaseBountyGrade
+grade
 (Rgrade"À

+
+BaseBounty
+exp
 
(Rexp
+level 
(Rlevel7
+claimed (2.cspb.BaseBounty.ClaimedEntryRclaimedQ
+ClaimedEntry
+key
 
(Rkey+
+value 
(2.cspb.BaseBountyGradeRvalue:8
"
 CDKeyUseReq
 key
 
(	Rkey"_
 CDKeyUseRsp(
@@ -1130,6 +1138,13 @@ TasksEntry
 err_code
 
(2
.cspb.ErrCodeRerrCode
 hero 
(2
 .cspb.HeroRhero"
+costs (2.cspb.RewardRcosts"
+HeroStarReq
+id
 
(Rid"{
+HeroStarRsp(
+err_code
 
(2
.cspb.ErrCodeRerrCode
+hero 
(2
+.cspb.HeroRhero"
 costs (2.cspb.RewardRcosts"
 HeroPutOnReq
 id
 
(Rid"«

@@ -1829,7 +1844,7 @@ tourn_wave 
(2.cspb.TournWaveR	tournWave"
 CHAT	
 EMOJI
 
-FRAMES*¬
+FRAMES*Ò
 ErrCode
 SUCCESS
 
@@ -1855,7 +1870,16 @@ tourn_wave 
(2.cspb.TournWaveR	tournWave"
 REWARD_CLAIMEDm
 TIME_OUTn
 
FUNC_NOT_OPENo
-FIGHT_STAT_NOT_MATCHEDp
+FIGHT_STAT_NOT_MATCHEDp
+CONDITION_NOT_SATISFIEDq
+ACTIVITY_INVALIDr
+TASK_NOT_EXISTs
+SENSITIVE_WORDt
+
+WEAK_POWERu
+CLIENT_MUST_UPDATEv
+BATTLE_CHEATERw
+	MAX_LEVELx
 SIGN_IS_FINISHEDÈ

 ACCELERATION_TIME_ERROR¬#
 DUNGEON_FARM_EXCEED_MAX_FAILED<10>$