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

FGUIProject/assets/poem/PoemUI.xml

@@ -4,9 +4,9 @@
     <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_v482" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_v482" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://iyz778gkysx9tju"/>
+      <Button icon="ui://iyz778gkysx9tjv"/>
     </component>
     <component id="n4_v482" name="comphoto" src="v4822" fileName="components/ComEctype.xml" xy="112,299" group="n6_ysx9"/>
     <component id="n5_r9ri" name="comGallery" src="v4822" fileName="components/ComEctype.xml" xy="586,299" group="n6_ysx9">

FGUIProject/assets/poem/componentsGallery/ComNormal.xml

@@ -39,7 +39,7 @@
       <gearDisplay controller="c1" pages="0,1"/>
       <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n38_v95q" name="comOpenLoad" src="r9ri12p" fileName="componentsGallery/ComPullHead.xml" xy="460,489" touchable="false"/>
+    <component id="n38_v95q" name="comOpenLoad" src="r9ri12p" fileName="componentsGallery/ComPullHead.xml" xy="460,489" visible="false" touchable="false"/>
     <list id="n23_r9ri" name="listRank" xy="43,483" size="997,1136" overflow="scroll" lineGap="20" defaultItem="ui://iyz778gkr9ri10y" align="center" autoClearItems="true">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="" sidePair="top-top,bottomext-bottom"/>

FGUIProject/assets/poem/package.xml

@@ -139,6 +139,7 @@
     <image id="dhoatjs" name="hl_sc_11.png" path="/imagesGallery/"/>
     <component id="dhoatjt" name="Button14.xml" path="/componentsGallery/"/>
     <image id="ysx9tju" name="hl_hlzibt.png" path="/imagesPhoto/"/>
+    <image id="ysx9tjv" name="xz_wss.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Constant/ConstCardSubType.cs

@@ -3,15 +3,15 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    public class ConstCardSubType 
+    public class ConstCardSubType
     {
 
-        public const int SubType_CHENGYUAN =1;
-        public const int SubType_LIBEIHE =2;
-        public const int SubType_SHANGZUOCHI =3;
+        public const int SubType_CHENGYUAN = 1;
+        public const int SubType_LIBEIHE = 2;
+        public const int SubType_SHANGZUOCHI = 3;
         public const int SubType_SHENJIAO = 4;
         public const int SubType_OTHER = 5;
-        public const string TITLE_CHENGYUAN = "程渊";
+        public const string TITLE_CHENGYUAN = "辰渊";
         public const string TITLE_LIBEIHE = "厉北河";
         public const string TITLE_SHANGZUOCHI = "商左池";
         public const string TITLE_SHENJIAO = "沈蛟";

GameClient/Assets/Game/HotUpdate/Data/Handler/RoleDataHandler.cs

@@ -20,7 +20,7 @@ namespace GFGGame
 
         private static void OnUpdate(object param)
         {
-            if(AntiAddictionController.CheckAntiAddictionWhenPlay())
+            if (AntiAddictionController.CheckAntiAddictionWhenPlay())
             {
                 StopUpdate();
                 return;

GameClient/Assets/Game/HotUpdate/ServerProxy/PoemGallerySProxy.cs

@@ -102,7 +102,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    PoemGalleryDataManager.Instance.MyRank = response.MyRank + 1;
+                    PoemGalleryDataManager.Instance.MyRank = response.MyRank;
                     List<long> list = PoemGalleryDataManager.Instance.RankDatas;
                     list.Clear();
                     for (int i = 0; i < response.RankList.Count; i++)

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

@@ -67,29 +67,28 @@ namespace GFGGame
             viewCom = _ui.target;
             isfullScreen = true;
 
-            _comFosterBottom = _ui.m_ComFosterBottom;
             //公共组件：返回，页签，属性列表
             _ui.m_ComFosterTop.m_btnback.onClick.Add(OnClickBtnBack);
-            _comFosterBottom.m_ctrlTab.onChanged.Add(OnChangeCtrlTab);
-            _comFosterBottom.m_listProperty.itemRenderer = RenderListPropertyItem;
+            _ui.m_ComFosterBottom.m_ctrlTab.onChanged.Add(OnChangeCtrlTab);
+            _ui.m_ComFosterBottom.m_listProperty.itemRenderer = RenderListPropertyItem;
 
             //卡面和故事界面
-            _comFosterBottom.m_btnStory.onClick.Add(OnClickBtnStroy);
+            _ui.m_ComFosterBottom.m_btnStory.onClick.Add(OnClickBtnStroy);
 
 
             //升级升星按钮
-            _comFosterBottom.m_btnUpLv.onClick.Add(OnClickBtnUpLv);
-            _comFosterBottom.m_btnAll.onClick.Add(OnClcikBtnAll);
-            _comFosterBottom.m_btnUpStar.onClick.Add(OnClickBtnUpStar);
+            _ui.m_ComFosterBottom.m_btnUpLv.onClick.Add(OnClickBtnUpLv);
+            _ui.m_ComFosterBottom.m_btnAll.onClick.Add(OnClcikBtnAll);
+            _ui.m_ComFosterBottom.m_btnUpStar.onClick.Add(OnClickBtnUpStar);
 
             //升级升星消耗材料列表
-            _comFosterBottom.m_listLvConsume.itemRenderer = RenderListLvConsumeItem;
-            _comFosterBottom.m_listStarConsume.itemRenderer = RenderListStarConsumeItem;
-            _comFosterBottom.m_listSkill.itemRenderer = RenderListSkilItem;
+            _ui.m_ComFosterBottom.m_listLvConsume.itemRenderer = RenderListLvConsumeItem;
+            _ui.m_ComFosterBottom.m_listStarConsume.itemRenderer = RenderListStarConsumeItem;
+            _ui.m_ComFosterBottom.m_listSkill.itemRenderer = RenderListSkilItem;
 
             //满星级后卡面列表
-            _comFosterBottom.m_listShowCard.itemRenderer = RenderListShowCardItem;
-            _comFosterBottom.m_listShowCard.onClickItem.Add(OnClickShowCardListItem);
+            _ui.m_ComFosterBottom.m_listShowCard.itemRenderer = RenderListShowCardItem;
+            _ui.m_ComFosterBottom.m_listShowCard.onClickItem.Add(OnClickShowCardListItem);
 
             // _ui.m_loaCard.onClick.Add(OnClickLoaCard);
             _ui.m_loaListener1.onClick.Add(OnClickLoaCard);
@@ -107,6 +106,7 @@ namespace GFGGame
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
             _cardData = CardDataManager.GetCardDataById((this.viewData as CardData).id);
+            _comFosterBottom = _ui.m_ComFosterBottom;
 
             playAni = false;
             comCardImgResInitSize = Vector2.zero;
@@ -767,20 +767,20 @@ namespace GFGGame
             }
             this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
         }
-        private void OnItemChangeListener()
-        {
-            if (!CardDataManager.isFullLv(_cardData.id, _cardData.lv, false))
-            {
-                CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfgBycardLvlAndcardRarity(_showLv, _cardData.itemCfg.rarity);
-                _comFosterBottom.m_listLvConsume.numItems = upgradeCardItemsArr.Length;
-            }
-            if (!CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
-            {
-                CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
-                _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
-
-            }
-        }
+        // private void OnItemChangeListener()
+        // {
+        //     if (!CardDataManager.isFullLv(_cardData.id, _cardData.lv, false))
+        //     {
+        //         CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfgBycardLvlAndcardRarity(_showLv, _cardData.itemCfg.rarity);
+        //         _comFosterBottom.m_listLvConsume.numItems = upgradeCardItemsArr.Length;
+        //     }
+        //     if (!CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
+        //     {
+        //         CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
+        //         _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
+
+        //     }
+        // }
         private void UpdateItemChange()
         {
             _ui.m_ComFosterBottom.m_listLvConsume.numItems = _ui.m_ComFosterBottom.m_listLvConsume.numItems;
@@ -806,8 +806,9 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateUpStarView);
-            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, OnItemChangeListener);
+            // EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, OnItemChangeListener);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateItemChange);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_UP_SKILL, UpdateUpSkillView);
         }
         private void CheckGuide(object param)
         {

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

@@ -149,10 +149,10 @@ namespace GFGGame
             itemUI.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
             itemUI.m_comIcon.m_imgNew.visible = ItemDataManager.GetItemNum(itemData.id) == count && isFirst ? true : false;
             string itemName = itemCfg.name;
-            if (itemData.num > 1)
-            {
-                itemName += "x" + itemData.num;
-            }
+            // if (itemData.num > 1)
+            // {
+            //     itemName += "x" + itemData.num;
+            // }
             itemUI.m_comIcon.m_txtName.text = itemName;
             itemUI.m_c1.selectedIndex = itemCfg.rarity;
             itemUI.m_comIcon.m_c1.selectedIndex = itemCfg.rarity;

GameClient/Assets/Game/HotUpdate/Views/Mail/MailView.cs

@@ -107,7 +107,8 @@ namespace GFGGame
 
             item.m_c1.selectedIndex = mailDataMgr.GetMailState(data);
             item.m_txtTitle.text = data.title;
-            string str = TimeUtil.FormattingTime(TimeHelper.ServerNow(), (data.timeSec + _retainDay * TimeUtil.SECOND_PER_DAY*1000));
+            long endTime = (data.timeSec + _retainDay * TimeUtil.SECOND_PER_DAY * 1000);
+            string str = TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
             item.m_txtTime.text = string.Format("Ê£Óàʱ¼ä£º{0}", str);
             if (item.m_btnLook.data == null)
             {

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -511,7 +511,6 @@ namespace GFGGame
         }
         private void OnClickHeadBar()
         {
-            GUIUtility.systemCopyBuffer = RoleDataManager.roleName;
             ViewManager.Show(ViewName.ROLE_INFO_VIEW);
         }
 

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -97,10 +97,8 @@ namespace GFGGame
 
             _ui.m_comNormal.m_comScroll.target.scrollPane.onPullDownRelease.Add(onPullDownRelease);
             _ui.m_comNormal.m_comScroll.target.scrollPane.onPullUpRelease.Add(OnPullUpToRefresh);
-            // _ui.m_comNormal.m_comScroll.target.scrollPane.onScrollEnd.Add(onScrollEnd);
             _ui.m_comFavorites.m_comScroll.target.scrollPane.onPullDownRelease.Add(onPullDownRelease);
             _ui.m_comFavorites.m_comScroll.target.scrollPane.onPullUpRelease.Add(OnPullUpToRefresh);
-            // _ui.m_comFavorites.m_comScroll.target.scrollPane.onScrollEnd.Add(onScrollEnd);
 
             _ui.m_comNormal.m_comScroll.m_listRecommend.itemRenderer = RenderListItem;
             _ui.m_comNormal.m_comScroll.m_listRecommend1.itemRenderer = RenderListItem1;
@@ -116,9 +114,8 @@ namespace GFGGame
             _ui.m_comNormal.m_c1.onChanged.Add(OnNormalTabChange);
             _ui.m_comFavorites.m_c1.onChanged.Add(OnFavoritesTabChange);
 
-
-
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
@@ -126,6 +123,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.GALLERY_DATA_CHANGE, UpdateGalleryList);
             // EventAgent.AddEventListener(ConstMessage.GALLERY_RANK_DATA_CHANGE, UpdateGalleryRankList);
         }
+
         protected override async void OnShown()
         {
             base.OnShown();
@@ -136,6 +134,9 @@ namespace GFGGame
                 _tabIndex = (int)(this.viewData as object[])[0];
                 _subtabIndex = (int)(this.viewData as object[])[1];
                 _ui.m_comNormal.m_comBoBox.selectedIndex = (int)(this.viewData as object[])[2];
+
+                UpdateList();
+                UpdateGalleryList();
                 if (_tabIndex == TabType.RECOVER)
                 {
                     _ui.m_comNormal.m_c1.selectedIndex = _subtabIndex;
@@ -144,8 +145,6 @@ namespace GFGGame
                 {
                     _ui.m_comFavorites.m_c1.selectedIndex = _subtabIndex;
                 }
-
-                UpdateGalleryList();
             }
             else
             {
@@ -170,7 +169,8 @@ namespace GFGGame
 
                 // OnFavoritesTabChange();
                 // OnNormalTabChange();
-                _ui.m_comNormal.m_comOpenLoad.target.visible = true;
+                // _ui.m_comNormal.m_comOpenLoad.target.visible = true;
+                ViewManager.Show<ModalStatusView>();
                 UpdateList();
                 PullDown();
                 onPullDownRelease();
@@ -233,8 +233,11 @@ namespace GFGGame
         /// </summary>
         private void OnBtnRecoverClick()
         {
+            int lastTabIndex = _tabIndex;
 
-            if (_tabIndex == TabType.RECOVER)//当前在推荐页要刷新
+            _tabIndex = _ui.m_c1.selectedIndex;
+            _subtabIndex = _ui.m_comNormal.m_c1.selectedIndex;
+            if (lastTabIndex == TabType.RECOVER)//当前在推荐页要刷新
             {
                 if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.RECOMMEND)//重新拉取数据
                 {
@@ -252,10 +255,6 @@ namespace GFGGame
                 UpdateList();
                 UpdateGalleryList();
             }
-            _tabIndex = _ui.m_c1.selectedIndex;
-            _subtabIndex = _ui.m_comNormal.m_c1.selectedIndex;
-            _comScroll = _ui.m_comNormal.m_comScroll.target;
-
         }
 
         /// <summary>
@@ -276,7 +275,6 @@ namespace GFGGame
 
             ResetPullRelease();
             _tabIndex = _ui.m_c1.selectedIndex;
-            _comScroll = _ui.m_comFavorites.m_comScroll.target;
             _ui.m_comFavorites.m_c1.selectedIndex = FavoritesType.FAVORITE;
             _subtabIndex = _ui.m_comFavorites.m_c1.selectedIndex;
             OnFavoritesTabChange();
@@ -309,28 +307,52 @@ namespace GFGGame
         }
         private void UpdateList()
         {
-
-            if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.RECOMMEND)//首页
+            if (_tabIndex == TabType.RECOVER)
             {
-                _ui.m_comNormal.m_comScroll.target.scrollPane.header.visible = true;
-                if (_ui.m_comNormal.m_comBoBox.selectedIndex == 0)//推荐
+                if (_subtabIndex == RecommendType.RECOMMEND)//首页
                 {
-                    _sortType = (int)GallerySortType.Recommend;
-                    _galleryDatas = PoemGalleryDataManager.Instance.RecommendDatas;
+                    _ui.m_comNormal.m_comScroll.target.scrollPane.header.visible = true;
+                    if (_ui.m_comNormal.m_comBoBox.selectedIndex == 0)//推荐
+                    {
+                        _sortType = (int)GallerySortType.Recommend;
+                        _galleryDatas = PoemGalleryDataManager.Instance.RecommendDatas;
+                    }
+                    else//最新
+                    {
+                        _sortType = (int)GallerySortType.Newest;
+                        _galleryDatas = PoemGalleryDataManager.Instance.NewestDatas;
+                    }
+                }
+                else if (_subtabIndex == RecommendType.FRIEND)//好友
+                {
+                    _sortType = (int)GallerySortType.Friend;
+                    _galleryDatas = PoemGalleryDataManager.Instance.FrinedDatas;
                 }
-                else//最新
+                else if (_subtabIndex == RecommendType.RANK)
                 {
-                    _sortType = (int)GallerySortType.Newest;
-                    _galleryDatas = PoemGalleryDataManager.Instance.NewestDatas;
+                    _galleryDatas = PoemGalleryDataManager.Instance.FrinedDatas;
                 }
+                _list = _ui.m_comNormal.m_comScroll.m_listRecommend;
+                _list1 = _ui.m_comNormal.m_comScroll.m_listRecommend1;
+                _comScroll = _ui.m_comNormal.m_comScroll.target;
             }
-            else if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.FRIEND)//好友
+            else if (_tabIndex == TabType.FAVORITES)
             {
-                _sortType = (int)GallerySortType.Friend;
-                _galleryDatas = PoemGalleryDataManager.Instance.FrinedDatas;
+                if (_subtabIndex == FavoritesType.FAVORITE)//我的收藏
+                {
+                    _sortType = (int)GallerySortType.MyCollect;
+                    _galleryDatas = PoemGalleryDataManager.Instance.FavoriteDatas;
+                }
+                else if (_subtabIndex == FavoritesType.MY_SELF)//我的作品
+                {
+                    _sortType = (int)GallerySortType.MyWorks;
+                    _galleryDatas = PoemGalleryDataManager.Instance.MySelfDatas;
+                }
+                _list = _ui.m_comFavorites.m_comScroll.m_listRecommend;
+                _list1 = _ui.m_comFavorites.m_comScroll.m_listRecommend1;
+                _comScroll = _ui.m_comFavorites.m_comScroll.target;
             }
-            _list = _ui.m_comNormal.m_comScroll.m_listRecommend;
-            _list1 = _ui.m_comNormal.m_comScroll.m_listRecommend1;
+
         }
         /// <summary>
         /// 切换收藏页签
@@ -339,18 +361,7 @@ namespace GFGGame
         {
             _ui.m_comFavorites.m_comScroll.target.scrollPane.header.visible = false;
             _subtabIndex = _ui.m_comFavorites.m_c1.selectedIndex;
-            if (_ui.m_comFavorites.m_c1.selectedIndex == FavoritesType.FAVORITE)//我的收藏
-            {
-                _sortType = (int)GallerySortType.MyCollect;
-                _galleryDatas = PoemGalleryDataManager.Instance.FavoriteDatas;
-            }
-            else if (_ui.m_comFavorites.m_c1.selectedIndex == FavoritesType.MY_SELF)//我的作品
-            {
-                _sortType = (int)GallerySortType.MyWorks;
-                _galleryDatas = PoemGalleryDataManager.Instance.MySelfDatas;
-            }
-            _list = _ui.m_comFavorites.m_comScroll.m_listRecommend;
-            _list1 = _ui.m_comFavorites.m_comScroll.m_listRecommend1;
+            UpdateList();
             if (_list.numItems > 0) _list.ScrollToView(0);
             if (_list1.numItems > 0) _list.ScrollToView(0);
             ReqGalleryList(0);
@@ -642,6 +653,7 @@ namespace GFGGame
         }
         private void OnPullDownTimeComplete()
         {
+            if (_comScroll == null) return;
             GComponent header = _comScroll.scrollPane.header;
             Transition transition = header.GetTransition("t0");
             transition.Stop();
@@ -681,6 +693,7 @@ namespace GFGGame
 
         private void OnPullUpTimeComplete()
         {
+            if (_comScroll == null) return;
             GComponent footer = _comScroll.scrollPane.footer;
             Transition transition = footer.GetTransition("t0");
             transition.Stop();
@@ -696,7 +709,8 @@ namespace GFGGame
             OnPullDownTimeComplete();
             // Timers.inst.Remove(OnPullUpTimeComplete);
             OnPullUpTimeComplete();
-            _ui.m_comNormal.m_comOpenLoad.target.visible = false;
+            // _ui.m_comNormal.m_comOpenLoad.target.visible = false;
+            ViewManager.Hide<ModalStatusView>();
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -2,6 +2,7 @@ using ET;
 using FairyGUI;
 using UI.CommonGame;
 using UI.RoleInfo;
+using UnityEngine;
 
 namespace GFGGame
 {
@@ -162,6 +163,7 @@ namespace GFGGame
         }
         private void OnComHeadClick()
         {
+            GUIUtility.systemCopyBuffer = RoleDataManager.roleName;
             ViewManager.Show<ChangeHeadView>(null, new object[] { typeof(RoleInfoView).FullName, this.viewData });
         }