From e67bf611416eda8bc3d3e6526845052f6201d1e4 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 8 Jul 2019 17:24:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=8C=E6=88=90=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/ktbeans/KTRoleUtil.java | 15 +++++++++++++++ .../com/ljsd/jieling/ktbeans/KtEventUtils.java | 4 ++-- .../ktbeans/parmsBean/ParamRoleBean.java | 18 ++++++++++++++++++ .../jieling/logic/activity/ActivityLogic.java | 1 - .../jieling/logic/dao/ActivityMission.java | 3 ++- .../ljsd/jieling/logic/fight/CombatLogic.java | 1 - 6 files changed, 37 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KTRoleUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KTRoleUtil.java index b0edae7d6..8fc8efd50 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KTRoleUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KTRoleUtil.java @@ -1,6 +1,9 @@ package com.ljsd.jieling.ktbeans; +import com.ljsd.jieling.core.GlobalsDef; +import com.ljsd.jieling.globals.Global; import com.ljsd.jieling.ktbeans.parmsBean.ParamRoleBean; +import com.ljsd.jieling.logic.dao.Item; import com.ljsd.jieling.logic.dao.root.User; import java.util.HashMap; @@ -13,6 +16,18 @@ public class KTRoleUtil { paramRoleBean.setRole_name_s(user.getPlayerInfoManager().getNickName()); paramRoleBean.setLevel_i(String.valueOf(user.getPlayerInfoManager().getLevel())); paramRoleBean.setVip_level_i(user.getPlayerInfoManager().getVipLevel()); + Item gem = user.getItemManager().getItemMap().get(Global.GEM); + Item gold = user.getItemManager().getItemMap().get(Global.GOLD); + int gemCount =0; + int goldCount =0; + if(gem!=null){ + gemCount = gem.getItemNum(); + } + if(gold!=null){ + goldCount = gold.getItemNum(); + } + paramRoleBean.setCurrency_1_d(String.valueOf(gemCount)); + paramRoleBean.setCurrency_2_d(String.valueOf(goldCount)); return paramRoleBean; } } 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 d2dc2f683..4032fffe1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java @@ -41,6 +41,7 @@ public class KtEventUtils { paramEventBean.add(sGlobalActivity.getSesc()); paramEventBean.add(sGlobalActivity.getSesc()); paramEventBean.add(parm[1].toString()); + paramEventBean.add("COMPLETE"); break; case ParamEventBean.UserItemEvent: case ParamEventBean.UserCurrencyEvent: @@ -89,8 +90,7 @@ public class KtEventUtils { case ParamEventBean.UserTaskEvent: int misionType = (int)parm[0]; int misionId = (int)parm[1]; - paramEventBean.add(String.valueOf(misionType)); - paramEventBean.add(String.valueOf(misionId)); + paramEventBean.add(misionType+"_"+misionId); paramEventBean.add("COMPLETE"); break; 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 807d1113c..93fb5f10f 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 @@ -21,6 +21,8 @@ public class ParamRoleBean { private String role_name_s; private String level_i; private int vip_level_i; + private String currency_1_d; + private String currency_2_d; public String getRole_id_s() { return role_id_s; @@ -54,4 +56,20 @@ public class ParamRoleBean { public void setVip_level_i(int vip_level_i) { this.vip_level_i = vip_level_i; } + + public String getCurrency_1_d() { + return currency_1_d; + } + + public void setCurrency_1_d(String currency_1_d) { + this.currency_1_d = currency_1_d; + } + + public String getCurrency_2_d() { + return currency_2_d; + } + + public void setCurrency_2_d(String currency_2_d) { + this.currency_2_d = currency_2_d; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 1fa7c8351..5c322b3e3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -311,7 +311,6 @@ public class ActivityLogic { continue; } checkActivityMissionFinishAndTaked(activityMission); - return; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityMission.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityMission.java index 1e5b20e04..0d832ca23 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityMission.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ActivityMission.java @@ -46,7 +46,8 @@ public class ActivityMission extends MongoBase { public void updateActivityState(int state){ - updateString("state",state); + activityState = state; + updateString("activityState",state); } public void updateProgressInfo(int missionId, ActivityProgressInfo activityProgressInfo) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index e1d3b6472..7e3fa110f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -638,7 +638,6 @@ public class CombatLogic { public void challengeInvasionBoss(ISession session,String bossId,int teamId,int fightTimes,int skipFight) throws Exception { int uid = session.getUid(); User user = UserManager.getUser(uid); - SGameSetting sGameSetting = SGameSetting.getGameSetting(); if(fightTimes<=0 || StringUtil.isEmpty(bossId)){ MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ADVENTURE_BOSS_CHALLENGE_RESPONSE_VALUE,""); return;