back_recharge
duhui 2023-04-04 16:35:27 +08:00
parent f4209eb50a
commit 2d0a740b7c
8 changed files with 383 additions and 338 deletions

View File

@ -150,8 +150,9 @@ public class FightDataUtil {
for(int i=2;i<length;i++){ for(int i=2;i<length;i++){
int passivityId = Integer.parseInt(unitSkill[i]); int passivityId = Integer.parseInt(unitSkill[i]);
SPassiveSkillLogicConfig sPassiveSkillLogicConfig = SPassiveSkillLogicConfig.getConfig(passivityId); SPassiveSkillLogicConfig sPassiveSkillLogicConfig = SPassiveSkillLogicConfig.getConfig(passivityId);
if(sPassiveSkillLogicConfig.getCoverID()!=0) if(sPassiveSkillLogicConfig.getCoverID()!=0){
tempSet.add(sPassiveSkillLogicConfig.getCoverID()); tempSet.add(sPassiveSkillLogicConfig.getCoverID());
}
} }
for(int i=2;i<length;i++){ for(int i=2;i<length;i++){
LuaValue detail = new LuaTable(); LuaValue detail = new LuaTable();

View File

@ -480,6 +480,9 @@ public class RedisKey {
// 邮件奖励 // 邮件奖励
public static final String MAIL_REWARD_MARK = "MAIL_REWARD_MARK"; public static final String MAIL_REWARD_MARK = "MAIL_REWARD_MARK";
// 罗浮称号奖励标记
public static final String LUOFU_TITLE_REWARD_MARK = "LUOFU_TITLE_REWARD_MARK";
public static Set<String> newAreaCacChe = new HashSet<>();//进程排行 合区统一 public static Set<String> newAreaCacChe = new HashSet<>();//进程排行 合区统一
public static Set<String> rankCacChe = new HashSet<>(); public static Set<String> rankCacChe = new HashSet<>();

View File

@ -75,9 +75,9 @@ public class GetWorldArenaInfoRequestHandler extends BaseHandler<WorldProto.GetW
Set<ZSetOperations.TypedTuple<String>> rankByKey = rank.getRankByKey(String.valueOf(crossGroup), 0, 20); Set<ZSetOperations.TypedTuple<String>> rankByKey = rank.getRankByKey(String.valueOf(crossGroup), 0, 20);
//处理第一次在休战期开启 //处理第一次在休战期开启
if(rankByKey.size()<1){ if(rankByKey.size()<1){
builder.setStage(1); builder.setStage(ArenaLogic.NORMAL_STATE);
}else{ }else{
builder.setStage(ArenaLogic.getInstance().getState()); builder.setStage(ArenaLogic.getState());
} }
if (diff > setting.getRestTime()[0] && diff < setting.getRestTime()[1]) { if (diff > setting.getRestTime()[0] && diff < setting.getRestTime()[1]) {

View File

@ -5,8 +5,6 @@ import com.ljsd.common.mogodb.MongoBase;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig; import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.FunctionIdEnum; import com.ljsd.jieling.core.FunctionIdEnum;
import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.db.mongo.MongoKey;
import com.ljsd.jieling.db.mongo.MongoUtil;
import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.globals.Global; import com.ljsd.jieling.globals.Global;
import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.handler.mission.Mission;
@ -18,8 +16,8 @@ import com.ljsd.jieling.logic.dao.PlayerManager;
import com.ljsd.jieling.logic.dao.TimeControllerOfFunction; import com.ljsd.jieling.logic.dao.TimeControllerOfFunction;
import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.logic.player.PlayerLogic;
import util.MathUtils;
import manager.STableManager; import manager.STableManager;
import util.MathUtils;
import util.TimeUtils; import util.TimeUtils;
import java.util.*; import java.util.*;
@ -315,7 +313,7 @@ public class MapManager extends MongoBase {
int addValue = (updateTime - lastUpdateEnergyTime) / 60 / energyRecoverSpeed[1] * energyRecoverSpeed[0]; int addValue = (updateTime - lastUpdateEnergyTime) / 60 / energyRecoverSpeed[1] * energyRecoverSpeed[0];
if (addValue != 0) { if (addValue != 0) {
int curEnergy = MathUtils.setBetweenWithMax(itemNum + addValue, 0, playerInfoManager.getMaxStamina()); int curEnergy = MathUtils.setBetweenWithMax(itemNum + addValue, 0, playerInfoManager.getMaxStamina());
item.setItemNum(curEnergy > playerInfoManager.getMaxStamina() ? playerInfoManager.getMaxStamina() : curEnergy); item.setItemNum(Math.min(curEnergy, playerInfoManager.getMaxStamina()));
KtEventUtils.onKtEvent(user, ParamEventBean.UserItemEvent, BIReason.TIME_REWARD,GlobalsDef.addReason,item.getItemId(),addValue,item.getItemNum()); KtEventUtils.onKtEvent(user, ParamEventBean.UserItemEvent, BIReason.TIME_REWARD,GlobalsDef.addReason,item.getItemId(),addValue,item.getItemNum());
} }
} }

View File

@ -441,6 +441,8 @@ public class GlobalDataManaager implements IManager {
RidingSwardLogic.getInstance().zeroClearRidingSwardByUser(user); RidingSwardLogic.getInstance().zeroClearRidingSwardByUser(user);
// 公会援助 // 公会援助
GuildLogic.getInstance().guildHelpDayHandler(user); GuildLogic.getInstance().guildHelpDayHandler(user);
// 罗浮称号
ArenaLogic.getInstance().takeTitleReward(user);
WeekCardLogic.getInstance().weekCardInfoIndication(user,0,0); WeekCardLogic.getInstance().weekCardInfoIndication(user,0,0);
ChallengeLogic.getInstance().ChallengeInfoIndication(session); ChallengeLogic.getInstance().ChallengeInfoIndication(session);

View File

@ -172,7 +172,7 @@ public class MinuteTask extends Thread {
} }
try { try {
ArenaLogic.getInstance().worldSendReward(); ArenaLogic.getInstance().checkState();
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
LOGGER.error("Exception::=>{}",e.toString()); LOGGER.error("Exception::=>{}",e.toString());

View File

@ -84,14 +84,13 @@ public class CBean2Proto {
if(itemNum == -1){ if(itemNum == -1){
itemNum = item.getItemNum(); itemNum = item.getItemNum();
} }
CommonProto.Item itemProto = CommonProto.Item return CommonProto.Item
.newBuilder() .newBuilder()
.setItemId(item.getItemId()) .setItemId(item.getItemId())
.setItemNum(itemNum) .setItemNum(itemNum)
.setEndingTime(item.getEndingTime()) .setEndingTime(item.getEndingTime())
.setNextFlushTime(item.getEndingTime() + getRecoverSpeedByItem(item.getItemId())) .setNextFlushTime(item.getEndingTime() + getRecoverSpeedByItem(item.getItemId()))
.build(); .build();
return itemProto;
} }
/** /**