Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -19,10 +19,15 @@ namespace GFGGame
         private List<LimitedTimeGiftBoxItemYxData> _ltgGbItemData5 = new List<LimitedTimeGiftBoxItemYxData>();
         public List<LimitedTimeGiftBoxItemYxData> LtgGbItemData5 => _ltgGbItemData5;
 
+        //圆形样式数据16--时间条件的数据
+        private List<LimitedTimeGiftBoxItemYxData> _ltgGbItemData16 = new List<LimitedTimeGiftBoxItemYxData>();
+        public List<LimitedTimeGiftBoxItemYxData> LtgGbItemData16 => _ltgGbItemData16;
+
         public void Clear()
         {
             _ltgGbItemData4.Clear();
             _ltgGbItemData5.Clear();
+            _ltgGbItemData16.Clear();
             _isOpenMeiRiTeHui = false;
         }
 
@@ -75,6 +80,26 @@ namespace GFGGame
             _ltgGbItemData5 = _ltgGbItemData5.OrderBy(a => a.ShopCfgId).ToList();
         }
 
+        public void UpLtgGbItemData16()
+        {
+            _ltgGbItemData16.Clear();
+            foreach (ActivityInfo activityInfo in ActivityGlobalDataManager.Instance.GetActivityInfoByType(
+                         ActivityType.LuckyDiscount))
+            {
+                if (activityInfo.EndTime >= TimeInfo.Instance.ServerNow())
+                {
+                    ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
+                    //判断是否是类型16的数据
+                    if (activityOpenCfg.type == ActivityType.LuckyDiscount)
+                    {
+                        FillData(_ltgGbItemData16, activityOpenCfg.paramsArr[0], activityInfo.EndTime);
+                    }
+                }
+            }
+
+            _ltgGbItemData16 = _ltgGbItemData16.OrderBy(a => a.ShopCfgId).ToList();
+        }
+
         private void FillData(List<LimitedTimeGiftBoxItemYxData> listData, int shopCfgId, long endTime)
         {
             ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);

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

@@ -18,6 +18,8 @@ namespace GFGGame
 
         public bool CHECK_TIPS_OPEN = false; //提示弹窗是否打开
 
+        public bool OPEN_LUCKY_DISCONT = false; //抽奖满20次幸运折扣弹窗是否打开
+
         private List<ItemData> _rewardsList;//当前奖励，每次抽奖后刷新
         private Dictionary<int, ItemData> _firstRewardsList = new Dictionary<int, ItemData>();//首次获得的奖励
         private Dictionary<int, List<LuckyBoxBonusData>> _dicShowList = new Dictionary<int, List<LuckyBoxBonusData>>();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyTipsUI.cs

@@ -8,12 +8,12 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public Controller m_checkType;
-        public GComponent m_bg;
+        public GImage m_bg;
         public GTextField m_txtNeed;
         public GTextField m_txtCost;
         public GLoader m_loaNeed;
-        public GButton m_btnCancel;
-        public GButton m_btnSure;
+        public UI_Button18 m_btnCancel;
+        public UI_Button18 m_btnSure;
         public GButton m_btnCheck;
         public const string URL = "ui://eg2y0ldpds629g";
         public const string PACKAGE_NAME = "CommonGame";
@@ -63,12 +63,12 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_checkType = comp.GetController("checkType");
-            m_bg = (GComponent)comp.GetChild("bg");
+            m_bg = (GImage)comp.GetChild("bg");
             m_txtNeed = (GTextField)comp.GetChild("txtNeed");
             m_txtCost = (GTextField)comp.GetChild("txtCost");
             m_loaNeed = (GLoader)comp.GetChild("loaNeed");
-            m_btnCancel = (GButton)comp.GetChild("btnCancel");
-            m_btnSure = (GButton)comp.GetChild("btnSure");
+            m_btnCancel = (UI_Button18)UI_Button18.Create(comp.GetChild("btnCancel"));
+            m_btnSure = (UI_Button18)UI_Button18.Create(comp.GetChild("btnSure"));
             m_btnCheck = (GButton)comp.GetChild("btnCheck");
         }
         public void Dispose(bool disposeTarget = false)
@@ -78,7 +78,9 @@ namespace UI.CommonGame
             m_txtNeed = null;
             m_txtCost = null;
             m_loaNeed = null;
+            m_btnCancel.Dispose();
             m_btnCancel = null;
+            m_btnSure.Dispose();
             m_btnSure = null;
             m_btnCheck = null;
             if(disposeTarget && target != null)

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

@@ -7,6 +7,7 @@ namespace UI.EnduringGiftBox
     public partial class UI_RushSaleGiftBoxUI
     {
         public GComponent target;
+        public Controller m_showType;
         public GComponent m_btnUp;
         public GComponent m_btnNext;
         public GComponent m_btnBack;
@@ -70,6 +71,7 @@ namespace UI.EnduringGiftBox
 
         private void Init(GComponent comp)
         {
+            m_showType = comp.GetController("showType");
             m_btnUp = (GComponent)comp.GetChild("btnUp");
             m_btnNext = (GComponent)comp.GetChild("btnNext");
             m_btnBack = (GComponent)comp.GetChild("btnBack");
@@ -89,6 +91,7 @@ namespace UI.EnduringGiftBox
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_showType = null;
             m_btnUp = null;
             m_btnNext = null;
             m_btnBack = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxActivityUI.cs

@@ -7,10 +7,12 @@ namespace UI.LuckyBox
     public partial class UI_LuckyBoxActivityUI
     {
         public GComponent target;
+        public Controller m_showGiftBag;
         public UI_ComBox m_comBox;
         public GButton m_btnBack;
         public GComponent m_valueBar;
         public GTextField m_txtTime;
+        public GButton m_btnLuckyDiscount;
         public GButton m_btnGiftBag;
         public UI_ComBagTime m_comBagTime;
         public GButton m_btnShop;
@@ -62,10 +64,12 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
+            m_showGiftBag = comp.GetController("showGiftBag");
             m_comBox = (UI_ComBox)UI_ComBox.Create(comp.GetChild("comBox"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnLuckyDiscount = (GButton)comp.GetChild("btnLuckyDiscount");
             m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
             m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
             m_btnShop = (GButton)comp.GetChild("btnShop");
@@ -73,11 +77,13 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_showGiftBag = null;
             m_comBox.Dispose();
             m_comBox = null;
             m_btnBack = null;
             m_valueBar = null;
             m_txtTime = null;
+            m_btnLuckyDiscount = null;
             m_btnGiftBag = null;
             m_comBagTime.Dispose();
             m_comBagTime = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/LuckyBoxSProxy.cs

@@ -41,12 +41,22 @@ namespace GFGGame
                     ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(response.ActivityId);
                     if (activityOpenCfg != null && activityOpenCfg.paramsArr[0] == luckyBoxId)
                     {
+                        
                         var activityCfg = ActivityOpenCfgArray.Instance.GetCfg(response.ActivityId);
                         if (activityCfg.type == ConstLimitTimeActivityType.ActLimitLuckyBox)
                             ActivityDataManager.Instance.allPlayTimes += response.Times;
-                        else if(activityCfg.type == ConstLimitTimeActivityType.ActLimitTsy)
+                        else if (activityCfg.type == ConstLimitTimeActivityType.ActLimitTsy)
                             ActivityDataManager.Instance.allTsyPlayTimes += response.Times;
+                        else if (activityCfg.type == ConstLimitTimeActivityType.ActLimitStlyc)
+                        {
+                            if (ActivityDataManager.Instance.allLimitStlycTimes < 20 && (ActivityDataManager.Instance.allLimitStlycTimes + response.Times) >= 20)
+                            {
+                                LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT = true;
+                            }
+                            ActivityDataManager.Instance.allLimitStlycTimes += response.Times;
+                        }
                     }
+
                     LuckyBoxDataManager.Instance.times = response.Times;
                     // LuckyBoxDataManager.Instance.luckyBoxIndex = response.LuckyBoxId;
                     LuckyBoxDataManager.Instance.RewardList = ItemUtil.CreateItemDataList(response.bonusList);

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/MonthlyCardTipsView.cs

@@ -13,7 +13,7 @@ namespace GFGGame
         private int rewards = 3;
         private List<int> itemID = new List<int>() { 1000005, 1000004, 5005006 };
         private List<string> rarity = new List<string>() {"", "wpk_db_fp", "wpk_db_zx", "wpk_db_dc", "wpk_db_ty" };
-        private List<string> rewardNum = new List<string>() { "x1680", "x300", "专属头像框" };
+        private List<string> rewardNum = new List<string>() { "x1800", "x300", "专属头像框" };
         public override void Dispose()
         {
 

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -171,7 +171,8 @@ namespace GFGGame
             }
 
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_selectedItemId);
-            if (itemCfg == null) { 
+            if (itemCfg == null)
+            {
                 ET.Log.Error("OnClickBtnProcuction itemCfg is null");
                 return;
             }
@@ -228,9 +229,11 @@ namespace GFGGame
             // 平板会比宽手机更宽，设定最小值防止缩小
             rate = Mathf.Max(rate, 1);
 
+            _dressUpObjUI.dressUpObj.TakeOffAll();
             _dressUpObjUI.ResetSceneObj(45, true, true, null, false);
-            _dressUpObjUI.dressUpObj.AddOrRemove(_selectedItemId, true);
-            _imgSelected.visible = true;// _dressUpObjUI.dressUpObj.CheckDressUpItemIsOn(_selectedItemId);
+            _dressUpObjUI.dressUpObj.AddOrRemove(_selectedItemId, true, DressUpOption.Add);
+            //_imgSelected.visible = _dressUpObjUI.dressUpObj.CheckDressUpItemIsOn(_selectedItemId);
+            _imgSelected.visible = true;
             _dressUpObjUI.UpdateWrapper(_compMover.m_holder);
             int type = ItemUtilCS.GetItemSubType(_selectedItemId);
             float duration = DURATION;
@@ -253,13 +256,13 @@ namespace GFGGame
             else if (Array.IndexOf(UPPER_BODY_Y_ARR, type) >= 0)
             {
                 _ui.m_compHolder.m_compHolder.m_compMover.target.TweenMoveY(UPPER_BODY_Y + dy, duration).SetEase(ease);
-                _compMover.target.TweenScale(new Vector2(UPPER_BODY_SCALE* rate, UPPER_BODY_SCALE * rate), duration).SetEase(ease);
+                _compMover.target.TweenScale(new Vector2(UPPER_BODY_SCALE * rate, UPPER_BODY_SCALE * rate), duration).SetEase(ease);
             }
             else if (Array.IndexOf(LOWER_BODY_Y_ARR, type) >= 0)
             {
                 _ui.m_loaBg2.visible = true;
                 _compMover.target.TweenMoveY(LOWER_BODY_Y + dy, duration).SetEase(ease);
-                _compMover.target.TweenScale(new Vector2(LOWER_BODY_SCALE * rate, LOWER_BODY_SCALE* rate), duration).SetEase(ease);
+                _compMover.target.TweenScale(new Vector2(LOWER_BODY_SCALE * rate, LOWER_BODY_SCALE * rate), duration).SetEase(ease);
             }
             else if (Array.IndexOf(SHOES_Y_ARR, type) >= 0)
             {

GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyTipsView.cs

@@ -36,9 +36,9 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _ui.m_btnSure.onClick.Add(OnClickBtnSure);
-            _ui.m_btnCancel.onClick.Add(OnClickBtnCancel);
-            _ui.m_btnCancel.onClick.Add(OnClickBtnCancel);
+            _ui.m_btnSure.target.onClick.Add(OnClickBtnSure);
+            _ui.m_btnCancel.target.onClick.Add(OnClickBtnCancel);
+            _ui.m_btnCancel.target.onClick.Add(OnClickBtnCancel);
             _ui.m_btnCheck.onClick.Add(OnBtnCheckClick);
         }
 

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -121,9 +121,9 @@ namespace GFGGame
                 int targetY = (int)(_ui.m_item.y + _ui.m_item.height + 50);
             }
             // UpdateItem(itemId);
-
+            bool showAction = SuitCfgArray.Instance.CheckSuitHasAction(suitId) && DressUpMenuSuitDataManager.CheckSuitHasActionRes(suitId);
             _dressUpObjUI.ResetSceneObj(115, false, true, null,  false);
-            _dressUpObjUI.dressUpObj.PutOnSuitCfg(suitId, false, null, false, false);
+            _dressUpObjUI.dressUpObj.PutOnSuitCfg(suitId, showAction, null, false, false);
             _dressUpObjUI.UpdateWrapper(_ui.m_holder);
         }
     }

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

@@ -56,6 +56,7 @@ namespace GFGGame
             _ui.m_t3.Play();
             LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData4();
             LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData5();
+            LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData16();
             InitPageInex();
             UpViewNone();
         }
@@ -117,43 +118,66 @@ namespace GFGGame
                     LimitedTimeGiftBoxDataManager.Instance.SetIsOpenMeiRiTeHui();
                 }
             }
+            else if (_type == ActivityType.LuckyDiscount)
+            {
+                //16开服活动摘星里面的 幸运折扣
+                var data16 = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData16
+                    .FirstOrDefault(a => a.IndexType == 1);
+                _pageIndex = data16 == null ? 0 : LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData5.IndexOf(data16);
+                if (!LimitedTimeGiftBoxDataManager.Instance.IsOpenMeiRiTeHui)
+                {
+                    LimitedTimeGiftBoxDataManager.Instance.SetIsOpenMeiRiTeHui();
+                }
+            }
         }
 
         public void UpTime()
         {
+            List<LimitedTimeGiftBoxItemYxData> list = new List<LimitedTimeGiftBoxItemYxData>();
             //筛选一条数据用来界面渲染
-            var list = _type == ActivityType.XSLB2
-                ? LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData4
-                : LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData5;
+            if (_type == ActivityType.XSLB2)
+                list = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData4;
+            else if (_type == ActivityType.XSLB3)
+                list = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData5;
+            else if(_type == ActivityType.LuckyDiscount)
+                list = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData16;
 
             list = list.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
-            if (list.Count == 0)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-                this.Hide();
-                return;
-            }
-
+                if (list.Count == 0)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                    this.Hide();
+                    return;
+                }
             _ui.m_txtBoxResidueTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
         }
 
         private void UpdateView(ListUtil.NavigateType type)
         {
-            var list = _type == ActivityType.XSLB2
-                ? LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData4
-                : LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData5;
+            List<LimitedTimeGiftBoxItemYxData> list = new List<LimitedTimeGiftBoxItemYxData>();
+            if(_type == ActivityType.XSLB2) {
+                _ui.m_showType.selectedIndex = 0;
+                list = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData4;
+            }
+            else if (_type == ActivityType.XSLB3)
+            {
+                _ui.m_showType.selectedIndex = 0;
+                list = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData5;
+            }
+            else if(_type == ActivityType.LuckyDiscount)
+            {
+                _ui.m_showType.selectedIndex = 1;
+                list = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData16;
+            }
 
-            list = list.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
                 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)
@@ -168,13 +192,11 @@ namespace GFGGame
                 {
                     _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);
@@ -252,7 +274,7 @@ namespace GFGGame
 
             _ui.m_txtBoxItemName.text = shopCfg.itemName;
             //这个B时间需要在一个地方统一处理，然后广播事件，不然可能会存在不同步的问题，最后做
-            _ui.m_txtBoxResidueTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), data.EndTime);
+            _ui.m_txtBoxResidueTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
             _ui.m_txtUrc.text = mTxtUrc;
             _ui.m_comDiscount.m_txtDiscountNum.text =
                 NumberUtil.CalculateDiscount(shopCfg.originalPrice, shopCfg.price);
@@ -275,6 +297,7 @@ namespace GFGGame
             //uiItem.m_txtName.text = itemCfg.name;
             uiItem.target.data = itemCfg;
             uiItem.m_txtCount.text = itemKv[1].ToString();
+            uiItem.m_QualityType.selectedIndex = itemCfg.rarity - 1;
             uiItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             uiItem.target.onClick.Add(OnListSelectorItemClick);
 

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

@@ -65,6 +65,7 @@ namespace GFGGame
             _ui.m_btnReward.onClick.Add(OnClickBtnReward);
             _ui.m_btnShop.onClick.Add(OnClickBtnShop);
             _ui.m_btnGiftBag.onClick.Add(OnClickBtnGiftBag);
+            _ui.m_btnLuckyDiscount.onClick.Add(OnClickBtnLuckyDiscount);
             _effectUIDic.Add("Button_public", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_btnBuyTen_eff, "ui_LuckyBox", "Button_public"));
             _effectUIDic.Add("Button_Text_DianCang", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_Special_eff, "ui_LuckyBox", "Button_Text_DianCang"));
         }
@@ -73,7 +74,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_LUCKY_BOX, UpdateView);
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpLuckyDiscount);
         }
         protected override void OnShown()
         {
@@ -88,6 +89,7 @@ namespace GFGGame
             LuckyBoxDataManager.Instance.currentBoxId = _luckyBoxCfg.id;
             LuckyBoxDataManager.Instance.luckyBoxIndex = 2;
             UpGiftBox();
+            UpLuckyDiscount();
             Timers.inst.Add(1, 0, UpdateTime);
             UpdateListItemData();
             UpdateRedDot();
@@ -184,6 +186,24 @@ namespace GFGGame
             }
             UI_ComBox.ProxyEnd();
         }
+
+        private void UpLuckyDiscount()
+        {
+            var activityOpenCfgs = ActivityOpenCfgArray.Instance.GetCfgsBytype(ConstLimitTimeActivityType.LuckyDiscount);
+            var shopCfgId = activityOpenCfgs[0].paramsArr[0];
+            var shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
+            var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
+            var activityInfoByTypeList =
+                ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.LuckyDiscount);
+            var list = activityInfoByTypeList
+                .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
+            _ui.m_btnLuckyDiscount.visible = ActivityDataManager.Instance.allLimitStlycTimes >= 20 && remainBuyNum != 0 && list.Count > 0;
+            if (LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT && _ui.m_btnLuckyDiscount.visible) {
+                LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT = false;
+                ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.LuckyDiscount, this.viewData });
+            }
+        }
+
         private void UpGiftBox()
         {
             var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByTypeAndID(ActivityType.XSLB3, _activityId);
@@ -191,8 +211,7 @@ namespace GFGGame
             var list = activityInfoByTypeList.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_comBagTime.target.visible = false;
-                _ui.m_btnGiftBag.visible = false;
+                _ui.m_showGiftBag.selectedIndex = 1;
             }
             else
             {
@@ -216,14 +235,12 @@ namespace GFGGame
 
                 if (isSoldOut)
                 {
-                    _ui.m_comBagTime.target.visible = false;
-                    _ui.m_btnGiftBag.visible = false;
+                    _ui.m_showGiftBag.selectedIndex = 1;
                 }
                 else
                 {
                     _ui.m_comBagTime.m_txtGiftBagTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-                    _ui.m_comBagTime.target.visible = true;
-                    _ui.m_btnGiftBag.visible = true;
+                    _ui.m_showGiftBag.selectedIndex = 0;
                 }
             }
         }
@@ -301,6 +318,12 @@ namespace GFGGame
                 ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.XSLB3, this.viewData });
         }
 
+        //幸运折扣按钮点击执行方法
+        private void OnClickBtnLuckyDiscount()
+        {
+            ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.LuckyDiscount, this.viewData });
+        }
+        
         protected override void OnHide()
         {
             base.OnHide();
@@ -314,6 +337,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_LUCKY_BOX, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpLuckyDiscount);
         }
 
         private void OnClickBtnBack()

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

@@ -78,6 +78,7 @@ namespace GFGGame
             _ui = UI_LuckBoxBonusShowUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_loaBg.onClick.Add(OnClickLoaBg);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ChallengeRewardView.cs

@@ -153,15 +153,15 @@ namespace GFGGame
                 switch (num)
                 {
                     case 1:
-                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(CardGameDate[0].bonusStar1Arr[0][0]).res);      
+                        item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(CardGameDate[0].bonusStar1Arr[0][0]).res, "png");      
                         item.m_Num.text = CardGameDate[0].bonusStar1Arr[0][1].ToString();
                         break;
                     case 2:
-                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(CardGameDate[0].bonusStar2Arr[0][0]).res);
+                        item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(CardGameDate[0].bonusStar2Arr[0][0]).res, "png");
                         item.m_Num.text = CardGameDate[0].bonusStar2Arr[0][1].ToString();
                         break;
                     case 3:
-                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(CardGameDate[0].bonusStar3Arr[0][0]).res);
+                        item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(CardGameDate[0].bonusStar3Arr[0][0]).res, "png");
                         item.m_Num.text = CardGameDate[0].bonusStar3Arr[0][1].ToString();
                         break;
                     default:
@@ -173,15 +173,15 @@ namespace GFGGame
                 switch (num)
                 {
                     case 1:
-                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(Merge2048GameDate[0].bonusWinFirstArr[0][0]).res);
+                        item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(Merge2048GameDate[0].bonusWinFirstArr[0][0]).res, "png");
                         item.m_Num.text = Merge2048GameDate[0].bonusWinFirstArr[0][1].ToString();
                         break;
                     case 2:
-                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(Merge2048GameDate[1].bonusWinFirstArr[0][0]).res);
+                        item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(Merge2048GameDate[1].bonusWinFirstArr[0][0]).res, "png");
                         item.m_Num.text = Merge2048GameDate[1].bonusWinFirstArr[0][1].ToString();
                         break;
                     case 3:
-                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(Merge2048GameDate[2].bonusWinFirstArr[0][0]).res);
+                        item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(Merge2048GameDate[2].bonusWinFirstArr[0][0]).res, "png");
                         item.m_Num.text = Merge2048GameDate[2].bonusWinFirstArr[0][1].ToString();
                         break;
                     default:

GameClient/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs

@@ -129,10 +129,10 @@ namespace GFGGame
                 consumeID = 3000017;
             }
 
-            _ui.m_ticket.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(consumeID).res);
+            _ui.m_ticket.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(consumeID).res,"png");
             _ui.m_needNum1.text = NumTicketOne.ToString();
-            _ui.m_needIcon1.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(consumeID).res);
-            _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(consumeID).res);
+            _ui.m_needIcon1.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(consumeID).res,"png");
+            _ui.m_needIcon2.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(consumeID).res, "png");
             _ui.m_needNum2.text = NumTicketTwo.ToString();
             _ui.m_needNum2.visible = false;
             _ui.m_needIcon2.visible = false;

GameClient/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_3!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 55283e5b13f60bc41a82721b6cd2a092
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_3.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: fb48ba929f9fc0a4fa5404e156f949cc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: