leiyasi 1 жил өмнө
parent
commit
2c96b9ed8c
20 өөрчлөгдсөн 556 нэмэгдсэн , 57 устгасан
  1. 0 1
      GameClient/Assets/Game/HotUpdate/Data/ActivityGlobalDataManager.cs
  2. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComProBonus2.cs
  3. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComProBonus2.cs.meta
  4. 86 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_GiftDetailUI.cs
  5. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_GiftDetailUI.cs.meta
  6. 93 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_LimitedRechargeDBGiftUI.cs
  7. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_LimitedRechargeDBGiftUI.cs.meta
  8. 90 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ProgressBar2.cs
  9. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ProgressBar2.cs.meta
  10. 4 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  11. 19 19
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs
  12. 126 0
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitedRechargeDBGiftView.cs
  13. 11 0
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitedRechargeDBGiftView.cs.meta
  14. 6 37
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  15. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0.png
  16. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1.png
  17. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_3.png
  18. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4.png
  19. BIN
      GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_fui.bytes
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Data/ActivityGlobalDataManager.cs

@@ -65,7 +65,6 @@ namespace GFGGame
             ActivityGlobalSProxy.ReqCloseActivity(activityId).Coroutine();
         }
 
-        //RemoveActivityInfo
         public void RemoveActivityInfo(int activityId)
         {
             if (!activityInfos.ContainsKey(activityId)) return;

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComProBonus2.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ComProBonus2
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtDay;
+        public GImage m_imgGot;
+        public const string URL = "ui://t8nwuj7ievdh27";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ComProBonus2";
+        private static UI_ComProBonus2 _proxy;
+
+        public static UI_ComProBonus2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComProBonus2();
+            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_ComProBonus2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComProBonus2();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtDay = (GTextField)comp.GetChild("txtDay");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtDay = null;
+            m_imgGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 86 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_GiftDetailUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_GiftDetailUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GComponent m_bg;
+        public GTextField m_txtLock;
+        public GTextField m_txtWeekGiftBag;
+        public GList m_listWeekGiftBag;
+        public GButton m_btnGetWeekGiftBag;
+        public const string URL = "ui://t8nwuj7ievdh2a";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "GiftDetailUI";
+        private static UI_GiftDetailUI _proxy;
+
+        public static UI_GiftDetailUI Create(GObject gObject = null)
+        {
+            var ui = new UI_GiftDetailUI();
+            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_GiftDetailUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_GiftDetailUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_bg = (GComponent)comp.GetChild("bg");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_txtWeekGiftBag = (GTextField)comp.GetChild("txtWeekGiftBag");
+            m_listWeekGiftBag = (GList)comp.GetChild("listWeekGiftBag");
+            m_btnGetWeekGiftBag = (GButton)comp.GetChild("btnGetWeekGiftBag");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_bg = null;
+            m_txtLock = null;
+            m_txtWeekGiftBag = null;
+            m_listWeekGiftBag = null;
+            m_btnGetWeekGiftBag = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 93 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_LimitedRechargeDBGiftUI.cs

@@ -0,0 +1,93 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_LimitedRechargeDBGiftUI
+    {
+        public GComponent target;
+        public UI_ProgressBar2 m_progress;
+        public GComponent m_DBGiftItem1;
+        public GComponent m_DBGiftItem2;
+        public GComponent m_DBGiftItem3;
+        public GComponent m_DBGiftItem4;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public GButton m_btnTest;
+        public const string URL = "ui://t8nwuj7ievdh25";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "LimitedRechargeDBGiftUI";
+        private static UI_LimitedRechargeDBGiftUI _proxy;
+
+        public static UI_LimitedRechargeDBGiftUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LimitedRechargeDBGiftUI();
+            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_LimitedRechargeDBGiftUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LimitedRechargeDBGiftUI();
+            }
+            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_progress = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progress"));
+            m_DBGiftItem1 = (GComponent)comp.GetChild("DBGiftItem1");
+            m_DBGiftItem2 = (GComponent)comp.GetChild("DBGiftItem2");
+            m_DBGiftItem3 = (GComponent)comp.GetChild("DBGiftItem3");
+            m_DBGiftItem4 = (GComponent)comp.GetChild("DBGiftItem4");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_btnTest = (GButton)comp.GetChild("btnTest");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_progress.Dispose();
+            m_progress = null;
+            m_DBGiftItem1 = null;
+            m_DBGiftItem2 = null;
+            m_DBGiftItem3 = null;
+            m_DBGiftItem4 = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            m_btnTest = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 90 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ProgressBar2.cs

@@ -0,0 +1,90 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ProgressBar2
+    {
+        public GProgressBar target;
+        public UI_ComProBonus2 m_comProBonus0;
+        public UI_ComProBonus2 m_comProBonus1;
+        public UI_ComProBonus2 m_comProBonus2;
+        public UI_ComProBonus2 m_comProBonus3;
+        public GGraph m_holder;
+        public GGraph m_holderReward;
+        public const string URL = "ui://t8nwuj7ievdh26";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ProgressBar2";
+        private static UI_ProgressBar2 _proxy;
+
+        public static UI_ProgressBar2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ProgressBar2();
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ProgressBar2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ProgressBar2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)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_comProBonus0 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus0"));
+            m_comProBonus1 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus1"));
+            m_comProBonus2 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus2"));
+            m_comProBonus3 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus3"));
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holderReward = (GGraph)comp.GetChild("holderReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comProBonus0.Dispose();
+            m_comProBonus0 = null;
+            m_comProBonus1.Dispose();
+            m_comProBonus1 = null;
+            m_comProBonus2.Dispose();
+            m_comProBonus2 = null;
+            m_comProBonus3.Dispose();
+            m_comProBonus3 = null;
+            m_holder = null;
+            m_holderReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 4 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -29,6 +29,7 @@ namespace UI.Main
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
+        public UI_BtnModle2 m_btnLimitedRechargeDBGift;
         public GGroup m_grpLeft;
         public GButton m_loaLeft;
         public UI_ButtonModle7 m_btn1;
@@ -114,6 +115,7 @@ namespace UI.Main
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnLimitedRechargeDBGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnLimitedRechargeDBGift"));
             m_grpLeft = (GGroup)comp.GetChild("grpLeft");
             m_loaLeft = (GButton)comp.GetChild("loaLeft");
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
@@ -170,6 +172,8 @@ namespace UI.Main
             m_btnActivityDay7 = null;
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
+            m_btnLimitedRechargeDBGift.Dispose();
+            m_btnLimitedRechargeDBGift = null;
             m_grpLeft = null;
             m_loaLeft = null;
             m_btn1.Dispose();

+ 19 - 19
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -11,7 +11,7 @@ namespace GFGGame
         private object[] _viewData;
 
         private int _itemId;
-        private object[] _fromeViewDatas;
+        private object[] _fromViewDatas;
         private int _needCount;//需求总量
         private List<string[]> _approachDatas = new List<string[]>();
 
@@ -33,7 +33,7 @@ namespace GFGGame
                 _ui.m_list.numItems = 0;
             }
             _approachDatas.Clear();
-            _fromeViewDatas = null;
+            _fromViewDatas = null;
         }
         public void OnInit(GComponent component)
         {
@@ -45,7 +45,7 @@ namespace GFGGame
         {
             _viewData = viewData;
             _itemId = (int)viewData[0];
-            _fromeViewDatas = viewData[1] as object[];
+            _fromViewDatas = viewData[1] as object[];
             // _needCount = viewData.Length > 2 ? (int)viewData[2] : 0;
             int needCount = viewData.Length > 2 ? (int)viewData[2] : 0;
             _needCount = (int)needCount;
@@ -167,11 +167,11 @@ namespace GFGGame
                     //     isJump = false;
                     //     break;
                     // }
-                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, _fromeViewDatas, true, true);
+                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, _fromViewDatas, true, true);
                     break;
                 case ConstFunctionId.FU_ZHUANG_DECOMPOSE:
                     // this.Hide();
-                    isJump = ViewManager.Show<ClothingDecomposeView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<ClothingDecomposeView>(null, _fromViewDatas);
                     break;
                 case ConstFunctionId.STORE:
 
@@ -226,7 +226,7 @@ namespace GFGGame
                         if (studioCfg.funId == typeof(StudioFilingView).Name)
                         {
                             StudioDataManager.Instance.filingChapterId = studioCfg.id;
-                            ViewManager.Show<StudioFilingView>(null, _fromeViewDatas);
+                            ViewManager.Show<StudioFilingView>(null, _fromViewDatas);
                             MainStoryDataManager.currentLevelCfgId = levelCfg.id;
                             InstanceZonesController.ShowLevelView(levelCfg.id, StudioDataManager.Instance.OnFinishFilingStoryLevel, _itemId, _needCount);
                             isJump = true;
@@ -248,7 +248,7 @@ namespace GFGGame
                             }
                             string viewName = "GFGGame." + studioCfg.funId;
 
-                            ViewManager.Show(viewName, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, _fromeViewDatas);
+                            ViewManager.Show(viewName, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, _fromViewDatas);
                             StudioDataManager.Instance.VIEW_NAME = viewName;
                             InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStudioStoryLevel, _itemId, _needCount);
                             isJump = true;
@@ -269,12 +269,12 @@ namespace GFGGame
                             break;
                         }
 
-                        if ((string)_fromeViewDatas[0] == ViewName.DRESS_UP_FIGHT_VIEW)
+                        if ((string)_fromViewDatas[0] == ViewName.DRESS_UP_FIGHT_VIEW)
                         {
                             //从战斗换装必需品来源跳转到剧情界面,在剧情界面点返回后直接返回章节界面,无需返回换装界面
-                            _fromeViewDatas = null;
+                            _fromViewDatas = null;
                         }
-                        isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, _fromeViewDatas, true);
+                        isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, _fromViewDatas, true);
                         StoryController.ShowLevelView(levelCfgId, _itemId, _needCount);
                         break;
                     }
@@ -288,17 +288,17 @@ namespace GFGGame
                         bool isPass = InstanceZonesDataManager.CheckLevelPass(suitCfg.syntheticStoryLevelId);
                         if (suitCfg.syntheticStoryLevelId > 0 && !isPass)
                         {
-                            isJump = ViewManager.Show<SuitSyntheticView>(suitId, _fromeViewDatas);
+                            isJump = ViewManager.Show<SuitSyntheticView>(suitId, _fromViewDatas);
                         }
                         else
                         {
-                            isJump = ViewManager.Show<ClothingSyntheticView>(new object[] { suitId, _itemId }, _fromeViewDatas);
+                            isJump = ViewManager.Show<ClothingSyntheticView>(new object[] { suitId, _itemId }, _fromViewDatas);
                         }
                     }
                     break;
                 case ConstFunctionId.ZHAI_XING:
                     // this.Hide();
-                    isJump = ViewManager.Show<LuckyBoxView>(null, _fromeViewDatas, true);
+                    isJump = ViewManager.Show<LuckyBoxView>(null, _fromViewDatas, true);
                     break;
                 case ConstFunctionId.TAO_ZHUANG_TU_JIAN:
                     isJump = false;
@@ -306,28 +306,28 @@ namespace GFGGame
                     {
                         return;
                     }
-                    isJump = ViewManager.Show<SuitGuideView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<SuitGuideView>(null, _fromViewDatas);
 
                     break;
                 case ConstFunctionId.TAO_ZHUANG_HE_CHENG:
                     isJump = ViewManager.Show<SuitSyntheticView>();
                     break;
                 case ConstFunctionId.SUIT_FOSTER:
-                    isJump = ViewManager.Show<ClothingListView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<ClothingListView>(null, _fromViewDatas);
                     break;
                 case ConstFunctionId.DAILY_TASK:
-                    isJump = ViewManager.Show<TaskView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<TaskView>(null, _fromViewDatas);
                     break;
                 case ConstFunctionId.WEEKLY_TASK:
-                    isJump = ViewManager.Show<TaskView>(new object[] { 1 }, _fromeViewDatas);
+                    isJump = ViewManager.Show<TaskView>(new object[] { 1 }, _fromViewDatas);
                     break;
                 case ConstFunctionId.LEAGUE_PRAY:
-                    isJump = ViewManager.Show<LeaguePrayView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<LeaguePrayView>(null, _fromViewDatas);
                     break;
                 case ConstFunctionId.LEAGUE_ANSWER:
                     if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
                     {
-                        ViewManager.Show<LeagueView>(null, _fromeViewDatas);
+                        ViewManager.Show<LeagueView>(null, _fromViewDatas);
                         isJump = ViewManager.Show<LeagueAnswerView>();
                     }
                     else

+ 126 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitedRechargeDBGiftView.cs

@@ -0,0 +1,126 @@
+using FairyGUI;
+using System;
+using System.Collections;
+using UI.DailyWelfare;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class LimitedRechargeDBGiftView : BaseWindow
+    {
+        private UI_LimitedRechargeDBGiftUI _ui;
+
+        private int _count = 0;
+        private int _minProgressOffset = 6;
+        private int _maxProgressOffset = -8;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LimitedRechargeDBGiftUI.PACKAGE_NAME;
+            _ui = UI_LimitedRechargeDBGiftUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_btnTest.onClick.Add(OnClickBtnTest);
+            InitProgressValueList();
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            _count = 0;
+            UpdateProgress();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void OnClickBtnTest(EventContext context)
+        {
+            _count += 10;
+            UpdateProgress();
+        }
+
+
+        private int[] _progressValuePart;
+        private int _partNum = 4;
+
+        private void InitProgressValueList()
+        {
+            _progressValuePart = new int[_partNum];
+            int max = (int)_ui.m_progress.target.max;
+            int average = (int)Mathf.Ceil((float)(_ui.m_progress.target.max / (_partNum - 1)));
+
+            _progressValuePart[0] = 0;
+            _progressValuePart[_partNum - 1] = max;
+            for (int i = 1; i < _partNum - 1; i++)
+            {
+                _progressValuePart[i] = i * average;
+            }
+        }
+
+        private void UpdateProgress()
+        {
+            int max = (int)_ui.m_progress.target.max;
+
+            // 确定count的区间
+            if (_count == 0 || _count == max)
+            {
+                _ui.m_progress.target.value = _count;
+            }
+            else
+            {
+                int index = 1;
+                for (; index < _progressValuePart.Length; index++)
+                {
+                    if (_count < _progressValuePart[index])
+                    {
+                        --index;
+                        break;
+                    }
+                }
+
+                // 计算进度条最小取值和最大取值,避免因为图标遮挡造成视觉错误
+                int minProgressValue = _progressValuePart[index] + _minProgressOffset;
+                int maxProgressValue = _progressValuePart[index + 1] + _maxProgressOffset;
+
+                if(_count == _progressValuePart[index] || _count == _progressValuePart[index + 1])
+                {
+                    _ui.m_progress.target.value = _count;
+                }
+                else
+                {
+                    _ui.m_progress.target.value = Mathf.Clamp(_count, minProgressValue, maxProgressValue);
+                }
+                Debug.LogError("count:" + _count + "," + "progress:" + _ui.m_progress.target.value);
+            }
+        }
+    }
+
+}

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

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

+ 6 - 37
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -129,6 +129,7 @@ namespace GFGGame
             _ui.m_btnTravel.target.onClick.Add(OnClickBtnTravel);
             _ui.m_btnDailyWelfare.target.onClick.Add(OnClickBtnDailyWelfare);
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
+            _ui.m_btnLimitedRechargeDBGift.target.onClick.Add(OnClickBtnLimitedRechargeDBGift);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
@@ -462,52 +463,20 @@ namespace GFGGame
             if (isOpen) return;
             isOpen = true;
             _ui.m_btnXiuFang.m_holder1.visible = true;
-            // Timers.inst.Add(effectTime, 1, (param) =>
-            // {
             _ui.m_btnXiuFang.m_holder1.visible = false;
             ViewManager.Show<XiuFangView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
             isOpen = false;
-
-
-            // });
         }
 
         private void OnClickBtnDailyLogin()
         {
-            // if (isOpen) return;
-            // isOpen = true;
-            // _ui.m_btnDailyLogin.m_holder.visible = true;
-            // Timers.inst.Add(effectTime, 1, (param) =>
-            // {
-            //     _ui.m_btnDailyLogin.m_holder.visible = false;
-            // List<string> list = new List<string>();
-            // list.Add("StudioView");
-            // list.Add("XiuFangView");
-            // ViewManager.Show<FunctionOpenView>(list);
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 1);
-
             ViewManager.Show<SevenDayLoginView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
-            //     isOpen = false;
-            // });
         }
 
         private void OnClickBtnDailyWelfare()
         {
-            // if (isOpen) return;
-            // isOpen = true;
-            // _ui.m_btnDailyLogin.m_holder.visible = true;
-            // Timers.inst.Add(effectTime, 1, (param) =>
-            // {
-            //     _ui.m_btnDailyLogin.m_holder.visible = false;
-            // List<string> list = new List<string>();
-            // list.Add("StudioView");
-            // list.Add("XiuFangView");
-            // ViewManager.Show<FunctionOpenView>(list);
-            // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 1);
-
             ViewManager.Show<DailyWelfareView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
-            //     isOpen = false;
-            // });
         }
 
         private void OnClickBtnActivityLuckyBox()
@@ -516,6 +485,11 @@ namespace GFGGame
                 true);
         }
 
+        private void OnClickBtnLimitedRechargeDBGift()
+        {
+            ViewManager.Show<LimitedRechargeDBGiftView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+        }
+
         private void OnClickBtnCiPai()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 1);
@@ -523,15 +497,12 @@ namespace GFGGame
             if (isOpen) return;
             isOpen = true;
             _ui.m_btnCiPai.m_holder1.visible = true;
-            // Timers.inst.Add(effectTime, 1, (param) =>
-            // {
             _ui.m_btnCiPai.m_holder1.visible = false;
 
             CardDataManager.isFilter = false;
             ViewManager.Show<CardDetailView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
             isOpen = false;
 
-            // });
         }
 
         private void OnClickBtnStudio()
@@ -549,7 +520,6 @@ namespace GFGGame
         private void OnClickBtnPoem()
         {
             // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
-
             ViewManager.Show<PoemView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
 
@@ -627,7 +597,6 @@ namespace GFGGame
 
         private void OnClickBtnGongGao()
         {
-            // /null, new object[] { ViewName.MAINUI_VIEW, this.viewData }
             ViewManager.Show<NoticeView>();
         }
 

BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0.png


BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes