Merge branch 'cn/develop' into cn/publish/preview

jiyue
2 parents b6651ec9 e9c1df55
Showing 2 changed files with 4 additions and 3 deletions Show diff stats
src/models/Activity.lua
src/services/dbseed.lua
@@ -1117,10 +1117,11 @@ end
 activityFunc[Activity.ActivityType.ActShopGoods] = {
 	["init"] = function(self, actType, isCrossDay, notify, actId)
 	end,
-	["close"] = function(self, actType, notify)
+	["close"] = function(self, actType, notify, actId)
 		local rechargeRecord = self.owner.storeData:getProperty("payR")
 		for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
-			if cfg.shop == 3 and cfg.type == ShopPackType.ActShopPack then
+			--if cfg.shop == 3 and cfg.type == ShopPackType.ActShopPack then
+			if cfg.activity_id == actId then
 				rechargeRecord[id] = nil
 			end
 		end
@@ -268,7 +268,7 @@ local function doUpdateSql()
             "ALTER TABLE `Rune` MODIFY COLUMN `refer` bigint;"
         },
         [3] = {
-            "ALTER TABLE `Email` MODIFY COLUMN `refer` VARCHAR(2048);"
+            "ALTER TABLE `Email` MODIFY COLUMN `content` VARCHAR(2048);"
         },
     }
 	-- 更新记录表