限时礼包

FGUIProject/assets/EnduringGiftBox/RushSaleGiftBoxUI.xml

@@ -8,8 +8,6 @@
     <text id="n4_yjmk" name="txtBoxItemName" xy="363,279" size="283,65" fontSize="40" color="#fffbf5" align="center" autoSize="none" strokeColor="#d69546" text="体力限时礼包"/>
     <image id="n6_yjmk" name="n6" src="yjmk2n" fileName="images/xsqg_sj_db.png" xy="639,288"/>
     <text id="n8_yjmk" name="txtBoxResidueTime" xy="683,286" size="207,48" fontSize="35" color="#fffbf5" align="center" autoSize="none" text="6天23分23秒"/>
-    <image id="n10_yjmk" name="btnUp" src="yjmk2o" fileName="images/xsqg_fy_an_2.png" xy="63,452"/>
-    <image id="n9_yjmk" name="btnNext" src="yjmk2k" fileName="images/xsqg_fy_an.png" xy="877,458"/>
     <list id="n11_yjmk" name="list" xy="344,449" size="425,203" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="50" defaultItem="ui://bdi1qe15yjmk2p" align="center">
       <item/>
       <item/>
@@ -19,6 +17,8 @@
     <component id="n15_yjmk" name="btnBuyPink" src="yjmk2q" fileName="components/BtnBuyPink.xml" xy="408,765"/>
     <component id="n14_yjmk" name="comDiscount" src="yjmk2r" fileName="components/ComDiscount2.xml" xy="333,714"/>
     <text id="n16_yjmk" name="txtLrc" xy="379,859" size="380,46" fontSize="34" color="#b8857b" align="center" autoSize="shrink" text="可获得60充值经验"/>
-    <image id="n18_yjmk" name="btnBack" src="yjmk2s" fileName="images/back2.png" xy="499,1030"/>
+    <component id="n19_droi" name="btnUp" src="droi3c" fileName="components/BtnUp.xml" xy="63,452"/>
+    <component id="n20_droi" name="btnNext" src="droi3d" fileName="components/BtnNext.xml" xy="877,458"/>
+    <component id="n21_droi" name="btnBack" src="qqhz26" fileName="components/BnBack.xml" xy="502,1014"/>
   </displayList>
 </component>

FGUIProject/assets/EnduringGiftBox/components/BtnNext.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="166,182">
+  <displayList>
+    <image id="n0_droi" name="n0" src="yjmk2k" fileName="images/xsqg_fy_an.png" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/components/BtnUp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="166,182">
+  <displayList>
+    <image id="n0_droi" name="n0" src="yjmk2o" fileName="images/xsqg_fy_an_2.png" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/package.xml

@@ -81,6 +81,8 @@
     <image id="yjmk39" name="wpk_db_1_da.png" path="/images/"/>
     <image id="yjmk3a" name="wpk_sz_db_1.png" path="/images/"/>
     <image id="yjmk3b" name="an_pink.png" path="/images/"/>
+    <component id="droi3c" name="BtnUp.xml" path="/components/" exported="true"/>
+    <component id="droi3d" name="BtnNext.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/EnduringGiftBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/components/Button5.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="94,95" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n1_vek8" name="icon" xy="0,0" size="94,95" url="ui://mfvz4q8kktf2o6" autoSize="true"/>
+    <text id="n4_mbf1" name="title" xy="27,26" pivot="0.5,0.5" size="40,42" fontSize="30" align="center" vAlign="middle" text="">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n1_vek8" sidePair="width-width,height-height"/>
+</component>

GameClient/Assets/Game/HotUpdate/Data/ActivityGlobalDataManager.cs

@@ -29,11 +29,13 @@ namespace GFGGame
             if (activityInfo == null) return;
             if (activityInfos.ContainsKey(activityInfo.activityId)) return;
             activityInfos.Add(activityInfo.activityId, activityInfo);
-            if (!activityInfosByType.ContainsKey(activityInfo.activityId))
+
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.activityId);
+            if (!activityInfosByType.ContainsKey(activityOpenCfg.type))
             {
-                activityInfosByType.Add(activityInfo.activityId, new List<int>());
+                activityInfosByType.Add(activityOpenCfg.type, new List<int>());
             }
-            activityInfosByType[activityInfo.activityId].Add(activityInfo.activityId);
+            activityInfosByType[activityOpenCfg.type].Add(activityInfo.activityId);
             //ACTIVITY_ADD
             EventAgent.DispatchEvent(ConstMessage.ACTIVITY_ADD, activityInfo.activityId);
             //TODO 判断下时间非法情况

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/EnduringGiftBox/UI_RushSaleGiftBoxUI.cs

@@ -9,14 +9,14 @@ namespace UI.EnduringGiftBox
         public GComponent target;
         public GTextField m_txtBoxItemName;
         public GTextField m_txtBoxResidueTime;
-        public GImage m_btnUp;
-        public GImage m_btnNext;
         public GList m_list;
         public GTextField m_txtUrc;
         public UI_BtnBuyPink m_btnBuyPink;
         public UI_ComDiscount2 m_comDiscount;
         public GTextField m_txtLrc;
-        public GImage m_btnBack;
+        public GComponent m_btnUp;
+        public GComponent m_btnNext;
+        public GComponent m_btnBack;
         public const string URL = "ui://bdi1qe15yjmk29";
         public const string PACKAGE_NAME = "EnduringGiftBox";
         public const string RES_NAME = "RushSaleGiftBoxUI";
@@ -66,21 +66,19 @@ namespace UI.EnduringGiftBox
         {
             m_txtBoxItemName = (GTextField)comp.GetChild("txtBoxItemName");
             m_txtBoxResidueTime = (GTextField)comp.GetChild("txtBoxResidueTime");
-            m_btnUp = (GImage)comp.GetChild("btnUp");
-            m_btnNext = (GImage)comp.GetChild("btnNext");
             m_list = (GList)comp.GetChild("list");
             m_txtUrc = (GTextField)comp.GetChild("txtUrc");
             m_btnBuyPink = (UI_BtnBuyPink)UI_BtnBuyPink.Create(comp.GetChild("btnBuyPink"));
             m_comDiscount = (UI_ComDiscount2)UI_ComDiscount2.Create(comp.GetChild("comDiscount"));
             m_txtLrc = (GTextField)comp.GetChild("txtLrc");
-            m_btnBack = (GImage)comp.GetChild("btnBack");
+            m_btnUp = (GComponent)comp.GetChild("btnUp");
+            m_btnNext = (GComponent)comp.GetChild("btnNext");
+            m_btnBack = (GComponent)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtBoxItemName = null;
             m_txtBoxResidueTime = null;
-            m_btnUp = null;
-            m_btnNext = null;
             m_list = null;
             m_txtUrc = null;
             m_btnBuyPink.Dispose();
@@ -88,6 +86,8 @@ namespace UI.EnduringGiftBox
             m_comDiscount.Dispose();
             m_comDiscount = null;
             m_txtLrc = null;
+            m_btnUp = null;
+            m_btnNext = null;
             m_btnBack = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -33,6 +33,10 @@ namespace UI.Main
         public GGroup m_grpMove;
         public GLoader m_loaGuidestudio;
         public GButton m_btnFirstRecharge;
+        public GButton m_btnGiftBag1;
+        public GTextField m_txtGiftBagTime1;
+        public GButton m_btnGiftBag2;
+        public GTextField m_txtGiftBagTime2;
         public Transition m_t1;
         public Transition m_t2;
         public Transition m_t3;
@@ -110,6 +114,10 @@ namespace UI.Main
             m_grpMove = (GGroup)comp.GetChild("grpMove");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_btnFirstRecharge = (GButton)comp.GetChild("btnFirstRecharge");
+            m_btnGiftBag1 = (GButton)comp.GetChild("btnGiftBag1");
+            m_txtGiftBagTime1 = (GTextField)comp.GetChild("txtGiftBagTime1");
+            m_btnGiftBag2 = (GButton)comp.GetChild("btnGiftBag2");
+            m_txtGiftBagTime2 = (GTextField)comp.GetChild("txtGiftBagTime2");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
             m_t3 = comp.GetTransition("t3");
@@ -160,6 +168,10 @@ namespace UI.Main
             m_grpMove = null;
             m_loaGuidestudio = null;
             m_btnFirstRecharge = null;
+            m_btnGiftBag1 = null;
+            m_txtGiftBagTime1 = null;
+            m_btnGiftBag2 = null;
+            m_txtGiftBagTime2 = null;
             m_t1 = null;
             m_t2 = null;
             m_t3 = null;

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/RushSaleGiftBoxView.cs

@@ -27,7 +27,7 @@ namespace GFGGame
             packageName = UI_RushSaleGiftBoxUI.PACKAGE_NAME;
             _ui = UI_RushSaleGiftBoxUI.Create();
             this.viewCom = _ui.target;
-            this.viewCom.Center();
+            // this.viewCom.Center();
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.None;
 
@@ -36,25 +36,15 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnBtnCancelClick);
             _ui.m_btnBuyPink.target.onClick.Add(OnBtnBuyClick);
         }
-
-        public override void Dispose()
-        {
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-
-            base.Dispose();
-        }
-
+        
         protected override void OnShown()
         {
             base.OnShown();
             _type = (int)(this.viewData as object[])[0]; //ConstActivityType
             AddEffect();
+            LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData4();
+            LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData5();
             InitPageInex();
-
             UpViewNone();
         }
 
@@ -63,12 +53,14 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_REMOVE, UpViewNone);
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_ADD, UpViewNone);
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpViewNone);
         }
 
         protected override void RemoveEventListener()
         {
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_REMOVE, UpViewNone);
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_ADD, UpViewNone);
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpViewNone);
             base.RemoveEventListener();
         }
 
@@ -91,7 +83,7 @@ namespace GFGGame
                 //5
                 var data5 = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData5
                     .FirstOrDefault(a => a.IndexType == 1);
-                _pageIndex = data5 == null ? 0 : LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData4.IndexOf(data5);
+                _pageIndex = data5 == null ? 0 : LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData5.IndexOf(data5);
             }
         }
 
@@ -106,7 +98,7 @@ namespace GFGGame
             if (list.Count == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-                OnHide();
+                this.Hide();
                 return;
             }
 
@@ -123,13 +115,34 @@ namespace GFGGame
             if (list.Count == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-                OnHide();
+                this.Hide();
                 return;
             }
 
             var data = ListUtil.Navigate(list, type, _pageIndex, out int newIndex);
             _pageIndex = newIndex;
 
+            _ui.m_btnUp.visible = true;
+            _ui.m_btnNext.visible = true;
+            if (list.Count == 1)
+            {
+                _ui.m_btnUp.visible = false;
+                _ui.m_btnNext.visible = false;
+            }
+            else
+            {
+                //翻页翻到了最后一条数据
+                if (list.Count == _pageIndex + 1)
+                {
+                    _ui.m_btnNext.visible = false;
+                }
+
+                if (_pageIndex == 0)
+                {
+                    _ui.m_btnUp.visible = false;
+                }
+            }
+
             var shopCfg = ShopCfgArray.Instance.GetCfg(data.ShopCfgId);
             var boxItemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
             var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
@@ -213,16 +226,16 @@ namespace GFGGame
 
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemKv[0]);
             uiItem.m_txtItemName.text = itemCfg.name;
+            uiItem.target.data = itemCfg;
             uiItem.m_comRewardIconItem.m_bagBlue.visible = false;
             uiItem.m_comRewardIconItem.m_bagBlueEx.visible = false;
             uiItem.m_comRewardIconItem.m_num.text = itemKv[1].ToString();
             uiItem.m_comRewardIconItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            uiItem.m_comRewardIconItem.target.onClick.Add(OnListSelectorItemClick);
         }
 
         private void UpViewNone()
         {
-            LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData4();
-            LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData5();
             UpdateView(ListUtil.NavigateType.None);
         }
 
@@ -281,5 +294,14 @@ namespace GFGGame
         {
             this.Hide();
         }
+        
+        //弹出物品详细描述框
+        private void OnListSelectorItemClick(EventContext context)
+        {
+            GObject sender = context.sender as GObject;
+            GObject obj = sender.parent;
+            ItemCfg itemCfg = obj.data as ItemCfg;
+            GoodsItemTipsController.ShowItemTips(itemCfg.id);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/SpecialOfferGiftBoxView.cs

@@ -79,7 +79,7 @@ namespace GFGGame
             if (list.Count == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-                OnHide();
+                this.Hide();
                 return;
             }
 
@@ -101,7 +101,7 @@ namespace GFGGame
             if (list.Count == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-                OnHide();
+                this.Hide();
                 return;
             }
 

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -70,8 +70,8 @@ namespace GFGGame
             _valueBarController.OnShown();
             _valueBarController.UpdateList(new List<int>() { _luckyBoxCfg.costID });
             _luckyBoxCtrl.OnShown(_luckyBoxCfg.id);
-            UpdateView();
             Timers.inst.Add(1, 0, UpdateTime);
+            UpdateView();
         }
         private void UpdateTime(object param = null)
         {
@@ -89,10 +89,10 @@ namespace GFGGame
 
             //=====限时礼包倒计时
             UpGiftBox();
-            if (ViewManager.isViewOpen(typeof(RushSaleGiftBoxView).FullName))
+            if (ViewManager.isViewOpen(nameof(RushSaleGiftBoxView)))
             {
                 var rushSaleGiftBoxView =
-                    ViewManager.GetUIView(typeof(RushSaleGiftBoxView).FullName) as RushSaleGiftBoxView;
+                    ViewManager.GetUIView(nameof(RushSaleGiftBoxView)) as RushSaleGiftBoxView;
                 rushSaleGiftBoxView?.UpTime();
             }
             //=====限时礼包倒计时END

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 using System.Collections.Generic;
 using ET;
 using System;
+using System.Linq;
 using UI.CommonGame;
 
 namespace GFGGame
@@ -153,6 +154,8 @@ namespace GFGGame
             // _btnStudio.onClick.Add(OnClickBtnStudio);
             // _btnField.onClick.Add(OnClickBtnField);
             _btnBag.onClick.Add(OnClickBtnBag);
+            _ui.m_btnGiftBag1.onClick.Add(OnClickBtnGiftBag1);
+            _ui.m_btnGiftBag2.onClick.Add(OnClickBtnGiftBag2);
 
             _ui.m_loaRight.target.onClick.Add(MoveLeft);
             _ui.m_loaLeft.target.onClick.Add(MoveRight);
@@ -631,6 +634,30 @@ namespace GFGGame
             ViewManager.Show(ViewName.ROLE_INFO_VIEW);
         }
 
+        //列表
+        private void OnClickBtnGiftBag1()
+        {
+          //ActivityType.XSLB1
+        }
+        
+        //圆形
+        private void OnClickBtnGiftBag2()
+        {
+            var activityInfoByTypeList =
+                ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB2);
+
+            var list = activityInfoByTypeList
+                .Where(a => a.endTime > TimeInfo.Instance.ServerNow()).ToList();
+            if (list.Count == 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+            }
+            else
+            {
+                ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.XSLB2, this.viewData });
+            }
+        }
+
         private void Update(object param)
         {
             ShowExitAlert();