Selaa lähdekoodia

世界boss 魔蛛 修复

249435196@qq.com 1 vuosi sitten
vanhempi
sitoutus
acebfe0bd6

+ 1 - 1
script/module/mozhu/MoZhuDB.lua

@@ -16,7 +16,7 @@ local Util = require("common.Util")
 MOZHU_DB = MOZHU_DB or {}
 
 function initAfterStart()
-	if _G.is_middle ~= true then return end
+	--if _G.is_middle ~= true then return end
 	print("  initAfterStart   initAfterStart")
 	MOZHU_DB = CommonDB.getValueByKey(CommonDB.KEY_CIYUAN_MOZHU) or {}
 

+ 20 - 10
script/module/mozhu/MoZhuLogic.lua

@@ -40,9 +40,10 @@ local ChatUnion = require("chat.ChatUnion")
 local JjcActLogic = require("jjc.JjcActLogic")
 local DragonNestLogic = require("copy.DragonNestLogic")
 local HeroLogic = require("hero.HeroLogic")
+local MozhuMiddleLogic = require("mozhu.MoZhuMiddleLogic")
 
-MOZHU_OPEN_DAY = {[4]= 1, [7] = 1}
-MOZHU_OPEN_DAY_2 = {4, 7}
+MOZHU_OPEN_DAY = {[1]= 1,[2] = 1,[3] = 1,[4] = 1,[5] = 1,[6] = 1, [7] = 1}
+MOZHU_OPEN_DAY_2 = {1, 7}
 MOZHU_DAY_TIME = 24 * 60 * 60
 MOZHU_END_TIME = 22 * 60 * 60
 MOZHU_TIAOZHAN_CNT = 3   -- 魔蛛挑战次数
@@ -341,10 +342,14 @@ function query(human)
         end       
     end
     initHuman(human)
-    local msgInner =  InnerMsg.lw.LW_MOZHU_QUERY
+    local msgInner = {}
     msgInner.uuid = human.db._id
     msgInner.unionUuid = human.db.unionUuid
-    InnerMsg.sendMsg(0, msgInner)
+    --[[local msgInner =  InnerMsg.lw.LW_MOZHU_QUERY
+    msgInner.uuid = human.db._id
+    msgInner.unionUuid = human.db.unionUuid
+    InnerMsg.sendMsg(0, msgInner)]]
+    MozhuMiddleLogic.LW_MOZHU_QUERY(human,msgInner)
 end
 
 function WLQuery(human, msg)
@@ -379,10 +384,12 @@ end
 
 
 function queryRank(human, type)
-    local msgInner = InnerMsg.lw.LW_MOZHU_RANK_QUERY
+    --local msgInner = InnerMsg.lw.LW_MOZHU_RANK_QUERY
+    local msgInner = {}
     msgInner.uuid = human.db._id
     msgInner.type = type 
-    InnerMsg.sendMsg(0, msgInner)
+    --InnerMsg.sendMsg(0, msgInner)
+    MozhuMiddleLogic.LW_MOZHU_RANK_QUERY(0,msgInner)
 end
 
 function rankQueryWL(human, msg)
@@ -433,11 +440,12 @@ function unionHurtGet(human, id)
     local oldId = human.db.mozhu.unionGet or 0
     if id ~= oldId + 1 then return end
 
-    local msgInner = InnerMsg.lw.LW_MOZHU_UNION_GET
+    local msgInner = {} -- InnerMsg.lw.LW_MOZHU_UNION_GET
     msgInner.uuid = human.db._id
     msgInner.unionUuid = human.db.unionUuid
     msgInner.id = id 
-    InnerMsg.sendMsg(0, msgInner)
+    --InnerMsg.sendMsg(0, msgInner)
+    MozhuMiddleLogic.LW_MOZHU_UNION_GET(0,msgInner)
 end
 
 function unionGetWL(human, msg)
@@ -837,7 +845,8 @@ function onFightEnd(human,result, combatType, cbParam , combatInfo)
     end
     human.db.mozhu.hurt = human.db.mozhu.hurt or 0
     human.db.mozhu.hurt = human.db.mozhu.hurt + atkHurt
-    local msgInner =  InnerMsg.lw.LW_MOZHU_FIGHT_END
+    --local msgInner =  InnerMsg.lw.LW_MOZHU_FIGHT_END
+    local msgInner = {}
     msgInner.uuid = human.db._id
     msgInner.unionUuid = human.db.unionUuid or ""
     msgInner.maxHurt =  human.db.mozhu.hurt
@@ -846,7 +855,8 @@ function onFightEnd(human,result, combatType, cbParam , combatInfo)
     msgInner.unionBase = {}    
     msgInner.combatInfo = combatInfo
     makeBaseInfo(human, msgInner.roleBase, msgInner.unionBase)
-    InnerMsg.sendMsg(0, msgInner)
+    --InnerMsg.sendMsg(0, msgInner)
+    MozhuMiddleLogic.LW_MOZHU_FIGHT_END(0,msgInner)
 
 end
 

+ 14 - 12
script/module/mozhu/MoZhuMiddleLogic.lua

@@ -128,7 +128,7 @@ function  LW_MOZHU_QUERY(fd, msg)
     end
     
    -- Util.printTable(mozhuDB)
-    local msgInner = InnerMsg.wl.WL_MOZHU_QUERY
+    local msgInner = {} --InnerMsg.wl.WL_MOZHU_QUERY
     msgInner.uuid = msg.uuid
     msgInner.myRank = 0
     msgInner.roleRank = {}
@@ -143,8 +143,8 @@ function  LW_MOZHU_QUERY(fd, msg)
     fontRoleRank(mozhuDB, msgInner, 10)
     fontMyRank(mozhuDB, msg.uuid, msgInner)
     fontMyUnion(mozhuDB, msg.unionUuid, msgInner)
-    InnerMsg.sendMsg(fd, msgInner)
-
+    --InnerMsg.sendMsg(fd, msgInner)
+    WL_MOZHU_QUERY(fd,msgInner)
 end
 
 
@@ -182,7 +182,7 @@ function LW_MOZHU_FIGHT_END(fd, msg)
 
     local startTime, endTime  = MoZhuLogic.getActTime()
     local now = os.time()
-    local msgInner =  InnerMsg.wl.WL_MOZHU_FIGHT_END
+    local msgInner = {} --InnerMsg.wl.WL_MOZHU_FIGHT_END
     if now < startTime or now > endTime then
         local rank, maxHurt = MoZhuDB.getRoleRank(msg.uuid)
         local unRank = MoZhuDB.getUnionRank(msg.unionUuid)
@@ -196,7 +196,8 @@ function LW_MOZHU_FIGHT_END(fd, msg)
         msgInner.maxHurt = maxHurt
         msgInner.combatInfo = msg.combatInfo
     --  Msg.trace(msgInner)
-        InnerMsg.sendMsg(fd, msgInner)
+        --InnerMsg.sendMsg(fd, msgInner)
+        WL_MOZHU_FIGHT_END(fd,msgInner)
         return 
     end   
 
@@ -220,8 +221,8 @@ function LW_MOZHU_FIGHT_END(fd, msg)
     msgInner.maxHurt = maxHurt
     msgInner.combatInfo = msg.combatInfo
   --  Msg.trace(msgInner)
-    InnerMsg.sendMsg(fd, msgInner)
-
+    --InnerMsg.sendMsg(fd, msgInner)
+    WL_MOZHU_FIGHT_END(fd,msgInner)
     MoZhuDB.saveMoZhu()
 end
 
@@ -236,7 +237,7 @@ end
 
 function LW_MOZHU_RANK_QUERY(fd, msg)
     local mozhuDB = MoZhuDB.getMoZhu()
-    local msgInner = InnerMsg.wl.WL_MOZHU_RANK_QUERY
+    local msgInner = {}--InnerMsg.wl.WL_MOZHU_RANK_QUERY
     msgInner.uuid = msg.uuid
     msgInner.type = msg.type
     msgInner.roleRank = {}
@@ -246,8 +247,8 @@ function LW_MOZHU_RANK_QUERY(fd, msg)
     else
         fontUnionRank(mozhuDB, msgInner)       
     end
-  --  Util.printTable(msgInner)
-    InnerMsg.sendMsg(fd, msgInner)
+    --InnerMsg.sendMsg(fd, msgInner)
+    WL_MOZHU_RANK_QUERY(fd,msgInner)
 end
 
 
@@ -274,11 +275,12 @@ function LW_MOZHU_UNION_GET(fd, msg)
         end
     end
 
-    local msgInner = InnerMsg.wl.WL_MOZHU_UNION_GET
+    local msgInner = {} --InnerMsg.wl.WL_MOZHU_UNION_GET
     msgInner.uuid = msg.uuid
     msgInner.ret  = ret
     msgInner.id   = msg.id
-    InnerMsg.sendMsg(fd, msgInner)
+    --InnerMsg.sendMsg(fd, msgInner)
+    WL_MOZHU_UNION_GET(fd,msgInner)
 end
 
 function WL_MOZHU_UNION_GET(fd, msg)