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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardItem.cs

@@ -7,6 +7,7 @@ namespace UI.Card
     public partial class UI_ListCardItem
     {
         public GComponent target;
+        public Controller m_starNumType;
         public UI_ComCardMask m_comCard;
         public GLoader m_loaBorder;
         public GLoader m_loaRarity;
@@ -64,6 +65,7 @@ namespace UI.Card
 
         private void Init(GComponent comp)
         {
+            m_starNumType = comp.GetController("starNumType");
             m_comCard = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCard"));
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
@@ -77,6 +79,7 @@ namespace UI.Card
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_starNumType = null;
             m_comCard.Dispose();
             m_comCard = null;
             m_loaBorder = null;

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

@@ -129,6 +129,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardRed(data.id), "", 10, -4);
 
             int starLevelDodge = data.star / 5;
+            listItem.m_starNumType.selectedIndex = data.itemCfg.starDescArr.Length-1;
             for (int i = 0; i < 4; i++)
             {
                 UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(listItem.target.GetChild("dodgeStar" + i));

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

@@ -774,8 +774,10 @@ namespace GFGGame
             int starLevelDodge = _cardData.star / _wordNumber;
             for (int i = 0; i < _wordRow; i++)
             {
-                UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(_comFosterBottom.target.GetChild("dodgeStar" + i));
+                var dodgeStarObj = _comFosterBottom.target.GetChild("dodgeStar" + i);
+                UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(dodgeStarObj);
                 dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
+                dodgeStarObj.visible = i < _cardData.itemCfg.starDescArr.Length;
                 UI_ComDodgeStar.ProxyEnd();
             }
         }
@@ -783,6 +785,7 @@ namespace GFGGame
         private void UpdateUpStarOfText()
         {
             int starLevel = _cardData.star / _wordNumber;
+            _wordRow = _cardData.itemCfg.starDescArr.Length;
             if (starLevel >= _wordRow)
                 starLevel = _wordRow - 1;
             int index = starLevel * _wordNumber;
@@ -920,7 +923,6 @@ namespace GFGGame
 
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
                 UpdateRedDot();
-
                 if (_cardData.star % 5 == 0) {
                     int starLevelDodge = _cardData.star / _wordNumber;
                     int starLevel = _cardData.star / _wordNumber - 1;

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

@@ -13,7 +13,7 @@ namespace GFGGame
     {
         private UI_LuckyBoxUI _ui;
         private ValueBarController _valueBarController;
-        private Dictionary<int, LuckyBoxController> _lcukyBoxCtrl = new Dictionary<int, LuckyBoxController>();
+        private Dictionary<int, LuckyBoxController> _luckyBoxCtrl = new Dictionary<int, LuckyBoxController>();
 
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
@@ -36,11 +36,11 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
-            foreach (int key in _lcukyBoxCtrl.Keys)
+            foreach (int key in _luckyBoxCtrl.Keys)
             {
-                _lcukyBoxCtrl[key].Dispose();
+                _luckyBoxCtrl[key].Dispose();
             }
-            _lcukyBoxCtrl.Clear();
+            _luckyBoxCtrl.Clear();
             if (_dressUpObjUIXiHe != null)
             {
                 _dressUpObjUIXiHe.Dispose();
@@ -81,7 +81,7 @@ namespace GFGGame
             // _ui.m_listBg.SetVirtual();
             _ui.m_listBg.itemRenderer = RenderListBgItem;
             // _ui.m_listBg.itemProvider = GetListItemResource;
-            _ui.m_listBg.scrollPane.onScrollEnd.Add(OnListBgScroll);
+            _ui.m_listBg.scrollPane.onScrollEnd.Add(OnScrollEnd);
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
         }
@@ -212,9 +212,20 @@ namespace GFGGame
                 GetWishingPoolInfo(_activityId);
         }
 
+        private void OnScrollEnd()
+        {
+            // 未更新滚动位置的时候，不更新，防止不停的播放渐入动画
+            int index = _ui.m_listBg.GetFirstChildInView();
+            if(index == _curIndex)
+            {
+                return;
+            }
+            OnListBgScroll();
+        }
+
         private void OnListBgScroll()
         {
-            if (_lcukyBoxCtrl.ContainsKey(LuckyBoxDataManager.Instance.currentBoxId)) _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnHide();
+            if (_luckyBoxCtrl.ContainsKey(LuckyBoxDataManager.Instance.currentBoxId)) _luckyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnHide();
             _curIndex = _ui.m_listBg.GetFirstChildInView();
             LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
             if (LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_3)
@@ -226,6 +237,8 @@ namespace GFGGame
                 _valueBarController.Controller(4);
             }
             _valueBarController.UpdateCJ();
+
+
             UpdateListItem();
             _ui.m_btnLeft.grayed = _curIndex <= 0;
             _ui.m_btnRight.grayed = _curIndex >= _ui.m_listBg.numItems - 1;
@@ -251,12 +264,12 @@ namespace GFGGame
             else 
                 comBox.m_showActivityType.selectedIndex = 0;
 
-            if (!_lcukyBoxCtrl.ContainsKey(boxId))
+            if (!_luckyBoxCtrl.ContainsKey(boxId))
             {
-                _lcukyBoxCtrl.Add(boxId, new LuckyBoxController(comBox.m_comModel.target));
+                _luckyBoxCtrl.Add(boxId, new LuckyBoxController(comBox.m_comModel.target));
             }
 
-            _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
+            _luckyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
 
             comBox.m_comLuckBoxBtn.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
             //GGraph holder = comBox.m_comLuckBoxBtn.m_btnBuyTen.GetChild("holder").asGraph;
@@ -563,9 +576,9 @@ namespace GFGGame
             _effectUI2 = null;
 
             _valueBarController.OnHide();
-            foreach (int key in _lcukyBoxCtrl.Keys)
+            foreach (int key in _luckyBoxCtrl.Keys)
             {
-                _lcukyBoxCtrl[key].OnHide();
+                _luckyBoxCtrl[key].OnHide();
             }
 
             Timers.inst.Remove(OnTimerUpdate);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -289,11 +289,11 @@ namespace GFGGame
             }
             if (isView)
             {
-                _ui.m_listChapter.ScrollToView(currentChapterIndex -1, false, true);
+                _ui.m_listChapter.ScrollToView(Mathf.Max(0, currentChapterIndex -1), false, true);
             }
             else
             {
-                _ui.m_listChapter.ScrollToView(chapterIndex - 1, false, true);
+                _ui.m_listChapter.ScrollToView(Mathf.Max(0,chapterIndex - 1), false, true);
             }
             
             int childrenCount = _ui.m_listChapter.numChildren - 1;

GameClient/Assets/Game/HotUpdate/Views/MainStory/StorySkillView.cs

@@ -122,7 +122,7 @@ namespace GFGGame
             //else
             {
                 //this.Hide();
-                Timers.inst.Add(2.0f, 1, AutoHide);
+                Timers.inst.Add(2.2f, 1, AutoHide);
             }
         }
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeView.cs

@@ -51,6 +51,7 @@ namespace GFGGame
             base.OnShown();
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE);
             _valueBarController.OnShown();
+            _ui.m_comVipLv.m_loaIcon.url = ResPathUtil.GetIconPath("tb_yajizijin", "png");
             UpdateView();
         }