diff --git a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelTrialPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelTrialPanel.prefab index 40264a9e53..8f2d8ac07d 100644 --- a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelTrialPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelTrialPanel.prefab @@ -181,6 +181,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4:5\u592909\u65F6" LanguageIndex: 0 +--- !u!1 &1472319716669193866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8552200405012909764} + - component: {fileID: 1578454265703255378} + - component: {fileID: 2554654434021218088} + m_Layer: 5 + m_Name: redpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8552200405012909764 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472319716669193866} + 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: 1019011625307048480} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -12.5, y: -12.5} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1578454265703255378 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472319716669193866} + m_CullTransparentMesh: 0 +--- !u!114 &2554654434021218088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472319716669193866} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &1547217150760750672 GameObject: m_ObjectHideFlags: 0 @@ -1421,6 +1495,7 @@ RectTransform: m_LocalScale: {x: 1.1, y: 1.1, z: 0} m_Children: - {fileID: 8893631836105709838} + - {fileID: 8552200405012909764} m_Father: {fileID: 9041930354262948749} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 855bc47917..adb3906c1b 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -17609,6 +17609,14 @@ MonoBehaviour: extension: .png resPathIndex: 65 resAbNameIndex: 31 + - resName: s_shanheshilian_rukou + extension: .png + resPathIndex: 65 + resAbNameIndex: 31 + - resName: s_shanheshilian_rukou2 + extension: .png + resPathIndex: 65 + resAbNameIndex: 31 - resName: s_shanheshilian_shanheshilianzi extension: .png resPathIndex: 65 diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua index 05c57d6e90..0d92a1c5d5 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua @@ -68,6 +68,9 @@ end function FightLevelTrialPanel:RemoveListener() end +function FightLevelTrialPanel:OnSortingOrderChange() +end + --界面打开时调用(用于子类重写) function FightLevelTrialPanel:OnOpen(_activityConfig,_index,parent) self.actConfig = _activityConfig @@ -145,14 +148,16 @@ function FightLevelTrialPanel:SingleDataShow(item,data,index) local getBtn = Util.GetGameObject(item,"getBtn") local btnImage = Util.GetGameObject(item,"getBtn"):GetComponent("Image") local btnText = Util.GetGameObject(item,"getBtn/Text"):GetComponent("Text") - + local redpoint = Util.GetGameObject(item,"getBtn/redpoint") local state = 0 + redpoint.gameObject:SetActive(false) if data.state == 1 then state = 2 elseif data.otherData.Values[1][1] > FightLevelManager.GetAllChapterStars() then state = 0 else state = 1 + redpoint.gameObject:SetActive(true) end starNum.text = data.otherData.Values[1][1]