新增活动gm礼包

master_dev
grimm 2024-02-22 11:22:57 +08:00
parent 23ffa5b58b
commit d122ae17b5
3 changed files with 6 additions and 21 deletions

View File

@ -135,16 +135,14 @@ public interface ActivityType {
int DRAW_FABAO_LV_CHEST = 119;//抽卡等级宝箱
int TIAN_JIANG_GIFT = 120;//天降礼包
int DA_NAO_TIAN_GONG = 121;//大闹天宫
int NOVICE_GEM_CHEST = 123;//初级宝石宝箱
int ADVANCED_GEM_CHEST = 124;//高级宝石宝箱
int LINGLONG_BAOJING_TASK = 20014;//玲珑宝镜任务
int BAUBLES_SUMMON_GIFT = 20015;//法宝召唤礼包
int GM_DAILY_GIFT = 10011;//gm每日礼包
int GM_WEEK_GIFT = 10012;//gm每周礼包
//***************************************bt活动=====================================//
int BRUSH_PRIVILEGE = 103;//刷充特权
int INFINITE_RESOURCES_PAVILION = 104;//无限资源阁
int ALL_PEOPLE_WELFARE = 105;//全民福利

View File

@ -138,6 +138,8 @@ public enum ActivityTypeEnum {
GOD_MONEY_TOTLE_RECHARGE(ActivityType.GOD_MONEY_TOTLE_RECHARGE, MoneyTotalRechargeActivity::new),//仙晶累充
FENGSHEN_TREASURE_TWO(ActivityType.FENGSHEN_TREASURE_TWO, FengshenTreasureActivity::new),//封神奖励
FENGSHEN_TREASURE_THREE(ActivityType.FENGSHEN_TREASURE_THREE, FengshenTreasureActivity::new),//封神奖励
GM_DAILY_GIFT(ActivityType.GM_DAILY_GIFT, DefaultEmptyActivity::new),//gm每日礼包
GM_WEEK_GIFT(ActivityType.GM_WEEK_GIFT, DefaultEmptyActivity::new),//gm每周礼包
;
private int type;

View File

@ -35,7 +35,7 @@ public class SuperFundNewActivity extends AbstractActivity {
Poster.getPoster().listenEvent(this, SuperBoxEvent.class);
}
private static int finish = 2;
private static final int finish = 2;
@Override
public void initActivity(User user) throws Exception {
@ -70,9 +70,6 @@ public class SuperFundNewActivity extends AbstractActivity {
/**
*
* @param user
* @param typeId
* @throws Exception
*/
private void zeroRefresh(User user, int typeId) throws Exception {
if (typeId != SuperBoxEvent.zero_init){
@ -82,7 +79,7 @@ public class SuperFundNewActivity extends AbstractActivity {
if (mission == null){
return;
}
long count = SLuxuryFund.typeMap.get(id).values().stream().count();
long count = SLuxuryFund.typeMap.get(id).values().size();
long count1 = mission.getActivityMissionMap().values().stream().filter(v -> v.getState() == finish).count();
if (count == count1){
initActivity(user);
@ -91,7 +88,6 @@ public class SuperFundNewActivity extends AbstractActivity {
/**
*
* @param user
*/
private void updateValue(User user, int giftId){
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id);
@ -142,10 +138,6 @@ public class SuperFundNewActivity extends AbstractActivity {
/**
*
* @param activityMission
* @param progressInfo
* @param fund
* @return
*/
private int getState(ActivityMission activityMission, ActivityProgressInfo progressInfo, SLuxuryFund fund){
int state;
@ -162,10 +154,6 @@ public class SuperFundNewActivity extends AbstractActivity {
/**
*
* @param session
* @param missionId
* @return
* @throws Exception
*/
@Override
public boolean takeReward(ISession session, int missionId) throws Exception {
@ -206,9 +194,6 @@ public class SuperFundNewActivity extends AbstractActivity {
/**
*
* @param user
* @return
* @throws Exception
*/
private ReceiveWelfareBag getBagInfo(User user){
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id);