Commit 876d9fbd6e21d0fe9bec29b5c462084ff6668b77

Authored by 熊润斐
2 parents ef70cd75 251b105a

Merge branch 'tr/bugfix' into tr/publish/preview

Showing 2 changed files with 23 additions and 24 deletions   Show diff stats
src/actions/AdvAction.lua
... ... @@ -57,6 +57,15 @@ local function checkFormat(role, format, checkAdvTeam)
57 57 end
58 58 end
59 59  
  60 + -- 多队挂机 电台任务英雄也不能重用
  61 + local radioTask = role:getProperty("radioTask")
  62 + for id, taskInfo in pairs(radioTask) do
  63 + local heros = taskInfo["heros"] or {}
  64 + for _, heroId in ipairs(heros) do
  65 + hadHero[heroId] = true
  66 + end
  67 + end
  68 +
60 69 if not format.leader then return end
61 70 if format.leader2 == format.leader then return end
62 71 local hadLeader = false
... ... @@ -102,6 +111,8 @@ function _M.startAdvRpc( agent, data )
102 111  
103 112 local advPass = role:getProperty("advPass")
104 113  
  114 + if not checkFormat(role) then return 7 end
  115 +
105 116 if AdvCommon.isEndless(chapterId) then -- 无尽模式判断
106 117  
107 118 if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节
... ... @@ -118,37 +129,23 @@ function _M.startAdvRpc( agent, data )
118 129 if not relayData then return 14 end -- 不是中继层
119 130 if advElM < relayData.unlockfloor then return 15 end --未解锁
120 131 end
  132 +
  133 + role.dailyData:updateProperty({field = "advElC", delta = 1})
121 134 else -- 普通模式判断
122   - if not role:checkAdvCount(chapterData.limitlevel) then return 2 end -- 是否有体力
123 135 if layer >= chapterData.limitlevel then return 4 end
124   - -- 关卡开放判断
125   - if not role:advChapterIsOpen(chapterId) then return 5 end
126 136  
  137 + local relayData = role:getAdvData():isHaveRelay(layer, chapterId)
  138 + if not relayData then return 6 end -- 不是中继层
127 139 if layer ~= 1 then
128   - local relayData = role:getAdvData():isHaveRelay(layer, chapterId)
129   - if not relayData then return 6 end -- 不是中继层
130 140 if (advPass[chapterId] or 0) < relayData.floor then return 21 end
131 141 end
132   - end
133   -
134   - if not checkFormat(role) then return 7 end
135   -
136   - --local advTeam = role:getProperty("advTeam")
137   - --table.clear(advTeam)
  142 + if not role:checkAdvCount(relayData.supply) then return 2 end -- 是否有体力
  143 + -- 关卡开放判断
  144 + if not role:advChapterIsOpen(chapterId) then return 5 end
138 145  
139   - --advTeam.heros = {}
140   - --for slot, heroId in pairs(format.heros) do
141   - -- advTeam.heros[slot] = heroId
142   - --end
143   - --advTeam.leader = format.leader
144   - --advTeam.leader2 = format.leader2
145   - --role:updateProperty({field = "advTeam", value = advTeam})
146   - if AdvCommon.isEndless(chapterId) then
147   - role.dailyData:updateProperty({field = "advElC", delta = 1})
148   - else
149   - role:changeAdvCount(chapterData.limitlevel)
  146 + role:changeAdvCount(relayData.supply)
150 147 end
151   -
  148 +
152 149 local support = {} -- 支援效果
153 150 if AdvCommon.isEndless(chapterId) then
154 151 -- 选择的支援效果
... ... @@ -168,6 +165,7 @@ function _M.startAdvRpc( agent, data )
168 165 end
169 166 end
170 167 end
  168 +
171 169 role:getAdvData():initByChapter({
172 170 chapterId = chapterId,
173 171 level = layer,
... ... @@ -175,6 +173,7 @@ function _M.startAdvRpc( agent, data )
175 173 isEnter = true,
176 174 support = support,
177 175 })
  176 +
178 177 role:checkTaskEnter("AdvStart", {id = chapterId})
179 178 role:checkTaskEnter("AdvStartSelf", {id = chapterId})
180 179 role:getAdvData():popBackEvents() -- 清一下事件
... ...
src/actions/DinerAction.lua
... ... @@ -305,7 +305,7 @@ function _M.expediteSellRpc( agent, data )
305 305 local gift = reward:toNumMap()
306 306  
307 307 -- 特权卡获取加速获得额外道具
308   - local coef = role.storeData:getProduceItemSpeedCoef()
  308 + local coef = 1 --role.storeData:getProduceItemSpeedCoef()
309 309 for k, v in pairs(gift) do
310 310 if coef > 1 then
311 311 v = math.floor(v * coef)
... ...