wasteland / server

Commit 0dd35d1c401a0ddfd2a5aa43d2795fabe78a6300

Authored by zhouhaihai
2 parents 1ee53494 66347c66

Merge branch 'develop' into qa 

* develop:
  探索指令调试完成
Showing 1 changed file with 6 additions and 5 deletions   Show diff stats
Inline Side-by-side
src/actions/StoreAction.lua
  Show/Hide comments   View file @0dd35d1
@@ -389,10 +389,10 @@ function _M.getExploreCommandRewardRpc(agent, data) @@ -389,10 +389,10 @@ function _M.getExploreCommandRewardRpc(agent, data)
389 local config = csvdb[tab_name][id] 389 local config = csvdb[tab_name][id]
390 if not config then return end 390 if not config then return end
391 391
392 - local bpInfo = role.storeData:getProperty("bpInfo") or {} 392 + local bpInfo = role.storeData:getProperty("bpInfo") or {}
393 local info = bpInfo[id] or {} 393 local info = bpInfo[id] or {}
394 local flag = info["flag"] or 0 394 local flag = info["flag"] or 0
395 - if flag == 0 then return 1 end 395 + --if flag == 0 then return 1 end
396 396
397 local freeRecord = info["fr"] or "" 397 local freeRecord = info["fr"] or ""
398 local buyRecord = info["br"] or "" 398 local buyRecord = info["br"] or ""
@@ -417,7 +417,7 @@ function _M.getExploreCommandRewardRpc(agent, data) @@ -417,7 +417,7 @@ function _M.getExploreCommandRewardRpc(agent, data)
417 if freeFlag == "0" then 417 if freeFlag == "0" then
418 gift = config.giftFree 418 gift = config.giftFree
419 419
420 - freeRecord = string.setbit(freeRecord, id) 420 + freeRecord = string.setbit(freeRecord, subId)
421 info["fr"] = freeRecord 421 info["fr"] = freeRecord
422 end 422 end
423 423
@@ -427,11 +427,12 @@ function _M.getExploreCommandRewardRpc(agent, data) @@ -427,11 +427,12 @@ function _M.getExploreCommandRewardRpc(agent, data)
427 end 427 end
428 gift = gift .. config.giftLimit 428 gift = gift .. config.giftLimit
429 429
430 - buyRecord = string.setbit(buyRecord, id) 430 + buyRecord = string.setbit(buyRecord, subId)
431 info["br"] = buyRecord 431 info["br"] = buyRecord
432 end 432 end
433 433
434 - role.storeData:updateProperty({field = "bpInfo", value = info}) 434 + bpInfo[id] = info
  435 + role.storeData:updateProperty({field = "bpInfo", value = bpInfo})
435 436
436 local reward, _ = role:award(gift, {log = {desc = "exploreCommand", int1 = id, int2 = subId}}) 437 local reward, _ = role:award(gift, {log = {desc = "exploreCommand", int1 = id, int2 = subId}})
437 438