diff --git a/Assets/ManagedResources/Prefabs/UI/Shop/MainShopPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Shop/MainShopPanel.prefab index b671f7b73f..4ab581b294 100644 --- a/Assets/ManagedResources/Prefabs/UI/Shop/MainShopPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Shop/MainShopPanel.prefab @@ -495,8 +495,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: -119.5, y: 0} - m_SizeDelta: {x: 155, y: 79.595} + m_AnchoredPosition: {x: -149.9, y: 228.5} + m_SizeDelta: {x: 212.3, y: 84.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222347767438749260 CanvasRenderer: @@ -1734,7 +1734,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 312} + m_AnchoredPosition: {x: 0, y: 372} m_SizeDelta: {x: 0, y: 85.70001} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1036919439 @@ -2455,7 +2455,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.70980394, g: 0.6431373, b: 0.5058824, a: 1} + m_Color: {r: 0.98823535, g: 0.9803922, b: 0.9725491, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2463,7 +2463,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 36 m_FontStyle: 0 m_BestFit: 1 @@ -2754,8 +2754,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: -5} - m_SizeDelta: {x: 160, y: 74} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 189, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2146428856575801967 CanvasRenderer: @@ -2785,7 +2785,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: d8e19ffb0a1c14b4dba326a273e52e7a, type: 3} + m_Sprite: {fileID: 21300000, guid: 0dc0640ffa275b742a82550b589865b2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3152,7 +3152,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000061035156, y: 0} + m_AnchoredPosition: {x: 0.000030517578, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &5698167213016214844 diff --git a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab index 2feb893c33..00371d22e5 100644 --- a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab @@ -1,5 +1,116 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2104176742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2104176743} + - component: {fileID: 2104176747} + - component: {fileID: 2104176746} + - component: {fileID: 2104176745} + - component: {fileID: 2104176744} + m_Layer: 5 + m_Name: titleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2104176743 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104176742} + 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: 224622296723305512} + 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: 386.5, y: 142.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2104176747 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104176742} + m_CullTransparentMesh: 0 +--- !u!114 &2104176746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104176742} + 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.9960785, g: 0.93725497, b: 0.93725497, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 82 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7075\u517D\u5546\u5E97" +--- !u!114 &2104176745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104176742} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &2104176744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104176742} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.8431373, g: 0.3254902, b: 0.37254903, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1012584920237626 GameObject: m_ObjectHideFlags: 0 @@ -324,7 +435,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: -31, y: 117} + m_AnchoredPosition: {x: -31, y: 139.2} m_SizeDelta: {x: 280, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222765991508291066 @@ -1171,14 +1282,15 @@ RectTransform: 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_Children: + - {fileID: 2104176743} m_Father: {fileID: 224589745136464296} 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: 2.2000122, y: 4} - m_SizeDelta: {x: 218, y: 68} + m_SizeDelta: {x: 307.8, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222180417632795242 CanvasRenderer: @@ -1706,8 +1818,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: -1491.1, y: 319.2} - m_SizeDelta: {x: 224.7, y: 262.9} + m_AnchoredPosition: {x: -1487, y: 310} + m_SizeDelta: {x: 233, y: 302} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222189988231697376 CanvasRenderer: @@ -1997,7 +2109,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1661251412756994} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2530,7 +2642,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 49.699955} + m_AnchoredPosition: {x: 0, y: 49.69995} m_SizeDelta: {x: 0, y: -99.400024} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1956310708716934 @@ -2872,7 +2984,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: -22, y: 117.000015} + m_AnchoredPosition: {x: -22, y: 139.2} m_SizeDelta: {x: 303, y: 77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7041719556531910036 @@ -3448,7 +3560,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: 199, y: 1.9} + m_AnchoredPosition: {x: 227, y: 1.9} m_SizeDelta: {x: 40, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &260160176260886405 @@ -5139,8 +5251,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: 10.7} - m_SizeDelta: {x: 216, y: 306.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 216, y: 434} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4696052057031592065 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua index 3426234c98..c969394773 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua @@ -3,10 +3,10 @@ local MainShopPanel = Inherit(BasePanel) local this = MainShopPanel -- Tab管理器 local TabBox = require("Modules/Common/TabBox") -local _Tab2Sprite = {default = "s_shop_qieye_1", select = "s_shop_qieye_2", lock = "s_shop_qieye_1"} -local _Tab2FontColor = { default = Color.New(181 / 255, 164 / 255, 129 / 255, 1), - lock = Color.New(181 / 255, 164 / 255, 129 / 255, 1), - select = Color.New(253 / 255, 244 / 255, 214 / 255, 1) } +local _Tab2Sprite = {default = "Btn_hz_tongyong_002", select = "Btn_hz_tongyong_001", lock = "s_shop_qieye_1"} +local _Tab2FontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), + lock = Color.New(255 / 255, 255 / 255, 255 / 255, 1), + select = Color.New(255 / 255, 255 / 255, 255 / 255, 1) } local _ShopTypeConfig = ConfigManager.GetConfig(ConfigName.StoreTypeConfig) local _ShopPage = { @@ -20,7 +20,7 @@ local _ShopPage = { }, [SHOP_PAGE.COIN] ={ -- 代币 default = "UI_hz_gonghui_33", lock = "UI_hz_gonghui_33", select = "UI_hz_gonghui_33", - rpType = RedPointType.Shop_Page_Coin,name="代币商店" + rpType = RedPointType.Shop_Page_Coin,name="公会商店" }, [SHOP_PAGE.PLAY] = { -- 玩法 default = "UI_hz_gonghui_34", lock = "UI_hz_gonghui_34", select = "UI_hz_gonghui_34", diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index eea63e36c0..d76583752a 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -54,6 +54,7 @@ function this:InitComponent() self.rechargeShopItem = Util.GetGameObject(self.gameObject, "scrollbg/scrollroot/item") self.titleBg = Util.GetGameObject(self.gameObject, "scrollbg/titlebg") self.titleImg = Util.GetGameObject(self.gameObject, "scrollbg/titlebg/title") + self.titleText = Util.GetGameObject(self.gameObject, "scrollbg/titlebg/title/titleText") self.helpBtn = Util.GetGameObject(self.gameObject, "scrollbg/titlebg/helpBtn")--scrollbg/titlebg/ self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition -- 创建循环列表 @@ -407,6 +408,7 @@ function this:RefreshBase() -- 商店标题 if self.ShopConfig.Title and self.ShopConfig.Title ~= "" then self.titleImg:GetComponent("Image").sprite = self.spLoader:LoadSprite(self.ShopConfig.Title) + self.titleText:GetComponent("Text").text = self.ShopConfig.Name.."商店" end -- 对话显示