Merge remote-tracking branch 'remotes/origin/master' into xiaojie

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

@@ -101,19 +101,47 @@ namespace GFGGame
             {
                 var stateA = TaskInfosDic[a.id].State == 1 ? 1 : -1;
                 var stateB = TaskInfosDic[b.id].State == 1 ? 1 : -1;
-                if (stateA > stateB) return -1;
-                else if (stateA == stateB) { 
-                    if(a.id > b.id) 
-                        return 1;
-                    else
-                        return -1;
-                }
                 return stateB > stateA ? 1 : TaskInfosDic[a.id].State.CompareTo(TaskInfosDic[b.id].State);
             });
             return cfgs;
         }
 
         /// <summary>
+        /// 获取任务成就列表
+        /// </summary>
+        /// <returns></returns>
+        public List<TaskCfg> GetTaskAchieveCfgs(int taskType)
+        {
+            var cfgs = new List<TaskCfg>();
+
+            TaskType2TaskIdListDic.TryGetValue(taskType, out var taskIds);
+            if (taskIds == null) return cfgs;
+            cfgs.AddRange(taskIds.Select(taskId => TaskCfgArray.Instance.GetCfg(taskId)));
+
+            cfgs.Sort((a, b) =>
+            {
+                var stateA = TaskInfosDic[a.id].State == 1 ? 1 : -1;
+                var stateB = TaskInfosDic[b.id].State == 1 ? 1 : -1;
+                if (stateA > stateB)
+                    return -1;
+                else if(stateA < stateB)
+                    return 1;
+                else {
+                    if (TaskInfosDic[a.id].State.CompareTo(TaskInfosDic[b.id].State) > 0)
+                        return -1;
+                    else if (TaskInfosDic[a.id].State.CompareTo(TaskInfosDic[b.id].State) < 0)
+                        return 1;
+                    else {
+                        if (a.id > b.id)
+                            return 1;
+                        else
+                            return -1;
+                    }
+                }
+            });
+            return cfgs;
+        }
+        /// <summary>
         /// 获取任务列表
         /// </summary>
         /// <returns></returns>

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

@@ -16,6 +16,7 @@ namespace UI.CommonGame
         public UI_Button22 m_GetRewardBt;
         public UI_Button22 m_ComeBt;
         public UI_Button22 m_GetRewardBt_2;
+        public GProgressBar m_taskBar;
         public const string URL = "ui://eg2y0ldplh8v5";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "TaskListItem";
@@ -72,6 +73,7 @@ namespace UI.CommonGame
             m_GetRewardBt = (UI_Button22)UI_Button22.Create(comp.GetChild("GetRewardBt"));
             m_ComeBt = (UI_Button22)UI_Button22.Create(comp.GetChild("ComeBt"));
             m_GetRewardBt_2 = (UI_Button22)UI_Button22.Create(comp.GetChild("GetRewardBt"));
+            m_taskBar = (GProgressBar)comp.GetChild("taskBar");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -87,6 +89,7 @@ namespace UI.CommonGame
             m_ComeBt = null;
             m_GetRewardBt_2.Dispose();
             m_GetRewardBt_2 = null;
+            m_taskBar = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevelItem.cs

@@ -16,8 +16,10 @@ namespace UI.Studio
         public GImage m_imgLockBg;
         public GImage m_imgLock;
         public GGroup m_grpLock;
+        public GGroup m_Panel;
         public Transition m_ToLeft;
         public Transition m_ToRight;
+        public Transition m_Left;
         public const string URL = "ui://xz8kxrecv4822p";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ListLevelItem";
@@ -74,8 +76,10 @@ namespace UI.Studio
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_grpLock = (GGroup)comp.GetChild("grpLock");
+            m_Panel = (GGroup)comp.GetChild("Panel");
             m_ToLeft = comp.GetTransition("ToLeft");
             m_ToRight = comp.GetTransition("ToRight");
+            m_Left = comp.GetTransition("Left");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -89,8 +93,10 @@ namespace UI.Studio
             m_imgLockBg = null;
             m_imgLock = null;
             m_grpLock = null;
+            m_Panel = null;
             m_ToLeft = null;
             m_ToRight = null;
+            m_Left = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveDetailUI.cs

@@ -11,6 +11,7 @@ namespace UI.Task
         public GLoader m_loaBg;
         public GButton m_btnBack;
         public GList m_listAchieveTask;
+        public GTextField m_txtProgress;
         public const string URL = "ui://5mpsibzzaigntob";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "TaskAchieveDetailUI";
@@ -62,6 +63,7 @@ namespace UI.Task
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listAchieveTask = (GList)comp.GetChild("listAchieveTask");
+            m_txtProgress = (GTextField)comp.GetChild("txtProgress");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +71,7 @@ namespace UI.Task
             m_loaBg = null;
             m_btnBack = null;
             m_listAchieveTask = null;
+            m_txtProgress = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs

@@ -14,7 +14,8 @@ namespace GFGGame
         {
             IN,
             IDLE,
-            OPEN
+            OPEN,
+            OUT
         }
 
         private UI_CreateRoleUI _ui;
@@ -47,7 +48,7 @@ namespace GFGGame
             // this.viewCom.Center();
             this.isfullScreen = true;
             this.clickBlankToClose = false;
-            this.modal = true;
+            this.modal = false;
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_yaoqinghan");
             _ui.m_envelopeModel.m_btnSure.onClick.Add(OnClickBtnSure);
@@ -87,6 +88,12 @@ namespace GFGGame
                     _ui.m_envelopeModel.m_t_Idle.Stop();
                     _ui.m_t_Open.Play();
                     break;
+                case State.OUT:
+                    _ui.m_t_AfterOpen.Play(()=>
+                    {
+                        this.Hide();
+                    });
+                    break;
             }
         }
 
@@ -132,7 +139,7 @@ namespace GFGGame
             if (result)
             {
                 StorageSProxy.ReqSetClientValue(ConstStorageId.CHANGE_NAME, 1).Coroutine();
-                this.Hide();
+                ChangeAnimationState(State.OUT);
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBaseView.cs

@@ -194,7 +194,7 @@ namespace GFGGame
                 list.GetChildAt(i).visible = false;
             }
             _time = 0;
-            Timers.inst.Add(0.2f, list.numChildren, OnTimerUpdate, 1);
+            Timers.inst.Add(0.07f, list.numChildren, OnTimerUpdate, 1);
         }
         private void OnTimerUpdate(object param)
         {

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -134,7 +134,7 @@ namespace GFGGame
         {
             // int _index = _storyLevelCfgs.Count - index - 1;
             UI_ListLevelItem item = UI_ListLevelItem.Proxy(obj);
-            item.m_c1.selectedIndex = index % 2 == 0 ? 0 : 1;
+            //item.m_c1.selectedIndex = index % 2 == 0 ? 0 : 1;
             item.m_txtName.text = _storyLevelCfgs[index].name;
             bool isFight = string.IsNullOrEmpty(_storyLevelCfgs[index].storyStartID);
             string resBg = isFight ? "cyjd_di_1" : "cyjd_di_2";
@@ -265,21 +265,25 @@ namespace GFGGame
                 _ui.m_list.GetChildAt(i).visible = false;
             }
             itemIndex = 0;
-            Timers.inst.Add(0.2f, _ui.m_list.numChildren, AddItemUpdate, 1);
+            Timers.inst.Add(0.05f, _ui.m_list.numChildren, AddItemUpdate, 1);
         }
 
         private void AddItemUpdate(object param)
         {
             _ui.m_list.GetChildAt(itemIndex).visible = true;
             UI_ListLevelItem item = UI_ListLevelItem.Proxy(_ui.m_list.GetChildAt(itemIndex));
+            Vector3 position = item.target.position;
             if (itemIndex % 2 == 0)
             {
-                item.m_ToLeft.Play();
+                //item.m_ToLeft.Play();
             }
             else
             {
-                item.m_ToRight.Play();
+                position.x = 200;
+                item.target.position = position;
+                //item.m_ToRight.Play();
             }
+            item.m_Left.Play();
             itemIndex++;
             UI_ListLevelItem.ProxyEnd();
         }

GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveDetailView.cs

@@ -11,7 +11,7 @@ namespace GFGGame
         private List<TaskCfg> _cfgs = new List<TaskCfg>();
         private int funcType = TaskFuncType.Achievement;
         private List<TaskCfg> _cfgsAll = new List<TaskCfg>();
-
+        public int taskSubType = 0;
         public override void Dispose()
         {
             if (_ui != null)
@@ -43,11 +43,13 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ACHIEVEMENT_TASK_PRO_CHANGED, UpdateProgressValue);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.ACHIEVEMENT_TASK_PRO_CHANGED, UpdateProgressValue);
         }
 
         protected override void OnShown()
@@ -62,11 +64,25 @@ namespace GFGGame
             base.OnHide();
         }
 
+        private void UpdateProgressValue()
+        {
+            var taskTypeProList = TaskDataManager.Instance.GetAchievementTaskTypeProList();
+            foreach (var info in taskTypeProList)
+            {
+                if (info.AchievementType == taskSubType + 1)
+                {
+                    _ui.m_txtProgress.text = (info.CompleteTaskNum*100 /info.AllTaskNum) + "%";
+                    break;
+                }
+            }
+        }
+
         private void UpdateTask()   
         {
-            int taskSubType = (int)this.viewData;
+            taskSubType = (int)this.viewData;
             _ui.m_AchieveType.selectedIndex = taskSubType;
-            _cfgsAll = TaskDataManager.Instance.GetTaskCfgs(funcType);
+            UpdateProgressValue();
+            _cfgsAll = TaskDataManager.Instance.GetTaskAchieveCfgs(funcType);
             _cfgs.Clear();
             for (int i= 0; i< _cfgsAll.Count;i++) {
                 if (_cfgsAll[i].achievementType == taskSubType+1)
@@ -81,9 +97,14 @@ namespace GFGGame
             //Áìȡ״̬
             item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
             item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 1 : 0;
+            item.m_c3.selectedIndex = 2;
             item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
-            item.m_txtCount.text =
-                $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].GetTargetCount()}";
+            
+            item.m_taskBar.value = TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id);
+            item.m_taskBar.max = _cfgs[index].GetTargetCount();
+
+            //item.m_txtCount.text =
+            //    $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].GetTargetCount()}";
             if (item.m_GetRewardBt.target.data == null)
             {
                 item.m_GetRewardBt.target.onClick.Add(OnBtnGetClick);