Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

liuzujun
2 parents 51d9d20b 83e959c0
Showing 6 changed files with 37 additions and 14 deletions Show diff stats
src/actions/AdvAction.lua
src/actions/HeroAction.lua
src/adv/Adv.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/Rune.lua
@@ -614,6 +614,7 @@ function _M.exitAdvRpc(agent, data)
 	local role = agent.role
 	-- local msg = MsgPack.unpack(data)
 	if not isCanContinue(role) then return end
+	-- 冒险中途退出的时候要把引导步骤设定到成就引导
 	if not role:checkOverGuide(57) then
 		role:saveGuide(57,1,true)
 	end
@@ -499,7 +499,7 @@ function _M.referEquipsRpc(agent, data)
 	local curAttr = hero:getTotalAttrs()
 	local attrChange = getChangeAttrJson(oldAttr, curAttr)
 	for typ, data in pairs(wear) do
-		role:log("hero_jewel", {
+		role:log("equip_wear", {
 			hero_id = hero:getProperty("type"), --英雄ID
 			equip_id = data.id, --装备ID
 			equip_wear_action = data.act, --装备操作类型：装备：0，卸载：1
@@ -671,9 +671,26 @@ function _M.getResetRewardRpc(agent, data)
 		end
 	end
-	hero:updateProperty({field = "level", value = level})
-	hero:updateProperty({field = "breakL", value = breakL})
-	hero:updateProperty({field = "talent", value = ""})
+	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 = "",
+	})
 	for itemId, count in pairs(reward) do
 		reward[itemId] = math.floor(count * globalCsv.unit_back_discount)
@@ -682,7 +699,7 @@ function _M.getResetRewardRpc(agent, data)
 	reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
 	role:log("hero_recycle", {
-		hero_recycle_list = hero:getProperty("type"), -- 回收的英雄id列表，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		hero_recycle_list = {[hero:getProperty("type")] = 1}, -- 回收的英雄id列表，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 		hero_recycle_reward = reward, -- 回收后获得的奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 		hero_recycle_cnt = 1, -- 总回收英雄量
 	})
@@ -789,6 +789,10 @@ function Adv:over(success, rewardRatio, overType)
 				red:hset(RANK_ADV_INFO, roleId,  MsgPack.pack(curInfo))
 			end)
 		end
+		-- 通关的时候要把引导步骤设定到成就引导
+		if not role:checkOverGuide(57) then
+			role:saveGuide(57,1,true)
+		end
 	end
 	self:clearAdvUnlockCache()
@@ -101,6 +101,7 @@ local ItemReason = {
 	resetHero = 1207, -- 重置养成
 	unlockPool = 1208, -- 解锁英雄定向抽卡池
 	downloadCv = 1209, -- 下载 cv包奖励
+	refer = 1210, -- 穿戴
 }
@@ -1413,7 +1413,7 @@ function RolePlugin.bind(Role)
 			item_number = 1, -- 购买的道具数量
 			item_level = 1, -- 购买的道具等级
 			order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
-			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
+			order_currency = "TWD", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
 			order_type = order_type, -- 订单类型，首充记录为1，否则为0
 			order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
 		})
@@ -27,15 +27,15 @@ function Rune:notifyUpdateProperty(field, newValue, oldValue)
 end
 function Rune:log(contents)
-	contents = contents or {}
-	if contents["cint1"] or contents["cint2"] or contents["cint3"] then
-		print("heroLog error log have cint1 or cint2 or cint3 ", debug.traceback())
-	end
-	contents["cint1"] = self:getProperty("uid")
-	contents["cint2"] = self:getProperty("type")
-	contents["cint3"] = self:getProperty("id")
+	-- contents = contents or {}
+	-- if contents["cint1"] or contents["cint2"] or contents["cint3"] then
+	-- 	print("heroLog error log have cint1 or cint2 or cint3 ", debug.traceback())
+	-- end
+	-- contents["cint1"] = self:getProperty("uid")
+	-- contents["cint2"] = self:getProperty("type")
+	-- contents["cint3"] = self:getProperty("id")
-	self.owner:log("rune_action", contents)
+	-- self.owner:log("rune_action", contents)
 end
 function Rune:notifyUpdateProperties(params)