Commit 286a8f957532a5117b728f6137be97312213c17f
1 parent
ad88ba14
刷新任务和主线 分开
Showing
1 changed file
with
18 additions
and
11 deletions
Show diff stats
src/adv/AdvTask.lua
| 1 | local AdvTask = {} | 1 | local AdvTask = {} |
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | +local advTaskChange = {} | ||
| 4 | function AdvTask.bind(Adv) | 5 | function AdvTask.bind(Adv) |
| 5 | Adv.TaskType = { | 6 | Adv.TaskType = { |
| 6 | Arrive = 1, --到达N层 | 7 | Arrive = 1, --到达N层 |
| @@ -60,14 +61,14 @@ function AdvTask.bind(Adv) | @@ -60,14 +61,14 @@ function AdvTask.bind(Adv) | ||
| 60 | 61 | ||
| 61 | function Adv:initLayerTask() | 62 | function Adv:initLayerTask() |
| 62 | self.advTask = {} | 63 | self.advTask = {} |
| 63 | - self.advTaskChange = true | 64 | + advTaskChange.t = true |
| 65 | + advTaskChange.m = true | ||
| 64 | if not next(self.advMTask) then | 66 | if not next(self.advMTask) then |
| 65 | self.advMTask = { | 67 | self.advMTask = { |
| 66 | id = 1, | 68 | id = 1, |
| 67 | status = 0, | 69 | status = 0, |
| 68 | lock = 1, | 70 | lock = 1, |
| 69 | } | 71 | } |
| 70 | - self.advTaskChange = true | ||
| 71 | end | 72 | end |
| 72 | self.advMTask.id = self.advMTask.id or 1 | 73 | self.advMTask.id = self.advMTask.id or 1 |
| 73 | local mainTaskData = csvdb["adv_questCsv"][self.advMTask.id] | 74 | local mainTaskData = csvdb["adv_questCsv"][self.advMTask.id] |
| @@ -79,7 +80,6 @@ function AdvTask.bind(Adv) | @@ -79,7 +80,6 @@ function AdvTask.bind(Adv) | ||
| 79 | if ts then | 80 | if ts then |
| 80 | self.advMTask.status = ts | 81 | self.advMTask.status = ts |
| 81 | end | 82 | end |
| 82 | - self.advTaskChange = true | ||
| 83 | end | 83 | end |
| 84 | end | 84 | end |
| 85 | end | 85 | end |
| @@ -92,7 +92,7 @@ function AdvTask.bind(Adv) | @@ -92,7 +92,7 @@ function AdvTask.bind(Adv) | ||
| 92 | local ts = checkTaskStatus(self, taskData, status, count, cond) | 92 | local ts = checkTaskStatus(self, taskData, status, count, cond) |
| 93 | if ts then | 93 | if ts then |
| 94 | self.advTask[taskId] = ts | 94 | self.advTask[taskId] = ts |
| 95 | - self.advTaskChange = true | 95 | + advTaskChange.t = true |
| 96 | end | 96 | end |
| 97 | end | 97 | end |
| 98 | end | 98 | end |
| @@ -102,7 +102,7 @@ function AdvTask.bind(Adv) | @@ -102,7 +102,7 @@ function AdvTask.bind(Adv) | ||
| 102 | local ts = checkTaskStatus(self, mainTaskData, self.advMTask.status, count, cond) | 102 | local ts = checkTaskStatus(self, mainTaskData, self.advMTask.status, count, cond) |
| 103 | if ts then | 103 | if ts then |
| 104 | self.advMTask.status = ts | 104 | self.advMTask.status = ts |
| 105 | - self.advTaskChange = true | 105 | + advTaskChange.m = true |
| 106 | end | 106 | end |
| 107 | end | 107 | end |
| 108 | end | 108 | end |
| @@ -117,7 +117,7 @@ function AdvTask.bind(Adv) | @@ -117,7 +117,7 @@ function AdvTask.bind(Adv) | ||
| 117 | self.advTask[taskId] = ts | 117 | self.advTask[taskId] = ts |
| 118 | end | 118 | end |
| 119 | 119 | ||
| 120 | - self.advTaskChange = true | 120 | + advTaskChange.t = true |
| 121 | return true | 121 | return true |
| 122 | end | 122 | end |
| 123 | end | 123 | end |
| @@ -133,7 +133,7 @@ function AdvTask.bind(Adv) | @@ -133,7 +133,7 @@ function AdvTask.bind(Adv) | ||
| 133 | end | 133 | end |
| 134 | self.advTask[taskId] = nil | 134 | self.advTask[taskId] = nil |
| 135 | ok = true | 135 | ok = true |
| 136 | - self.advTaskChange = true | 136 | + advTaskChange.t = true |
| 137 | end | 137 | end |
| 138 | return ok, reward | 138 | return ok, reward |
| 139 | end | 139 | end |
| @@ -159,16 +159,23 @@ function AdvTask.bind(Adv) | @@ -159,16 +159,23 @@ function AdvTask.bind(Adv) | ||
| 159 | end | 159 | end |
| 160 | end | 160 | end |
| 161 | ok = true | 161 | ok = true |
| 162 | - self.advTaskChange = true | 162 | + advTaskChange.m = true |
| 163 | end | 163 | end |
| 164 | return ok, reward | 164 | return ok, reward |
| 165 | end | 165 | end |
| 166 | 166 | ||
| 167 | function Adv:updateTask(notNotify) | 167 | function Adv:updateTask(notNotify) |
| 168 | - if self.advTaskChange then | ||
| 169 | - self.owner:updateProperties({advTask = self.advTask, advMTask = self.advMTask}, notNotify) | 168 | + local properties = {} |
| 169 | + if advTaskChange.t then | ||
| 170 | + properties.advTask = self.advTask | ||
| 170 | end | 171 | end |
| 171 | - self.advTaskChange = false | 172 | + if advTaskChange.m then |
| 173 | + properties.advMTask = self.advMTask | ||
| 174 | + end | ||
| 175 | + if next(properties) then | ||
| 176 | + self.owner:updateProperties(properties, notNotify) | ||
| 177 | + end | ||
| 178 | + advTaskChange = {} | ||
| 172 | end | 179 | end |
| 173 | end | 180 | end |
| 174 | 181 |