Merge branch 'herofund' into dev_20230829
This commit is contained in:
commit
46e7fbc5de
8
Assets/prefabs/ui/activity/hero_fund.meta
Normal file
8
Assets/prefabs/ui/activity/hero_fund.meta
Normal 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
3634
Assets/prefabs/ui/activity/hero_fund/activity_herofund_ui.prefab
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a1b544cf1daf1aa42a94f9b8863a18aa
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: prefabs/ui/activity/activity_ui.prefab.ab
|
||||
assetBundleVariant:
|
||||
@ -1,5 +1,5 @@
|
||||
|
||||
Åš
|
||||
‰¡
|
||||
pb/proto/protocol.protocspb"ž
|
||||
Gift
|
||||
act_type (RactType
|
||||
@ -90,7 +90,27 @@ growUpGift"U
|
||||
current_grow_up_id (RcurrentGrowUpId$
|
||||
trigger_end_at (RtriggerEndAt"Q
|
||||
TriggerGrowUpGift2Ntf8
|
||||
group_up_gift (2.cspb.ActGrowUpGift2RgroupUpGift"4
|
||||
group_up_gift (2.cspb.ActGrowUpGift2RgroupUpGift"ƒ
|
||||
HeroFundData!
|
||||
free_awarded (RfreeAwarded&
|
||||
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
|
||||
|
||||
trigger_at (R triggerAt"Á
|
||||
@ -386,7 +406,11 @@ farm_count (2*.cspb.ChapterArmorChallenge.FarmCountEntryR farmCount
|
||||
|
||||
trigger_at (R triggerAt
|
||||
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(
|
||||
chapter_armor_id (RchapterArmorId
|
||||
heroes (Rheroes"Œ
|
||||
@ -526,7 +550,11 @@ farm_count (R farmCount
|
||||
|
||||
trigger_at (R triggerAt
|
||||
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*
|
||||
chapter_weapon_id (RchapterWeaponId
|
||||
heroes (Rheroes"n
|
||||
@ -931,7 +959,7 @@ facebookId"C
|
||||
client_info (2.cspb.ClientInfoR
|
||||
clientInfo
|
||||
|
||||
skip_guide (R skipGuide"—
|
||||
skip_guide (R skipGuide"Ä
|
||||
LoginRsp(
|
||||
err_code (2
.cspb.ErrCodeRerrCode*
|
||||
today_first_login (RtodayFirstLogin
|
||||
@ -978,7 +1006,8 @@ mall_daily (2.cspb.MallDailyR mallDaily+
|
||||
|
||||
collection$ (2.cspb.CollectionR
|
||||
collection!
|
||||
game_version% ( RgameVersion"U
|
||||
game_version% ( RgameVersion+
|
||||
hero_fund& (2.cspb.HeroFundRheroFund"U
|
||||
PipedReq
|
||||
id (
Rid
|
||||
ts (Rts
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user