From c9558bd1160bfe9d7342fd1d3256964fd2009e11 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 21 Dec 2020 14:00:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=AE=E8=82=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java index 1f6dd9a31..e1d756fd6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java @@ -319,6 +319,7 @@ public class FightUtil { .setProperty(property.substring(0, property.length()-1)) .setStar(hero.getStar()) .setPosition(teamPosHeroInfo.getPosition()) + .setSkinId(hero.getSkin()) .build(); heroFightInfos.add(heroFightInfo); } From 025128b6ec4812b1440f253ca879c6c73f135626 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 17 Dec 2020 21:24:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=85=E5=B3=B0=E8=B5=9B=20=E7=AB=9E?= =?UTF-8?q?=E7=8C=9C=E5=B8=81=E8=A1=A5=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../champion/ChampionBetInfoHandler.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java index 42c87d608..5cbb44427 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java @@ -1,10 +1,13 @@ package com.ljsd.jieling.handler.champion; +import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig; import com.ljsd.jieling.core.GlobalsDef; +import com.ljsd.jieling.db.mongo.MongoUtil; 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.logic.championship.ChampionshipLogic; import com.ljsd.jieling.logic.dao.*; @@ -14,8 +17,10 @@ import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.ArenaInfoProto; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; +import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; import config.SArenaRobotConfig; +import manager.STableManager; import util.StringUtil; import java.util.List; @@ -135,6 +140,20 @@ public class ChampionBetInfoHandler extends BaseHandler