From 837e769c14cce43b0de843ef9081f7173224d1b7 Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Wed, 30 Aug 2023 22:07:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=83=E7=95=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/QiJieShiLian/QiJieShiLianPanel.prefab | 206 +++++++++++++++--- .../QiJieShiLian/QiJieShiLianPanel.lua | 4 +- 2 files changed, 180 insertions(+), 30 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab index f8cfb4df01..e85ed89266 100644 --- a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab @@ -7343,6 +7343,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1151144909 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1151144910} + - component: {fileID: 1151144912} + - component: {fileID: 1151144911} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1151144910 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1151144909} + 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: 7062579154444941889} + 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: -15, y: -65} + m_SizeDelta: {x: 151, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1151144912 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1151144909} + m_CullTransparentMesh: 0 +--- !u!114 &1151144911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1151144909} + 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: 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_Sprite: {fileID: 21300000, guid: 6b74b32357f4cfe4fb749da600533533, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1190340635 GameObject: m_ObjectHideFlags: 0 @@ -9006,6 +9080,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1440305848 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1440305849} + - component: {fileID: 1440305851} + - component: {fileID: 1440305850} + m_Layer: 0 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1440305849 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1440305848} + 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: 7062579154444941889} + 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: -12, y: 4.6} + m_SizeDelta: {x: 159, y: 164} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1440305851 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1440305848} + m_CullTransparentMesh: 0 +--- !u!114 &1440305850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1440305848} + 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: 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_Sprite: {fileID: 21300000, guid: 1d0319f07020b7446a88cc1fea1a69fc, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1455872921 GameObject: m_ObjectHideFlags: 0 @@ -12562,14 +12710,16 @@ 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: 1151144910} + - {fileID: 1440305849} m_Father: {fileID: 4111861525389611920} 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.3, y: 0.61} - m_SizeDelta: {x: 200, y: 121.34} + m_SizeDelta: {x: 186, y: 173} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3971427918725485211 CanvasRenderer: @@ -12599,7 +12749,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: 3c2c09241e35b084583053797b5c3146, type: 3} + m_Sprite: {fileID: 21300000, guid: a758002a909c6bf478516e8eb95c858e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -13409,8 +13559,8 @@ 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: -218.92, y: -431} - m_SizeDelta: {x: 150, y: 100} + m_AnchoredPosition: {x: -189.2, y: -387.8} + m_SizeDelta: {x: 209.6, y: 240.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3894009504481957099 CanvasRenderer: @@ -16066,8 +16216,8 @@ GameObject: m_Component: - component: {fileID: 6395397312321115719} - component: {fileID: 2883982566452069115} - - component: {fileID: 7729752259397430008} - component: {fileID: 5772662400124129660} + - component: {fileID: 719117893} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -16091,7 +16241,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: 0} + m_AnchoredPosition: {x: -13, y: -101} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2883982566452069115 @@ -16102,21 +16252,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7641637194158697498} m_CullTransparentMesh: 0 ---- !u!114 &7729752259397430008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7641637194158697498} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1.5, y: -1.5} - m_UseGraphicAlpha: 1 --- !u!114 &5772662400124129660 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16130,7 +16265,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9529412, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.98823535, g: 0.98823535, b: 0.97647065, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -16138,9 +16273,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: 50 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 32 + m_FontStyle: 2 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 60 @@ -16152,6 +16287,21 @@ MonoBehaviour: m_LineSpacing: 0.8 m_Text: "\u82E6\u72F1\u754C" LanguageIndex: 10337 +--- !u!114 &719117893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7641637194158697498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.1254902, g: 0.027450982, b: 0.03529412, a: 1} + m_EffectDistance: {x: 1.9, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &7752452386878455158 GameObject: m_ObjectHideFlags: 0 @@ -16609,8 +16759,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 75, y: 50} - m_SizeDelta: {x: -150, y: 100} + m_AnchoredPosition: {x: 38.099976, y: 129.74998} + m_SizeDelta: {x: -129.9, y: 259.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8590061395019584692 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua index 8a4732cbde..83f638ffdb 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua @@ -52,7 +52,7 @@ function QiJieShiLianPanel:InitComponent() self.tabPre = Util.GetGameObject(self.TabBox,"tabPre") self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.box.transform, - self.tabPre, nil, Vector2.New(940.6, 150), 2, 1, Vector2.New(20, 0)) + self.tabPre, nil, Vector2.New(940.6, 240), 2, 1, Vector2.New(20, 0)) self.ScrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(-8, 0) self.ScrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5) self.ScrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5) @@ -234,7 +234,7 @@ function QiJieShiLianPanel:SetTabBox() self.ScrollView:SetData(tabList, function (index, go) Util.GetGameObject(go,"Text"):GetComponent("Text").text = tabList[index].Chapter local state = tabList[index].QijieType == self.configData.QijieType - local name = state and "r_hero_xuanze_001" or "r_hero_xuanze_002" + local name = state and "UI_hz_kuang_bg_01" or "UI_hz_kuang_bg_01" Util.GetGameObject(go,"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(name) Util.GetGameObject(go,"LockImage"):SetActive(not state) Util.AddOnceClick(go,function ()