Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw

back_recharge
zhangshanxue 2020-11-09 11:12:44 +08:00
commit f84dcbd84c
3 changed files with 7 additions and 1 deletions

View File

@ -79,5 +79,6 @@ public interface ActivityType {
int TRIAL_EXPERT = 70;//幻境达人
int SHEJI_ACTIVITY = 60;//社稷大典
int SUB_ACTIVITY = 8000;//易经宝库
int SKIN_RECHARGE_ACTIVITY = 71;
}

View File

@ -60,6 +60,8 @@ public enum ActivityTypeEnum {
TRIAL_EXPERT(ActivityType.TRIAL_EXPERT,TrialExpectRankActivity::new),
SHEJI_ACTIVITY(ActivityType.SHEJI_ACTIVITY,SheJiActivity::new),
SUB_ACTIVITY(ActivityType.SUB_ACTIVITY, SubActivity::new),
SKIN_RECHARGE_ACTIVITY(ActivityType.SKIN_RECHARGE_ACTIVITY, DefaultEmptyActivity::new),
;
private int type;

View File

@ -1484,7 +1484,7 @@ public class HeroLogic{
Map<Integer, Integer> skinInfo = user.getHeroManager().getSkinInfo();
SHeroSkin sHeroSkin = SHeroSkin.skinMapByType.get(skin);
if(sHeroSkin!=null&&sHeroSkin.getMonomerProperty()!=null&&sHeroSkin.getMonomerProperty().length>0){
if(skinInfo.containsKey(skin)&&skinInfo.get(skin)>TimeUtils.nowInt()){
if(skinInfo.containsKey(skin)&&(skinInfo.get(skin)==-1||skinInfo.get(skin)>TimeUtils.nowInt())){
combinedAttribute(sHeroSkin.getMonomerProperty(),heroAllAttribute);
}
}
@ -3308,6 +3308,9 @@ public class HeroLogic{
}
hero.setSkin(skinId);
if(isInTeam(user,heroId,1)){
Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(session.getUid()));
}
MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true);