Commit 9587d70aee85dbc002c00cf91730f95bb6a59cfa

Authored by zhouhaihai
2 parents acf11d0d 052ae144

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

* tr/bugfix:
  活动卡池回馈数量丢失Bug

# Conflicts:
#	src/csvdata
Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
src/models/Activity.lua
@@ -91,6 +91,7 @@ function Activity:data() @@ -91,6 +91,7 @@ function Activity:data()
91 act18 = self:getProperty("act18"), 91 act18 = self:getProperty("act18"),
92 act19 = self:getProperty("act19"), 92 act19 = self:getProperty("act19"),
93 act20 = self:getProperty("act20"), 93 act20 = self:getProperty("act20"),
  94 + act24 = self:getProperty("act24"),
94 act26 = self:getProperty("act26"), 95 act26 = self:getProperty("act26"),
95 } 96 }
96 end 97 end