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

back_recharge
zhangshanxue 2020-08-27 21:09:08 +08:00
commit 0417a4c728
11 changed files with 52 additions and 27 deletions

View File

@ -46,7 +46,7 @@ public class RewardStaticConfig extends AbstractClassStaticConfig {
int max = value.getMaxRank();
for(int i = min;i<=max;i++){
for(int i = max;i<=min;i++){
guildChallengeConfigMapTemp.get(value.getGuildCheckpoint()).put(i,value);
}

View File

@ -142,7 +142,8 @@ public class GetPlayerInfoHandler extends BaseHandler{
int equipPool = user.getEquipManager().getSoulEquipPool();
CommonProto.EndlessInfo.Builder endless = CommonProto.EndlessInfo.newBuilder();
endless.setMapId(MapLogic.getEndlessMapId());
endless.setWorldLevel(1);
ServerConfig config = MongoUtil.getInstence().getMyMongoTemplate().findById(1, ServerConfig.class);
endless.setWorldLevel(config.getWorldLevel());
endless.setBloodScore(RedisUtil.getInstence().getZSetScore(RedisKey.BLOODY_RANK,Integer.toString(1), Integer.toString(userId)).intValue());
List<CommonProto.GiftGoodsInfo> goodsBagInfo = new ArrayList<>(SRechargeCommodityConfig.rechargeCommodityConfigMap.size());
BuyGoodsLogic.getGoodsBagInfo(userId,goodsBagInfo,true);

View File

@ -804,7 +804,7 @@ public class MapLogic {
MapMissionManager.updateMapMission(user, EventType.updatePonintEvent, pointId, pointId);
CommonProto.Drop.Builder dropBuilder = null;
if (sOptionConfig.getReward().length > 0) {
dropBuilder = ItemUtil.drop(user, sOptionConfig.getReward(), 1, 1, BIReason.MAP_EVENET_REWARD);
dropBuilder = ItemUtil.drop(user, sOptionConfig.getReward(), 1, 0, BIReason.MAP_EVENET_REWARD);
}
List<CommonProto.EventBehaviorValues> eventBehaviorValuesList = new ArrayList<>();
for (int i = 0; i < sOptionConfig.getBehaviorTypeValues().length; i++) {

View File

@ -62,6 +62,7 @@ public class FourtyTwoBehavior extends BaseBehavior {
mapManager.setTrialFloor(floor + 1);
mapManager.setTrialEnergy(0);
mapManager.setMapIntoFlag(2);
mapManager.setCurMapType(0);
mapManager.updateTrialMapInfo(new HashMap<>());
//换层清除数据
mapManager.updateMapMonsterHp(new HashMap<>());

View File

@ -250,7 +250,7 @@ public class EndlessMap extends AbstractMap{
SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId);
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1, BIReason.MAP_FAST_FIGHT_REWARD);
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 0, BIReason.MAP_FAST_FIGHT_REWARD);
// if (mapManager.getMonsterId() > 0) {
// BaseBehavior baseBehavior = baseBehaviorMap.get(1);

View File

@ -76,14 +76,18 @@ public class TowerMap extends AbstractMap {
TrialInfo trialInfo = mapManager.getTrialInfo();
if(mapManager.getCurMapType()!=0&&mapManager.getCurMapType()!=type){
MapLogic.getInstance().getMap(user).autoExitMap(user);
}
if(!trialInfo.getMapInfo().isEmpty()){
mapManager.setMapInfo(trialInfo.getMapInfo());
mapManager.setCurMapId(trialInfo.getQuitMapId());
mapManager.setCurXY(trialInfo.getCurXY());
}else{
//进新图
if(!trialInfo.getMapInfo().isEmpty()){
mapManager.setMapInfo(trialInfo.getMapInfo());
mapManager.setCurMapId(trialInfo.getQuitMapId());
mapManager.setCurXY(trialInfo.getCurXY());
}else{
//进新图
// super.enterMap(uid,mapEnterResponse);
initMap(mapManager,user);
}
}
if(mapManager.getCurMapType()==0){
//换层
initMap(mapManager,user);
}
Map<String, TrailHero> heroInfo = trialInfo.getHeroInfo();
@ -441,7 +445,7 @@ public class TowerMap extends AbstractMap {
//------------
SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId);
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1, BIReason.MAP_FAST_FIGHT_REWARD);
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 0, BIReason.MAP_FAST_FIGHT_REWARD);
// mapManager.
if (mapManager.getMonsterId() > 0) {
@ -597,7 +601,7 @@ public class TowerMap extends AbstractMap {
Cell cell = callChief(user);
LOGGER.info("怪物数量:{}",mosterAmount);
int[] bombReward = rewardResult.stream().mapToInt(Integer::valueOf).toArray();
CommonProto.Drop.Builder drop = ItemUtil.drop(user, bombReward, 1,1,BIReason.BOMB_REWARD);
CommonProto.Drop.Builder drop = ItemUtil.drop(user, bombReward, 1,0,BIReason.BOMB_REWARD);
mapManager.updateBombUseCount(mapManager.getTrialInfo().getBombUseTimes()+1);

View File

@ -139,6 +139,9 @@ public class GuildChallengeLogic {
long damage = 0;
GuildInfo guildInfo;
SGuildCheckpointConfig config = STableManager.getConfig(SGuildCheckpointConfig.class).get(bossId);
if(config==null){
throw new ErrorCodeException("配置不存在"+bossId);
}
int[] privilege = config.getPrivilege();
boolean check = PlayerLogic.getInstance().check(user, privilege[0], 1);
if(!check){
@ -221,8 +224,6 @@ public class GuildChallengeLogic {
}
damage = guildMyInfo.getGuildChallengeDamage();
}
drop = ItemUtil.drop(user, new int[]{config.getReward()}, 1, 0, 1);
}
}
if(!error.isEmpty()){
@ -241,7 +242,7 @@ public class GuildChallengeLogic {
if(guildMyInfo.getGuildChallengeDamage()==0){
return;
}
if(guildMyInfo.getRefreshedBoss().contains(bossId)){
if(guildMyInfo.getRefreshedBoss().contains(bossId)) {
return;
}
int[] refreshPrivilege = config.getPrivilege();
@ -263,6 +264,8 @@ public class GuildChallengeLogic {
runnable.run();
drop = ItemUtil.drop(user, new int[]{config.getReward(),config.getKillReward()}, 1, 0, 1);
}else{
drop = ItemUtil.drop(user, new int[]{config.getReward()}, 1, 0, 1);
}
double blood = guildInfo.getBossHpRemain();
Family.GuildChallengeIndication.Builder indication = Family.GuildChallengeIndication.newBuilder()

View File

@ -1468,10 +1468,10 @@ public class HeroLogic{
continue;
Jewel j = (Jewel)propertyItem;
SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(j.getEquipId());
Map<Integer, Map<Integer, SJewelRankupConfig>> poolMap = SJewelRankupConfig.rankupMap.get(config.getRankupPool());
if(poolMap==null){
continue;
}
Map<Integer, Map<Integer, SJewelRankupConfig>> rankPoolMap = SJewelRankupConfig.rankupMap.get(config.getRankupPool());
Map<Integer, Map<Integer, SJewelRankupConfig>> levelPoolMap = SJewelRankupConfig.rankupMap.get(config.getLevelupPool());
if(flashing){
if(minLevel==-1){
minLevel = j.getLevel();
@ -1484,10 +1484,15 @@ public class HeroLogic{
minBuildLevel = Math.min(j.getBuildLevel(),minBuildLevel);
}
}
int[][] property = poolMap.get(1).get(j.getLevel()).getProperty();
combinedAttribute(property,heroAllAttribute);
property = poolMap.get(2).get(j.getBuildLevel()).getProperty();
combinedAttribute(property,heroAllAttribute);
int[][] property;
if(levelPoolMap!=null){
property = levelPoolMap.get(1).get(j.getLevel()).getProperty();
combinedAttribute(property,heroAllAttribute);
}
if(rankPoolMap!=null){
property = rankPoolMap.get(2).get(j.getBuildLevel()).getProperty();
combinedAttribute(property,heroAllAttribute);
}
}
//宝器共鸣
if(flashing){
@ -1771,7 +1776,7 @@ public class HeroLogic{
Integer propertyId = item.getKey();
float propertyValue = item.getValue();
if(propertyId == HeroAttributeEnum.EquipForce.getPropertyId()){
// LOGGER.info("the equipScore={}",propertyValue);
// LOGGER.info("the equipScore={}",propertyValue);
continue;
}
SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByPID(propertyId);
@ -1781,9 +1786,9 @@ public class HeroLogic{
float score = sPropertyConfig.getScore();
result += propertyValue*score;
// LOGGER.info("the propertyId={} the value is ={},propertyValue={},score={}result ={},the value={}",propertyId,propertyValue*score,propertyValue,score,result,propertyValue*score);
// LOGGER.info("the propertyId={} the value is ={},propertyValue={},score={}result ={},the value={}",propertyId,propertyValue*score,propertyValue,score,result,propertyValue*score);
}
// System.out.println(result);
// System.out.println(result);
return (int)result;
}

View File

@ -25,6 +25,7 @@ import com.ljsd.jieling.logic.dao.RechargeInfo;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.VipInfo;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.expedition.ExpeditionLogic;
import com.ljsd.jieling.logic.fight.CombatLogic;
import com.ljsd.jieling.logic.mail.MailLogic;
import com.ljsd.jieling.logic.mission.GameEvent;
@ -47,6 +48,8 @@ import util.TimeUtils;
import java.math.BigDecimal;
import java.util.*;
import static com.ljsd.jieling.logic.store.GiftGoodsType.SKY_TREASURE;
/**
* 西
*/
@ -393,6 +396,11 @@ public class BuyGoodsLogic {
}
}
if(type==GiftGoodsType.SKY_TREASURE){
user.getExpeditionManager().getWorldTreasureReward().setScore(user.getExpeditionManager().getWorldTreasureReward().getScore()+SSpecialConfig.getIntegerValue(SSpecialConfig.SKY_TREASURE_SCORE_INGIFT));
Map<Integer, Integer> rewardStatusMap = user.getExpeditionManager().getWorldTreasureReward().getRewardStatusMap();
ExpeditionLogic.sendTreasureRewardUpdate(OnlineUserManager.getSessionByUid(user.getId()),user.getExpeditionManager().getWorldTreasureReward().getScore(),rewardStatusMap,user.getExpeditionManager().getWorldTreasureReward().getCreateTime());
}
if(sRechargeCommodityConfig.getTime() ==5){
rechargeInfo.updateRefreshMapByKey(sRechargeCommodityConfig.getId(),TimeUtils.now()+sRechargeCommodityConfig.getDailyUpdate()*TimeUtils.DAY);
}

View File

@ -11,4 +11,6 @@ public interface GiftGoodsType {
int FOUND_ONE = 8; //豪华基金
int FOUND_TWO = 9; //豪华基金
int SUN_LONG = 11; //豪华基金
int SKY_TREASURE = 12; //天宫秘宝
}

View File

@ -75,6 +75,7 @@ public class SSpecialConfig implements BaseConfig {
public static final String XUANYUAN_OPEN_TIME = "xuanyuan_open_time";//轩辕开始时间(星期)
public static final String EXCHANGE_FORCE_TYPE = "exchange_focus_type";//货币转换类型
public static final String SKY_TREASURE_SCORE_INGIFT = "sky_treasure_score_ingift";//天宫密保购买默认获得积分
@Override
public void init() throws Exception {