diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureConfig.java index a40fb21fc..08ce9706b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SAdventureConfig.java @@ -10,6 +10,8 @@ public class SAdventureConfig implements BaseConfig { private int id; + private String areaName; + private int[] openLevel; private int[][] areaLevelLimit; @@ -36,8 +38,12 @@ public class SAdventureConfig implements BaseConfig { private static Map config; - - @Override + + public String getAreaName() { + return areaName; + } + + @Override public void init() throws Exception { config = STableManager.getConfig(SAdventureConfig.class); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index a48484677..78b7923f5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -308,8 +308,8 @@ public class CombatLogic { MessageUtil.sendErrorResponse(iSession,0, MessageTypeProto.MessageType.ADVENTURE_UPLEVEL_RESPONSE_VALUE,"item not"); return; } - getAdventureReward(user, arenaId, true,1); adventureStateInfo.setLevel(adventureStateInfo.getLevel()+1); + getAdventureReward(user, arenaId, true,1); MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.ADVENTURE_UPLEVEL_RESPONSE_VALUE,null,true); } @@ -389,8 +389,9 @@ public class CombatLogic { String title = ""; String content = ""; if(reason == 1){ + String areaName = SAdventureConfig.getConfig().get(position).getAreaName(); title = SErrorCodeEerverConfig.getI18NMessage("adventuren_reward_of_uplevel_title"); - content = SErrorCodeEerverConfig.getI18NMessage("adventuren_reward_of_uplevel_content",new Object[]{"test",adventureStateInfoMap.get(position).getLevel()+1}); + content = SErrorCodeEerverConfig.getI18NMessage("adventuren_reward_of_uplevel_content",new Object[]{areaName,adventureStateInfoMap.get(position).getLevel()}); }else if(reason == 2){ int vipLevel = user.getPlayerInfoManager().getVipLevel(); title = SErrorCodeEerverConfig.getI18NMessage("adventuren_reward_of_viplevel_title"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 6b0325f90..7e5e12259 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -165,9 +165,10 @@ public class PlayerLogic { MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.VIP_LEVELUP_RESPONSE_VALUE,"not finfish"); return; } - CombatLogic.getInstance().getAdventureReward(user, -1, true,2); + int vipLevel = playerInfoManager.getVipLevel(); playerInfoManager.updateVipInfo(user,vipLevel+1); + CombatLogic.getInstance().getAdventureReward(user, -1, true,2); List missionList = new ArrayList<>(); MissionLoigc.getVipMission(user,missionList); CommonProto.VipBaseInfo vipInfoProto = CommonProto.VipBaseInfo.newBuilder()