Merge branch '360test' of https://gitee.com/wangwenfan/congkong into 360test

script/module/absAct/DrumBlastingLogic.lua

@@ -301,13 +301,24 @@ end
 -- �ص�
 function drumTaskCallBack(human,id,type,cnt)
     AbsActLogic.checkAbsActClean(human, id)
-    initDB(human,id)
+   
 
     local state, endTime, starTime = AbsActLogic.isStarted(human, id)
+    -- 活動未開啓
+    if not state or os.time() > endTime then 
+        return
+    end
     
     local absConfig = AbsActExcel.absActivity[id]
     if not absConfig then return end
 
+    local absActData = human.db.absAct[id]
+    if not absActData then 
+        return
+    end
+
+    initDB(human,id)
+
     local nowDay = Util.diffDay(starTime) + 1
     -- ������������������
     local taskConfig = AbsActExcel.drum