0a07bdd9
 
  zhouahaihai
 
角色升级 。gm
 | 
1
2
3
4
5
6
7
8
9
10
11
12
13
14 
 | 
  local ipairs = ipairs
  local table = table
  local math = math
  local next = next
  local string = string
  local redisproxy = redisproxy
  local MsgPack = MsgPack
  local getRandomName = getRandomName
  local mcast_util = mcast_util
  local string_format = string.format
  local tonumber = tonumber
  local require = require
  local table_insert = table.insert
  local tconcat = table.concat
 
 | 
be9c9ca6
 
  zhouahaihai
 
角色评论
 | 
15 
 | 
  local table_unpack = table.unpack
 
 | 
0a07bdd9
 
  zhouahaihai
 
角色升级 。gm
 | 
16
17 
 | 
  
  local _M = {}
 
 | 
058a0cbb
 
  zhouhaihai
 
抽卡
 | 
18 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
19
20
21
22
23
24
25
26
27 
 | 
  local function getChangeAttrJson(oldAttr, newAttr)
  	local change = {}
  	for k, v in pairs(newAttr) do
  		change[k] = v - oldAttr[k]
  		change[k] = math.ceil(change[k])
  		if change[k] == 0 then
  			change[k] = nil
  		end
  	end
 
 | 
887c1843
 
  zhouhaihai
 
日志新一批
 | 
28 
 | 
  	return change
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
29
30 
 | 
  end
  
 
 | 
0a07bdd9
 
  zhouahaihai
 
角色升级 。gm
 | 
31
32
33 
 | 
  function _M.levelUpRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
34 
 | 
  
 
 | 
0a07bdd9
 
  zhouahaihai
 
角色升级 。gm
 | 
35 
 | 
  	local hero = role.heros[msg.id]
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
36 
 | 
  	if not hero then return 1 end
 
 | 
0a07bdd9
 
  zhouahaihai
 
角色升级 。gm
 | 
37 
 | 
  
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
38 
 | 
  	if hero:getProperty("level") >= hero:getMaxLevel() then return 2 end
 
 | 
8c74292c
 
  zhouahaihai
 
增加item 以及 角色突破
 | 
39 
 | 
  	local curData = csvdb["unit_expCsv"][hero:getProperty("level")]
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
40 
 | 
  	local cost = {[ItemId.Exp] = curData.exp, [ItemId.Gold] = curData.gold}
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
41 
 | 
  	if not role:checkItemEnough(cost) then return 3 end
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
42 
 | 
  	role:costItems(cost, {log = {desc = "heroLevelUp", int1 = msg.id, int2 = hero:getProperty("type")}})
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
43
44
45 
 | 
  
  	local oldAttr = hero:getTotalAttrs()
  	local oldBattleV = hero:getProperty("battleV")
 
 | 
0a07bdd9
 
  zhouahaihai
 
角色升级 。gm
 | 
46 
 | 
  	hero:updateProperty({field = "level", delta = 1})
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
47 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
48
49 
 | 
  	role:log("hero_upgrade", {
  		hero_id = hero:getProperty("type"), --英雄ID
 
 | 
887c1843
 
  zhouhaihai
 
日志新一批
 | 
50 
 | 
  		hero_upgrade_cost = cost, -- 英雄升级消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,………...}
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
51
52
53
54
55 
 | 
  		hero_upgrade_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄升级效果,可记录效果ID,或json格式记录提升效果,{攻击:20,闪避:20,……..}
  		hero_upgrade_type = 0, -- 英雄升级方式,连续升级:1,单击升级:0
  		hero_upgrade_score = hero:getProperty("battleV"), -- 英雄升级后评分
  		hero_upgrade_scoreget = hero:getProperty("battleV") - oldBattleV, -- 通过英雄升级提升的评分
  	})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
56 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
57 
 | 
  	hero:mylog({desc = "levelUp", int1 = hero:getProperty("level")})
 
 | 
1e9cb217
 
  chenyueqi
 
服务器记录控制引导过程
 | 
58 
 | 
  
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
59 
 | 
  	role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
 
 | 
190e1415
 
  测试
 
英雄帖活动初始化
 | 
60
61 
 | 
  
  	role:checkTaskEnter("HeroLvlCollect", {})
 
 | 
0a07bdd9
 
  zhouahaihai
 
角色升级 。gm
 | 
62
63
64
65 
 | 
  	SendPacket(actionCodes.Hero_levelUpRpc, '')
  	return true
  end
  
 
 | 
8c74292c
 
  zhouahaihai
 
增加item 以及 角色突破
 | 
66
67
68
69 
 | 
  function _M.breakRpc( agent, data )
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local hero = role.heros[msg.id]
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
70 
 | 
  	if not hero then return 1 end
 
 | 
8c74292c
 
  zhouahaihai
 
增加item 以及 角色突破
 | 
71 
 | 
  
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
72
73 
 | 
  	if hero:getProperty("level") < hero:getMaxLevel() then return 2 end
  	if hero:getProperty("breakL") >= #csvdb["unit_breakCsv"] then return 3 end
 
 | 
8c74292c
 
  zhouahaihai
 
增加item 以及 角色突破
 | 
74 
 | 
  	local curData = csvdb["unit_breakCsv"][hero:getProperty("breakL")]
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
75 
 | 
  	local cost = {[ItemId.BreakCost] = curData.cost, [ItemId.Gold] = curData.gold}
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
76 
 | 
  	if not role:checkItemEnough(cost) then return 4 end
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
77 
 | 
  	role:costItems(cost, {log = {desc = "heroBreak", int1 = msg.id, int2 = hero:getProperty("type")}})
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
78 
 | 
  	local oldAttr = hero:getTotalAttrs()
 
 | 
8c74292c
 
  zhouahaihai
 
增加item 以及 角色突破
 | 
79 
 | 
  	hero:updateProperty({field = "breakL", delta = 1})
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
80 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
81
82 
 | 
  	role:log("hero_break", {
  		hero_id = hero:getProperty("type"), --英雄ID
 
 | 
887c1843
 
  zhouhaihai
 
日志新一批
 | 
83 
 | 
  		hero_break_cost = cost, -- 英雄突破消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,………...}
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
84
85
86 
 | 
  		hero_break_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄突破效果,可记录效果ID,或json格式记录提升效果,{攻击:20,闪避:20,……..}
  		hero_break_level = hero:getMaxLevel(), -- 英雄突破后等级上限
  	})
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
87 
 | 
  	hero:mylog({desc = "break", int1 = hero:getProperty("breakL")})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
88 
 | 
  
 
 | 
8c74292c
 
  zhouahaihai
 
增加item 以及 角色突破
 | 
89
90
91 
 | 
  	SendPacket(actionCodes.Hero_breakRpc, '')
  	return true
  end
 
 | 
0a07bdd9
 
  zhouahaihai
 
角色升级 。gm
 | 
92 
 | 
  
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
93
94
95
96 
 | 
  function _M.wakeRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local hero = role.heros[msg.id]
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
97
98
99
100
101 
 | 
  	if not hero then return 1 end
  	if hero:getProperty("wakeL") >= #csvdb["unit_wakeCsv"] then return 2 end
  	local typ = hero:getProperty("type")
  	local wakeData = csvdb["unit_wakeCsv"][hero:getProperty("wakeL")]
  	if not wakeData then return 3 end
 
 | 
15cba0bf
 
  zhouhaihai
 
修改天赋升级消耗
 | 
102
103 
 | 
  	local costMaterial = wakeData.costMaterial:toArray(true,"=")
  	local cost = {[typ] = wakeData.costFigment,[globalCsv.unit_wake_cost[hero:getCamp()][costMaterial[1]]] = costMaterial[2]}
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
104
105 
 | 
  	if not role:checkItemEnough(cost) then
  		return 4
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
106 
 | 
  	end
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
107 
 | 
  
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
108 
 | 
  	role:costItems(cost, {log = {desc = "heroWake", int1 = msg.id, int2 = hero:getProperty("type")}})
 
 | 
0889982f
 
  zhouhaihai
 
优化角色技能等级
 | 
109 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
110 
 | 
  	local oldAttr = hero:getTotalAttrs()
 
 | 
43293781
 
  zhouhaihai
 
日志bug
 | 
111 
 | 
  	local oldBattleV = hero:getProperty("battleV")
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
112
113 
 | 
  	hero:updateProperty({field = "wakeL", delta = 1})
  
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
114 
 | 
  	local curLevel = hero:getProperty("wakeL")
 
 | 
f6a9215f
 
  zhouhaihai
 
觉醒 误删了 任务
 | 
115 
 | 
  	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
 
 | 
bcbb0c7b
 
  zhouhaihai
 
3星解锁 cg
 | 
116 
 | 
  	if curLevel == 3 then -- 解锁cg
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
117
118 
 | 
  		role:checkTaskEnter("WakeCG", {heroType = typ})
  	end
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
119 
 | 
  	hero:mylog({desc = "wake", int1 = hero:getProperty("wakeL")})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
120 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
121
122 
 | 
  	role:log("hero_rise", {
  		hero_id = typ, --英雄ID
 
 | 
887c1843
 
  zhouhaihai
 
日志新一批
 | 
123 
 | 
  		hero_rise_cost = cost, --英雄觉醒消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,………...}
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
124 
 | 
  		hero_rise_score = hero:getProperty("battleV"), --英雄觉醒后评分提升
 
 | 
43293781
 
  zhouhaihai
 
日志bug
 | 
125 
 | 
  		hero_rise_scoreget = hero:getProperty("battleV") - oldBattleV, --英雄觉醒后评分提升
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
126
127
128 
 | 
  		hero_rise_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), --英雄觉醒效果,可记录效果ID,或json格式记录提升效果,{攻击:20,闪避:20,……..}
  	})
  
 
 | 
a5b98c30
 
  chenyueqi
 
引导调整
 | 
129
130
131
132 
 | 
  	if hero:getProperty("type") == 204 then
  		role:finishGuide(7)
  	end
  
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
133 
 | 
  	SendPacket(actionCodes.Hero_wakeRpc, '')
 
 | 
190e1415
 
  测试
 
英雄帖活动初始化
 | 
134
135 
 | 
  
  	role:checkTaskEnter("HeroStarCollect", {})
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
136
137
138 
 | 
  	return true
  end
  
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
139
140
141
142
143 
 | 
  
  function _M.talentRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local hero = role.heros[msg.id]
 
 | 
b57f0bae
 
  gaofengduan
 
fix hero talent
 | 
144 
 | 
  	if not hero then return 1 end
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
145 
 | 
  
 
 | 
04258e10
 
  zhouhaihai
 
天赋bug
 | 
146 
 | 
  	local talent = hero:getProperty("talent")
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
147 
 | 
  	local heroCfgId = hero:getProperty("type")
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
148 
 | 
  	local curStage = talent:getv(0, 1)
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
149
150
151 
 | 
  	local curLevel = talent:getv(1, 1)
  	local curData = csvdb["unit_talent_"..heroCfgId.."Csv"][curStage]
  	if not curData then return 1 end
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
152
153 
 | 
  	local oldSkillLv = hero:getSkillLevel(1)
  
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
154 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
155 
 | 
  	local cost = {}
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
156
157
158 
 | 
  	if curLevel == #curData then
  		talent = talent:setv(0, curStage + 1)
  		talent = talent:setv(1, 1)
 
 | 
6fc397d6
 
  zhouhaihai
 
角色新突破  冒险优化点击地块
 | 
159 
 | 
  	else
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
160 
 | 
  		if curLevel > #curData then return 2 end
 
 | 
6fc397d6
 
  zhouhaihai
 
角色新突破  冒险优化点击地块
 | 
161 
 | 
  
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
162
163 
 | 
  		local talentData = curData[curLevel]
  		if not talentData then return 3 end
 
 | 
6fc397d6
 
  zhouhaihai
 
角色新突破  冒险优化点击地块
 | 
164 
 | 
  
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
165 
 | 
  		if talentData.lvRequire > hero:getProperty("level") then return 4 end
 
 | 
6fc397d6
 
  zhouhaihai
 
角色新突破  冒险优化点击地块
 | 
166 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
167 
 | 
  		cost = talentData.money:toNumMap()
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
168 
 | 
  		if not role:checkItemEnough(cost) then return 5 end
 
 | 
6fc397d6
 
  zhouhaihai
 
角色新突破  冒险优化点击地块
 | 
169 
 | 
  		role:costItems(cost, {log = {desc = "heroTalent", int1 = msg.id, int2 = hero:getProperty("type")}})
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
170 
 | 
  		talent = talent:setv(1, curLevel + 1)
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
171 
 | 
  	end
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
172
173 
 | 
  	curStage = talent:getv(0, 1)
  	role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = curStage})
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
174 
 | 
  
 
 | 
6fc397d6
 
  zhouhaihai
 
角色新突破  冒险优化点击地块
 | 
175 
 | 
  	hero:updateProperty({field = "talent", value = talent})
 
 | 
53e8037e
 
  zhouhaihai
 
任务
 | 
176 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
177
178 
 | 
  	role:log("hero_talent", {
  		hero_id = hero:getProperty("type"), --英雄ID
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
179 
 | 
  		hero_talent_id = curStage, --天赋ID
 
 | 
887c1843
 
  zhouhaihai
 
日志新一批
 | 
180 
 | 
  		hero_talent_cost = cost, -- 英雄天赋升级消耗,json格式记录,{道具ID1:消耗数量1,道具ID2:消耗数量2,………...}
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
181
182
183 
 | 
  		hero_talent_levelbef = oldSkillLv, -- 英雄技能升级前等级
  		hero_talent_level = hero:getSkillLevel(1), -- 英雄技能升级后等级
  	})
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
184 
 | 
  	hero:mylog({desc = "talent", int1 = talent:getv(0, 1), int2 = talent:getv(1, 1)})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
185 
 | 
  
 
 | 
997cbdfe
 
  zhouahaihai
 
技能养成
 | 
186
187
188
189 
 | 
  	SendPacket(actionCodes.Hero_talentRpc, '')
  	return true
  end
  
 
 | 
6fc397d6
 
  zhouhaihai
 
角色新突破  冒险优化点击地块
 | 
190 
 | 
  
 
 | 
be9c9ca6
 
  zhouahaihai
 
角色评论
 | 
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264 
 | 
  -- 暂时没有这个功能
  function _M.likeHeroRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local heroType = msg.type
  	local result = {status = 0}
  	local isLike = false
  	local hadLike = role:getProperty("likeHero"):toArray(true, "=")
  	for _, v in pairs(hadLike) do
  		if v == heroType then
  			isLike = true
  			break
  		end
  	end
  	if isLike then
  		result.status = 1
  	else
  		redisproxy:hincrby("hero:like", "hero:"..heroType, 1)
  		table.insert(hadLike, heroType)
  		role:setProperty("likeHero", table.concat(hadLike, "="))
  	end
  
  	SendPacket(actionCodes.Hero_likeHeroRpc, MsgPack.pack(result))
  	return true
  end
  local RankLikeNum = 5 --热度显示几个
  local TimeLikeNum = 95 -- 时间显示几个
  local function getCommentKey(heroType)
  	return {
  		commentListKey = string.format("list:%d:herocomments", heroType),
  		commentRankKey = string.format("rank:%d:herocomments", heroType),
  		commentKey = string.format("hero:%d:comments", heroType),
  	}
  end
  
  local function trimComment(heroType, commentId) -- 剪裁 CommentList
  	local commentKey = getCommentKey(heroType)
  	local redret = redisproxy:pipelining(function (red)
  		red:lpush(commentKey.commentListKey, commentId)
  		red:lrange(commentKey.commentListKey, TimeLikeNum,-1)
  		red:ltrim(commentKey.commentListKey, 0, TimeLikeNum - 1)
  		red:zrevrange(commentKey.commentRankKey, 0, RankLikeNum - 1)
  	end)
  	local hots = {}
  	for _, hot in pairs(redret[4]) do
  		hots[hot] = 1
  	end
  	redisproxy:pipelining(function (red)
  		local needDel = {}
  		for _, tempId in pairs(redret[2]) do
  			if not hots[tempId] then
  				table.insert(needDel, tempId)
  			end
  		end
  		if #needDel > 0 then
  			red:zrem(commentKey.commentRankKey, table_unpack(needDel))
  			red:hdel(commentKey.commentKey, table_unpack(needDel))
  		end
  	end)
  end
  
  
  function _M.commentHeroRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local heroType = msg.type
  	local content = msg.content
  
  	local result = {status = 0}  -- status 0 成功  1 已经评论过了
  	local curStutus = role.dailyData:getProperty("commentHero")
  	if curStutus:getv(heroType, 0) ~= 0 then
  		result.status = 1
  	else
  		local commentKey = getCommentKey(heroType)
 
 | 
3c0ea5fb
 
  zhouhaihai
 
抽英雄
 | 
265 
 | 
  		local SERV = string.format(".chated%d", math.random(1, 5))
 
 | 
be9c9ca6
 
  zhouahaihai
 
角色评论
 | 
266
267
268
269
270
271 
 | 
  		local legal, mod = skynet.call(SERV, "lua", "check", content)
  		if not legal then
  			content = mod or ""
  		end
  		local commentId = tostring(redisproxy:hincrby("hero:comment:autoincr", "hero:" .. heroType, 1))
  		local comment = {
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
272 
 | 
  			commentId = commentId,
 
 | 
be9c9ca6
 
  zhouahaihai
 
角色评论
 | 
273
274
275
276
277
278
279
280
281
282
283 
 | 
  			content = content,
  			roleId = role:getProperty("id"),
  			name = role:getProperty("name"),
  			-- time = skynet.timex()
  		}
  		redisproxy:hset(commentKey.commentKey, commentId, json.encode(comment))
  		trimComment(heroType, commentId)
  
  		comment.like = 0
  		result.comment = comment
  		role.dailyData:setProperty("commentHero", curStutus:setv(heroType, 1))
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
284
285
286
287
288
289
290
291 
 | 
  
  
  		role:log("hero_note", {
  			hero_id = heroType, -- 英雄ID
  			hero_note_action = 0, -- 英雄评价界面操作,发布评论:0,点赞:1,反对:2
  			hero_note_id = commentId, -- 操作的评价ID
  			hero_note_text = content, -- 操作的评价内容
  		})
 
 | 
be9c9ca6
 
  zhouahaihai
 
角色评论
 | 
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354 
 | 
  	end
  	SendPacket(actionCodes.Hero_commentHeroRpc, MsgPack.pack(result))
  	return true
  end
  
  function _M.getCommentsRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local heroType = msg.type
  	local list = {}  -- 评论列表
  	local commentKey = getCommentKey(heroType)
  	local commentRoleKey = string.format("comment:%d:like", role:getProperty("id"))
  	local redret = redisproxy:pipelining(function (red)
  		red:lrange(commentKey.commentListKey, 0,TimeLikeNum - 1)
  		red:zrevrange(commentKey.commentRankKey, 0, -1, "WITHSCORES") --热门
  		red:hget("hero:like", "hero:"..heroType)
  		red:lrange(commentRoleKey, 0, 999)
  	end)
  
  	local likeMap = {}
  	local idList = {}
  	local liked = {}
  	for i = 1, #redret[2], 2 do
  		likeMap[redret[2][i]] = redret[2][i + 1]
  		if i < RankLikeNum * 2 then
  			table.insert(idList, redret[2][i])
  		end
  	end
  	for i = 1, #redret[1] do
  		table.insert(idList, redret[1][i])
  	end
  	for i = 1, #redret[4] do
  		liked[redret[4][i]] = 1
  	end
  
  	local commentData = redisproxy:pipelining(function (red)
  		for _, commentId in ipairs(idList) do
  			red:hget(commentKey.commentKey, commentId)
  		end
  	end)
  	for _, commentS in ipairs(commentData or {}) do
  		local comment = json.decode(commentS)
  		comment.like = likeMap[tostring(comment.commentId)] or 0
  		comment.liked = liked[heroType .. ":" .. comment.commentId] or 0
  		table.insert(list, comment)
  	end
  	SendPacket(actionCodes.Hero_getCommentsRpc, MsgPack.pack({list = list, like = tonumber(redret[3] or 0)}))
  	return true
  end
  
  function _M.likeCommentRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local actType = msg.actType  -- 1 顶 2 踩
  	local heroType = msg.type
  	local commentId = msg.commentId  --评论id
  	local commentKey = getCommentKey(heroType)
  	local add = 0
  	if actType == 1 then
  		add = 1
  	elseif actType == 2 then
  		add = -1
  	else
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
355 
 | 
  		return
 
 | 
be9c9ca6
 
  zhouahaihai
 
角色评论
 | 
356
357 
 | 
  	end
  
 
 | 
1c35c4cf
 
  gaofengduan
 
fix hero awake
 | 
358
359 
 | 
  	local result = {status = 0}
  	local commentIndex = heroType .. ":" .. commentId
 
 | 
be9c9ca6
 
  zhouahaihai
 
角色评论
 | 
360
361 
 | 
  	local commentRoleKey = string.format("comment:%d:like", role:getProperty("id"))
  	local redret = redisproxy:pipelining(function (red)
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
362 
 | 
  		red:hget(commentKey.commentKey, commentId)
 
 | 
be9c9ca6
 
  zhouahaihai
 
角色评论
 | 
363
364
365
366
367
368
369 
 | 
  		red:lrem(commentRoleKey, 1, commentIndex)
  		red:lpush(commentRoleKey, commentIndex)
  		red:ltrim(commentRoleKey, 0, 999)
  	end)
  	if (tonumber(redret[2]) or 0) > 0 then
  		result.status = 1
  	else
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
370
371 
 | 
  		if redret[1] then-- 查不到也返回ture
  			local comment = json.decode(redret[1])
 
 | 
be9c9ca6
 
  zhouahaihai
 
角色评论
 | 
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396 
 | 
  			local redret2 = redisproxy:pipelining(function (red)
  				red:zrevrange(commentKey.commentRankKey, 0, RankLikeNum - 1) --热门
  				red:zincrby(commentKey.commentRankKey, add, commentId)
  				red:zrevrange(commentKey.commentRankKey, 0, RankLikeNum - 1) --热门
  			end)
  			local out = {}
  			for _, v in pairs(redret2[1]) do
  				out[v] = 1
  			end
  			local new = {}
  			for _, v in pairs(redret2[3]) do
  				if out[v] then
  					out[v] = nil
  				else
  					new[v] = 1
  				end
  			end
  			for tempId, _ in pairs(out) do
  				trimComment(heroType, tempId)
  			end
  			redisproxy:pipelining(function (red)
  				for tempId, _ in pairs(new) do
  					red:lrem(commentKey.commentListKey, 0, tempId)
  				end
  			end)
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
397
398
399
400
401
402
403 
 | 
  
  			role:log("hero_note", {
  				hero_id = heroType, -- 英雄ID
  				hero_note_action = add > 0 and 1 or 2, -- 英雄评价界面操作,发布评论:0,点赞:1,反对:2
  				hero_note_id = commentId, -- 操作的评价ID
  				hero_note_text = comment.content, -- 操作的评价内容
  			})
 
 | 
be9c9ca6
 
  zhouahaihai
 
角色评论
 | 
404
405
406
407
408
409
410 
 | 
  		end
  	end
  
  	SendPacket(actionCodes.Hero_likeCommentRpc, MsgPack.pack(result))
  	return true
  end
  
 
 | 
312b9db5
 
  zhouahaihai
 
背包
 | 
411
412
413
414
415
416
417
418
419
420
421
422
423
424 
 | 
  function _M.createHeroRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local heroType = msg.heroType
  	local unitData = csvdb["unitCsv"][heroType]
  	if not unitData then return end
  	local cost = globalCsv.unit_fragment_cost[unitData["rare"]]
  	if not cost then return end
  	if role:getItemCount(heroType) < cost then return end
  
  	for _, hero in pairs(role.heros) do
  		if hero:getProperty("type") == heroType then return end
  	end
  
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
425
426 
 | 
  	role:costItems({[heroType] = cost}, {log = {desc = "createHero"}})
  	role:award({[heroType + ItemStartId.Hero] = 1}, {log = {desc = "createHero"}})
 
 | 
312b9db5
 
  zhouahaihai
 
背包
 | 
427
428
429
430
431 
 | 
  
  	SendPacket(actionCodes.Hero_createHeroRpc, "")
  	return true
  end
  
 
 | 
43cc5f51
 
  gaofengduan
 
调整 equip 数据结构
 | 
432 
 | 
  -- typ 位置,level等级对应唯一装备,level为0时为移除,不为0时无则装备,有则替换
 
 | 
24d77701
 
  gaofengduan
 
fix equip
 | 
433 
 | 
  function _M.referEquipsRpc(agent, data)
 
 | 
43cc5f51
 
  gaofengduan
 
调整 equip 数据结构
 | 
434
435
436
437
438 
 | 
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local hero = role.heros[msg.id]
  	if not hero then return 10 end
  	local equips = msg.equips
 
 | 
3efc352e
 
  zhouhaihai
 
增加记录log
 | 
439 
 | 
  	local isAuto = msg.isAuto
 
 | 
43cc5f51
 
  gaofengduan
 
调整 equip 数据结构
 | 
440
441 
 | 
  	if not equips or not next(equips) then return 11 end
  
 
 | 
056c01a0
 
  zhouhaihai
 
简化装备
 | 
442
443
444
445
446 
 | 
  	for typ = 1, 4 do -- 4件装备
  		if equips[typ] and equips[typ] ~= 0 then
  			if role:getEquipCount(typ, equips[typ]) <= 0 then
  				return
  			end
 
 | 
43cc5f51
 
  gaofengduan
 
调整 equip 数据结构
 | 
447 
 | 
  		end
 
 | 
43cc5f51
 
  gaofengduan
 
调整 equip 数据结构
 | 
448 
 | 
  	end
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
449
450
451
452
453 
 | 
  
  	local oldAttr = hero:getTotalAttrs()
  	local oldBattleV = hero:getProperty("battleV")
  	local wear = {}
  
 
 | 
056c01a0
 
  zhouhaihai
 
简化装备
 | 
454
455
456
457 
 | 
  	local curEquip = hero:getProperty("equip")
  	for typ = 1, 4 do -- 4件装备
  		if equips[typ] then
  			local cur = curEquip:getv(typ, 0)
 
 | 
ee999bde
 
  zhouhaihai
 
零件优化
 | 
458
459 
 | 
  			if cur ~= equips[typ] then
  				if equips[typ] == 0 then
 
 | 
056c01a0
 
  zhouhaihai
 
简化装备
 | 
460 
 | 
  					curEquip = curEquip:delk(typ)
 
 | 
ee999bde
 
  zhouhaihai
 
零件优化
 | 
461 
 | 
  				else
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
462 
 | 
  					role:addEquip(typ, equips[typ], -1, {log = {desc = "refer"}}) -- 穿上
 
 | 
056c01a0
 
  zhouhaihai
 
简化装备
 | 
463 
 | 
  					curEquip = curEquip:setv(typ, equips[typ])
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
464
465 
 | 
  
  					wear[typ] = {id = equips[typ], act = 0}
 
 | 
056c01a0
 
  zhouhaihai
 
简化装备
 | 
466 
 | 
  				end
 
 | 
ee999bde
 
  zhouhaihai
 
零件优化
 | 
467
468 
 | 
  
  				if cur ~= 0 then
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
469 
 | 
  					role:addEquip(typ, cur, 1, {log = {desc = "refer"}}) -- 脱掉
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
470
471 
 | 
  
  					wear[typ] = {id = cur, act = 1}
 
 | 
ee999bde
 
  zhouhaihai
 
零件优化
 | 
472 
 | 
  				end
 
 | 
43cc5f51
 
  gaofengduan
 
调整 equip 数据结构
 | 
473
474 
 | 
  			end
  		end
 
 | 
43cc5f51
 
  gaofengduan
 
调整 equip 数据结构
 | 
475 
 | 
  	end
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
476 
 | 
  
 
 | 
056c01a0
 
  zhouhaihai
 
简化装备
 | 
477
478
479 
 | 
  	-- 更新角色
  	hero:updateProperty({field = "equip", value = curEquip})
  
 
 | 
1e9cb217
 
  chenyueqi
 
服务器记录控制引导过程
 | 
480
481 
 | 
  	role:finishGuide(23)
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
482
483
484 
 | 
  	local curAttr = hero:getTotalAttrs()
  	local attrChange = getChangeAttrJson(oldAttr, curAttr)
  	for typ, data in pairs(wear) do
 
 | 
c3a70cde
 
  zhouhaihai
 
返还
 | 
485 
 | 
  		role:log("equip_wear", {
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
486
487
488
489
490
491
492
493
494 
 | 
  			hero_id = hero:getProperty("type"), --英雄ID
  			equip_id = data.id, --装备ID
  			equip_wear_action = data.act, --装备操作类型:装备:0,卸载:1
  			equip_wear_part = typ, --装备部位,记录部位ID
  			equip_wear_result = curAttr, --装备操作后结果,记录属性变化,json格式记录,{“aa”:1234,"bb":4567}
  			equip_wear_change = attrChange, --装备操作变化值,记录属性变化,记录正负值,json格式记录,{“aa”:1234,"bb":-45}
  			equip_wear_mode = isAuto and 0 or 1, --用以区分自动装备还是手动装备,自动记录为0,手动记录为1
  		})
  	end
 
 | 
43cc5f51
 
  gaofengduan
 
调整 equip 数据结构
 | 
495
496
497
498 
 | 
  	SendPacket(actionCodes.Hero_referEquipsRpc, "")
  	return true
  end
  
 
 | 
ee3ac0b5
 
  gaofengduan
 
fix magic
 | 
499
500 
 | 
  -- typ 位置,uid对应唯一符文,uid为0时为移除,不为0时无则装备,有则替换
  function _M.referRunesRpc(agent, data)
 
 | 
43cc5f51
 
  gaofengduan
 
调整 equip 数据结构
 | 
501
502
503
504
505
506 
 | 
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local hero = role.heros[msg.id]
  	if not hero then return 10 end
  	local runes = msg.runes
  	if not runes or not next(runes) then return 11 end
 
 | 
ee3ac0b5
 
  gaofengduan
 
fix magic
 | 
507 
 | 
  
 
 | 
f52efe51
 
  zhouhaihai
 
符文升级
 | 
508 
 | 
  	local used = {}
 
 | 
ee999bde
 
  zhouhaihai
 
零件优化
 | 
509
510
511
512 
 | 
  	for typ = 1, 6 do
  		if runes[typ] and runes[typ] ~= 0 then
  			local ownRune = role.runeBag[runes[typ]]
  			if not ownRune then return end
 
 | 
f52efe51
 
  zhouhaihai
 
符文升级
 | 
513
514
515
516
517
518
519
520
521
522
523
524
525
526 
 | 
  			if ownRune:getProperty("refer") ~= 0 then 
  				used[ownRune:getProperty("refer")] = used[ownRune:getProperty("refer")] or {}
  				used[ownRune:getProperty("refer")][runes[typ]] = 1
  			end
  		end
  	end
  
  	for cheroId, cIds in pairs(used) do
  		local chero = role.heros[cheroId] 
  		local hrunes = chero:getProperty("rune")
  		for slot, rId in pairs(hrunes:toNumMap()) do
  			if cIds[rId] then
  				hrunes = hrunes:delk(slot)
  			end
 
 | 
ee3ac0b5
 
  gaofengduan
 
fix magic
 | 
527 
 | 
  		end
 
 | 
f52efe51
 
  zhouhaihai
 
符文升级
 | 
528 
 | 
  		chero:updateProperty({field = "rune", value = hrunes})
 
 | 
ee3ac0b5
 
  gaofengduan
 
fix magic
 | 
529 
 | 
  	end
 
 | 
f52efe51
 
  zhouhaihai
 
符文升级
 | 
530 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
531
532
533 
 | 
  	local oldAttr = hero:getTotalAttrs()
  	local oldBattleV = hero:getProperty("battleV")
  	local wear = {}
 
 | 
ee999bde
 
  zhouhaihai
 
零件优化
 | 
534
535
536
537
538
539
540
541
542
543 
 | 
  	local curRune = hero:getProperty("rune")
  	for typ = 1, 6 do
  		if runes[typ] then
  			local cur = curRune:getv(typ, 0)
  			if cur ~= runes[typ] then
  				if runes[typ] == 0 then
  					curRune = curRune:delk(typ)
  				else
  					local newRune = role.runeBag[runes[typ]]
  					newRune:updateProperty({field = "refer",value = hero:getProperty("id")})
 
 | 
4ea1b5ac
 
  zhouhaihai
 
穿戴零件
 | 
544 
 | 
  					curRune = curRune:setv(typ, runes[typ])
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
545 
 | 
  					wear[runes[typ]] = typ
 
 | 
ee999bde
 
  zhouhaihai
 
零件优化
 | 
546 
 | 
  				end
 
 | 
ee3ac0b5
 
  gaofengduan
 
fix magic
 | 
547 
 | 
  
 
 | 
ee999bde
 
  zhouhaihai
 
零件优化
 | 
548
549
550
551
552
553 
 | 
  				if cur ~= 0 then
  					local oldR = role.runeBag[cur]
  					if oldR then
  						oldR:updateProperty({field = "refer",value = 0})
  					end
  				end
 
 | 
ee3ac0b5
 
  gaofengduan
 
fix magic
 | 
554 
 | 
  			end
 
 | 
ee3ac0b5
 
  gaofengduan
 
fix magic
 | 
555 
 | 
  		end
 
 | 
ee3ac0b5
 
  gaofengduan
 
fix magic
 | 
556 
 | 
  	end
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
557 
 | 
  
 
 | 
4ea1b5ac
 
  zhouhaihai
 
穿戴零件
 | 
558 
 | 
  	hero:updateProperty({field = "rune", value = curRune})
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
559
560
561
562 
 | 
  
  	local attrChange = getChangeAttrJson(oldAttr, hero:getTotalAttrs())
  	for runeId, typ in pairs(wear) do
  		local ownRune = role.runeBag[runeId]
 
 | 
43293781
 
  zhouhaihai
 
日志bug
 | 
563
564
565
566
567
568
569
570
571
572 
 | 
  		if ownRune then
  			role:log("hero_jewel", {
  				hero_id = hero:getProperty("type"), -- 英雄ID
  				hero_jewel_id = ownRune:getProperty("id"), -- 铭文ID
  				hero_jewel_part = typ, -- 铭文装备部位
  				hero_jewel_score = hero:getProperty("battleV"), -- 铭文装备后的英雄分值
  				hero_jewel_scorebefore = oldBattleV, -- 铭文装备前的英雄分值
  				hero_jewel_result = attrChange, -- 铭文装备后效果,可记录效果ID,或json格式记录提升效果,{攻击:20,闪避:20,……..}
  			})
  		end
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
573 
 | 
  	end
 
 | 
190e1415
 
  测试
 
英雄帖活动初始化
 | 
574
575 
 | 
  
  	role:checkTaskEnter("RuneQualityCollect", {})
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
576 
 | 
  	
 
 | 
ee3ac0b5
 
  gaofengduan
 
fix magic
 | 
577 
 | 
  	SendPacket(actionCodes.Hero_referRunesRpc, "")
 
 | 
43cc5f51
 
  gaofengduan
 
调整 equip 数据结构
 | 
578
579
580 
 | 
  	return true
  end
  
 
 | 
3b069d52
 
  zhouhaihai
 
增加获取 food 后台
 | 
581
582
583
584
585
586
587 
 | 
  function _M.createHeroRandomRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local itemId = msg.itemId
  	local itemData = csvdb["itemCsv"][itemId]
  	if not itemData or itemData.type ~= ItemType.HeroFCommon then return end
  	local cost = globalCsv.unit_fragment_cost[itemData.quality]
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
588 
 | 
  	if not cost or role:getItemCount(itemId) < cost then return 1 end
 
 | 
3b069d52
 
  zhouhaihai
 
增加获取 food 后台
 | 
589
590 
 | 
  
  	local randomData = csvdb["item_randomCsv"][tonumber(itemData.use_effect)]
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
591 
 | 
  	if not randomData then return 2 end
 
 | 
3b069d52
 
  zhouhaihai
 
增加获取 food 后台
 | 
592 
 | 
  
 
 | 
007af97e
 
  zhouhaihai
 
item_random 结构更改
 | 
593 
 | 
  	local temp = randomData.gift1:randWeight(true)
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
594 
 | 
  	if not temp or not next(temp) then return 3 end
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
595 
 | 
  
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
596 
 | 
  	role:costItems({[itemId] = cost}, {log = {desc = "createHeroRandom"}})
 
 | 
b8b1c164
 
  测试
 
扭蛋活动,万能碎片bug
 | 
597 
 | 
  	local reward, change = role:award({[temp[1]] = 1}, {log = {desc = "createHeroRandom"}})
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
598
599
600 
 | 
  
  
  	SendPacket(actionCodes.Hero_createHeroRandomRpc, MsgPack.pack(role:packReward(reward, change)))
 
 | 
3b069d52
 
  zhouhaihai
 
增加获取 food 后台
 | 
601
602
603 
 | 
  	return true
  end
  
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
604
605
606 
 | 
  function _M.getResetRewardRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
607
608
609
610
611
612
613 
 | 
  	
  	local hero = role.heros[msg.id]
  	if not hero then return end
  
  	local level = hero:getProperty("level")
  	local breakL = hero:getProperty("breakL")
  	local talent = hero:getProperty("talent")
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
614 
 | 
  	local heroCfgId = hero:getProperty("type")
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
615 
 | 
  
 
 | 
782ee57d
 
  测试
 
多编队功能
 | 
616 
 | 
  	local tmpLevel = level
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
617
618 
 | 
  	if level <= 1 and talent == "" then return end
  
 
 | 
fe296849
 
  测试
 
归还消耗指定道具或钻石
 | 
619 
 | 
  	local pay = true
 
 | 
782ee57d
 
  测试
 
多编队功能
 | 
620
621
622
623 
 | 
  	if level <= 60 then
  		pay = false
  	end
  
 
 | 
fe296849
 
  测试
 
归还消耗指定道具或钻石
 | 
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642 
 | 
  	if pay then
  		local costArr = globalCsv.unit_heroBack_cost:toArray(true, "=")
  		local itemCount = role:getItemCount(costArr[1])
  		local totalCost = {}
  		if itemCount >= costArr[2] then
  			totalCost[costArr[1]] = costArr[2]
  		else
  			local diamond = (costArr[2] - itemCount) * costArr[3]
  			if role:getItemCount(ItemId.Diamond) < diamond then
  				return 1
  			end
  			totalCost[costArr[1]] = itemCount
  			totalCost[ItemId.Diamond] = diamond
  		end
  
  		--if pay and not role:costDiamond({count = globalCsv.unit_heroBack_cost or 200, log = {desc = "resetHero", int1 = msg.id}}) then
  		--	return 1
  		--end
  		role:costItems(totalCost, {log = {desc = "resetHero", int1 = msg.id}})
 
 | 
782ee57d
 
  测试
 
多编队功能
 | 
643
644 
 | 
  	end
  
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660 
 | 
  	local reward = {}
  	while level > 1 do
  		local curData = csvdb["unit_expCsv"][level - 1]
  		reward[ItemId.Exp] = (reward[ItemId.Exp] or 0) + curData.exp
  		reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + curData.gold
  		level = level - 1
  	end
  
  	while breakL > 0 do
  		local curData = csvdb["unit_breakCsv"][breakL - 1]
  		reward[ItemId.BreakCost] = (reward[ItemId.BreakCost] or 0) + curData.cost
  		reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + curData.gold
  		breakL = breakL - 1
  	end
  
  	local stage = talent:getv(0, 1)
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
661
662 
 | 
  	local curTalentLvl = talent:getv(1, 1)
  	--local tlevel = {talent:getv(1, 0), talent:getv(2, 0), talent:getv(3, 0), talent:getv(4, 0)}
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
663 
 | 
  
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
664 
 | 
  	while stage > 0 do
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
665
666
667 
 | 
  		local curData = csvdb["unit_talent_"..heroCfgId.."Csv"][stage]
  		for lvl = 1, curTalentLvl - 1 do
  			local talentData = curData[lvl]
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
668 
 | 
  			for itemId, count in pairs(talentData.money:toNumMap()) do
 
 | 
96d591f7
 
  测试
 
天赋升级修改,增加英雄信赖
 | 
669 
 | 
  				reward[itemId] = (reward[itemId] or 0) + count
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
670
671
672 
 | 
  			end
  		end
  		stage = stage - 1
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
673
674 
 | 
  	end
  
 
 | 
c3a70cde
 
  zhouhaihai
 
返还
 | 
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694 
 | 
  	local equip = hero:getProperty("equip")
  	for k, v in pairs(equip:toNumMap()) do
  		role:addEquip(k, v, 1, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
  	end
  
  	local rune = hero:getProperty("rune")
  	for _, id in pairs(rune:toNumMap()) do
  		local curRune = role.runeBag[id]
  		if curRune then
  			curRune:updateProperty({field = "refer", value = 0})
  		end
  	end
  
  	hero:updateProperties({
  		level = level,
  		breakL = breakL,
  		talent = "",
  		equip = "",
  		rune = "",
  	})
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
695 
 | 
  	hero:mylog({desc = "resetHero"})
 
 | 
782ee57d
 
  测试
 
多编队功能
 | 
696 
 | 
  	
 
 | 
fe296849
 
  测试
 
归还消耗指定道具或钻石
 | 
697
698 
 | 
  	--local coef = globalCsv.unit_back_discount
  	--coef = (pay or tmpLevel <= 60) and  1 or coef
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
699 
 | 
  	for itemId, count in pairs(reward) do
 
 | 
fe296849
 
  测试
 
归还消耗指定道具或钻石
 | 
700 
 | 
  		reward[itemId] = count
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
701 
 | 
  	end
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
702
703 
 | 
  	local change
  	reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
704 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
705 
 | 
  	role:log("hero_recycle", {
 
 | 
c3a70cde
 
  zhouhaihai
 
返还
 | 
706 
 | 
  		hero_recycle_list = {[hero:getProperty("type")] = 1}, -- 回收的英雄id列表,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"}
 
 | 
887c1843
 
  zhouhaihai
 
日志新一批
 | 
707 
 | 
  		hero_recycle_reward = reward, -- 回收后获得的奖励,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"}
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
708
709 
 | 
  		hero_recycle_cnt = 1, -- 总回收英雄量
  	})
 
 | 
7bb30dca
 
  zhouhaihai
 
修改发奖
 | 
710 
 | 
  	SendPacket(actionCodes.Hero_getResetRewardRpc, MsgPack.pack(role:packReward(reward, change)))
 
 | 
36482c8b
 
  zhouhaihai
 
回收养成
 | 
711
712
713 
 | 
  	return true
  end
  
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
714
715
716
717 
 | 
  function _M.drawHeroRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
 
 | 
accf94c4
 
  测试
 
活动以类型标识,修改双倍活动bug
 | 
718 
 | 
  	if not role:isFuncUnlock(FuncUnlock.GetHero) then return 1 end
 
 | 
86584add
 
  测试
 
新手卡池,心愿单卡池
 | 
719 
 | 
  	local btype = msg.pool	-- 1 2 3 4 5	卡池类型  4新手卡池 5心愿卡池
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
720
721 
 | 
  	local subType = msg.subType	or 1-- 定向卡池需要传 子类型
  	local drawType = msg.type -- 1 单抽 2 十连
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
722
723 
 | 
  	if btype ~= 1 then
  		subType = 1
 
 | 
86584add
 
  测试
 
新手卡池,心愿单卡池
 | 
724
725
726 
 | 
  		if btype == 4 and role:getProperty("newerDraw") >= 10 then
  			subType = 2
  		end
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
727 
 | 
  	end
 
 | 
8cd3770f
 
  测试
 
挂机关卡可以选择,经验金币根据最高...
 | 
728
729
730 
 | 
  
  	if btype == 1 then
  		-- 判断定向卡池活动开启
 
 | 
f7a55da3
 
  测试
 
新增cb2临时限时礼包
 | 
731 
 | 
  		if not role.activity:isOpen("RaceDraw") then
 
 | 
8cd3770f
 
  测试
 
挂机关卡可以选择,经验金币根据最高...
 | 
732
733
734 
 | 
  			return
  		end
  	end
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
735
736 
 | 
  	
  	local buildTypeData = csvdb["build_typeCsv"][btype]
 
 | 
accf94c4
 
  测试
 
活动以类型标识,修改双倍活动bug
 | 
737 
 | 
  	if not buildTypeData then return 2 end
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
738
739 
 | 
  
  	local drawCount = {1, 10} -- 抽取次数
 
 | 
accf94c4
 
  测试
 
活动以类型标识,修改双倍活动bug
 | 
740 
 | 
  	if not drawCount[drawType] then return 3 end
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
741 
 | 
  
 
 | 
93f6e69b
 
  测试
 
拾荒选择时间,抽卡增加sr保底
 | 
742
743
744 
 | 
  	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
  	local floorHeroCount = role:getProperty("floorHero")[btype] or 0
  
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
745
746 
 | 
  	-- 计算抽卡消耗品
  	local cost = {}
 
 | 
86584add
 
  测试
 
新手卡池,心愿单卡池
 | 
747
748
749
750
751
752
753
754 
 | 
  	if buildTypeData["draw_coin_1"] == "" then
  		return 11
  	end
  	local diamondCost = buildTypeData["draw_coin_1"]:toArray(true, "=")
  
  	local isEnough = true
  	for _, costType in ipairs({"draw_card_"}) do
  		costType = costType..drawCount[drawType]
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
755
756
757 
 | 
  		if buildTypeData[costType] ~= "" then
  			local curCost = buildTypeData[costType]:toArray(true, "=")
  			local hadCount = role:getItemCount(curCost[1])
 
 | 
86584add
 
  测试
 
新手卡池,心愿单卡池
 | 
758
759 
 | 
  			if hadCount >= curCost[2] then
  				cost[curCost[1]] = curCost[2]
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
760 
 | 
  				break
 
 | 
86584add
 
  测试
 
新手卡池,心愿单卡池
 | 
761
762
763
764
765
766
767
768 
 | 
  			else
  				cost[curCost[1]] = hadCount
  				diamondCost[2] = (curCost[2] - hadCount) * diamondCost[2]
  				if not role:checkItemEnough({[diamondCost[1]]=diamondCost[2]}) then
  					isEnough = false
  					break
  				end
  				cost[diamondCost[1]] = diamondCost[2]
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
769
770
771 
 | 
  			end
  		end
  	end
 
 | 
86584add
 
  测试
 
新手卡池,心愿单卡池
 | 
772 
 | 
  	if isEnough == false then -- 钱不够
 
 | 
accf94c4
 
  测试
 
活动以类型标识,修改双倍活动bug
 | 
773 
 | 
  		return 4
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
774
775
776
777
778 
 | 
  	end
  
  	-- 抽取的池子
  	local poolMap = buildTypeData["pool"]:toNumMap()
  	local poolId = poolMap[subType]
 
 | 
accf94c4
 
  测试
 
活动以类型标识,修改双倍活动bug
 | 
779 
 | 
  	if not poolId then return 5 end
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
780
781
782
783
784
785 
 | 
  	
  	--判断定向卡池是否开启
  	if btype == 1 then
  			if not role:isTimeResetOpen(TimeReset["DrawType" .. subType]) then
  				local unlockPool = role.dailyData:getProperty("unlockPool")
  				if not unlockPool[subType] then
 
 | 
accf94c4
 
  测试
 
活动以类型标识,修改双倍活动bug
 | 
786 
 | 
  					return 6
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
787
788
789
790
791 
 | 
  				end
  			end
  	end
  
  	--TODO 活动覆盖
 
 | 
93f6e69b
 
  测试
 
拾荒选择时间,抽卡增加sr保底
 | 
792
793
794
795 
 | 
  	local actPoolId = role.activity:getActivityPool(btype, subType)
  	if actPoolId ~= 0 then
  		poolId = actPoolId
  	end
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
796
797 
 | 
  
  	local unitPool = csvdb["build_unitCsv"][poolId]
 
 | 
accf94c4
 
  测试
 
活动以类型标识,修改双倍活动bug
 | 
798 
 | 
  	if not unitPool then return 7 end
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
799
800
801 
 | 
  
  	-- 开始抽
  	local resultPool = {}
 
 | 
93f6e69b
 
  测试
 
拾荒选择时间,抽卡增加sr保底
 | 
802 
 | 
  	local function fillDrawPool(isFloorBack)
 
 | 
accf94c4
 
  测试
 
活动以类型标识,修改双倍活动bug
 | 
803 
 | 
  		local condition = {"rare"}
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
804
805 
 | 
  		local values = {}
  
 
 | 
93f6e69b
 
  测试
 
拾荒选择时间,抽卡增加sr保底
 | 
806 
 | 
  
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821 
 | 
  		for idx, field in ipairs(condition) do
  			if not values[idx] then
  				local lpool = {}
  				local curIdx = 1
  				while unitPool[field .. "_" .. curIdx] do
  					lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
  					curIdx = curIdx + 1
  				end
  
  				if next(lpool) then
  					values[idx] =  math.randWeight(lpool, 1)
  				end
  			end
  		end
  
 
 | 
4839b94d
 
  测试
 
增加抽卡英雄up
 | 
822
823
824
825
826
827
828
829
830
831
832
833
834 
 | 
  		local weight = 0
  		local up_pool = nil
  		local rand_v = math.randomInt(1, 100)
  		if values[1] == HeroQuality.SR then
  			weight = unitPool["up_sr_weight"]
  			up_pool = unitPool["up_sr_id"]
  		elseif values[1] == HeroQuality.SSR then
  			weight = unitPool["up_ssr_weight"]
  			up_pool = unitPool["up_ssr_id"]
  		end
  		--print(poolId, rand_v, weight, up_pool, values[1])
  		if rand_v < weight and up_pool then
  			up_pool = up_pool:toArray(true, "=")
 
 | 
86584add
 
  测试
 
新手卡池,心愿单卡池
 | 
835
836
837 
 | 
  			if btype == 5 then -- 爱心卡池,使用玩家设置的备选池子
  				up_pool = role:getProperty("wishPool")
  			end
 
 | 
4839b94d
 
  测试
 
增加抽卡英雄up
 | 
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855 
 | 
  			for k, v in ipairs(up_pool) do
  				resultPool[v] = {1}
  			end
  		else
  			for itemId, oneData in pairs(isFloorBack and csvdb["build_floorCsv"] or csvdb["build_poolCsv"]) do
  				local pool_str = "pool_" .. poolId
  				if oneData[pool_str] and oneData[pool_str] ~= "" then
  					local itemData = csvdb["itemCsv"][itemId]
  					while itemData do
  						if itemData.type ~= ItemType.Hero then break end
  						local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
  						if not heroData then break end
  						local ok = true
  						-- 保底是全随机,不用比较类型
  						if not isFloorBack then
  							for idx, field in ipairs(condition) do
  								if heroData[field] ~= values[idx] then ok = false break end
  							end
 
 | 
bb10924f
 
  测试
 
10连保底使用池子全随机
 | 
856 
 | 
  						end
 
 | 
4839b94d
 
  测试
 
增加抽卡英雄up
 | 
857
858
859
860
861 
 | 
  						if not ok then break end
  						if oneData[pool_str] > 0 then
  							resultPool[itemId] = {oneData[pool_str]}  -- itemId, count, 概率
  						end
  						break
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
862 
 | 
  					end
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
863
864
865
866
867 
 | 
  				end
  			end
  		end
  	end
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
868 
 | 
  	role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
869 
 | 
  
 
 | 
00bf6029
 
  测试
 
限时礼包,抽卡ssr广播
 | 
870 
 | 
  	local guideHero = nil
 
 | 
a5b98c30
 
  chenyueqi
 
引导调整
 | 
871
872 
 | 
  	if role:getProperty("newerGuide") == "8=1" then
  		guideHero = globalCsv.newdraw_hero_item_id or 503
 
 | 
16f5fa68
 
  chenyueqi
 
引导招募的引导改动被回退
 | 
873
874 
 | 
  	end
  
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
875
876 
 | 
  	local ssrCount = 0
  	local reward = {}
 
 | 
37bb4611
 
  测试
 
付费签到,抽卡阶段奖励,探索指令
 | 
877 
 | 
  	local logReward = {}
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
878 
 | 
  	for i = 1, drawCount[drawType] do
 
 | 
93f6e69b
 
  测试
 
拾荒选择时间,抽卡增加sr保底
 | 
879
880 
 | 
  		floorHeroCount = floorHeroCount + 1
  		local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
881 
 | 
  		resultPool = {}
 
 | 
93f6e69b
 
  测试
 
拾荒选择时间,抽卡增加sr保底
 | 
882
883
884 
 | 
  		fillDrawPool(isFloorBack)
  		if not next(resultPool) then
  			skynet.error("random pool error, poolId:" .. poolId)
 
 | 
accf94c4
 
  测试
 
活动以类型标识,修改双倍活动bug
 | 
885 
 | 
  			return 8
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
886
887 
 | 
  		end
  
 
 | 
16f5fa68
 
  chenyueqi
 
引导招募的引导改动被回退
 | 
888
889
890 
 | 
  		local itemId = math.randWeight(resultPool, 1)
  		if guideHero then
  			itemId = guideHero
 
 | 
16f5fa68
 
  chenyueqi
 
引导招募的引导改动被回退
 | 
891
892 
 | 
  		end
  
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
893
894
895 
 | 
  		local itemData = csvdb["itemCsv"][itemId]
  		if itemData.quality == HeroQuality.SSR then
  			ssrCount = ssrCount + 1
 
 | 
00bf6029
 
  测试
 
限时礼包,抽卡ssr广播
 | 
896 
 | 
  			if not guideHero then
 
 | 
4839b94d
 
  测试
 
增加抽卡英雄up
 | 
897 
 | 
  				-- 广播获得ssr英雄
 
 | 
00bf6029
 
  测试
 
限时礼包,抽卡ssr广播
 | 
898
899
900 
 | 
  				local ntf = {heroId = itemData.id - ItemStartId.Hero, nick = role:getProperty("name")}
  				mcast_util.pub_world(actionCodes.Role_broadGetSSR, MsgPack.pack(ntf))
  			end
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
901
902 
 | 
  		end
  
 
 | 
86584add
 
  测试
 
新手卡池,心愿单卡池
 | 
903
904
905
906
907
908
909
910 
 | 
  		if btype == 4 and role:getProperty("newerDraw") == 0 then		-- 新手卡池
  			if itemData.quality == HeroQuality.SSR then
  				floorHeroCount = 0
  			end
  		else
  			if itemData.quality >= HeroQuality.SR then
  				floorHeroCount = 0
  			end
 
 | 
93f6e69b
 
  测试
 
拾荒选择时间,抽卡增加sr保底
 | 
911
912 
 | 
  		end
  
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
913
914
915
916 
 | 
  		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
  			local fragId = itemData.id - ItemStartId.Hero
  			local heroData = csvdb["unitCsv"][fragId]
  			local count = globalCsv.draw_unit_tofragment[heroData.rare]
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
917 
 | 
  			role:award({[fragId] = count}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
 
 | 
b5481708
 
  zhouhaihai
 
保底日志
 | 
918 
 | 
  			logReward[fragId] = (logReward[fragId] or 0) + count
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
919
920 
 | 
  			table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
  		else
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
921 
 | 
  			role:award({[itemId] = 1}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
 
 | 
b5481708
 
  zhouhaihai
 
保底日志
 | 
922 
 | 
  			logReward[itemId] = (logReward[itemId] or 0) + 1
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
923
924
925
926 
 | 
  			table.insert(reward, {id = itemId, count = 1})
  		end
  	end
  
 
 | 
93f6e69b
 
  测试
 
拾荒选择时间,抽卡增加sr保底
 | 
927
928
929
930
931
932 
 | 
  	if draw_floor_back_counts then
  		local floorHero = role:getProperty("floorHero")
  		floorHero[btype] = floorHeroCount
  		role:setProperty("floorHero", floorHero)
  	end
  
 
 | 
86584add
 
  测试
 
新手卡池,心愿单卡池
 | 
933
934
935
936
937 
 | 
  	if btype == 4 then
  		local newCount = role:getProperty("newerDraw")
  		role:updateProperty({field="newerDraw", value = newCount + drawCount[drawType]})
  	end
  
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
938
939
940
941 
 | 
  	role:checkTaskEnter("DrawHero", {pool = btype, count = drawCount[drawType]})
  	if ssrCount > 0 then
  		role:checkTaskEnter("DrawSSR", {count = ssrCount})
  	end
 
 | 
a5b98c30
 
  chenyueqi
 
引导调整
 | 
942 
 | 
  	role:finishGuide(8)
 
 | 
b5481708
 
  zhouhaihai
 
保底日志
 | 
943 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
944
945
946
947
948 
 | 
  	role:log("gacha", {
  		gacha_id = poolId, -- 卡池ID
  		gacha_type = btype, -- 卡池类型
  		gacha_up = 0, -- 卡池UP角色
  		gacha_times = drawCount[drawType], -- 抽卡次数
 
 | 
b5481708
 
  zhouhaihai
 
保底日志
 | 
949 
 | 
  		gacha_reward = logReward, -- 抽卡结果,建议使用json格式记录。示例:{ "XX": "1", "XXX": "3"}
 
 | 
887c1843
 
  zhouhaihai
 
日志新一批
 | 
950 
 | 
  		currency = cost, -- 购买道具消耗的货币
 
 | 
b5481708
 
  zhouhaihai
 
保底日志
 | 
951 
 | 
  		gacha_cnt = floorHeroCount,
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
952 
 | 
  	})
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
953 
 | 
  	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
 
 | 
37bb4611
 
  测试
 
付费签到,抽卡阶段奖励,探索指令
 | 
954
955
956
957
958
959 
 | 
  
  	if btype == 1 or btype == 2 then
  		-- 达到一定次数,给响应奖励
  		local oldVal = role:getProperty("repayHero") or 0
  		local newVal = oldVal + drawCount[drawType]
  		local drawCardReward, val = role:getDrawCardExtraReward(oldVal, newVal)
 
 | 
37bb4611
 
  测试
 
付费签到,抽卡阶段奖励,探索指令
 | 
960
961 
 | 
  		-- 空字符穿代表直接给英雄  走以前repayHeroRpc
  		if drawCardReward == "" then
 
 | 
c8d4058c
 
  测试
 
保底机制修改,200次出未拥有的永雄
 | 
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983 
 | 
  			local repayHeroMaxCount = role:getProperty("repayMaxC") or 0
  			repayHeroMaxCount = repayHeroMaxCount + 1
  
  			role:updateProperty({field = "repayMaxC", value = repayHeroMaxCount})
  			local even = repayHeroMaxCount % 2
  			local id = 0
  			if even == 1 then
  				id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
  			else
  				local giftHeroSet = {}
  				for gid, cfg in pairs(csvdb["build_giftCsv"]) do
  					if cfg["pool_1"] ~= 0 and not role:isHaveHero(gid - ItemStartId.Hero) then
  						giftHeroSet[gid] = {1}
  					end
  				end
  				if next(giftHeroSet) then
  					id = math.randWeight(giftHeroSet, 1)
  				end
  			end
  			if id == 0 then
  				id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
  			end
 
 | 
37bb4611
 
  测试
 
付费签到,抽卡阶段奖励,探索指令
 | 
984 
 | 
  
 
 | 
e0290d8e
 
  测试
 
修改引导, 抽卡阶段奖励修改
 | 
985 
 | 
  			local r,change = {}
 
 | 
37bb4611
 
  测试
 
付费签到,抽卡阶段奖励,探索指令
 | 
986 
 | 
  			local itemData = csvdb["itemCsv"][id]
 
 | 
e0290d8e
 
  测试
 
修改引导, 抽卡阶段奖励修改
 | 
987
988
989
990
991
992
993
994
995
996 
 | 
  			--if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
  			--	local fragId = itemData.id - ItemStartId.Hero
  			--	local heroData = csvdb["unitCsv"][fragId]
  			--	local count = globalCsv.draw_unit_tofragment[heroData.rare]
  			--	r, change = role:award({[fragId] = count}, {log = {desc = "drawHeroExtraReward"}})
  			--	--r = {id = fragId, count = count, from = id, fcount = 1}
  			--else
  			r, change = role:award({[id] = 1}, {log = {desc = "drawHeroExtraReward"}})
  			--end
  			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
 
 | 
37bb4611
 
  测试
 
付费签到,抽卡阶段奖励,探索指令
 | 
997 
 | 
  		elseif drawCardReward and drawCardReward ~= "" then
 
 | 
ceef9d00
 
  测试
 
抽卡50次保底英雄转换碎片bug
 | 
998
999
1000 
 | 
  			local r,change = {}
  			r, change = role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
  			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
 
 | 
37bb4611
 
  测试
 
付费签到,抽卡阶段奖励,探索指令
 | 
1001
1002
1003 
 | 
  		end
  		role:updateProperty({field = "repayHero", value = val})
  	end
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
1004
1005
1006 
 | 
  	return true
  end
  
 
 | 
317a46a9
 
  测试
 
添加特权卡
 | 
1007
1008 
 | 
  function _M.repayHeroRpc(agent, data)
  	local role = agent.role
 
 | 
a35233c6
 
  zhouhaihai
 
保底和回馈
 | 
1009 
 | 
  
 
 | 
317a46a9
 
  测试
 
添加特权卡
 | 
1010 
 | 
  	local repayHero = role:getProperty("repayHero")
 
 | 
fb3d084d
 
  测试
 
月卡赛季卡发送邮件奖励
 | 
1011
1012 
 | 
  	local cnt = globalCsv.draw_times_to_get_ssr or 100
  	if repayHero < cnt then
 
 | 
317a46a9
 
  测试
 
添加特权卡
 | 
1013
1014 
 | 
  		return
  	end
 
 | 
fb3d084d
 
  测试
 
月卡赛季卡发送邮件奖励
 | 
1015 
 | 
  	local result = repayHero - cnt
 
 | 
a35233c6
 
  zhouhaihai
 
保底和回馈
 | 
1016 
 | 
  
 
 | 
317a46a9
 
  测试
 
添加特权卡
 | 
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031 
 | 
  	role:updateProperty({field = "repayHero", value = result})
  	local id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
  
  	local reward = {}
  	local itemData = csvdb["itemCsv"][id]
  	if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
  		local fragId = itemData.id - ItemStartId.Hero
  		local heroData = csvdb["unitCsv"][fragId]
  		local count = globalCsv.draw_unit_tofragment[heroData.rare]
  		role:award({[fragId] = count}, {log = {desc = "heroRepay"}})
  		reward = {id = fragId, count = count, from = id, fcount = 1}
  	else
  		role:award({[id] = 1}, {log = {desc = "heroRepay"}})
  		reward = {id = id, count = 1}
  	end
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
1032 
 | 
  	role:mylog("hero_action", {desc = "heroRepay", int1=result})
 
 | 
317a46a9
 
  测试
 
添加特权卡
 | 
1033
1034
1035 
 | 
  	SendPacket(actionCodes.Hero_repayHeroRpc, MsgPack.pack({reward = reward}))
  	return true
  end
 
 | 
a35233c6
 
  zhouhaihai
 
保底和回馈
 | 
1036 
 | 
  
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054 
 | 
  function _M.unlockPoolRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	if not role:isFuncUnlock(FuncUnlock.GetHero) then return end
  	local type = msg.type -- 指定定向卡池需要类型  1, 2, 3
  	local needCost = true
  	--当前开启的类型不用解锁
  	if role:isTimeResetOpen(TimeReset["DrawType" .. type]) then
  		needCost = false
  	end
  	--已经解锁的不需要重复解锁
  	local unlockPool = role.dailyData:getProperty("unlockPool")
  	if unlockPool[type] then
  		needCost = false
  	end
  
  	if needCost then
 
 | 
f3eb34b1
 
  测试
 
删除无用日志
 | 
1055 
 | 
  		if not role:costDiamond({count = globalCsv.draw_unlock_pool_diamond or 300, log = {desc = "unlockPool", int1 = type}}) then
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
1056
1057
1058
1059
1060
1061
1062
1063 
 | 
  			return
  		end
  	end
  
  	unlockPool[type] = 1
  	role.dailyData:updateProperty({field="unlockPool", value = unlockPool})
  	role.dailyData:updateProperty({field="curPool", value = type})
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
1064 
 | 
  	role:mylog("hero_action", {desc = "unlockPool", int1=type})
 
 | 
1a0b3c56
 
  测试
 
抽卡保底,切换定向卡池
 | 
1065
1066
1067
1068 
 | 
  	SendPacket(actionCodes.Hero_unlockPoolRpc, MsgPack.pack({}))
  	return true
  end
  
 
 | 
51d9d20b
 
  测试
 
付费签到,应用市场反馈
 | 
1069 
 | 
  function _M.changeCrown(agent, data)
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
1070
1071
1072
1073
1074 
 | 
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local heroType = msg.heroType
  
 
 | 
4c7d396c
 
  zhouhaihai
 
不回复 更改看板娘
 | 
1075 
 | 
  	if not role:isHaveHero(heroType) then return true end
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
1076
1077
1078
1079
1080 
 | 
  	role:setProperty("crown", heroType)
  
  	role:log("hero_show", {
  		hero_id = heroType,
  	})
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
1081
1082
1083 
 | 
  	return true
  end
  
 
 | 
16634605
 
  测试
 
多队挂机,天赋道具合成
 | 
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102 
 | 
  function _M.itemComposeRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local itemId = msg.id
  	local count = msg.count
  	if not csvdb["itemCsv"][itemId] then return 1 end
  	local config = csvdb["item_processCsv"][itemId]
  	if not config then return 2 end
  
  	local cost = config.cost:toNumMap()
  	if not role:checkItemEnough(cost) then return 2 end
  	role:costItems(cost, {log = {desc = "itemCompose", int1 = itemId, int2 = count}})
  	role:award({[itemId] = count}, {log = {desc = "itemCompose"}})
  
  	SendPacket(actionCodes.Hero_itemComposeRpc, "")
  	return true
  end
  
 
 | 
86584add
 
  测试
 
新手卡池,心愿单卡池
 | 
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130 
 | 
  function _M.setWishPoolRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local heros = msg.heros
  	if #heros > 3 then return 1 end
  
  	for _, heroId in pairs(heros) do
  		local cfg = csvdb["build_poolCsv"][heroId]
  		if not cfg then return 2 end
  
  		local buildTypeData = csvdb["build_typeCsv"][5]
  		if not buildTypeData then return 3 end
  		local poolMap = buildTypeData["pool"]:toNumMap()
  		local poolId = poolMap[1]
  		if not poolId then return 4 end
  
  		if cfg["pool_"..poolId] == 0 then
  			return 5
  		end
  	end
  
  	role:updateProperty({field="wishPool", value = heros})
  
  	SendPacket(actionCodes.Hero_setWishPoolRpc, "")
  	return true
  end
  
 
 | 
1af7ada5
 
  测试
 
fix confict
 | 
1131 
 | 
  return _M
 
 |