Merge branch 'master_test_gn_zf' into master_test_gn

back_recharge
xuexinpeng 2021-08-19 20:05:55 +08:00
commit 299a608590
6 changed files with 10 additions and 7 deletions

View File

@ -411,7 +411,7 @@ public class GMRequestHandler extends BaseHandler{
case 1:
int bossId;
if(!prarm3.isEmpty()){
bossId = Integer.valueOf(prarm3);
bossId = Integer.parseInt(prarm3);
}else{
int[] freeTravelBoss = travelConfig.getFreeTravelBoss();
bossId = MathUtils.randomFromArray(freeTravelBoss);

View File

@ -21,8 +21,8 @@ public class Cmd_addhero extends GmRoleAbstract{
if(args.length!=2){
return true;
}
int prarm1 = Integer.valueOf(args[0]);
int prarm2 = Integer.valueOf(args[1]);
int prarm1 = Integer.parseInt(args[0]);
int prarm2 = Integer.parseInt(args[1]);
CommonProto.Drop.Builder drop = ItemUtil.drop(getUser(), new int[][]{{prarm1, 1}}, BIReason.GM_REWARD);
CommonProto.Hero heroProto = drop.getHero(0);

View File

@ -122,7 +122,7 @@ public class GlobalDataManaager implements IManager {
//开服几天后开启
if(getServerOpenTimeCompareSpecialTimeResult()){
int[]limitDay = sGlobalSystemConfig.getIfOpen();
if(limitDay.length>0 && limitDay != null){
if(limitDay != null && limitDay.length>0){
if( limitDay[0] == 2 ){
//此时是开服第几天
long day = TimeUtils.getGapDaysByTwoTime(GameApplication.serverConfig.getOpenTime(),TimeUtils.getTimeStamp2(TimeUtils.now()))+1;
@ -333,7 +333,7 @@ public class GlobalDataManaager implements IManager {
//开服几天后开启
if(getServerOpenTimeCompareSpecialTimeResult()){
int[]limitDay = sGlobalSystemConfig.getIfOpen();
if(limitDay.length>0 && limitDay != null){
if(limitDay != null && limitDay.length>0){
if( limitDay[0] == 2 ){
//此时是开服第几天
long day = TimeUtils.getGapDaysByTwoTime(GameApplication.serverConfig.getOpenTime(),TimeUtils.getTimeStamp2(TimeUtils.now()))+1;

View File

@ -457,10 +457,12 @@ public class UserMissionManager extends MongoBase {
case MISSING_ROOM_MISSION_REWARD:{
missingRoomMissionType.rewardMission((int)parm[0],missionTypeEnumListMap.get(GameMisionType.MISSINGROOMMISSION));
updateString("missingRoomMissionType",missingRoomMissionType);
break;
}
case COW_FLY_SKY_REWEARD:{
cowFlySkyMissionType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.COWFLYSKYMISSION));
updateString("cowFlySkyMissionType",cowFlySkyMissionType);
break;
}
case ENDLESS_MISSION_REWARD:{
endlessMissionType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.ENDLESS_MISSION));

View File

@ -219,7 +219,7 @@ public class User {
this.hardStageManager = new HardStageManager();
this.hardStageManager.init(id,MongoKey.hardStageManager);
}else{
if(this.hardStageManager.getMongoKey()== null || this.hardStageManager.getMongoKey() == ""){
if(this.hardStageManager.getMongoKey()== null || this.hardStageManager.getMongoKey().isEmpty()){
this.hardStageManager.init(id,MongoKey.hardStageManager);
try {
MongoUtil.getInstence().getMyMongoTemplate().save(id,this);

View File

@ -381,7 +381,7 @@ public class HeroLogic{
builder.addAllDrawTimes(CBean2Proto.getRandomTypeNums(user));
MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.HERO_RAND_RESPONSE_VALUE, builder.build(), true);
if(sLotterySetting.getLotteryType() == GlobalsDef.RANDOM_LOTTERY_TYPE && !user.getPlayerInfoManager().isHasRandomLotteryType()&sLotterySetting.getPerCount()!=1){
if(sLotterySetting.getLotteryType() == GlobalsDef.RANDOM_LOTTERY_TYPE && !user.getPlayerInfoManager().isHasRandomLotteryType()&&sLotterySetting.getPerCount()!=1){
//首次神将召唤 10连抽 给个攻略邮件
String title = SErrorCodeEerverConfig.getI18NMessage("zhanneixin_title");
String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("zhanneixin_content",new Object[]{ user.getPlayerInfoManager().getNickName()},new int[]{0},"#");
@ -745,6 +745,7 @@ public class HeroLogic{
case 11:
eventEnum = ReportEventEnum.TREASURE_SUMMON;
activityId = sLotterySetting.getActivityId();
break;
default:
break;