From 7d3e8fd73de79f8376af95b85071ca58c120dd14 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 26 Jan 2022 10:29:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E7=B4=AB=E5=BA=9C=E7=A5=9E=E5=8D=B0]=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E7=B4=AB=E5=BA=9C=E7=A5=9E=E5=8D=B0=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Practice/PracticeImprintPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua index 7263f1b8f1..eaa8caa124 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua @@ -258,7 +258,7 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData) proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) local star,starType = heroData.GetStar(1) SetHeroStars(self.spLoader,starGrid, star,starType) - SetHeroFlyEffect(Util.GetGameObject(self.head, "GameObject"),self.spLoader,heroData.star,self.sortingOrder+1,1,3,0) + SetHeroFlyEffect(Util.GetGameObject(self.itemPre, "GameObject"),self.spLoader,heroData.star,self.sortingOrder+1,1,3,0) Util.SetParticleSortLayer(starGrid,self.sortingOrder + 1) curhero = _serverData.subId else From 4af86c7e7f1416d439cbc5c300ba8ff81dd1d139 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 26 Jan 2022 13:29:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=E5=BE=A1=E7=94=B2=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E5=80=BC=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/Buff/Blood.lua | 16 ++++++++-------- .../Modules/Battle/Logic/Misc/BattleUtil.lua | 6 ++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Blood.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Blood.lua index be25c277d4..974b557054 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Blood.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Blood.lua @@ -4,8 +4,8 @@ Blood = Buff:New() function Blood:SetData(...) -- 刷新排序等级 - self.bloodValue=... - + --self.bloodValue=... + self.bloodValue=0 self.sort = 4 end @@ -23,12 +23,12 @@ 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) + --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() return self.bloodValue diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index e3d3ccc24c..015af0a1e6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -1307,13 +1307,15 @@ end function BattleUtil.AddBlood(target,value) if not target.isBanBlood then if target.bloodShield then - BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime*2,function() + --BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime*2,function() target.bloodShield:AddValue(value) - end) + --end) else local buff=Buff.Create(target, BuffName.Blood,0,value) target:AddBuff(buff) target.bloodShield=buff + target.bloodShield:AddValue(value) + --target.bloodShield:star end else target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Blood) From 1597c0b657d9ec783194fbf18af441582419d3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BD=AA?= <2han9b1a0@gmial.com> Date: Wed, 26 Jan 2022 13:40:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E7=89=B9=E6=9D=83=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E3=80=91=E6=97=A0=E6=B3=95=E8=B4=AD=E4=B9=B0=E6=9C=80?= =?UTF-8?q?=E5=90=8Ei=E4=B8=80=E4=B8=AA=E5=90=8D=E6=9C=9B=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=EF=BC=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/ActivityGift/ActivityGiftManager.lua | 4 ++-- .../~Lua/Modules/Recharge/View/EveryDayGiftNew.lua | 4 ++-- .../~Lua/Modules/Recharge/View/RechargeViewNew.lua | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 97ba7804c5..4c11f56a45 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index cae7181316..b4df19b01e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -260,8 +260,8 @@ function EveryDayGiftNew:RefreshReward(Data) if Data.data.limitNum - Data.data.boughtNum > 0 then -- LogYellow(tostring(rechargeNum).." "..tostring(Data.data.shopItemData.BuyRule[2])) if rechargeNum >= Data.data.shopItemData.BuyRule[2] then - -- LogPink(tostring(BagManager.GetItemCountById(Data.data.costId)).." "..tostring(Data.data.shopItemData.BuyRule[2])) - if BagManager.GetItemCountById(Data.data.costId) >= Data.data.shopItemData.BuyRule[2] then + -- LogPink(tostring(BagManager.GetItemCountById(Data.data.costId)).." "..tostring(Data.data.price)) + if BagManager.GetItemCountById(Data.data.costId) >= Data.data.price then -- LogBlue(tostring(Data.data.shopItemData.buyType).." "..tostring(Data.data.shopData.id)) ShopManager.RequestBuyShopItem(Data.buyType, Data.data.shopData.id, 1, function() self:SetGrowGift() diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 9a1a2d8ee7..67e457bc27 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -177,7 +177,7 @@ function RechargeViewNew:RefreshReward(Data) -- LogYellow(tostring(rechargeNum).." "..tostring(Data.data.shopItemData.BuyRule[2])) if rechargeNum >= Data.data.shopItemData.BuyRule[2] then -- LogPink(tostring(BagManager.GetItemCountById(Data.data.costId)).." "..tostring(Data.data.shopItemData.BuyRule[2])) - if BagManager.GetItemCountById(Data.data.costId) >= Data.data.shopItemData.BuyRule[2] then + if BagManager.GetItemCountById(Data.data.costId) >= Data.data.price then -- LogBlue(tostring(Data.data.shopItemData.buyType).." "..tostring(Data.data.shopData.id)) ShopManager.RequestBuyShopItem(Data.buyType, Data.data.shopData.id, 1, function() self:SetGrowGift()