diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab index a807e98989..01b8211dd5 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab @@ -145,6 +145,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1820718257822173687} - {fileID: 8174691545454135507} - {fileID: 3597293914897812886} - {fileID: 7664187428545557434} @@ -463,6 +464,53 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &566866127944547337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1820718257822173687} + - component: {fileID: 682159529315701993} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1820718257822173687 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 566866127944547337} + 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: 6893026086784897140} + - {fileID: 996536539065158426} + - {fileID: 7358646842554356004} + m_Father: {fileID: 1792764959241262439} + 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: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &682159529315701993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 566866127944547337} + m_CullTransparentMesh: 0 --- !u!1 &742306660034555430 GameObject: m_ObjectHideFlags: 0 @@ -5770,6 +5818,7 @@ RectTransform: - {fileID: 3826093032240713913} - {fileID: 3512704310149506704} - {fileID: 4708614719849942965} + - {fileID: 2210074410557156002} m_Father: {fileID: 8772735742504336993} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5888,7 +5937,7 @@ RectTransform: m_Children: - {fileID: 8472295107157176270} m_Father: {fileID: 1792764959241262439} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5967,7 +6016,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: -269.5, y: -521} + m_AnchoredPosition: {x: -269.5, y: -430} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3840635568929308425 @@ -6580,7 +6629,7 @@ RectTransform: - {fileID: 8378124066126775923} - {fileID: 391955313055842024} m_Father: {fileID: 1792764959241262439} - m_RootOrder: 0 + 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} @@ -6602,7 +6651,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3428593359095076002} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -6698,6 +6747,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3683460160705340515 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7358646842554356004} + - component: {fileID: 568557614017533568} + - component: {fileID: 2740781502714485269} + m_Layer: 5 + m_Name: Bg2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7358646842554356004 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3683460160705340515} + 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: 1820718257822173687} + m_RootOrder: 2 + 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: -8.8, y: 283.69995} + m_SizeDelta: {x: 833, y: 834} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &568557614017533568 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3683460160705340515} + m_CullTransparentMesh: 0 +--- !u!114 &2740781502714485269 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3683460160705340515} + 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: d810b87ac7a57d44f93dfb73006cfc41, 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 &3772299510285832107 GameObject: m_ObjectHideFlags: 0 @@ -7003,7 +7126,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: 0, y: 91} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &289963460829507102 @@ -7021,7 +7144,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 31 - m_Top: 147 + m_Top: 250 m_Bottom: 0 m_ChildAlignment: 2 m_Spacing: 10 @@ -7029,6 +7152,80 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &4498426809452546078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 996536539065158426} + - component: {fileID: 209647186530052858} + - component: {fileID: 5726264874514444479} + m_Layer: 5 + m_Name: Bg3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &996536539065158426 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4498426809452546078} + 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: 1820718257822173687} + 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: 0} + m_SizeDelta: {x: 1080, y: 1833} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &209647186530052858 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4498426809452546078} + m_CullTransparentMesh: 0 +--- !u!114 &5726264874514444479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4498426809452546078} + 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: 5644df9ee5037554ba996f94cdc531af, 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 &4668915026912685284 GameObject: m_ObjectHideFlags: 0 @@ -8995,7 +9192,7 @@ RectTransform: - {fileID: 4845195722760884985} - {fileID: 1876494193522904164} m_Father: {fileID: 1792764959241262439} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -14893,6 +15090,154 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8186161311435929646} m_CullTransparentMesh: 0 +--- !u!1 &8327315105478471619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6893026086784897140} + - component: {fileID: 8480489074927530339} + - component: {fileID: 5190262855195324117} + m_Layer: 5 + m_Name: Bg1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6893026086784897140 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8327315105478471619} + 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: 1820718257822173687} + m_RootOrder: 0 + 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_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8480489074927530339 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8327315105478471619} + m_CullTransparentMesh: 0 +--- !u!114 &5190262855195324117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8327315105478471619} + 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: ff5b4a7c4e932ae4abc1b4675bdb9df6, 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 &8442993710598278120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2210074410557156002} + - component: {fileID: 2423546049653599133} + - component: {fileID: 7645907499399457287} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2210074410557156002 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8442993710598278120} + 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: 235128951260794024} + m_RootOrder: 3 + 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: 40.1, y: 39.49997} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2423546049653599133 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8442993710598278120} + m_CullTransparentMesh: 0 +--- !u!114 &7645907499399457287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8442993710598278120} + 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 &8613925313822943764 GameObject: m_ObjectHideFlags: 0 @@ -15010,7 +15355,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: 4.6, y: -700} + m_AnchoredPosition: {x: 4.6, y: -609} m_SizeDelta: {x: 600, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3325518073787234455 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index dad22e38c1..366e3df85e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -54,7 +54,8 @@ function TimeLimitUpHero:InitComponent() self.sliderText=Util.GetGameObject(self.getBtn,"Text"):GetComponent("Text") self.sliderText2=Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text") self.nextReward = Util.GetGameObject(self.getBtn, "reward") - self.effect=Util.GetGameObject(self.nextReward,"juneng_chenggong") + self.effect=Util.GetGameObject(self.nextReward,"juneng_chenggong") + self.Bg = Util.GetGameObject(self.gameObject,"Bg2"):GetComponent("Image") self.mask1=Util.GetGameObject(self.gameObject,"Bg2/mask") self.heroPar=Util.GetGameObject(self.mask1,"curObj") @@ -62,6 +63,7 @@ function TimeLimitUpHero:InitComponent() self.btn_hero=Util.GetGameObject(self.gameObject,"btngroup/btn_hero") self.lsth = Util.GetGameObject(self.gameObject,"btngroup/zqbg") self.zqbgRed = Util.GetGameObject(self.gameObject,"btngroup/zqbg/red") + self.zqbgEffect = Util.GetGameObject(self.gameObject,"btngroup/zqbg/Fx_Circle 1") BindRedPointObject(RedPointType.TimeLimitWishStore,self.zqbgRed) self.heroIcon=Util.GetGameObject(self.btn_hero,"Icon"):GetComponent("Image") self.callTimeImg=Util.GetGameObject(self.gameObject,"callTimeImg"):GetComponent("Image") @@ -146,7 +148,10 @@ function TimeLimitUpHero:OnOpen(_activityConfig,_index,parent) self.parent = parent end -function TimeLimitUpHero:OnSortingOrderChange() +function TimeLimitUpHero:OnSortingOrderChange(layer) + sortingOrder =layer + SetParticleSortLayer(self.effect,layer) + SetParticleSortLayer(self.zqbgEffect,layer) end -- 打开,重新打开时回调 @@ -154,7 +159,9 @@ function TimeLimitUpHero:OnShow(_sortingOrder) self.gameObject:SetActive(true) sortingOrder = _sortingOrder Util.SetParticleSortLayer(self.effect, sortingOrder+1) + Util.SetParticleSortLayer(self.zqbgEffect, sortingOrder+1) self.actId = self.actConfig.ActId + LogError("self.actId===="..self.actId.." self.actConfig.ActiveType=="..self.actConfig.ActiveType.." self.actConfig.FunType== "..self.actConfig.FunType) self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType if self.actConfig.IfBack == 1 then if self.actConfig.ActiveType > 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua index 971e534a6a..d7d82f98a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua @@ -298,6 +298,7 @@ local redSort = { [2] = 2, [3] = 1, [4] = 4, + [5] = 5, } --界面打开时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index d4bd81580a..45c8583719 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -640,9 +640,23 @@ end function this.GetRecruitData() local dicData = {} local allConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityGroups, "PageType",1) + -- for i = 1,#allConfigs do + -- if allConfigs[i].ActiveType and allConfigs[i].ActiveType > 0 then + -- elseif allConfigs[i].FunType and allConfigs[i].FunType > 0 then + -- if allConfigs[i].IfBack == 1 then + -- if ActTimeCtrlManager.SingleFuncState(allConfigs[i].FunType) then + -- table.insert(dicData,allConfigs[i]) + -- end + -- else + -- if ActTimeCtrlManager.IsQualifiled(allConfigs[i].FunType) then + -- table.insert(dicData,allConfigs[i]) + -- end + -- end + -- end + -- end for i = 1,#allConfigs do - if allConfigs[i].ActiveType and allConfigs[i].ActiveType > 0 then - elseif allConfigs[i].FunType and allConfigs[i].FunType > 0 then + --if allConfigs[i].ActiveType and allConfigs[i].ActiveType > 0 then + if allConfigs[i].FunType and allConfigs[i].FunType > 0 then if allConfigs[i].IfBack == 1 then if ActTimeCtrlManager.SingleFuncState(allConfigs[i].FunType) then table.insert(dicData,allConfigs[i]) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index 37199865d4..39a4e8cf13 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -323,7 +323,7 @@ function RecruitPanelNew:UpdatePanelData() itemId=d[1] itemNum=d[2] m.icon.sprite=self.spLoader:LoadSprite(artResourcesConfig[itemConfig[itemId].ResourceID].Name) - m.num.text= tostring(itemNum) + m.num.text= PrintWanNum2(itemNum) end Util.AddOnceClick(m.btn,function()