gitwallet 1 год назад
Родитель
Сommit
01bcf4c64b
1 измененных файлов с 9 добавлено и 2 удалено
  1. 9 2
      script/module/chengjiu/ChengjiuLogic.lua

+ 9 - 2
script/module/chengjiu/ChengjiuLogic.lua

@@ -15,6 +15,7 @@ local CombatPosLogic = require("combat.CombatPosLogic")
 local RoleAttr = require("role.RoleAttr")
 local GuideLogic = require("guide.GuideLogic")
 local DB = require("common.DB")
+local Util = require("common.Util")
 local LuaMongo = _G.lua_mongo
 
 --[[
@@ -361,9 +362,14 @@ function isDot(human)
             for k, id in ipairs( GroupExcel[i].member) do
                 if human.chengJiuGo and human.chengJiuGo[i] and human.chengJiuGo[i][id] then
                 else
-                    if human.db.chengjiu.task and human.db.chengjiu.task[id] and human.db.chengjiu.task[id] ~= CJ_TASK_STATE_0 then
+                    if (human.db.chengjiu.task and human.db.chengjiu.task[id] and human.db.chengjiu.task[id] ~= CJ_TASK_STATE_0) or
+                        (human.db.chengjiu.task and human.db.chengjiu.task[id] and human.db.chengjiu.task[id] == CJ_TASK_STATE_0) then
                     else
-                        return true
+                        print("1:ChengjiuLogic isDot->"..human.fd.." state:")
+                        if human.db.chengjiu.task and human.db.chengjiu.task[id] and (human.db.chengjiu.task[id] == CJ_TASK_STATE_2 or 
+                            human.db.chengjiu.task[id] == CJ_TASK_STATE_1 ) then
+                           return true
+                        end
                     end
                     
                 end  
@@ -379,6 +385,7 @@ function isDot(human)
             local groupID = ChengjiuExcel[k].group
             local needLv = GroupExcel[groupID].lv
             if v == CJ_TASK_STATE_1 and human.db.lv >= needLv then
+                print("2:ChengjiuLogic isDot->"..human.fd.." state:")
                 return true
             end
         end