|
|
@@ -70,6 +70,7 @@ local TriggerDefine = require("trigger.TriggerDefine")
|
|
|
local TriggerLogic = require("trigger.TriggerLogic")
|
|
|
local CombatImpl = require("combat.CombatImpl")
|
|
|
local battleRougeCfg = require("excel.battleRouge").Sheet1
|
|
|
+local WeekTaskLogic = require("dailyTask.WeekTaskLogic")
|
|
|
|
|
|
|
|
|
BATTLE_HANG_EXP_OUT_PERIOD = 60 -- 经验产出时间间隔
|
|
|
@@ -387,7 +388,7 @@ local function generateCfgWeightInfo(excludeIDList, excludeTypeList)
|
|
|
end
|
|
|
|
|
|
for k,v in ipairs(battleRougeCfg) do
|
|
|
- if (not excludeIDList or not excludeIDList[k]) and (not excludeTypeList or not excludeTypeList[v.type]) then
|
|
|
+ if not excludeIDList or not excludeIDList[k] then
|
|
|
local tp = v.type
|
|
|
local weight = v.weight
|
|
|
type2List[tp] = type2List[tp] or {weight = 0, typeList = {}}
|
|
|
@@ -3153,6 +3154,7 @@ function mopupFight(human)
|
|
|
HeroLogLogic.finishTaskCB(human, HeroLogLogic.HERO_LOG_TYPE_3, 1)
|
|
|
RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_2001)
|
|
|
YunYingLogic.onCallBack(human, "onMopup", 1)
|
|
|
+ WeekTaskLogic.recordWeekTaskFinishCnt(human, WeekTaskLogic.WEEK_TASK_ID_6, 1)
|
|
|
|
|
|
TriggerLogic.PublishEvent(TriggerDefine.EVENT_TYPE_SWEEP, human.db._id, 1)
|
|
|
end
|
|
|
@@ -4158,7 +4160,7 @@ function GetNowBattleModeAllAttr(human)
|
|
|
local attrAddData = getBattleAttrByType(human, nBattleType)
|
|
|
|
|
|
if not attrAddData or not attrAddData.chosenAttrList then
|
|
|
- return Broadcast.sendErr(human, Lang.BATTLE_NO_ATTR)
|
|
|
+ return
|
|
|
end
|
|
|
|
|
|
sendNowBattleModeAllAttr(human, attrAddData.chosenAttrList)
|
gitxsm