Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
c010b09b78
|
@ -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<Integer, SAdventureConfig> config;
|
||||
|
||||
|
||||
@Override
|
||||
|
||||
public String getAreaName() {
|
||||
return areaName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init() throws Exception {
|
||||
config = STableManager.getConfig(SAdventureConfig.class);
|
||||
}
|
||||
|
|
|
@ -2120,8 +2120,8 @@ public class MapLogic {
|
|||
int star = crossInfo.getStars().size();
|
||||
totalStar += star;
|
||||
}
|
||||
if (totalStar <= sChallengeStarBox.getStarNum()) {
|
||||
LOGGER.info("totalStar less sChallengeStarBox.getStarNum uid=>{}, id=>{}", session.getUid(), id);
|
||||
if (totalStar <= sChallengeStarBox.getStarNum()){
|
||||
LOGGER.info("totalStar less sChallengeStarBox.getStarNum totalStar is {} uid=>{}, id=>{}", totalStar,session.getUid(), id);
|
||||
MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), "");
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -214,6 +214,10 @@ public class MapManager extends MongoBase {
|
|||
int recoveryTime = SGameSetting.getGameSetting().getRecoveryTime();
|
||||
int heroTimes = SGameSetting.getGameSetting().getHeroTimes();
|
||||
int recoveryTimes = (updateTime - lastUpdateEnergyTime)/recoveryTime;
|
||||
if(itemNum>heroTimes){
|
||||
item.setEndingTime(updateTime);
|
||||
return;
|
||||
}
|
||||
if( recoveryTimes>0){
|
||||
if(itemNum<heroTimes ){
|
||||
int addValue = MathUtils.setBetweenWithMax(itemNum+recoveryTimes,0,heroTimes);
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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<CommonProto.UserMissionInfo> missionList = new ArrayList<>();
|
||||
MissionLoigc.getVipMission(user,missionList);
|
||||
CommonProto.VipBaseInfo vipInfoProto = CommonProto.VipBaseInfo.newBuilder()
|
||||
|
|
Loading…
Reference in New Issue