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

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

@@ -145,23 +145,11 @@ namespace GFGGame
 
         public decimal GetGuideProgress()
         {
-
-            int suitHaveCount = 0;
-            int suitTotalCount = 1;
+            int suitHaveCount;
+            int suitTotalCount;
             DressUpMenuSuitDataManager.GetTotalProgress(out suitHaveCount, out suitTotalCount);
-            // int chapterItemHaveCount = 0;
-            // int chapterItemTotalCount = 1;
-            // InstanceZonesDataManager.GetTotalProgress(out chapterItemHaveCount, out chapterItemTotalCount);
-            // int travelHaveCount = 0;
-            // int travelTotalCount = 1;
-            // TravelDataManager.Instance.GetTotalTravelProgress(out travelHaveCount, out travelTotalCount);
-
-            // int haveCount = suitHaveCount + chapterItemHaveCount + travelHaveCount;
-            // int totalCount = suitTotalCount + chapterItemTotalCount + travelTotalCount;
-
-            decimal value = Math.Floor((decimal)100 * suitHaveCount / suitTotalCount);
+            decimal value = FieldGuideView.ProgressCalculate(suitHaveCount, suitTotalCount);
             return value;
-
         }
 
         public void UpdateHeadWithLv(GComponent component, int headId, int roleBorderId, int lv)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxWishUI.cs

@@ -10,6 +10,10 @@ namespace UI.LuckyBox
         public GButton m_btnWish1;
         public GButton m_btnWish2;
         public GButton m_btnRule;
+        public GLoader m_loaProperty1;
+        public GLoader m_loaProperty2;
+        public GButton m_btnShow1;
+        public GButton m_btnShow2;
         public const string URL = "ui://drx9d1usnlyjtqb";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxWishUI";
@@ -60,12 +64,20 @@ namespace UI.LuckyBox
             m_btnWish1 = (GButton)comp.GetChild("btnWish1");
             m_btnWish2 = (GButton)comp.GetChild("btnWish2");
             m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_loaProperty1 = (GLoader)comp.GetChild("loaProperty1");
+            m_loaProperty2 = (GLoader)comp.GetChild("loaProperty2");
+            m_btnShow1 = (GButton)comp.GetChild("btnShow1");
+            m_btnShow2 = (GButton)comp.GetChild("btnShow2");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_btnWish1 = null;
             m_btnWish2 = null;
             m_btnRule = null;
+            m_loaProperty1 = null;
+            m_loaProperty2 = null;
+            m_btnShow1 = null;
+            m_btnShow2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -259,7 +259,7 @@ namespace GFGGame
             DOTween.To(() => start, (value) =>
             {
                 ChangeModelAlpha(index, value);
-            }, end, 0.75f).SetEase(ease).OnComplete(() =>
+            }, end, 0.6f).SetEase(ease).OnComplete(() =>
             {
                 action?.Invoke();
             }).SetAutoKill().SetId("fade");

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyOverView.cs

@@ -32,7 +32,7 @@ namespace GFGGame
             isfullScreen = true;
             isReturnView = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetDressUpPath("chahuibg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
 
             teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem1);
@@ -71,6 +71,7 @@ namespace GFGGame
         {
             base.OnHide();
             Timers.inst.Remove(UpdateTime);
+
         }
 
         protected override void RemoveEventListener()
@@ -94,7 +95,7 @@ namespace GFGGame
 
         private void OnBtnBackClick()
         {
-            ViewManager.GoBackFrom(typeof(LeagueTeaPartyOverView).FullName);
+            ViewManager.Show<LeagueTeaPartyView>(null,null,true);
         }
 
         private void OnBtnRewardClick()

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyShowView.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             isfullScreen = true;
             isReturnView = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetDressUpPath("chahuibg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
 
             teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem1);

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
@@ -36,6 +37,11 @@ namespace GFGGame
             _ui.m_btnWish2.onClick.Add(OnClickBtnWish);
             _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnRule.data = 300024;
+
+            _ui.m_btnShow1.data = 0;
+            _ui.m_btnShow1.onClick.Add(OnClickBtnShow);
+            _ui.m_btnShow2.data = 1;
+            _ui.m_btnShow2.onClick.Add(OnClickBtnShow);
         }
         protected override void AddEventListener()
         {
@@ -46,8 +52,19 @@ namespace GFGGame
         {
             base.OnShown();
             _actLimitTsy = (int)this.viewData;
+
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
+            var suitId = activityOpenCfg.params2Arr[0];
+            var suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[0]);
+            _ui.m_loaProperty1.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg.mainScore);
+            var suitId2 = activityOpenCfg.params2Arr[1];
+            var suitCfg2 = SuitCfgArray.Instance.GetCfg(suitId2);
+            ItemCfg itemCfg2 = ItemCfgArray.Instance.GetCfg(suitCfg2.partsArr[0]);
+            _ui.m_loaProperty2.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg2.mainScore);
         }
-        
+
         protected override void OnHide()
         {
             base.OnHide();
@@ -70,6 +87,25 @@ namespace GFGGame
             AlertUI.Show(string.Format("是否将【{0}】设为许愿套装（许愿后将不可修改，请研究员谨慎选择）", suitCfg.name)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(index); });
         }
 
+        private void OnClickBtnShow(EventContext context)
+        {
+            int index = (int)(context.sender as GObject).data;
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
+            var suitId = activityOpenCfg.params2Arr[index];
+            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 async void ReqAddWishingPoolInfo(int index)
         {
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);