wasteland / server

Commit 28f0c0ca8bf1a1ce232b15aa744fc1366fe4c543

Authored by zhouhaihai
2 parents 6288ab7f dea89131

Merge branch 'bugfix' into develop 

* bugfix:
  修复bug
  记录聊天信息
  缺了 newdevice
  安全判定
Showing 5 changed files with 28 additions and 10 deletions   Show diff stats
Inline Side-by-side
src/actions/AdvAction.lua
  Show/Hide comments   View file @28f0c0c
@@ -657,7 +657,7 @@ function _M.startBattleRpc(agent, data) @@ -657,7 +657,7 @@ function _M.startBattleRpc(agent, data)
657 if adv:isWaitChooseArtifact() then return end 657 if adv:isWaitChooseArtifact() then return end
658 local enemy = adv.battle:getEnemyById(enemyId) 658 local enemy = adv.battle:getEnemyById(enemyId)
659 659
660 - if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end 660 + if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end
661 661
662 local key = tostring(math.random()) 662 local key = tostring(math.random())
663 adv.__battleCache = { 663 adv.__battleCache = {
@@ -689,7 +689,7 @@ function _M.endBattleRpc(agent, data) @@ -689,7 +689,7 @@ function _M.endBattleRpc(agent, data)
689 if not adv.__battleCache then return end 689 if not adv.__battleCache then return end
690 if adv.__battleCache.enemyId ~= enemyId then return end 690 if adv.__battleCache.enemyId ~= enemyId then return end
691 local enemy = adv.battle:getEnemyById(enemyId) 691 local enemy = adv.battle:getEnemyById(enemyId)
692 - if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end 692 + if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end
693 adv.__battleCache = nil 693 adv.__battleCache = nil
694 694
695 -- 打完野猪怪 695 -- 打完野猪怪
src/actions/RoleAction.lua
  Show/Hide comments   View file @28f0c0c
@@ -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 @28f0c0c
@@ -31,16 +31,32 @@ local awardGift = createVersionFunc(VersionType.Override ,function(role, params) @@ -31,16 +31,32 @@ 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 + if phase == 1 then
  38 + local curData = (csvdb["guide_sudokuCsv"][phase] or {})[9]
  39 + if role:checkHangPass(curData.con2) then
  40 + sudoku.task = sudoku.task or {}
  41 + sudoku.task[phase] = sudoku.task[phase] or {}
  42 + if (sudoku.task[phase][id] or 0 == 0) then
  43 + sudoku.task[phase][id] = 1
  44 + role:setProperty("sudoku", sudoku)
  45 + end
  46 + end
  47 + end
  48 +end)
  49 +
34 ---------------------版本方法 end ---------------------- 50 ---------------------版本方法 end ----------------------
35 51
36 -- version 罗列start 52 -- version 罗列start
37 local versionList = {} -- version 列表 53 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"} 54 +versionList[1] = {bugFixSuduku}
  55 +-- versionList[2] = {clearActivity, {5, 7}}
  56 +-- versionList[3] = {changeStructF, "test1"}
  57 +-- versionList[4] = {changeStructF, "test2"}
  58 +-- versionList[5] = {awardGift, "test3"}
  59 +-- versionList[6] = {awardGift, "test4"}
44 60
45 --version 罗列end 61 --version 罗列end
46 62
src/models/RoleLog.lua
  Show/Hide comments   View file @28f0c0c
@@ -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, -- 卖装备
@@ -482,6 +482,7 @@ local LogType = { @@ -482,6 +482,7 @@ local LogType = {
482 login = "common", 482 login = "common",
483 logout = "common", 483 logout = "common",
484 guide = "common", 484 guide = "common",
  485 + newdevice = "common",
485 486
486 in_item = "common", 487 in_item = "common",
487 out_item = "common", 488 out_item = "common",
src/models/RoleTask.lua
  Show/Hide comments   View file @28f0c0c
@@ -555,7 +555,7 @@ function RoleTask.bind(Role) @@ -555,7 +555,7 @@ function RoleTask.bind(Role)
555 for id , sudikuData in pairs(guide_sudokuData) do 555 for id , sudikuData in pairs(guide_sudokuData) do
556 local curStatus = sudoku.task[pause][id] or 0 556 local curStatus = sudoku.task[pause][id] or 0
557 557
558 - if curStatus ~= -1 and sudikuData.type == stype and (sudikuData.unlock == 0 or self:checkHangPass(sudikuData.unlock)) then 558 + if curStatus ~= -1 and sudikuData.type == stype then
559 if IsFindMax[sudikuData.type] then -- 最大值 559 if IsFindMax[sudikuData.type] then -- 最大值
560 if sudikuData.con2 == 0 or sudikuData.con2 == cond then 560 if sudikuData.con2 == 0 or sudikuData.con2 == cond then
561 if (count or 0) > curStatus then 561 if (count or 0) > curStatus then