Merge branch 'master_test_gn' into master_test_gn_godsoul
commit
d35f538ad2
|
@ -129,7 +129,9 @@ public class GameLogicService implements IService {
|
|||
Thread.currentThread().setName("addShutdownHook");
|
||||
try {
|
||||
GameApplication.close();
|
||||
}catch (Exception e){}
|
||||
}catch (Exception e){
|
||||
LOGGER.info("ShutdownHook Exception e={}", e);
|
||||
}
|
||||
|
||||
}));
|
||||
}
|
||||
|
|
|
@ -246,6 +246,7 @@ public class HardStageLogic {
|
|||
.setPosition(teamPosHeroInfo.getPosition())
|
||||
.setStar(hero.getStar())
|
||||
.setSkinId(hero.getSkin())
|
||||
.setForceScore(HeroLogic.getInstance().calTeamForce(user,teamId))
|
||||
.build();
|
||||
heroFightInfos.add(heroFightInfo);
|
||||
}
|
||||
|
@ -258,6 +259,7 @@ public class HardStageLogic {
|
|||
.addAllPokemonUnitList(HeroLogic.getInstance().getPokemonSkills(user))
|
||||
.setTeamPassiveList(pokenmonPassiveSkills)
|
||||
.setSpecialPassive(SpecialForTeamBuildEnum.toParm(teamId, user))
|
||||
.setForceScore(HeroLogic.getInstance().calTeamForce(user,teamId))
|
||||
.build();
|
||||
}
|
||||
|
||||
|
|
|
@ -2894,7 +2894,7 @@ public class HeroLogic {
|
|||
SXiuXian shuxingTable = SXiuXian.sXiuXianMap.get(sXiuXian.getRealmId()).get(0);
|
||||
if (shuxingTable != null) {
|
||||
int[][] proRank = shuxingTable.getProRank();
|
||||
float[][] proLevel = shuxingTable.getProLevel();
|
||||
int[][] proLevel = shuxingTable.getProLevel();
|
||||
Map<Integer, Long> otherAttriMaop = new HashMap<>(5);
|
||||
for (int i = 0; i < proRank.length; i++) {
|
||||
float addValue = proRank[i][1] + proLevel[i][1] * xiuweiLevel;
|
||||
|
|
|
@ -61,6 +61,11 @@ public class RidingSwardLogic{
|
|||
if (endTime == 0 && startTime == 0){
|
||||
return 0;
|
||||
}
|
||||
// 比赛结算阶段
|
||||
int size = getRankMap("").size();
|
||||
if (getRound() >= size){
|
||||
return 3;
|
||||
}
|
||||
int now = TimeUtils.nowInt();
|
||||
// 活动过期
|
||||
if (now > endTime || now < startTime){
|
||||
|
@ -74,10 +79,7 @@ public class RidingSwardLogic{
|
|||
SRidingSwardConfig config = STableManager.getConfig(SRidingSwardConfig.class).get(1);
|
||||
// 一场比赛得时间,投注时间+比赛时间
|
||||
int oneGameTime = config.getTime()[0] + config.getTime()[1];
|
||||
if (now + oneGameTime >= endTime){
|
||||
return 3;
|
||||
}
|
||||
// (当前时间-开始时间)%场次时间,取模,可以获得限制位于哪个阶段
|
||||
// (当前时间-开始时间)%场次时间,取模,可以获得现在位于哪个阶段
|
||||
return (now - startTime) % (oneGameTime) > config.getTime()[0] ? 2 : 1;
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
|
@ -94,17 +96,14 @@ public class RidingSwardLogic{
|
|||
SRidingSwardConfig config = STableManager.getConfig(SRidingSwardConfig.class).get(1);
|
||||
// 一场比赛得时间,投注时间+比赛时间
|
||||
int oneGameTime = config.getTime()[0] + config.getTime()[1];
|
||||
// 第几轮
|
||||
int time = TimeUtils.nowInt() - startTime;
|
||||
// 第几轮
|
||||
int round = 0;
|
||||
if (time % oneGameTime == 0){
|
||||
round = time / oneGameTime;
|
||||
}else {
|
||||
round = time / oneGameTime +1;
|
||||
}
|
||||
if (getState() == 3){
|
||||
round -= 1;
|
||||
}
|
||||
return round;
|
||||
}
|
||||
|
||||
|
@ -399,8 +398,13 @@ public class RidingSwardLogic{
|
|||
* @return
|
||||
*/
|
||||
private CommonProto.RidingSwardLastRank getRidingSwardLastRank() throws ErrorCodeException {
|
||||
int round = getRound()-1;
|
||||
if (getState() == 3){
|
||||
int size = getRankMap("").size();
|
||||
round = size - 1;
|
||||
}
|
||||
// 配置
|
||||
RidingSwardRank swardRank = getRankMap("").getOrDefault(getRound()-1, new RidingSwardRank());
|
||||
RidingSwardRank swardRank = getRankMap("").getOrDefault(round, new RidingSwardRank());
|
||||
return CommonProto.RidingSwardLastRank.newBuilder()
|
||||
.setRankTime(swardRank.getTime())
|
||||
.setRankId(swardRank.getRankId())
|
||||
|
@ -423,7 +427,7 @@ public class RidingSwardLogic{
|
|||
boolean judge = false;
|
||||
for (RidingSwardRecord record : entry.getValue()) {
|
||||
// 当前比赛结果不能显示
|
||||
if (record.getTime() > (getTime()-config.getTime()[1])){
|
||||
if (record.getRound() >= getRound()){
|
||||
break;
|
||||
}
|
||||
judge = recordBuild(record,getRankMap(""));
|
||||
|
|
|
@ -30,7 +30,7 @@ public class SXiuXian implements BaseConfig {
|
|||
|
||||
private int[][] proRank;
|
||||
|
||||
private float[][] proLevel;
|
||||
private int[][] proLevel;
|
||||
|
||||
private int playerSkillLvMax;
|
||||
|
||||
|
@ -93,7 +93,7 @@ public class SXiuXian implements BaseConfig {
|
|||
return proRank;
|
||||
}
|
||||
|
||||
public float[][] getProLevel() {
|
||||
public int[][] getProLevel() {
|
||||
return proLevel;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue