wasteland / server

Commit 7600b148188cf56672d8b5dffa027a5180c25fb8

Authored by 熊润斐
2 parents 0688e04b 38c7e6a0

Merge branch 'bugfix' into tr/publish 

* bugfix:
  bug
  bug
  修复bug
  记录聊天信息
  缺了 newdevice
  安全判定
Showing 5 changed files with 29 additions and 10 deletions   Show diff stats
Inline Side-by-side
src/actions/AdvAction.lua
  Show/Hide comments   View file @7600b14
@@ -655,7 +655,7 @@ function _M.startBattleRpc(agent, data) @@ -655,7 +655,7 @@ function _M.startBattleRpc(agent, data)
655 if adv:isWaitChooseArtifact() then return end 655 if adv:isWaitChooseArtifact() then return end
656 local enemy = adv.battle:getEnemyById(enemyId) 656 local enemy = adv.battle:getEnemyById(enemyId)
657 657
658 - if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end 658 + if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end
659 659
660 local key = tostring(math.random()) 660 local key = tostring(math.random())
661 adv.__battleCache = { 661 adv.__battleCache = {
@@ -687,7 +687,7 @@ function _M.endBattleRpc(agent, data) @@ -687,7 +687,7 @@ function _M.endBattleRpc(agent, data)
687 if not adv.__battleCache then return end 687 if not adv.__battleCache then return end
688 if adv.__battleCache.enemyId ~= enemyId then return end 688 if adv.__battleCache.enemyId ~= enemyId then return end
689 local enemy = adv.battle:getEnemyById(enemyId) 689 local enemy = adv.battle:getEnemyById(enemyId)
690 - if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end 690 + if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end
691 adv.__battleCache = nil 691 adv.__battleCache = nil
692 692
693 -- 打完野猪怪 693 -- 打完野猪怪
src/actions/RoleAction.lua
  Show/Hide comments   View file @7600b14
@@ -937,6 +937,7 @@ function _M.chatRpc(agent, data) @@ -937,6 +937,7 @@ function _M.chatRpc(agent, data)
937 end 937 end
938 mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response)) 938 mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
939 pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response) 939 pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
  940 + role:mylog("role_action", {desc = "chatWorld", text1 = content})
940 end, 941 end,
941 -- 私聊 942 -- 私聊
942 [2] = function () 943 [2] = function ()
src/models/RoleChangeStruct.lua
  Show/Hide comments   View file @7600b14
@@ -31,16 +31,33 @@ local awardGift = createVersionFunc(VersionType.Override ,function(role, params) @@ -31,16 +31,33 @@ local awardGift = createVersionFunc(VersionType.Override ,function(role, params)
31 print("awardGift" .. " >>> " .. params) 31 print("awardGift" .. " >>> " .. params)
32 end) 32 end)
33 33
  34 +local bugFixSuduku = createVersionFunc(VersionType.DoOnly, function(role, params)
  35 + local sudoku = role:getProperty("sudoku")
  36 + local phase = sudoku[-1] or 1
  37 + local id = 9
  38 + if phase == 1 then
  39 + local curData = (csvdb["guide_sudokuCsv"][phase] or {})[id]
  40 + if role:checkHangPass(curData.con2) then
  41 + sudoku.task = sudoku.task or {}
  42 + sudoku.task[phase] = sudoku.task[phase] or {}
  43 + if (sudoku.task[phase][id] or 0 == 0) then
  44 + sudoku.task[phase][id] = 1
  45 + role:setProperty("sudoku", sudoku)
  46 + end
  47 + end
  48 + end
  49 +end)
  50 +
34 ---------------------版本方法 end ---------------------- 51 ---------------------版本方法 end ----------------------
35 52
36 -- version 罗列start 53 -- version 罗列start
37 local versionList = {} -- version 列表 54 local versionList = {} -- version 列表
38 -versionList[1] = {clearActivity, {1, 2}}  
39 -versionList[2] = {clearActivity, {5, 7}}  
40 -versionList[3] = {changeStructF, "test1"}  
41 -versionList[4] = {changeStructF, "test2"}  
42 -versionList[5] = {awardGift, "test3"}  
43 -versionList[6] = {awardGift, "test4"} 55 +versionList[1] = {bugFixSuduku, {}}
  56 +-- versionList[2] = {clearActivity, {5, 7}}
  57 +-- versionList[3] = {changeStructF, "test1"}
  58 +-- versionList[4] = {changeStructF, "test2"}
  59 +-- versionList[5] = {awardGift, "test3"}
  60 +-- versionList[6] = {awardGift, "test4"}
44 61
45 --version 罗列end 62 --version 罗列end
46 63
src/models/RoleLog.lua
  Show/Hide comments   View file @7600b14
@@ -12,7 +12,7 @@ local server_id = (skynet.getenv("serverType") or "localtest") .. "_" .. serverI @@ -12,7 +12,7 @@ local server_id = (skynet.getenv("serverType") or "localtest") .. "_" .. serverI
12 1000 其他行为 12 1000 其他行为
13 --]] 13 --]]
14 local ItemReason = { 14 local ItemReason = {
15 - recharge = 100, 15 + recharge = 100, -- 充值获取
16 advWheelSurf = 101, -- 资助 16 advWheelSurf = 101, -- 资助
17 advRepayWheelSurf = 102, -- 资助回馈 17 advRepayWheelSurf = 102, -- 资助回馈
18 saleEquip = 103, -- 卖装备 18 saleEquip = 103, -- 卖装备
@@ -481,6 +481,7 @@ local LogType = { @@ -481,6 +481,7 @@ local LogType = {
481 login = "common", 481 login = "common",
482 logout = "common", 482 logout = "common",
483 guide = "common", 483 guide = "common",
  484 + newdevice = "common",
484 485
485 in_item = "common", 486 in_item = "common",
486 out_item = "common", 487 out_item = "common",
src/models/RoleTask.lua
  Show/Hide comments   View file @7600b14
@@ -554,7 +554,7 @@ function RoleTask.bind(Role) @@ -554,7 +554,7 @@ function RoleTask.bind(Role)
554 for id , sudikuData in pairs(guide_sudokuData) do 554 for id , sudikuData in pairs(guide_sudokuData) do
555 local curStatus = sudoku.task[pause][id] or 0 555 local curStatus = sudoku.task[pause][id] or 0
556 556
557 - if curStatus ~= -1 and sudikuData.type == stype and (sudikuData.unlock == 0 or self:checkHangPass(sudikuData.unlock)) then 557 + if curStatus ~= -1 and sudikuData.type == stype then
558 if IsFindMax[sudikuData.type] then -- 最大值 558 if IsFindMax[sudikuData.type] then -- 最大值
559 if sudikuData.con2 == 0 or sudikuData.con2 == cond then 559 if sudikuData.con2 == 0 or sudikuData.con2 == cond then
560 if (count or 0) > curStatus then 560 if (count or 0) > curStatus then