修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏

dev_chengFeng
zhangqiang 2020-08-17 11:39:41 +08:00
parent 21ea44a475
commit 6df142b067
5 changed files with 206 additions and 44 deletions

View File

@ -4707,7 +4707,7 @@ ParticleSystem:
--- !u!199 &199913150007694034
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -12210,7 +12210,7 @@ ParticleSystem:
--- !u!199 &199808684316966162
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -17788,7 +17788,7 @@ ParticleSystem:
--- !u!199 &3852268799559907720
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -22566,7 +22566,7 @@ ParticleSystem:
--- !u!199 &5271325450925093107
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -27264,7 +27264,7 @@ ParticleSystem:
--- !u!199 &3183714690231709786
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -32368,7 +32368,7 @@ ParticleSystem:
--- !u!199 &1743651251639927205
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -37124,7 +37124,7 @@ ParticleSystem:
--- !u!199 &7475280723313167660
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -41880,7 +41880,7 @@ ParticleSystem:
--- !u!199 &9150494766190968901
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -46614,7 +46614,7 @@ ParticleSystem:
--- !u!199 &7199790129551958231
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -51370,7 +51370,7 @@ ParticleSystem:
--- !u!199 &5940030307403993872
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -56362,7 +56362,7 @@ ParticleSystem:
--- !u!199 &8744724081048752083
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -61352,7 +61352,7 @@ ParticleSystem:
--- !u!199 &4790988713032616438
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -66573,7 +66573,7 @@ ParticleSystem:
--- !u!199 &7601660874278259845
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -71438,7 +71438,7 @@ ParticleSystem:
--- !u!199 &3734719174028801100
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -76172,7 +76172,7 @@ ParticleSystem:
--- !u!199 &7852783147755868435
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -81186,7 +81186,7 @@ ParticleSystem:
--- !u!199 &5795776126709631377
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -85942,7 +85942,7 @@ ParticleSystem:
--- !u!199 &645669681233002935
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -90698,7 +90698,7 @@ ParticleSystem:
--- !u!199 &3025146004537813439
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -95454,7 +95454,7 @@ ParticleSystem:
--- !u!199 &5065274489376317798
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -100402,7 +100402,7 @@ ParticleSystem:
--- !u!199 &1063978642119183846
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -105193,7 +105193,7 @@ ParticleSystem:
--- !u!199 &4577166716739436122
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -105287,6 +105287,80 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 3.8400345}
m_SizeDelta: {x: 142.16, y: 29.089996}
m_Pivot: {x: 0, y: 0}
--- !u!1 &5256917612543720349
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7892719658203971873}
- component: {fileID: 6410324465281114611}
- component: {fileID: 7000730609023575785}
m_Layer: 5
m_Name: proIcon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7892719658203971873
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5256917612543720349}
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: 8520111332518550340}
m_RootOrder: 4
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: -52.1, y: 48.6}
m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6410324465281114611
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5256917612543720349}
m_CullTransparentMesh: 0
--- !u!114 &7000730609023575785
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5256917612543720349}
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: b9245d28ee09c3e4987fe6385cc7c0ac, 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 &5364604360836469863
GameObject:
m_ObjectHideFlags: 0
@ -110021,7 +110095,7 @@ ParticleSystem:
--- !u!199 &521858604409485964
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -110589,6 +110663,80 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: +88
--- !u!1 &6301224445746568475
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6879932971547156798}
- component: {fileID: 5455980628845282961}
- component: {fileID: 2287411544007319414}
m_Layer: 5
m_Name: proIcon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6879932971547156798
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6301224445746568475}
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: 8519697061298595646}
m_RootOrder: 4
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: -52.1, y: 48.6}
m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5455980628845282961
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6301224445746568475}
m_CullTransparentMesh: 0
--- !u!114 &2287411544007319414
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6301224445746568475}
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: b9245d28ee09c3e4987fe6385cc7c0ac, 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 &6313730057854862727
GameObject:
m_ObjectHideFlags: 0
@ -115286,7 +115434,7 @@ ParticleSystem:
--- !u!199 &3013826695847252014
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -120042,7 +120190,7 @@ ParticleSystem:
--- !u!199 &413717427226994198
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -124873,7 +125021,7 @@ ParticleSystem:
--- !u!199 &388545298818640071
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -129629,7 +129777,7 @@ ParticleSystem:
--- !u!199 &4120970463321800302
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -134363,7 +134511,7 @@ ParticleSystem:
--- !u!199 &7717983067442452609
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -139418,7 +139566,7 @@ ParticleSystem:
--- !u!199 &2287083752582572032
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -144270,7 +144418,7 @@ ParticleSystem:
--- !u!199 &1755222855953066752
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -148968,7 +149116,7 @@ ParticleSystem:
--- !u!199 &8370477990178466979
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -153820,7 +153968,7 @@ ParticleSystem:
--- !u!199 &6004082643824602778
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -158690,7 +158838,7 @@ ParticleSystem:
--- !u!199 &2598195503796815680
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -163525,7 +163673,7 @@ ParticleSystem:
--- !u!199 &8828901401956282593
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -168259,7 +168407,7 @@ ParticleSystem:
--- !u!199 &5648459871644747481
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -173053,7 +173201,7 @@ ParticleSystem:
--- !u!199 &7148827205064525326
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -177809,7 +177957,7 @@ ParticleSystem:
--- !u!199 &3981746168289052076
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -182677,7 +182825,7 @@ ParticleSystem:
--- !u!199 &4752419209397002737
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -187608,7 +187756,7 @@ ParticleSystem:
--- !u!199 &3843098992673722736
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -187700,6 +187848,7 @@ RectTransform:
- {fileID: 8190936101513654167}
- {fileID: 3186279549825186737}
- {fileID: 4494805040267940149}
- {fileID: 7892719658203971873}
m_Father: {fileID: 224461338842806296}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -188161,6 +188310,7 @@ RectTransform:
- {fileID: 6650637829069874669}
- {fileID: 7361097531623832304}
- {fileID: 5954589829577688489}
- {fileID: 6879932971547156798}
m_Father: {fileID: 224737750581944100}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -195074,7 +195224,7 @@ ParticleSystem:
--- !u!199 &4527856640657632424
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -199865,7 +200015,7 @@ ParticleSystem:
--- !u!199 &4712161909095197685
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -204621,7 +204771,7 @@ ParticleSystem:
--- !u!199 &1704248638401735114
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -868,7 +868,7 @@ JumpType = {
DailyCarbon_Hero=69, --每日角色碎片副本
DailyCarbon_Transure=70, --每日法宝副本
DailyCarbon_SoulPrint=71, --每日魂印副本
DeathPos=71, --十绝阵
DeathPos=72, --十绝阵
GuildCarDelay=73 , --车迟斗法
CompoundHero = 74,--神将合成、置换

View File

@ -44,6 +44,7 @@ function this:InitComponent(gameObject)
this.compoundHeroyuanImage=Util.GetGameObject(this.compoundHero,"yuanImage")
this.compoundHerolive = Util.GetGameObject(this.compoundHero, "Mask/icon"):GetComponent("RawImage")
this.compoundHerozs = Util.GetGameObject(this.compoundHero, "zs")
this.compoundHeroframe = Util.GetGameObject(gameObject, "CompoundHeroPanel_Compound/titleGo/compoundHero/frame")
Util.GetGameObject(this.compoundHero,"hpProgress").gameObject:SetActive(false)
Util.GetGameObject(this.compoundHero,"rageProgress").gameObject:SetActive(false)
Util.GetGameObject(this.compoundHero,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(false)
@ -113,6 +114,7 @@ function this.ShowTitleData(curHeroCompoundData)
local heroData = curHeroCompoundData.haveHeroList[1][1]
local heroConfig = heroData and heroData.heroConfig or curHeroCompoundData.config
this.compoundHero:SetActive(true)
this.compoundHeroframe:SetActive(false)
this.compoundHeroTipText:SetActive(false)
this.compoundHerobg.sprite = Util.LoadSprite(GetHeroCardStarBg[_star])
local zsName = GetHeroCardStarZs[_star]
@ -145,6 +147,7 @@ function this.ShowTitleData(curHeroCompoundData)
end
else
this.compoundHero:SetActive(false)
this.compoundHeroframe:SetActive(true)
this.compoundHeroTipText:SetActive(true)
end
end

View File

@ -412,7 +412,14 @@ function this.DeleteHeroDatas(heroDIds)
--清楚编队上的英雄
FormationManager.AllFormationDeleCurHeroId(heroDIds[i])
--清除英雄魂印上挂载的英雄did
SoulPrintManager.hasEquipSoulPrintId[heroDIds[i]] = nil
SoulPrintManager.hasEquipSoulPrintId[heroDIds[i]] = nil
--清除宝器上的英雄
local jewels = heroDatas[heroDIds[i]].jewels
if jewels and LengthOfTable(jewels) > 0 then
for i = 1, #jewels do
EquipTreasureManager.SetTreasureUpOrDown(jewels[i],"")
end
end
--删除远征英雄数据
ExpeditionManager.DelHeroHpValue(heroDatas[heroDIds[i]])
--删除英雄

View File

@ -547,7 +547,9 @@ function this.ShowHeroEquip()
Util.LoadSprite(curEquipTreasureDatas[i].frame)
--Util.GetGameObject(go.transform,"proIcon"):GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(curEquipTreasureDatas[i].itemConfig.PropertyName))
Util.GetGameObject(go.transform, "frame/star"):SetActive(false)
Util.GetGameObject(go.transform, "num").gameObject:SetActive(false)
Util.GetGameObject(go.transform, "num").gameObject:SetActive(false)
Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite =
Util.LoadSprite(GetProStrImageByProNum(curEquipTreasureDatas[i].itemConfig.PropertyName))
if curEquipTreasureDatas[i].lv > 0 and lvObj then
lvObj:GetComponent("Text").text = curEquipTreasureDatas[i].lv
lvObj:SetActive(true)