diff --git a/src/models/Diner.lua b/src/models/Diner.lua index 0b8686d..0dc7e9e 100644 --- a/src/models/Diner.lua +++ b/src/models/Diner.lua @@ -70,10 +70,10 @@ function Diner:refreshDailyData(notify) end end - if self.owner:getProperty("funcGuide"):getv(51,0) == 0 or (self.owner:checkOverGuide(26) and not self.owner:checkOverGuide(27)) then + if self.owner:getProperty("funcGuide"):getv(51,0) == 0 or (not self.owner:checkOverGuide(27) and self.owner:checkOverGuide(25)) then entrust[1] = 1001 entrust[2] = 1 - elseif self.owner:checkOverGuide(29) then + elseif not self.owner:checkOverGuide(29,4) and self.owner:checkOverGuide(29) then local temp = entrust[1] entrust[1] = 1 entrust[2] = temp diff --git a/src/models/RoleLog.lua b/src/models/RoleLog.lua index 773945c..7e3928e 100644 --- a/src/models/RoleLog.lua +++ b/src/models/RoleLog.lua @@ -71,7 +71,7 @@ local ItemReason = { sudoku = 1001, -- 九宫格 sudokuR = 1002, -- 九宫格连线奖励 sudokuRP = 1003, -- 九宫格阶段奖励 - actSign = 1004, -- 签到 + sign = 1004, -- 签到 friendPoint = 1005, -- 友情 birth = 1006, -- 出生奖励 -- libgit2 0.21.2