Commit febda4c31cf085817538dd8c13491f83917972a2
Merge branch 'cn/develop' into cn/publish/release
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
src/models/Store.lua
| @@ -840,13 +840,13 @@ function Store:flushWeekShop() | @@ -840,13 +840,13 @@ function Store:flushWeekShop() | ||
| 840 | if next(tmpWeekShop) then | 840 | if next(tmpWeekShop) then |
| 841 | local id = math.randWeight(tmpWeekShop) | 841 | local id = math.randWeight(tmpWeekShop) |
| 842 | if id then | 842 | if id then |
| 843 | - weekShop[id] = weekShop[id] | 843 | + weekShop[id] = tmpWeekShop[id] |
| 844 | tmpWeekShop[id] = nil | 844 | tmpWeekShop[id] = nil |
| 845 | end | 845 | end |
| 846 | 846 | ||
| 847 | id = math.randWeight(tmpWeekShop) | 847 | id = math.randWeight(tmpWeekShop) |
| 848 | if id then | 848 | if id then |
| 849 | - weekShop[id] = weekShop[id] | 849 | + weekShop[id] = tmpWeekShop[id] |
| 850 | tmpWeekShop[id] = nil | 850 | tmpWeekShop[id] = nil |
| 851 | end | 851 | end |
| 852 | end | 852 | end |