From 45e38873d910657392546fbe91e89f8c24e66d22 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 29 Jul 2019 19:42:57 +0800 Subject: [PATCH] upload --- .../ktbeans/BeanBuilder/ParamBuilder.java | 2 +- .../ljsd/jieling/ktbeans/KtEventUtils.java | 7 ++++ .../ktbeans/parmsBean/ParamRoleBean.java | 9 +++++ .../ljsd/jieling/logic/hero/HeroLogic.java | 33 +++++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/BeanBuilder/ParamBuilder.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/BeanBuilder/ParamBuilder.java index be2028469..149a44f2e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/BeanBuilder/ParamBuilder.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/BeanBuilder/ParamBuilder.java @@ -49,7 +49,7 @@ public class ParamBuilder { ktRoleLogin.setParam_data(KtEventUtils.dataBuild(uid)); ktRoleLogin.setParam_environment(KtEventUtils.simpleEnviromentBuild(uid)); ktRoleLogin.setParam_user(KtEventUtils.userBuild(user)); - ktRoleLogin.setParam_role(KtEventUtils.roleBuild(user)); + ktRoleLogin.setParam_role(KtEventUtils.roleForLoginOrLogoutBuild(user)); ktRoleLogin.setParam_event(paramEventBean); ktRoleLogin.getParam_data().setCategory_s(LoginParamType.DATA_CATEGORY_ROLE); return ktRoleLogin; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java index 9b8f2131e..88f0b9f7c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java @@ -10,6 +10,7 @@ import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; import com.ljsd.jieling.ktbeans.parmsBean.*; import com.ljsd.jieling.logic.dao.PlayerManager; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.hero.HeroLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -122,6 +123,12 @@ public class KtEventUtils { return KTRoleUtil.getRoleById(user); } + public static ParamRoleBean roleForLoginOrLogoutBuild(User user){ + ParamRoleBean paramRoleBean = KTRoleUtil.getRoleById(user); + paramRoleBean.setEco_force_11_a(HeroLogic.getInstance().getEcoForce11A(user)); + return paramRoleBean; + } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/parmsBean/ParamRoleBean.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/parmsBean/ParamRoleBean.java index 93fb5f10f..d37e6de89 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/parmsBean/ParamRoleBean.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/parmsBean/ParamRoleBean.java @@ -23,6 +23,7 @@ public class ParamRoleBean { private int vip_level_i; private String currency_1_d; private String currency_2_d; + private String eco_force_11_a; public String getRole_id_s() { return role_id_s; @@ -72,4 +73,12 @@ public class ParamRoleBean { public void setCurrency_2_d(String currency_2_d) { this.currency_2_d = currency_2_d; } + + public String getEco_force_11_a() { + return eco_force_11_a; + } + + public void setEco_force_11_a(String eco_force_11_a) { + this.eco_force_11_a = eco_force_11_a; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 34fa84dcb..456deef16 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1648,4 +1648,37 @@ public class HeroLogic { MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.RINGFIRE_ADVANCED_RESPONSE_VALUE,null,true); } + + public String getEcoForce11A(User user){ + StringBuilder append = new StringBuilder().append("["); + append.append(calAllPokenmonForce(user)); + getTeamForceForUpload(append, user.getTeamPosManager().getTeamPosForHero().get(1),user); + getTeamForceForUpload(append, user.getTeamPosManager().getTeamPosForHero().get( GlobalsDef.TEAM_ARENA_DEFENSE),user); + append.append("]"); + return append.toString(); + } + + public void getTeamForceForUpload( StringBuilder append, List teamPosHeroInfoList,User user){ + if(teamPosHeroInfoList != null &&!teamPosHeroInfoList.isEmpty()){ + HeroManager heroManager = user.getHeroManager(); + Map heroMap = heroManager.getHeroMap(); + Map heroPosMap = new HashMap<>(5); + for(TeamPosHeroInfo teamPosHeroInfo: teamPosHeroInfoList){ + String heroId = teamPosHeroInfo.getHeroId(); + Hero hero = heroMap.get(heroId); + heroPosMap.put(teamPosHeroInfo.getPosition(),calHeoForce(user,hero,false)); + } + for(int i=1;i<6;i++){ + Integer force = heroPosMap.get(i); + if(force == null){ + force=0; + } + append.append(",").append(force); + } + }else{ + for(int i=1;i<6;i++){ + append.append(",").append(0); + } + } + } }