4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
1
|
local AdvTask = {}
|
dd1c4a13
zhouhaihai
冒险
|
2
|
local AdvCommon = require "adv.AdvCommon"
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
3
|
|
286a8f95
zhouhaihai
刷新任务和主线 分开
|
4
|
local advTaskChange = {}
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
function AdvTask.bind(Adv)
Adv.TaskType = {
Arrive = 1, --到达N层
Kill = 2, --消灭指定怪物N个
Item = 3, --获得指定道具N个
Choose = 4, --完成指定抉择点N次
Shop = 5, --和指定商人交易N次
Build = 6, --和指定建筑交互N次
KillAll = 7, --消灭本层所有怪物
}
-- 检查任务状态 在新领取任务的时候回进行检查
local function checkTaskStatus(self, taskData, status, count, cond)
count = count or 0
if status == -1 or not taskData then
return
end
local function checkCondValue()
if taskData.value2 ~= "" then
local conds = taskData.value2:toArray(true, "=")
for _, one in pairs(conds) do
if one == cond then
return true
end
end
|
1b36bb26
zhouhaihai
冒险任务bug
|
30
|
return false
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
end
return true
end
local checkTaskFunc = {}
checkTaskFunc[Adv.TaskType.Arrive] = function()
if self.level > status then
if self.level >= taskData.value1 then
return -1
else
return self.level
end
end
end
checkTaskFunc[Adv.TaskType.KillAll] = function()
|
0b9d9fba
zhouhaihai
冒险任务 获取敌人数量错误
|
46
|
if #self.battle.player:getTeam(2, nil, nil, true) == 0 then
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
return -1
end
end
if checkTaskFunc[taskData.condition] then
status = checkTaskFunc[taskData.condition]()
else
if count == 0 or not checkCondValue() then return end --没有变化
status = status + count
if status >= taskData.value1 then
status = -1
end
end
return status
end
function Adv:initLayerTask()
self.advTask = {}
|
286a8f95
zhouhaihai
刷新任务和主线 分开
|
65
66
|
advTaskChange.t = true
advTaskChange.m = true
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
67
68
69
70
71
72
|
if not next(self.advMTask) then
self.advMTask = {
id = 1,
status = 0,
lock = 1,
}
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
73
74
75
76
|
end
self.advMTask.id = self.advMTask.id or 1
local mainTaskData = csvdb["adv_questCsv"][self.advMTask.id]
if mainTaskData and self.advMTask.lock then
|
4d943586
zhouhaihai
直通 advt gm
|
77
|
if self.chapterId == mainTaskData.chapter and self.level >= mainTaskData.level then --到达指定关卡解锁当前任务
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
78
79
80
81
82
83
|
self.advMTask.lock = nil
self.advMTask.status = 0
local ts = checkTaskStatus(self, mainTaskData, self.advMTask.status, 0)
if ts then
self.advMTask.status = ts
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
84
85
86
87
88
|
end
end
end
function Adv:checkTask(taskType, count, cond)
|
4d943586
zhouhaihai
直通 advt gm
|
89
|
local chapter = self.chapterId
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
90
91
92
93
94
95
|
for taskId, status in pairs(self.advTask) do
local taskData = csvdb["event_questCsv"][taskId]
if taskData and taskData.levelchapter == chapter and taskType == taskData.condition then
local ts = checkTaskStatus(self, taskData, status, count, cond)
if ts then
self.advTask[taskId] = ts
|
286a8f95
zhouhaihai
刷新任务和主线 分开
|
96
|
advTaskChange.t = true
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
97
98
99
100
101
102
103
104
105
|
end
end
end
local mainTaskData = csvdb["adv_questCsv"][self.advMTask.id]
if not self.advMTask.lock and mainTaskData and mainTaskData.chapter == chapter and taskType == mainTaskData.condition then
local ts = checkTaskStatus(self, mainTaskData, self.advMTask.status, count, cond)
if ts then
self.advMTask.status = ts
|
286a8f95
zhouhaihai
刷新任务和主线 分开
|
106
|
advTaskChange.m = true
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
end
end
end
-- 点击任务地块领取任务
function Adv:addTask(taskId)
local taskData = csvdb["event_questCsv"][taskId]
if taskData then
self.advTask[taskId] = 0
local ts = checkTaskStatus(self, taskData, self.advTask[taskId], 0)
if ts then
self.advTask[taskId] = ts
end
|
286a8f95
zhouhaihai
刷新任务和主线 分开
|
121
|
advTaskChange.t = true
|
85ded242
zhouhaihai
丰富返回事件
|
122
|
self:pushBackEvent(AdvBackEventType.Task, {id = taskId})
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
123
124
125
126
127
128
129
130
131
132
|
return true
end
end
--完成层任务
function Adv:finishTask(taskId)
local ok, reward
if self.advTask[taskId] and self.advTask[taskId] == -1 then
local taskData = csvdb["event_questCsv"][taskId]
if not taskData then return end
|
eee37c88
zhouhaihai
楼层数据
|
133
134
135
136
137
138
139
|
local curFloorData = self:getCurFloorData()
if not curFloorData then return end
reward = {[ItemId.AdvPoint] = curFloorData.questAward}
local item = csvdb["event_dropCsv"][taskData.drop]["range"]:randWeight(true)
reward[item[1]] = (reward[item[1]] or 0) + item[2]
|
1313eac0
zhouhaihai
冒险的一些bug
|
140
|
reward = self:award(reward)
|
eee37c88
zhouhaihai
楼层数据
|
141
|
|
bbf64622
zhouhaihai
冒险
|
142
143
|
self:scoreChange(AdvScoreType.Task, taskData.advScore) --增加加分
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
144
|
self.advTask[taskId] = nil
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
145
|
ok = true
|
286a8f95
zhouhaihai
刷新任务和主线 分开
|
146
|
advTaskChange.t = true
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
end
return ok, reward
end
-- 完成主线任务
function Adv:finishMTask()
local ok, reward
if self.advMTask.status == -1 then --已完成带领取
local mainTaskData = csvdb["adv_questCsv"][self.advMTask.id]
if not mainTaskData then return end
if mainTaskData.reward == 1 then
reward = self.owner:award(mainTaskData.rewardValue)
end
self.advMTask.id = self.advMTask.id + 1
self.advMTask.status = 0
local nextTaskData = csvdb["adv_questCsv"][self.advMTask.id]
|
4d943586
zhouhaihai
直通 advt gm
|
163
|
if not nextTaskData or self.chapterId ~= nextTaskData.chapter or self.level < nextTaskData.level then
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
164
165
166
167
168
169
170
|
self.advMTask.lock = true
else
local ts = checkTaskStatus(self, nextTaskData, self.advMTask.status, 0)
if ts then
self.advMTask.status = ts
end
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
171
|
ok = true
|
286a8f95
zhouhaihai
刷新任务和主线 分开
|
172
|
advTaskChange.m = true
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
173
174
175
176
177
|
end
return ok, reward
end
function Adv:updateTask(notNotify)
|
286a8f95
zhouhaihai
刷新任务和主线 分开
|
178
179
180
|
local properties = {}
if advTaskChange.t then
properties.advTask = self.advTask
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
181
|
end
|
286a8f95
zhouhaihai
刷新任务和主线 分开
|
182
183
184
185
186
187
188
|
if advTaskChange.m then
properties.advMTask = self.advMTask
end
if next(properties) then
self.owner:updateProperties(properties, notNotify)
end
advTaskChange = {}
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
189
|
end
|
b176d7d3
zhouhaihai
冒险成就
|
190
191
192
193
194
195
196
197
198
199
|
------ 冒险成就 ------------
Adv.AchievType = {
StartBattle = 1, --累计挑战N次
OverWin = 2, --通关N次M层
TaskLayer = 3, --完成每层任务N次
UseItem = 4, --使用道具N次
GetItem = 5, --获得道具N个
|
e852b350
zhouhaihai
冒险成就类型增加
|
200
|
GetMWeapon = 6, --获得神器N个
|
b176d7d3
zhouhaihai
冒险成就
|
201
202
203
204
205
206
207
208
|
Build = 7, --完成建筑N个
Choose = 8, --完成事件N个
Shop = 9, --完成商店N次
LinkChoose = 10, --完成连锁事件N次
Trap = 11, --触发陷阱N次
Kill = 12, --消灭怪物N个
EnterILayer = 13, --进入夹层N次
KillByBuff = 14, --使用BUFF消灭敌人N个
|
e852b350
zhouhaihai
冒险成就类型增加
|
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
|
KillBoss = 15, --击杀首领N次
FinishStoryId = 16, -- 完成故事Id
MWeaponLv = 17, -- 指定神器等级达到
GetBuff = 18, -- 获得指定buff
KillHadBuff = 19, -- 击败拥有指定buff的敌人
ChooseBySelect = 20, -- 指定事件的指定选项N次
BuildBySelect = 21, -- 指定建筑的指定选项N次
KillWithBuff = 22, -- 携带指定层数的buff 击败怪物
KillBossWithBuff = 23, -- 携带指定层数的buff 击败boss
KillNoBuff = 24, -- 不携带指定的buff 击败boss
KillBossNoBuff = 25, -- 不携带指定的buff 击败boss
StorryDone = 26, -- 故事完成个数
KillWithMWeapon = 27, -- 携带指定神器击败怪物N次
KillBossWithMWeapon = 28, -- 携带指定神器击败BossN次
KillWithAMWeapon = 29, -- 激活神器套装 击败怪物N次
KillBossWithAMWeapon= 30, -- 激活神器套装 击败BossN次
|
b176d7d3
zhouhaihai
冒险成就
|
225
226
227
228
229
230
|
}
local advAchievChange = {}
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
231
|
local function insertChange(chapterId, taskId, value, pts)
|
46fff3ff
zhouhaihai
冒险手册
|
232
|
local achievField = AdvCommon.isEndless(chapterId) and "advEAchiev" or "advAchiev"
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
233
234
235
236
237
|
if pts then
table.insert(advAchievChange, {type = achievField, field = {chapterId, "pts", taskId}, value = value})
else
table.insert(advAchievChange, {type = achievField, field = {chapterId, taskId}, value = value})
end
|
b176d7d3
zhouhaihai
冒险成就
|
238
239
|
end
|
e852b350
zhouhaihai
冒险成就类型增加
|
240
|
function Adv:checkAchievement(taskType, count, cond, cond2)
|
46fff3ff
zhouhaihai
冒险手册
|
241
242
|
local achievField = self:isEndless() and "advEAchiev" or "advAchiev"
local advAchiev = self.owner:getProperty(achievField)[self.chapterId] or {}
|
b176d7d3
zhouhaihai
冒险成就
|
243
244
245
246
247
|
for taskId , data in pairs(csvdb["adv_achievementCsv"][self.chapterId] or {}) do
local oldStatus = advAchiev[taskId] or 0
if oldStatus ~= -1 and data.type == taskType then
local status
local checkTaskFunc = {}
|
e852b350
zhouhaihai
冒险成就类型增加
|
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
|
checkTaskFunc[Adv.AchievType.KillHadBuff] = function()
if cond:hadBuffById(data.value2) then
return (oldStatus + count)
end
end
checkTaskFunc[Adv.AchievType.KillWithBuff] = function()
local buff = self.battle.player:hadBuffById(data.value2)
if buff and buff.layer == data.value3 then
return (oldStatus + count)
end
end
checkTaskFunc[Adv.AchievType.KillBossWithBuff] = checkTaskFunc[Adv.AchievType.KillWithBuff]
checkTaskFunc[Adv.AchievType.KillNoBuff] = function()
local buff = self.battle.player:hadBuffById(data.value2)
if not buff then
return (oldStatus + count)
end
end
checkTaskFunc[Adv.AchievType.KillBossNoBuff] = checkTaskFunc[Adv.AchievType.KillNoBuff]
checkTaskFunc[Adv.AchievType.KillWithMWeapon] = function()
if self:isWearAF(data.value2) then
return (oldStatus + count)
end
end
checkTaskFunc[Adv.AchievType.KillBossWithMWeapon] = checkTaskFunc[Adv.AchievType.KillWithMWeapon]
checkTaskFunc[Adv.AchievType.KillWithAMWeapon] = function()
if self:haveComboAF(data.value2) then
return (oldStatus + count)
end
end
checkTaskFunc[Adv.AchievType.KillBossWithAMWeapon] = checkTaskFunc[Adv.AchievType.KillWithAMWeapon]
checkTaskFunc[Adv.AchievType.StorryDone] = function()
if data.value2 == 0 or data.value2 == cond then
local advStoryB = self.owner:getProperty("advStoryB")
local newCount = 0
for storyId, _ in pairs(advStoryB) do
if data.value2 == 0 then
newCount = newCount + 1
else
local storyData = csvdb["event_linkchoose_storyCsv"][storyId]
if storyData[1].chapter == data.value2 then
newCount = newCount + 1
end
end
end
if newCount > oldStatus then
return newCount
end
end
end
|
b176d7d3
zhouhaihai
冒险成就
|
304
|
|
b176d7d3
zhouhaihai
冒险成就
|
305
306
307
|
if checkTaskFunc[taskType] then
status = checkTaskFunc[taskType]()
else
|
e852b350
zhouhaihai
冒险成就类型增加
|
308
|
if count ~= 0 and (data.value2 == 0 or data.value2 == cond) and (data.value3 == 0 or data.value3 == cond2) then
|
b176d7d3
zhouhaihai
冒险成就
|
309
310
311
|
status = oldStatus + count
end
end
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
|
if self:isEndless() then
if status and status ~= oldStatus then
insertChange(self.chapterId, taskId, status)
end
else
if (status or -1) >= data.value1 then
status = -1
end
if status and status ~= oldStatus then
insertChange(self.chapterId, taskId, status)
if status == -1 then
local ptcount = (self.owner:getProperty(achievField)[self.chapterId] or {})[-1] or 0
ptcount = ptcount + data.pt
insertChange(self.chapterId, -1, ptcount)
end
|
b176d7d3
zhouhaihai
冒险成就
|
328
329
|
end
end
|
b176d7d3
zhouhaihai
冒险成就
|
330
331
332
333
|
end
end
end
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
|
-- 说不用领取 注释掉
-- 又说要领取 打开 修改
function Adv:finishAchievement(chapterId, taskId)
if not AdvCommon.isEndless(chapterId) then return end -- 暂时只有无尽可以领奖
local achievField = AdvCommon.isEndless(chapterId) and "advEAchiev" or "advAchiev"
local achievData = (csvdb["adv_achievementCsv"][chapterId] or {})[taskId]
local status = (self.owner:getProperty(achievField)[chapterId] or {})[taskId] or -1
local reward = {}
if status >= achievData.value1 then
insertChange(chapterId, taskId, -1)
local count = (self.owner:getProperty(achievField)[chapterId] or {})[-1] or 0
count = count + achievData.pt
insertChange(chapterId, -1, count)
-- 发放奖励
reward = self.owner:award(achievData.reward)
return true, reward
end
end
|
b176d7d3
zhouhaihai
冒险成就
|
354
355
|
function Adv:getAchievementReward(chapterId, taskId)
|
46fff3ff
zhouhaihai
冒险手册
|
356
357
|
local achievField = AdvCommon.isEndless(chapterId) and "advEAchiev" or "advAchiev"
local count = (self.owner:getProperty(achievField)[chapterId] or {})[-1] or 0
|
b176d7d3
zhouhaihai
冒险成就
|
358
|
local achievData = (csvdb["adv_achievement_rewardCsv"][chapterId] or {})[taskId]
|
46fff3ff
zhouhaihai
冒险手册
|
359
|
local status = ((self.owner:getProperty(achievField)[chapterId] or {})["pts"] or {})[taskId] or 0
|
b176d7d3
zhouhaihai
冒险成就
|
360
361
362
|
if status == -1 or count < achievData.pt then return end
local reward = self.owner:award(achievData.reward)
|
9ced5432
zhouhaihai
冒险支援效果 保底事件
|
363
|
insertChange(chapterId, taskId, -1, true)
|
b176d7d3
zhouhaihai
冒险成就
|
364
365
366
367
368
369
370
371
|
return true, reward
end
function Adv:updateAchievement(notNotify)
if not next(advAchievChange) then return end
self.owner:changeUpdates(advAchievChange, notNotify)
end
|
4faef572
zhouhaihai
冒险任务,冒险扫荡, 冒险中继
|
372
373
374
375
|
end
return AdvTask
|