Merge branch 'develop' into player

* develop: twd 拾荒引导结束要设定引导步骤为成就引导

Merge branch 'develop' into player
* develop: twd 拾荒引导结束要设定引导步骤为成就引导
zhouhaihai
2 parents e3954226 83e959c0
Showing 3 changed files with 6 additions and 1 deletions Show diff stats
src/actions/AdvAction.lua
src/adv/Adv.lua
src/models/RolePlugin.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
@@ -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()
  
@@ -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'
 		})