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/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();
         }