Merge branch 'master_test_gn' into master_test_gn_practiceSkill

back_recharge
yuanshuai 2021-10-19 15:40:38 +08:00
commit 75872a85e9
5 changed files with 4243 additions and 37055 deletions

View File

@ -139,6 +139,7 @@ public class CrossYuxulundaoGetInfoHandler extends BaseHandler<ArenaInfoProto.Cr
csPlayer.setCrossYuxulundaoNewScore(SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow());
csPlayer.setCrossYuxulundaoOldScore(SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow());
}
csPlayer.setCrossYxldMaxLevel(0);
isNeedUpdate = true;
}
arenaManager.setCrossMatchTimes(0);
@ -169,6 +170,7 @@ public class CrossYuxulundaoGetInfoHandler extends BaseHandler<ArenaInfoProto.Cr
}
csPlayer.setCrossYxldMaxLevel(id);
isNeedUpdate = true;
}
}
if(newSeason){

View File

@ -288,10 +288,11 @@ public class CrossServiceLogic {
private static CSPlayer formattUserToPlayer(User user){
CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(user.getId());
int newScore=0,oldScore =0;
int newScore=0,oldScore =0,crossYxldMaxLevel=0 ;
if(csPlayer!=null){
newScore = csPlayer.getCrossYuxulundaoNewScore();
oldScore = csPlayer.getCrossYuxulundaoOldScore();
crossYxldMaxLevel = csPlayer.getCrossYxldMaxLevel();
}
CSPlayer player = new CSPlayer();
@ -310,6 +311,7 @@ public class CrossServiceLogic {
player.setCrossYuxulundaoNewScore(newScore);
player.setCrossYuxulundaoOldScore(oldScore);
player.setGuildId(p.getGuildId());
player.setCrossYxldMaxLevel(crossYxldMaxLevel);
//player.setGuildId();
//三个队伍总战力
int force1 = HeroLogic.getInstance().calTeamTotalForce(user, GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE, false);

View File

@ -632,6 +632,12 @@ public class MissionEventDistributor {
if(gameMisionType==GameMisionType.MISSINGROOMMISSION){
continue;
}
if (gameMisionType == GameMisionType.ACHIEVEMISSION) {
SAchievementConfig sAchievementConfig = STableManager.getConfig(SAchievementConfig.class).get(missionStateChangeInfo.getMissionId());
if (sAchievementConfig.getEffectTime() != 0 && openTime >= sAchievementConfig.getEffectTime()) {
continue;
}
}
if(gameMisionType == GameMisionType.COPYMISSION || gameMisionType == GameMisionType.TREASUREMISSION
|| gameMisionType == GameMisionType.SEVENMISSION || gameMisionType == GameMisionType.BLOODYMISSION
|| gameMisionType == GameMisionType.ACHIEVEMISSION || gameMisionType == GameMisionType.JADE_DYNASTY_MISSION
@ -669,9 +675,6 @@ public class MissionEventDistributor {
if(gameMisionType == GameMisionType.ACHIEVEMISSION){
SAchievementConfig sAchievementConfig = STableManager.getConfig(SAchievementConfig.class).get(missionStateChangeInfo.getMissionId());
if (sAchievementConfig.getEffectTime() != 0 && openTime >= sAchievementConfig.getEffectTime()) {
continue;
}
progress= sAchievementConfig.getValues()[1][0];
}

File diff suppressed because it is too large Load Diff

View File

@ -24,7 +24,12 @@ public class SXiuXian implements BaseConfig {
private int[] teamSkill;
private int[] playerSkill;
private int[][] proRank;
private float[][] proLevel;
@Override
public void init() throws Exception {
@ -62,4 +67,16 @@ public class SXiuXian implements BaseConfig {
public String getNameFontColor() {
return nameFontColor;
}
public int[] getPlayerSkill() {
return playerSkill;
}
public int[][] getProRank() {
return proRank;
}
public float[][] getProLevel() {
return proLevel;
}
}