Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

back_recharge
yuanshuai 2021-11-05 17:00:22 +08:00
commit bbe20d2156
5 changed files with 19 additions and 14 deletions

View File

@ -64,6 +64,8 @@ public class GameApplication {
CrossServiceLogic.serverInit();
CrossRankManager.getInstance().guildCacheHandle();
HotfixUtil.getInstance();
// 游戏支付端口
RedisUtil.getInstence().set(RedisKey.GAME_PAY_URL + GameApplication.serverId, RPCServerTask.userCallBackUrl);
// 开启定时任务
// TaskKit.reset();
//控制台gm
@ -115,8 +117,6 @@ public class GameApplication {
serverConfigTmp.setRestartTime(TimeUtils.getTimeStamp2(TimeUtils.now()));
MongoUtil.getInstence().getMyMongoTemplate().saveWithoutMongoRoot(serverConfigTmp);
serverConfig = serverConfigTmp;
// 游戏支付端口
RedisUtil.getInstence().set(RedisKey.GAME_PAY_URL + GameApplication.serverId, RPCServerTask.userCallBackUrl);
}

View File

@ -161,7 +161,17 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
winerGetScore = setting.getBattleWinReward()[0]+(ackScores-defScores);
loserGetScore = setting.getBattleLoseReward()[0]+(defScores-ackScores);
}
//范围修正1
if(winerGetScore>setting.getScoreRange()[1]){ //35
winerGetScore = setting.getScoreRange()[1];
}else if(winerGetScore<setting.getScoreRange()[0]){ //1
winerGetScore = setting.getScoreRange()[0];
}
if(loserGetScore>-setting.getScoreRange()[0]){//-1
loserGetScore = -setting.getScoreRange()[0];
}else if(loserGetScore<-setting.getScoreRange()[1]){//-35
loserGetScore = -setting.getScoreRange()[1];
}
//降分公式的基础上×70%
if(loserGetScore<0){
loserGetScore = (int)Math.floor(loserGetScore*0.7);
@ -177,7 +187,7 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
SMServerRankConfig serverRankConfig = SMServerRankConfig.serverRankConfig.get(defRandId);
loserGetScore += serverRankConfig.getLimitScore();
}
//范围修正2
if(winerGetScore>setting.getScoreRange()[1]){ //35
winerGetScore = setting.getScoreRange()[1];
}else if(winerGetScore<setting.getScoreRange()[0]){ //1
@ -188,7 +198,6 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler<ArenaInfoProto.
}else if(loserGetScore<-setting.getScoreRange()[1]){//-35
loserGetScore = -setting.getScoreRange()[1];
}
int defScore;//对手分数
AbstractRank rank = RankContext.getRankEnum(RankEnum.CROSS_YUXULUNDAO_RANK_PERSON.getType());
int crossGroup = GlobleSystemLogic.getInstence().getCrossGroup();

View File

@ -256,7 +256,7 @@ public class GlobalDataManaager implements IManager {
}
@Override
public void init() throws Exception {
public void init(){
try {
GuildFightLogic.familyFightStatus();
ActivityLogic.getInstance().checkSecretBoxSeason();
@ -269,7 +269,6 @@ public class GlobalDataManaager implements IManager {
ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes());
}
if(globalSystemControl.getTimeControllerOfFunctionMap().containsKey(FunctionIdEnum.Endless.getFunctionType())){
ServerConfig serverConfigTmp = MongoUtil.getInstence().getMyMongoTemplate().findById(1, ServerConfig.class);
if(MapLogic.endlessMapId==0){
FunctionIdEnum.Endless.getManager().startAction(globalSystemControl.getTimeControllerOfFunctionMap().get(FunctionIdEnum.Endless.getFunctionType()));
}
@ -277,8 +276,6 @@ public class GlobalDataManaager implements IManager {
if(globalSystemControl.getTimeControllerOfFunctionMap().containsKey(FunctionIdEnum.GuildBossFight.getFunctionType())){
GuildFightLogic.updateGuildBossInfoByTimes(globalSystemControl.getTimeControllerOfFunctionMap().get(FunctionIdEnum.GuildBossFight.getFunctionType()).getTimes());
}
}
MissionEventDistributor.init();
DataManagerDistributor.init();

View File

@ -18,7 +18,6 @@ public class Item extends MongoBase {
}
public Item(int itemId,long itemNum){
// this.setRootCollection(User._COLLECTION_NAME);
this.itemId = itemId;
this.itemNum = itemNum;
this.endingTime = (int)(System.currentTimeMillis()/1000);
@ -30,7 +29,7 @@ public class Item extends MongoBase {
return itemId;
}
public void setItemId(int itemId) throws Exception {
public void setItemId(int itemId){
updateString("itemId", itemId);
this.itemId = itemId;
}
@ -39,7 +38,7 @@ public class Item extends MongoBase {
return itemNum;
}
public void setItemNum(long itemNum) throws Exception {
public void setItemNum(long itemNum){
updateString("itemNum", itemNum);
this.itemNum = itemNum;
}
@ -48,7 +47,7 @@ public class Item extends MongoBase {
return endingTime;
}
public void setEndingTime(int endingTime) throws Exception {
public void setEndingTime(int endingTime){
updateString("endingTime", endingTime);
this.endingTime = endingTime;
}

View File

@ -62,7 +62,7 @@ public class ItemManager extends MongoBase {
this.itemMap = itemMap;
}
public void addItem(Item item) throws Exception {
public void addItem(Item item) {
item.init(this.getRootId(), getMongoKey() + ".itemMap." + item.getItemId());
updateString("itemMap." + item.getItemId(), item);
itemMap.put(item.getItemId(), item);