diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 703c86cdf..15f728131 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -307,6 +307,9 @@ public class GetPlayerInfoHandler extends BaseHandler{ } for(Hero hero : user.getHeroManager().getHeroMap().values()){ user.getHeroManager().addHeroStar(hero.getTemplateId(),hero.getStar()); + if (hero.getTemplateId()==10026&&hero.getStar()>=6){//至尊降世活动任务兼容(如果当前用户已经拥有6星玉帝则满足任务条件) + Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.UPSTAR.getType(), hero.getTemplateId())); + } } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java index c6ac509a5..7cb3fdd6a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java @@ -46,7 +46,7 @@ public class NewWelfareActivity extends AbstractActivity { boolean isUpdate = false; for(SActivityRewardConfig sActivityRewardConfig : sActivityRewardConfigs){ ActivityProgressInfo activityProgressInfo = activityProgressInfoMap.get(sActivityRewardConfig.getId()); - if(sActivityRewardConfig.getSort()==1){ + if(sActivityRewardConfig.getSort()==1){//拿sort区分新老至尊降世活动任务 if(activityProgressInfo.getState() == 1){ continue; }