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

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

@@ -11,7 +11,6 @@ namespace UI.CommonGame
         public GGraph m_holderEffect;
         public GGraph m_holder;
         public GTextField m_txtName;
-        public GProgressBar m_probar;
         public GComponent m_item;
         public const string URL = "ui://eg2y0ldptu965e";
         public const string PACKAGE_NAME = "CommonGame";
@@ -64,7 +63,6 @@ namespace UI.CommonGame
             m_holderEffect = (GGraph)comp.GetChild("holderEffect");
             m_holder = (GGraph)comp.GetChild("holder");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_probar = (GProgressBar)comp.GetChild("probar");
             m_item = (GComponent)comp.GetChild("item");
         }
         public void Dispose(bool disposeTarget = false)
@@ -73,7 +71,6 @@ namespace UI.CommonGame
             m_holderEffect = null;
             m_holder = null;
             m_txtName = null;
-            m_probar = null;
             m_item = null;
             if(disposeTarget && target != null)
             {

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

@@ -0,0 +1,95 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_SuitItemUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GGraph m_iconEffect;
+        public GLoader m_iconBg;
+        public GLoader m_icon;
+        public GLoader m_iconBgDown;
+        public GProgressBar m_probar;
+        public GTextField m_txtName;
+        public Transition m_t_open;
+        public Transition m_t_close;
+        public const string URL = "ui://eg2y0ldpcbywtqq";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "SuitItemUI";
+        private static UI_SuitItemUI _proxy;
+
+        public static UI_SuitItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_SuitItemUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_SuitItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SuitItemUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_iconEffect = (GGraph)comp.GetChild("iconEffect");
+            m_iconBg = (GLoader)comp.GetChild("iconBg");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_iconBgDown = (GLoader)comp.GetChild("iconBgDown");
+            m_probar = (GProgressBar)comp.GetChild("probar");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_t_open = comp.GetTransition("t_open");
+            m_t_close = comp.GetTransition("t_close");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_iconEffect = null;
+            m_iconBg = null;
+            m_icon = null;
+            m_iconBgDown = null;
+            m_probar = null;
+            m_txtName = null;
+            m_t_open = null;
+            m_t_close = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_SuitItemUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a29488f4e7c0c6c4faec35fcd9af84d6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListVipItem.cs

@@ -18,7 +18,7 @@ namespace UI.Store
         public GButton m_btnGetGiftBag;
         public GTextField m_txtGiftBag;
         public GButton m_btnWeek;
-        public const string URL = "ui://p9mtgheoqik1tby";
+        public const string URL = "ui://p9mtgheosn9hte1";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ListVipItem";
         private static UI_ListVipItem _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreExchangeList.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_StoreExchangeList
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://p9mtgheosn9hte0";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "StoreExchangeList";
+        private static UI_StoreExchangeList _proxy;
+
+        public static UI_StoreExchangeList Create(GObject gObject = null)
+        {
+            var ui = new UI_StoreExchangeList();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_StoreExchangeList Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoreExchangeList();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreExchangeList.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 791198b0b755fb84d97deb1eba2fb0ee
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreExchangeUI.cs

@@ -7,7 +7,7 @@ namespace UI.Store
     public partial class UI_StoreExchangeUI
     {
         public GComponent target;
-        public GList m_list;
+        public UI_StoreExchangeList m_storeExchangeList;
         public GComponent m_valueBar;
         public const string URL = "ui://p9mtgheol500tbh";
         public const string PACKAGE_NAME = "Store";
@@ -56,12 +56,13 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_list = (GList)comp.GetChild("list");
+            m_storeExchangeList = (UI_StoreExchangeList)UI_StoreExchangeList.Create(comp.GetChild("storeExchangeList"));
             m_valueBar = (GComponent)comp.GetChild("valueBar");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_list = null;
+            m_storeExchangeList.Dispose();
+            m_storeExchangeList = null;
             m_valueBar = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreGiftBagList.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_StoreGiftBagList
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://p9mtgheosn9htdz";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "StoreGiftBagList";
+        private static UI_StoreGiftBagList _proxy;
+
+        public static UI_StoreGiftBagList Create(GObject gObject = null)
+        {
+            var ui = new UI_StoreGiftBagList();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_StoreGiftBagList Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoreGiftBagList();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreGiftBagList.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 57cbfa73cab1284419bd7d1628dfb0d0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreGiftBagUI.cs

@@ -7,7 +7,7 @@ namespace UI.Store
     public partial class UI_StoreGiftBagUI
     {
         public GComponent target;
-        public GList m_list;
+        public UI_StoreGiftBagList m_storeGiftBagList;
         public GComponent m_valueBar;
         public const string URL = "ui://p9mtgheol500tbc";
         public const string PACKAGE_NAME = "Store";
@@ -56,12 +56,13 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_list = (GList)comp.GetChild("list");
+            m_storeGiftBagList = (UI_StoreGiftBagList)UI_StoreGiftBagList.Create(comp.GetChild("storeGiftBagList"));
             m_valueBar = (GComponent)comp.GetChild("valueBar");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_list = null;
+            m_storeGiftBagList.Dispose();
+            m_storeGiftBagList = null;
             m_valueBar = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/GetSuitItemController.cs

@@ -6,6 +6,8 @@ namespace GFGGame
     {
         public static bool enable = true;
         private static List<int> _waitingToShowSuit = new List<int>();
+        //这个变量主要用于抽奖自动打开
+        public static bool isAuto = false;
 
         public static void Clear()
         {
@@ -44,14 +46,14 @@ namespace GFGGame
                 if (index >= 0)
                 {
                     _waitingToShowSuit.RemoveAt(index);
-                    ViewManager.Show<GetSuitItemVIew>(suitId);
+                    ViewManager.Show<SuitItemView>(suitId);
                 }
             }
             else if (_waitingToShowSuit.Count > 0)
             {
                 suitId = _waitingToShowSuit[0];
                 _waitingToShowSuit.RemoveAt(0);
-                ViewManager.Show<GetSuitItemVIew>(suitId);
+                ViewManager.Show<SuitItemView>(suitId);
             }
             return suitId;
         }

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

@@ -116,21 +116,14 @@ namespace GFGGame
             int count = 0;//套装当前拥有的部件数量
             int totalCount = 1;
             // int suitId = 0;
-            //_ui.m_bg.url = ResPathUtil.GetBgImgPath("bg_zhuxian");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("bg_zhuxian");
             DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitId, out count, out totalCount);
-            // totalCount = SuitCfgManager.Instance.GetTotalCountOfOneSuit(suitId);
             if (suitId > 0)
             {
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
                 _ui.m_txtName.text = "套装·" + suitCfg.name;
                 int targetY = (int)(_ui.m_item.y + _ui.m_item.height + 50);
             }
-            _ui.m_probar.max = totalCount;
-            _ui.m_probar.value = count;
-            //_ui.m_probar.visible = false;
-            //AlertUI.Show(string.Format("套装进度:{0}/{1}", count, totalCount))
-            //.SetLeftButton(false)
-            //.SetRightButton(true, "确定");
             // UpdateItem(itemId);
 
             _dressUpObjUI.ResetSceneObj(70, false, true, null,  false);

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

@@ -0,0 +1,91 @@
+using UI.CommonGame;
+using FairyGUI;
+using UnityEngine;
+using UI.LuckyBox;
+
+namespace GFGGame
+{
+    public class SuitItemView : BaseWindow
+    {
+        private UI_SuitItemUI _ui;
+        private EffectUI _effectUI1;
+        private int suitID;
+        private int count = 0;//套装当前拥有的部件数量
+        private int totalCount = 1;
+
+        public override void Dispose()
+        {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_SuitItemUI.PACKAGE_NAME;
+            _ui = UI_SuitItemUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            _ui.m_loaBg.onTouchBegin.Add(OnClickBg);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            suitID = (int)this.viewData;
+            UpdateView();
+        }
+        private void UpdateView()
+        {
+            DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitID, out count, out totalCount);
+            if (suitID > 0)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitID);
+                _ui.m_txtName.text = "套装·" + suitCfg.name;
+                _ui.m_icon.url = ResPathUtil.GetFieldGuideIconPath(suitCfg.res);
+            }
+            _ui.m_probar.max = totalCount;
+            _ui.m_probar.value = count;
+            _ui.m_t_open.Play();
+            if (GetSuitItemController.isAuto)
+            {
+                Timers.inst.Add(0.7f, 1, WaitAutoEnd);
+            }
+        }
+        private void OnClickBg()
+        {
+            if(!GetSuitItemController.isAuto)
+            {
+                this.Hide();
+                if (count == totalCount)
+                {
+                    ViewManager.Show<GetSuitItemVIew>(suitID);
+                }
+            }
+        }
+
+        protected override void OnHide()
+        {
+            
+        }
+
+        private void WaitAutoEnd(object param = null)
+        {
+            this.Hide();
+            if (count == totalCount)
+            {
+                ViewManager.Show<GetSuitItemVIew>(suitID);
+            }
+            else
+            {
+                EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_ANIMATION_WAIT);
+            }
+            Timers.inst.Remove(WaitAutoEnd);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/CommonGame/SuitItemView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c5c280d7be561a741b5c1bce401a379c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -276,7 +276,12 @@ namespace GFGGame
         //茶话会提交搭配
         private void OnClickBtnSubmission()
         {
-            ChangeTeapartyDressup();
+            AlertUI.Show("是否确认提交本次搭配?")
+            .SetLeftButton(true, "取消")
+            .SetRightButton(true, "确认", (object param) =>
+            {
+                ChangeTeapartyDressup();
+            });
         }
 
         private async void ChangeTeapartyDressup()

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

@@ -347,6 +347,7 @@ namespace GFGGame
 
         private void ClickPass()
         {
+            GetSuitItemController.isAuto = true;
             _ui.m_touchFlipOpen.touchable = true;
             _ui.m_BtnPass.visible = false;
             for (int i = 0; i < _rewardList.Count; i++)
@@ -373,6 +374,7 @@ namespace GFGGame
                 Timers.inst.Remove(UpDataTime);
                 HideOtherShowWindow();
                 _ui.m_touchFlipOpen.touchable = false;
+                GetSuitItemController.isAuto = false;
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -145,7 +145,8 @@ namespace GFGGame
 
             Timers.inst.StartCoroutine(InitChapter());
 
-            Timers.inst.Add(0.5f, 1, SetContainerY);
+            //Timers.inst.Add(0.2f, 1, SetContainerY);
+            _ui.m_chapter.m_compChapterScroll.target.y = 1;
 
             _valueBarController.OnShown();
 

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

@@ -199,6 +199,8 @@ namespace GFGGame
             Timers.inst.Remove(OnShowLater);
             Timers.inst.Add(0.1f, 1, OnShowLater);
 
+            // 先隐藏茶会提示
+            _ui.m_grpLeagueTips.visible = false;
             // 刚进游戏不播放主界面入场动画
             if (firstIn)
             {

GameClient/Assets/Game/HotUpdate/Views/Store/StoreArenaView.cs

@@ -37,7 +37,7 @@ namespace GFGGame
             this.clickBlankToClose = false;
             this.bringToFontOnClick = false;
 
-            _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_storeExchangeList.m_list.itemRenderer = ListItemRenderer;
             _valueBarController = new ValueBarController(_ui.m_valueBar);
         }
         protected override void AddEventListener()
@@ -71,7 +71,7 @@ namespace GFGGame
         private void UpdateView()
         {
             _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
-            _ui.m_list.numItems = _shopCfgs.Count;
+            _ui.m_storeExchangeList.m_list.numItems = _shopCfgs.Count;
         }
         private void ListItemRenderer(int index, GObject obj)
         {

GameClient/Assets/Game/HotUpdate/Views/Store/StoreBrocadeWeavView.cs

@@ -194,7 +194,7 @@ namespace GFGGame
         {
             ViewManager.Show<BrocadeWeavTaskView>();
         }
-        
+
 
         //前往
         // private void OnBtnGoClick(EventContext context)
@@ -231,7 +231,8 @@ namespace GFGGame
                 itemView.ChangeTxtCountStyle();
                 itemView.GrpGotVisible = BattlePassTaskDataManager.Instance.CheckLevelRewardGet(level);
                 bool redDot = (!BattlePassTaskDataManager.Instance.CheckLevelRewardGet(level) && state == 1);
-                RedDotController.Instance.SetComRedDot(item.m_NormalReward, redDot);
+                RedDotController.Instance.SetComRedDot(item.m_NormalReward, redDot, "", -27, 32);
+
             }
             else
             {
@@ -243,7 +244,7 @@ namespace GFGGame
                 item.m_RewardList.itemRenderer = SpecialRewardRender;
             }
             var superLevelRewardGet = BattlePassTaskDataManager.Instance.CheckSuperLevelRewardGet(level);
-            item.m_RewardList.data = (battlePassCfg.bonusSpecialArr, true , state, superLevelRewardGet);
+            item.m_RewardList.data = (battlePassCfg.bonusSpecialArr, true, state, superLevelRewardGet);
             item.m_RewardList.numItems = battlePassCfg.bonusSpecialArr.Length;
             if (state == 1)
             {
@@ -251,7 +252,8 @@ namespace GFGGame
                 item.m_touch.data = battlePassCfg.level;
                 item.m_touch.touchable = true;
             }
-            else {
+            else
+            {
                 item.m_touch.onClick.Clear();
                 item.m_touch.touchable = false;
             }
@@ -275,7 +277,8 @@ namespace GFGGame
             itemView.SetData(itemData);
             itemView.ChangeTxtCountStyle();
             var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
-            if (keyValuePair.Item2 && isBuy) {
+            if (keyValuePair.Item2 && isBuy)
+            {
                 RedDotController.Instance.SetComRedDot(itemView.GetGComponentObj, keyValuePair.Item3 == 1);
                 itemView.GrpGotVisible = keyValuePair.Item4;
             }
@@ -369,7 +372,7 @@ namespace GFGGame
             //去掉第一个为0的配置
             _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
             RedDotController.Instance.SetComRedDot(_ui.m_btnGetAll,
-              BattlePassTaskDataManager.Instance.CheckStoreBrocadeWeavRed());
+              BattlePassTaskDataManager.Instance.CheckStoreBrocadeWeavRed(), "", -18, -8);
         }
 
         private void SetOpenBattlePassBtnStatus()
@@ -412,7 +415,7 @@ namespace GFGGame
             }
             var superLevelRewardGet = BattlePassTaskDataManager.Instance.CheckSuperLevelRewardGet(level);
             var state = BattlePassTaskDataManager.Instance.GetRewardState(level);
-            uiBattlePassReward.m_RewardList.data = (battlePassCfg.bonusSpecialArr,false ,state, superLevelRewardGet);
+            uiBattlePassReward.m_RewardList.data = (battlePassCfg.bonusSpecialArr, false, state, superLevelRewardGet);
             uiBattlePassReward.m_RewardList.numItems = battlePassCfg.bonusSpecialArr.Length;
         }
 

GameClient/Assets/Game/HotUpdate/Views/Store/StoreExchangeView.cs

@@ -37,7 +37,7 @@ namespace GFGGame
             this.clickBlankToClose = false;
             this.bringToFontOnClick = false;
 
-            _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_storeExchangeList.m_list.itemRenderer = ListItemRenderer;
             _valueBarController = new ValueBarController(_ui.m_valueBar);
         }
         protected override void AddEventListener()
@@ -71,7 +71,7 @@ namespace GFGGame
         private void UpdateView()
         {
             _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
-            _ui.m_list.numItems = _shopCfgs.Count;
+            _ui.m_storeExchangeList.m_list.numItems = _shopCfgs.Count;
         }
         private void ListItemRenderer(int index, GObject obj)
         {

GameClient/Assets/Game/HotUpdate/Views/Store/StoreGiftBagView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             this.clickBlankToClose = false;
             this.bringToFontOnClick = false;
 
-            _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_storeGiftBagList.m_list.itemRenderer = ListItemRenderer;
             _valueBarController = new ValueBarController(_ui.m_valueBar);
         }
         protected override void AddEventListener()
@@ -54,7 +54,7 @@ namespace GFGGame
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _valueBarController.OnShown();
             _valueBarController.UpdateList(ShopDataManager.Instance.GetShopCostIds(_shopCfgs));
-            _ui.m_list.scrollPane.ScrollTop();
+            _ui.m_storeGiftBagList.m_list.scrollPane.ScrollTop();
             UpdateView();
         }
 
@@ -73,13 +73,13 @@ namespace GFGGame
         private void UpdateView()
         {
             _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
-            _ui.m_list.numItems = _shopCfgs.Count;
+            _ui.m_storeGiftBagList.m_list.numItems = _shopCfgs.Count;
         }
         private void ListItemRenderer(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgs[index];
             ShopViewManager.Instance.UptadeItem(obj, shopCfg);
-            RedDotController.Instance.SetComRedDot(obj.asCom, menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY && shopCfg.price == 0 && ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id) < shopCfg.maxBuyNum, "", 0, 70);
+            RedDotController.Instance.SetComRedDot(obj.asCom, menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY && shopCfg.price == 0 && ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id) < shopCfg.maxBuyNum, "", 5, 76);
         }
     }
 }

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_8!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: d8dc8bdaa175e09429492f39d61c1bb4
+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
+  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/CommonGame/CommonGame_atlas0_8.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 6f4941d6967bd79429e641e922edb6bb
+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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: