puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

层数buff完善

Browse Source
This commit is contained in:
xiekaidong 2023-07-17 14:46:02 +08:00
parent ac9d7dd776
commit 85f016086d
8 changed files with 64370 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lua/app/config/buff.lua
View File

@ -692,8 +692,15 @@ local buff = {
[79]={
["id"]=79,
["name"]="invincible_shield",
["decr"]=1,
["icon"]="invincible_shield"
["buff_type"]=7,
["decr"]=3,
["icon"]="invincible_shield",
["fx_continued"]={
24
},
["fx_disappear"]={
25
}
}
}
local keys = {

719
lua/app/config/dungeon_armor_fund.lua Normal file
View File

@ -0,0 +1,719 @@
local dungeon_armor_fund = {
[1]={
["stage"]=1,
["dungeon_stage"]=1,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=1,
["num_for_nothing"]="Vw=="
}
},
["act_gift"]=100102
},
[2]={
["stage"]=1,
["dungeon_stage"]=4,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=2,
["num_for_nothing"]="VA=="
}
},
["act_gift"]=100102
},
[3]={
["stage"]=1,
["dungeon_stage"]=6,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=3,
["num_for_nothing"]="VQ=="
}
},
["act_gift"]=100102
},
[4]={
["stage"]=1,
["dungeon_stage"]=10,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=4,
["num_for_nothing"]="Ug=="
}
},
["act_gift"]=100102
},
[5]={
["stage"]=1,
["dungeon_stage"]=12,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=5,
["num_for_nothing"]="Uw=="
}
},
["act_gift"]=100102
},
[6]={
["stage"]=1,
["dungeon_stage"]=16,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=6,
["num_for_nothing"]="UA=="
}
},
["act_gift"]=100102
},
[7]={
["stage"]=1,
["dungeon_stage"]=18,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=7,
["num_for_nothing"]="UQ=="
}
},
["act_gift"]=100102
},
[8]={
["stage"]=1,
["dungeon_stage"]=22,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=8,
["num_for_nothing"]="Xg=="
}
},
["act_gift"]=100102
},
[9]={
["stage"]=1,
["dungeon_stage"]=24,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=9,
["num_for_nothing"]="Xw=="
}
},
["act_gift"]=100102
},
[10]={
["stage"]=1,
["dungeon_stage"]=28,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
["act_gift"]=100102
},
[11]={
["stage"]=1,
["dungeon_stage"]=30,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=11,
["num_for_nothing"]="Vwk="
}
},
["act_gift"]=100102
},
[12]={
["stage"]=2,
["dungeon_stage"]=31,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=12,
["num_for_nothing"]="Vwo="
}
},
["act_gift"]=100202
},
[13]={
["stage"]=2,
["dungeon_stage"]=34,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=13,
["num_for_nothing"]="Vws="
}
},
["act_gift"]=100202
},
[14]={
["stage"]=2,
["dungeon_stage"]=36,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=14,
["num_for_nothing"]="Vww="
}
},
["act_gift"]=100202
},
[15]={
["stage"]=2,
["dungeon_stage"]=38,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=15,
["num_for_nothing"]="Vw0="
}
},
["act_gift"]=100202
},
[16]={
["stage"]=2,
["dungeon_stage"]=40,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=16,
["num_for_nothing"]="Vw4="
}
},
["act_gift"]=100202
},
[17]={
["stage"]=2,
["dungeon_stage"]=42,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=17,
["num_for_nothing"]="Vw8="
}
},
["act_gift"]=100202
},
[18]={
["stage"]=2,
["dungeon_stage"]=44,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=18,
["num_for_nothing"]="VwA="
}
},
["act_gift"]=100202
},
[19]={
["stage"]=2,
["dungeon_stage"]=46,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=19,
["num_for_nothing"]="VwE="
}
},
["act_gift"]=100202
},
[20]={
["stage"]=2,
["dungeon_stage"]=48,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
["act_gift"]=100202
},
[21]={
["stage"]=2,
["dungeon_stage"]=50,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=21,
["num_for_nothing"]="VAk="
}
},
["act_gift"]=100202
},
[22]={
["stage"]=2,
["dungeon_stage"]=52,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=22,
["num_for_nothing"]="VAo="
}
},
["act_gift"]=100202
},
[23]={
["stage"]=2,
["dungeon_stage"]=54,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=23,
["num_for_nothing"]="VAs="
}
},
["act_gift"]=100202
}
}
local config = {
data=dungeon_armor_fund,count=23
}
return config

10
lua/app/config/dungeon_armor_fund.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 00fd88a1c22e59a4c96458faba2c1b3f
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

55628
lua/app/config/equip.lua
View File

File diff suppressed because it is too large Load Diff

8000
lua/app/config/equip_level.lua
View File

File diff suppressed because it is too large Load Diff

2
lua/app/config/strings/cn/global.lua
View File

@ -342,7 +342,7 @@ local localization_global =
["COLLECTION_DESC_4"] = "还差{0}星辉可获得奖励",
["COLLECTION_DESC_5"] = "已获得奖励",
["COLLECTION_DESC_6"] = "未获得奖励",
["COLLECTION_DESC_7"] = "1.每个英雄提升等级后都能再次领取星辉，不同品质的英雄升级给星辉数不同。/n2.累计星辉可领取丰厚奖励。",
["COLLECTION_DESC_7"] = "1.每个英雄提升等级后都能领取星辉，不同品质的英雄升级给星辉数不同。\n2.累计星辉可领取丰厚奖励。",
["COLLECTION_DESC_8"] = "敬请期待",
["COLLECTION_DESC_9"] = "请领取当前奖励",
["COLLECTION_DESC_10"] = "收集奖励",

5
lua/app/module/battle/component/battle_unit_comp.lua
View File

@ -1630,7 +1630,10 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d
local time = Time:getServerTime()
if num < 0 then -- 伤害
local delayTime = 0
if shieldHpDiff < 0 then
if shieldHpDiff < 0 or shieldWorkOn then
if shieldHpDiff == 0 then
shieldHpDiff = damage
end
damage = damage - shieldHpDiff
delayTime = BattleConst.EFFECT_NUMBER_DELAY
if self.lastBlueNumberTime == time then

2
lua/app/module/battle/helper/battle_buff_special.lua
View File

@ -4,7 +4,7 @@ local BattleFormula = require "app/module/battle/helper/battle_formula"
local BattleBuffSpecial = {}
local BUFF_NAME = BattleConst.BUFF_NAME
local ATTR_NAME = BattleConst.ATTR_NAM
local ATTR_NAME = BattleConst.ATTR_NAME
local EFFECT_TYPE = BattleConst.EFFECT_TYPE
local function _addSkillOn(unitComp, buff, target, buffEffect)