热更,修复天天0.1bug

master_zzxx
grimm 2024-07-02 15:33:21 +08:00
parent 8fd4a60e94
commit 67b39bdd22
3 changed files with 25 additions and 15 deletions

View File

@ -1,6 +1,7 @@
{ {
"version":"6", "version":"7",
"classes": [ "classes": [
{"name":"MissionEventDistributor.class","fullName":"com.ljsd.jieling.logic.mission.event.MissionEventDistributor"} {"name":"MissionEventDistributor.class","fullName":"com.ljsd.jieling.logic.mission.event.MissionEventDistributor"},
{"name":"EveryDayDiscountType.class","fullName":"com.ljsd.jieling.logic.mission.main.EveryDayDiscountType"}
] ]
} }

View File

@ -371,35 +371,38 @@ public class MissionEventDistributor {
SThemeActivityTaskConfig config = SThemeActivityTaskConfig.idTaskConfig.get(missionStateChangeInfo.getMissionId()); SThemeActivityTaskConfig config = SThemeActivityTaskConfig.idTaskConfig.get(missionStateChangeInfo.getMissionId());
progress = MissionLoigc.getDoingProgress(user,user.getUserMissionManager().getDonghaiXunxianData(), config.getTaskType(), config.getTaskValue()[0]); progress = MissionLoigc.getDoingProgress(user,user.getUserMissionManager().getDonghaiXunxianData(), config.getTaskType(), config.getTaskValue()[0]);
} }
//TODO
if (gameMisionType == GameMisionType.EXPLORE){ if (gameMisionType == GameMisionType.EXPLORE){
SExploreTask exploreTask = STableManager.getConfig(SExploreTask.class).get(missionStateChangeInfo.getMissionId()); SExploreTask exploreTask = STableManager.getConfig(SExploreTask.class).get(missionStateChangeInfo.getMissionId());
progress = MissionLoigc.getDoingProgress(user,user.getUserMissionManager().getDonghaiXunxianData(), exploreTask.getType(), exploreTask.getValues()[0]); progress = MissionLoigc.getDoingProgress(user,user.getUserMissionManager().getDonghaiXunxianData(), exploreTask.getType(), exploreTask.getValues()[0]);
} }
if (gameMisionType == GameMisionType.EVERY_DAY_DISCOUNT){
SEveryDayGiftTask dayGiftTask = SEveryDayGiftTask.map.get(missionStateChangeInfo.getMissionId());
progress = MissionLoigc.getDoingProgress(user,user.getUserMissionManager().getDonghaiXunxianData(), dayGiftTask.getTaskType(), dayGiftTask.getTaskValue()[0]);
}
} }
// 已完成或者已领取的任务 // 已完成或者已领取的任务
if(missionState == MissionState.FINISH || missionState == MissionState.REWARD){ if(missionState == MissionState.FINISH || missionState == MissionState.REWARD){
if(gameMisionType == GameMisionType.VIPMISSION){ if (gameMisionType == GameMisionType.VIPMISSION){
STaskConfig sTaskConfig = STaskConfig.getsTaskConfigById(missionStateChangeInfo.getMissionId()); STaskConfig sTaskConfig = STaskConfig.getsTaskConfigById(missionStateChangeInfo.getMissionId());
progress = sTaskConfig.getTaskValue()[1][0]; progress = sTaskConfig.getTaskValue()[1][0];
} }
if(gameMisionType == GameMisionType.DAILYMISSION){ if (gameMisionType == GameMisionType.DAILYMISSION){
SDailyTasksConfig sDailyTasksConfig = SDailyTasksConfig.getSDailyTasksConfigById(missionStateChangeInfo.getMissionId()); SDailyTasksConfig sDailyTasksConfig = SDailyTasksConfig.getSDailyTasksConfigById(missionStateChangeInfo.getMissionId());
progress = sDailyTasksConfig.getValues()[1][0]; progress = sDailyTasksConfig.getValues()[1][0];
} }
if(gameMisionType == GameMisionType.BEGINNERMISSION){ if (gameMisionType == GameMisionType.BEGINNERMISSION){
SBeginnerTask sBeginnerTask = SBeginnerTask.sBeginnerTaskCongigMap.get(missionStateChangeInfo.getMissionId()); SBeginnerTask sBeginnerTask = SBeginnerTask.sBeginnerTaskCongigMap.get(missionStateChangeInfo.getMissionId());
progress = sBeginnerTask.getTaskValue()[1][0]; progress = sBeginnerTask.getTaskValue()[1][0];
} }
if(gameMisionType == GameMisionType.TREASUREMISSION){ if (gameMisionType == GameMisionType.TREASUREMISSION){
STreasureSunlongTaskConfig sunlongTaskConfig = STreasureSunlongTaskConfig.treasureTaskConfig.get(missionStateChangeInfo.getMissionId()); STreasureSunlongTaskConfig sunlongTaskConfig = STreasureSunlongTaskConfig.treasureTaskConfig.get(missionStateChangeInfo.getMissionId());
progress = sunlongTaskConfig.getTaskValue()[1][0]; progress = sunlongTaskConfig.getTaskValue()[1][0];
} }
if(gameMisionType == GameMisionType.ACHIEVEMISSION){ if (gameMisionType == GameMisionType.ACHIEVEMISSION){
SAchievementConfig sAchievementConfig = STableManager.getConfig(SAchievementConfig.class).get(missionStateChangeInfo.getMissionId()); SAchievementConfig sAchievementConfig = STableManager.getConfig(SAchievementConfig.class).get(missionStateChangeInfo.getMissionId());
progress = sAchievementConfig.getValues()[1][0]; progress = sAchievementConfig.getValues()[1][0];
} }
if(gameMisionType == GameMisionType.HOME_MISSION){ if (gameMisionType == GameMisionType.HOME_MISSION){
SHomeLandTask homeLandTask = STableManager.getConfig(SHomeLandTask.class).get(missionStateChangeInfo.getMissionId()); SHomeLandTask homeLandTask = STableManager.getConfig(SHomeLandTask.class).get(missionStateChangeInfo.getMissionId());
progress = homeLandTask.getValues()[1][0]; progress = homeLandTask.getValues()[1][0];
} }
@ -407,15 +410,15 @@ public class MissionEventDistributor {
SThemeActivityTaskConfig config = SThemeActivityTaskConfig.idTaskConfig.get(missionStateChangeInfo.getMissionId()); SThemeActivityTaskConfig config = SThemeActivityTaskConfig.idTaskConfig.get(missionStateChangeInfo.getMissionId());
progress = config.getTaskValue()[1][0]; progress = config.getTaskValue()[1][0];
} }
if(gameMisionType == GameMisionType.EXPLORE){ if (gameMisionType == GameMisionType.EXPLORE){
SExploreTask exploreTask = STableManager.getConfig(SExploreTask.class).get(missionStateChangeInfo.getMissionId()); SExploreTask exploreTask = STableManager.getConfig(SExploreTask.class).get(missionStateChangeInfo.getMissionId());
progress = exploreTask.getValues()[1][0]; progress = exploreTask.getValues()[1][0];
} }
if(gameMisionType == GameMisionType.EVERY_DAY_DISCOUNT){ if (gameMisionType == GameMisionType.EVERY_DAY_DISCOUNT){
SEveryDayGiftTask task = SEveryDayGiftTask.map.get(missionStateChangeInfo.getMissionId()); SEveryDayGiftTask task = SEveryDayGiftTask.map.get(missionStateChangeInfo.getMissionId());
progress = task.getTaskValue()[1][0]; progress = task.getTaskValue()[1][0];
} }
if(gameMisionType == GameMisionType.SEVENMISSION){ if (gameMisionType == GameMisionType.SEVENMISSION){
STreasureTaskConfig sTreasureTaskConfig = STreasureTaskConfig.sTreasureTaskConfigMap.get(missionStateChangeInfo.getMissionId()); STreasureTaskConfig sTreasureTaskConfig = STreasureTaskConfig.sTreasureTaskConfigMap.get(missionStateChangeInfo.getMissionId());
if(sTreasureTaskConfig.getTaskType() != MissionType.SENVER_HAPPY.getMissionTypeValue()){ if(sTreasureTaskConfig.getTaskType() != MissionType.SENVER_HAPPY.getMissionTypeValue()){
progress= sTreasureTaskConfig.getTaskValue()[1][0]; progress= sTreasureTaskConfig.getTaskValue()[1][0];
@ -439,10 +442,9 @@ public class MissionEventDistributor {
} }
Map<GameMisionType, List<MissionStateChangeInfo>> missionTypeEnumListMap = threadMissionChangeList.get(); Map<GameMisionType, List<MissionStateChangeInfo>> missionTypeEnumListMap = threadMissionChangeList.get();
try { try {
if(missionTypeEnumListMap == null){ if (missionTypeEnumListMap == null){
missionTypeEnumListMap = new HashMap<>(1); missionTypeEnumListMap = new HashMap<>(1);
} }
processor.onGameEvent(user,missionTypeEnumListMap,event,parm); processor.onGameEvent(user,missionTypeEnumListMap,event,parm);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

View File

@ -9,6 +9,7 @@ import com.ljsd.jieling.logic.mission.data.AbstractDataManager;
import com.ljsd.jieling.logic.mission.data.DataManagerDistributor; import com.ljsd.jieling.logic.mission.data.DataManagerDistributor;
import config.SEveryDayGiftTask; import config.SEveryDayGiftTask;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -51,7 +52,13 @@ public class EveryDayDiscountType extends AbstractMissionType {
continue; continue;
} }
// 清除旧信息(进行中) // 清除旧信息(进行中)
missionStateChangeInfos.removeIf(v->v.getMissionId()==id); Iterator<MissionStateChangeInfo> iterator = missionStateChangeInfos.iterator();
while (iterator.hasNext()){
MissionStateChangeInfo info = iterator.next();
if (info != null && info.getMissionId() == id){
iterator.remove();
}
}
// 添加新信息(可领取) // 添加新信息(可领取)
MissionStateChangeInfo finishInfo = new MissionStateChangeInfo(id,MissionState.FINISH, task.getReward()); MissionStateChangeInfo finishInfo = new MissionStateChangeInfo(id,MissionState.FINISH, task.getReward());
missionStateChangeInfos.add(finishInfo); missionStateChangeInfos.add(finishInfo);