From 5b660609f4cbb3a8ec3e7faab95652e47dcbe3b9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-98AVA47\\Administrator" <zt011052@126.com>
Date: Thu, 1 Oct 2020 00:23:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E7=A8=B7=E5=A4=A7=E5=85=B8=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ljsd/jieling/db/redis/RedisUtil.java  | 12 ++++++++++
 .../jieling/logic/activity/ActivityLogic.java |  2 ++
 .../jieling/logic/activity/SheJiActivity.java | 24 ++++++++++++-------
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java
index f1970448e..467fce676 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java
@@ -1308,4 +1308,16 @@ public class RedisUtil {
     }
 
 
+    public void remove(String key){
+
+        for (int i = 0; i < MAX_TRY_TIMES; i++) {
+            try {
+                redisTemplate.delete(key);
+                return;
+            } catch (Exception e) {
+
+            }
+        }
+    }
+
 }
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 c55ffa330..68746d945 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
@@ -176,6 +176,8 @@ public class ActivityLogic implements IEventHandler{
             if (null == abstractActivity) {
                 continue;
             }
+            if(openActivityIds.contains(sGlobalActivity.getId()))
+                continue;
             abstractActivity.onActivityStart();
             openActivityIds.add(sGlobalActivity.getId());
         }
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
index 66987f54d..06e214ffb 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
@@ -71,21 +71,27 @@ class SheJiActivity extends AbstractActivity {
             }
 
         }
+
+        //删除本榜单
+        String key = RedisUtil.getInstence().getKey(RedisKey.EXPERT_RANK, Integer.toString(id));
+        String key2 = RedisUtil.getInstence().getKey(RedisKey.GUILD_SHEJI_SCORE_RANK, Integer.toString(id));
+        RedisUtil.getInstence().remove(key);
+        RedisUtil.getInstence().remove(key2);
     }
 
     @Override
     public void initActivity(User user) throws Exception {
         super.initActivity(user);
         //初始化移除道具
-        SGodSacrificeSetting sGodSacrificeSetting = STableManager.getConfig(SGodSacrificeSetting.class).get(1);
-        if (null != sGodSacrificeSetting) {
-            if (sGodSacrificeSetting.getItemDelete() == 1) {
-                int[] activityItems = sGodSacrificeSetting.getActivityItems();
-                for (int item : activityItems) {
-                    user.getItemManager().removeItem(item);
-                }
-            }
-        }
+//        SGodSacrificeSetting sGodSacrificeSetting = STableManager.getConfig(SGodSacrificeSetting.class).get(1);
+//        if (null != sGodSacrificeSetting) {
+//            if (sGodSacrificeSetting.getItemDelete() == 1) {
+//                int[] activityItems = sGodSacrificeSetting.getActivityItems();
+//                for (int item : activityItems) {
+//                    user.getItemManager().removeItem(item);
+//                }
+//            }
+//        }
 
 
     }