diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/QuanMinFLPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/QuanMinFLPanel.prefab index b9cb846fd8..a90f47f1fd 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/QuanMinFLPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/QuanMinFLPanel.prefab @@ -197,6 +197,85 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &1014593915993751549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2293838184298056130} + - component: {fileID: 5264884701912024565} + - component: {fileID: 6735126075473065230} + m_Layer: 5 + m_Name: hintTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2293838184298056130 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014593915993751549} + 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: 2385468292489900213} + m_RootOrder: 4 + 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: -267, y: 541} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5264884701912024565 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014593915993751549} + m_CullTransparentMesh: 0 +--- !u!114 &6735126075473065230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014593915993751549} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.45098042, g: 0.28627452, b: 0.121568635, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: --- !u!1 &1423140635938475687 GameObject: m_ObjectHideFlags: 0 @@ -1294,6 +1373,7 @@ RectTransform: - {fileID: 2869403810203928741} - {fileID: 5308020761504434853} - {fileID: 6572056644900855212} + - {fileID: 2293838184298056130} m_Father: {fileID: 2400084004413893316} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/QuanMinFLPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/QuanMinFLPanel.lua index adfacd399f..1f2e85e8ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/QuanMinFLPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/QuanMinFLPanel.lua @@ -28,6 +28,7 @@ function QuanMinFLPanel:InitComponent() self.itemPre = Util.GetGameObject(self.gameObject, "rzyBg/ItemPre") self.grid = Util.GetGameObject(self.gameObject, "rzyBg/scrollItem/grid") self.btn_close=Util.GetGameObject(self.gameObject, "rzyBg/btn_return") + self.hintTxt=Util.GetGameObject(self.gameObject, "rzyBg/hintTxt"):GetComponent("Text") --设置滚动条 --local rootHight = self.scrollItem.transform.rect.height --local width = self.scrollItem.transform.rect.width @@ -64,6 +65,7 @@ function QuanMinFLPanel:OnOpen(activityId) local missionList={} self.titleBgIma.sprite=self.spLoader:LoadSprite("GM_qmfl_banner_zh") local activityData=ActivityGiftManager.GetActivityInfoByType(10502) + if activityData and activityData.mission then for i = 1, #activityData.mission do @@ -77,6 +79,8 @@ function QuanMinFLPanel:OnOpen(activityId) -- self.missionPre = {} -- end LogError("missionList len="..#missionList) + local dataLen=#missionList + self.hintTxt.text="已购买人数"..missionList[dataLen].progress.."/"..UniversalWelfareConfig[missionList[dataLen].missionId].Peolple table.sort(missionList, function(a, b) if stateSort[a.state] == stateSort[b.state] then return a.missionId < b.missionId @@ -88,29 +92,32 @@ function QuanMinFLPanel:OnOpen(activityId) -- self.scrollView:SetData(missionList, function(index, item) -- self:RefreshShowData(item, missionList[index]) -- end,false,false) + - end - local len=#self.prelist - local dataLen=#missionList - if dataLen>len then - for i=1,dataLen-len do - local go=newObject(self.itemPre) - go.transform:SetParent(self.grid.transform) - go.transform.localScale = Vector3.one - go.transform.localPosition=Vector3.zero; - table.insert(self.prelist,go) + local len=#self.prelist + local dataLen=#missionList + if dataLen>len then + for i=1,dataLen-len do + local go=newObject(self.itemPre) + go.transform:SetParent(self.grid.transform) + go.transform.localScale = Vector3.one + go.transform.localPosition=Vector3.zero; + table.insert(self.prelist,go) + end + end + + len=#self.prelist + for i = 1,len do + if i>dataLen then + self.prelist[i]:SetActive(false) + else + self.prelist[i]:SetActive(true) + this:RefreshShowData(self.prelist[i],missionList[i],i) + end end end - len=#self.prelist - for i = 1,len do - if i>dataLen then - self.prelist[i]:SetActive(false) - else - self.prelist[i]:SetActive(true) - this:RefreshShowData(self.prelist[i],missionList[i],i) - end - end + end function QuanMinFLPanel:OnSortingOrderChange() @@ -164,7 +171,7 @@ function QuanMinFLPanel:RefreshShowData(item, data,index) table.insert(self.itemsList,itemList) end nameTxt.text="妖晶" - desTxt.text="购买人数达到"..UniversalWelfareConfig[data.missionId].Peolple.."人可领取" + desTxt.text= UniversalWelfareConfig[data.missionId].Describe --"购买人数达到"..UniversalWelfareConfig[data.missionId].Peolple.."人可领取" Util.SetGray(btn_get,data.state ~=1) redpoint.gameObject:SetActive(false) redpoint.gameObject:SetActive(data.state == 1)