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

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

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapterScroll
     {
         public GComponent target;
+        public GGraph m_nextEffect;
         public GLoader m_imgBegin;
         public UI_CompStoryLevelItem m_g20;
         public UI_CompStoryLevelItem m_g19;
@@ -75,6 +76,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_nextEffect = (GGraph)comp.GetChild("nextEffect");
             m_imgBegin = (GLoader)comp.GetChild("imgBegin");
             m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
             m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
@@ -99,6 +101,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_nextEffect = null;
             m_imgBegin = null;
             m_g20.Dispose();
             m_g20 = null;

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

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GGraph m_bgEffect;
         public UI_CompChapter m_chapter;
         public GComponent m_valueBar;
         public GButton m_btnBack;
@@ -72,6 +73,7 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_chapter = (UI_CompChapter)UI_CompChapter.Create(comp.GetChild("chapter"));
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -92,6 +94,7 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_bgEffect = null;
             m_chapter.Dispose();
             m_chapter = null;
             m_valueBar = null;

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -111,7 +111,7 @@ namespace GFGGame
             int count = 0;//套装当前拥有的部件数量
             int totalCount = 1;
             // int suitId = 0;
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("bg_zhuxian");
+            //_ui.m_bg.url = ResPathUtil.GetBgImgPath("bg_zhuxian");
             DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitId, out count, out totalCount);
             // totalCount = SuitCfgManager.Instance.GetTotalCountOfOneSuit(suitId);
             if (suitId > 0)
@@ -120,12 +120,12 @@ namespace GFGGame
                 _ui.m_txtName.text = "套装·" + suitCfg.name;
                 int targetY = (int)(_ui.m_item.y + _ui.m_item.height + 50);
             }
-            //_ui.m_probar.max = totalCount;
-            //_ui.m_probar.value = count;
-            _ui.m_probar.visible = false;
-            AlertUI.Show(string.Format("套装进度:{0}/{1}", count, totalCount))
-            .SetLeftButton(false)
-            .SetRightButton(true, "确定");
+            _ui.m_probar.max = totalCount;
+            _ui.m_probar.value = count;
+            //_ui.m_probar.visible = false;
+            //AlertUI.Show(string.Format("套装进度:{0}/{1}", count, totalCount))
+            //.SetLeftButton(false)
+            //.SetRightButton(true, "确定");
             // UpdateItem(itemId);
 
             _dressUpObjUI.ResetSceneObj(70, false, true, null,  false);

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

@@ -18,6 +18,8 @@ namespace GFGGame
         private GObject _endLevelItem;
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
+        private EffectUI _effectUI3;
+        private EffectUI _effectUI4;
         private GComponent _comEff;
         private GComponent _effFirst;
 
@@ -36,6 +38,10 @@ namespace GFGGame
             _effectUI1 = null;
             EffectUIPool.Recycle(_effectUI2);
             _effectUI2 = null;
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
+            EffectUIPool.Recycle(_effectUI4);
+            _effectUI4 = null;
             if (_comEff != null)
             {
                 _comEff.RemoveFromParent();
@@ -97,6 +103,8 @@ namespace GFGGame
 
             _effFirst = new GComponent();
             _effFirst = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComEff").asCom;
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_zj", "ZX_BG_TX");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_chapter.m_compChapterScroll.m_nextEffect, "ui_zj", "ZX_Next_Boat");
 
         }
         protected override void AddEventListener()
@@ -132,6 +140,7 @@ namespace GFGGame
             indexY = 111.0f * Mathf.Max(0, (float)StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type, chapterCfg.subType, chapterCfg.id).Count - 5);
             gamey = GameObject.Find("Stage/GRoot/Window - StoryChapterUI/ContentPane/CompChapter/Container/Container");
             _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = false;
+            _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = false;
 
             Timers.inst.StartCoroutine(InitChapter());
 
@@ -237,6 +246,7 @@ namespace GFGGame
             if (lastLevelCfg != null && MainStoryDataManager.CheckLevelUnlock(lastLevelCfg.id) && LastChapterCfg != null)
             {
                 _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = true;
+                _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = true;
             }
             //_comEff.visible = false;
             //_effFirst.visible = false;

GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveView.cs

@@ -100,6 +100,8 @@ namespace GFGGame
             listItem.target.data = index;
 
             var taskTypeProList = TaskDataManager.Instance.GetAchievementTaskTypeProList();
+            if (taskTypeProList == null)
+                return;
             foreach (var info in taskTypeProList) {
                 if (info.AchievementType == index+1) {
                     listItem.m_achieveBar.max = info.AllTaskNum;