Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2022-02-11 15:58:16 +08:00
commit 7a010e5e7d
3 changed files with 26 additions and 23 deletions

View File

@ -138,9 +138,9 @@ function this.InitActivityServerData(msg, isUpdate)
if GlobalActivity[v.activityId] then
this.CheckMoneyProgress(v)
this.mission[v.activityId] = v
LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
-- LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
for n, m in ipairs(v.mission) do
LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
-- LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
if (v.activityId == ActivityTypeDef.OnlineGift) then
this.onlineOpen = true
this.onlineGetRewardState[m.missionId] = m.state

View File

@ -569,7 +569,9 @@ function BattleUtil.Seckill(skill, atkRole, defRole,addDamagePro)
return
end
local damage = defRole:GetRoleData(RoleDataName.Hp)
damage=floor(BattleUtil.FP_Mul(damage,1+addDamagePro))
if addDamagePro then
damage=floor(BattleUtil.FP_Mul(damage,1+addDamagePro))
end
local finalDmg = defRole.data:SubValue(RoleDataName.Hp, damage)
if finalDmg >= 0 then
if defRole:GetRoleData(RoleDataName.Hp) <= 0 and not defRole:IsDead() then

View File

@ -740,29 +740,30 @@ function this.CreatSingleData(shopData,DataTypeIndex,buyType,actType)
else
data.tipImageText = nil
end
--每日特惠改回以前一件购买,取消了购买后礼包变任务的形式
-- LogGreen("actType:"..tostring(actType))
if actType then
local actData = ActivityGiftManager.GetActivityTypeInfo(actType)
-- LogGreen("actData:"..tostring(actData))
if actData then
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityRewardConfig,"ActivityId",actType,"Sort",data.shopItemData.Sequence)
data.price = "可领取"
data.linkAct = true
data.missionId = configData.Id
data.activityId = actData.activityId
data.state = actData.mission[data.shopItemData.Sequence].state
data.buyInfo = ""
else
data.price = string.format(MoneyUtil.GetMoneyUnitName(), data.finalNum)
data.linkAct = false
data.missionId = 0
data.activityId = 0
data.buyInfo = Language[10580]..data.limitNum - data.boughtNum..Language[10048]
end
else
-- if actType then
-- local actData = ActivityGiftManager.GetActivityTypeInfo(actType)
-- -- LogGreen("actData:"..tostring(actData))
-- if actData then
-- local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityRewardConfig,"ActivityId",actType,"Sort",data.shopItemData.Sequence)
-- data.price = "可领取"
-- data.linkAct = true
-- data.missionId = configData.Id
-- data.activityId = actData.activityId
-- data.state = actData.mission[data.shopItemData.Sequence].state
-- data.buyInfo = ""
-- else
-- data.price = string.format(MoneyUtil.GetMoneyUnitName(), data.finalNum)
-- data.linkAct = false
-- data.missionId = 0
-- data.activityId = 0
-- data.buyInfo = Language[10580]..data.limitNum - data.boughtNum..Language[10048]
-- end
-- else
data.price = string.format(MoneyUtil.GetMoneyUnitName(), data.finalNum)
data.buyInfo = Language[10580]..data.limitNum - data.boughtNum..Language[10048]
end
-- end
data.endTime = shopData.endTime
else
return nil