diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java index beae2b356..39458fa19 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java @@ -10,6 +10,10 @@ public interface Global { int GOLD = 14; //金币 int SOULCRYSTAL = 15; // 魂晶id int GEM = 16; // 妖精id + int DEVILJADE = 22; // 妖灵玉 + int ELITEPROOF = 25; // 精英证明 + int HEARTFIRE = 26; // 心火明晶 + int SEND_CARD_COUNT = 20; // 每页发送卡牌个数 int SEND_ITEM_COUNT = 200; // 每页发送道具个数 int SEND_EQUIP_COUNT = 20; // 每页发送装备个数 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 a2ae381d1..38b4c7f92 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java @@ -30,6 +30,9 @@ public class KtEventUtils { currencyMap.put(Global.SOULCRYSTAL,"currency_1_d"); //魂晶 currencyMap.put(Global.GEM,"currency_2_d"); //妖精 currencyMap.put(Global.GOLD,"currency_3_d");//金币 + currencyMap.put(Global.DEVILJADE,"currency_4_d");//妖灵玉 + currencyMap.put(Global.ELITEPROOF,"currency_5_d");//精英证明 + currencyMap.put(Global.HEARTFIRE,"currency_6_d");//心火明晶 } private static Gson gson = new Gson(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java index e3706dcc3..2bad68b18 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java @@ -206,7 +206,7 @@ public class CumulationData { if(count == null){ count = 0; } - heroUpStarTimesMap.put(heroStar,count+1); + heroUpSomeStarTimesMap.put(heroStar,count+1); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 72b852067..f29e70d6d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -407,6 +407,7 @@ public class PlayerManager extends MongoBase { } public void setRechargedaily(int rechargedaily) { + updateString("rechargedaily", rechargedaily); this.rechargedaily = rechargedaily; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hotfix/DoFix.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hotfix/DoFix.java index 577e00a28..8348317ca 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hotfix/DoFix.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hotfix/DoFix.java @@ -40,7 +40,10 @@ public class DoFix { int activityId = 14; ActivityManager activityManager = user.getActivityManager(); ActivityMission activityMission = activityManager.getActivityMissionMap().get(activityId); - if(activityMission.getValue()!=0){ + if (null == activityMission) { + return; + } + if (activityMission.getValue() != 0) { return; } int sum = 0; @@ -49,7 +52,7 @@ public class DoFix { sum++; } } - if(sum==0){ + if (sum == 0) { return; } activityMission.setValue(sum); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java index 72a74b094..8b9e9777a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java @@ -35,6 +35,13 @@ public class StoreLogic { private static Set openStoreInfo = new HashSet<>(); + private static Set storeGiftType = new HashSet<>(3); + static { + storeGiftType.add(30); + storeGiftType.add(31); + storeGiftType.add(32); + } + public static void checkGlobalStore(boolean isStartServer) throws Exception { long now = System.currentTimeMillis(); for(SStoreTypeConfig sStoreTypeConfig : SStoreTypeConfig.getsStoreTypeConfigMap().values()){ @@ -304,7 +311,7 @@ public class StoreLogic { dropItems[i][1]= (int)(goods[i][1]*itemNum *(add/10000F) ); } CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropItems, BIReason.STORE_BUY_ITEM); - if(SStoreTypeConfig.getsStoreTypeConfigMap().get(storeId).getStoreType() != StoreType.GIFT_STORE.getType()){ + if(!storeGiftType.contains(SStoreTypeConfig.getsStoreTypeConfigMap().get(storeId).getStoreType() )){ user.getUserMissionManager().onGameEvent(user, GameEvent.BUY_MATERIAL,sStoreConfig.getGoods()[0][0],itemNum,SStoreTypeConfig.getsStoreTypeConfigMap().get(storeId).getStoreType()); } if(itemId==10005){