diff --git a/equipeff.lua b/equipeff.lua index 5f73294..5a06c0b 100644 --- a/equipeff.lua +++ b/equipeff.lua @@ -679,7 +679,8 @@ function beginmagic(actor, skillId, skillName, target, x, y) if bohave and not jhxbbgame.timeSecAt(actor, "U019", vdata.timecur) then jhxbbgame.SettimeSec(actor, "U019", 180, vdata.timecur) delbuff(actor, 31126) - delbuff(actor, 31121) + jhxbbgame.SettimeSec(actor, "N$移动掉血", 0) + delbuff(actor, 31124) delbuff(actor, 31118) delbuff(actor, 31119) @@ -1287,14 +1288,15 @@ function attackdamagebb(actor, -- object end end -function zbcfg.run(actor) +function zbcfg.run(actor, r) + r = r or 1 --jhxbbgame.log(actor,"*run",getconst(actor,"<$MAP>")) kuafusys.run(actor) - if hasbuff(actor, 31121) then + if jhxbbgame.timeSecAt(actor, "N$移动掉血") then --local ret = - jhxbbgame.DecHP(actor, 0.05) + jhxbbgame.DecHP(actor, 0.05*r) jhxbbgame.showeff(actor, 14) --jhxbbgame.HintEff(actor, "奇毒") diff --git a/kfsystem.lua b/kfsystem.lua index 78083ae..6c76300 100644 --- a/kfsystem.lua +++ b/kfsystem.lua @@ -3,23 +3,24 @@ local b2i = { [false] = 0, [true] = 1 } local waittimesec = 3*60 local namesact = { [0] = "跨服", "群骑竞赛", "夺宝战场", "杀戮证道", "据点争夺", "跨服沙巴克","辉煌的凤栖寺院", "泽坤的恩赐", } -local tims = { [0] = { (13 * 60 + 30), (23 * 60 + 30) } -, { (18 * 60 + 30), (18 * 60 + 50) }--群骑竞赛 -, { (19 * 60 + 10), (19 * 60 + 25) }--夺宝战场 -, { (20 * 60 + 00), (20 * 60 + 10) }--杀戮证道 -, { (21 * 60 + 00), (21 * 60 + 20) }--据点争夺 每周二四六开启21:00:00 -, { (21 * 60 + 00), (21 * 60 + 50) }--跨服沙巴克 每周二四六开启21:00:00 -, { (22 * 60 + 00), (22 * 60 + 50) }--辉煌的凤栖寺院 -, { (21 * 60 + 00), (21 * 60 + 50) }--泽坤的恩赐 周日21:00:00 +local tims = { [0] = { (12 * 60 + 0), (23 * 60 + 30) } +, { (16 * 60 + 30), (16 * 60 + 50) }--群骑竞赛 +, { (18 * 60 + 10), (18 * 60 + 25) }--夺宝战场 +,nil--, { (20 * 60 + 00), (20 * 60 + 10) }--杀戮证道 +, { (19 * 60 + 00), (19 * 60 + 20) }--据点争夺 每周二四六开启21:00:00 +, { (19 * 60 + 00), (19 * 60 + 50) }--跨服沙巴克 每周二四六开启21:00:00 +, { (20 * 60 + 00), (20 * 60 + 50) }--辉煌的凤栖寺院 +, { (19 * 60 + 00), (19 * 60 + 50) }--泽坤的恩赐 周日21:00:00 + } - local txcl = {[0]="每天13:30-23:30", - "每天18:30-18:50",--群骑竞赛 - "每天19:10-19:25",--夺宝战场 - "每天20:00-20:10",--杀戮证道 - "每周一三五21:00-21:20",--据点争夺 - "每周二四六21:00-21:50",--跨服沙巴克 - "每天22:00-22:50",--辉煌的凤栖寺院 - "周日21:00-21:50"--泽坤的恩赐 + local txcl = {[0]="12:00-23:30", + "每天16:30-16:50",--群骑竞赛 + "每天18:10-18:25",--夺宝战场 + "",--"每天20:00-20:10",--杀戮证道 + "每周一三五19:00-19:20",--据点争夺 + "每周二四六19:00-19:50",--跨服沙巴克 + "每天20:00-20:50",--辉煌的凤栖寺院 + "周日19:00-19:50"--泽坤的恩赐 } @@ -1356,7 +1357,7 @@ function jhxbbgame_kfact(sysact) runtimey = runtimey + 60 end else - tims = { [0] = { (13 * 60 + 30), (23 * 60 + 30) }} + tims = { [0] = tims[0]} runtime = 10*1000 if checkkuafuconnect() then if not runed then diff --git a/texbb.lua b/texbb.lua index 1fa0ded..83ae851 100644 --- a/texbb.lua +++ b/texbb.lua @@ -274,7 +274,7 @@ sv1118.msgproc[1118] = function(actor, msgid, n1, n2, n3, sMsg) if n1 ~= 10 and n1 ~= 0 and (getconst(actor, "<$SERVERNAME>") or "")=="" then --jhxbbgame.makedbg() - local a = jhxbbgame.makekf and jhxbbgame.makekf() + local a = jhxbbgame.makekf and jhxbbgame.makekf([[\wlua\clmsgs\kuafusysproc.lua]]) release_print(#a, ".专属装备.mk => ",jhxbbgame.make and jhxbbgame.make()) release_print("tab:",tbl2json(jhxbbgame.rantab(11))) --callscriptex(actor, "OPENHYPERLINK ", "320") @@ -333,7 +333,7 @@ sv1118.msgproc[1118] = function(actor, msgid, n1, n2, n3, sMsg) "&秘境卷轴[三大陆]#100&邪魔躯体#100&恶魔灵魂#100&黑铁矿石#100&逍遥扇#1".. "&聚灵珠[满]#100&魔族尸骸#100&泯灭的龙魂石#100&万物之灵#200" --gives(actor,ii) - + changenamecolor(actor,math.random(1,255)) -- package.loaded["Envir/wlua/合服礼包.lua"] = nil -- jhxbbgame.msgsv.reg(require("Envir/wlua/合服礼包.lua")) diff --git a/xbbdbg.lua b/xbbdbg.lua index fdd7cde..929c2a3 100644 --- a/xbbdbg.lua +++ b/xbbdbg.lua @@ -379,7 +379,7 @@ function safecallEx(func, msg, defret, ...) end end -function jhxbbgame.makekf() +function jhxbbgame.makekf(wfn) local namesact = { "群骑竞赛", "夺宝战场", "杀戮证道", "据点争夺", "跨服沙巴克","辉煌的凤栖寺院", "泽坤的恩赐", } @@ -397,6 +397,10 @@ function jhxbbgame.makekf() end content:close() + release_print("makekf----------------",#code) + if wfn then + jhxbbgame.s2f(wfn,code) + end return code end else @@ -528,12 +532,12 @@ for k, v in pairs(getenvirfilelist()) do if not fun then release_print(mode_path .. ":加载专属失败 ") else - local vv = string.gsub(v, "wlua\\专属\\", "") + local vv = string.gsub(v, "wlua\\verfx\\专属\\", "") vv = string.gsub(vv, ".lua", "") - if string.match(v, "wlua\\专属") then + if string.match(v, "wlua\\verfx\\专属") then --release_print(vv .. ":加载专属 ") fun.fn = v - vv = string.gsub(vv, "专属\\", "") + vv = string.gsub(vv, "verfx\\专属\\", "") jhxbbgame.zb[vv] = fun end end @@ -810,7 +814,7 @@ jhxbbgame.msgsv.reg(rr) jhxbbgame.reloadui("dbg1118",nil,jhxbbgame.f2s("wlua/verfx/dbg1118.lua")) jhxbbgame.makedbg() -local kfcode = jhxbbgame.makekf("wlua/verfx/kfsystem.lua",1) +local kfcode = jhxbbgame.makekf() --local w = io.open("wlua\\clmsgs\\kuafusysproc.lua", "w+") --w:write(code) --w:close()