Merge branch 'master_test_gn' into 开发/dev_dh
commit
257a5afaf8
|
@ -2,7 +2,7 @@ package com.ljsd.jieling.core;
|
||||||
|
|
||||||
public interface GlobalsDef {
|
public interface GlobalsDef {
|
||||||
String DEFAULT_NAME = "无名妖灵师";
|
String DEFAULT_NAME = "无名妖灵师";
|
||||||
int VERSION_CODE=3;//后端兼容版本号
|
int VERSION_CODE=4;//后端兼容版本号
|
||||||
int MAP_MISSION_RETURN = -9999;
|
int MAP_MISSION_RETURN = -9999;
|
||||||
int MAP_MISSION_FAILURE = -10000;
|
int MAP_MISSION_FAILURE = -10000;
|
||||||
|
|
||||||
|
|
|
@ -168,8 +168,8 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
||||||
if (playerInfoManager.getVersionCode()<2){
|
if (playerInfoManager.getVersionCode()<2){
|
||||||
calHeroHandBookData(user);
|
calHeroHandBookData(user);
|
||||||
}
|
}
|
||||||
// 重置天宫商店
|
// 重置天宫商店,2021-12-8 再次重置
|
||||||
if (playerInfoManager.getVersionCode()<3){
|
if (playerInfoManager.getVersionCode() < 4) {
|
||||||
user.getStoreManager().removeStoreInfo(17);
|
user.getStoreManager().removeStoreInfo(17);
|
||||||
}
|
}
|
||||||
playerInfoManager.setVersionCode(GlobalsDef.VERSION_CODE);
|
playerInfoManager.setVersionCode(GlobalsDef.VERSION_CODE);
|
||||||
|
|
|
@ -1461,7 +1461,7 @@ public class ActivityLogic implements IEventHandler{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
LOGGER.debug("未开启或者活动表已删除的活动id:{}",activityType);
|
// LOGGER.info("checkActivityOpen uid={} 未开启或者活动表已删除的活动id:{}",user.getId(), activityType);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue