wasteland / server

Commit 0cc5de89646b553c2c0c5c4fb4f85b3259fc4081

Authored by chenyueqi
1 parent 254ed866

签到log类型再改回来，餐厅刷新顾客判断修正

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/models/Diner.lua
  Show/Hide comments   View file @0cc5de8
@@ -70,10 +70,10 @@ function Diner:refreshDailyData(notify) @@ -70,10 +70,10 @@ function Diner:refreshDailyData(notify)
70 end 70 end
71 end 71 end
72 72
73 - if self.owner:getProperty("funcGuide"):getv(51,0) == 0 or (self.owner:checkOverGuide(26) and not self.owner:checkOverGuide(27)) then 73 + if self.owner:getProperty("funcGuide"):getv(51,0) == 0 or (not self.owner:checkOverGuide(27) and self.owner:checkOverGuide(25)) then
74 entrust[1] = 1001 74 entrust[1] = 1001
75 entrust[2] = 1 75 entrust[2] = 1
76 - elseif self.owner:checkOverGuide(29) then 76 + elseif not self.owner:checkOverGuide(29,4) and self.owner:checkOverGuide(29) then
77 local temp = entrust[1] 77 local temp = entrust[1]
78 entrust[1] = 1 78 entrust[1] = 1
79 entrust[2] = temp 79 entrust[2] = temp
src/models/RoleLog.lua
  Show/Hide comments   View file @0cc5de8
@@ -71,7 +71,7 @@ local ItemReason = { @@ -71,7 +71,7 @@ local ItemReason = {
71 sudoku = 1001, -- 九宫格 71 sudoku = 1001, -- 九宫格
72 sudokuR = 1002, -- 九宫格连线奖励 72 sudokuR = 1002, -- 九宫格连线奖励
73 sudokuRP = 1003, -- 九宫格阶段奖励 73 sudokuRP = 1003, -- 九宫格阶段奖励
74 - actSign = 1004, -- 签到 74 + sign = 1004, -- 签到
75 friendPoint = 1005, -- 友情 75 friendPoint = 1005, -- 友情
76 birth = 1006, -- 出生奖励 76 birth = 1006, -- 出生奖励
77 77