From 0a80bf8b15d738394842910cd58fff05c73facb0 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 13 Aug 2025 13:55:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=84=8F?= =?UTF-8?q?=E5=BF=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Popup/FaLingSingleShowPopup.prefab | 136 +++++++++--------- .../Modules/Recruit/RecruitEquipPanelNew.lua | 1 + 2 files changed, 69 insertions(+), 68 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab index d66de896ce..14d29fe39e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab @@ -5116,7 +5116,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.854902, g: 0, b: 0, a: 1} + m_Color: {r: 0.26034328, g: 0.5660378, b: 0.050729785, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5343,7 +5343,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -0.9} m_SizeDelta: {x: 800, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &954781807244965406 @@ -5419,8 +5419,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 434.95, y: 0} - m_SizeDelta: {x: 905, y: 0} + m_AnchoredPosition: {x: 475, y: 0} + m_SizeDelta: {x: 920, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6217477407285219874 MonoBehaviour: @@ -5435,10 +5435,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 30 + m_Left: 20 m_Right: 0 - m_Top: 0 - m_Bottom: 0 + m_Top: 5 + m_Bottom: 5 m_ChildAlignment: 0 m_Spacing: 10 m_ChildForceExpandWidth: 0 @@ -5646,7 +5646,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: -29, y: 0} + m_AnchoredPosition: {x: -354, y: 0} m_SizeDelta: {x: 100, y: 49.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2507863033409594254 @@ -5679,7 +5679,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 32 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -5880,8 +5880,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 434.95, y: 0} - m_SizeDelta: {x: 905, y: 0} + m_AnchoredPosition: {x: 475, y: 0} + m_SizeDelta: {x: 920, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6836352913882028000 MonoBehaviour: @@ -5896,12 +5896,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 30 + m_Left: 20 m_Right: 0 m_Top: 0 - m_Bottom: 0 + m_Bottom: 5 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 5 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -10731,7 +10731,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: -29, y: 0} + m_AnchoredPosition: {x: -354.00003, y: 0} m_SizeDelta: {x: 100, y: 49.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1312987530506984998 @@ -10764,7 +10764,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 32 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -15835,7 +15835,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.26666668, g: 0.5882353, b: 0.07450981, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -15843,7 +15843,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: 34 m_FontStyle: 0 m_BestFit: 0 @@ -20624,7 +20624,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6117647, g: 0.36862746, b: 0.054901965, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -20632,7 +20632,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: 34 m_FontStyle: 0 m_BestFit: 0 @@ -20821,7 +20821,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 161.68, y: 66.15} + m_SizeDelta: {x: 880, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3799790185227221731 CanvasRenderer: @@ -20851,7 +20851,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: f57339a8b1354b9428d22a0b8dce20c9, type: 3} + m_Sprite: {fileID: 21300000, guid: a40c39d20c3dbcb419e836a687d8dcdd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -21013,7 +21013,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 161.68, y: 66.15} + m_SizeDelta: {x: 880, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4104582753842428520 CanvasRenderer: @@ -21043,7 +21043,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: f57339a8b1354b9428d22a0b8dce20c9, type: 3} + m_Sprite: {fileID: 21300000, guid: a40c39d20c3dbcb419e836a687d8dcdd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -30690,7 +30690,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 515.3, y: 0} - m_SizeDelta: {x: 869.9, y: 0} + m_SizeDelta: {x: 950, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8131479203938136133 MonoBehaviour: @@ -30721,7 +30721,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 20 + m_Top: 10 m_Bottom: 0 m_ChildAlignment: 1 m_Spacing: 7 @@ -31044,7 +31044,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 467.5, y: 0} + m_AnchoredPosition: {x: 457.5, y: 0} m_SizeDelta: {x: 875, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5711379197510184867 @@ -35816,7 +35816,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: -29, y: 0} + m_AnchoredPosition: {x: -354.00003, y: 0} m_SizeDelta: {x: 100, y: 49.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1586850713841072197 @@ -35849,7 +35849,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 32 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -36048,7 +36048,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 442.9, y: 0} + m_AnchoredPosition: {x: 432.9, y: 0} m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &8653047631559410116 @@ -36472,7 +36472,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.098039225, g: 0.8431373, b: 0.098039225, a: 1} + m_Color: {r: 0.048949793, g: 0.41509432, b: 0.048949793, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -41494,10 +41494,10 @@ RectTransform: m_Father: {fileID: 1969524464755873176} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 467.5, y: -85} - m_SizeDelta: {x: 875, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 457.5, y: 0} + m_SizeDelta: {x: 875, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2313003006818027609 MonoBehaviour: @@ -51370,8 +51370,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 434.95, y: 0} - m_SizeDelta: {x: 905, y: 0} + m_AnchoredPosition: {x: 475, y: 0} + m_SizeDelta: {x: 920, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5857915752065905400 MonoBehaviour: @@ -51386,10 +51386,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 30 + m_Left: 20 m_Right: 0 - m_Top: 0 - m_Bottom: 0 + m_Top: 5 + m_Bottom: 30 m_ChildAlignment: 0 m_Spacing: 10 m_ChildForceExpandWidth: 0 @@ -51510,8 +51510,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -4} - m_SizeDelta: {x: 900, y: 8} + m_AnchoredPosition: {x: 0, y: 0.20000076} + m_SizeDelta: {x: 880, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5835143987022383215 CanvasRenderer: @@ -51541,7 +51541,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: 19d5542f3ad36154883cfc2022d17e0a, type: 3} + m_Sprite: {fileID: 21300000, guid: fd5ff3c7d2db3214693ff66dcf9dc8af, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -51639,7 +51639,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: 0, y: -84.4} + m_AnchoredPosition: {x: 0, y: -82.6} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &460399709375896704 @@ -51672,7 +51672,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 23 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -61645,7 +61645,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 465.75, y: 0} + m_AnchoredPosition: {x: 455.75, y: 0} m_SizeDelta: {x: 871.5, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3812105176433244773 @@ -62022,10 +62022,10 @@ RectTransform: m_Father: {fileID: 1686059012614484793} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400, y: -25} - m_SizeDelta: {x: 600, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7826543180693064574 GameObject: @@ -62165,7 +62165,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.86666673, b: 0.24705884, a: 1} + m_Color: {r: 0.5754717, g: 0.4971191, b: 0.13300997, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -62232,9 +62232,9 @@ RectTransform: m_Father: {fileID: 1969524464755873176} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1724173878087686558 @@ -62258,7 +62258,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.3962264, g: 0.2710523, b: 0.031772878, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -62266,9 +62266,9 @@ 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_FontSize: 36 - m_FontStyle: 1 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 40 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 @@ -62414,7 +62414,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1969524464755873176 RectTransform: m_ObjectHideFlags: 0 @@ -62432,10 +62432,10 @@ RectTransform: m_Father: {fileID: 4714743663163808378} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 452.5, y: -165} - m_SizeDelta: {x: 905, y: 110} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 475, y: 0} + m_SizeDelta: {x: 920, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1784366634625095008 MonoBehaviour: @@ -62450,12 +62450,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 30 + m_Left: 20 m_Right: 0 m_Top: 0 - m_Bottom: 0 + m_Bottom: 5 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 5 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -72676,7 +72676,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 161.68, y: 66.15} + m_SizeDelta: {x: 880, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5748678726162093919 CanvasRenderer: @@ -72706,7 +72706,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: f57339a8b1354b9428d22a0b8dce20c9, type: 3} + m_Sprite: {fileID: 21300000, guid: a40c39d20c3dbcb419e836a687d8dcdd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua index f221acd79a..45561b381b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua @@ -26,6 +26,7 @@ function RecruitEquipPanelNew:InitComponent() self.root=Util.GetGameObject(self.panel,"root") self.rewardBox = Util.GetGameObject(self.panel, "btngroup/rewardBox") + self.rewardBox:SetActive(false) self.boxIcon = Util.GetGameObject(self.rewardBox, "boxIcon") self.slider = Util.GetGameObject(self.rewardBox,"Bg/Slider"):GetComponent("Image") self.sliderText = Util.GetGameObject(self.rewardBox, "progress/Text"):GetComponent("Text")