Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
commit
c264817928
|
@ -797,6 +797,9 @@ public class RedisUtil {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void zsetRemoveOne(String key, String value){
|
public void zsetRemoveOne(String key, String value){
|
||||||
|
if(key.contains(RedisKey.CAR_DEALY_RANK)){
|
||||||
|
LOGGER.info("此处删除了车迟斗法排行key:{},value:{}",key,value);
|
||||||
|
}
|
||||||
for (int i = 0; i < MAX_TRY_TIMES; i++) {
|
for (int i = 0; i < MAX_TRY_TIMES; i++) {
|
||||||
try {
|
try {
|
||||||
redisTemplate.opsForZSet().remove(key, value);
|
redisTemplate.opsForZSet().remove(key, value);
|
||||||
|
|
|
@ -88,6 +88,8 @@ public class ActivityLogic implements IEventHandler{
|
||||||
user.getPlayerInfoManager().getRechargeInfo().setDailyFirst(0);
|
user.getPlayerInfoManager().getRechargeInfo().setDailyFirst(0);
|
||||||
//更新累计充值天数
|
//更新累计充值天数
|
||||||
ActivityLogic.getInstance().resumeActivity(user, ActivityType.RECHARGE_SUM_DAY);
|
ActivityLogic.getInstance().resumeActivity(user, ActivityType.RECHARGE_SUM_DAY);
|
||||||
|
|
||||||
|
ActivityLogic.getInstance().resumeActivity(user,ActivityType.JADE_DYNASTY_MISSION);
|
||||||
user.getPlayerInfoManager().setRechargedaily(0);
|
user.getPlayerInfoManager().setRechargedaily(0);
|
||||||
user.getPlayerInfoManager().setLuckWheelLimitTime(0);
|
user.getPlayerInfoManager().setLuckWheelLimitTime(0);
|
||||||
user.getPlayerInfoManager().setLuckAdvanceWheelLimitTime(0);
|
user.getPlayerInfoManager().setLuckAdvanceWheelLimitTime(0);
|
||||||
|
|
|
@ -18,7 +18,7 @@ public class JadeDynastyTaskActivity extends AbstractActivity {
|
||||||
public void onResume(User user) throws Exception {
|
public void onResume(User user) throws Exception {
|
||||||
LOGGER.info("[破阵诛仙任务活动刷新] [uid:{}] [activityId:{}]",user.getId(),id);
|
LOGGER.info("[破阵诛仙任务活动刷新] [uid:{}] [activityId:{}]",user.getId(),id);
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.JADE_DYNASTY_REFRESH, id);
|
user.getUserMissionManager().onGameEvent(user, GameEvent.JADE_DYNASTY_REFRESH, id);
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.JADE_DYNASTY_WEEK_REFRESH, id);
|
// user.getUserMissionManager().onGameEvent(user, GameEvent.JADE_DYNASTY_WEEK_REFRESH, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -144,20 +144,12 @@ public class UserMissionManager extends MongoBase {
|
||||||
int jadeAId = (int) parm[0];//当前轮次破阵诛仙的活动ID
|
int jadeAId = (int) parm[0];//当前轮次破阵诛仙的活动ID
|
||||||
int[] mIds = resetJadeDynastyTaskInfo(1,jadeAId,missionTypeEnumListMap,jadeDynastyCumulationData);
|
int[] mIds = resetJadeDynastyTaskInfo(1,jadeAId,missionTypeEnumListMap,jadeDynastyCumulationData);
|
||||||
jadeDynastyCumulationData = new CumulationData();
|
jadeDynastyCumulationData = new CumulationData();
|
||||||
int nextRefreshTime= (int) (TimeUtils.getLastOrUnderHour(TimeUtils.now(), 5, 0,false)/1000);
|
|
||||||
CommonProto.RefreshTask.Builder t = treasureIndicationBuild(1, mIds).setRefreshTime(nextRefreshTime);
|
|
||||||
PlayerInfoProto.JadeDynastyRefreshIndication indi = PlayerInfoProto.JadeDynastyRefreshIndication.newBuilder().addTasks(t.build()).build();
|
|
||||||
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.JADE_DYNASTY_REFRESH_INDICATION_VALUE,indi,true);
|
|
||||||
break;
|
break;
|
||||||
case JADE_DYNASTY_WEEK_REFRESH:
|
case JADE_DYNASTY_WEEK_REFRESH:
|
||||||
int jadeAid = (int) parm[0];//当前轮次破阵诛仙的活动ID
|
int jadeAid = (int) parm[0];//当前轮次破阵诛仙的活动ID
|
||||||
int[] weekMIds = resetJadeDynastyTaskInfo(2,jadeAid,missionTypeEnumListMap,jadeDynastyWeekCumulationData);
|
int[] weekMIds = resetJadeDynastyTaskInfo(2,jadeAid,missionTypeEnumListMap,jadeDynastyWeekCumulationData);
|
||||||
if(weekMIds != null){
|
if(weekMIds != null){
|
||||||
jadeDynastyWeekCumulationData = new CumulationData();
|
jadeDynastyWeekCumulationData = new CumulationData();
|
||||||
int weekRefreshTime = (int)(TimeUtils.getNextWeekendStartTime(1,5)/1000);
|
|
||||||
CommonProto.RefreshTask.Builder task2= treasureIndicationBuild(2, weekMIds).setRefreshTime(weekRefreshTime);
|
|
||||||
PlayerInfoProto.JadeDynastyRefreshIndication indication2 = PlayerInfoProto.JadeDynastyRefreshIndication.newBuilder().addTasks(task2.build()).build();
|
|
||||||
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.JADE_DYNASTY_REFRESH_INDICATION_VALUE,indication2,true);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SERVENHAPPY_REFRESH:
|
case SERVENHAPPY_REFRESH:
|
||||||
|
@ -559,7 +551,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
private int[] resetJadeDynastyTaskInfo(int type, int activityId, Map<GameMisionType, List<MissionStateChangeInfo>> missionTypeEnumListMap,CumulationData jadeDynastyCumulationData){
|
private int[] resetJadeDynastyTaskInfo(int type, int activityId, Map<GameMisionType, List<MissionStateChangeInfo>> missionTypeEnumListMap,CumulationData jadeDynastyCumulationData){
|
||||||
//周刷新检测
|
//周刷新检测
|
||||||
if (type == 2) {
|
if (type == 2) {
|
||||||
if (jadeDynastyMissionType.getWeekRefresh() != 0 && !TimeUtils.isSpanTime(jadeDynastyMissionType.getWeekRefresh(), TimeUtils.now(), 1, 5)) {
|
if (jadeDynastyMissionType.getWeekRefresh() != 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
jadeDynastyMissionType.setWeekRefresh(TimeUtils.now());
|
jadeDynastyMissionType.setWeekRefresh(TimeUtils.now());
|
||||||
|
|
Loading…
Reference in New Issue