From fc08ad0bdf29ca702e5307a8e6326e4aa9372682 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 1 Mar 2021 18:29:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Guild/RedPacketView/RedPacketPanel.prefab | 2 +- .../UI/Harmony/HongMengEnvoyPanel.prefab | 173 +++++++++--------- .../UI/Harmony/HongMengUnLoadPanel.prefab | 46 ++--- .../Guild/RedPacketView/RedPacketPanel.lua | 1 + .../Harmony/Panel/HongMengEnvoyPanel.lua | 6 +- 5 files changed, 115 insertions(+), 113 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab index 46baca4a73..cb0cb60b54 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab @@ -1520,7 +1520,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4756266431040088835 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab index 4df795c9e0..46976414e6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab @@ -264,7 +264,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3330798633778287082 RectTransform: m_ObjectHideFlags: 0 @@ -359,10 +359,10 @@ RectTransform: m_Father: {fileID: 4088516387311303254} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 288.40002, y: 1815.2} - m_SizeDelta: {x: 111.8, y: 36.715} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -104} + m_SizeDelta: {x: 111.8, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1109697951589173621 CanvasRenderer: @@ -399,7 +399,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 6 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 1 @@ -2692,85 +2692,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3676658294149564053 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5136775017715279467} - - component: {fileID: 8617475382152636445} - - component: {fileID: 3726553240140409257} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5136775017715279467 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3676658294149564053} - 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: 6143607442243393965} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2.0999985, y: 1.2999992} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8617475382152636445 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3676658294149564053} - m_CullTransparentMesh: 0 ---- !u!114 &3726553240140409257 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3676658294149564053} - 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: 41 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 45 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5347 \u7EA7" --- !u!1 &3706264774494383992 GameObject: m_ObjectHideFlags: 0 @@ -2955,6 +2876,86 @@ RectTransform: m_AnchoredPosition: {x: 162.59973, y: -207.40039} m_SizeDelta: {x: 321.2, y: 406.9} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4294001925723325660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6757180706887448775} + - component: {fileID: 4922464353795196045} + - component: {fileID: 3815962664142758794} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6757180706887448775 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4294001925723325660} + 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: 6143607442243393965} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.82, y: 1.2999992} + m_SizeDelta: {x: -52.48, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4922464353795196045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4294001925723325660} + m_CullTransparentMesh: 0 +--- !u!114 &3815962664142758794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4294001925723325660} + 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.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: 41 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 41 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5347 \u7EA7" + LanguageIndex: 0 --- !u!1 &4359770096108468564 GameObject: m_ObjectHideFlags: 0 @@ -3779,7 +3780,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5136775017715279467} + - {fileID: 6757180706887448775} - {fileID: 1676212431931269004} m_Father: {fileID: 798015173237835578} m_RootOrder: 12 diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengUnLoadPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengUnLoadPanel.prefab index 9b1407a75d..c5102de338 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengUnLoadPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengUnLoadPanel.prefab @@ -648,8 +648,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: -295, y: -49} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -248, y: -49} + m_SizeDelta: {x: 195, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1962112155060276043 CanvasRenderer: @@ -686,7 +686,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1117,7 +1117,7 @@ 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: 21, y: -148} + m_AnchoredPosition: {x: 21, y: -82} m_SizeDelta: {x: 135.4, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2928976484220003980 @@ -1516,7 +1516,7 @@ 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: 21, y: -226} + m_AnchoredPosition: {x: 21, y: -160} m_SizeDelta: {x: 135.4, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2962436469266720112 @@ -1867,8 +1867,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: -295, y: -128} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -248.00003, y: -128} + m_SizeDelta: {x: 195, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3794753255847681849 CanvasRenderer: @@ -1905,7 +1905,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1947,8 +1947,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: -295, y: -203} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -248.00003, y: -203} + m_SizeDelta: {x: 195, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1462565709785835919 CanvasRenderer: @@ -1985,7 +1985,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -2571,7 +2571,7 @@ 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: 164, y: 86.5} + m_AnchoredPosition: {x: 144, y: 86.5} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3763684332243154989 @@ -2643,7 +2643,7 @@ 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: 21, y: 75} + m_AnchoredPosition: {x: 21, y: 141} m_SizeDelta: {x: 135.4, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2053752634692970960 @@ -3072,8 +3072,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: -102, y: 86.5} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -81, y: 18.3} + m_SizeDelta: {x: 100, y: 337.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4280895127486242528 GameObject: @@ -3525,7 +3525,7 @@ 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: 21, y: -70} + m_AnchoredPosition: {x: 21, y: -4} m_SizeDelta: {x: 135.4, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3510386891970724206 @@ -4291,7 +4291,7 @@ 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: 21, y: 3} + m_AnchoredPosition: {x: 21, y: 69} m_SizeDelta: {x: 135.4, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9194616543481516081 @@ -5157,8 +5157,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: -295, y: 95.49997} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -248.00003, y: 95.49997} + m_SizeDelta: {x: 195, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4879915484820718942 CanvasRenderer: @@ -5195,7 +5195,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -5356,8 +5356,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: -295, y: 25.099976} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -248.00003, y: 25.099976} + m_SizeDelta: {x: 195, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &826119108422463413 CanvasRenderer: @@ -5394,7 +5394,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua index b9242dc9b1..59ef51acb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua @@ -77,6 +77,7 @@ end function RedPacketPanel:OnShow() BindRedPointObject(RedPointType.Guild_RedPacket,this.redPoint) CheckRedPointStatus(RedPointType.Guild_RedPacket) + this.tabbox:SetActive(true) this.TabCtrl = TabBox.New() this.TabCtrl:SetTabAdapter(this.TabAdapter) this.TabCtrl:SetChangeTabCallBack(this.OnTabChange) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua index 71a29fa1f6..bb63c8772f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua @@ -144,7 +144,7 @@ function HongMengEnvoyPanel:BindEvent() end - self.GradeText.text = string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum) + self.GradeText.text = "鸿蒙塔等级:"..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum) --检测红点 UpdateGongMingLv for i = 1, #self.EnvoyItemList do @@ -162,7 +162,7 @@ function HongMengEnvoyPanel:BindEvent() end else - PopupTipPanel.ShowTip(Language[12198]) + PopupTipPanel.ShowTip(Language[11771]) end end end @@ -330,7 +330,7 @@ function HongMengEnvoyPanel:OnOpen(equipSId) local sum = HarmonyManager:HongMengTowerUpLimit() - self.GradeText.text = string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum) + self.GradeText.text = "鸿蒙塔等级:"..string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum) self:IsUpBtnGray() self:InitTextMum() self:CheckEvoyEquip()