设置全局scenario值
This commit is contained in:
parent
c5d8988ee7
commit
6f2cef9edc
|
@ -82,14 +82,8 @@ public class BattleRootTask extends AbtParentTask {
|
||||||
this.initBean();
|
this.initBean();
|
||||||
if(this.getRoomStatus()) {
|
if(this.getRoomStatus()) {
|
||||||
long initDuringTime = this.getDuringTime();
|
long initDuringTime = this.getDuringTime();
|
||||||
StatisticBean statisticBean = null;
|
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"duringTime",String.valueOf(initDuringTime));
|
||||||
try {
|
|
||||||
statisticBean = statisticService.statistic(scenarioTask.getResourceId());
|
|
||||||
}catch (Exception ex){
|
|
||||||
ex.printStackTrace();
|
|
||||||
}
|
|
||||||
String jsonStr = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo");
|
String jsonStr = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo");
|
||||||
|
|
||||||
ScenarioInfo scenarioInfo =JSONObject.parseObject(jsonStr,ScenarioInfo.class);
|
ScenarioInfo scenarioInfo =JSONObject.parseObject(jsonStr,ScenarioInfo.class);
|
||||||
HashMap<String,Object> battleParams = new HashMap<>();
|
HashMap<String,Object> battleParams = new HashMap<>();
|
||||||
//初始化本次战斗任务各种资源数
|
//初始化本次战斗任务各种资源数
|
||||||
|
@ -105,9 +99,9 @@ public class BattleRootTask extends AbtParentTask {
|
||||||
battleParams.put("teamLng",scenarioInfo.getTeam().getLng().toString());
|
battleParams.put("teamLng",scenarioInfo.getTeam().getLng().toString());
|
||||||
battleParams.put("duringTime",Long.valueOf(initDuringTime).toString());
|
battleParams.put("duringTime",Long.valueOf(initDuringTime).toString());
|
||||||
log.info("===============================初始化本次战斗任务各种资源数====================================");
|
log.info("===============================初始化本次战斗任务各种资源数====================================");
|
||||||
double suppleAmount =statisticBean.getAmmunition().getTotal();
|
double suppleAmount =scenarioInfo.getAmmunition().getTotal();
|
||||||
int suppleDeath =statisticBean.getPerson().getDeath();
|
int suppleDeath =scenarioInfo.getPerson().getDeath();
|
||||||
int suppleInjured =statisticBean.getPerson().getInjured();
|
int suppleInjured =scenarioInfo.getPerson().getInjured();
|
||||||
final Map<String,Boolean> suppleFlagMap = new HashMap<>();
|
final Map<String,Boolean> suppleFlagMap = new HashMap<>();
|
||||||
suppleFlagMap.put("ammunition",false);
|
suppleFlagMap.put("ammunition",false);
|
||||||
suppleFlagMap.put("death",false);
|
suppleFlagMap.put("death",false);
|
||||||
|
@ -130,7 +124,7 @@ public class BattleRootTask extends AbtParentTask {
|
||||||
JSONObject jsonObject = new JSONObject();
|
JSONObject jsonObject = new JSONObject();
|
||||||
try {
|
try {
|
||||||
long duringTime = getDuringTime();
|
long duringTime = getDuringTime();
|
||||||
long lastDuringTime = Long.valueOf(battleParams.get("duringTime").toString());
|
long lastDuringTime = Long.valueOf(redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"duringTime").toString());
|
||||||
long intervalDuringTime = duringTime - lastDuringTime;
|
long intervalDuringTime = duringTime - lastDuringTime;
|
||||||
double ammunition = Double.valueOf(battleParams.get("ammunition").toString());
|
double ammunition = Double.valueOf(battleParams.get("ammunition").toString());
|
||||||
double food = Double.valueOf(battleParams.get("food").toString());
|
double food = Double.valueOf(battleParams.get("food").toString());
|
||||||
|
@ -166,8 +160,8 @@ public class BattleRootTask extends AbtParentTask {
|
||||||
scenarioInfo.getWater().setCurrent(Double.valueOf(water - waterConsume));
|
scenarioInfo.getWater().setCurrent(Double.valueOf(water - waterConsume));
|
||||||
scenarioInfo.getPerson().setDeath(Long.valueOf(death+deathConsume).intValue());
|
scenarioInfo.getPerson().setDeath(Long.valueOf(death+deathConsume).intValue());
|
||||||
scenarioInfo.getPerson().setInjured(Long.valueOf(injured +injuredConsume).intValue());
|
scenarioInfo.getPerson().setInjured(Long.valueOf(injured +injuredConsume).intValue());
|
||||||
battleParams.put("duringTime",Long.valueOf(duringTime).toString());
|
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"duringTime",String.valueOf(duringTime));
|
||||||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), battleParams);
|
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo",JSONObject.toJSONString(scenarioInfo));
|
||||||
}catch (Exception ex){
|
}catch (Exception ex){
|
||||||
log.error("==============================设置消耗信息失败=============================================",ex.getMessage());
|
log.error("==============================设置消耗信息失败=============================================",ex.getMessage());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user