From 820eb65f8dda15bde0a5c6540615245e48820811 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 30 Dec 2020 15:29:06 +0900 Subject: [PATCH 01/13] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A05=EF=BC=8C=206=20condition=20=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=20=20=E6=B7=BB=E5=8A=A0buff=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=20=E9=BA=92=E9=BA=9F=E5=8D=B0=E5=8A=A0=20=20=E6=94=BE?= =?UTF-8?q?=E9=80=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Logic/Monster/MonsterSkill/MCondition.lua | 67 ++++++++++++++++++- .../Modules/Battle/View/Unit/BuffCtrl.lua | 6 ++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua index 2ddc8b26b1..7b506bb4bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua @@ -52,7 +52,71 @@ local _ConditionConfig = { local comValue = condition[3] -- 当前释放技能的单位的职业 local professionId = skill.owner.professionId - return professionId == comValue + local skillCastEnd=function(skill2) + if skill2.owner.camp==skill.owner.camp then + local list=skill2:GetDirectTargetsNoMiss() + if not list then + return false + end + local num=0 + for key, value in pairs(list) do + local isHave=BattleLogic.BuffMgr:HasBuff(value, BuffName.DOT, function(buff) return buff.damageType == 1 and buff.caster==skill2.owner and buff.startRound == BattleLogic.GetCurRound() end) + if isHave then + return true + end + end + return false + end + end + BattleLogic.Event:AddEvent(BattleEventName.SkillCastEnd,skillCastEnd) + return skillCastEnd + end, + [5] = function(skill, condition) --5:敌方上场神将数量 且概率(万分比) + local conId = condition[1] + local comType = condition[2] + local comValue = condition[3] + local rand = condition[4] + local roleList = RoleManager.Query(function(role) + return role.camp ~= skill.owner.camp + end) + local isEnough=BattleUtil.CompareValue(#roleList, comValue, comType) + local r = Random.Range01() + -- 判断概率 + if isEnough then + return r>rand/10000 + end + return false + end, + [6] = function(skill, condition) --6:敌方任意神将生命百分比 【比较类型】 N(万分比) + local conId = condition[1] + local comType = condition[2] + local comValue = condition[3] + local round = condition[4] + -- 获取该技能相同阵营人物 + local roleList = RoleManager.Query(function(role) + return role.camp ~= skill.owner.camp + end) + -- 判断 + local r = Random.Range01() + for _, role in ipairs(roleList) do + local hpf = role:GetRoleData(RoleDataName.Hp) / role:GetRoleData(RoleDataName.MaxHp) + if BattleUtil.CompareValue(hpf, comValue/10000, comType) then + return round/10000>r + end + end + return false + end, + [7] = function(skill, condition) --7:检测是否有可以放逐的目标 + local list=skill.owner.exileTargets + if list then + local roleList = RoleManager.Query(function(role) + return role.camp ~= skill.owner.camp and not BattleUtil.ChecklistIsContainValue(list,role) + end) + if roleList and #roleList>0 then + return true + end + end + return false end, } @@ -61,6 +125,7 @@ function MCondition.CheckCondition(skill, condition) if not condition then return true end + LogError("skill"..skill.id) local conId = condition[1] local comType = condition[2] local comValue = condition[3] diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua index 4d50b185a7..11549fb5f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua @@ -8,6 +8,8 @@ local BuffTypeToConfigType = { [BuffName.Shield] = 5, [BuffName.Immune] = 6, [BuffName.Curse] = 7, + [BuffName.KylinMark] = 8, + [BuffName.Exile] = 9, } local function _GetPropChangeBuffCType(pName) for cType, pn in ipairs(BattlePropList) do @@ -39,6 +41,10 @@ local function _GetBuffEffectConfig(buff) cType = buff.immuneType elseif bType == BuffName.Curse then cType = buff.curseType + elseif bType== BuffName.KylinMark then + cType = 1 + elseif bType== BuffName.Exile then + cType = 1 end local type = BuffTypeToConfigType[bType] From 04765e2d7a09ed3b7562defa8c0003da68fe3987 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 30 Dec 2020 16:14:50 +0900 Subject: [PATCH 02/13] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=20=E9=BA=92=E9=BA=9F=E5=8D=B0=E8=AE=B0=EF=BC=8C?= =?UTF-8?q?=E6=94=BE=E9=80=90=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 6662ef4695..009d49625b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -177,6 +177,8 @@ BuffName = { Immune = "Immune", NoDead = "NoDead", Curse = "Curse", + KylinMark = "KylinMark", + Exile = "Exile", } DotType = { From 4828581d0923e891e2c669c2b9808c58a4d77832 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 6 Jan 2021 11:22:16 +0900 Subject: [PATCH 03/13] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D?= =?UTF-8?q?=E7=81=B5=E5=85=BD=E9=87=91=E4=B9=8C=E6=8A=80=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/BattleManager.lua | 1 + .../Logic/Monster/MonsterSkill/MCondition.lua | 24 ++++++++----------- .../Logic/Monster/MonsterSkill/MTrigger.lua | 2 +- .../Modules/Battle/Logic/Role/RoleLogic.lua | 1 + .../Modules/Battle/Logic/SkillManager.lua | 13 +++++++--- .../Modules/Battle/Test/BattleTestPanel.lua | 2 ++ 6 files changed, 25 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index ac9cfced5f..bd7f41f954 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -290,6 +290,7 @@ function this.GetBattleServerData(msg, isFightPlayer) camp = 0, type = 1, quality = 0, + job=HeroConfig[rid].Job, element = HeroConfig[rid].PropertyName, professionId = HeroConfig[rid].Profession, passivity = { }, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua index 7b506bb4bd..d6f0f75503 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MCondition.lua @@ -46,30 +46,27 @@ local _ConditionConfig = { return isRoundOk and isRandomOk end, - [4] = function(skill, condition) --4:行动单位的职业设定 【比较类型】 N + [4] = function(skill, condition) --4:场上燃烧目标的数量 【比较类型】 N local conId = condition[1] local comType = condition[2] local comValue = condition[3] -- 当前释放技能的单位的职业 local professionId = skill.owner.professionId - local skillCastEnd=function(skill2) - if skill2.owner.camp==skill.owner.camp then - local list=skill2:GetDirectTargetsNoMiss() + + local list = RoleManager.Query(function(role) + return role.camp ~= skill.owner.camp + end) if not list then return false end local num=0 for key, value in pairs(list) do - local isHave=BattleLogic.BuffMgr:HasBuff(value, BuffName.DOT, function(buff) return buff.damageType == 1 and buff.caster==skill2.owner and buff.startRound == BattleLogic.GetCurRound() end) + local isHave=BattleLogic.BuffMgr:HasBuff(value, BuffName.DOT, function(buff) return buff.damageType == 1 end) if isHave then - return true + num=num+1 end - end - return false - end - end - BattleLogic.Event:AddEvent(BattleEventName.SkillCastEnd,skillCastEnd) - return skillCastEnd + end + return BattleUtil.CompareValue(num, comValue, comType) end, [5] = function(skill, condition) --5:敌方上场神将数量 且概率(万分比) local conId = condition[1] @@ -115,7 +112,7 @@ local _ConditionConfig = { if roleList and #roleList>0 then return true end - end + end return false end, } @@ -125,7 +122,6 @@ function MCondition.CheckCondition(skill, condition) if not condition then return true end - LogError("skill"..skill.id) local conId = condition[1] local comType = condition[2] local comValue = condition[3] diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua index 5ea443bb38..eebb84f5f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua @@ -90,7 +90,7 @@ local _TriggerConfig = { triggerFunc = function(skill, ...) local args = {...} local castSkill = args[1] - return castSkill.owner.camp == skill.owner.camp + return castSkill.owner.camp == skill.owner.camp and castSkill.owner.job==2 and (castSkill.type==BattleSkillType.DeadSkill or castSkill.type==BattleSkillType.Extra or castSkill.type==BattleSkillType.Special) end }, } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 4a0e4a5c7f..a37870ce3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -33,6 +33,7 @@ function RoleLogic:Init(uid, data, position) self.name = data.name self.element = data.element self.professionId = data.professionId + self.job=data.job self.star = data.star or 1 -- LogError("英雄uid".. self.roleId .." " .. self.star) self.shield:Clear() --护盾列表 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua index d820659a29..544a79676b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua @@ -157,15 +157,22 @@ function this.Update() -- 检测一下轮转 this.IsSkilling = false -- this.CheckTurnRound() - -- 检测一次灵兽技能 - this.CheckMonsterSkill(this.MonsterCheckFunc) + if this.MonsterCheckFunc then + this.CheckMonsterSkill(this.MonsterCheckFunc) + else + this.CheckMonsterSkill(this.CheckTurnRound) + end end) else -- 检测一下轮转 this.IsSkilling = false -- this.CheckTurnRound() -- 检测一次灵兽技能 - this.CheckMonsterSkill(this.MonsterCheckFunc) + if this.MonsterCheckFunc then + this.CheckMonsterSkill(this.MonsterCheckFunc) + else + this.CheckMonsterSkill(this.CheckTurnRound) + end end return end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua index 43f05b1ceb..a1c123a0e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua @@ -308,6 +308,7 @@ function this.RefreshFightData(type) data.skinId=role.skinId LogError("skinId==="..role.skinId) data.type = 1 + data.job=roleData.Job local paskill = string.split(role.passivity, "#") data.passivity = BattleManager.GetPassivityData(paskill) or {} data.property = {} @@ -364,6 +365,7 @@ end function this.ApplyMonsterData(data) monsterTestData = data this.RefreshFightData(2) + return true end function this.ClearMonsterData(camp) if camp == 0 then From 6afeb8b41c13974bcbc254c1a0ad5af0c70fa1cc Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 8 Jan 2021 17:36:03 +0900 Subject: [PATCH 04/13] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E6=96=B0=E5=A2=9E124=E6=95=88?= =?UTF-8?q?=E6=9E=9C=20=E9=80=A0=E6=88=90=E7=9B=AE=E6=A0=87[a]*[b]%?= =?UTF-8?q?=E7=9A=84=E7=9B=B4=E6=8E=A5=E4=BC=A4=E5=AE=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Effect.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index 354416f80e..5acc545376 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -2328,6 +2328,17 @@ local effectList = { end BattleUtil.SeckillHP(skill,caster,target,pro) end, + -- 造成目标[a]*[b]%的直接伤害(不会被分摊机制分摊) + -- a[属性],b[float] + [124] = function(caster, target, args, interval, skill) + local pro = args[1] + local f1 = args[2] + + BattleLogic.WaitForTrigger(interval, function () + local damage = BattleUtil.ErrorCorrection(f1 * target:GetRoleData(BattlePropList[pro])) + BattleUtil.FinalDamage(skill, caster, target, damage, nil, 0, nil, true) + end) + end, } From ecc254550e04b7f03074bbc5a81e8ee82964adcd Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 8 Jan 2021 18:15:28 +0900 Subject: [PATCH 05/13] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=E6=96=B0=E5=A2=9E125=E6=95=88=E6=9E=9C=20=20=20=20--=20?= =?UTF-8?q?=E7=9B=AE=E6=A0=87[a]=E5=A2=9E=E5=8A=A0[b]%=E6=8C=81=E7=BB=AD[c?= =?UTF-8?q?]=E5=9B=9E=E5=90=88=EF=BC=8C=E6=95=88=E6=9E=9C=E5=8F=AF?= =?UTF-8?q?=E5=8F=A0=E5=8A=A0=EF=BC=8C[d]=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Effect.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index 5acc545376..ca00202f2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -2339,6 +2339,17 @@ local effectList = { BattleUtil.FinalDamage(skill, caster, target, damage, nil, 0, nil, true) end) end, + -- 目标[a]增加[b]%持续[c]回合,效果可叠加,[d]改变 + -- a[属性]b[float]c[int]d[改变类型] + [125] = function(caster, target, args, interval, skill) + local pro = args[1] + local f1 = args[2] + local i1 = args[3] + local ct = args[4] + BattleLogic.WaitForTrigger(interval, function () + target:AddBuff(Buff.Create(caster, BuffName.PropertyChange, i1, BattlePropList[pro], f1, ct)) + end) + end, } From f1ada7ed8d3716892e187cc6d2871944ac114540 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 8 Jan 2021 19:19:25 +0900 Subject: [PATCH 06/13] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=88=98=E6=96=97=20=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0job=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index bd7f41f954..a5479294d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -187,6 +187,7 @@ function this.GetMonsterData(monsterId) skill = this.GetSkillData(monsterConfig.SkillList[1],monsterConfig.SkinId), superSkill = this.GetSkillData(monsterConfig.SkillList[2],monsterConfig.SkinId), element = monsterConfig.PropertyName, + job=HeroConfig[monsterConfig.MonsterId].Job, passivity = this.GetPassivityData(monsterConfig.PassiveSkillList), property = { monsterConfig.Level, @@ -372,6 +373,7 @@ function this.GetBattleServerData(msg, isFightPlayer) position = position, star = star, skinId=skin, + job=HeroConfig[monsterConfig.monsterId].Job, camp = 1, type = monsterConfig.Type, quality = monsterConfig.Quality, @@ -400,6 +402,7 @@ function this.GetBattleServerData(msg, isFightPlayer) position = position, star = star, skinId=skin, + job=HeroConfig[rid].Job, camp = 1, type = 1, quality = 0, @@ -545,6 +548,7 @@ function this.GetBattlePlayerData(fId) camp = 0, type = 1, quality = 0, + job=HeroConfig[heroData.id].Job, element = HeroConfig[heroData.id].PropertyName, professionId = heroData.profession, } From 8b72027fcbff22e64814fb717913305ab4dd29eb Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 8 Jan 2021 19:51:26 +0900 Subject: [PATCH 07/13] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=20?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E8=A1=A8=E7=8E=B0=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=95=8C=E6=88=91=E6=96=B9=E6=AD=BB=E4=BA=A1=E5=90=8E?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=8A=A0=E6=80=92=E6=B0=94=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/Unit/EnemyView.lua | 3 +++ .../~Lua/Modules/Battle/View/Unit/PlayerView.lua | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index 3223ec9bc6..f158cd2cfa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -460,6 +460,9 @@ end -- 怒气值改变 function EnemyView:RoleRageChange(deltaRage) + if self.role:IsRealDead() then + return + end if deltaRage ~= 0 then if deltaRage > 0 then self.Floater:ImageBuffFloating("z_zhandou_nuqijia", nil, deltaRage) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index 0fb2959604..b2259a5a1d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -518,6 +518,9 @@ end -- 怒气值改变 function PlayerView:RoleRageChange(deltaRage) + if self.role:IsRealDead() then + return + end if deltaRage ~= 0 then if deltaRage > 0 then self.Floater:ImageBuffFloating("z_zhandou_nuqijia", nil, deltaRage) From 7ad4f0fe1bf9a7283c6c15e6713b125c9bf876c4 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 9 Jan 2021 10:58:15 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E6=88=98=E6=96=97=E5=BC=80=E5=A7=8B=E6=8A=80=E8=83=BD=E6=8A=A5?= =?UTF-8?q?=E9=94=99=EF=BC=8C=E7=81=B5=E5=85=BD=E6=8A=80=E8=83=BD=E9=87=8A?= =?UTF-8?q?=E6=94=BEcasting=E4=BA=8B=E4=BB=B6=E5=BB=B6=E9=95=BF=E5=88=B02?= =?UTF-8?q?=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua | 2 +- .../~Lua/Modules/Battle/View/Unit/SkillCaster.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index a5479294d2..46d9935a5f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -373,7 +373,7 @@ function this.GetBattleServerData(msg, isFightPlayer) position = position, star = star, skinId=skin, - job=HeroConfig[monsterConfig.monsterId].Job, + job=HeroConfig[monsterConfig.MonsterId].Job, camp = 1, type = monsterConfig.Type, quality = monsterConfig.Quality, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua index 073c8754dc..670ea3ea3d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua @@ -119,7 +119,7 @@ function SkillCaster:PlaySkillCastingEffect(combat, skill, func) self.owner:OnSkillCastingStart() end - self.owner:DelayFunc(1, function() + self.owner:DelayFunc(2, function() self.castingEfectNode:SetActive(false) -- 调用上层接口 From 3ed952153cc921decf15c2dbb53621d758b55e4b Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 9 Jan 2021 10:59:50 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=98=E6=96=97=E7=BB=93=E6=9D=9F=E5=90=8E?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 46d9935a5f..29d88007d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -849,6 +849,7 @@ function this.GetBattleSorting() if UIManager.IsOpen(UIName.GuideBattlePanel) then return GuideBattlePanel.sortingOrder end + return 0 end -- 判断是否是战斗测试 From 90750c9617208674e3698a9d29a71d64e07cf26a Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 9 Jan 2021 15:06:00 +0900 Subject: [PATCH 10/13] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=20=E6=98=BE=E7=A4=BA=E5=B1=82?= =?UTF-8?q?=E4=BC=A4=E5=AE=B3=E6=98=BE=E7=A4=BA=E5=B1=8F=E8=94=BD=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=20=20=20=20=20118=EF=BC=8C121=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Effect.lua | 4 ++-- .../~Lua/Modules/Battle/View/Unit/FloatNode.lua | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index ca00202f2f..a9d65748cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -2272,7 +2272,7 @@ local effectList = { local f1 = args[2] BattleLogic.WaitForTrigger(interval, function () - local damage = BattleUtil.ErrorCorrection(f1 * caster:GetRoleData(BattlePropList[pro])) + local damage = floor(BattleUtil.ErrorCorrection(f1 * caster:GetRoleData(BattlePropList[pro]))) BattleUtil.FinalDamage(skill, caster, target, damage, nil, 0, nil, true) end) end, @@ -2335,7 +2335,7 @@ local effectList = { local f1 = args[2] BattleLogic.WaitForTrigger(interval, function () - local damage = BattleUtil.ErrorCorrection(f1 * target:GetRoleData(BattlePropList[pro])) + local damage = floor(BattleUtil.ErrorCorrection(f1 * target:GetRoleData(BattlePropList[pro]))) BattleUtil.FinalDamage(skill, caster, target, damage, nil, 0, nil, true) end) end, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua index 702b481d9b..09c14d439f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/FloatNode.lua @@ -2,7 +2,7 @@ FloatNode = {} local floatingEffect = "FloatingText" local buffFloatingEffect = "BuffFloatingText" - +local floor = math.floor -- 普通文字 TextFloatingColor = { Blue = 1, @@ -152,6 +152,7 @@ end function FloatNode:GetArtText(type, color, value) local text = "" + value=floor(value) if type == ArtFloatingType.CritDamage then text = text .. string.char(33) -- 暴击文字 text = text .. string.char((color*2)+110) -- 减号 From a1ce0ee92c196e3207b3cf3bfecc8c8f4bdc2fa3 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 9 Jan 2021 16:44:15 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E3=80=905=E7=82=B9=E6=94=B90=E7=82=B9?= =?UTF-8?q?=E3=80=91=20=E9=A6=96=E5=86=B2=E8=AE=A1=E6=97=B6=E6=9C=AA?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index e7e26efb5a..ee01b6528e 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1258,7 +1258,7 @@ function GetTimePass(timeValue) tab.sec = 0 local tab2 = os.date("*t", timeValue) - tab2.hour = 5 + tab2.hour = 0 tab2.min = 0 tab2.sec = 0 local timeStartSum = os.time(tab2) From 7f0786065eba92738ffbae06325f5534ad135b28 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 9 Jan 2021 17:03:47 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E3=80=90=E9=93=9C=E5=A2=99=E9=93=81?= =?UTF-8?q?=E5=A3=81=E3=80=91=E8=B5=84=E6=BA=90=E4=BD=8D=E7=BD=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ongQiangTieBi.meta => DyAct_TongQiangTieBi.meta} | 0 .../l_lingshou_jinwu.png | Bin .../l_lingshou_jinwu.png.meta | 2 +- .../t_tongqiangtiebi_banner.jpg | Bin .../t_tongqiangtiebi_banner.jpg.meta | 2 +- .../t_tongqiangtiebi_icon1.png | Bin .../t_tongqiangtiebi_icon1.png.meta | 2 +- .../t_tongqiangtiebi_icon2.png | Bin .../t_tongqiangtiebi_icon2.png.meta | 2 +- .../t_tongqiangtiebi_shenjiang1.png | Bin .../t_tongqiangtiebi_shenjiang1.png.meta | 2 +- .../t_tongqiangtiebi_shenjiang2.png | Bin .../t_tongqiangtiebi_shenjiang2.png.meta | 2 +- .../t_tongqiangtiebi_shenjiang3.png | Bin .../t_tongqiangtiebi_shenjiang3.png.meta | 2 +- .../t_tongqiangtiebi_zi.png | Bin .../t_tongqiangtiebi_zi.png.meta | 2 +- 17 files changed, 8 insertions(+), 8 deletions(-) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi.meta => DyAct_TongQiangTieBi.meta} (100%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/LingShouBaoGe => DyAct_TongQiangTieBi}/l_lingshou_jinwu.png (100%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/LingShouBaoGe => DyAct_TongQiangTieBi}/l_lingshou_jinwu.png.meta (97%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_banner.jpg (100%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_banner.jpg.meta (97%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_icon1.png (100%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_icon1.png.meta (97%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_icon2.png (100%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_icon2.png.meta (97%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_shenjiang1.png (100%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_shenjiang1.png.meta (97%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_shenjiang2.png (100%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_shenjiang2.png.meta (97%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_shenjiang3.png (100%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_shenjiang3.png.meta (97%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_zi.png (100%) rename Assets/ManagedResources/Atlas/{DynamicActivityAtlas/TongQiangTieBi => DyAct_TongQiangTieBi}/t_tongqiangtiebi_zi.png.meta (97%) diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi.meta b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi.meta similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi.meta rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi.meta diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/LingShouBaoGe/l_lingshou_jinwu.png b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/l_lingshou_jinwu.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/LingShouBaoGe/l_lingshou_jinwu.png rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/l_lingshou_jinwu.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/LingShouBaoGe/l_lingshou_jinwu.png.meta b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/l_lingshou_jinwu.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/LingShouBaoGe/l_lingshou_jinwu.png.meta rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/l_lingshou_jinwu.png.meta index a304af739a..7732104f24 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/LingShouBaoGe/l_lingshou_jinwu.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/l_lingshou_jinwu.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_TongQiangTieBi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_banner.jpg b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_banner.jpg similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_banner.jpg rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_banner.jpg diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_banner.jpg.meta b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_banner.jpg.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_banner.jpg.meta rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_banner.jpg.meta index fbaee8d627..e776d99230 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_banner.jpg.meta +++ b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_banner.jpg.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_TongQiangTieBi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon1.png b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_icon1.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon1.png rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_icon1.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon1.png.meta b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_icon1.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon1.png.meta rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_icon1.png.meta index be8abf420c..6f48d8ece2 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon1.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_icon1.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_TongQiangTieBi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon2.png b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_icon2.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon2.png rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_icon2.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon2.png.meta b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_icon2.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon2.png.meta rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_icon2.png.meta index 222bb2ed9b..f95273b7b2 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon2.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_icon2.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_TongQiangTieBi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png.meta b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png.meta rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png.meta index f7e2a3a826..c167b36534 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_TongQiangTieBi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png.meta b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png.meta rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png.meta index aff8b512dc..db252bb78e 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_TongQiangTieBi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png.meta b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png.meta rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png.meta index f7f964b7c4..412b63d065 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_TongQiangTieBi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_zi.png b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_zi.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_zi.png rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_zi.png diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_zi.png.meta b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_zi.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_zi.png.meta rename to Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_zi.png.meta index 2ea74d3b3e..c3fb64c7bf 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_zi.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_TongQiangTieBi/t_tongqiangtiebi_zi.png.meta @@ -80,7 +80,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: DynamicActivityAtlas + spritePackingTag: DyAct_TongQiangTieBi pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: From be60660dcc1f3ab35dda884119b667118348546c Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 9 Jan 2021 17:19:21 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E6=8F=B4?= =?UTF-8?q?=E5=8A=A9=E3=80=91=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua index fe303b4c93..a313e5750f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua @@ -103,7 +103,7 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function this:OnShow() --this - this.refreshText.text = Language[11009] + this.refreshText.text = "每日凌晨0点重置求援次数" this.ShowPanelData() end function this.ShowPanelData()