新百宝商会活动
parent
71285d2eb7
commit
091cf93f40
|
@ -331,8 +331,8 @@ public interface BIReason {
|
|||
int ACTIVE_USERSKIN = 1089;// 激活玩家皮肤
|
||||
int ACTIVE_TITLE = 1090;// 激活玩家称号
|
||||
int ACTIVE_MOUNT = 1091;// 激活玩家坐骑
|
||||
int EQUIP_UPLEVEL_COST = 1092;//装备升星消耗
|
||||
int EQUIP_UPLEVEL_REWARD = 1093;//装备升星获得
|
||||
int EQUIP_UPLEVEL_COST = 1092;//装备升星消耗(云游商人)
|
||||
int EQUIP_UPLEVEL_REWARD = 1093;//装备升星获得(云游商人)
|
||||
int TA_SUI_LING_XIAO = 1094;//踏碎凌霄
|
||||
int MORALE_LEVEL_UP_CONSUME = 1095;//士气等级提升消耗
|
||||
int HARD_STAGE_GET = 1096;//山河社稷图获得
|
||||
|
|
|
@ -155,8 +155,11 @@ public class ActivityLogic implements IEventHandler{
|
|||
public final static ActivityLogic instance = new ActivityLogic();
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查活动状态
|
||||
* @throws Exception
|
||||
*/
|
||||
public void checkActiviyStatus() throws Exception {
|
||||
|
||||
long now = System.currentTimeMillis();
|
||||
Map<Integer, SGlobalActivity> sGlobalActivityMap = SGlobalActivity.getsGlobalActivityMap();
|
||||
|
||||
|
@ -345,6 +348,13 @@ public class ActivityLogic implements IEventHandler{
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查用户身上的活动
|
||||
* @param user
|
||||
* @param builder
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
public Set<Integer> checkActivityOfUser(User user, PlayerInfoProto.ActivityUpateIndication.Builder builder) throws Exception {
|
||||
long now = TimeUtils.now();
|
||||
if(user==null){
|
||||
|
@ -377,8 +387,8 @@ public class ActivityLogic implements IEventHandler{
|
|||
}
|
||||
}
|
||||
}
|
||||
for (SActivityRewardConfig Config:sActivityRewardConfigs) {
|
||||
if(!activityMission.getActivityMissionMap().containsKey(Config.getId())){
|
||||
for (SActivityRewardConfig config:sActivityRewardConfigs) {
|
||||
if(!activityMission.getActivityMissionMap().containsKey(config.getId())){
|
||||
if(activityMission.getActivityState()==2){
|
||||
activityMission.setActivityState(1);
|
||||
}
|
||||
|
@ -386,7 +396,7 @@ public class ActivityLogic implements IEventHandler{
|
|||
activityProgressInfo.setProgrss(ActivityLogic.getInstance().getInitActivityMissionProgress(openActivityId));
|
||||
activityProgressInfo.setState(0);
|
||||
activityProgressInfo.setProgrss(chargeMoneyCount);
|
||||
activityMission.getActivityMissionMap().put(Config.getId(), activityProgressInfo);
|
||||
activityMission.getActivityMissionMap().put(config.getId(), activityProgressInfo);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -525,6 +535,12 @@ public class ActivityLogic implements IEventHandler{
|
|||
MessageUtil.sendIndicationMessage(session, 1, MessageTypeProto.MessageType.LUCKWHEEL_POOL_INDICATION_VALUE, builder.build(), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取活动信息
|
||||
* @param activityMissionMap
|
||||
* @param createTime
|
||||
* @return
|
||||
*/
|
||||
public List<CommonProto.ActivityInfo> getActivityInfos(Map<Integer, ActivityMission> activityMissionMap, long createTime) {
|
||||
Map<Integer, SGlobalActivity> sGlobalActivityMap = SGlobalActivity.getsGlobalActivityMap();
|
||||
List<CommonProto.ActivityInfo> activityInfoList = new ArrayList<>(activityMissionMap.size());
|
||||
|
|
|
@ -113,4 +113,6 @@ public interface ActivityType {
|
|||
|
||||
int SEVEN_WORLD_TREASURE = 83;//七界秘宝
|
||||
int RIDING_SWARD = 84;//御剑飞行
|
||||
|
||||
int ITEMS_STORE_NEW = 6001;//新百宝商会
|
||||
}
|
||||
|
|
|
@ -86,6 +86,7 @@ public enum ActivityTypeEnum {
|
|||
SEVEN_WORLD_TREASURE(ActivityType.SEVEN_WORLD_TREASURE,SevenWorldActivity::new),
|
||||
LING_LONG_PAVILION(ActivityType.LING_LONG_PAVILION,DefaultEmptyActivity::new),
|
||||
RIDING_SWARD(ActivityType.RIDING_SWARD,RidingSwardActivity::new),
|
||||
ITEMS_STORE_NEW(ActivityType.ITEMS_STORE_NEW,SuperBoxActivity::new),
|
||||
;
|
||||
|
||||
private int type;
|
||||
|
|
|
@ -10,9 +10,6 @@ import com.ljsd.jieling.network.session.ISession;
|
|||
import config.SActivityRewardConfig;
|
||||
import util.TimeUtils;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
class SignInSumActivity extends AbstractActivity {
|
||||
|
||||
|
@ -26,7 +23,9 @@ class SignInSumActivity extends AbstractActivity {
|
|||
|
||||
@Override
|
||||
public void onEvent(IEvent event) throws Exception {
|
||||
if(!(event instanceof SignInEvent)) return;
|
||||
if(!(event instanceof SignInEvent)){
|
||||
return;
|
||||
}
|
||||
update(UserManager.getUser(((SignInEvent) event).getUid()),1);
|
||||
}
|
||||
|
||||
|
@ -47,7 +46,6 @@ class SignInSumActivity extends AbstractActivity {
|
|||
if (day > 1){
|
||||
// 初始化
|
||||
ActivityLogic.getInstance().initMissionInfo(activityMission,id);
|
||||
|
||||
activityMission.setV(count);
|
||||
}else {
|
||||
activityMission.setV(count + activityMission.getV());
|
||||
|
|
|
@ -25,12 +25,14 @@ import java.util.stream.Collectors;
|
|||
* 惊喜礼盒活动
|
||||
*
|
||||
* 礼盒状态:
|
||||
* 已解锁可购买 1
|
||||
* 已解锁不可购买 2
|
||||
* 未解锁可见可预览 3
|
||||
* 未解锁可见不可预览 4
|
||||
* 未解锁不可见 5
|
||||
* 已购买 6
|
||||
* 1:已解锁,可购买
|
||||
* 2:已解锁,不可买,未到购买天数
|
||||
* 3:已解锁,不可买,未购买前置礼包
|
||||
* 4:已解锁,不可买,未激活特权
|
||||
* 5:未解锁,不可见
|
||||
* 6:未解锁,可见,可预览
|
||||
* 7:未解锁,可见,不可预览
|
||||
* 8:已购买
|
||||
*/
|
||||
@SuppressWarnings("ALL")
|
||||
public class SuperBoxActivity extends AbstractActivity {
|
||||
|
|
|
@ -32,11 +32,14 @@ public class TimeLimitWelfareBag extends AbstractWelfareBag {
|
|||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean buy() {
|
||||
SRechargeCommodityNewConfig commodityNewConfig = SRechargeCommodityNewConfig.getConfigById(getModId());
|
||||
if(super.buy()){
|
||||
setRefreshTime(TimeUtils.getTodayZero() + commodityNewConfig.getDailyUpdate() * TimeUtils.DAY);
|
||||
return true;
|
||||
}else {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue