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

jiyue
2 parents 0bf143be e9c1df55
Showing 3 changed files with 6 additions and 5 deletions Show diff stats
src/actions/HeroAction.lua
src/models/Activity.lua
src/services/dbseed.lua
@@ -66,7 +66,7 @@ function _M.levelUpRpc( agent, data )
 		hero_upgrade_scoreget = hero:getProperty("battleV") - oldBattleV, -- 通过英雄升级提升的评分
 	})
-	hero:mylog({desc = "levelUp", int1 = hero:getProperty("level")})
+	hero:mylog({desc = "levelUp", int1 = hero:getProperty("level"), int2 = hero:getProperty("type")})
 	role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
@@ -105,7 +105,7 @@ function _M.breakRpc( agent, data )
 		hero_break_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄突破效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 		hero_break_level = hero:getMaxLevel(), -- 英雄突破后等级上限
 	})
-	hero:mylog({desc = "break", int1 = hero:getProperty("breakL")})
+	hero:mylog({desc = "break", int1 = hero:getProperty("breakL"), int2 = hero:getProperty("type")})
 	SendPacket(actionCodes.Hero_breakRpc, '')
 	return true
@@ -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);"
         },
     }
 	-- 更新记录表