Merge branch 'master_dev' into master_otnew
commit
1f87c29b53
|
@ -141,6 +141,8 @@ public interface ActivityType {
|
||||||
|
|
||||||
int LINGLONG_BAOJING_TASK = 20014;//玲珑宝镜任务
|
int LINGLONG_BAOJING_TASK = 20014;//玲珑宝镜任务
|
||||||
|
|
||||||
|
int BAUBLES_SUMMON_GIFT = 20015;//法宝召唤礼包
|
||||||
|
|
||||||
//***************************************bt活动=====================================//
|
//***************************************bt活动=====================================//
|
||||||
|
|
||||||
int BRUSH_PRIVILEGE = 103;//刷充特权
|
int BRUSH_PRIVILEGE = 103;//刷充特权
|
||||||
|
|
|
@ -122,6 +122,7 @@ public enum ActivityTypeEnum {
|
||||||
LINGLONG_BAOJING_TASK(ActivityType.LINGLONG_BAOJING_TASK, DefaultEmptyActivity::new),//玲珑宝镜任务
|
LINGLONG_BAOJING_TASK(ActivityType.LINGLONG_BAOJING_TASK, DefaultEmptyActivity::new),//玲珑宝镜任务
|
||||||
NOVICE_GEM_CHEST(ActivityType.NOVICE_GEM_CHEST, GemChestActivity::new),//初级命石宝箱
|
NOVICE_GEM_CHEST(ActivityType.NOVICE_GEM_CHEST, GemChestActivity::new),//初级命石宝箱
|
||||||
ADVANCED_GEM_CHEST(ActivityType.ADVANCED_GEM_CHEST, GemChestActivity::new),//高级命石宝箱
|
ADVANCED_GEM_CHEST(ActivityType.ADVANCED_GEM_CHEST, GemChestActivity::new),//高级命石宝箱
|
||||||
|
BAUBLES_SUMMON_GIFT(ActivityType.BAUBLES_SUMMON_GIFT, DefaultEmptyActivity::new),//法宝召唤礼包
|
||||||
|
|
||||||
/****************************************************** bt **********************************************************/
|
/****************************************************** bt **********************************************************/
|
||||||
BRUSH_PRIVILEGE(ActivityType.BRUSH_PRIVILEGE, BrushPrivilegeActivity::new),//刷充特权
|
BRUSH_PRIVILEGE(ActivityType.BRUSH_PRIVILEGE, BrushPrivilegeActivity::new),//刷充特权
|
||||||
|
|
Loading…
Reference in New Issue