宝物分解bug,竞猜打点提交

back_recharge
lvxinran 2020-12-12 17:51:29 +08:00
parent 9784aa4c3f
commit 1f0f27727b
3 changed files with 10 additions and 2 deletions

View File

@ -1,14 +1,19 @@
package com.ljsd.jieling.handler.champion;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.FunctionIdEnum;
import com.ljsd.jieling.db.redis.RedisKey;
import com.ljsd.jieling.db.redis.RedisUtil;
import com.ljsd.jieling.exception.ErrorCode;
import com.ljsd.jieling.exception.ErrorCodeException;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.handler.BaseHandler;
import com.ljsd.jieling.ktbeans.ReportEventEnum;
import com.ljsd.jieling.ktbeans.ReportUtil;
import com.ljsd.jieling.logic.GlobalDataManaager;
import com.ljsd.jieling.logic.championship.ChampionshipLogic;
import com.ljsd.jieling.logic.dao.ArenaRecord;
import com.ljsd.jieling.logic.dao.TimeControllerOfFunction;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.network.session.ISession;
@ -77,6 +82,8 @@ public class ChampionGuessHandler extends BaseHandler<ArenaInfoProto.ChampionBet
RedisUtil.getInstence().incrementZsetScore(RedisKey.CHAMPION_BET_ALL,"",selectUid +":" + winUid,chip);
RedisUtil.getInstence().putMapEntry(RedisKey.CHAMPION_BET_DETAIL,selectUid +":" + winUid,Integer.toString(uid),chip);
TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.TopBattle);
ReportUtil.onReportEvent(user,ReportEventEnum.GUESSING.getType(),openTimeOfFuntionCacheByType.getTimes(),ChampionshipLogic.getSchedule()==1?ChampionshipLogic.getRealTimes():ChampionshipLogic.getRealTimes()+7,winUid==arenaRecord.getAttackId()?1:2,chip);
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.CHAMPION_BET_GUESS_RESPONSE_VALUE,null,true);
}
}

View File

@ -87,6 +87,7 @@ public enum ReportEventEnum {
BEAST_STAR(60,"beast_star",new CommonEventHandler(),new String[]{"beast_id","old_star","new_star","cost_item_list","cost_beast_list"}),
BEAST_SUMMON(61,"beast_summon",new CommonEventHandler(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}),
BEAST_CABINET(62,"beast_cabinet",new CommonEventHandler(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}),
GUESSING(63,"guessing",new CommonEventHandler(),new String[]{"season_id","guessing_type","stake_type","stake_num"}),
VIP_LEVEL_UP(100,"", new VipLevelUpEventHandler(),new String[]{""});

View File

@ -329,7 +329,7 @@ public class ItemLogic {
if (!equipMap.containsKey(jewelId))
throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_NO_EQUIP);
PropertyItem propertyItem = equipMap.get(jewelId);
if (!StringUtil.isEmpty(propertyItem.getHeroId()))
if (!StringUtil.isEmpty(propertyItem.getHeroId())&&user.getHeroManager().getHero(propertyItem.getHeroId())!=null)
throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_SOULE_CANT);
Jewel jewel = (Jewel) propertyItem;
SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(propertyItem.getEquipId());
@ -478,7 +478,7 @@ public class ItemLogic {
soulEquipByPositionMap.forEach((k, v) -> baseItemMap.put(v, baseItemMap.getOrDefault(v, 0) + 1));
}
//卸下宝物
Set<String> jewelInfo = hero.getJewelInfo();
Set<String> jewelInfo = new HashSet<>(hero.getJewelInfo());
for (String equipId : jewelInfo) {
if (!equipMap.containsKey(equipId)) {
continue;