戒灵秘宝修改
parent
eba1a6bd0e
commit
663680048b
|
@ -49,7 +49,6 @@ public class TreasureActivity extends AbstractActivity {
|
||||||
}
|
}
|
||||||
activityMission.initOtherMission(levels);
|
activityMission.initOtherMission(levels);
|
||||||
long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 2) - 24 * 3600 * 1000;
|
long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 2) - 24 * 3600 * 1000;
|
||||||
user.getActivityManager().setTrsendTime(endTime);
|
|
||||||
user.getActivityManager().addActivity(sGlobalActivity.getId(), activityMission);
|
user.getActivityManager().addActivity(sGlobalActivity.getId(), activityMission);
|
||||||
// PlayerInfoProto.TreasureLevelUpIndication indication = PlayerInfoProto.TreasureLevelUpIndication.newBuilder().setLevel(user.getPlayerInfoManager().getTreasureLevel()).build();
|
// PlayerInfoProto.TreasureLevelUpIndication indication = PlayerInfoProto.TreasureLevelUpIndication.newBuilder().setLevel(user.getPlayerInfoManager().getTreasureLevel()).build();
|
||||||
// MessageUtil.sendIndicationMessage(OnlineUserManager.getSessionByUid(user.getId()),1,MessageTypeProto.MessageType.TREASURE_LEVELUP_INDICATION_VALUE,indication,true);
|
// MessageUtil.sendIndicationMessage(OnlineUserManager.getSessionByUid(user.getId()),1,MessageTypeProto.MessageType.TREASURE_LEVELUP_INDICATION_VALUE,indication,true);
|
||||||
|
|
|
@ -9,7 +9,6 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
public class ActivityManager extends MongoBase {
|
public class ActivityManager extends MongoBase {
|
||||||
private Map<Integer, ActivityMission> activityMissionMap = new HashMap<>();
|
private Map<Integer, ActivityMission> activityMissionMap = new HashMap<>();
|
||||||
private long trsendTime; // 孙龙结束时间
|
|
||||||
private long senvenTime; //七日狂欢结束时间
|
private long senvenTime; //七日狂欢结束时间
|
||||||
private LuckWheelMission luckWheel;//幸运探宝奖池
|
private LuckWheelMission luckWheel;//幸运探宝奖池
|
||||||
private LuckWheelMission luckWheelAdvance;//高级幸运探宝奖池
|
private LuckWheelMission luckWheelAdvance;//高级幸运探宝奖池
|
||||||
|
@ -52,15 +51,6 @@ public class ActivityManager extends MongoBase {
|
||||||
this.senvenTime = senvenTime;
|
this.senvenTime = senvenTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getTrsendTime() {
|
|
||||||
return trsendTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTrsendTime(long trsendTime) {
|
|
||||||
updateString("trsendTime", trsendTime);
|
|
||||||
this.trsendTime = trsendTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Map<Integer, ActivityMission> getActivityMissionMap() {
|
public Map<Integer, ActivityMission> getActivityMissionMap() {
|
||||||
return activityMissionMap;
|
return activityMissionMap;
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,6 +88,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
// updateString("treasureCumulationData",treasureCumulationData);
|
// updateString("treasureCumulationData",treasureCumulationData);
|
||||||
|
|
||||||
int[] refreshIds =resetTreasureTaskInfo(1,missionTypeEnumListMap,treasureCumulationData);
|
int[] refreshIds =resetTreasureTaskInfo(1,missionTypeEnumListMap,treasureCumulationData);
|
||||||
|
treasureCumulationData = new CumulationData();
|
||||||
CommonProto.RefreshTask.Builder task = treasureIndicationBuild(1, refreshIds);
|
CommonProto.RefreshTask.Builder task = treasureIndicationBuild(1, refreshIds);
|
||||||
PlayerInfoProto.TreasureRefreshIndication indication1 = PlayerInfoProto.TreasureRefreshIndication.newBuilder().addTasks(task.build()).build();
|
PlayerInfoProto.TreasureRefreshIndication indication1 = PlayerInfoProto.TreasureRefreshIndication.newBuilder().addTasks(task.build()).build();
|
||||||
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.TREASURE_REFRESH_INDICATION_VALUE,indication1,true);
|
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.TREASURE_REFRESH_INDICATION_VALUE,indication1,true);
|
||||||
|
@ -95,6 +96,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
case TREASH_WEEK_REFRESH:
|
case TREASH_WEEK_REFRESH:
|
||||||
int[] weekRefreshIds = resetTreasureTaskInfo(2,missionTypeEnumListMap,treasureWeekCumulationData);
|
int[] weekRefreshIds = resetTreasureTaskInfo(2,missionTypeEnumListMap,treasureWeekCumulationData);
|
||||||
if(weekRefreshIds!=null){
|
if(weekRefreshIds!=null){
|
||||||
|
treasureWeekCumulationData = new CumulationData();
|
||||||
CommonProto.RefreshTask.Builder task2= treasureIndicationBuild(2, weekRefreshIds);
|
CommonProto.RefreshTask.Builder task2= treasureIndicationBuild(2, weekRefreshIds);
|
||||||
PlayerInfoProto.TreasureRefreshIndication indication2 = PlayerInfoProto.TreasureRefreshIndication.newBuilder().addTasks(task2.build()).build();
|
PlayerInfoProto.TreasureRefreshIndication indication2 = PlayerInfoProto.TreasureRefreshIndication.newBuilder().addTasks(task2.build()).build();
|
||||||
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.TREASURE_REFRESH_INDICATION_VALUE,indication2,true);
|
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.TREASURE_REFRESH_INDICATION_VALUE,indication2,true);
|
||||||
|
@ -114,9 +116,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
System.out.println("戒灵秘宝月任务初始化");
|
treasureMonthCumulationData = new CumulationData();
|
||||||
// int[] dailyRefreshIds1 = resetTreasureTaskInfo(1,missionTypeEnumListMap,treasureCumulationData);
|
|
||||||
// int[] weekRefreshIds1 = resetTreasureTaskInfo(2,missionTypeEnumListMap,treasureWeekCumulationData);
|
|
||||||
int[] monthRefreshIds1 = resetTreasureTaskInfo(3,missionTypeEnumListMap,treasureMonthCumulationData);
|
int[] monthRefreshIds1 = resetTreasureTaskInfo(3,missionTypeEnumListMap,treasureMonthCumulationData);
|
||||||
|
|
||||||
// CommonProto.RefreshTask.Builder task3 = treasureIndicationBuild(1, dailyRefreshIds1);
|
// CommonProto.RefreshTask.Builder task3 = treasureIndicationBuild(1, dailyRefreshIds1);
|
||||||
|
@ -245,7 +245,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
}
|
}
|
||||||
if(!treasureMissionIdsType.getDoingMissionIds().isEmpty() ){
|
if(!treasureMissionIdsType.getDoingMissionIds().isEmpty() ){
|
||||||
List<STreasureSunlongTaskConfig> sTreasureTaskConfigs = STreasureSunlongTaskConfig.sTreasureTaskConfigListByTypeMapTmp.get(missionType.getMissionTypeValue());
|
List<STreasureSunlongTaskConfig> sTreasureTaskConfigs = STreasureSunlongTaskConfig.sTreasureTaskConfigListByTypeMapTmp.get(missionType.getMissionTypeValue());
|
||||||
if(sTreasureTaskConfigs!=null && user.getActivityManager().getTrsendTime()>System.currentTimeMillis()){
|
if(sTreasureTaskConfigs!=null){
|
||||||
CumulationData.Result result = treasureCumulationData.updateData(missionType, parm);
|
CumulationData.Result result = treasureCumulationData.updateData(missionType, parm);
|
||||||
CumulationData.Result weekResult = treasureWeekCumulationData.updateData(missionType, parm);
|
CumulationData.Result weekResult = treasureWeekCumulationData.updateData(missionType, parm);
|
||||||
CumulationData.Result monthResult = treasureMonthCumulationData.updateData(missionType, parm);
|
CumulationData.Result monthResult = treasureMonthCumulationData.updateData(missionType, parm);
|
||||||
|
@ -327,7 +327,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
treasureMissionIdsType.getDoingMissionIds().add(task);
|
treasureMissionIdsType.getDoingMissionIds().add(task);
|
||||||
missionStateChangeInfos.add(new MissionStateChangeInfo(task, MissionState.DOING,0));
|
missionStateChangeInfos.add(new MissionStateChangeInfo(task, MissionState.DOING,0));
|
||||||
}
|
}
|
||||||
treasureCumulationData.reset();
|
treasureCumulationData = new CumulationData();
|
||||||
updateString("treasureMissionIdsType",treasureMissionIdsType);
|
updateString("treasureMissionIdsType",treasureMissionIdsType);
|
||||||
if(type==1){
|
if(type==1){
|
||||||
updateString("treasureCumulationData",treasureCumulationData);
|
updateString("treasureCumulationData",treasureCumulationData);
|
||||||
|
|
|
@ -347,7 +347,7 @@ public class MissionLoigc {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(type == GameMisionType.TREASUREMISSION.getType() && user.getActivityManager().getTrsendTime()>System.currentTimeMillis()){
|
if(type == GameMisionType.TREASUREMISSION.getType()){
|
||||||
|
|
||||||
Map<GameMisionType, List<MissionStateChangeInfo>> gameMisionTypeListMap = userMissionManager.onGameEvent(user, GameEvent.TREASURE_MISSION_REWARD, missionId);
|
Map<GameMisionType, List<MissionStateChangeInfo>> gameMisionTypeListMap = userMissionManager.onGameEvent(user, GameEvent.TREASURE_MISSION_REWARD, missionId);
|
||||||
missionStateChangeInfos = gameMisionTypeListMap.get(GameMisionType.TREASUREMISSION);
|
missionStateChangeInfos = gameMisionTypeListMap.get(GameMisionType.TREASUREMISSION);
|
||||||
|
|
|
@ -13,7 +13,9 @@ import com.ljsd.jieling.globals.Global;
|
||||||
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
||||||
import com.ljsd.jieling.logic.activity.ActivityType;
|
import com.ljsd.jieling.logic.activity.ActivityType;
|
||||||
import com.ljsd.jieling.logic.dao.*;
|
import com.ljsd.jieling.logic.dao.*;
|
||||||
|
import com.ljsd.jieling.logic.dao.root.GuildInfo;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
|
import com.ljsd.jieling.logic.family.GuildLogic;
|
||||||
import com.ljsd.jieling.logic.fight.CombatLogic;
|
import com.ljsd.jieling.logic.fight.CombatLogic;
|
||||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||||
import com.ljsd.jieling.logic.mail.MailLogic;
|
import com.ljsd.jieling.logic.mail.MailLogic;
|
||||||
|
@ -594,7 +596,12 @@ public class PlayerLogic {
|
||||||
cache.setName(playerInfoManager.getNickName());
|
cache.setName(playerInfoManager.getNickName());
|
||||||
cache.setLevel(playerInfoManager.getLevel());
|
cache.setLevel(playerInfoManager.getLevel());
|
||||||
cache.setServerId(GameApplication.serverId);
|
cache.setServerId(GameApplication.serverId);
|
||||||
cache.setGuildPosition(0);
|
if(user.getPlayerInfoManager().getGuildId()==0){
|
||||||
|
cache.setGuildPosition(0);
|
||||||
|
}else{
|
||||||
|
int memberType = GuildLogic.getMemberType(user.getId(), GuilidManager.guildInfoMap.get(user.getPlayerInfoManager().getGuildId()).getMembers());
|
||||||
|
cache.setGuildPosition(memberType);
|
||||||
|
}
|
||||||
RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE,"",String.valueOf(user.getId()),cache);
|
RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE,"",String.valueOf(user.getId()),cache);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue