Merge branch 'ios_test' of http://192.168.2.10:3000/GFG/Client into ios_test

GameClient/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs

@@ -207,6 +207,20 @@ namespace GFGGame
                 }
             }
         }
+        public void RemoveGalleryData()
+        {
+            if (_dicGalleryData.Count > 30)
+            {
+                for (int i = 0; i < GalleryIDList.Count; i++)
+                {
+                    long id = GalleryIDList[i];
+                    if (_dicGalleryData.ContainsKey(id))
+                    {
+                        _dicGalleryData.Remove(id);
+                    }
+                }           
+             }
+        }
         public void UpdateRoleInfo(long workId, string name, int rank = 0)
         {
             if (_dicGalleryData.ContainsKey(workId))

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs

@@ -202,12 +202,12 @@ namespace GFGGame
             currentDifficulty = chapterCfg.type;
             if (currentDifficulty == 1)
             {
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("wxsg_bj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("yytz_gq_bj");
             }
             else
             {
                 currentDifficulty = 0;
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("wxsg_bj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("yytz_gq_bj");
             }
             //_comEff.visible = false;
             //_effFirst.visible = false;

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBView.cs

@@ -41,7 +41,7 @@ namespace GFGGame
             _ui.m_btnChange.onClick.Add(this.Hide);
             _ui.m_shopBtn.onClick.Add(OnClickShopBtn);
 
-            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "WGSX_All_Tx/WGSX_All_Tx");
+            //_effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "WGSX_All_Tx/WGSX_All_Tx");
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnEffect, "ui_Activity", "WGSX_Button/WGSX_Button");
         }                
         protected override void OnShown()

GameClient/Assets/Game/HotUpdate/Views/FieldWork/FieldWorkLevelView.cs

@@ -118,6 +118,11 @@ namespace GFGGame
                     isPassCount++;
                 }
             }
+            
+            if (isPassCount >= CimbingTowerLevelCfgArray.Instance.dataArray.Length)
+            {
+                isPassCount = CimbingTowerLevelCfgArray.Instance.dataArray.Length - 1;
+            }
             string ObjGuidename = "g" + isPassCount.ToString();
             objGuide = _ui.m_chapter.m_compChapterScroll.target.GetChild(ObjGuidename).asCom;
             float levelCount = CimbingTowerLevelCfgArray.Instance.dataArray.Length - isPassCount;

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

@@ -776,6 +776,7 @@ namespace GFGGame
 
             isPullDown = true;
             _scrollList.scrollPane.LockHeader(_scrollList.scrollPane.header.sourceHeight);
+            PoemGalleryDataManager.Instance.RemoveGalleryData();
             PoemGalleryDataManager.Instance.GalleryIDList.Clear();
             bool result = await PoemGallerySProxy.ReqGalleryList(_sortType, 0, PoemGalleryDataManager.pageCount);
             // OnPullDownTimeComplete();