puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'herofund' into dev_20230829

Browse Source
This commit is contained in:
xiekaidong 2023-08-18 18:09:25 +08:00
commit 46e7fbc5de
4 changed files with 3684 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/prefabs/ui/activity/hero_fund.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7c02cce0ca97b074d8f8e5348c12bf44
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3634
Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a1b544cf1daf1aa42a94f9b8863a18aa
PrefabImporter:
externalObjects: {}
userData:
assetBundleName: prefabs/ui/activity/activity_ui.prefab.ab
assetBundleVariant:

41
Assets/proto/protocol.bytes
View File

@ -1,5 +1,5 @@
Åš ‰¡
pb/proto/protocol.protocspb"ž pb/proto/protocol.protocspb"ž
Gift Gift
act_type (RactType act_type (RactType
@ -90,7 +90,27 @@ growUpGift"U
current_grow_up_id (RcurrentGrowUpId$ current_grow_up_id (RcurrentGrowUpId$
trigger_end_at (R triggerEndAt"Q trigger_end_at (R triggerEndAt"Q
TriggerGrowUpGift2Ntf8 TriggerGrowUpGift2Ntf8
group_up_gift ( 2.cspb.ActGrowUpGift2R groupUpGift"4 group_up_gift ( 2.cspb.ActGrowUpGift2R groupUpGift"ƒ
HeroFundData!
free_awarded (R freeAwarded&
pay_low_awarded (R payLowAwarded(
pay_high_awarded (RpayHighAwarded"l
HeroFund
open_at (RopenAt(
funds ( 2.cspb.HeroFundDataRfunds
total_wave (R totalWave"4
HeroIdWithLv
id (Rid
grade (Rgrade"D
HeroFundAwardReq0
id_with_lv ( 2.cspb.HeroIdWithLvRidWithLv"–
HeroFundAwardRsp(
err_code (2 .cspb.ErrCodeRerrCode0
id_with_lv ( 2.cspb.HeroIdWithLvRidWithLv&
rewards ( 2 .cspb.RewardRrewards"4
ActIntroductoryGift ActIntroductoryGift
trigger_at (R triggerAt"Á trigger_at (R triggerAt"Á
@ -386,7 +406,11 @@ farm_count ( 2*.cspb.ChapterArmorChallenge.FarmCountEntryR farmCount
trigger_at (R triggerAt trigger_at (R triggerAt
expire_at (RexpireAt expire_at (RexpireAt
cd_end_at (RcdEndAt"a cd_end_at (RcdEndAt"8
ChapterArmorChallengeHeroesReq
heroes (Rheroes"J
ChapterArmorChallengeHeroesRsp(
err_code (2 .cspb.ErrCodeRerrCode"a
ChapterArmorChallengeStartReq( ChapterArmorChallengeStartReq(
chapter_armor_id (RchapterArmorId chapter_armor_id (RchapterArmorId
heroes (Rheroes"Œ heroes (Rheroes"Œ
@ -526,7 +550,11 @@ farm_count (R farmCount
trigger_at (R triggerAt trigger_at (R triggerAt
expire_at (RexpireAt expire_at (RexpireAt
cd_end_at (RcdEndAt"d cd_end_at (RcdEndAt"9
ChapterWeaponChallengeHeroesReq
heroes (Rheroes"K
ChapterWeaponChallengeHeroesRsp(
err_code (2 .cspb.ErrCodeRerrCode"d
ChapterWeaponChallengeStartReq* ChapterWeaponChallengeStartReq*
chapter_weapon_id (RchapterWeaponId chapter_weapon_id (RchapterWeaponId
heroes (Rheroes"n heroes (Rheroes"n
@ -931,7 +959,7 @@ facebookId"C
client_info ( 2.cspb.ClientInfoR client_info ( 2.cspb.ClientInfoR
clientInfo clientInfo
skip_guide (R skipGuide"— skip_guide (R skipGuide"Ä
LoginRsp( LoginRsp(
err_code (2 .cspb.ErrCodeRerrCode* err_code (2 .cspb.ErrCodeRerrCode*
today_first_login (RtodayFirstLogin today_first_login (RtodayFirstLogin
@ -978,7 +1006,8 @@ mall_daily ( 2.cspb.MallDailyR mallDaily+
collection$ ( 2.cspb.CollectionR collection$ ( 2.cspb.CollectionR
collection! collection!
game_version% ( R gameVersion"U game_version% ( R gameVersion+
hero_fund& ( 2.cspb.HeroFundRheroFund"U
PipedReq PipedReq
id ( Rid id ( Rid
ts (Rts ts (Rts