zhangyuqian před 1 rokem
rodič
revize
1d7de07273
34 změnil soubory, kde provedl 879 přidání a 0 odebrání
  1. binární
      GameClient/Assets/Game/HotUpdate/.vs/HotUpdate/v16/.suo
  2. 3 0
      GameClient/Assets/Game/HotUpdate/.vs/ProjectSettings.json
  3. 10 0
      GameClient/Assets/Game/HotUpdate/.vs/VSWorkspaceState.json
  4. binární
      GameClient/Assets/Game/HotUpdate/.vs/slnx.sqlite
  5. binární
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/.vs/GenCode/v16/.suo
  6. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/.vs/ProjectSettings.json
  7. 6 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/.vs/VSWorkspaceState.json
  8. binární
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/.vs/slnx.sqlite
  9. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit/UI_ButtonDay.cs
  10. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit/UI_ButtonDay.cs.meta
  11. 104 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListShowItem.cs
  12. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListShowItem.cs.meta
  13. 95 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_NewLimitChargeUI.cs
  14. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_NewLimitChargeUI.cs.meta
  15. 8 0
      GameClient/Assets/Game/HotUpdate/Views/AFZLActivity.meta
  16. 56 0
      GameClient/Assets/Game/HotUpdate/Views/AFZLActivity/AFZLView.cs
  17. 11 0
      GameClient/Assets/Game/HotUpdate/Views/AFZLActivity/AFZLView.cs.meta
  18. 273 0
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs
  19. 11 0
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs.meta
  20. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0!a.png
  21. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0.png
  22. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1!a.png
  23. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1.png
  24. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_2!a.png
  25. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_2.png
  26. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_3!a.png
  27. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_3.png
  28. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4!a.png
  29. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4.png
  30. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5!a.png
  31. 96 0
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5!a.png.meta
  32. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5.png
  33. 96 0
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5.png.meta
  34. binární
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_fui.bytes

binární
GameClient/Assets/Game/HotUpdate/.vs/HotUpdate/v16/.suo


+ 3 - 0
GameClient/Assets/Game/HotUpdate/.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}

+ 10 - 0
GameClient/Assets/Game/HotUpdate/.vs/VSWorkspaceState.json

@@ -0,0 +1,10 @@
+{
+  "ExpandedNodes": [
+    "",
+    "\\FairyGUI",
+    "\\FairyGUI\\GenCode",
+    "\\FairyGUI\\GenCode\\Login"
+  ],
+  "SelectedNode": "\\FairyGUI\\GenCode\\Login\\UI_LoginInputUI.cs",
+  "PreviewInSolutionExplorer": false
+}

binární
GameClient/Assets/Game/HotUpdate/.vs/slnx.sqlite


binární
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/.vs/GenCode/v16/.suo


+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/.vs/VSWorkspaceState.json

@@ -0,0 +1,6 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "PreviewInSolutionExplorer": false
+}

binární
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/.vs/slnx.sqlite


+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit/UI_ButtonDay.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.BornLimit
+{
+    public partial class UI_ButtonDay
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GTextField m_text;
+        public const string URL = "ui://cfkvka81xi0115";
+        public const string PACKAGE_NAME = "BornLimit";
+        public const string RES_NAME = "ButtonDay";
+        private static UI_ButtonDay _proxy;
+
+        public static UI_ButtonDay Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonDay();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonDay Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonDay();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_c1 = comp.GetController("c1");
+            m_text = (GTextField)comp.GetChild("text");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_text = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit/UI_ButtonDay.cs.meta

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

+ 104 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListShowItem.cs

@@ -0,0 +1,104 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ListShowItem
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public GButton m_btnShow;
+        public GTextField m_txtName0;
+        public GTextField m_txtName1;
+        public GTextField m_txtName2;
+        public GTextField m_txtName3;
+        public GTextField m_txtName4;
+        public GList m_listGiftBag;
+        public GButton m_btnGetGiftBag;
+        public GTextField m_txtGiftBag;
+        public GLoader m_cardBg;
+        public GLoader m_cardIcon;
+        public const string URL = "ui://t8nwuj7idn9y2i";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ListShowItem";
+        private static UI_ListShowItem _proxy;
+
+        public static UI_ListShowItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListShowItem();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListShowItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListShowItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_holder = (GGraph)comp.GetChild("holder");
+            m_btnShow = (GButton)comp.GetChild("btnShow");
+            m_txtName0 = (GTextField)comp.GetChild("txtName0");
+            m_txtName1 = (GTextField)comp.GetChild("txtName1");
+            m_txtName2 = (GTextField)comp.GetChild("txtName2");
+            m_txtName3 = (GTextField)comp.GetChild("txtName3");
+            m_txtName4 = (GTextField)comp.GetChild("txtName4");
+            m_listGiftBag = (GList)comp.GetChild("listGiftBag");
+            m_btnGetGiftBag = (GButton)comp.GetChild("btnGetGiftBag");
+            m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
+            m_cardBg = (GLoader)comp.GetChild("cardBg");
+            m_cardIcon = (GLoader)comp.GetChild("cardIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_btnShow = null;
+            m_txtName0 = null;
+            m_txtName1 = null;
+            m_txtName2 = null;
+            m_txtName3 = null;
+            m_txtName4 = null;
+            m_listGiftBag = null;
+            m_btnGetGiftBag = null;
+            m_txtGiftBag = null;
+            m_cardBg = null;
+            m_cardIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListShowItem.cs.meta

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

+ 95 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_NewLimitChargeUI.cs

@@ -0,0 +1,95 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_NewLimitChargeUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GTextField m_packageName;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public GList m_list;
+        public GButton m_toRightBtn;
+        public GButton m_toLeftBtn;
+        public GButton m_btnCharge;
+        public const string URL = "ui://t8nwuj7idn9y2h";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "NewLimitChargeUI";
+        private static UI_NewLimitChargeUI _proxy;
+
+        public static UI_NewLimitChargeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NewLimitChargeUI();
+            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_NewLimitChargeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NewLimitChargeUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_packageName = (GTextField)comp.GetChild("packageName");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_list = (GList)comp.GetChild("list");
+            m_toRightBtn = (GButton)comp.GetChild("toRightBtn");
+            m_toLeftBtn = (GButton)comp.GetChild("toLeftBtn");
+            m_btnCharge = (GButton)comp.GetChild("btnCharge");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_packageName = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            m_list = null;
+            m_toRightBtn = null;
+            m_toLeftBtn = null;
+            m_btnCharge = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_NewLimitChargeUI.cs.meta

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

+ 8 - 0
GameClient/Assets/Game/HotUpdate/Views/AFZLActivity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1bd7a86b8ab991b47a499b0314cb10a9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 56 - 0
GameClient/Assets/Game/HotUpdate/Views/AFZLActivity/AFZLView.cs

@@ -0,0 +1,56 @@
+
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.DailyWelfare;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class AFZLView : BaseWindow
+    {
+        private UI_SevenDayLoginUI _ui;
+        private List<ActivityLoginCfg> _cfgs;
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _cfgs = ActivityLoginCfgArray.Instance.GetCfgsByid(3001);
+            _ui.m_list.itemRenderer = ListItemRender;
+            _ui.m_comIcon.m_loaIcon.onClick.Add(OnListItemClick);
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            UpdateView();
+        }
+        private void UpdateView()
+        {
+
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void ListItemRender(int index, GObject obj)
+        {
+
+        }
+        private async void OnListItemClick(EventContext context)
+        {
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/AFZLActivity/AFZLView.cs.meta

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

+ 273 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -0,0 +1,273 @@
+using UI.Store;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using ET;
+using System;
+using Hutool;
+using UI.DailyWelfare;
+
+namespace GFGGame
+{
+    public class NewLimitChargeView : BaseWindow
+    {
+        private UI_StoreChargeAddUpUI _ui;
+        private List<ShopCfg> _shopCfgs;
+        private DressUpObjUI _dressUpObjUI;
+        private List<DressUpObjUI> _dressUpObjUIs = new List<DressUpObjUI>();
+        private int _curSelectIndex = 0;
+
+        private int _activityId = 0;
+        private ActivityInfo _activityInfo;
+        private List<ActivityRechargeCfg> _rechargeCfgs;
+
+        public override void Dispose()
+        {
+            if (_dressUpObjUI != null)
+            {
+                _dressUpObjUI.Dispose();
+                _dressUpObjUI = null;
+            }
+            for (int i = 0; i < _dressUpObjUIs.Count; i++)
+            {
+                if (_dressUpObjUIs[i] != null)
+                {
+                    _dressUpObjUIs[i].Dispose();
+                    _dressUpObjUIs[i] = null;
+                }
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StoreChargeAddUpUI.PACKAGE_NAME;
+            _ui = UI_StoreChargeAddUpUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+            this.bringToFontOnClick = false;
+
+            _dressUpObjUI = new DressUpObjUI("SceneSuitFoster");
+
+            _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_list.SetVirtual();
+            _ui.m_list.scrollPane.onScrollEnd.Add(UpdateSuitView);
+            _ui.m_list.scrollPane.decelerationRate = 0.8f;
+
+            _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
+            _ui.m_btnRight.onClick.Add(OnBtnRightClick);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, RefreshList);
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            RefreshList();
+            _curSelectIndex = Math.Max(0, RoleDataManager.vipLv - 1);
+            _ui.m_list.selectedIndex = _curSelectIndex;
+            _ui.m_list.ScrollToView(_curSelectIndex);
+            _ui.m_btnLeft.visible = _curSelectIndex == 0 ? false : true;
+            _ui.m_btnRight.visible = _curSelectIndex < _ui.m_list.numItems - 1 ? true : false;
+
+            _activityId = (int)(this.viewData as object[])[0];
+            _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(_activityId);
+
+            UpdateRedDot();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, RefreshList);
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
+        }
+
+        private void RefreshList()
+        {
+            _ui.m_list.numItems = VipCfgArray.Instance.dataArray.Length - 1;
+        }
+        private void ListItemRenderer(int index, GObject obj)
+        {
+
+            VipCfg lastVipCfg = VipCfgArray.Instance.dataArray[index];
+            VipCfg vipCfg = VipCfgArray.Instance.dataArray[index + 1];
+
+            UI_ListShowItem item = UI_ListShowItem.Proxy(obj);
+            string name = SuitCfgArray.Instance.GetCfg(vipCfg.suitId).name;
+            item.m_txtName0.text = name.Length > 0 ? name.Substring(0, 1) : "";
+            item.m_txtName1.text = name.Length > 1 ? name.Substring(1, 1) : "";
+            item.m_txtName2.text = name.Length > 2 ? name.Substring(2, 1) : "";
+            item.m_txtName3.text = name.Length > 3 ? name.Substring(3, 1) : "";
+            item.m_txtName4.text = name.Length > 4 ? name.Substring(4) : "";
+
+            item.m_txtGiftBag.SetVar("value", vipCfg.id.ToString()).FlushVars();
+            if (item.m_listGiftBag.data == null)
+            {
+                item.m_listGiftBag.itemRenderer = ListRewardItemRender;
+                item.m_listGiftBag.onClickItem.Add(OnListItemClick);
+            }
+            item.m_listGiftBag.data = lastVipCfg.bonusOnceArr;
+            item.m_listGiftBag.numItems = lastVipCfg.bonusOnceArr.Length;
+
+            if (item.m_holder.data == null)
+            {
+                DressUpObjUI dressUpObjUI = new DressUpObjUI("SceneSuitFoster");
+                item.m_holder.data = dressUpObjUI;
+                _dressUpObjUIs.Add(dressUpObjUI);
+            }
+            _dressUpObjUI = item.m_holder.data as DressUpObjUI;
+            _dressUpObjUI.ResetSceneObj(80, false, true, null, false);
+            _dressUpObjUI.dressUpObj.PutOnSuitCfg(vipCfg.suitId, true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
+            _dressUpObjUI.UpdateWrapper(item.m_holder);
+
+            if (item.m_btnShow.data == null)
+            {
+                item.m_btnShow.onClick.Add(OnBtnShowClick);
+            }
+            item.m_btnShow.data = vipCfg.suitId;
+            if (item.m_btnGetGiftBag.data == null)
+            {
+                item.m_btnGetGiftBag.onClick.Add(OnBtnGetGiftBagClick);
+            }
+            item.m_btnGetGiftBag.data = vipCfg.id;
+            bool isGet = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfg.id);
+            item.m_btnGetGiftBag.grayed = isGet || vipCfg.id > RoleDataManager.vipLv;
+            RedDotController.Instance.SetComRedDot(item.m_btnGetGiftBag, !isGet && RoleDataManager.vipLv >= vipCfg.id);
+            bool canGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv == vipCfg.id;
+            UI_ListVipItem.ProxyEnd();
+        }
+
+        private void ListRewardItemRender(int index, GObject obj)
+        {
+            int[][] rewards = (int[][])obj.parent.data;
+            UI_ComItem item = UI_ComItem.Proxy(obj);
+            ItemData itemData = ItemUtil.createItemData(rewards[index]);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            item.m_txtCount.text = itemData.num.ToString();
+            item.target.data = itemCfg;
+            item.m_QualityType.selectedIndex = itemData.rarity - 1;
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            UI_ComItem.ProxyEnd();
+        }
+
+        private void OnBtnShowClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int suitId = (int)obj.data;
+            int _suitTypeId = 0;
+            for (int i = 0; i < SuitGuideMenuCfgArray.Instance.dataArray.Length; i++)
+            {
+                string[] suitIds = SuitGuideMenuCfgArray.Instance.dataArray[i].suitIds.Split(';');
+                if (Array.IndexOf(suitIds, suitId.ToString()) >= 0)
+                {
+                    _suitTypeId = SuitGuideMenuCfgArray.Instance.dataArray[i].id;
+                    break;
+                }
+            }
+            ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, new List<int>() { suitId }, false });
+        }
+
+        private void OnBtnWeekClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int vipLv = (int)obj.data;
+            ViewManager.Show<WeekGiftView>(vipLv);
+        }
+
+        private void OnBtnGetGiftBagClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int vipLv = (int)obj.data;
+            bool isGet = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipLv);
+            if (isGet)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("会员等级礼包已领取");
+                return;
+            }
+            if (RoleDataManager.vipLv < vipLv)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("会员等级不足");
+                return;
+            }
+            ShopSProxy.ReqGetVipGiftBag(vipLv).Coroutine();
+        }
+
+        private void OnBtnLeftClick()
+        {
+
+            if (_curSelectIndex == 0) return;
+            _curSelectIndex = _curSelectIndex - 1;
+            _ui.m_list.ScrollToView(_curSelectIndex, true);
+            UpdateRedDot();
+        }
+        private void OnBtnRightClick()
+        {
+            if (_curSelectIndex == _ui.m_list.numItems - 1) return;
+            _curSelectIndex = _curSelectIndex + 1;
+            _ui.m_list.ScrollToView(_curSelectIndex, true);
+            UpdateRedDot();
+
+        }
+        private void UpdateSuitView()
+        {
+            _curSelectIndex = _ui.m_list.GetFirstChildInView();
+            _ui.m_list.selectedIndex = _curSelectIndex;
+            _ui.m_btnLeft.visible = _curSelectIndex == 0 ? false : true;
+            _ui.m_btnRight.visible = _curSelectIndex < _ui.m_list.numItems - 1 ? true : false;
+        }
+
+        private void UpdateRedDot()
+        {
+
+            bool leftRed = false;
+            bool rightRed = false;
+            VipCfg[] vipCfgs = VipCfgArray.Instance.dataArray;
+            for (int i = 1; i < vipCfgs.Length; i++)
+            {
+                bool isGet = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfgs[i].id);
+                bool red = !isGet && RoleDataManager.vipLv >= vipCfgs[i].id;
+
+                if (red && _curSelectIndex > i - 1)
+                {
+                    leftRed = true;
+                    break;
+                }
+                if (red && _curSelectIndex + 1 < i)
+                {
+                    rightRed = true;
+                    break;
+                }
+            }
+
+            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv > 0 && _curSelectIndex > RoleDataManager.vipLv - 1) { leftRed = true; }
+            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv > 0 && _curSelectIndex + 1 < RoleDataManager.vipLv) { rightRed = true; }
+            RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, leftRed);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnRight, rightRed);
+
+        }
+
+        private void OnListItemClick(EventContext context)
+        {
+            GComponent comItem = (context.data as GComponent);
+            ItemCfg itemCfg = comItem.data as ItemCfg;
+            GoodsItemTipsController.ShowItemTips(itemCfg.id);
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs.meta

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

binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0!a.png


binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0.png


binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1!a.png


binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1.png


binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_2!a.png


binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_2.png


binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_3!a.png


binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_3.png


binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4!a.png


binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4.png


binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: fc944ffafb54aa6499289ab2959e2d5b
+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: 

binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5.png


+ 96 - 0
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_5.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 895a2fb14a2d823438285b7cfd6f997a
+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: 

binární
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_fui.bytes