From b5e8846e41d30213017b15c42a101d4dd58f84b6 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Fri, 13 Dec 2024 15:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/2icon/X1_zhucheng_tubiaomingcheng1.png | Bin 0 -> 524 bytes .../X1_zhucheng_tubiaomingcheng1.png.meta | 121 ++++++++++ .../UI/Fight/FightPointPassMainPanel.prefab | 4 +- .../Prefabs/UI/Main/MainPanel.prefab | 224 +++++++++++++++--- .../~Lua/Modules/Main/MainPanel.lua | 2 +- 5 files changed, 320 insertions(+), 31 deletions(-) create mode 100644 Assets/ManagedResources/BG/UI/2icon/X1_zhucheng_tubiaomingcheng1.png create mode 100644 Assets/ManagedResources/BG/UI/2icon/X1_zhucheng_tubiaomingcheng1.png.meta diff --git a/Assets/ManagedResources/BG/UI/2icon/X1_zhucheng_tubiaomingcheng1.png b/Assets/ManagedResources/BG/UI/2icon/X1_zhucheng_tubiaomingcheng1.png new file mode 100644 index 0000000000000000000000000000000000000000..42df3eeeec6414be96abe26dd2a73e898e231629 GIT binary patch literal 524 zcmV+n0`vWeP)Y5Qd*b6a_*2Y_u_UDYOv5!a^nSM<*g$iU>AVqG@a_{0NptB6IA)dAZ%&fVWw* z`@%KhVBb8Mne5DN4SPKTjWOP@QoYp6a5$`dvAX4Z4UYhcx-J*9g>+W2k8$NCq*lc~ z#?d!$;c`J6NHf5x1249^1>RgPXang0Sa#sWR_Cr4w1MPPs);%tco@-@{L^~!d;)W> z0hH~N7FGVwI`ZSA9?H_~IB-CsZW$!s_D7RYr!3v>f#!66cPkBmHB%&Q1rA7b4fIWr z+78Y5s-*pikjzTo|v74KBOK=uc(Wpy}$vXnrLaJwdofB`ZMDg9i&)~ zGCg8ZO+kJ6eX$270%bR<;ubeBTXNIDE05T--V6jB_G7+R4OQt0)_cvD3ntpNLO zJ$a`a;9X}*Af2e|H6hD*Q>7kLEs^o2N=;4Sw%z&hPI6Oa75FN22K)f)_nuMsN7)?! O0000\u6C38\u4E45\u7279\u6743" +--- !u!114 &3667705488396497737 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -73107,12 +73124,28 @@ MonoBehaviour: m_GameObject: {fileID: 6001139918026831346} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 1e1c6668b9507f84b8251431115f9ad5, type: 3} m_Name: m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 2, y: -2} + m_OutlineColor: {r: 0, g: 0, b: 0, a: 1} + m_OutlineDistance: {x: 1, y: 1} + m_ShadowColor: {r: 0, g: 0, b: 0, a: 0.43137255} + m_ShadowDistance: {x: 3, y: -3} m_UseGraphicAlpha: 1 +--- !u!114 &2519062305936554927 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6001139918026831346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &6018299568118914253 GameObject: m_ObjectHideFlags: 0 @@ -74966,7 +74999,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 127, y: 144} + m_SizeDelta: {x: 114, y: 129} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1245295961626444767 CanvasRenderer: @@ -75328,7 +75361,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 127, y: 144} + m_SizeDelta: {x: 114, y: 129} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4788135583134682652 CanvasRenderer: @@ -76361,6 +76394,141 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7082585511650441751 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3339770390762915293} + - component: {fileID: 945309684877949328} + - component: {fileID: 479527955084294470} + - component: {fileID: 5217397387368888800} + - component: {fileID: 7784540029141783693} + - component: {fileID: 9152698732156976761} + m_Layer: 5 + m_Name: NameBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3339770390762915293 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7082585511650441751} + 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: + - {fileID: 3943375214579996680} + m_Father: {fileID: 694772823556335785} + 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: 0, y: -46.4} + m_SizeDelta: {x: 127, y: 43} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &945309684877949328 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7082585511650441751} + m_CullTransparentMesh: 0 +--- !u!114 &479527955084294470 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7082585511650441751} + 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: 0.47058824} + 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: 34f25e6f98322c54696268658f27e4f9, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &5217397387368888800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7082585511650441751} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &7784540029141783693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7082585511650441751} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 5 + m_Right: 7 + m_Top: 5 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &9152698732156976761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7082585511650441751} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 50 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &7108863330248971075 GameObject: m_ObjectHideFlags: 0 @@ -82421,7 +82589,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: fe42424cf58508c46a4876999476d232, type: 3} + m_Sprite: {fileID: 21300000, guid: 878e40d9a30b3ad4e996844540c24ebe, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 6071a8fe1e..1243d341d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1016,7 +1016,7 @@ function this.CreatActivity() activityTabs[k].timeImg = Util.GetGameObject(activityTabs[k].go, "Image_1") activityTabs[k].timeText = Util.GetGameObject(activityTabs[k].timeImg, "time"):GetComponent("Text") activityTabs[k].redpot = Util.GetGameObject(activityTabs[k].go, "redPoint") - activityTabs[k].activityname = Util.GetGameObject(activityTabs[k].go, "activityname"):GetComponent("Text") + activityTabs[k].activityname = Util.GetGameObject(activityTabs[k].go, "NameBG/activityname"):GetComponent("Text") -- 限时折扣显示特效 if v.Id == 13 then local effect = poolManager:LoadAsset("UI_Effect_jinkuang_Yuan", PoolManager.AssetType.GameObject)