d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
1
2
3
4
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
30
31
32
33
34 
 | 
  local ipairs = ipairs
  local table = table
  local math = math
  local string = string
  local redisproxy = redisproxy
  local MsgPack = MsgPack
  local string_format = string.format
  local tonumber = tonumber
  local table_insert = table.insert
  local table_unpack = table.unpack
  local table_find = table.find
  local table_nums = table.nums
  local math_random = math.randomInt
  
  
  local _M = {}
  
  
  function _M.sudokuRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
  
  	local sudoku = role:getProperty("sudoku")
  	local phase = sudoku[-1] or 1
  	local curData = (csvdb["guide_sudokuCsv"][phase] or {})[id]
  	if phase == -1 or not curData then return 1 end
  
  	sudoku.task = sudoku.task or {}
  	sudoku.task[phase] = sudoku.task[phase] or {}
  
  	if (sudoku.task[phase][id] or 0) < curData.con1 then return 2 end
  
  	sudoku.task[phase][id] = -1
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
35 
 | 
  	local task, tchange = role:award(curData.reward, {log = {desc = "sudoku", int1 = id, int2 = phase}}) -- 任务奖励
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
36 
 | 
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
37 
 | 
  	local reward, rchange = {}
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62 
 | 
  	local rId = {}
  	for pid, pdata in pairs(csvdb["guide_sudoku_rewardCsv"][phase] or {}) do
  		local pos = pdata.pos:toArray(true, "=")
  		local ok, is = true, false
  		for _, one in pairs(pos) do
  			if one == id then
  				is = true
  			end
  			if sudoku.task[phase][one] ~= -1 then
  				ok = false
  				break
  			end
  		end
  
  		if ok and is then
  			for itemId, count in pairs(pdata.reward:toNumMap()) do
  				reward[itemId] = (reward[itemId] or 0) + count
  			end
  			table.insert(rId, pid)
  		end
  	end
  
  	if not next(reward) then
  		reward = nil
  	else
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
63 
 | 
  		reward, rchange = role:award(reward, {log = {desc = "sudokuR", int1 = id, int2 = phase}})
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
64
65
66
67 
 | 
  	end
  
  	role:updateProperty({field = "sudoku", value = sudoku})
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
68
69
70 
 | 
  	role:log("activity", {
  		activity_id = id, -- 活动ID(或活动指定任务的ID)
  		activity_type = 0, -- 活动类型,见活动类型枚举表
 
 | 
56c7a1c5
 
  测试
 
修改报错,下载cv奖励记录字段
 | 
71 
 | 
  		activity_reward = reward or {}, -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
72 
 | 
  	})
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
73 
 | 
  	role:mylog("act_action", {desc = "sudoku", int1 = id, int2 = phase})
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
74 
 | 
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
75 
 | 
  	SendPacket(actionCodes.Activity_sudokuRpc, MsgPack.pack({task = role:packReward(task, tchange), reward = role:packReward(reward, rchange), rId = rId}))
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97 
 | 
  	return true
  end
  
  function _M.sudokuRewardRpc(agent, data)
  	local role = agent.role
  
  
  	local sudoku = role:getProperty("sudoku")
  	local phase = sudoku[-1] or 1
  
  	local curData = csvdb["guide_sudokuCsv"][phase]
  	if not curData then return end
  	if not globalCsv.guide_sudoku_reward[phase] then return end
  
  	local curTask = (sudoku.task or {})[phase] or {}
  
  	for id, _ in pairs(curData) do
  		if curTask[id] ~= -1 then
  			return
  		end
  	end
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
98 
 | 
  	local reward, change = role:award(globalCsv.guide_sudoku_reward[phase], {log = {desc = "sudokuRP", int1 = phase}})
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
99
100
101
102
103
104
105
106
107 
 | 
  
  	sudoku[-1] = phase + 1
  	sudoku.task[phase] = nil
  	if not csvdb["guide_sudokuCsv"][sudoku[-1]] then
  		sudoku[-1] = -1
  		sudoku.task = nil
  	end
  	role:updateProperty({field = "sudoku", value = sudoku})
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
108
109
110 
 | 
  	role:log("activity", {
  		activity_id = 10000 + phase, -- 活动ID(或活动指定任务的ID)
  		activity_type = 0, -- 活动类型,见活动类型枚举表
 
 | 
887c1843
 
  zhouhaihai
 
日志新一批
 | 
111 
 | 
  		activity_reward = reward, -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
112
113 
 | 
  	})
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
114 
 | 
  	SendPacket(actionCodes.Activity_sudokuRewardRpc, MsgPack.pack(role:packReward(reward, change)))
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138 
 | 
  	return true
  end
  
  
  function _M.signRpc(agent, data)
  	local role = agent.role
  
  	local serverT = skynet.timex()
  	local tm = os.date("*t", serverT)
  
  	local curDay = tm.day
  	
  	local yearMonth = tm.year * 100 + tm.month
  	local monthData = csvdb["daily_signInCsv"][yearMonth]
  	if not monthData or not monthData[curDay] then
  		return 1
  	end
  
  	local signs = role:getProperty("sign")
  	if signs[curDay] == yearMonth then  -- 未重置的还可以签到正常(本月已经签到)
  		return 2
  	end
  	signs[curDay] = yearMonth
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
139 
 | 
  	local reward, change = role:award(monthData[curDay].item, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}})
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
140 
 | 
  	role:changeUpdates({{type = "sign", field = curDay, value = yearMonth}})
 
 | 
e7806e6f
 
  zhouhaihai
 
签到成就
 | 
141 
 | 
  	role:checkTaskEnter("SignIn")
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
142 
 | 
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
143 
 | 
  	SendPacket(actionCodes.Activity_signRpc, MsgPack.pack(role:packReward(reward, change)))
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
144
145
146
147 
 | 
  	return true
  end
  
  
 
 | 
ea40710f
 
  zhouhaihai
 
活动
 | 
148
149 
 | 
  function _M.actSignRpc(agent, data)
  	local role = agent.role
 
 | 
be4e8031
 
  zhouhaihai
 
活动 拾荒
 | 
150 
 | 
  	if not role.activity:isOpen("Sign") then return 1 end
 
 | 
ea40710f
 
  zhouhaihai
 
活动
 | 
151
152 
 | 
  
  	local curData = role.activity:getActData("Sign")
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
153 
 | 
  	local reward, change = {}
 
 | 
be4e8031
 
  zhouhaihai
 
活动 拾荒
 | 
154 
 | 
  	for day, csvData in ipairs(csvdb["new_signInCsv"]) do
 
 | 
ea40710f
 
  zhouhaihai
 
活动
 | 
155
156
157
158
159
160
161
162
163
164
165
166
167 
 | 
  		if day <= (curData[0] or 0) then
  			if not curData[day] then
  				curData[day] = -1
  				-- 奖励
  				for itemId, count in pairs(csvData.reward:toNumMap()) do
  					reward[itemId] = (reward[itemId] or 0) + count
  				end
  			end
  		else
  			break
  		end
  	end
  	if next(reward) then
 
 | 
be4e8031
 
  zhouhaihai
 
活动 拾荒
 | 
168 
 | 
  		role.activity:updateActData("Sign", curData)
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
169 
 | 
  		reward, change = role:award(reward, {log = {desc = "actSign"}})
 
 | 
ea40710f
 
  zhouhaihai
 
活动
 | 
170 
 | 
  	end
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
171
172
173
174 
 | 
  
  	role:log("activity", {
  		activity_id = curData[0], -- 活动ID(或活动指定任务的ID)
  		activity_type = role.activity.ActivityType.Sign, -- 活动类型,见活动类型枚举表
 
 | 
887c1843
 
  zhouhaihai
 
日志新一批
 | 
175 
 | 
  		activity_reward = reward, -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
176
177 
 | 
  	})
  
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
178 
 | 
  	SendPacket(actionCodes.Activity_actSignRpc, MsgPack.pack(role:packReward(reward, change)))
 
 | 
ea40710f
 
  zhouhaihai
 
活动
 | 
179
180
181 
 | 
  	return true
  end
  
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
182 
 | 
  
 
 | 
51d9d20b
 
  测试
 
付费签到,应用市场反馈
 | 
183
184
185 
 | 
  function _M.actPaySignRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
 
 | 
460afa6e
 
  测试
 
付费签到改为主动领取,战斗关卡不一...
 | 
186 
 | 
  	local dayIndex = msg.day
 
 | 
51d9d20b
 
  测试
 
付费签到,应用市场反馈
 | 
187
188 
 | 
  	local actGoodsFlag = role.storeData:getProperty("actGoodsFlag")
  	local index = GetActGoodsIndex("paySignIn")
 
 | 
460afa6e
 
  测试
 
付费签到改为主动领取,战斗关卡不一...
 | 
189
190 
 | 
  	local ts = actGoodsFlag[index] or 0
  	if ts == 0 then return 1 end
 
 | 
51d9d20b
 
  测试
 
付费签到,应用市场反馈
 | 
191 
 | 
  
 
 | 
460afa6e
 
  测试
 
付费签到改为主动领取,战斗关卡不一...
 | 
192
193 
 | 
  	local open, actId = role.activity:isOpen("PaySignIn")
  	if not open then return 2 end
 
 | 
51d9d20b
 
  测试
 
付费签到,应用市场反馈
 | 
194 
 | 
  
 
 | 
ede282c0
 
  测试
 
付费签到规则改为按登录天数计算进度...
 | 
195 
 | 
  	--local diffDay = diffFromTs(ts) + 1
 
 | 
51d9d20b
 
  测试
 
付费签到,应用市场反馈
 | 
196
197 
 | 
  
  	local curData = role.activity:getActData("PaySignIn")
 
 | 
b1644d3b
 
  测试
 
付费签到天数bug
 | 
198 
 | 
  	if not curData then return 3 end
 
 | 
51d9d20b
 
  测试
 
付费签到,应用市场反馈
 | 
199
200 
 | 
  	local reward, change = {}
  	for day, csvData in ipairs(csvdb["pay_signInCsv"]) do
 
 | 
ede282c0
 
  测试
 
付费签到规则改为按登录天数计算进度...
 | 
201 
 | 
  		if day <= (curData[0] or 0) and day == dayIndex then
 
 | 
51d9d20b
 
  测试
 
付费签到,应用市场反馈
 | 
202
203
204
205
206
207
208 
 | 
  			if not curData[day] then
  				curData[day] = 1
  				-- 奖励
  				for itemId, count in pairs(csvData.reward:toNumMap()) do
  					reward[itemId] = (reward[itemId] or 0) + count
  				end
  			end
 
 | 
460afa6e
 
  测试
 
付费签到改为主动领取,战斗关卡不一...
 | 
209
210 
 | 
  		--else
  		--	break
 
 | 
51d9d20b
 
  测试
 
付费签到,应用市场反馈
 | 
211
212
213
214
215
216
217
218 
 | 
  		end
  	end
  	if next(reward) then
  		role.activity:updateActData("PaySignIn", curData)
  		reward, change = role:award(reward, {log = {desc = "actPaySign"}})
  	end
  
  	role:log("activity", {
 
 | 
460afa6e
 
  测试
 
付费签到改为主动领取,战斗关卡不一...
 | 
219 
 | 
  		activity_id = actId, -- 活动ID(或活动指定任务的ID)
 
 | 
51d9d20b
 
  测试
 
付费签到,应用市场反馈
 | 
220
221
222
223
224
225
226 
 | 
  		activity_type = role.activity.ActivityType.PaySignIn, -- 活动类型,见活动类型枚举表
  		activity_reward = reward, -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
  	})
  
  	SendPacket(actionCodes.Activity_actPaySignRpc, MsgPack.pack(role:packReward(reward, change)))
  	return true
  end
 
 | 
d763fb14
 
  zhouhaihai
 
签到 九宫格
 | 
227 
 | 
  
 
 | 
4bd3095f
 
  测试
 
英雄帖任务bug
 | 
228 
 | 
  function _M.actCalendaTaskRpc(agent, data)
 
 | 
190e1415
 
  测试
 
英雄帖活动初始化
 | 
229
230
231 
 | 
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local taskId = msg.id
 
 | 
4bd3095f
 
  测试
 
英雄帖任务bug
 | 
232 
 | 
  	local calTask = role:getProperty("calTask") or {}
 
 | 
190e1415
 
  测试
 
英雄帖活动初始化
 | 
233
234
235
236
237
238
239
240 
 | 
  	local record = calTask["r"] or {}
  	local flag = record[taskId] or 0
  	if flag == 1 then return 1 end
  	local open, actId = role.activity:isOpen("CalendaTask")
  	local actData = csvdb["activity_ctrlCsv"][actId]
  	if not open then return 2 end
  	if not actData then return 3 end
  
 
 | 
4bd3095f
 
  测试
 
英雄帖任务bug
 | 
241
242
243
244
245 
 | 
  	local taskList = csvdb["activity_taskCsv"][actData.condition]
  	if not taskList then return 4 end
  	local taskCfg = taskList[taskId]
  	if not taskCfg then return 5 end
  	if taskCfg.key ~= actData.condition then return 6 end
 
 | 
190e1415
 
  测试
 
英雄帖活动初始化
 | 
246 
 | 
  
 
 | 
4bd3095f
 
  测试
 
英雄帖任务bug
 | 
247 
 | 
  	if (calTask[taskId] or 0) < taskCfg.condition1 then return 7 end
 
 | 
190e1415
 
  测试
 
英雄帖活动初始化
 | 
248
249
250
251 
 | 
  
  	record[taskId] = 1
  	calTask["r"] = record
  
 
 | 
4bd3095f
 
  测试
 
英雄帖任务bug
 | 
252 
 | 
  	role:updateProperty({field = "calTask", value = calTask})
 
 | 
190e1415
 
  测试
 
英雄帖活动初始化
 | 
253 
 | 
  
 
 | 
4bd3095f
 
  测试
 
英雄帖任务bug
 | 
254 
 | 
  	local reward, change = role:award(taskCfg.reward, {log = {desc = "calendaTask"}})
 
 | 
190e1415
 
  测试
 
英雄帖活动初始化
 | 
255
256
257
258
259
260
261 
 | 
  
  	role:log("activity", {
  		activity_id = taskId, -- 活动ID(或活动指定任务的ID)
  		activity_type = role.activity.ActivityType.CalendaTask, -- 活动类型,见活动类型枚举表
  		activity_reward = reward, -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
  	})
  
 
 | 
f76d63e1
 
  测试
 
联动任务活动
 | 
262
263 
 | 
  	role:checkTaskEnter("FinishSpeTask", {taskId = taskId, actId = actId})
  
 
 | 
190e1415
 
  测试
 
英雄帖活动初始化
 | 
264 
 | 
  	SendPacket(actionCodes.Activity_actCalendaTaskRpc, MsgPack.pack(role:packReward(reward, change)))
 
 | 
f76d63e1
 
  测试
 
联动任务活动
 | 
265 
 | 
  
 
 | 
4bd3095f
 
  测试
 
英雄帖任务bug
 | 
266 
 | 
  	return true
 
 | 
190e1415
 
  测试
 
英雄帖活动初始化
 | 
267
268 
 | 
  end
  
 
 | 
dfa9ae5e
 
  测试
 
战令任务活动
 | 
269 
 | 
  function _M.actBattleCommandTaskRpc(agent, data)
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
270
271
272 
 | 
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local taskId = msg.id
 
 | 
dfa9ae5e
 
  测试
 
战令任务活动
 | 
273 
 | 
  	local calTask = role:getProperty("bcTask") or {}
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
274
275
276 
 | 
  	local record = calTask["r"] or {}
  	local flag = record[taskId] or 0
  	if flag == 1 then return 1 end
 
 | 
dfa9ae5e
 
  测试
 
战令任务活动
 | 
277 
 | 
  	local open, actId = role.activity:isOpen("BattleCommandTask")
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
278
279
280
281
282
283
284
285
286
287
288
289 
 | 
  	local actData = csvdb["activity_ctrlCsv"][actId]
  	if not open then return 2 end
  	if not actData then return 3 end
  
  	local taskList = csvdb["activity_taskCsv"][actData.condition]
  	if not taskList then return 4 end
  	local taskCfg = taskList[taskId]
  	if not taskCfg then return 5 end
  	if taskCfg.key ~= actData.condition then return 6 end
  
  	if (calTask[taskId] or 0) < taskCfg.condition1 then return 7 end
  
 
 | 
dfa9ae5e
 
  测试
 
战令任务活动
 | 
290
291
292
293
294
295 
 | 
  	local open, actId = role.activity:isOpen("BattleCommand")
  	local actData = csvdb["activity_ctrlCsv"][actId]
  	if not open then return 2 end
  	if not actData then return 3 end
  
  
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
296
297
298 
 | 
  	record[taskId] = 1
  	calTask["r"] = record
  
 
 | 
dfa9ae5e
 
  测试
 
战令任务活动
 | 
299 
 | 
  	role:updateProperty({field = "bcTask", value = calTask})
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
300 
 | 
  
 
 | 
dfa9ae5e
 
  测试
 
战令任务活动
 | 
301 
 | 
  	local reward, change = role:award(taskCfg.reward, {log = {desc = "battleCommandTask"}})
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
302
303
304 
 | 
  
  	role:log("activity", {
  		activity_id = taskId, -- 活动ID(或活动指定任务的ID)
 
 | 
dfa9ae5e
 
  测试
 
战令任务活动
 | 
305 
 | 
  		activity_type = role.activity.ActivityType.BattleCommandTask, -- 活动类型,见活动类型枚举表
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
306
307
308
309
310 
 | 
  		activity_reward = reward, -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
  	})
  
  	role:checkTaskEnter("FinishSpeTask", {taskId = taskId, actId = actId})
  
 
 | 
dfa9ae5e
 
  测试
 
战令任务活动
 | 
311 
 | 
  	SendPacket(actionCodes.Activity_actBattleCommandTaskRpc, MsgPack.pack(role:packReward(reward, change)))
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
312
313
314
315 
 | 
  
  	return true
  end
  
 
 | 
847f9a7b
 
  测试
 
兑换活动,邮件内容修改
 | 
316
317
318
319
320 
 | 
  function _M.exchangeRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid
  	local id = msg.id
 
 | 
686d4fd6
 
  测试
 
兑换活动支持兑换多个, 新增卡池
 | 
321
322 
 | 
  	local count = msg.count
  	if not role.activity:isOpenById(actid, "Exchange") then return 1 end
 
 | 
847f9a7b
 
  测试
 
兑换活动,邮件内容修改
 | 
323
324
325
326
327
328
329
330 
 | 
  
  	local exchangeCfg = csvdb["activity_exchangeCsv"][actid]
  	if not exchangeCfg then return 2 end
  	if not exchangeCfg[id] then return 3 end
  	local curData = role.activity:getActData("Exchange") or {}
  	local exchangeData = curData[actid] or {}
  	local curCount = exchangeData[id] or 0
  	local actCfg = exchangeCfg[id]
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
331 
 | 
  	local limitArr = actCfg.limit:toArray(true, "=")
 
 | 
686d4fd6
 
  测试
 
兑换活动支持兑换多个, 新增卡池
 | 
332 
 | 
  	if curCount + count > limitArr[2] then return 4 end
 
 | 
847f9a7b
 
  测试
 
兑换活动,邮件内容修改
 | 
333
334 
 | 
  
  	local costs = actCfg.goods:toNumMap()
 
 | 
686d4fd6
 
  测试
 
兑换活动支持兑换多个, 新增卡池
 | 
335
336
337 
 | 
  	for k,v in pairs(costs) do
  		costs[k] = v * count
  	end
 
 | 
847f9a7b
 
  测试
 
兑换活动,邮件内容修改
 | 
338
339
340 
 | 
  	if not role:checkItemEnough(costs) then return 5 end
  	role:costItems(costs, {log = {desc = "actExchange", int1 = actid, int2 = id}})
  
 
 | 
686d4fd6
 
  测试
 
兑换活动支持兑换多个, 新增卡池
 | 
341 
 | 
  	curCount = curCount + count
 
 | 
847f9a7b
 
  测试
 
兑换活动,邮件内容修改
 | 
342
343
344
345 
 | 
  	exchangeData[id] = curCount
  	curData[actid] = exchangeData
  	role.activity:updateActData("Exchange", curData)
  
 
 | 
0163328c
 
  测试
 
修改活动boss关卡三星条件
 | 
346
347
348
349
350
351 
 | 
  	local award = actCfg.award:toNumMap()
  	for k,v in pairs(award) do
  		award[k] = v * count
  	end
  
  	local reward, change = role:award(award, {log = {desc = "actExchange", int1 = actid, int2 = id}})
 
 | 
847f9a7b
 
  测试
 
兑换活动,邮件内容修改
 | 
352
353
354
355
356
357 
 | 
  
  
  	SendPacket(actionCodes.Activity_exchangeRpc, MsgPack.pack(role:packReward(reward, change)))
  	return true
  end
  
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
358
359
360
361 
 | 
  function _M.gachakonRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
362
363
364
365 
 | 
  	local count = msg.count
  
  	if count > 10 then return end
  
 
 | 
686d4fd6
 
  测试
 
兑换活动支持兑换多个, 新增卡池
 | 
366 
 | 
  	if not role.activity:isOpenById(actid, "Gachakon") then return 1 end
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
367 
 | 
  
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
368
369
370
371 
 | 
  	local actCtrlData = csvdb["activity_ctrlCsv"][actid]
  	if not actCtrlData then return 2 end
  	local cost = actCtrlData.condition2:toNumMap()
  
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
372 
 | 
  	local actCfg = csvdb["activity_capsuleToysCsv"][actid]
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
373
374 
 | 
  	if not actCfg then return 3 end
  
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
375 
 | 
  	local gachakonInfo = role.activity:getActData("Gachakon") or {}
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
376
377 
 | 
  	local award = {}
  	local remain = 0
 
 | 
6a2b449c
 
  测试
 
扭蛋机奖励不合并显示, 新增多队挂...
 | 
378 
 | 
  	local showAward = {}
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
379 
 | 
  	for i = 1, count do
 
 | 
1be743f3
 
  测试
 
扭蛋机调试
 | 
380
381 
 | 
  		local tmpCfg = clone(actCfg)
  		remain = 0
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
382
383 
 | 
  		for id, cfg in pairs(tmpCfg) do
  			local num = gachakonInfo[id] or 0
 
 | 
1be743f3
 
  测试
 
扭蛋机调试
 | 
384
385 
 | 
  			num = cfg.amount >= num and cfg.amount - num or 0
  			cfg.weight = cfg.weight * num
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
386 
 | 
  			if cfg.weight > 0 then
 
 | 
1be743f3
 
  测试
 
扭蛋机调试
 | 
387 
 | 
  				remain = remain + num
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
388 
 | 
  			end
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
389 
 | 
  			--print("num ".. num, id, cfg.weight, cfg.amount)
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
390 
 | 
  		end
 
 | 
1be743f3
 
  测试
 
扭蛋机调试
 | 
391 
 | 
  		if remain == 0 then
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
392
393
394 
 | 
  			break
  		end
  		local id = math.randWeight(tmpCfg, "weight")
 
 | 
1be743f3
 
  测试
 
扭蛋机调试
 | 
395 
 | 
  		if not id then return 4 end
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
396
397 
 | 
  		gachakonInfo[id] = (gachakonInfo[id] or 0) + 1
  		local curAward = tmpCfg[id].award:toNumMap()
 
 | 
6a2b449c
 
  测试
 
扭蛋机奖励不合并显示, 新增多队挂...
 | 
398 
 | 
  		table.insert(showAward, curAward)
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
399
400 
 | 
  		for k, v in pairs(curAward) do
  			award[k] = (award[k] or 0) + v
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
401 
 | 
  		end
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
402 
 | 
  	end
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
403 
 | 
  
 
 | 
1be743f3
 
  测试
 
扭蛋机调试
 | 
404
405
406
407
408 
 | 
  	for k, v in pairs(cost) do
  		cost[k] = v * count
  	end
  
  	if not role:checkItemEnough(cost) then return 5 end
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
409
410 
 | 
  
  	role:costItems(cost, {log = {desc = "actGachakon", int1 = actid, int2 = count}})
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
411 
 | 
  
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
412 
 | 
  	local reward, change = role:award(award, {log = {desc = "actGachakon", int1 = actid, int2 = count}})
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
413
414 
 | 
  	--print("-----------", remain, count)
  	if remain <= 1 then
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
415 
 | 
  		gachakonInfo = {}
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
416 
 | 
  	end
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
417
418 
 | 
  	role.activity:updateActData("Gachakon", gachakonInfo)
  
 
 | 
6a2b449c
 
  测试
 
扭蛋机奖励不合并显示, 新增多队挂...
 | 
419 
 | 
  	SendPacket(actionCodes.Activity_gachakonRpc, MsgPack.pack(showAward))
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
420
421
422 
 | 
  	return true
  end
  
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
423
424
425
426 
 | 
  function _M.hangDropRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid
 
 | 
686d4fd6
 
  测试
 
兑换活动支持兑换多个, 新增卡池
 | 
427 
 | 
  	if not role.activity:isOpenById(actid, "HangDrop") then return 1 end
 
 | 
6662e7d2
 
  测试
 
掉落活动配置最大掉落周期数
 | 
428
429 
 | 
  	local actCtrlData = csvdb["activity_ctrlCsv"][actid]
  	if not actCtrlData then return end
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445 
 | 
  
  	local actCfg = csvdb["activity_putCsv"][actid]
  	if not actCfg then return 2 end
  
  	local award, period = "", 0
  	for i = 1, #actCfg do
  		local cfg = actCfg[i]
  		if not cfg then
  			break
  		end
  		if cfg.condition ~= "" then
  			local arr = cfg.condition:toArray(true, "=")
  			local type = arr[1]
  			if type == 1 then
  				local actId = arr[2]
  				local carbonId = arr[3]
 
 | 
0163328c
 
  测试
 
修改活动boss关卡三星条件
 | 
446 
 | 
  				if not role.activity:isOpenById(actId, "ChallengeLevel") then return 3 end
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461 
 | 
  				local clInfo = role.activity:getActData("ChallengeLevel") or {}
  				if not clInfo[carbonId] then
  					break
  				end
  			end
  		end
  		award = cfg.reward
  		period = cfg.period * 60
  	end
  	local actData = role.activity:getActData("HangDrop") or 0
  	local timeNow = skynet.timex()
  	if period == 0 or award == "" then
  		return 4
  	end
  	local num = math.floor((timeNow - actData)/ period)
 
 | 
6662e7d2
 
  测试
 
掉落活动配置最大掉落周期数
 | 
462 
 | 
  	num = num > actCtrlData.condition and actCtrlData.condition or num
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
463
464
465
466
467
468
469
470
471
472 
 | 
  	if num == 0 then
  		return 5
  	end
  	local reward, change = {}, nil
  	for id, value in pairs(award:toNumMap()) do
  		reward[id] = value * num
  	end
  
  	reward, change  = role:award(reward, {log = {desc = "actHangDrop", int1 = actid, int2 = num}})
  
 
 | 
576c791c
 
  测试
 
玛尼英雄帖活动通过任务bug 元旦...
 | 
473
474
475
476
477
478
479 
 | 
  	if num < 8 then
  		actData = actData + num * period
  	else
  		actData = timeNow
  	end
  
  	role.activity:updateActData("HangDrop", actData)
 
 | 
2bc706ab
 
  测试
 
兑换活动重置,累充功能
 | 
480
481
482
483
484
485 
 | 
  
  	SendPacket(actionCodes.Activity_hangDropRpc, MsgPack.pack(role:packReward(reward, change)))
  
  	return true
  end
  
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502 
 | 
  local function getStarCount(cfg, data)
  	local count = 0
  	for i = 0, #(cfg.sweep_condition:toTableArray(true)) do
  		if (1 << i & data) > 0 then
  			count = count + 1
  		end
  	end
  
  	return count
  end
  
  function _M.startBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid
  	local id = msg.id
  	local count = msg.count
 
 | 
686d4fd6
 
  测试
 
兑换活动支持兑换多个, 新增卡池
 | 
503 
 | 
  	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526 
 | 
  
  	local actCfg = csvdb["activity_battleCsv"][actid]
  	if not actCfg then return 2 end
  
  	local battleCfg = actCfg[id]
  	if not battleCfg then return 3 end
  
  	local actData = role.activity:getActData("ChallengeLevel") or {}
  
  	local preArr = battleCfg.prepose:toArray(true, "=")
  	for _, v in ipairs(preArr) do
  		local battleInfo = actData[v]
  		if not battleInfo then
  			return 4
  		end
  		local star = battleInfo["star"] or 0
  		if star <= 0 then
  			return 4
  		end
  	end
  	-- check cost
  	local changeFlag = false
  	local ticket = actData["ticket"]
 
 | 
8e892c71
 
  测试
 
挑战关卡活动打完再扣门票
 | 
527 
 | 
  	local num = 0	-- cost num
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
528 
 | 
  	if battleCfg.type ~= "" then
 
 | 
576c791c
 
  测试
 
玛尼英雄帖活动通过任务bug 元旦...
 | 
529 
 | 
  		role.activity:getBattleTicket(actid)
 
 | 
8e892c71
 
  测试
 
挑战关卡活动打完再扣门票
 | 
530 
 | 
  		num = battleCfg.type:toArray(true, "=")[3]
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
531
532
533
534
535
536
537 
 | 
  		if count and count > 0 then
  			if battleCfg.rank == 0 then
  				return 7
  			end
  			local bi = actData[id]
  			if not bi then return 8 end
  			local star = bi["star"] or 0
 
 | 
3e80ee56
 
  测试
 
世界boss行动点bug
 | 
538
539
540
541
542
543
544
545
546
547 
 | 
  			local maxP = bi["maxP"] or 0
  			-- 世界boss
  			if battleCfg.worldBoss_award ~= 0 then
  				if maxP < 1 then
  					return 9
  				end
  			else
  				if star < 1 then
  					return 9
  				end
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
548
549
550
551
552
553 
 | 
  			end
  			num = num * count
  		end
  		if ticket < num then
  			return 6
  		end
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
554
555 
 | 
  		changeFlag = true
  	end
 
 | 
be697585
 
  测试
 
活动剧情解锁
 | 
556
557 
 | 
  	-- 解锁活动剧情
  	role:checkStoryStatus(false, 5, id)
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
558
559
560
561
562
563 
 | 
  
  	if not count then
  		role.__actBattleCache = {
  			key = tostring(math.random()),
  			actid = actid,
  			id = id,
 
 | 
edf2ee12
 
  zhouhaihai
 
防作弊
 | 
564 
 | 
  			format = msg.format,
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
565
566
567
568
569
570
571
572
573
574 
 | 
  		}
  		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack({key = role.__actBattleCache.key}))
  	else
  		if count <= 0 then
  			return
  		end
  		if battleCfg.rank == 0 then
  			return 7
  		end
  		local bi = actData[id]
 
 | 
3e80ee56
 
  测试
 
世界boss行动点bug
 | 
575 
 | 
  		local star = bi["star"] or 0
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
576
577
578
579
580
581
582
583
584
585
586
587
588 
 | 
  		local award = battleCfg.item_clear:toNumMap()
  		if getStarCount(battleCfg, star) == 3 then
  			local aw = battleCfg.perfect_reward:toNumMap()
  			for k, v in pairs(aw) do
  				award[k] = (award[k] or 0) + v
  			end
  		end
  		for k, v in pairs(award) do
  			award[k] = v * count
  		end
  		local reward, change  = role:award(award, {log = {desc = "actBattle", int1 = actid, int2 = count or 0}})
  		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack(role:packReward(reward, change)))
  
 
 | 
34d9f192
 
  测试
 
世界boss 胜利才扣门票,扫荡根...
 | 
589 
 | 
  		if battleCfg.worldBoss_award ~= 0 and (bi["maxP"] or 0) > 0 then
 
 | 
3e80ee56
 
  测试
 
世界boss行动点bug
 | 
590 
 | 
  			bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"] * count
 
 | 
34d9f192
 
  测试
 
世界boss 胜利才扣门票,扫荡根...
 | 
591
592 
 | 
  		end
  
 
 | 
38b8089d
 
  测试
 
关卡boss活动扫荡累计伤害值不正...
 | 
593 
 | 
  		bi["sum"] = bi["sum"] + bi["top"] * count
 
 | 
8e892c71
 
  测试
 
挑战关卡活动打完再扣门票
 | 
594 
 | 
  		actData["ticket"] = ticket - num
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621 
 | 
  		actData[id] = bi
  		changeFlag = true
  
  		local rankVal = 0
  		if battleCfg.rank == 1 then
  			rankVal = bi["sum"]
  		elseif battleCfg.rank == 2 then
  			rankVal = bi["top"]
  		end
  		role:updateRankCommon(RANK_TYPE.ActBattleBoss, rankVal)
  	end
  	if changeFlag then
  		role.activity:updateActData("ChallengeLevel", actData)
  	end
  
  	return true
  end
  
  function _M.endBattleRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid
  	local id = msg.id
  	local key = msg.key
  	local isWin = msg.isWin
  	local heros = msg.heros
  	local support = msg.support
 
 | 
1c1ea691
 
  测试
 
活动战斗结束不发送战斗奖励
 | 
622
623
624
625 
 | 
  	if not role.activity:isOpenById(actid, "ChallengeLevel") then
  		SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({}))
  		return true
  	end
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
626
627
628
629
630
631
632 
 | 
  
  	if not role.__actBattleCache then return 2 end
  	
  	if role.__actBattleCache.id ~= id or role.__actBattleCache.key ~= key and role.__actBattleCache.actid ~= actid then 
  		SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({errorCode = 1}))
  	end
  
 
 | 
edf2ee12
 
  zhouhaihai
 
防作弊
 | 
633
634
635
636
637
638
639 
 | 
  	-- 防作弊
  	if not role:checkBattleCheat("act_battle", {
  		id = id,
  		isWin = isWin,
  		info = msg.info,
  		format = role.__actBattleCache.format
  	}) then
 
 | 
4083e99a
 
  zhouhaihai
 
可能的报错点
 | 
640 
 | 
  		SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({errorCode = 1}))
 
 | 
edf2ee12
 
  zhouhaihai
 
防作弊
 | 
641
642
643
644 
 | 
  		return true
  	end
  	role.__actBattleCache = nil
  
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
645
646
647
648
649
650
651
652 
 | 
  	local actCfg = csvdb["activity_battleCsv"][actid]
  	if not actCfg then return 3 end
  
  	local battleCfg = actCfg[id]
  	if not battleCfg then return 4 end
  
  	local actData = role.activity:getActData("ChallengeLevel") or {}
  
 
 | 
0163328c
 
  测试
 
修改活动boss关卡三星条件
 | 
653
654
655
656
657
658
659
660 
 | 
  	-- 总输出
  	local dmg = 0
  	for k, v in pairs(msg.info.damage) do
  		if k % 100 == 2 then
  			dmg = dmg + v
  		end
  	end
  
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715 
 | 
  	local reward, change = {}, nil
  
  	local battleInfo = actData[id] or {}
  	local curStar = 0
   	if isWin then
   		local herosInfo = msg.heros
  
   		local check = {}
   		-- 1 通关
  		check[1] = function(_)
  			return true
  		end
  		-- 2 阵亡人数 <= N
  		check[2] = function(_, cond)
  			return msg.info.dead and msg.info.dead <= cond
  		end
  		-- 3 全员存活
  		check[3] = function(_)
  			return msg.info.dead and msg.info.dead == 0
  		end
  		-- 4 指定种族 >= N
  		check[4] = function(_, cond)
  			local count = 0
  			for _, one in pairs(herosInfo) do
  				local heroData = csvdb["unitCsv"][one.type]
  				if heroData.camp == cond then
  					count = count + 1
  				end
  			end
  			return count >= cond
  		end
  		-- 5 指定职业 >= N
  		check[5] = function(_, cond)
  			local count = 0
  			for _, one in pairs(herosInfo) do
  				local heroData = csvdb["unitCsv"][one.type]
  				if heroData.job == cond then
  					count = count + 1
  				end
  			end
  			return count >= cond
  		end
  		-- 6 含有指定角色 
  		check[6] = function(_, cond)
  			for _, one in pairs(herosInfo) do
  				if one.type == cond then
  					return true
  				end
  			end
  			return false
  		end
  		-- 7 通关耗时 <= X 秒  msg.info.atime
  		check[7] = function(_, cond)
  			return msg.info.atime and msg.info.atime <= cond
  		end
 
 | 
0163328c
 
  测试
 
修改活动boss关卡三星条件
 | 
716
717
718
719 
 | 
  		-- 8 总输出值  msg.info.atime
  		check[8] = function(_, cond)
  			return dmg >= cond
  		end
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
720
721
722
723
724
725 
 | 
  		curStar = 0
  		local sweepConds = battleCfg.sweep_condition:toTableArray(true)
   		for i, cond in ipairs(sweepConds) do
   			if check[cond[1]] and check[cond[1]](table.unpack(cond)) then
   				curStar = curStar + (1 << (i - 1))
   			end
 
 | 
7b570ef2
 
  测试
 
新春活动任务
 | 
726
727
728 
 | 
  		 end
  
  		role:checkTaskEnter("ActBattlePass", {chapterId = id})
 
 | 
0163328c
 
  测试
 
修改活动boss关卡三星条件
 | 
729
730
731
732
733 
 | 
  	 else
  		curStar = 0
  		if battleCfg.rank ~= 0 then
  			curStar = 1
  		end
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
734
735
736
737
738
739
740 
 | 
  	end
  	local oldStarNum = getStarCount(battleCfg, battleInfo["star"] or 0)
  	local newStarNum = getStarCount(battleCfg, curStar)
  	if  newStarNum > oldStarNum then
  		battleInfo["star"] = curStar
  	end
  
 
 | 
34d9f192
 
  测试
 
世界boss 胜利才扣门票,扫荡根...
 | 
741 
 | 
  	if battleCfg.rank ~= 0 and isWin then
 
 | 
8e892c71
 
  测试
 
挑战关卡活动打完再扣门票
 | 
742
743
744
745
746 
 | 
  		-- 消耗门票
  		role.activity:getBattleTicket(actid)
  		local num = battleCfg.type:toArray(true, "=")[3]
  		actData["ticket"] = math.max(actData["ticket"] - num, 0)
  
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
747 
 | 
  		-- 更新排行榜 最高伤害
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
748
749
750
751
752
753
754
755
756
757
758
759 
 | 
  		battleInfo["top"] = math.max(battleInfo["top"] or 0, dmg)
  		battleInfo["sum"] = (battleInfo["sum"] or 0) + dmg
  		local rankVal = 0
  		if battleCfg.rank == 1 then
  			rankVal = battleInfo["sum"]
  		elseif battleCfg.rank == 2 then
  			rankVal = battleInfo["top"]
  		end
  		if rankVal > 0 then
  			role:updateRankCommon(RANK_TYPE.ActBattleBoss, rankVal)
  		end
  	end
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
760 
 | 
  
 
 | 
598bd73f
 
  测试
 
关卡挑战活动奖励错误bug
 | 
761 
 | 
  	if (oldStarNum == 0 and newStarNum > 0) or battleCfg.rank ~= 0 then
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
762
763 
 | 
  		reward = battleCfg.item_clear:toNumMap()
  	end
 
 | 
0163328c
 
  测试
 
修改活动boss关卡三星条件
 | 
764 
 | 
  	if (oldStarNum < 3 and newStarNum == 3) or (battleCfg.rank ~= 0 and newStarNum == 3) then
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780 
 | 
  		local aw = battleCfg.perfect_reward:toNumMap()
  		for k, v in pairs(aw) do
  			reward[k] = (reward[k] or 0) + v
  		end
  	end
  
   	role:checkBattle("act_battle", {
  		cfg = battleCfg,
  		star = newStarNum,
  		isWin = isWin,
  		info = msg.info,
  		reward = reward,
  		heros = heros,
  		supports = support,
  	})
  
 
 | 
be697585
 
  测试
 
活动剧情解锁
 | 
781
782
783
784
785 
 | 
  	-- 解锁活动剧情
  	if newStarNum >= 3 then
  		role:checkStoryStatus(false, 5, id)
  	end
  
 
 | 
6857a37f
 
  测试
 
世界Boss 增加行动点
 | 
786
787 
 | 
  	if battleCfg.worldBoss_award ~= 0 and msg.point then
  		battleInfo["bossP"] = (battleInfo["bossP"] or 0) + msg.point
 
 | 
34d9f192
 
  测试
 
世界boss 胜利才扣门票,扫荡根...
 | 
788 
 | 
  		battleInfo["maxP"] = math.max(msg.point, (battleInfo["maxP"] or 0))
 
 | 
6857a37f
 
  测试
 
世界Boss 增加行动点
 | 
789 
 | 
  	end
 
 | 
ede282c0
 
  测试
 
付费签到规则改为按登录天数计算进度...
 | 
790
791 
 | 
  	actData[id] = battleInfo
  	role.activity:updateActData("ChallengeLevel", actData)
 
 | 
6857a37f
 
  测试
 
世界Boss 增加行动点
 | 
792 
 | 
  
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
793
794
795
796
797
798
799
800
801
802
803
804
805
806 
 | 
  	reward, change  = role:award(reward, {log = {desc = "actBattle", int1 = actid, int2 = newStarNum}})
  
  	SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({
  		reward = reward,
  		change = change
  	}))
  
  	return true
  end
  
  function _M.battleRankRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid
 
 | 
161c50cc
 
  zhouhaihai
 
宝藏怪活动
 | 
807
808
809
810
811
812
813
814
815 
 | 
  	local cfg = csvdb["activity_ctrlCsv"][actid]
  	if not cfg then return 1 end
  	if not role.activity:isOpen(cfg.showType) then return 2 end
  	local actTypeToRank = {
  		[role.activity.ActivityType.ChallengeLevel] = RANK_TYPE.ActBattleBoss,
  		[role.activity.ActivityType.Crisis] = RANK_TYPE.ActCrisis,
  	}
  	if not actTypeToRank[cfg.showType] then return end
  	local rankInfo = role:getRankInfoCommon(actTypeToRank[cfg.showType])
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
816
817
818
819
820
821
822
823
824
825
826 
 | 
  	SendPacket(actionCodes.Activity_battleRankRpc, MsgPack.pack(rankInfo))
  	return true
  end
  
  function _M.battleMilestoneRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid
  	local id = msg.id
  	local index = msg.index
  
 
 | 
686d4fd6
 
  测试
 
兑换活动支持兑换多个, 新增卡池
 | 
827 
 | 
  	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
 
 | 
66fe093a
 
  测试
 
元旦关卡活动
 | 
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859 
 | 
  
  	local actCfg = csvdb["activity_mileageCsv"][actid]
  	if not actCfg then return 3 end
  
  	local mileCfg = actCfg[index]
  	if not mileCfg then return 4 end
  
  	local actData = role.activity:getActData("ChallengeLevel") or {}
  	local battleInfo = actData[id] or {}
  	local val = 0
  	if mileCfg.type == 1 then
  		val = battleInfo["sum"] or 0
  	elseif mileCfg.type == 2 then
  		val = battleInfo["top"] or 0
  	end
  
  	local record = battleInfo["r"] or ""
  	local flag = string.char(string.getbit(record, index))
  	if flag == "1" then return 5 end
  	if mileCfg.condition > val then return 6 end
  
  	battleInfo["r"] = string.setbit(record, index)
  	actData[id] = battleInfo
  	role.activity:updateActData("ChallengeLevel", actData)
  
  	local award = mileCfg.reward:toNumMap()
  	local reward, change = role:award(award, {log = {desc = "actMilestone", int1 = actid, int2 = index}})
  	SendPacket(actionCodes.Activity_battleMilestoneRpc, MsgPack.pack(role:packReward(reward, change)))
  
  	return true
  end
  
 
 | 
161c50cc
 
  zhouhaihai
 
宝藏怪活动
 | 
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882 
 | 
  function _M.crisisMilestoneRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid
  	local id = msg.id
  	if not role.activity:isOpenById(actid, "Crisis") then return 1 end
  	local actCfg = csvdb["activity_mileageCsv"][actid]
  	if not actCfg then return 3 end
  
  	local curCsv = actCfg[id]
  	if not curCsv then return 4 end
  
  	if role:getItemCount(ItemId.CrisisScore) < curCsv.condition then
  		return 5
  	end
  
  	local actData = role.activity:getActData("Crisis") or {}
  	actData.score = actData.score or {}
  	if actData.score[id] then
  		return 6
  	end
  	actData.score[id] = -1
  	role.activity:updateActData("Crisis", actData)
 
 | 
558c9044
 
  zhouhaihai
 
物资危机
 | 
883
884 
 | 
  
  	local reward, change = role:award(curCsv.reward, {log = {desc = "actMilecrisis", int1 = actid}})
 
 | 
161c50cc
 
  zhouhaihai
 
宝藏怪活动
 | 
885
886
887
888
889 
 | 
  	SendPacket(actionCodes.Activity_crisisMilestoneRpc, MsgPack.pack(role:packReward(reward, change)))
  	return true
  end
  
  
 
 | 
be697585
 
  测试
 
活动剧情解锁
 | 
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904 
 | 
  function _M.bossRewardRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid
  	local id = msg.id
  	local index = msg.index
  
  	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
  
  	local actCfg = csvdb["activity_battleCsv"][actid]
  	if not actCfg then return 2 end
  
  	local battleCfg = actCfg[id]
  	if not battleCfg then return 3 end
  
 
 | 
eb5ffd1c
 
  测试
 
世界boss翻牌奖励 活动卡池保底...
 | 
905 
 | 
  	if battleCfg.worldBoss_award == 0 then return 4 end
 
 | 
be697585
 
  测试
 
活动剧情解锁
 | 
906 
 | 
  
 
 | 
eb5ffd1c
 
  测试
 
世界boss翻牌奖励 活动卡池保底...
 | 
907
908
909
910
911 
 | 
  	actCfg = csvdb["activity_wordboss_awardCsv"][battleCfg.worldBoss_award]
  	if not actCfg then return 5 end
  	local awardCfg = actCfg[index]
  	if not awardCfg then return 6 end
  
 
 | 
8b6745bf
 
  测试
 
世界boss行动点奖励领完后重置
 | 
912 
 | 
  	local totalAwardCnt = #actCfg
 
 | 
eb5ffd1c
 
  测试
 
世界boss翻牌奖励 活动卡池保底...
 | 
913
914
915
916
917
918
919
920 
 | 
  	local preList = awardCfg.condition1:toArray(true, "=")
  
  	local actData = role.activity:getActData("ChallengeLevel") or {}
  	local battleInfo = actData[id] or {}
  	local bossPoint = battleInfo["bossP"] or 0
  	if bossPoint < 1 then return 7 end
  
  	local bossRecord = battleInfo["bossR"] or ""
 
 | 
ede282c0
 
  测试
 
付费签到规则改为按登录天数计算进度...
 | 
921
922
923
924 
 | 
  	local r = string.char(string.getbit(bossRecord, index))
  	if r == "1" then
  		return 9
  	end
 
 | 
eb5ffd1c
 
  测试
 
世界boss翻牌奖励 活动卡池保底...
 | 
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939 
 | 
  	local ok = false
  	if #preList == 0 then
  		ok = true
  	else
  		for _, i in ipairs(preList) do
  			local flag = string.char(string.getbit(bossRecord, i))
  			if flag == "1" then
  				ok = true
  				break
  			end
  		end
  	end
  	if not ok then return 8 end
  
  	battleInfo["bossR"] = string.setbit(bossRecord, index)
 
 | 
8b6745bf
 
  测试
 
世界boss行动点奖励领完后重置
 | 
940
941
942
943
944
945
946
947
948
949 
 | 
  	local allFinish = true
  	for i = 1, totalAwardCnt do
  		if string.char(string.getbit(battleInfo["bossR"], i)) == "0" then
  			allFinish = false
  			break
  		end
  	end
  	if allFinish then
  		battleInfo["bossR"] = ""
  	end
 
 | 
ede282c0
 
  测试
 
付费签到规则改为按登录天数计算进度...
 | 
950 
 | 
  	battleInfo["bossP"] = bossPoint - 1
 
 | 
eb5ffd1c
 
  测试
 
世界boss翻牌奖励 活动卡池保底...
 | 
951
952
953
954
955
956 
 | 
  	actData[id] = battleInfo
  	role.activity:updateActData("ChallengeLevel", actData)
  
  	local award = awardCfg.reward:toNumMap()
  	local reward, change = role:award(award, {log = {desc = "worldBossReward", int1 = actid, int2 = index}})
  	SendPacket(actionCodes.Activity_bossRewardRpc, MsgPack.pack(role:packReward(reward, change)))
 
 | 
be697585
 
  测试
 
活动剧情解锁
 | 
957
958
959 
 | 
  	return true
  end
  
 
 | 
ac885527
 
  测试
 
联动签到活动
 | 
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989 
 | 
  function _M.commonSignRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid
  	local index = msg.index
  
  	if not role.activity:isOpenById(actid, "CommonSignIn") then return 1 end
  
  	local actData = role.activity:getActData("CommonSignIn")
  	if (actData[0] or 0) < index then
  		return 2
  	end
  	if (actData[index] or 0) == 1 then
  		return 3
  	end
  
  	local actCfg = csvdb["activity_signInCsv"][actid]
  	if not actCfg then return 4 end
  	actCfg = actCfg[index]
  	if not actCfg then return 5 end
  
  	actData[index] = 1
  	role.activity:updateActData("CommonSignIn", actData)
  
  	local award = actCfg.reward:toNumMap()
  	local reward, change = role:award(award, {log = {desc = "commonSign", int1 = actid, int2 = index}})
  	SendPacket(actionCodes.Activity_commonSignRpc, MsgPack.pack(role:packReward(reward, change)))
  	return true
  end
  
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
990
991
992
993
994 
 | 
  function _M.friendHelpRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  	local oper = tonumber(msg.oper) or -1
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
995
996
997 
 | 
  	local award = {}
  	local result
  
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
998 
 | 
  
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
999 
 | 
  	local actid = 37
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1000 
 | 
  	if not role.activity:isOpenById(actid, "FriendEnergy") then return 1 end
 
 | 
0ce1cab5
 
  chenyueqi
 
好友赠送能量活动bug修复
 | 
1001 
 | 
  	if oper < 1 or oper > 4 then return 2 end
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018 
 | 
  
  	local actCsv = csvdb["activity_ctrlCsv"][actid]
  	local getLimit = actCsv.condition
  	local gifts = actCsv.condition2:toTableArray(true)
  
  	local actData = role.activity:getActData("FriendEnergy") or {}
  
  	local function getIds()
  		local ids = {}
  		local friends = redisproxy:hgetall(FRIEND_KEY:format(roleId))
  		for i = 1, #friends , 2 do
  			local objId = tonumber(friends[i])
  			ids[objId] = 1
  		end
  		return ids
  	end
  
 
 | 
0886d05a
 
  chenyueqi
 
修改联动好友赠送获得的红点记录和通知
 | 
1019 
 | 
  	if oper == 1 then -- 赠送好友能量
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1020 
 | 
  		local giveAE = actData.giveAE or {}
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1021
1022
1023
1024
1025 
 | 
  		local objId = msg.roleId
  		local gift = gifts[1]
  		local ids = {}
  
  		if not objId then
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1026
1027
1028
1029
1030
1031
1032 
 | 
  			return 3
  		end
  		if not redisproxy:hexists(FRIEND_KEY:format(roleId), objId) then
  			result = 2
  		end
  		if giveAE[objId] then
  			result = 1
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1033
1034 
 | 
  		end
  
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1035
1036
1037
1038
1039
1040
1041 
 | 
  		if not result then
  			giveAE[objId] = 1
  			award[gift[1]] = gift[2]
  			redisproxy:sadd(FRIEND_ENERGY:format(objId), roleId)
  			rpcRole(objId, "SendPacket", actionCodes.Role_notifyNewEvent, MsgPack.pack({events = {actFriendGive = roleId}}))
  			actData.giveAE = giveAE
  		end
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1042
1043
1044 
 | 
  	elseif oper == 2 then -- 收取能量
  		local objId = msg.roleId
  		local gift = gifts[2]
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1045 
 | 
  		local getAE = actData.getAE or {}
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1046
1047
1048 
 | 
  		local limit = actData.limit or 0
  
  		if limit >= getLimit then return 4 end
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1049
1050
1051
1052
1053
1054
1055
1056 
 | 
  		if not redisproxy:sismember(FRIEND_ENERGY:format(roleId), objId) then
  			result = 3
  		end
  		if getAE[objId] then
  			result = 2
  		end
  		if limit >= getLimit then
  			result = 1
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1057
1058 
 | 
  		end
  
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1059
1060
1061
1062
1063
1064
1065
1066 
 | 
  		if not result then
  			limit = limit + 1
  			getAE[objId] = 1
  			award[gift[1]] = gift[2]
  			redisproxy:srem(FRIEND_ENERGY:format(roleId), objId)
  			actData.limit = limit
  			actData.getAE = getAE
  		end
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1067 
 | 
  	elseif oper == 3 then -- 一键送领全部
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1068
1069 
 | 
  		local giveAE = actData.giveAE or {}
  		local getAE = actData.getAE or {}
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1070
1071
1072 
 | 
  		local gift1 = gifts[1]
  		local gift2 = gifts[2]
  		local limit = actData.limit or 0
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1073 
 | 
  		local cmd1, cmd2 = 0, 0
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1074 
 | 
  		local ids = getIds()
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1075
1076
1077
1078
1079
1080
1081 
 | 
  
  		local members = {}
  		local temp = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
  		for _, id in pairs(temp) do
  			members[tonumber(id)] = 1
  		end
  
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1082
1083 
 | 
  		redisproxy:pipelining(function(red)
  			for friendId, _ in pairs(ids) do
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1084
1085 
 | 
  				if not giveAE[friendId] then
  					giveAE[friendId] = 1
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1086
1087 
 | 
  					award[gift1[1]] = (award[gift1[1]] or 0) + gift1[2]
  					red:sadd(FRIEND_ENERGY:format(friendId), roleId)
 
 | 
eba94a09
 
  chenyueqi
 
修改联动好友赠送活动的消息通知结构
 | 
1088 
 | 
  					rpcRole(friendId, "SendPacket", actionCodes.Role_notifyNewEvent, MsgPack.pack({events = {actFriendGive = roleId}}))
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1089 
 | 
  					cmd1 = 2
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1090
1091 
 | 
  				end
  
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1092
1093 
 | 
  				if members[friendId] and not getAE[friendId] and limit <= getLimit then
  					cmd2 = 1
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1094 
 | 
  					limit = limit + 1
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1095 
 | 
  					getAE[friendId] = 1
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1096
1097
1098
1099
1100
1101 
 | 
  					award[gift2[1]] = (award[gift2[1]] or 0) + gift2[2]
  					red:srem(FRIEND_ENERGY:format(roleId), friendId)
  				end
  			end
  		end)
  
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1102
1103
1104
1105
1106
1107
1108 
 | 
  		local sum = cmd1 + cmd2
  		if sum == 0 then
  			result = 3
  		elseif sum ~= 3 then
  			result = sum
  		end
  
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1109 
 | 
  		actData.limit = limit
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1110
1111 
 | 
  		actData.giveAE = giveAE
  		actData.getAE = getAE
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126 
 | 
  	elseif oper == 4 then -- 抽大奖
  		local magic = actData.magic or 0
  		local rewards = actData.reward or {}
  		local rewardCsv = csvdb["activity_orderRewardsCsv"][actid]
  		local itemId1 = gifts[1][1]
  		local itemId2 = gifts[2][1]
  
  		local level = math.min(magic + 1,#rewardCsv)
  		local rewardData = rewardCsv[level]
  
  		local cost = {[itemId1] = rewardData.condition1, [itemId2] = rewardData.condition2}
  
  		if not role:checkItemEnough(cost) then return 7 end
  		role:costItems(cost, {log = {desc = "actFriendHelp", int1 = actid, int2 = level}})
  
 
 | 
0ce1cab5
 
  chenyueqi
 
好友赠送能量活动bug修复
 | 
1127 
 | 
  		if rewardData.reward ~= "" then
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1128 
 | 
  			result = 1
 
 | 
0ce1cab5
 
  chenyueqi
 
好友赠送能量活动bug修复
 | 
1129 
 | 
  			award = rewardData.reward:toNumMap()
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1130 
 | 
  		end
 
 | 
0ce1cab5
 
  chenyueqi
 
好友赠送能量活动bug修复
 | 
1131 
 | 
  		if rewardData.reward_random ~= "" then
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1132
1133 
 | 
  			result = 1
  			local pool = {}
 
 | 
0ce1cab5
 
  chenyueqi
 
好友赠送能量活动bug修复
 | 
1134 
 | 
  			for _, temp in pairs(rewardData.reward_random:toArray()) do
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1135
1136 
 | 
  				table.insert(pool, temp:toArray(true, "="))
  			end
 
 | 
0ce1cab5
 
  chenyueqi
 
好友赠送能量活动bug修复
 | 
1137 
 | 
  			local gift = pool[math.randWeight(pool, 3)]
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1138
1139
1140
1141
1142 
 | 
  			award[gift[1]] = (award[gift[1]] or 0) + gift[2]
  		end
  		rewards[level] = 1
  		actData.reward = rewards
  		actData.magic = level
 
 | 
0886d05a
 
  chenyueqi
 
修改联动好友赠送获得的红点记录和通知
 | 
1143
1144 
 | 
  	else
  		return 5
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1145
1146 
 | 
  	end
  
 
 | 
0886d05a
 
  chenyueqi
 
修改联动好友赠送获得的红点记录和通知
 | 
1147 
 | 
  	local ids = {}
 
 | 
0ce1cab5
 
  chenyueqi
 
好友赠送能量活动bug修复
 | 
1148 
 | 
  	local members = {}
 
 | 
0886d05a
 
  chenyueqi
 
修改联动好友赠送获得的红点记录和通知
 | 
1149 
 | 
  	local friendIds = getIds()
 
 | 
0ce1cab5
 
  chenyueqi
 
好友赠送能量活动bug修复
 | 
1150
1151
1152
1153
1154
1155
1156
1157 
 | 
  	local temp = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
  	for _, id in pairs(temp) do
  		members[tonumber(id)] = 1
  	end
  
  	for id, _ in pairs(friendIds) do
  		if members[id] then
  			ids[id] = 1
 
 | 
0886d05a
 
  chenyueqi
 
修改联动好友赠送获得的红点记录和通知
 | 
1158 
 | 
  		end
 
 | 
0ce1cab5
 
  chenyueqi
 
好友赠送能量活动bug修复
 | 
1159
1160 
 | 
  	end
  
 
 | 
0886d05a
 
  chenyueqi
 
修改联动好友赠送获得的红点记录和通知
 | 
1161
1162 
 | 
  	actData.new = ids
  
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1163
1164 
 | 
  	local reward, change
  	if next(award) then
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1165 
 | 
  		reward, change = role:award(award, {log = {desc = "actFriendHelp", int1 = actid}})
 
 | 
cab7184b
 
  chenyueqi
 
活动能量bug
 | 
1166 
 | 
  	end
 
 | 
091912ed
 
  chenyueqi
 
未测试版好友能量助力活动
 | 
1167
1168
1169
1170
1171 
 | 
  	role.activity:updateActData("FriendEnergy", actData)
  	SendPacket(actionCodes.Activity_friendHelpRpc, MsgPack.pack({result = result, reward = reward}))
  	return true
  end
  
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1172
1173
1174
1175
1176
1177
1178 
 | 
  -- 战令活动奖励
  function _M.battleCommandRpc(agent, data)	
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid		-- 活动id
  	local index = msg.index			-- 领取的阶段id
  	local pay = msg.pay		-- 是否是超级奖励
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190 
 | 
  
  	if not role.activity:isOpenById(actid, "BattleCommand") then return 1 end
  	local actCtrlData = csvdb["activity_ctrlCsv"][actid]
  
  	if not actCtrlData then return end
  
  	local actData = role.activity:getActData("BattleCommand") or {}
  	if pay and not actData["unlock"] then return 2 end
  
  	local bpCfg = csvdb["activity_battlepass_rewardCsv"][actid]
  	if not bpCfg then return 3 end
  
 
 | 
fa8de8ea
 
  测试
 
将军令一键领取bug
 | 
1191 
 | 
  	local unlock = actData["unlock"] or 0
 
 | 
6cac3be8
 
  测试
 
将军令批量领取奖励
 | 
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202 
 | 
  	local award = {}
  	if not index then	-- 一键领取
  		for i = 1, #bpCfg do
  			local cfg = bpCfg[i]
  			if not cfg then return 4 end
  
  			if (actData["lvl"] or 0) < cfg["type"] then break end
  			local records = {{"freeR", "rewardNormal"}, {"payR", "rewardHigh"}}
  
  			for _, info in ipairs(records) do
  				local typeKey, rewardKey = info[1], info[2]
 
 | 
fa8de8ea
 
  测试
 
将军令一键领取bug
 | 
1203
1204
1205 
 | 
  				if typeKey == "payR" and unlock == 0 then
  					break
  				end
 
 | 
6cac3be8
 
  测试
 
将军令批量领取奖励
 | 
1206
1207
1208
1209 
 | 
  				local record = actData[typeKey] or ""
  				local flag = string.char(string.getbit(record, i))
  				if flag == "0" then
  					record = string.setbit(record, i)
 
 | 
7cbf1146
 
  测试
 
去除advmap monster类型
 | 
1210
1211
1212
1213 
 | 
  					local awd = cfg[rewardKey]
  					for k, v in pairs(awd:toNumMap()) do
  						award[k] = (award[k] or 0) + v
  					end
 
 | 
6cac3be8
 
  测试
 
将军令批量领取奖励
 | 
1214 
 | 
  				end
 
 | 
6cac3be8
 
  测试
 
将军令批量领取奖励
 | 
1215 
 | 
  				actData[typeKey] = record
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1216 
 | 
  
 
 | 
6cac3be8
 
  测试
 
将军令批量领取奖励
 | 
1217
1218 
 | 
  			end
  		end
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1219 
 | 
  	else
 
 | 
6cac3be8
 
  测试
 
将军令批量领取奖励
 | 
1220
1221 
 | 
  		bpCfg = bpCfg[index]
  		if not bpCfg then return 4 end
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1222 
 | 
  
 
 | 
6cac3be8
 
  测试
 
将军令批量领取奖励
 | 
1223 
 | 
  		if (actData["lvl"] or 0) < bpCfg["type"] then return 5 end
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1224 
 | 
  
 
 | 
6cac3be8
 
  测试
 
将军令批量领取奖励
 | 
1225
1226
1227
1228
1229
1230 
 | 
  		local record = ""
  		if pay then
  			record = actData["payR"] or ""
  		else
  			record = actData["freeR"] or ""
  		end
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1231 
 | 
  
 
 | 
6cac3be8
 
  测试
 
将军令批量领取奖励
 | 
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241 
 | 
  		local flag = string.char(string.getbit(record, index))
  
  		if flag == "1" then
  			return 6
  		end
  
  		record = string.setbit(record, index)
  		local awd = ""
  		if pay then
  			actData["payR"] = record
 
 | 
30d52f8f
 
  测试
 
战令奖励错位
 | 
1242 
 | 
  			awd = bpCfg["rewardHigh"]
 
 | 
6cac3be8
 
  测试
 
将军令批量领取奖励
 | 
1243
1244 
 | 
  		else
  			actData["freeR"] = record
 
 | 
30d52f8f
 
  测试
 
战令奖励错位
 | 
1245 
 | 
  			awd = bpCfg["rewardNormal"]
 
 | 
6cac3be8
 
  测试
 
将军令批量领取奖励
 | 
1246
1247
1248
1249 
 | 
  		end
  		for k, v in pairs(awd:toNumMap()) do
  			award[k] = (award[k] or 0) + v
  		end
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263 
 | 
  	end
  
  	role.activity:updateActData("BattleCommand", actData)
  
  	local reward, change = role:award(award, {log = {desc = "actBattleCommand", int1 = actid, int2 = index}})
  
  	SendPacket(actionCodes.Activity_battleCommandRpc, MsgPack.pack(role:packReward(reward, change)))
  	return true
  end
  
  function _M.buyBattleCommandLvlRpc(agent, data)	
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid		-- 活动id
 
 | 
98be031a
 
  测试
 
新年活动
 | 
1264 
 | 
  	local count = msg.count
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276 
 | 
  
  	if not role.activity:isOpenById(actid, "BattleCommand") then return 1 end
  	local actCtrlData = csvdb["activity_ctrlCsv"][actid]
  
  	if not actCtrlData then return 2 end
  
  	local bpCfg = csvdb["activity_battlepass_rewardCsv"][actid]
  	if not bpCfg then return 3 end
  
  	local actData = role.activity:getActData("BattleCommand") or {}
  
  	local curLvl = actData["lvl"] or 0
 
 | 
98be031a
 
  测试
 
新年活动
 | 
1277 
 | 
  	local nextLvl = curLvl + count
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1278
1279
1280
1281 
 | 
  	if curLvl >= bpCfg[#bpCfg]["type"] then return 4 end
  	local cost = 0
  	for i = 1, #bpCfg do
  		local cfg = bpCfg[i]
 
 | 
98be031a
 
  测试
 
新年活动
 | 
1282
1283 
 | 
  		if cfg["type"] > curLvl and cfg["type"] <= nextLvl then
  			cost = cost + cfg["cost"]
 
 | 
7e5d9ac6
 
  测试
 
战令活动购买等级扣除钻石bug
 | 
1284 
 | 
  		elseif cfg["type"] > nextLvl then
 
 | 
b620581a
 
  测试
 
战令活动,战令相关的任务活动
 | 
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298 
 | 
  			break
  		end
  	end
  	if cost == 0 then return 5 end
  
  	if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return 6 end
  	role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "actBuyBpLevel", int1 = curLvl}})
  	actData["lvl"] = nextLvl
  	role.activity:updateActData("BattleCommand", actData)
  
  	SendPacket(actionCodes.Activity_buyBattleCommandLvlRpc, MsgPack.pack({}))
  	return true
  end
  
 
 | 
336fa4a6
 
  chenyueqi
 
新的活动签到,新春三重奏之返还0消耗
 | 
1299
1300
1301 
 | 
  function _M.newSignRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
 
 | 
336fa4a6
 
  chenyueqi
 
新的活动签到,新春三重奏之返还0消耗
 | 
1302 
 | 
  
 
 | 
0ed985c5
 
  chenyueqi
 
先加上,后面再调试
 | 
1303
1304 
 | 
  	local open, actId = role.activity:isOpen("NewSign")
  	if not open then return 1 end
 
 | 
336fa4a6
 
  chenyueqi
 
新的活动签到,新春三重奏之返还0消耗
 | 
1305
1306 
 | 
  
  	local actData = role.activity:getActData("NewSign")
 
 | 
6897e0e3
 
  chenyueqi
 
新春签到领奖方法里 漏掉了一个in...
 | 
1307 
 | 
  	if actData[tostring(actData["0"] or 0)] then
 
 | 
336fa4a6
 
  chenyueqi
 
新的活动签到,新春三重奏之返还0消耗
 | 
1308
1309 
 | 
  		return 2
  	end
 
 | 
336fa4a6
 
  chenyueqi
 
新的活动签到,新春三重奏之返还0消耗
 | 
1310 
 | 
  
 
 | 
0ed985c5
 
  chenyueqi
 
先加上,后面再调试
 | 
1311 
 | 
  	local actCfg = csvdb["activity_signInCsv"][actId]
 
 | 
336fa4a6
 
  chenyueqi
 
新的活动签到,新春三重奏之返还0消耗
 | 
1312 
 | 
  	if not actCfg then return 4 end
 
 | 
336fa4a6
 
  chenyueqi
 
新的活动签到,新春三重奏之返还0消耗
 | 
1313 
 | 
  
 
 | 
119b51db
 
  chenyueqi
 
新春签到 记录字段值的key改成s...
 | 
1314 
 | 
  	local sumDay = actData["0"] or 0
 
 | 
0ed985c5
 
  chenyueqi
 
先加上,后面再调试
 | 
1315
1316 
 | 
  	local award = {}
  	for k, data in pairs(actCfg) do
 
 | 
119b51db
 
  chenyueqi
 
新春签到 记录字段值的key改成s...
 | 
1317 
 | 
  		if not actData[tostring(data.day)] and data.day <= sumDay then
 
 | 
0ed985c5
 
  chenyueqi
 
先加上,后面再调试
 | 
1318
1319
1320 
 | 
  			for id, value in pairs(data.reward:toNumMap()) do
  				award[id] = (award[id] or 0) + value
  			end
 
 | 
119b51db
 
  chenyueqi
 
新春签到 记录字段值的key改成s...
 | 
1321 
 | 
  			actData[tostring(data.day)] = 1
 
 | 
0ed985c5
 
  chenyueqi
 
先加上,后面再调试
 | 
1322
1323
1324
1325
1326
1327
1328
1329 
 | 
  		end
  	end
  
  	local reward, change
  	if next(award) then
  		role.activity:updateActData("NewSign", actData)
  		reward, change = role:award(award, {log = {desc = "newSign", int1 = actId, int2 = sumDay}})
  	end
 
 | 
336fa4a6
 
  chenyueqi
 
新的活动签到,新春三重奏之返还0消耗
 | 
1330 
 | 
  
 
 | 
336fa4a6
 
  chenyueqi
 
新的活动签到,新春三重奏之返还0消耗
 | 
1331
1332
1333
1334 
 | 
  	SendPacket(actionCodes.Activity_newSignRpc, MsgPack.pack(role:packReward(reward, change)))
  	return true
  end
  
 
 | 
98be031a
 
  测试
 
新年活动
 | 
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349 
 | 
  -- 活动拾荒领取阶段奖励
  function _M.advLevelRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actid = msg.actid
  	local index = msg.index
  
  	if not role.activity:isOpenById(actid, "AdvLevel") then return 1 end
  
  	local actCfg = csvdb["activity_stagesAwardCsv"][actid]
  	if not actCfg then return 2 end
  	actCfg = actCfg[index]
  	if not actCfg then return 3 end
  
  	local actData = role.activity:getActData("AdvLevel") or {}
 
 | 
fa8de8ea
 
  测试
 
将军令一键领取bug
 | 
1350 
 | 
  	local record = actData["r"] or ""
 
 | 
98be031a
 
  测试
 
新年活动
 | 
1351
1352
1353
1354
1355
1356
1357
1358 
 | 
  	local flag = string.char(string.getbit(record, index))
  
  	if flag == "1" then return 4 end
  
  	local chapters = actCfg["condition2"]:toArray(true, "=")
  	local totalVal = 0
  	for i = 1, #chapters do
  		local cid = chapters[i]
 
 | 
fa8de8ea
 
  测试
 
将军令一键领取bug
 | 
1359
1360 
 | 
  		local info = actData[cid] or {}
  		totalVal = totalVal + (info["max"] or 0)
 
 | 
98be031a
 
  测试
 
新年活动
 | 
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372 
 | 
  	end
  	if totalVal < actCfg["condition1"] then return 5 end
  
  	actData["r"] = string.setbit(record, index)
  	role.activity:updateActData("AdvLevel", actData)
  
  	local reward, change = role:award(actCfg.reward, {log = {desc = "advLevelStage", int1 = actid, int2 = index}})
  
  	SendPacket(actionCodes.Activity_advLevelRpc, MsgPack.pack(role:packReward(reward, change)))
  	return true
  end
  
 
 | 
c3c1b7e0
 
  测试
 
fix confict
 | 
1373 
 | 
  return _M
 
 |