Commit f715b4bc8ff41bf7d1951f2bdee1dc24d15e7c11
Merge branch 'develop' into player
* develop: twd 拾荒引导结束要设定引导步骤为成就引导
Showing
3 changed files
with
6 additions
and
1 deletions
Show diff stats
src/actions/AdvAction.lua
| @@ -614,6 +614,7 @@ function _M.exitAdvRpc(agent, data) | @@ -614,6 +614,7 @@ function _M.exitAdvRpc(agent, data) | ||
| 614 | local role = agent.role | 614 | local role = agent.role |
| 615 | -- local msg = MsgPack.unpack(data) | 615 | -- local msg = MsgPack.unpack(data) |
| 616 | if not isCanContinue(role) then return end | 616 | if not isCanContinue(role) then return end |
| 617 | + -- 冒险中途退出的时候要把引导步骤设定到成就引导 | ||
| 617 | if not role:checkOverGuide(57) then | 618 | if not role:checkOverGuide(57) then |
| 618 | role:saveGuide(57,1,true) | 619 | role:saveGuide(57,1,true) |
| 619 | end | 620 | end |
src/adv/Adv.lua
| @@ -789,6 +789,10 @@ function Adv:over(success, rewardRatio, overType) | @@ -789,6 +789,10 @@ function Adv:over(success, rewardRatio, overType) | ||
| 789 | red:hset(RANK_ADV_INFO, roleId, MsgPack.pack(curInfo)) | 789 | red:hset(RANK_ADV_INFO, roleId, MsgPack.pack(curInfo)) |
| 790 | end) | 790 | end) |
| 791 | end | 791 | end |
| 792 | + -- 通关的时候要把引导步骤设定到成就引导 | ||
| 793 | + if not role:checkOverGuide(57) then | ||
| 794 | + role:saveGuide(57,1,true) | ||
| 795 | + end | ||
| 792 | end | 796 | end |
| 793 | self:clearAdvUnlockCache() | 797 | self:clearAdvUnlockCache() |
| 794 | 798 |
src/models/RolePlugin.lua
| @@ -1413,7 +1413,7 @@ function RolePlugin.bind(Role) | @@ -1413,7 +1413,7 @@ function RolePlugin.bind(Role) | ||
| 1413 | item_number = 1, -- 购买的道具数量 | 1413 | item_number = 1, -- 购买的道具数量 |
| 1414 | item_level = 1, -- 购买的道具等级 | 1414 | item_level = 1, -- 购买的道具等级 |
| 1415 | order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee' | 1415 | order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee' |
| 1416 | - order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范 | 1416 | + order_currency = "TWD", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范 |
| 1417 | order_type = order_type, -- 订单类型，首充记录为1，否则为0 | 1417 | order_type = order_type, -- 订单类型，首充记录为1，否则为0 |
| 1418 | order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no' | 1418 | order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no' |
| 1419 | }) | 1419 | }) |