|
|
@@ -13,39 +13,39 @@ local Log = require("common.Log")
|
|
|
local Grid = require("bag.Grid")
|
|
|
local Broadcast = require("broadcast.Broadcast")
|
|
|
local Lang = require("common.Lang")
|
|
|
-local CommonDefine = require("common.CommonDefine")
|
|
|
+-- local CommonDefine = require("common.CommonDefine")
|
|
|
local HeroDefine = require("hero.HeroDefine")
|
|
|
local ItemDefine = require("bag.ItemDefine")
|
|
|
local HeroLogic = require("hero.HeroLogic")
|
|
|
local BagLogic = require("bag.BagLogic")
|
|
|
local HeroGrid = require("hero.HeroGrid")
|
|
|
local DrawCardExcel = require("excel.drawCard").drawCard
|
|
|
-local DrawCardActivityExcel = require("excel.drawCard").activity
|
|
|
+-- local DrawCardActivityExcel = require("excel.drawCard").activity
|
|
|
local DailyTaskLogic = require("dailyTask.DailyTaskLogic")
|
|
|
local ChengjiuLogic = require("chengjiu.ChengjiuLogic")
|
|
|
local ChengjiuDefine = require("chengjiu.ChengjiuDefine")
|
|
|
local HeroExcel = require("excel.hero").hero
|
|
|
-local MailExcel = require("excel.mail")
|
|
|
-local MailManager = require("mail.MailManager")
|
|
|
+-- local MailExcel = require("excel.mail")
|
|
|
+-- local MailManager = require("mail.MailManager")
|
|
|
local ChatPaoMaLogic = require("chat.ChatPaoMaLogic")
|
|
|
-local MonthSummon = require("monthAct.MonthSummon")
|
|
|
+-- local MonthSummon = require("monthAct.MonthSummon")
|
|
|
local HeroBook = require("hero.HeroBook")
|
|
|
-local RoleDefine = require("role.RoleDefine")
|
|
|
+-- local RoleDefine = require("role.RoleDefine")
|
|
|
local RoleSystemLogic = require("roleSystem.RoleSystemLogic")
|
|
|
local RoleSystemDefine = require("roleSystem.RoleSystemDefine")
|
|
|
local GuideLogic = require("guide.GuideLogic")
|
|
|
local RandomLogic = require("common.RandomLogic")
|
|
|
-local TuiSongLiBao = require("present.TuiSongLiBao")
|
|
|
-local MoshouLogic = require("moshou.MoshouLogic")
|
|
|
+-- local TuiSongLiBao = require("present.TuiSongLiBao")
|
|
|
+-- local MoshouLogic = require("moshou.MoshouLogic")
|
|
|
local LiLianLogic = require("dailyTask.LiLianLogic")
|
|
|
-local ProjectLogic = require("platform.ProjectLogic")
|
|
|
+-- local ProjectLogic = require("platform.ProjectLogic")
|
|
|
local SysParameter = require("common.SysParameter")
|
|
|
local AbsActLogic = require("absAct.AbsActLogic")
|
|
|
local AbsActDefine = require("absAct.AbsActDefine")
|
|
|
-local HeroUpLogic = require("absAct.HeroUpLogic")
|
|
|
+-- local HeroUpLogic = require("absAct.HeroUpLogic")
|
|
|
local PerpleHeroLogic = require("absAct.PerpleHeroLogic")
|
|
|
local YunYingLogic = require("yunying.YunYingLogic")
|
|
|
-local PanelDefine = require("broadcast.PanelDefine")
|
|
|
+-- local PanelDefine = require("broadcast.PanelDefine")
|
|
|
local VipLogic = require("vip.VipLogic")
|
|
|
local MengxinLogic = require("present.MengxinLogic")
|
|
|
local LimitPerpleHeroLogic = require("present.LimitPerpleHeroLogic")
|
|
|
@@ -58,6 +58,8 @@ local MaiDianDefine = require("MaiDian.MaiDianDefine")
|
|
|
local TriggerDefine = require("trigger.TriggerDefine")
|
|
|
local TriggerLogic = require("trigger.TriggerLogic")
|
|
|
local WeekTaskLogic = require("dailyTask.WeekTaskLogic")
|
|
|
+local ClutterDataLogic = require("clutter.ClutterDataLogic")
|
|
|
+local ClutterDataDefine = require("clutter.ClutterDataDefine")
|
|
|
|
|
|
DRAWCARD_ID0 = 0 -- 积分召唤
|
|
|
DRAWCARD_ID1 = 1 -- 基础召唤
|
|
|
@@ -362,6 +364,7 @@ function sendDrawOp(human, id, op, heroList, items, heroNewList, heroIndexList,i
|
|
|
Grid.makeItem(dataNet.items[dataNet.items[0]], itemID, itemCnt)
|
|
|
end
|
|
|
end
|
|
|
+
|
|
|
fontDrawCardNet(msgRet.drawData, id, human)
|
|
|
Msg.send(msgRet, human.fd)
|
|
|
end
|
|
|
@@ -564,6 +567,33 @@ function randHeroID(human, id, op, config, actConfig, randomIndex, isAct)
|
|
|
return heroID
|
|
|
end
|
|
|
|
|
|
+--每日可抽取次数检测 新改为只是做个形式上的扣除
|
|
|
+local function dayLotteryTimesCheck(human, lotteryType, lotteryTimes)
|
|
|
+ local cnt = 0
|
|
|
+ local clutterType = 0
|
|
|
+ if lotteryType == DRAWCARD_ID1 then
|
|
|
+ clutterType = ClutterDataDefine.CLUTTER_TYPE1
|
|
|
+ elseif lotteryType == DRAWCARD_ID2 then
|
|
|
+ clutterType = ClutterDataDefine.CLUTTER_TYPE2
|
|
|
+ elseif lotteryType == DRAWCARD_ID3 then
|
|
|
+ clutterType = ClutterDataDefine.CLUTTER_TYPE3
|
|
|
+ elseif lotteryType == DRAWCARD_ID8 then
|
|
|
+ clutterType = ClutterDataDefine.CLUTTER_TYPE5
|
|
|
+ end
|
|
|
+
|
|
|
+ -- cnt = ClutterDataLogic.GetDiffLotteryTimes(human, clutterType)
|
|
|
+ -- if cnt < lotteryTimes then
|
|
|
+ -- return Broadcast.sendErr(human, Lang.JINBI_EXCHANGE_ERR_CNT)
|
|
|
+ -- end
|
|
|
+
|
|
|
+ ClutterDataLogic.UpdateDiffLotteryTimes(human, clutterType, lotteryTimes, lotteryType)
|
|
|
+
|
|
|
+ -- return cnt, clutterType
|
|
|
+end
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
-- 基础,高级,友情召唤,活动召唤
|
|
|
local function draw(human, id, op, actConfig, skip,isAct)
|
|
|
if isAct == AbsActDefine.ABS_ACT_TYPE_4 then
|
|
|
@@ -595,15 +625,21 @@ local function draw(human, id, op, actConfig, skip,isAct)
|
|
|
return
|
|
|
end
|
|
|
|
|
|
+
|
|
|
if HeroLogic.getEmptyCnt(human) < heroCnt then
|
|
|
return Broadcast.sendErr(human, Lang.HERO_BAG_FULL)
|
|
|
end
|
|
|
|
|
|
+
|
|
|
if not checkUseItem(human, id, op, config,isAct) then
|
|
|
print("checkUseItem false")
|
|
|
return
|
|
|
end
|
|
|
|
|
|
+
|
|
|
+ dayLotteryTimesCheck(human, id, heroCnt)
|
|
|
+
|
|
|
+
|
|
|
if id == DRAWCARD_ID2 then
|
|
|
MainDianLogic.MaiDian_Begin(human, MaiDianDefine.MAIDIAN_TYPE_ADV_SUMMON,{nValue = heroCnt})
|
|
|
end
|
|
|
@@ -711,6 +747,7 @@ local function draw(human, id, op, actConfig, skip,isAct)
|
|
|
end
|
|
|
end
|
|
|
|
|
|
+
|
|
|
if id ~= DRAWCARD_ID8 then
|
|
|
updateJifen(human, config.jifen * heroCnt)
|
|
|
end
|