From 264540e796bdf9acbc740510a1c8027784e647f0 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 21 Aug 2019 19:45:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/handler/LoginRequestHandler.java | 6 +++--- .../main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java | 6 +++++- .../java/com/ljsd/jieling/logic/friend/FriendLogic.java | 2 +- .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 3 +++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java index d4c1b4241..341513e9d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java @@ -47,13 +47,13 @@ public class LoginRequestHandler extends BaseHandler { LoginParamType.NETWORK_WIFI.equals(loginRequest.getNetworkS())); switch (loginRequest.getPlatformS()){ case LoginParamType.PLATFORM_ANDRIOD: - paramEnvironmentSimpleBean.setIdfa_s(loginRequest.getIdfaSOrImeiS()); + paramEnvironmentSimpleBean.setImei_s(loginRequest.getIdfaSOrImeiS()); break; case LoginParamType.PLATFORM_IOS: - paramEnvironmentSimpleBean.setImei_s(loginRequest.getIdfaSOrImeiS()); + paramEnvironmentSimpleBean.setIdfa_s(loginRequest.getIdfaSOrImeiS()); break; case LoginParamType.PLATFORM_IOS_YY: - paramEnvironmentSimpleBean.setImei_s(loginRequest.getIdfaSOrImeiS()); + paramEnvironmentSimpleBean.setIdfa_s(loginRequest.getIdfaSOrImeiS()); break; case LoginParamType.PLATFORM_PC: break; 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 38b4c7f92..b6bb90aa4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java @@ -58,7 +58,11 @@ public class KtEventUtils { int itemTotalNum = (int)parm[4]; paramEventBean.add(itemUseType[useType]); paramEventBean.add(String.valueOf(useReson)); - paramEventBean.add(String.valueOf(itemId)); + if(currencyMap.containsKey(itemId)){ + paramEventBean.add(currencyMap.get(itemId)); + }else{ + paramEventBean.add(String.valueOf(itemId)); + } paramEventBean.add(String.valueOf(itemNum)); PlayerManager playerInfoManager = user.getPlayerInfoManager(); BILog.info("itemflow {}|{}|{}|{}|{}|{}|{}|{}",user.getId(), playerInfoManager.getLevel(), playerInfoManager.getVipLevel(),useType,useReson,itemId,itemNum,itemTotalNum); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java index 252ca5f98..4dd873233 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java @@ -446,7 +446,7 @@ public class FriendLogic { boolean check = friendUser.getPlayerInfoManager().check(SGameSetting.getGameSetting().getMaxEnergyGet(), 0); if(check){ friendManager1.updateHaveRewardMap(uid,1); - sendFriendStatedication(uid,friendId,2); + sendFriendStatedication(uid,friendUserId,2); times++; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index a7cfcdc6d..769b5d14e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -42,6 +42,9 @@ public class ItemUtil { currencyMap.add(Global.GEM); currencyMap.add(Global.GOLD); currencyMap.add(Global.SOULCRYSTAL); + currencyMap.add(Global.DEVILJADE);//妖灵玉 + currencyMap.add(Global.ELITEPROOF);//精英证明 + currencyMap.add(Global.HEARTFIRE);//心火明晶 } public static void initNoDelete(){