Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
2392506183
|
@ -23,7 +23,7 @@ public class HeroGodSoulBindRequestHandler extends BaseHandler<HeroInfoProto.Her
|
||||||
return MessageTypeProto.MessageType.HERO_GOD_SOUL_BIND_REQUEST;
|
return MessageTypeProto.MessageType.HERO_GOD_SOUL_BIND_REQUEST;
|
||||||
}
|
}
|
||||||
|
|
||||||
//神魂进阶绑定协议
|
//神魂升级绑定协议
|
||||||
@Override
|
@Override
|
||||||
public void processWithProto(ISession session, HeroInfoProto.HeroGodSoulBindRequest proto) throws Exception {
|
public void processWithProto(ISession session, HeroInfoProto.HeroGodSoulBindRequest proto) throws Exception {
|
||||||
String heroId=proto.getHeroId();
|
String heroId=proto.getHeroId();
|
||||||
|
|
|
@ -304,6 +304,7 @@ public class GlobalDataManaager implements IManager {
|
||||||
|
|
||||||
public void getTimeOfControl(ISession session){
|
public void getTimeOfControl(ISession session){
|
||||||
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_FUNCTIONOFTIME_RESPONSE_VALUE,getFunctionOfTimeResponse,true);
|
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.GET_FUNCTIONOFTIME_RESPONSE_VALUE,getFunctionOfTimeResponse,true);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateGetFunctionOfTimeResponse(){
|
private void updateGetFunctionOfTimeResponse(){
|
||||||
|
@ -321,6 +322,15 @@ public class GlobalDataManaager implements IManager {
|
||||||
long timeOpenOfThis =seasonOpenLong;
|
long timeOpenOfThis =seasonOpenLong;
|
||||||
long timeCloseOfThis =seasonEndLong;
|
long timeCloseOfThis =seasonEndLong;
|
||||||
if(seasonInterval == 0){
|
if(seasonInterval == 0){
|
||||||
|
int[]limitDay = sGlobalSystemConfig.getIfOpen();
|
||||||
|
if(limitDay != null && limitDay.length>0){
|
||||||
|
if( limitDay[0] == 2 ){
|
||||||
|
long day = TimeUtils.getGapDaysByTwoTime(GameApplication.serverConfig.getOpenTime(),TimeUtils.getTimeStamp2(TimeUtils.now()))+1;
|
||||||
|
if(day < limitDay[1]){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
timeOpenOfThis = systemOpenLong;
|
timeOpenOfThis = systemOpenLong;
|
||||||
timeCloseOfThis = systemEndLong;
|
timeCloseOfThis = systemEndLong;
|
||||||
}else{
|
}else{
|
||||||
|
|
|
@ -79,17 +79,17 @@ public class WeekCardLogic {
|
||||||
weekCardVal.setBugTime(0);
|
weekCardVal.setBugTime(0);
|
||||||
isSave = true;
|
isSave = true;
|
||||||
}
|
}
|
||||||
if(isSave){
|
}
|
||||||
user.getPlayerInfoManager().setWeekCard(weekCard);
|
if(isSave){
|
||||||
}
|
user.getPlayerInfoManager().setWeekCard(weekCard);
|
||||||
if(dropMap.size()>0){
|
}
|
||||||
int [][] dropArray= dropMap.entrySet().stream().map(n->new int[]{n.getKey(),n.getValue()}).toArray(int[][]::new);
|
if(dropMap.size()>0){
|
||||||
String title = SErrorCodeEerverConfig.getI18NMessage("WeekcardReward_mail_title");
|
int [][] dropArray= dropMap.entrySet().stream().map(n->new int[]{n.getKey(),n.getValue()}).toArray(int[][]::new);
|
||||||
String content = SErrorCodeEerverConfig.getI18NMessage("WeekcardReward_mail_txt");
|
String title = SErrorCodeEerverConfig.getI18NMessage("WeekcardReward_mail_title");
|
||||||
// 排行奖励
|
String content = SErrorCodeEerverConfig.getI18NMessage("WeekcardReward_mail_txt");
|
||||||
MailLogic.getInstance().sendMail(user.getId(), title, content,
|
// 排行奖励
|
||||||
StringUtil.parseArrayToString(dropArray), TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME);
|
MailLogic.getInstance().sendMail(user.getId(), title, content,
|
||||||
}
|
StringUtil.parseArrayToString(dropArray), TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue