From 075101090d3c29d325df9c801a5d60a14003ea40 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 8 Apr 2021 20:52:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E9=A6=96=E5=85=85=E3=80=91?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/FirstRecharge/FirstRechargePanel.prefab | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab index ae9a10a357..77e1a8bd1d 100644 --- a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab @@ -4644,7 +4644,7 @@ ParticleSystem: --- !u!199 &1481527221194107646 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10638,7 +10638,7 @@ ParticleSystem: --- !u!199 &1481527221797319403 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15867,7 +15867,7 @@ ParticleSystem: --- !u!199 &1481527222190047225 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20644,7 +20644,7 @@ ParticleSystem: --- !u!199 &1481527222294757571 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25630,7 +25630,7 @@ ParticleSystem: --- !u!199 &1481527222605618109 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30319,7 +30319,7 @@ ParticleSystem: --- !u!199 &1481527222633079609 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35352,7 +35352,7 @@ ParticleSystem: --- !u!199 &1481527223089183893 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35869,7 +35869,7 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 38 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 44 m_Alignment: 4 @@ -38334,7 +38334,7 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 38 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 44 m_Alignment: 4 From 19ba1ffc5ab6405b1ca6d97b334b17144140c55f Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 8 Apr 2021 21:03:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E5=88=86=E8=A7=A3=E3=80=91?= =?UTF-8?q?=E7=A5=9E=E5=B0=86=E8=BE=BE=E5=88=B0=E4=B8=8A=E9=99=90=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=90=8E=EF=BC=8C=E5=86=8D=E8=8E=B7=E5=BE=97?= =?UTF-8?q?=E7=A5=9E=E5=B0=86=E4=BE=9D=E7=84=B6=E6=8F=90=E7=A4=BA=E5=B7=B2?= =?UTF-8?q?=E8=BE=BE=E4=B8=8A=E9=99=90=EF=BC=8C=E9=87=8D=E7=99=BB=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/EightDayGift/EightDayGiftPanel.prefab | 30 +++++++++++++++---- .../Modules/Bag/BagResolveAnCompoundPanel.lua | 2 +- .../Popup/RewardItemSingleShowPopup.lua | 3 +- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/EightDayGift/EightDayGiftPanel.prefab b/Assets/ManagedResources/Prefabs/UI/EightDayGift/EightDayGiftPanel.prefab index 8795ed970b..31eb65f5e6 100644 --- a/Assets/ManagedResources/Prefabs/UI/EightDayGift/EightDayGiftPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/EightDayGift/EightDayGiftPanel.prefab @@ -5107,7 +5107,7 @@ ParticleSystem: --- !u!199 &4686382907089013049 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10501,7 +10501,7 @@ ParticleSystem: --- !u!199 &9024823682437842000 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15497,7 +15497,7 @@ ParticleSystem: --- !u!199 &3349493174350808778 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15774,6 +15774,7 @@ GameObject: - component: {fileID: 8831489817173743925} - component: {fileID: 2823244858404267734} - component: {fileID: 1666511982042220401} + - component: {fileID: 423540173281187702} m_Layer: 5 m_Name: btnBack m_TagString: Untagged @@ -15879,6 +15880,25 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &423540173281187702 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4755461667711632052} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &4858409445642786380 GameObject: m_ObjectHideFlags: 0 @@ -20671,7 +20691,7 @@ ParticleSystem: --- !u!199 &2398997576238749712 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25815,7 +25835,7 @@ ParticleSystem: --- !u!199 &2656224703081973911 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index f0e84a2539..c8508ba017 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -298,7 +298,7 @@ function this.OnShowLayout3Data() this.btnCompoundText.text=Language[10193] local maxCompoundValue = math.floor(itemData.num/itemData.itemConfig.UsePerCount) compoundMaxNum=maxCompoundValue > gameSetting.HeroCompoundLimit and gameSetting.HeroCompoundLimit or maxCompoundValue - endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.heroDataLists) + endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas()) compoundMaxNum=compoundMaxNum >endHeroNum and endHeroNum or compoundMaxNum elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱 this.nameText.text=Language[10194] diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index b608c6d7da..8a4b301613 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -58,9 +58,8 @@ function RewardItemSingleShowPopup:BindEvent() local item={} item.itemId= _itemData.id item.itemNum=compoundNum*_itemData.itemConfig.UsePerCount - Log("sssssssssssssss "..item.itemId.." "..item.itemNum) local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) - local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.heroDataLists) + local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas()) if endHeroNum > 0 then NetManager.HeroComposeRequest(item,function (drop) this.SendBackCompoundReCallBack(drop) From a3647d7cbeb68974563d39ead3673b3e8dc5b63d Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 8 Apr 2021 21:07:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E6=8E=92=E8=A1=8C=E6=A6=9C?= =?UTF-8?q?=E3=80=91=E4=B8=8E=E6=8E=92=E8=A1=8C=E7=AC=AC=E4=B8=80=E5=88=87?= =?UTF-8?q?=E7=A3=8B=E5=90=8E=E8=BF=94=E5=9B=9E=EF=BC=8C=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=B0=8F=E4=BA=BA=E5=BD=A2=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Ranking/RankingSingleListPanel.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index d858cc0ef0..7434bdfc64 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -82,9 +82,6 @@ function RankingSingleListPanel:OnClose() SoundManager.PlayOldMusic() RankingManager.isRequest=0 this.noneImage:SetActive(false) - if npc then - npc:OnClose() - end -- if this.liveNode then -- --Log("==YSP== 删除立绘") -- poolManager:UnLoadLive(npc, this.liveNode) From d19f1cce1cda46197dffb5d224a00e4c3c65bc7d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 8 Apr 2021 21:09:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D?= =?UTF-8?q?=E8=A2=AB=E5=8A=A8214=EF=BC=8C238=E4=BF=AE=E6=94=B9=20=20=20=20?= =?UTF-8?q?=20bug:1014491=20=20=20=201013881?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 61ef382f09..cd66d68ec8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -4513,7 +4513,7 @@ local passivityList = { local list = RoleManager.Query(function(r) return r.camp == defRole.camp and r ~= defRole end) for _, r in ipairs(list) do local dd = floor(BattleUtil.ErrorCorrection(damage* f1)) - BattleUtil.ApplyDamage(nil, role, r, dd) + BattleUtil.ApplyDamage(nil, atkRole, r, dd) end end end @@ -5047,8 +5047,29 @@ local passivityList = { local ct2 = args[7] if OutDataManager.GetOutData(role.camp,id) == flr then + local hp=0 + local hp2=0 + --如果提升的是血量上限 + if pro1==12 or pro2==12 then + hp = role:GetRoleData(RoleDataName.Hp) / role:GetRoleData(RoleDataName.MaxHp) + end BattleUtil.AddProp(role, pro1, f1, ct1) BattleUtil.AddProp(role, pro2, f2, ct2) + --如果提升的是血量上限 + if pro1==12 or pro2==12 then + hp2 = role:GetRoleData(RoleDataName.Hp) / role:GetRoleData(RoleDataName.MaxHp) + local pro=hp-hp2 + local treat= floor(BattleUtil.ErrorCorrection(role:GetRoleData(RoleDataName.MaxHp)*pro)) + role.data:AddValue(RoleDataName.Hp, treat) + BattleLogManager.Log( + "Final Treat", + "acamp", role.camp, + "apos", role.position, + "tcamp", role.camp, + "tpos", role.position, + "value", treat + ) + end end end, -- 猎妖之路专属