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

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

@@ -224,7 +224,7 @@ namespace GFGGame
             else
             {
                 startTime = monday;
-                endTime = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime);
+                endTime = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1, GlobalCfgArray.globalCfg.galleryClearingEndTime);
             }
             string strStartTime = TimeUtil.FormattingTime3(startTime);
             string strEndTime = TimeUtil.FormattingTime3(endTime); ;

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -582,7 +582,7 @@ namespace GFGGame
                         _ui.m_txtCount.text = string.Format("{0}/{1}", PoemGalleryDataManager.Instance.MyWorksCountOfTheme, GlobalCfgArray.globalCfg.maxGalleryWorksCount);
                         ViewManager.Hide<ModalStatusView>();
                         object[] objs = ViewManager.GetGoBackDatas(typeof(DressUpView).FullName)[1] as object[];
-                        ViewManager.Show<PoemGalleryView>(objs, null, true, true);
+                        ViewManager.Show<PoemGalleryView>(objs, null, true);
                     }
                 });
             }

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

@@ -66,11 +66,11 @@ namespace GFGGame
         }
         private void OnComPhotoClick()
         {
-            ViewManager.Show<PoemPhotoView>(null, new object[] { typeof(PoemView).FullName, this.viewData }, true);
+            ViewManager.Show<PoemPhotoView>(null, new object[] { typeof(PoemView).FullName, this.viewData });
         }
         private void OnComGalleryClick()
         {
-            ViewManager.Show<PoemGalleryView>(null, new object[] { typeof(PoemView).FullName, this.viewData }, true);
+            ViewManager.Show<PoemGalleryView>(null, new object[] { typeof(PoemView).FullName, this.viewData });
         }
 
         private void CheckGuide(object param)
@@ -93,13 +93,5 @@ namespace GFGGame
             GuideController.TryCompleteGuide(ConstGuideId.POEM, 3);
 
         }
-        protected override void TryCompleteGuide()
-        {
-            base.TryCompleteGuide();
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.POEM);
-            GuideController.TryCompleteGuideIndex(cfg.id, 3);
-            GuideController.TryCompleteGuide(ConstGuideId.POEM, 3);
-
-        }
     }
 }

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

@@ -91,7 +91,6 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_NAME, UpdateRoleName);
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-            EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateList);
 
         }
         private void UpdateRoleName()