11

gamecommon/src/main/java/com/ljsd/jieling/exception/ErrorCode.java

@@ -167,7 +167,7 @@ public enum ErrorCode implements IErrorCode {
     FORCE_NOT_ENOUGH(128, "战力不足"),
     VIP_HAD_TAKED_LEVEL_REWARD(129, "已领取该等级礼包"),
     VIP_HAD_TAKED_DAILY_REWARD(130, "已领取今日礼包"),
-    VIP_LEVEL_NOT_ENOUGH(131, "等级不足"),
+    VIP_LEVEL_NOT_ENOUGH(131, "等级不足vip9"),
     MINSK_BATTLE_BUYCOUNT_ENOUGH(132, "购买次数已达上限"),
     MINSK_BATTLE_COUNT_ENOUGH(133, "挑战次数已达上限"),
     HERO_COMBATPLAN_ERR(134, "作战方案不存在"),

gamecommon/src/main/java/util/TimeUtils.java

@@ -30,7 +30,7 @@ public class TimeUtils {
     private static final Logger LOGGER = LoggerFactory.getLogger(TimeUtils.class);
 
     static {
-        //TimeZone.setDefault(TimeZone.getTimeZone("GMT+8")); 直接使用操作系统的时区
+        TimeZone.setDefault(TimeZone.getTimeZone("GMT+8")); //直接使用操作系统的时区
         TIME_ZONE = TimeZone.getDefault();
     }
 

serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java

@@ -120,7 +120,7 @@ public class ChatLogic {
         User user = UserManager.getUser(uid);
         PlayerManager playerInfoManager = user.getPlayerInfoManager();
         LOGGER.debug("sendChatMessage message={}", message);
-        if (playerInfoManager.getLevel() < 20) {
+        if ((playerInfoManager.getLevel() < 20) || (user.getPlayerInfoManager().getVipLevel() < 9)){
             throw new ErrorCodeException(ErrorCode.VIP_LEVEL_NOT_ENOUGH);
         }
 

serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java

@@ -128,7 +128,7 @@ public class GlobalDataManaager implements IManager {
             } else {
                 long seasonOpenLong = sGlobalSystemConfig.getSeasonOpenLong();
                 long seasonEndLong = sGlobalSystemConfig.getSeasonEndLong();
-                long diffTime = seasonEndLong - seasonOpenLong;
+                long diffTime = (seasonEndLong - seasonOpenLong);
                 int seasonInterval = sGlobalSystemConfig.getSeasonInterval() * 60 * 1000;
 
                 long passTims = now - seasonOpenLong;

serverlogic/src/main/java/com/ljsd/jieling/logic/adjutant/AdjutantLogic.java

@@ -345,7 +345,11 @@ public class AdjutantLogic {
         int checkCount = count + adjutantManager.getVigorTotal();
        // int vigorTotalLimit=user.getPlayerInfoManager().getVipPrivilageValue(VipPrivilegeType.VIGORTOTAL_LIMIT_NUM);
         int vigorTotalLimit = SPrivilegeTypeConfig.getConditionByVip(VipPrivilegeType.VIGORTOTAL_LIMIT_NUM,user.getPlayerInfoManager().getVipLevel());
-        if (0 < checkCount) {
+        // Only proceed when we actually have elapsed periods (count > 0).
+        // Previously the code checked "0 < checkCount" which becomes true when the
+        // current vigorTotal > 0 even if no time period has elapsed (count == 0).
+        // That prevented proper incrementing behavior (e.g. stuck at 4/5).
+        if (count > 0) {
             if (vigorTotalLimit > checkCount) {
                 adjutantManager.setVigorTotal(adjutantManager.getVigorTotal() + count);
                 adjutantManager.setAddVigorTime(adjutantManager.getAddVigorTime() + count * minute * 60);

serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java

@@ -302,7 +302,8 @@ public class UserManager {
             if (canNull) {
                 return null;
             }
-            throw new Exception("1-UserManager::getUser null exception：" + uid);
+            return null;
+           // throw new Exception("1-UserManager::getUser null exception：" + uid);
         }
 
         initHeroMedal(user);

serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java

@@ -385,9 +385,9 @@ public class GuildLogic {
         int uid = session.getUid();
         User user = UserManager.getUser(uid);
         int msgId = MessageTypeProto.MessageType.FAMILY_CREATE_RESPONSE_VALUE;
-//        if (user.getPlayerInfoManager().getVipLevel() < 6) {
-//            throw new ErrorCodeException(ErrorCode.VIP_LEVEL_NOT_ENOUGH);
-//        }
+        if (user.getPlayerInfoManager().getVipLevel() < 9) {
+            throw new ErrorCodeException(ErrorCode.VIP_LEVEL_NOT_ENOUGH);
+        }
         checkForCreateGuild(user, familyName, announce,channelId);
         boolean enough = ItemUtil.itemCost(user, SGuildSetting.sGuildSetting.getCreatCost(), BIReason.CREATE_GUILD_CONSUME, 0);
         if (!enough) {

serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java

@@ -508,7 +508,7 @@ public class MissionLoigc {
         JadeDynastyMissionType jadeDynastyMissionType = user.getUserMissionManager().getJadeDynastyMissionType();
         CumulationData jadeDynastyCumulationData = user.getUserMissionManager().getJadeDynastyCumulationData();
         CumulationData jadeDynastyWeekCumulationData = user.getUserMissionManager().getJadeDynastyWeekCumulationData();
-
+        LOGGER.error("getJadeDynastyMission. userId={},jadeDynastyMissionType={},jadeDynastyCumulationData={},jadeDynastyWeekCumulationData={}", user.getId(),jadeDynastyMissionType,jadeDynastyCumulationData,jadeDynastyWeekCumulationData);
         int jadeMissionType = GameMisionType.JADE_DYNASTY_MISSION.getType();
         for (Integer id : jadeDynastyMissionType.getDoingMissionIds()) {
             SThemeActivityTaskConfig config = SThemeActivityTaskConfig.idTaskConfig.get(id);
@@ -539,6 +539,7 @@ public class MissionLoigc {
                 missionList.add(CommonProto.UserMissionInfo.newBuilder().setMissionId(taskId.getKey()).setState(2).setType(jadeMissionType).setProgress(taskId.getValue().getTaskValue()[1][0]).setTakeTimes(0).build());
             }
         }
+        LOGGER.error("getJadeDynastyMission. userId={},missionList={}", user.getId(),missionList);
     }
 
     private static void getShengDanMission(User user, List<CommonProto.UserMissionInfo> missionList) {

serverlogic/src/main/java/com/ljsd/jieling/logic/rankingReward/RankingRewardLogic.java

@@ -226,18 +226,20 @@ public class RankingRewardLogic {
                 int _uid = _e.getValue();
                 long _time = _e.getKey();
                 User user = UserManager.getUser(_uid);
-                PlayerManager playerManager = user.getPlayerInfoManager();
-                CommonProto.RankingInfo info = CommonProto.RankingInfo.newBuilder()
-                        .setId(_id)
-                        .setUid(_uid)
-                        .setLevel(playerManager.getLevel())
-                        .setHead(playerManager.getHead())
-                        .setName(playerManager.getNickName())
-                        .setHeadFrame(playerManager.getHeadFrame())
-                        .setTime(_time)
-                        .setRank(++rank)
-                        .build();
-                rankingInfoList.add(info);
+                if (user != null) {
+                    PlayerManager playerManager = user.getPlayerInfoManager();
+                    CommonProto.RankingInfo info = CommonProto.RankingInfo.newBuilder()
+                            .setId(_id)
+                            .setUid(_uid)
+                            .setLevel(playerManager.getLevel())
+                            .setHead(playerManager.getHead())
+                            .setName(playerManager.getNickName())
+                            .setHeadFrame(playerManager.getHeadFrame())
+                            .setTime(_time)
+                            .setRank(++rank)
+                            .build();
+                    rankingInfoList.add(info);
+                }
             }
         }
     }

serverlogic/src/main/java/com/ljsd/jieling/util/ShieldedWordUtils.java

@@ -31,7 +31,7 @@ public class ShieldedWordUtils {
             }
         }
 
-        result = isContaintSensitiveWord2(name);
+        result = isContaintSensitiveWord(name);
         if(result){
             return false;
         }