【鸿蒙阵修改】

dev_chengFeng
guowei 2021-01-14 21:11:53 +08:00
parent a25db7d09c
commit b42a1c8e61
12 changed files with 271 additions and 286 deletions

View File

@ -336,6 +336,7 @@ RectTransform:
- {fileID: 917442717006195055}
- {fileID: 6617956877845356924}
- {fileID: 5237089446759454498}
- {fileID: 6245963816754381579}
m_Father: {fileID: 501882121750972884}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -553,7 +554,7 @@ GameObject:
- component: {fileID: 2380982328895866829}
- component: {fileID: 913594788029594075}
m_Layer: 5
m_Name: text
m_Name: textTitle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -570,12 +571,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4295126611195974249}
m_RootOrder: 0
m_Father: {fileID: 8081481610987422976}
m_RootOrder: 5
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: 146.1, y: -13.6}
m_AnchoredPosition: {x: -31.350037, y: 286.60507}
m_SizeDelta: {x: 197.07, y: 47.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2380982328895866829
@ -1255,7 +1256,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4295126611195974249}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1746,7 +1747,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4295126611195974249}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1905,7 +1906,6 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: -200.00002}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6245963816754381579}
- {fileID: 2610432428760421131}
- {fileID: 7498108257538012307}
- {fileID: 1000258875902609876}
@ -1978,7 +1978,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4295126611195974249}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -2058,7 +2058,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4295126611195974249}
m_RootOrder: 5
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}
@ -2456,7 +2456,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4295126611195974249}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -2838,7 +2838,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4295126611195974249}
m_RootOrder: 1
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}

View File

@ -144,8 +144,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 258042187939681154}
- {fileID: 6842369900325493280}
- {fileID: 6872947304781273850}
- {fileID: 6818948719093268324}
m_Father: {fileID: 1616674185796874855}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1743,6 +1743,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2315919068680065115
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6872947304781273850}
- component: {fileID: 8901986436359637533}
- component: {fileID: 1537002055658094563}
m_Layer: 5
m_Name: TextGold
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6872947304781273850
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2315919068680065115}
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: 2238990896396835307}
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: -21.97, y: -24.612}
m_SizeDelta: {x: 149.34, y: 35.22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8901986436359637533
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2315919068680065115}
m_CullTransparentMesh: 0
--- !u!114 &1537002055658094563
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2315919068680065115}
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.19607843, g: 0.19607843, b: 0.19607843, 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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &2597894897370395602
GameObject:
m_ObjectHideFlags: 0
@ -2913,86 +2992,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4591450094532924810
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 258042187939681154}
- component: {fileID: 9106388405961325089}
- component: {fileID: 9038985681351618970}
m_Layer: 5
m_Name: TextGold
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &258042187939681154
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4591450094532924810}
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: 2238990896396835307}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 23.58, y: 29.07}
m_SizeDelta: {x: 139.33, y: 42.59}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9106388405961325089
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4591450094532924810}
m_CullTransparentMesh: 0
--- !u!114 &9038985681351618970
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4591450094532924810}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.88235295, g: 0.33333334, b: 0.34509805, 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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 6
m_AlignByGeometry: 0
m_RichText: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
LanguageIndex: 10145
--- !u!1 &4634040865599569378
GameObject:
m_ObjectHideFlags: 0
@ -3523,86 +3522,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5635014062522739605
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6842369900325493280}
- component: {fileID: 7218534637907293873}
- component: {fileID: 3948321631027399706}
m_Layer: 5
m_Name: TextHuFu
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6842369900325493280
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5635014062522739605}
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: 2238990896396835307}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 227.62, y: 28.57}
m_SizeDelta: {x: 144.23, y: 41.59}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7218534637907293873
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5635014062522739605}
m_CullTransparentMesh: 0
--- !u!114 &3948321631027399706
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5635014062522739605}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.88235295, g: 0.33333334, b: 0.34509805, 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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 6
m_AlignByGeometry: 0
m_RichText: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
LanguageIndex: 10145
--- !u!1 &5665514149302273787
GameObject:
m_ObjectHideFlags: 0
@ -4586,6 +4505,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7746374221011472703
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6818948719093268324}
- component: {fileID: 2446820263901191992}
- component: {fileID: 2545185796261615726}
m_Layer: 5
m_Name: TextHuFu
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6818948719093268324
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7746374221011472703}
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: 2238990896396835307}
m_RootOrder: 1
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: 178.62, y: -24.612}
m_SizeDelta: {x: 150.15, y: 35.22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2446820263901191992
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7746374221011472703}
m_CullTransparentMesh: 0
--- !u!114 &2545185796261615726
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7746374221011472703}
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.19607843, g: 0.19607843, b: 0.19607843, 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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &7880080324435757498
GameObject:
m_ObjectHideFlags: 0

View File

@ -2729,8 +2729,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: -3.18, y: 21.5}
m_SizeDelta: {x: 150, y: 150}
m_AnchoredPosition: {x: -2.88, y: 21.5}
m_SizeDelta: {x: 150.6, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4904620408164012165
CanvasRenderer:
@ -3594,7 +3594,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: fbe18f8337a8e3f439f006aac4918036, type: 3}
m_Sprite: {fileID: 21300000, guid: 1dd8d4c8eca3fcd42ae1403ba03f440c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -106,7 +106,7 @@ function EnvoyItem:SetItem(go,data)
Util.GetGameObject(go.transform, "GameObject/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroSingleData.heroConfig.Quality,heroSingleData.star))
if heroSingleData.lv == HarmonyManager.hongmengAdditions[1].value then
-- body
Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("<color=#0f0>%d</color>",heroSingleData.lv)
Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("<color=#ffbe22>%d</color>",heroSingleData.lv)
else
Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("<color=red>%d</color>",heroSingleData.lv)
end

View File

@ -246,7 +246,7 @@ function this:SetInitList()
end
this.ChooseDataList = tempTable
-- LogBlue("#this.ChooseDataList长度:"..#this.ChooseDataList)
LogBlue("#this.ChooseDataList长度:"..#this.ChooseDataList)
end
--初始化 鸿蒙塔的数据
function this:SetTowerInit()

View File

@ -14,12 +14,13 @@ local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig)
function GongMingResultTips:InitComponent()
this.BtnBack = Util.GetGameObject(self.transform, "btnBack")
this.textTitle = Util.GetGameObject(self.transform,"grid/ver/textTitle"):GetComponent("Text")
this.TextOneAll = Util.GetGameObject(self.transform,"grid/TextOne")
this.TextTwoAll = Util.GetGameObject(self.transform,"grid/TextTwo")
this.HeroSkin = Util.GetGameObject(self.transform,"grid/ver/HeroSkin")
end
@ -73,73 +74,15 @@ function GongMingResultTips:OnOpen(flag)
end)
--共鸣后
if flag then
-- body
Util.GetGameObject(this.TextOneAll,"textDegree"):GetComponent("Text").text = string.format("%d",herodata.oriLv)
Util.GetGameObject(this.TextOneAll,"textEqiue"):GetComponent("Text").text = ""
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = ""
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = ""
Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = ""
-- if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]) then
-- -- body
-- if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv then
-- Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv)
-- LingDegree = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv
-- end
-- else
-- end
-- if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]) then
-- -- body
-- if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv then
-- -- body
-- Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv)
-- HunDegree = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv
-- end
-- end
-- Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format("%d",herodata.talismanList)
if HeroManager.IsTenTalent(herodata.id) then
else
if HarmonyManager:HongMengTowerUpLimit()>=330 then
-- body
local data = HarmonyManager:GetAdditions()
Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = data[1].value
this.textTitle.text = "获得鸿蒙碑共鸣效果"
else
Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = herodata.lv
this.textTitle.text = "获得鸿蒙阵共鸣效果"
end
Util.GetGameObject(this.TextTwoAll,"textEqiue"):GetComponent("Text").text = ""
Util.GetGameObject(this.TextTwoAll,"textHun"):GetComponent("Text").text = ""
Util.GetGameObject(this.TextTwoAll,"textLing"):GetComponent("Text").text = ""
Util.GetGameObject(this.TextTwoAll,"textFa"):GetComponent("Text").text = ""
-- local data = HarmonyManager:GetAdditions()
-- for i = 1, #data do
-- if data[i].additionType == 1 then
-- Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = string.format("<color=green>%d</color>",data[i].value)
-- elseif data[i].additionType == 2 then
-- if data[i].value == -1 then
-- Util.GetGameObject(this.TextTwoAll,"textEqiue"):GetComponent("Text").text = string.format("<color=green>无</color>")
-- else
-- Util.GetGameObject(this.TextTwoAll,"textEqiue"):GetComponent("Text").text = string.format("<color=red>%d</color>",data[i].value)
-- end
-- -- body
-- elseif data[i].additionType == 3 then
-- if HunDegree >data[i].value then
-- -- body
-- Util.GetGameObject(this.TextTwoAll,"textHun"):GetComponent("Text").text = string.format("<color=green>%d</color>",HunDegree)
-- else
-- Util.GetGameObject(this.TextTwoAll,"textHun"):GetComponent("Text").text = string.format("<color=green>%d</color>",data[i].value)
-- end
-- -- body
-- elseif data[i].additionType == 4 then
-- if LingDegree>data[i].value then
-- Util.GetGameObject(this.TextTwoAll,"textLing"):GetComponent("Text").text =string.format("<color=green>%d</color>",LingDegree)
-- else
-- Util.GetGameObject(this.TextTwoAll,"textLing"):GetComponent("Text").text =string.format("<color=green>%d</color>",data[i].value)
-- end
-- -- body
-- else
-- Util.GetGameObject(this.TextTwoAll,"textFa"):GetComponent("Text").text =string.format("<color=green>%d</color>",data[i].value)
-- end
-- end
else
local data = HarmonyManager:GetAdditions()
Util.GetGameObject(this.TextOneAll,"textDegree"):GetComponent("Text").text = string.format("%d",herodata.oriLv)
if data[2].value > 0 then

View File

@ -127,15 +127,31 @@ function HongMengEnvoyPanel:BindEvent()
function()
-- body
LogGreen("回调函数")
HarmonyManager.hongmengAdditions[1].value = HarmonyManager.hongmengAdditions[1].value + 1
if HarmonyManager.hongmengAdditions[1].value >= sum then
-- body
Util.SetGray(self.UpBtn, true)
self.imageGame:SetActive(false)
self.TextGame:SetActive(false)
self.UnShowText:SetActive(true)
end
local data = HarmonyManager:GetHongMengUpData()
self.TextGold.text = data.LevelUp[1][2]
self.TextGrowthAmulet.text = data.LevelUp[1][2]
if Gold >= data.LevelUp[1][2] then
-- body
self.TextGold.text = string.format("<color=#9E8D6C>%d</color>",data.LevelUp[1][2])
if GrowthAmulet >= data.LevelUp[2][2] then
self.TextGrowthAmulet.text = string.format("<color=#9E8D6C>%d</color>",data.LevelUp[2][2])
else
self.TextGrowthAmulet.text = string.format("<color=#E15558>%d</color>",data.LevelUp[2][2])
end
else
self.TextGold.text = string.format("<color=#E15558>%d</color>",data.LevelUp[1][2])
end
local sum = HarmonyManager:HongMengTowerUpLimit()
self.GradeText.text =
string.format("%d/%d", HarmonyManager.hongmengAdditions[1].value, sum)
self.GradeText.text = string.format("%d/%d", HarmonyManager.hongmengAdditions[1].value, sum)
--检测红点 UpdateGongMingLv
for i = 1, #self.EnvoyItemList do
@ -146,9 +162,11 @@ function HongMengEnvoyPanel:BindEvent()
end
)
else
PopupTipPanel.ShowTip("成长护符不足!")
end
else
PopupTipPanel.ShowTip("金币不足!")
end
end
@ -286,8 +304,17 @@ function HongMengEnvoyPanel:OnOpen(equipSId)
local data = HarmonyManager:GetHongMengUpData()
if data then
-- body
self.TextGold.text = data.LevelUp[1][2]
self.TextGrowthAmulet.text = data.LevelUp[2][2]
if Gold >= data.LevelUp[1][2] then
-- body #9e8d6c
self.TextGold.text = string.format("<color=#9e8d6c>%d</color>",data.LevelUp[1][2])
if GrowthAmulet >= data.LevelUp[2][2] then
self.TextGrowthAmulet.text = string.format("<color=#9e8d6c>%d</color>",data.LevelUp[2][2])
else
self.TextGrowthAmulet.text = string.format("<color=#e15558>%d</color>",data.LevelUp[2][2])
end
else
self.TextGold.text = string.format("<color=#E15558>%d</color>",data.LevelUp[1][2])
end
else
LogGreen(" error: data is nil ")
end

View File

@ -21,15 +21,23 @@ HeroData.__get__.lv = function(self)
--LogGreen(tostring(HeroManager.IsElevenStar(self.star)))
--print(self._id.." "..HarmonyManager.hongmengAdditions[1].heroTid..self.heroConfig.ReadingName)
if HeroManager.IsTenTalent(self._id) and HarmonyManager.hongmengAdditions[1].heroTid == 0 and HarmonyManager:HongMengTowerUpLimit() ~= 0 then
if HeroManager.IsTenTalent(self._id)and HarmonyManager:HongMengTowerUpLimit() ~= 0 then
-- bodys
endLv = HarmonyManager.hongmengAdditions[1].value
-- print(endLv," "..self.heroConfig.ReadingName.."!!!!!!!!"..HarmonyManager.hongmengAdditions[1].value)
--print(endLv," "..self.heroConfig.ReadingName.."!!!!!!!!"..HarmonyManager.hongmengAdditions[1].value)
else
local curlvEen = HeroManager.heroLvEnd[self.id]
if HeroManager.IsTenTalent(self._id) then
-- body
endLv = HarmonyManager.hongmengAdditions[1].value
else
local curlvEen = HeroManager.heroLvEnd[self._id]
endLv = temp_lv > curlvEen and curlvEen or temp_lv
end
--
endLv = temp_lv > curlvEen and curlvEen or temp_lv
-- print(temp_lv," "..self.heroConfig.ReadingName.."!!!!!!!!"..curlvEen)
end
@ -122,7 +130,7 @@ end
HeroData.__set__.breakId = function (self,value)
-- body
self._breakId = value
print("self._breakId",self._breakId)
--print("self._breakId",self._breakId)
end
HeroData.__get__.breakId = function (self)
@ -145,7 +153,7 @@ HeroData.__get__.breakId = function (self)
endLv = temp_lv > curlvEen and curlvEen or temp_lv
end
endbreakIdLv = HeroManager.GetAllStarBreakIdData(self._id,endLv)
--print(endbreakIdLv," 111 "..self.heroConfig.ReadingName.."等级"..endLv)
return endbreakIdLv
elseif HarmonyManager.hongmengAdditions[1] and HarmonyManager:IsEnvoy(self.dynamicId) then
--print("self._id @@@"..HarmonyManager.hongmengAdditions[1].heroTid.."#####"..HarmonyManager.hongmengAdditions[1].value )
@ -158,8 +166,8 @@ HeroData.__get__.breakId = function (self)
else
temp_lv = HeroManager.heroLvEnd[self.id]
end
endbreakIdLv = HeroManager.GetAllStarBreakIdData(self._id,endLv)
--print("self._id 222"..self._id)
endbreakIdLv = HeroManager.GetAllStarBreakIdData(self._id,temp_lv)
--print(endbreakIdLv," 222 "..self.heroConfig.ReadingName.."等级"..temp_lv)
return endbreakIdLv
else

View File

@ -37,17 +37,10 @@ function RoleChooseListPanel:InitComponent()
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 1
this:InitData()
--this:InitData()
end
function RoleChooseListPanel:InitData()
self.ScrollView:SetData(HarmonyManager.ChooseDataList,function (index, go)
this.OnShowSingleCardData(go, HarmonyManager.ChooseDataList[index],index)
end)
end
--绑定事件(用于子类重写)
function RoleChooseListPanel:BindEvent()
@ -103,7 +96,7 @@ function RoleChooseListPanel:BindEvent()
end)
Util.AddClick(this.btnAutoSelect, function()
-- self:AutoSelectHero()
end)
end
@ -125,9 +118,13 @@ function RoleChooseListPanel:OnOpen(flag)
this.numText.text = ""
this.title_text.text ="共鸣神将选择"
self.flag = flag
TempData = nil
--SelectHero = nil
local list = HarmonyManager.ChooseDataList
print("list "..#list,TempData,SelectHero)
if #list > 0 then
-- body
print("@@@@@@@@"..#list)
this.Empty:SetActive(false)
table.sort(list, function(a, b)
if a.star == b.star then
@ -144,13 +141,16 @@ function RoleChooseListPanel:OnOpen(flag)
return a.star > b.star
end
end)
self.ScrollView.gameObject:SetActive(true)
self.ScrollView:SetData(list,function (index, go)
this.OnShowSingleCardData(go, list[index],index)--
end)
else
list={}
self.ScrollView.gameObject:SetActive(false)
this.Empty:SetActive(true)
end
@ -223,27 +223,17 @@ function this.OnShowSingleCardData(go,heroData,index)--isSelect 1选择 2 没
end)
end
function RoleChooseListPanel:AutoSelectHero()
curSelectHeroList = {}
for i = 1, #heroDataList do
if LengthOfTable(curSelectHeroList) < curNeedRoleNum and heroDataList[i].isFormation == "" and heroDataList[i].lockState == 0 then
curSelectHeroList[heroDataList[i].dynamicId]=heroDataList[i]
end
end
this.numText.text=string.format("%s/%s",LengthOfTable(curSelectHeroList),curNeedRoleNum)
this.ScrollView:SetData(heroDataList, function (index, go)
this.OnShowSingleCardData(go, heroDataList[index])
end)
end
--界面关闭时调用(用于子类重写)
function RoleChooseListPanel:OnClose()
--destroy(SelectHero)
SelectHero = nil
end
--界面销毁时调用(用于子类重写)
function RoleChooseListPanel:OnDestroy()
this.ScrollView = nil
end

View File

@ -176,7 +176,7 @@ function RoleEquipPanel:BindEvent()
this.allEquipDown,
function()
--HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId) and
print(tostring(HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId)),tostring(curHeroData.harmonyGongMing))
--print(tostring(HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId)),tostring(curHeroData.harmonyGongMing))
if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
-- body
PopupTipPanel.ShowTip("共鸣装备,无法一键卸下")
@ -609,8 +609,10 @@ function this.ShowHeroEquip()
--鸿蒙阵 共享数据判断
if HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1 then
-- body
--curEquipTreasureDatas[i].lv = curEquipTreasureDatas[i].lv > HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) and curEquipTreasureDatas[i].lv or HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint)
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
elseif HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) ~= -1 then
--curEquipTreasureDatas[i].lv = curEquipTreasureDatas[i].lv > HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) and curEquipTreasureDatas[i].lv or HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint)
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
else
-- body
@ -619,6 +621,7 @@ function this.ShowHeroEquip()
if curEquipTreasureDatas[i].lv > 0 and lvObj then
lvObj:GetComponent("Text").text = curEquipTreasureDatas[i].lv
print(curEquipTreasureDatas[i].lv,".....")
lvObj:SetActive(true)
else
lvObj:SetActive(false)

View File

@ -175,9 +175,12 @@ function this:UpdateHeroInfoData()
end
end
if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then
-- body
-- body#FFCC00
this.lv.text= "<color=green>"..curHeroData.lv.."</color>"
elseif HarmonyManager:IsEnvoy(curHeroData.dynamicId) then
this.lv.text= "<color=#FFCC00>"..curHeroData.lv.."</color>"
else
-- body
this.lv.text= curHeroData.lv.."/"..curLvEnd
end

View File

@ -370,10 +370,23 @@ function this:SetShowHeroListData(upStarConsumeMaterial,curHeroList)--1 消耗
end
--进阶按钮点击事件处理
function this:StarUpClick()
if curHeroData.lv>=HeroManager.heroLvEnd[curHeroData.heroConfig.Id] then
PopupTipPanel.ShowTip(Language[11846])
return
if (not HarmonyManager.IsInfo(curHeroData.dynamicId)) and (not HarmonyManager:IsEnvoy(curHeroData.dynamicId)) then
-- body curHeroData
-- print("1111111111",1111111111,tostring(HarmonyManager.IsInfo(curHeroData.dynamicId)),tostring(HarmonyManager:IsEnvoy(curHeroData.dynamicId)))
if curHeroData.lv>=HeroManager.heroLvEnd[curHeroData.heroConfig.Id] then
PopupTipPanel.ShowTip(Language[11846])
return
end
-- elseif then
-- -- body
-- print("2222222",1111111111)
-- if curHeroData.lv>=HeroManager.heroLvEnd[curHeroData.heroConfig.Id] then
-- PopupTipPanel.ShowTip(Language[11846])
-- return
-- end
end
if curHeroData.lv<upStarRankUpConfig.LimitLevel then
PopupTipPanel.ShowTip(Language[11851]..upStarRankUpConfig.LimitLevel)
return