修改获取词牌、服装数量的函数

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -28,11 +28,11 @@ namespace GFGEditor
             int cardCount = 0;
             foreach (ItemCfg cfg in dataArray)
             {
-                HandleItemAndDressUpTable(cfg, ref clothingPartsCount);
-                HandleItemAndCardTable(cfg, ref cardCount);
                 HandleItemAndSuitTable(cfg, suitDic);
                 HandleItemApproch(cfg, actions);
                 HandleItemSyntheticSuit(cfg, syntheticSuitDic);
+                HandleItemAndDressUpTable(cfg, ref clothingPartsCount);
+                HandleItemAndCardTable(cfg, ref cardCount);
             }
             var globalCfg = GlobalCfgArray.globalCfg;
             SQLiteHelper.Instance.OpenConnection();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CardGuideUI.cs

@@ -9,9 +9,11 @@ namespace UI.FieldGuide
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnBack;
-        public GList m_listRole;
         public GList m_listCard;
+        public GList m_listRole;
         public UI_ProgressBar2 m_progress;
+        public Transition m_In;
+        public Transition m_Refresh;
         public const string URL = "ui://vqq9h9h4e3ot5t";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "CardGuideUI";
@@ -61,18 +63,22 @@ namespace UI.FieldGuide
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_listRole = (GList)comp.GetChild("listRole");
             m_listCard = (GList)comp.GetChild("listCard");
+            m_listRole = (GList)comp.GetChild("listRole");
             m_progress = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progress"));
+            m_In = comp.GetTransition("In");
+            m_Refresh = comp.GetTransition("Refresh");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_btnBack = null;
-            m_listRole = null;
             m_listCard = null;
+            m_listRole = null;
             m_progress.Dispose();
             m_progress = null;
+            m_In = null;
+            m_Refresh = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterGuideItem.cs

@@ -10,6 +10,7 @@ namespace UI.FieldGuide
         public GLoader m_loaIcon;
         public GTextField m_txtDesc;
         public GGroup m_grpLock;
+        public Transition m_In;
         public const string URL = "ui://vqq9h9h4s61p29";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "ChapterGuideItem";
@@ -60,12 +61,14 @@ namespace UI.FieldGuide
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_grpLock = (GGroup)comp.GetChild("grpLock");
+            m_In = comp.GetTransition("In");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
             m_txtDesc = null;
             m_grpLock = null;
+            m_In = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterItemShowUI.cs

@@ -12,6 +12,8 @@ namespace UI.FieldGuide
         public GLoader m_loaItem;
         public GTextField m_txtTitle;
         public GTextField m_txtDesc;
+        public Transition m_In;
+        public Transition m_Idle;
         public const string URL = "ui://vqq9h9h4s61p2i";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "ChapterItemShowUI";
@@ -64,6 +66,8 @@ namespace UI.FieldGuide
             m_loaItem = (GLoader)comp.GetChild("loaItem");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_In = comp.GetTransition("In");
+            m_Idle = comp.GetTransition("Idle");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +76,8 @@ namespace UI.FieldGuide
             m_loaItem = null;
             m_txtTitle = null;
             m_txtDesc = null;
+            m_In = null;
+            m_Idle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_DressUpGuideUI.cs

@@ -17,6 +17,8 @@ namespace UI.FieldGuide
         public GTextField m_txtTips;
         public UI_ProgressBar2 m_progressBar;
         public GButton m_btnSearch;
+        public Transition m_In;
+        public Transition m_Refresh;
         public const string URL = "ui://vqq9h9h493pb49";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "DressUpGuideUI";
@@ -74,6 +76,8 @@ namespace UI.FieldGuide
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_progressBar = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progressBar"));
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
+            m_In = comp.GetTransition("In");
+            m_Refresh = comp.GetTransition("Refresh");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -88,6 +92,8 @@ namespace UI.FieldGuide
             m_progressBar.Dispose();
             m_progressBar = null;
             m_btnSearch = null;
+            m_In = null;
+            m_Refresh = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_FieldGuideUI.cs

@@ -10,7 +10,7 @@ namespace UI.FieldGuide
         public GLoader m_loaBg;
         public GButton m_btnBack;
         public GList m_listGuide;
-        public Transition m_openViewAction;
+        public Transition m_In;
         public const string URL = "ui://vqq9h9h4pjip1";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "FieldGuideUI";
@@ -61,14 +61,14 @@ namespace UI.FieldGuide
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listGuide = (GList)comp.GetChild("listGuide");
-            m_openViewAction = comp.GetTransition("openViewAction");
+            m_In = comp.GetTransition("In");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_btnBack = null;
             m_listGuide = null;
-            m_openViewAction = null;
+            m_In = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitGuideDetailUI.cs

@@ -13,6 +13,7 @@ namespace UI.FieldGuide
         public GTextField m_title;
         public GButton m_btnSearch;
         public UI_ProgressBar4 m_progress;
+        public Transition m_In;
         public const string URL = "ui://vqq9h9h4e3ot6l";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "SuitGuideDetailUI";
@@ -66,6 +67,7 @@ namespace UI.FieldGuide
             m_title = (GTextField)comp.GetChild("title");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_progress = (UI_ProgressBar4)UI_ProgressBar4.Create(comp.GetChild("progress"));
+            m_In = comp.GetTransition("In");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -76,6 +78,7 @@ namespace UI.FieldGuide
             m_btnSearch = null;
             m_progress.Dispose();
             m_progress = null;
+            m_In = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitStoryItem.cs

@@ -10,6 +10,7 @@ namespace UI.FieldGuide
         public GImage m_icon;
         public GTextField m_title;
         public GTextField m_progressNum;
+        public Transition m_In;
         public const string URL = "ui://vqq9h9h4e3ot6k";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "SuitStoryItem";
@@ -60,12 +61,14 @@ namespace UI.FieldGuide
             m_icon = (GImage)comp.GetChild("icon");
             m_title = (GTextField)comp.GetChild("title");
             m_progressNum = (GTextField)comp.GetChild("progressNum");
+            m_In = comp.GetTransition("In");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_icon = null;
             m_title = null;
             m_progressNum = null;
+            m_In = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompDialogName.cs

@@ -11,6 +11,7 @@ namespace UI.Main
         public GTextField m_txtContent;
         public UI_CompArrow m_iconNext;
         public GTextField m_txtName;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8knmnb30";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompDialogName";
@@ -62,6 +63,7 @@ namespace UI.Main
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_iconNext = (UI_CompArrow)UI_CompArrow.Create(comp.GetChild("iconNext"));
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -70,6 +72,7 @@ namespace UI.Main
             m_iconNext.Dispose();
             m_iconNext = null;
             m_txtName = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryDialogUI.cs

@@ -20,7 +20,6 @@ namespace UI.Main
         public GButton m_btnSpeedUp;
         public GButton m_btnSkip;
         public Transition m_t0;
-        public Transition m_t1;
         public const string URL = "ui://mfvz4q8kxuzk2i";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryDialogUI";
@@ -81,7 +80,6 @@ namespace UI.Main
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_btnSkip = (GButton)comp.GetChild("btnSkip");
             m_t0 = comp.GetTransition("t0");
-            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -101,7 +99,6 @@ namespace UI.Main
             m_btnSpeedUp = null;
             m_btnSkip = null;
             m_t0 = null;
-            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/CardGuideView.cs

@@ -13,6 +13,8 @@ namespace GFGGame
     {
         private UI_CardGuideUI _ui;
         private List<int> _cardList;
+        private bool _startInAnim;
+        private int _lastClickIndex;
 
         public override void Dispose()
         {
@@ -40,6 +42,7 @@ namespace GFGGame
             _ui.m_listRole.onClickItem.Add(OnClickRoleListItem);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_listRole.selectedIndex = 0;
+            _startInAnim = true;
         }
 
         protected override void AddEventListener()
@@ -62,13 +65,19 @@ namespace GFGGame
         {
             base.OnShown();
             UpdateCardList();
+            if (_startInAnim)
+            {
+                _startInAnim = false;
+                _ui.m_listRole.scrollPane.ScrollTop();
+                _ui.m_In.Play();
+            }
         }
 
         protected override void OnHide()
         {
             base.OnHide();
             _ui.m_listRole.selectedIndex = 0;
-            _ui.m_listRole.scrollPane.ScrollTop();
+            _lastClickIndex = 0;
         }
 
         private void RenderCardListItem(int index, GObject obj)
@@ -110,7 +119,8 @@ namespace GFGGame
         {
             object data = (context.data as GObject).data;
             int index = _ui.m_listCard.GetChildIndex(context.data as GObject);
-            if(data == null)
+
+            if (data == null)
             {
                 object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(CardGuideView).Name);
                 object[] sourceDatas = new object[] { _cardList[index], goBackDatas, 1 };
@@ -125,8 +135,16 @@ namespace GFGGame
 
         private void OnClickRoleListItem(EventContext eventContext)
         {
+            if (_ui.m_listRole.selectedIndex == _lastClickIndex)
+            {
+                return;
+            }
+
+            _lastClickIndex = _ui.m_listRole.selectedIndex;
+
             UpdateCardList();
             _ui.m_listCard.scrollPane.ScrollTop();
+            _ui.m_Refresh.Play();
         }
 
         private void UpdateCardList()
@@ -147,6 +165,7 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
+            _startInAnim = true;
             ViewManager.GoBackFrom(typeof(CardGuideView).FullName);
         }
     }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemGuideView.cs

@@ -56,6 +56,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(typeof(ChapterItemGuideView).FullName);
+            _ui.m_list.scrollPane.ScrollTop();
         }
 
         private void RenderListItem(int index, GObject obj)

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemShowView.cs

@@ -38,6 +38,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjtj_bjbj");
             _cfg = this.viewData as CulturalRelicCfg;
             UpdateView();
+            _ui.m_Idle.Play(-1, 0, null);
         }
         protected override void AddEventListener()
         {

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs

@@ -14,6 +14,7 @@ namespace GFGGame
     {
         private UI_DressUpGuideUI _ui;
         private List<int> _itemIdList;
+        private bool _startInAnim;
 
         // 上次点击单选按钮的index
         private struct LastClickIndex
@@ -44,6 +45,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
 
             _itemIdList = new List<int>();
+            _startInAnim = true;
 
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
@@ -79,6 +81,12 @@ namespace GFGGame
 
             UpdateItemIdListByType1(0);
             UpdateItemList();
+
+            if (_startInAnim)
+            {
+                _startInAnim = false;
+                _ui.m_In.Play();
+            }
         }
 
         protected override void OnHide()
@@ -106,6 +114,7 @@ namespace GFGGame
 
             UpdateItemIdListByType1(index);
             UpdateItemList();
+            _ui.m_Refresh.Play();
         }
 
         private void RenderListDressUpItem(int index, GObject item)
@@ -149,6 +158,7 @@ namespace GFGGame
 
             UpdateItemIdListByType2(index);
             UpdateItemList();
+            _ui.m_Refresh.Play();
         }
 
         private void OnClickBtnAllAccessories()
@@ -258,6 +268,8 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = 1;
             _ui.m_listType2.selectedIndex = 0;
             _ui.m_listType2.scrollPane.SetPercX(0, false);
+            _lastClickIndex.typeIndex = 2;
+            _lastClickIndex.index = 0;
         }
 
         private void ShowListType1()
@@ -279,6 +291,7 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
+            _startInAnim = true;
             ViewManager.GoBackFrom(typeof(DressUpGuideView).FullName);
         }
 

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

@@ -15,6 +15,7 @@ namespace GFGGame
         private int[] _listBannerDatas = new int[3] { ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING };
         private int[] _listGuideDatas = new int[5] { ConstFieldGuideId.SUIT_GUIDE, ConstFieldGuideId.CHAPTER_ITEM, ConstFieldGuideId.DRESS_UP_GUIDE, ConstFieldGuideId.CARD_GUIDE, ConstFieldGuideId.TRAVEL_GUIDE };
         GetRedCall[] actions = new GetRedCall[] { RedDotDataManager.Instance.GetFieldGuideRed, null, null, null, RedDotDataManager.Instance.GetTravelGuideRed };
+        private bool _startInAnim;
 
         public override void Dispose()
         {
@@ -34,6 +35,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
+            _startInAnim = true;
             _ui.m_listGuide.itemRenderer = ListGuideItemRenderer;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
@@ -52,7 +54,11 @@ namespace GFGGame
             base.OnShown();
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
             _ui.m_listGuide.numItems = _listGuideDatas.Length;
-            _ui.m_openViewAction.Play();
+            if (_startInAnim)
+            {
+                _ui.m_listGuide.scrollPane.ScrollTop();
+                _ui.m_In.Play();
+            }
             Timers.inst.StartCoroutine(UpdatePrgress());
         }
 
@@ -69,21 +75,13 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             // this.Hide();
-            _ui.m_listGuide.scrollPane.ScrollTop();
+            _startInAnim = true;
             ViewManager.GoBackFrom(ViewName.FIELD_GUIDE_VIEW);
         }
         private void UpdateList()
         {
             _ui.m_listGuide.numItems = _listGuideDatas.Length;
         }
-        private void ListBannerItemRenderer(int index, GObject item)
-        {
-            UI_ButtonBannerPage listItem = UI_ButtonBannerPage.Proxy(item);
-            int id = _listBannerDatas[index];
-            listItem.target.data = id;
-            UI_ButtonBannerPage.ProxyEnd();
-        }
-
 
         private void ListGuideItemRenderer(int index, GObject item)
         {
@@ -93,7 +91,10 @@ namespace GFGGame
             listItem.target.data = id;
             bool red = actions[index] == null ? false : actions[index]();
             RedDotController.Instance.SetComRedDot(listItem.target, red, "", -46, 51);
-            listItem.m_Init.Play();
+            if (_startInAnim)
+            {
+                listItem.m_Init.Play();
+            }
 
             UI_CompGuideItem.ProxyEnd();
         }
@@ -152,6 +153,8 @@ namespace GFGGame
         private IEnumerator UpdatePrgress()
         {
             int num = _ui.m_listGuide.numChildren;
+            bool playAnim = _startInAnim;
+            _startInAnim = false;
             for (int i = 0; i < num; i++)
             {
                 UI_CompGuideItem listItem = UI_CompGuideItem.Proxy(_ui.m_listGuide.GetChildAt(i));
@@ -161,9 +164,20 @@ namespace GFGGame
                 GetGuideProgress(id, out haveCount, out totalCount);
                 decimal value = ProgressCalculate(haveCount, totalCount);
                 listItem.m_txtProgress.text = value.ToString();
-                listItem.m_In.Play();
+                if (playAnim)
+                {
+                    listItem.m_In.Play();
+                    // µ¹ÊýµÚ¶þ¸ö
+                    if (i == num - 2)
+                    {
+                        yield return new WaitForSeconds(0.02f);
+                    }
+                    else if (i < num - 2)
+                    {
+                        yield return new WaitForSeconds(0.05f);
+                    }
+                }
                 UI_CompGuideItem.ProxyEnd();
-                yield return new WaitForSeconds(0.02f);
             }
 
         }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideDetailView.cs

@@ -13,6 +13,7 @@ namespace GFGGame
         private UI_SuitGuideDetailUI _ui;
         private List<int> _suitIds;
         private int _suitTypeId;
+        private bool _startInAnim;
 
         public override void Dispose()
         {
@@ -36,6 +37,7 @@ namespace GFGGame
             _ui.m_listSuit.itemRenderer = RenderListSuitItem;
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
+            _startInAnim = true;
         }
         protected override void AddEventListener()
         {
@@ -52,6 +54,11 @@ namespace GFGGame
             base.OnShown();
             _suitTypeId = (int)viewData;
             UpdateListSuit();
+            if (_startInAnim)
+            {
+                _startInAnim = false;
+                _ui.m_In.Play();
+            }
         }
 
         protected override void OnHide()
@@ -90,6 +97,7 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
+            _startInAnim = true;
             ViewManager.GoBackFrom(typeof(SuitGuideDetailView).FullName);
         }
 

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

@@ -501,10 +501,11 @@ namespace GFGGame
                 if (!lastTextFieldType.Equals("name"))
                 {
                     lastTextFieldType = "name";
-                    if(IsTeaParty)
-                        _ui.m_t1.Play();
-                    else
-                        _ui.m_t0.Play();
+                    //if(IsTeaParty)
+                    //    _ui.m_t1.Play();
+                    //else
+                    //    _ui.m_t0.Play();
+                    _ui.m_t0.Play();
                 }
             }
             else