From ce86215f537208a3578f2c590c053ea32a778640 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 4 Nov 2021 16:20:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=98=9F=E6=98=9F=E6=95=B0=E5=B0=91?= =?UTF-8?q?=E4=BA=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 1ab0a41da8..1d6c64d448 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -474,7 +474,7 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot end elseif star < 6 then for i = 2, 24 do - if i <= star then + if i < star then starPre.transform:GetChild(i - 1):GetComponent("Image").sprite = spLoader:LoadSprite(GetHeroStarImage[1]) starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize if rotation then @@ -487,7 +487,7 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot end elseif star > 5 and star < 10 then for i = 2, 24 do - if i <= star - 4 then + if i < star - 4 then starPre.transform:GetChild(i - 1):GetComponent("Image").sprite = spLoader:LoadSprite(GetHeroStarImage[2]) starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize if rotation then From 96c77fd03368b7b0c84d46defd9fda58a8348c0e Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 4 Nov 2021 16:48:34 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E5=91=A8=E5=8D=A1=E3=80=91?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=BF=87=E9=95=BF=E7=94=A8=E4=B8=87=E5=AD=97?= =?UTF-8?q?=E7=9C=81=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/WeekCardPage.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPage.lua index 6912d18887..0ed25580d8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPage.lua @@ -114,15 +114,15 @@ function WeekCardPage:SetCardShow(index, data) itemId = config.BaseReward[1][1] dayNum = config.BaseReward[1][2] end - pre.dayNum.text = dayNum + pre.dayNum.text = PrintWanNum2(dayNum) -- 当前累计奖励数量 local curNum = dayNum * data.leaveGetRewardDays or 0 - pre.curNum.text = curNum + pre.curNum.text = PrintWanNum2(curNum) pre.curNum.transform.parent.gameObject:SetActive(curNum ~= 0) -- 累计数量为0时不显示 -- 总奖励数量 local continueDay = config.ContiueDays or 0 local allNum = dayNum * continueDay - pre.allNum.text = allNum + pre.allNum.text = PrintWanNum2(allNum) -- 设置物品图片显示 local sprite = SetIcon(self.spLoader, itemId) pre.icon.sprite = sprite From 661ea274212621aedb2d064d3a8eaee79cc6fe3b Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 4 Nov 2021 16:57:06 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E8=A2=AB=E5=8A=A8357=E4=BF=AE=E6=94=B9=20=20=20=E5=BE=A1?= =?UTF-8?q?=E7=94=B2buff=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 3 --- .../~Lua/Modules/Battle/Logic/Buff/Blood.lua | 9 +++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 9fa7d0fb85..9c4e81a23f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -8556,9 +8556,6 @@ local passivityList = { return end - if not buff.skill then - return - end if type==BuffName.DOT then if buff.damageType~=type2 then return diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Blood.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Blood.lua index a8d305f84a..7970d4ec17 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Blood.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Blood.lua @@ -5,10 +5,7 @@ function Blood:SetData(...) -- 刷新排序等级 self.bloodValue=... - local passiveChange=function(addValue) - self.bloodValue=self.bloodValue+addValue - end - BattleLogic.Event:DispatchEvent(BattleEventName.BloodValuePassiveChange,passiveChange,self.target,self.caster,self.bloodValue) + self.sort = 4 end @@ -27,6 +24,10 @@ end --初始化后调用一次 function Blood:OnStart() self.target.bloodShield = self + local passiveChange=function(addValue) + self.bloodValue=self.bloodValue+addValue + end + BattleLogic.Event:DispatchEvent(BattleEventName.BloodValuePassiveChange,passiveChange,self.target,self.caster,self.bloodValue) self.target.Event:DispatchEvent(BattleEventName.BloodValueChange,self.bloodValue/self.target:GetRoleData(RoleDataName.MaxHp),1,self.bloodValue) end function Blood:GetCurValue() From 671de8334950e8b7fd81cd4b96fc591774b7fe5c Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 4 Nov 2021 18:10:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E5=A4=A9=E4=B9=A6=E5=AF=86?= =?UTF-8?q?=E5=8D=B7=E3=80=91=E4=BF=AE=E5=A4=8D=E8=BF=94=E5=9B=9E=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=92=8C=E9=A1=B5=E7=AD=BE=E9=81=AE=E6=8C=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab index 3331150878..54f0b1fe91 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab @@ -2415,9 +2415,9 @@ RectTransform: m_Father: {fileID: 6861030463589856289} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -536.9, y: 50.1} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 50.1} m_SizeDelta: {x: 806.3, y: 100.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3105191926613661990 From e39bbe2dc1f34e1a5094e6e814f0e13d6325106d Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 4 Nov 2021 18:53:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E8=BD=A9=E8=BE=95=E5=AE=9D?= =?UTF-8?q?=E9=95=9C=E3=80=91=E4=BF=AE=E5=A4=8D=E5=A6=82=E6=9E=9C=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E6=9C=89=E4=B8=A4=E4=B8=AA=E7=9B=B8=E5=90=8C=E7=9A=84?= =?UTF-8?q?=E6=88=98=E5=8A=9B=E8=BE=83=E9=AB=98=E7=9A=84=E7=A5=9E=E5=B0=86?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=B0=91=E4=B8=8A=E9=98=B5?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BD=8D=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Formation/View/XuanYuanMirrorFormation.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua index 77f5042a88..5fa1d61ff1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua @@ -72,9 +72,11 @@ function this.GetOneKeyUpHeroList() -- 限制数量 local upList = {} for k, v in ipairs(tempHeros) do - if #heros < rulesNum then - table.insert(heros, v) - upList[v.dynamicId] = 1 + if not upList[v.heroConfig.Id] then + if #heros < rulesNum then + table.insert(heros, v) + upList[v.heroConfig.Id] = 1 + end end end -- 所有英雄,按战力补位 @@ -87,7 +89,7 @@ function this.GetOneKeyUpHeroList() end end) for k, v in ipairs(allHeros) do - if not upList[v.dynamicId] then + if not upList[v.heroConfig.Id] then if #heros < 6 then table.insert(heros, v) end