From b650ba81e8077eeeb21449b98427a9a2c73125ac Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 20 Aug 2020 16:47:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=A1=BA=E5=BA=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit d47708cc41ecf75dd8aba813449c9e20e492b5e5) --- .../UI/Operating/OperatingPanel.prefab | 74 +++++++++---------- .../ActivityGift/ActivityGiftManager.lua | 1 - .../~Lua/Modules/Operating/OperatingPanel.lua | 32 ++++---- 3 files changed, 53 insertions(+), 54 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab index ae3feec342..b25fae164b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab @@ -659,7 +659,7 @@ GameObject: - component: {fileID: 114451904932443988} - component: {fileID: 114829984440603480} m_Layer: 5 - m_Name: tabs_1 + m_Name: tabs_5 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -679,7 +679,7 @@ RectTransform: - {fileID: 568639522917424682} - {fileID: 9168254092259534281} m_Father: {fileID: 224613153558090644} - m_RootOrder: 0 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -896,7 +896,7 @@ GameObject: - component: {fileID: 222223956725511446} - component: {fileID: 8617049428068780533} m_Layer: 5 - m_Name: page_1 + m_Name: page_5 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -916,7 +916,7 @@ RectTransform: - {fileID: 863016053} - {fileID: 3467050837168159327} m_Father: {fileID: 224326955275377428} - m_RootOrder: 0 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1301,11 +1301,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224364277726372388} + - {fileID: 5615828735167990986} - {fileID: 224114314216780152} - {fileID: 6755377465913552352} - {fileID: 897629116163733771} - - {fileID: 5615828735167990986} + - {fileID: 224364277726372388} - {fileID: 1384613452998036532} - {fileID: 8814220106900169789} m_Father: {fileID: 224859010172153270} @@ -1354,15 +1354,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 224980375280759174} + - {fileID: 2114283670694146732} - {fileID: 224748070802756234} - {fileID: 224141371839801236} - {fileID: 1487702711196035133} - - {fileID: 2114283670694146732} - - {fileID: 3048090068103662213} + - {fileID: 224980375280759174} + - {fileID: 6064278685194838120} - {fileID: 8814220107145403555} - {fileID: 8814220106497423369} - - {fileID: 6064278685194838120} + - {fileID: 3048090068103662213} - {fileID: 375785417472329793} - {fileID: 1209172527590496317} - {fileID: 7741194408981798387} @@ -2709,7 +2709,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -8.5} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -540.86, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2790220155273969555 MonoBehaviour: @@ -8120,12 +8120,12 @@ GameObject: - component: {fileID: 5285331927146186406} - component: {fileID: 5412330582740733119} m_Layer: 5 - m_Name: page_5 + m_Name: page_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5615828735167990986 RectTransform: m_ObjectHideFlags: 0 @@ -8140,7 +8140,7 @@ RectTransform: - {fileID: 1134928736819784042} - {fileID: 5163948428886061200} m_Father: {fileID: 224326955275377428} - m_RootOrder: 4 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -34013,7 +34013,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7741194408981798387 RectTransform: m_ObjectHideFlags: 0 @@ -34030,9 +34030,9 @@ RectTransform: m_Father: {fileID: 224613153558090644} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 450, y: -92} m_SizeDelta: {x: 184, y: 184} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2425244200170157868 @@ -55192,7 +55192,7 @@ GameObject: - component: {fileID: 3288181376871965593} - component: {fileID: 8267326687302504792} m_Layer: 5 - m_Name: tabs_6 + m_Name: tabs_9 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -55212,7 +55212,7 @@ RectTransform: - {fileID: 3671343191984081671} - {fileID: 4627928063106812431} m_Father: {fileID: 224613153558090644} - m_RootOrder: 5 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -83136,7 +83136,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 154} m_Pivot: {x: 0, y: 1} --- !u!222 &7054035270899119123 CanvasRenderer: @@ -115319,7 +115319,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &375785417472329793 RectTransform: m_ObjectHideFlags: 0 @@ -115336,9 +115336,9 @@ RectTransform: m_Father: {fileID: 224613153558090644} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 92, y: -92} m_SizeDelta: {x: 184, y: 184} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5911972339559834340 @@ -115491,10 +115491,10 @@ RectTransform: m_Father: {fileID: 2547574702630156647} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: -87} + m_SizeDelta: {x: 150, y: 134} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3176581777211206878 CanvasRenderer: @@ -120563,7 +120563,7 @@ GameObject: - component: {fileID: 1268959317132352573} - component: {fileID: 6874443795423049374} m_Layer: 5 - m_Name: tabs_9 + m_Name: tabs_6 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -120583,7 +120583,7 @@ RectTransform: - {fileID: 7985051096529203752} - {fileID: 6913033910568031851} m_Father: {fileID: 224613153558090644} - m_RootOrder: 8 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -120845,7 +120845,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1209172527590496317 RectTransform: m_ObjectHideFlags: 0 @@ -120862,9 +120862,9 @@ RectTransform: m_Father: {fileID: 224613153558090644} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 271, y: -92} m_SizeDelta: {x: 184, y: 184} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4083780535237785567 @@ -136776,7 +136776,7 @@ GameObject: - component: {fileID: 3458708719321431360} - component: {fileID: 871490940080290256} m_Layer: 5 - m_Name: tabs_5 + m_Name: tabs_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -136796,7 +136796,7 @@ RectTransform: - {fileID: 8558366772861491315} - {fileID: 6754087034341056255} m_Father: {fileID: 224613153558090644} - m_RootOrder: 4 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 825790b357..866b371422 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -284,7 +284,6 @@ end function this.GetActivityOpenStatus(type) if this.mission[type] then - LogGreen(this.mission[type].reallyOpen) return this.mission[type].reallyOpen == 1 else Log(string.format(Language[10002], type)) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua index d17de0f0ca..ca22271177 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua @@ -21,7 +21,7 @@ local kMaxTab = 11 --显示类型 type 面板类型 body 显示页签索引 local ShowType={ - Welfare={type=1,body={1,2,5,9}},--福利 + Welfare={type=1,body={1,2,5,6}},--福利 MonthFund={type=2,body={7,8}} --超值基金 } local TabToContent = { @@ -30,13 +30,13 @@ local TabToContent = { [3] = 3, [4] = 4, [5] = 5, - [6] = 6, + [6] = 5, [7] = 7, [8] = 7, - [9] = 1, - [10] = 1, - [11] = 1, - [12] = 1, + [9] = 6, + [10] = 5, + [11] = 5, + [12] = 5, } local kMaxTab = #TabToContent @@ -53,11 +53,11 @@ function OperatingPanel:InitComponent() end self.selectTabIndex = -1 self.operatingContents = { - [1] = WeekMonthGiftPackPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")), + [1] = CumulativeSignIn.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")), [2] = MonthCardPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")), [3] = GrowthGiftPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")), [4] = ContinuityRechargePage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")), - [5] = CumulativeSignIn.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")), + [5] = WeekMonthGiftPackPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")), [6] = AttentionGiftPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")), [7] = UpperMonthCard:New(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")), } @@ -65,11 +65,11 @@ function OperatingPanel:InitComponent() content:OnHide() end) - BindRedPointObject(RedPointType.GiftPage, Util.GetGameObject(self.operateTabs[1], "redPoint")) + BindRedPointObject(RedPointType.CumulativeSignIn, Util.GetGameObject(self.operateTabs[1], "redPoint")) + BindRedPointObject(RedPointType.GiftPage, Util.GetGameObject(self.operateTabs[5], "redPoint")) BindRedPointObject(RedPointType.MonthCard, Util.GetGameObject(self.operateTabs[2], "redPoint")) BindRedPointObject(RedPointType.GrowthGift, Util.GetGameObject(self.operateTabs[3], "redPoint")) -- BindRedPointObject(RedPointType.ContinuityRecharge, Util.GetGameObject(self.operateTabs[4], "redPoint")) - BindRedPointObject(RedPointType.CumulativeSignIn, Util.GetGameObject(self.operateTabs[5], "redPoint")) -- 上部货币显示 self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform, { showType = UpViewOpenType.ShowLeft }) @@ -148,7 +148,7 @@ function OperatingPanel:OnDestroy() end function OperatingPanel:OnTabClicked(index) - if index == 6 then --第6个是什么绑定手鸡 + if index == 9 then --第9个是什么绑定手鸡 PopupTipPanel.ShowTip(Language[11487]) return end @@ -178,10 +178,10 @@ function OperatingPanel:ShowTabContent(index) self.operatingContents[oldContent]:OnHide() end - if index == 1 then + if index == 5 then self.operatingContents[curContent]:OnShow(self.sortingOrder, 1) return - elseif index == 9 then + elseif index == 6 then self.operatingContents[curContent]:OnShow(self.sortingOrder, 2) return elseif index==10 then @@ -242,9 +242,9 @@ function OperatingPanel:RefreshTabStatus() end if not RECHARGEABLE then--(是否开启充值) - self.operateTabs[1]:SetActive(false) + self.operateTabs[5]:SetActive(false) self.operateTabs[2]:SetActive(false) - self.operateTabs[9]:SetActive(false) + self.operateTabs[6]:SetActive(false) self.operateTabs[3]:SetActive(false) self.operateTabs[7]:SetActive(false)--, SALARY_TYPE.BASE_128 self.operateTabs[8]:SetActive(false)--, SALARY_TYPE.BASE_328 @@ -255,7 +255,7 @@ function OperatingPanel:RefreshTabStatus() end function OperatingPanel:GetPriorityIndex() - local index = 5 + local index = 1 for idx, operateItem in ipairs(self.operateTabs) do if Util.GetGameObject(operateItem, "redPoint").activeSelf then index = idx