Browse Source

成就界面拼ui

huangxiaoyue 1 year ago
parent
commit
fc67199dd4
56 changed files with 669 additions and 17 deletions
  1. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_AchieveItem.cs
  2. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_AchieveItem.cs.meta
  3. 6 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_CombTaskUI.cs
  4. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveDetailUI.cs
  5. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveDetailUI.cs.meta
  6. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveUI.cs
  7. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveUI.cs.meta
  8. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskUI.cs
  9. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskController.cs
  10. 114 0
      GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveDetailView.cs
  11. 11 0
      GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveDetailView.cs.meta
  12. 72 0
      GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveView.cs
  13. 11 0
      GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveView.cs.meta
  14. 2 12
      GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs
  15. BIN
      GameClient/Assets/ResIn/UI/Card/Card_fui.bytes
  16. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  18. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  20. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png
  22. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png
  23. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png
  24. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  25. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0!a.png
  26. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0.png
  27. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png
  28. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1.png
  29. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png
  30. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2.png
  31. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png
  32. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3.png
  33. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png
  34. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4.png
  35. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png
  36. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5.png
  37. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png
  38. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_7.png
  39. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png
  40. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_8.png
  41. BIN
      GameClient/Assets/ResIn/UI/League/League_fui.bytes
  42. BIN
      GameClient/Assets/ResIn/UI/Task/Task_atlas0!a.png
  43. BIN
      GameClient/Assets/ResIn/UI/Task/Task_atlas0.png
  44. BIN
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_1!a.png
  45. BIN
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_1.png
  46. BIN
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_2!a.png
  47. BIN
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_2.png
  48. BIN
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_3!a.png
  49. 1 1
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_3!a.png.meta
  50. BIN
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_3.png
  51. 1 1
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_3.png.meta
  52. BIN
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_4!a.png
  53. 96 0
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_4!a.png.meta
  54. BIN
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_4.png
  55. 96 0
      GameClient/Assets/ResIn/UI/Task/Task_atlas0_4.png.meta
  56. BIN
      GameClient/Assets/ResIn/UI/Task/Task_fui.bytes

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_AchieveItem.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_AchieveItem
+    {
+        public GComponent target;
+        public GTextField m_txtName;
+        public const string URL = "ui://5mpsibzzaignto5";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "AchieveItem";
+        private static UI_AchieveItem _proxy;
+
+        public static UI_AchieveItem Create(GObject gObject = null)
+        {
+            var ui = new UI_AchieveItem();
+            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_AchieveItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_AchieveItem();
+            }
+            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_txtName = (GTextField)comp.GetChild("txtName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_AchieveItem.cs.meta

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

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_CombTaskUI.cs

@@ -11,6 +11,8 @@ namespace UI.Task
         public UI_LivenessRewardProcess m_LivenessProcess;
         public GList m_TaskList;
         public GButton m_GetAll;
+        public GTextField m_txtLevel;
+        public GTextField m_txtLevel_2;
         public const string URL = "ui://5mpsibzzfqor2p";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "CombTaskUI";
@@ -62,6 +64,8 @@ namespace UI.Task
             m_LivenessProcess = (UI_LivenessRewardProcess)UI_LivenessRewardProcess.Create(comp.GetChild("LivenessProcess"));
             m_TaskList = (GList)comp.GetChild("TaskList");
             m_GetAll = (GButton)comp.GetChild("GetAll");
+            m_txtLevel = (GTextField)comp.GetChild("txtLevel");
+            m_txtLevel_2 = (GTextField)comp.GetChild("txtLevel");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -70,6 +74,8 @@ namespace UI.Task
             m_LivenessProcess = null;
             m_TaskList = null;
             m_GetAll = null;
+            m_txtLevel = null;
+            m_txtLevel_2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveDetailUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_TaskAchieveDetailUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GList m_listAchieveTask;
+        public const string URL = "ui://5mpsibzzaigntob";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "TaskAchieveDetailUI";
+        private static UI_TaskAchieveDetailUI _proxy;
+
+        public static UI_TaskAchieveDetailUI Create(GObject gObject = null)
+        {
+            var ui = new UI_TaskAchieveDetailUI();
+            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_TaskAchieveDetailUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TaskAchieveDetailUI();
+            }
+            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_listAchieveTask = (GList)comp.GetChild("listAchieveTask");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_listAchieveTask = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveDetailUI.cs.meta

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

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_TaskAchieveUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GList m_listAchieveItem;
+        public const string URL = "ui://5mpsibzzaigntny";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "TaskAchieveUI";
+        private static UI_TaskAchieveUI _proxy;
+
+        public static UI_TaskAchieveUI Create(GObject gObject = null)
+        {
+            var ui = new UI_TaskAchieveUI();
+            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_TaskAchieveUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TaskAchieveUI();
+            }
+            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_listAchieveItem = (GList)comp.GetChild("listAchieveItem");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_listAchieveItem = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveUI.cs.meta

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

+ 0 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskUI.cs

@@ -9,7 +9,6 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
-        public GComponent m_comValueBar;
         public GButton m_btnBack;
         public GButton m_btnTask;
         public GButton m_btnWeekly;
@@ -64,7 +63,6 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnTask = (GButton)comp.GetChild("btnTask");
             m_btnWeekly = (GButton)comp.GetChild("btnWeekly");
@@ -75,7 +73,6 @@ namespace UI.Task
         {
             m_c1 = null;
             m_loaBg = null;
-            m_comValueBar = null;
             m_btnBack = null;
             m_btnTask = null;
             m_btnWeekly = null;

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskController.cs

@@ -95,6 +95,7 @@ namespace GFGGame
             DailyTaskDataManager.Instance.GetShowLivenessBoxNum(funcType);
             _ui.m_LivenessProcess.target.max = 100;
             _ui.m_LivenessProcess.target.value = liveness;
+            _ui.m_txtLevel.text = liveness.ToString();
             var cfgs = TaskActiveRewardCfgArray.Instance.GetCfgsByfuncType(funcType);
             for (var i = 0; i < cfgs.Count; i++)
             {

+ 114 - 0
GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveDetailView.cs

@@ -0,0 +1,114 @@
+using FairyGUI;
+using System.Collections.Generic;
+using UI.CommonGame;
+using UI.Task;
+
+namespace GFGGame
+{
+    public class TaskAchieveDetailView : BaseWindow
+    {
+        private UI_TaskAchieveDetailUI _ui;
+        private List<TaskCfg> _cfgs;
+        private int funcType = TaskFuncType.BattlePass;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_TaskAchieveDetailUI.PACKAGE_NAME;
+            _ui = UI_TaskAchieveDetailUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chengjiu_bg");
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_listAchieveTask.itemRenderer = RenderListAchieveTask;
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.Hide<TaskAchieveDetailView>();
+        }
+
+    
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _cfgs = TaskDataManager.Instance.GetTaskCfgs(funcType);
+            UpdateTask();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void UpdateTask()
+        {
+            _cfgs = TaskDataManager.Instance.GetTaskCfgs(funcType);
+            _ui.m_listAchieveTask.numItems = _cfgs.Count;
+        }
+
+        private void RenderListAchieveTask(int index, GObject obj)
+        {
+            var item = UI_TaskListItem.Proxy(obj);
+            //Áìȡ״̬
+            item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
+            item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 1 : 0;
+            item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
+            item.m_txtCount.text =
+                $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].GetTargetCount()}";
+            //if (item.m_GetRewardBt.data == null)
+            //{
+            //    item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+            //}
+            //item.m_GetRewardBt.data = _cfgs[index].id;
+            //if (item.m_ComeBt.data == null)
+            //{
+            //    item.m_ComeBt.onClick.Add(OnBtnGoClick);
+            //}
+            item.m_ComeBt.data = _cfgs[index];
+            if (item.m_listTaskReward.data == null)
+            {
+                item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
+            }
+            var reward = TaskDataManager.Instance.GetReward(_cfgs[index]);
+            item.m_listTaskReward.data = reward;
+            item.m_listTaskReward.numItems = reward.Length;
+            var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            bool canGet = item.m_c1.selectedIndex == 1;
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, canGet);
+            UI_TaskListItem.ProxyEnd();
+        }
+
+        private static void ListTaskRewardItemRender(int index, GObject obj)
+        {
+            var rewards = (int[][])obj.parent.data;
+            var itemData = ItemUtil.createItemData(rewards[index]);
+            var item = new ItemView(obj as GComponent);
+            obj.data = item;
+            item.SetData(itemData);
+            item.ChangeTxtCountStyle();
+            UI_RewardIconYellow.ProxyEnd();
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveDetailView.cs.meta

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

+ 72 - 0
GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveView.cs

@@ -0,0 +1,72 @@
+using FairyGUI;
+using UI.Task;
+
+namespace GFGGame
+{
+    public class TaskAchieveView : BaseWindow
+    {
+        private UI_TaskAchieveUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_TaskAchieveUI.PACKAGE_NAME;
+            _ui = UI_TaskAchieveUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chengjiu_bg");
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_listAchieveItem.itemRenderer = RenderListAchieveItem;
+            _ui.m_listAchieveItem.onClickItem.Add(OnClickListRarityItem);
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.Hide<TaskAchieveView>();
+        }
+
+        private void OnClickListRarityItem(EventContext context)
+        {
+            ViewManager.Show<TaskAchieveDetailView>();
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_listAchieveItem.numItems = 5;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void RenderListAchieveItem(int index, GObject obj)
+        {
+            UI_AchieveItem listItem = UI_AchieveItem.Proxy(obj);
+            listItem.m_txtName.text = "ÈÎÎñ";
+            UI_AchieveItem.ProxyEnd();
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveView.cs.meta

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

+ 2 - 12
GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs

@@ -6,16 +6,10 @@ namespace GFGGame
     public class TaskView : BaseWindow
     {
         private UI_TaskUI _ui;
-        private ValueBarController _valueBarController;
         private CombTaskController _combTaskController;
 
         public override void Dispose()
         {
-            if (_valueBarController != null)
-            {
-                _valueBarController.Dispose();
-                _valueBarController = null;
-            }
             if(_combTaskController != null)
             {
                 _combTaskController.Dispose();
@@ -39,7 +33,6 @@ namespace GFGGame
             isfullScreen = true;
             bringToFontOnClick = false;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            _valueBarController = new ValueBarController(_ui.m_comValueBar);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
             _ui.m_c1.onChanged.Add(OnCtrlChange);
             _ui.m_btnAchieve.onClick.Add(OnBtnAchieveClick);
@@ -54,9 +47,8 @@ namespace GFGGame
         }
 
         private void OnBtnAchieveClick()
-        { 
-            
-        
+        {
+            ViewManager.Show<TaskAchieveView>();
         }
             
         protected override void AddEventListener()
@@ -76,7 +68,6 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _valueBarController.OnShown();
             int selectedIndex = 0;
             if (viewData != null)
             {
@@ -95,7 +86,6 @@ namespace GFGGame
         {
             base.OnHide();
             _ui.m_c1.selectedIndex = 0;
-            _valueBarController.OnHide();
             UpdateRedPoint();
         }
 

BIN
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_8.png


BIN
GameClient/Assets/ResIn/UI/League/League_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Task/Task_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Task/Task_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Task/Task_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Task/Task_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Task/Task_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/Task/Task_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Task/Task_atlas0_3!a.png


+ 1 - 1
GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png.meta → GameClient/Assets/ResIn/UI/Task/Task_atlas0_3!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 726e7f10cd7fec847806366b24311ae0
+guid: 016d38e7535b991498476c92087f8915
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

BIN
GameClient/Assets/ResIn/UI/Task/Task_atlas0_3.png


+ 1 - 1
GameClient/Assets/ResIn/UI/League/League_atlas0_8.png.meta → GameClient/Assets/ResIn/UI/Task/Task_atlas0_3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f1597f8c9e40b17439e8c3621066718a
+guid: e3263f0fdbe4c8745976dd24bda50a16
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

BIN
GameClient/Assets/ResIn/UI/Task/Task_atlas0_4!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Task/Task_atlas0_4!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 724092c2de7d4b54599ad22cf8583f93
+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
GameClient/Assets/ResIn/UI/Task/Task_atlas0_4.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Task/Task_atlas0_4.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 200cabac085b0f240b2b99fbb572cf71
+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
GameClient/Assets/ResIn/UI/Task/Task_fui.bytes