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

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -405,9 +405,6 @@ namespace GFGGame
         {
             _showLv = isPreview == true ? lv : _cardData.lv;
             _showExp = isPreview == true ? exp : _cardData.exp;
-
-            ET.Log.Debug("打印测试========UpdateUpLvView========"+ _showExp);
-
             CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfgByrarityAndcardLvl(_cardData.itemCfg.rarity, _showLv);
             if (cardLvCfg == null)
             {
@@ -613,9 +610,6 @@ namespace GFGGame
             int previewLv = 0;
             int previewExp = 0;
             CardDataManager.GetPreViewLvAndExp(_cardData.id, _cardData.lv, _cardData.exp, hasExp, out previewLv, out previewExp);
-            ET.Log.Debug("打印测试========previewLv========" + previewLv);
-            ET.Log.Debug("打印测试========previewExp========" + previewExp);
-
             this.UpdateUpLvView(true, previewLv, previewExp);
         }
 

GameClient/Assets/Game/HotUpdate/Views/Card/CardUpLevelView.cs

@@ -51,17 +51,19 @@ namespace GFGGame
             _ui.m_btnAdd.onClick.Add(OnClickBtnAdd);
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_slideUpLevel.onChanged.Add(OnChangeUpLevel);
-
         }
 
         private void OnChangeUpLevel()
         {
             float volumn = (float)_ui.m_slideUpLevel.value / 100;
-            //UI_UpLevelSlide slider1 = UI_UpLevelSlide.Proxy(_ui.m_slideUpLevel);
-            //slider1.m_progressBar.fillAmount = volumn;
-            ////tidyData(_nowCountCanUpLevel);
-            ////ReferViewInfo();
-            //UI_UpLevelSlide.ProxyEnd();
+            _nowCountCanUpLevel = (int)(volumn * (_countCanUpMaxLevel - _cardData.lv + 1));
+            tidyData(_nowCountCanUpLevel);
+            ReferViewInfo();
+        }
+
+        private void ReferSlide()
+        {
+            _ui.m_slideUpLevel.value = (float)_nowCountCanUpLevel / (_countCanUpMaxLevel - _cardData.lv + 1)*100;
         }
 
         protected override void OnShown()
@@ -70,7 +72,8 @@ namespace GFGGame
             _cardData = (CardData)this.viewData;
             AddEffect();
             ClearItemsCountList();
-            
+
+            _ui.m_slideUpLevel.value = 0;
             int cfgMaxLevel = CardLvlCfgArray.Instance.GetCfgsByrarity(_cardData.itemCfg.rarity).Count - 1;
             tidyData(cfgMaxLevel);
             _countCanUpMaxLevel = _nowCountCanUpLevel;
@@ -181,6 +184,7 @@ namespace GFGGame
                 _nowCountCanUpLevel = _cardData.lv;
             tidyData(_nowCountCanUpLevel);
             ReferViewInfo();
+            ReferSlide();
         }
 
         private void OnClickBtnAdd()
@@ -190,6 +194,7 @@ namespace GFGGame
                 _nowCountCanUpLevel = _countCanUpMaxLevel;
             tidyData(_nowCountCanUpLevel);
             ReferViewInfo();
+            ReferSlide();
         }
     }
 }