公会大区修改，生成消耗原因方法提交

serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java

@@ -211,10 +211,10 @@ public class RedisKey {
             return  type + RedisKey.Delimiter_colon + key;
         }
         if(familyKey.contains(type)){
-            return  type + RedisKey.Delimiter_colon + GameApplication.serverProperties.getAreaId();
+            return GameApplication.serverProperties.getAreaId()+RedisKey.Delimiter_colon+ type+RedisKey.Delimiter_colon;
         }
         if (withoutServerId) {
-            return GameApplication.areaId + Delimiter_colon + type + Delimiter_colon + String.valueOf(key);
+            return GameApplication.areaId + Delimiter_colon + type + Delimiter_colon + String.valueOf(key)+key;
         } else {
             return GameApplication.serverId + Delimiter_colon + type + Delimiter_colon + String.valueOf(key);
         }

serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java

@@ -1058,7 +1058,7 @@ public class RedisUtil {
             return type + RedisKey.Delimiter_colon + key;
         }
         if(RedisKey.familyKey.contains(type)){
-            return  type + RedisKey.Delimiter_colon + GameApplication.serverProperties.getAreaId();
+            return GameApplication.serverProperties.getAreaId()+ RedisKey.Delimiter_colon+type  + RedisKey.Delimiter_colon+key;
         }
         if(RedisKey.TOKEN.equals(type)||RedisKey.USER_SERVER_INFO.equals(type)||
                 RedisKey.CDKEY.equals(type)){

serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java

@@ -17,11 +17,9 @@ public interface BIReason {
 
     int TAKE_MISSION_REWARD = 11;//领取任务奖励
     int TAKE_ACTIVITY_REWARD = 12;//领取活动奖励
-    int TAKE_COPY_REWARD = 12;// 领取副本功绩奖励
 
     int TAKE_SECRET_REWARD = 13;//秘盒奖励
     int TAKE_SECRET_EXTRA_REWARD = 14;//秘盒额外奖励
-
     int USER_BORN_REWARD = 15;//角色出生奖励
 
 
@@ -47,6 +45,10 @@ public interface BIReason {
 
     int VIP_DAY_REWARD = 29;//VIP每日赠送
 
+    int TAKE_COPY_REWARD = 30;//领取副本功绩奖励
+
+    int TREASURE_SCORE = 31;//孙龙宝藏获得积分
+
     int FRIEND_GIVE = 32;//好友赠送
 
     int BOMB_REWARD = 33;//炸弹掉落
@@ -83,7 +85,6 @@ public interface BIReason {
     int RANDOM_SOULEQUIP = 51;//占星
 
     int DIRECT_BUY = 52;//直购
-    int TREASURE_SCORE = 53;//孙龙宝藏获得积分
 
     int MAIN_LEVEL_STATE_REWARD = 53;//关卡挂机奖励
 
@@ -94,7 +95,7 @@ public interface BIReason {
     int HERO_BACK_REWARD =   57 ; //英雄回溯返回东西
     int EXTRA_DROP_REWARD=58;//  额外赠送
 
-    //道具消耗原因 1000开头
+
     int ADVENTURE_UPLEVEL_CONSUME = 1000;//秘境升级
     int SECRETBOX_CONSUME = 1001;//秘盒抽卡
     int DECOMPOSE_ITEM_CONSUME = 1002;//分解道具消耗

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

@@ -411,9 +411,9 @@ public class GuildLogic {
         if(!isSuccess){
             throw new ErrorCodeException(ErrorCode.FAMILY_DO_AGAIN);
         }
-        if(GuildFightLogic.getStatus()!=0&&(type==1||type==3)){
-            throw new ErrorCodeException(ErrorCode.FAMILY_NO_APPLY_IN_WAR);
-        }
+//        if(GuildFightLogic.getStatus()!=0&&(type==1||type==3)){
+//            throw new ErrorCodeException(ErrorCode.FAMILY_NO_APPLY_IN_WAR);
+//        }
         try {
             Map<Integer, GuildApply> applyGuild = GuilidManager.getApplyGuildInfos(guildId, 0);
             switch (type){

test/src/main/java/BIUtil.java

@@ -0,0 +1,41 @@
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+/**
+ * @author lvxinran
+ * @date 2019/11/5
+ * @discribe
+ */
+public class BIUtil {
+    public static void main(String[] args) {
+        outBIReasonFile("serverlogic\\src\\main\\java\\com\\ljsd\\jieling\\globals\\BIReason.java","conf\\BIoutput.txt");
+    }
+    public static void outBIReasonFile(String in,String out){
+        StringBuffer buf = new StringBuffer();
+        Path path = Paths.get(in);
+        try {
+            List<String> lines = Files.readAllLines(path);
+            lines.forEach(str -> buf.append(str));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        String replace = buf.toString().replace("}", "").replace(" ","");
+        String[] split = replace.split("=");
+        StringBuilder content = new StringBuilder();
+        for(String s:split){
+            String[] reason= s.split("int")[0].split(";//");
+            if(reason.length<2){
+                continue;
+            }
+            content.append(reason[0]).append("\t").append(reason[1].replaceAll(" ","")).append("\n");
+        }
+        try {
+            Files.write(Paths.get(out), content.toString().getBytes());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}