Merge branch 'dh_dev_seven' into master_test_gn
commit
2514e19137
|
@ -96,6 +96,7 @@ public interface ActivityType {
|
||||||
int NEW_GENERAL_ATTACK = 200;//新将来袭
|
int NEW_GENERAL_ATTACK = 200;//新将来袭
|
||||||
|
|
||||||
int SUPER_BOX = 69;//惊喜礼盒
|
int SUPER_BOX = 69;//惊喜礼盒
|
||||||
|
int SUPER_DISCOUNT_SKIN = 73;//特惠神装
|
||||||
int HERO_STAR = 500;
|
int HERO_STAR = 500;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,6 +75,7 @@ public enum ActivityTypeEnum {
|
||||||
HARD_STAGE_EXERCISE(ActivityType.HARD_STAGE_EXERCISE,HardStageExerciseActivity::new),
|
HARD_STAGE_EXERCISE(ActivityType.HARD_STAGE_EXERCISE,HardStageExerciseActivity::new),
|
||||||
SUPER_BOX(ActivityType.SUPER_BOX,SuperBoxActivity::new),
|
SUPER_BOX(ActivityType.SUPER_BOX,SuperBoxActivity::new),
|
||||||
HERO_STAR(ActivityType.HERO_STAR,HeroStarActivity::new),
|
HERO_STAR(ActivityType.HERO_STAR,HeroStarActivity::new),
|
||||||
|
SUPER_DISCOUNT_SKIN(ActivityType.SUPER_DISCOUNT_SKIN,SuperBoxActivity::new),
|
||||||
;
|
;
|
||||||
private int type;
|
private int type;
|
||||||
private Function<Integer, AbstractActivity> toActivityFunction;
|
private Function<Integer, AbstractActivity> toActivityFunction;
|
||||||
|
|
Loading…
Reference in New Issue