From 599ef2e0fc20bfb70ebb794a094fdfc48956f2f7 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 10 Feb 2022 15:29:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=E8=A2=AB=E5=8A=A8356=20=20422=20=20=20=E6=8A=80=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=20108=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/Effect.lua | 26 +++++++++++--- .../Modules/Battle/Logic/Base/Passivity.lua | 35 +++++++++++++++++-- .../Modules/Battle/Logic/Misc/BattleUtil.lua | 3 +- 3 files changed, 55 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index d550a6c5f0..b45ce78798 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -2051,8 +2051,8 @@ local effectList = { - -- 造成[a]%的[b]伤害如果目标[c]且[d]低于[e]则有[F]%概率将其秒杀 - -- a[float]b[伤害类型]c[持续伤害类型]d[属性]e[float]f[float] + -- 造成[a]%的[b]伤害如果目标[c]且[d]低于[e]则有[F]%概率将其秒杀,灭有一层c状态,增加[g]%暴毙率,暴毙伤害提升[h]%,最多提高[i]层 + -- a[float],b[伤害类型],c[持续伤害类型],d[属性],e[float],f[float],g[float],h[float],i[int] [108] = function(caster, target, args, interval, skill) local f1 = args[1] local dt = args[2] @@ -2060,22 +2060,38 @@ local effectList = { local pro1 = args[4] local f2 = args[5] local f3 = args[6] + local v1 = args[7] + local v2 = args[8] + local v3 = args[9] + if v1==nil then + v1=0 + end + if v2==nil then + v2=0 + end + if v3==nil then + v3=0 + end caster.Event:DispatchEvent(BattleEventName.RoleViewBullet, skill, target) BattleLogic.WaitForTrigger(interval, function () local isSecKill = false if BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function (buff) return dot == 0 or buff.damageType == dot end,caster,dot) then -- 检测被动技能对秒杀参数得影响 f2, f3 = BattleUtil.CheckSeckill(f2, f3, caster, target) - -- + local list=BattleLogic.BuffMgr:GetAllBuffByFunc(function(buff) return buff.target==target and dot == 0 or buff.damageType == dot end) + local len=BattleUtil.LengthOfTable(list) + if len>v3 then + len=v3 + end local ft = target:GetRoleData(RoleDataName.Hp)/target:GetRoleData(RoleDataName.MaxHp) if ft < f2 then - isSecKill = BattleUtil.RandomAction(f3, function() + isSecKill = BattleUtil.RandomAction(f3+len*v1, function() -- 秒杀 local isBoss=BattleUtil.CheckIsBoss(target) if isBoss then return end - BattleUtil.Seckill(skill, caster, target) + BattleUtil.Seckill(skill, caster, target,v2*len) end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 501222ef43..a16c72d94b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -8678,8 +8678,8 @@ local passivityList = { end BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,onRoundChange,nil,nil,role) end, - -- 修改技能id:[a] 技能类型:[b]的参数,第[c]个参数改变为[d],第[e]个参数改变为[f] - -- a[int 技能的id],b[int 技能的type类型],c[int],d[float/int],e[int],f[int/float] + -- 修改技能id:[a] 技能类型:[b]的参数,第[c]个参数改变为[d],第[e]个参数改变为[f],第[g]个参数改变为[h] + -- a[int 技能的id],b[int 技能的type类型],c[int],d[float/int],e[int],f[int/float],g[int],h[int/float] [356] = function(role, args,id,judge) local id = args[1] local type = args[2] @@ -8687,6 +8687,8 @@ local passivityList = { local v1 = args[4] local i2 = args[5] local v2 = args[6] + local i3 = args[7] + local v3 = args[8] local onSkillEffectBefore = function(skill, e, func) if skill.type == BattleSkillType.Special then if skill.id == id and e.type == type then @@ -8696,6 +8698,9 @@ local passivityList = { if e.args[i2] then e.args[i2] = v2 end + if e.args[i3] then + e.args[i3] = v3 + end if func then func(e) end end end @@ -10840,7 +10845,31 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit,nil,nil,role) end, - + --触发不灭后,技能额外造成目标[a][b]%的伤害。 + --a[int 属性id] b[float] + [422]=function(role,args,id,judge) + local f1 = args[1] + local dt = args[2] + -- 直接伤害后 + local onPassiveDamaging = function(func, defRole, damage,skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if not BattleLogic.BuffMgr:HasBuff(role,BuffName.NoDead) then + return + end + --观音,这个被动只有额外技能才能触发 by:王振兴 2021/1/21 17:48 + if skill and (skill.type == BattleSkillType.Extra or skill.type == BattleSkillType.Special) then + --如果是boss 并且额外伤害是根据最大生命则返回 + if (f1==12 or f1==13) and BattleUtil.CheckIsBoss(defRole) then + return + end + local val = floor(BattleUtil.FP_Mul(dt, defRole:GetRoleData(BattlePropList[f1]))) + BattleUtil.FinalDamageCountShield(nil,role,defRole,val) + end + end + role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role) + end, } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 015af0a1e6..ea53019f13 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -563,12 +563,13 @@ function BattleUtil.CheckIsBoss(role) end -- 秒杀 -function BattleUtil.Seckill(skill, atkRole, defRole) +function BattleUtil.Seckill(skill, atkRole, defRole,addDamagePro) -- 灵兽无效 if defRole.type == BattleUnitType.Monster or defRole.type == BattleUnitType.Player then return end local damage = defRole:GetRoleData(RoleDataName.Hp) + damage=floor(BattleUtil.FP_Mul(damage,1+addDamagePro)) local finalDmg = defRole.data:SubValue(RoleDataName.Hp, damage) if finalDmg >= 0 then if defRole:GetRoleData(RoleDataName.Hp) <= 0 and not defRole:IsDead() then From bd5d09def029f917fc2ccdfe86a9515bf304e034 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 10 Feb 2022 16:49:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90ID1011132=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BC=98=E5=8C=96=E3=80=91=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E8=B1=AA=E7=A4=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DailyRecharge/DailyRechargePanel.prefab | 564 ++++++++++-------- .../DailyRecharge/DailyRechargePanel.lua | 33 +- 2 files changed, 343 insertions(+), 254 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab index 49b2c2669f..632beb6be3 100644 --- a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6157198575599046546} + - {fileID: 3745360341016640850} - {fileID: 3456949296994544259} - {fileID: 6296100240130870523} m_Father: {fileID: 7301020580712938050} @@ -496,6 +496,101 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &704168234238995471 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1117330747498089113} + - component: {fileID: 4176292560204997969} + - component: {fileID: 7120593114457184631} + - component: {fileID: 1867367817867730403} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1117330747498089113 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704168234238995471} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6046644362136523165} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -7.96, y: 0.21} + m_SizeDelta: {x: 106.51, y: 105.91} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4176292560204997969 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704168234238995471} + m_CullTransparentMesh: 0 +--- !u!114 &7120593114457184631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704168234238995471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9843138, g: 0.909804, b: 0.56078434, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "18\u5143" +--- !u!114 &1867367817867730403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704168234238995471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.6862745, g: 0.4784314, b: 0.10588236, a: 0.5} + m_EffectDistance: {x: 1.5, y: -1.5} + m_UseGraphicAlpha: 1 --- !u!1 &714644459001502146 GameObject: m_ObjectHideFlags: 0 @@ -506,7 +601,8 @@ GameObject: m_Component: - component: {fileID: 4799306814106429235} - component: {fileID: 4661878256046023183} - - component: {fileID: 7724174491585962220} + - component: {fileID: 570714755730235788} + - component: {fileID: 5442346987183311359} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -530,8 +626,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 75, y: 39} + m_AnchoredPosition: {x: -7.96, y: 0.21} + m_SizeDelta: {x: 106.51, y: 105.91} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4661878256046023183 CanvasRenderer: @@ -541,7 +637,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 714644459001502146} m_CullTransparentMesh: 0 ---- !u!114 &7724174491585962220 +--- !u!114 &570714755730235788 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -550,26 +646,141 @@ MonoBehaviour: m_GameObject: {fileID: 714644459001502146} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.6901961, g: 0.65882355, b: 0.48235297, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7d326efded35273479ca213776851301, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "18\u5143" +--- !u!114 &5442346987183311359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714644459001502146} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.44705886, g: 0.3372549, b: 0.13725491, a: 0.5} + m_EffectDistance: {x: 1.5, y: -1.5} + m_UseGraphicAlpha: 1 +--- !u!1 &730266691974805705 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3745360341016640850} + - component: {fileID: 8320324087515932539} + - component: {fileID: 6201493695334616405} + - component: {fileID: 9066558882436217658} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3745360341016640850 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730266691974805705} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5619197308840722705} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -7.96, y: 0.21} + m_SizeDelta: {x: 106.51, y: 105.91} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8320324087515932539 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730266691974805705} + m_CullTransparentMesh: 0 +--- !u!114 &6201493695334616405 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730266691974805705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.6901961, g: 0.65882355, b: 0.48235297, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "18\u5143" +--- !u!114 &9066558882436217658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730266691974805705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.44705886, g: 0.3372549, b: 0.13725491, a: 0.5} + m_EffectDistance: {x: 1.5, y: -1.5} + m_UseGraphicAlpha: 1 --- !u!1 &730860949144446631 GameObject: m_ObjectHideFlags: 0 @@ -880,6 +1091,101 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1213125985772751716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5885292494882513412} + - component: {fileID: 1389884508449454462} + - component: {fileID: 250912736128292644} + - component: {fileID: 575614064578039097} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5885292494882513412 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1213125985772751716} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3865777398004124759} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -7.96, y: 0.21} + m_SizeDelta: {x: 106.51, y: 105.91} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1389884508449454462 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1213125985772751716} + m_CullTransparentMesh: 0 +--- !u!114 &250912736128292644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1213125985772751716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.6901961, g: 0.65882355, b: 0.48235297, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "18\u5143" +--- !u!114 &575614064578039097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1213125985772751716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.44705886, g: 0.3372549, b: 0.13725491, a: 0.5} + m_EffectDistance: {x: 1.5, y: -1.5} + m_UseGraphicAlpha: 1 --- !u!1 &1240416925317639214 GameObject: m_ObjectHideFlags: 0 @@ -39271,7 +39577,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1785626250951181298} + - {fileID: 5885292494882513412} - {fileID: 3027172422762333908} - {fileID: 3522782950735055791} m_Father: {fileID: 7301020580712938050} @@ -39391,7 +39697,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9012877642429734133} + - {fileID: 1117330747498089113} m_Father: {fileID: 1827622887959451477} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -58963,80 +59269,6 @@ RectTransform: m_AnchoredPosition: {x: 4.2, y: -272.9} m_SizeDelta: {x: 1080.9, y: 1919.5} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7614315457775369332 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9012877642429734133} - - component: {fileID: 2004116907988043367} - - component: {fileID: 8669632771756880089} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9012877642429734133 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7614315457775369332} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6046644362136523165} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 75, y: 39} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2004116907988043367 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7614315457775369332} - m_CullTransparentMesh: 0 ---- !u!114 &8669632771756880089 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7614315457775369332} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 38a25ea50f2918544b450a8b0c53d069, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &7708640474158185853 GameObject: m_ObjectHideFlags: 0 @@ -73436,80 +73668,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8125749947759857291} m_CullTransparentMesh: 0 ---- !u!1 &8249452742326429285 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1785626250951181298} - - component: {fileID: 8706785490226522164} - - component: {fileID: 9085802928117488892} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1785626250951181298 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8249452742326429285} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3865777398004124759} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 77, y: 39} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8706785490226522164 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8249452742326429285} - m_CullTransparentMesh: 0 ---- !u!114 &9085802928117488892 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8249452742326429285} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9781bd16df34fe342a8e05e35c5faa83, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &8262412935377313249 GameObject: m_ObjectHideFlags: 0 @@ -78442,80 +78600,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &8933236503346550858 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6157198575599046546} - - component: {fileID: 4903990147580067213} - - component: {fileID: 5416738527146912725} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6157198575599046546 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8933236503346550858} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5619197308840722705} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 76, y: 39} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4903990147580067213 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8933236503346550858} - m_CullTransparentMesh: 0 ---- !u!114 &5416738527146912725 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8933236503346550858} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 78ef5a2e12c7b874ba187ece4e09f331, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &9017701672859025087 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index ebf90e7155..d02a7b227e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -14,6 +14,8 @@ local missionIndex = { [198] = {selectIma = "r_mrcz_198_zh",selectImaRMB = "r_mrcz_198_zh",defaultIma = "r_mrcz_19801_zh",defaultImaRMB = "r_mrcz_19801_zh"}, [328] = {selectIma = "r_mrcz_328_zh",selectImaRMB = "r_mrcz_328_zh",defaultIma = "r_mrcz_32801_zh",defaultImaRMB = "r_mrcz_32801_zh"}, [648] = {selectIma = "r_mrcz_648_zh",selectImaRMB = "r_mrcz_648_zh",defaultIma = "r_mrcz_64801_zh",defaultImaRMB = "r_mrcz_64801_zh"}, + [50] = {selectIma = "r_mrcz_50_zh",selectImaRMB = "r_mrcz_50_zh",defaultIma = "r_mrcz_5001_zh",defaultImaRMB = "r_mrcz_5001_zh"}, + [100] = {selectIma = "r_mrcz_100_zh",selectImaRMB = "r_mrcz_100_zh",defaultIma = "r_mrcz_10001_zh",defaultImaRMB = "r_mrcz_10001_zh"}, } @@ -25,14 +27,15 @@ function DailyRechargePanel:InitComponent() self.title = Util.GetGameObject(self.backBtn, "bg/title"):GetComponent("Image") self.select = Util.GetGameObject(self.backBtn, "bg/select") - self.selectIma = Util.GetGameObject(self.select, "Text"):GetComponent("Image") - + --self.selectIma = Util.GetGameObject(self.select, "Text"):GetComponent("Image") + self.selectIma = Util.GetGameObject(self.select, "Text"):GetComponent("Text") self.grid = Util.GetGameObject(self.backBtn, "bg/grid") self.items = {} for i = 1,self.grid.transform.childCount do self.items[i] = {} self.items[i].go = Util.GetGameObject(self.grid,"item"..i) - self.items[i].priceText = Util.GetGameObject(self.items[i].go,"Text"):GetComponent("Image") + --self.items[i].priceText = Util.GetGameObject(self.items[i].go,"Text"):GetComponent("Image") + self.items[i].priceText = Util.GetGameObject(self.items[i].go,"Text"):GetComponent("Text") self.items[i].redpot = Util.GetGameObject(self.items[i].go,"red") end @@ -171,11 +174,12 @@ function DailyRechargePanel:SetGrid() else self.items[i].go.gameObject:SetActive(true) local config = actRewardConfig[self.actInfo.mission[i].missionId] - if MoneyUtil.MT == MoneyType.RMB then - self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultImaRMB) - else - self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultIma) - end + -- if MoneyUtil.MT == MoneyType.RMB then + -- self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultImaRMB) + -- else + -- self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultIma) + -- end + self.items[i].priceText.text = MoneyUtil.GetMoneyUnitNameWithMoney1(config.Values[1][1]) self.items[i].priceText:SetNativeSize() end end @@ -223,12 +227,13 @@ function DailyRechargePanel:SetSelectBtn() self.select.transform:SetParent(self.items[index].go.transform) self.select.transform:SetSiblingIndex(1) self.select.transform.localPosition = Vector3.zero - if MoneyUtil.MT == MoneyType.RMB then - self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]].selectImaRMB) - else - self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]].selectIma) - end - self.selectIma:SetNativeSize() + self.selectIma.text = MoneyUtil.GetMoneyUnitNameWithMoney1(actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]) + -- if MoneyUtil.MT == MoneyType.RMB then + -- self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]].selectImaRMB) + -- else + -- self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]].selectIma) + -- end + --self.selectIma:SetNativeSize() end function DailyRechargePanel:RefreshPanel() From 0cf058dbb5ddd6283cf0970ba1a4fa70da8a14b5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 10 Feb 2022 17:10:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E8=B1=AA=E7=A4=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DailyRecharge/DailyRechargePanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index d02a7b227e..dbda0da824 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -179,7 +179,7 @@ function DailyRechargePanel:SetGrid() -- else -- self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultIma) -- end - self.items[i].priceText.text = MoneyUtil.GetMoneyUnitNameWithMoney1(config.Values[1][1]) + self.items[i].priceText.text = MoneyUtil.GetMoneyUnitNameWithMoney(config.Values[1][1]) self.items[i].priceText:SetNativeSize() end end @@ -227,7 +227,7 @@ function DailyRechargePanel:SetSelectBtn() self.select.transform:SetParent(self.items[index].go.transform) self.select.transform:SetSiblingIndex(1) self.select.transform.localPosition = Vector3.zero - self.selectIma.text = MoneyUtil.GetMoneyUnitNameWithMoney1(actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]) + self.selectIma.text = MoneyUtil.GetMoneyUnitNameWithMoney(actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]) -- if MoneyUtil.MT == MoneyType.RMB then -- self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]].selectImaRMB) -- else From 01506ba48cafe4a26c749b22d51d6185fd488c44 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 10 Feb 2022 17:52:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E8=A7=92=E8=89=B2=E5=A4=A9=E8=B5=8B]=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E8=A7=92=E8=89=B2=E5=A4=A9=E8=B5=8B=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Common/functions.lua | 18 ++++++++++++++++++ .../Modules/HandBook/HandBookHeroInfoPanel.lua | 1 + .../HandBook/HandBookRoleInfoLayout.lua | 1 + .../~Lua/Modules/Hero/HeroManager.lua | 1 + .../~Lua/Modules/Popup/RoleInfoPopup.lua | 1 + .../~Lua/Modules/RoleInfo/RoleAwakeLayout.lua | 1 + .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 2 ++ .../~Lua/Modules/RoleInfo/RoleTalentPopup.lua | 1 + 8 files changed, 26 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 9e359a104c..e71d20d7b3 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -556,6 +556,24 @@ function SetHeroFormationFlyEffect(par,spLoader,effect,_star,_layer) end end +function GetPassiveByMaxStar(heroConfig,list) + --local OpenPassiveSkillRules = list + local heroRankUp=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",heroConfig.MaxRank) + if not heroRankUp then + list=heroConfig.OpenPassiveSkillRules + end + local aaa={} + if list then + for i = 1,#list do + if list[i][2]<=heroRankUp.Id then + table.insert(aaa,list[i]) + end + end + end + return aaa +end + + --把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设 function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation) diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index 22e7a31b34..23daf2769a 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -305,6 +305,7 @@ function this:UpdateHeroInfoData() local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh" self.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage) local OpenPassiveSkillRules = heroStar >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules + OpenPassiveSkillRules=GetPassiveByMaxStar(heroConFigData,OpenPassiveSkillRules) if OpenPassiveSkillRules then local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId) self.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua index 701e9a9be9..1120143420 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua @@ -152,6 +152,7 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv) Util.GetGameObject(passObj,"SkillTypeImage"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SkillIconType[aaa]) Util.GetGameObject(passObj,"SkillTypeImage"):GetComponent("Image"):SetNativeSize() local OpenPassiveSkillRules = star >= HeroManager.awakeNextStarIndex and heroConFigData.Awaken or heroConFigData.OpenPassiveSkillRules + OpenPassiveSkillRules=GetPassiveByMaxStar(heroConFigData,OpenPassiveSkillRules) local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroConFigData,breakId,upStarId) if star==11 then Util.GetGameObject(passObj,"Text"):GetComponent("Text").text = #openlists - compoundOpenNum .."/"..10 diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 680d996b2d..6129cb2341 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2912,6 +2912,7 @@ function this.GetAllPassiveSkillIds(heroConfig, breakId, upStarId) local compoundNum = 0 local compoundOPenNum = 0 local OpenPassiveSkillRules = (upStarId and upStarId ~=0 and heroRankUpConfig[upStarId].OpenStar >= this.awakeNextStarIndex) and heroConfig.Awaken or heroConfig.OpenPassiveSkillRules + OpenPassiveSkillRules=GetPassiveByMaxStar(heroConfig,OpenPassiveSkillRules) if OpenPassiveSkillRules then for i = 1, #OpenPassiveSkillRules do if OpenPassiveSkillRules[i][1] == 1 then --突破 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index f7a37087f9..465676eb06 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -294,6 +294,7 @@ function this.RoleInfo0() --local talentBtnImage = curHeroData.star == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh" this.talentBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(talentBtnImage) local OpenPassiveSkillRules = curHeroData.star >= HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules + OpenPassiveSkillRules=GetPassiveByMaxStar(curHeroData.heroConfig,OpenPassiveSkillRules) if OpenPassiveSkillRules then local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) this.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua index fbf0c617a5..80ec507dce 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua @@ -112,6 +112,7 @@ function RoleAwakeLayout:UpdateHeroUpStarData() this.curLvEnd.text= HeroManager.GetCurHeroStarLvEnd(1,curHeroData) this.nextLvEnd.text= HeroManager.GetCurHeroStarLvEnd(2,curHeroData,curHeroData.breakId,upStarRankUpConfig.Id) local OpenPassiveSkillRules = curHeroData.star == HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules + OpenPassiveSkillRules=GetPassiveByMaxStar(curHeroData.heroConfig,OpenPassiveSkillRules) local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) this.talent1Progress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum this.talent2Progress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index c6aefcba2e..5498a2d52e 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -430,8 +430,10 @@ function this.GetSkillsData() heroSkill.Skilltips = nil local OpenPassiveSkillRules = curHeroData.star >= HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules + OpenPassiveSkillRules=GetPassiveByMaxStar(curHeroData.heroConfig,OpenPassiveSkillRules) if OpenPassiveSkillRules then local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) + LogError("#OpenPassiveSkillRules=="..#OpenPassiveSkillRules.." compoundNum=="..compoundNum) heroSkill.Name = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum heroSkill.state = 1 if curHeroData.star == 12 then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua index 7df1b3c002..83dda77406 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua @@ -58,6 +58,7 @@ function RoleTalentPopup:GetTalentDataShow() LogError("upstarid =="..upStarId) local openNum=0 local OpenPassiveSkillRules = (upStarId and upStarId ~=0 and heroRankUpConfig[upStarId].OpenStar >= HeroManager.awakeNextStarIndex) and heroConfig.Awaken or heroConfig.OpenPassiveSkillRules + OpenPassiveSkillRules=GetPassiveByMaxStar(heroConfig,OpenPassiveSkillRules) if OpenPassiveSkillRules then for i = 1, #OpenPassiveSkillRules do if OpenPassiveSkillRules[i][1] == 1 then--突破