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

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

@@ -797,7 +797,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetDailyWelfareRed()
         {
-            return GetLimiteChargeRewardRed() || GetSevenDayLoginRed() || DailySignRed() || DailySupplyRed();
+            return GetLimiteChargeRewardRed() || GetSevenDayLoginRed() || DailySignRed() || DailySupplyRed() || GetLimiteChargeRewardRed(501);
         }
         /// <summary>
         ///福利大厅-限时累充可领奖励红点

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -8,7 +8,7 @@ using System.Collections;
 
 namespace GFGGame
 {
-    public class ClothingSyntheticView : BaseWindow
+    public class ClothingSyntheticView : BaseView
     {
         private const int HEAD_Y = 942;
         private const int FA_XING_Y = 609;
@@ -82,7 +82,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             //isReturnView = true;
-            this.clickBlankToClose = false;
+            //this.clickBlankToClose = false;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
 

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

@@ -24,7 +24,6 @@ namespace GFGGame
             _ui = UI_PhotographSaveUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-            isReturnView = true;
 
             _ui.m_btnClose.onClick.Add(this.Hide);
             _ui.m_btnSave.onClick.Add(this.OnClickBtnSave);

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

@@ -236,8 +236,11 @@ namespace GFGGame
                 PhotographSceneManager.Instance.AddSceneItem(parentGameObj3, itemCfg, 3, setLayer);
                 if (setLayer)
                 {
-                    parentGameObj3.transform.localPosition = -parentGameObj3.transform.GetChild(0).localPosition;
-                    pos = parentGameObj3.transform.localPosition;
+                    if(parentGameObj3.transform.childCount > 0)
+                    {
+                        parentGameObj3.transform.localPosition = -parentGameObj3.transform.GetChild(0).localPosition;
+                        pos = parentGameObj3.transform.localPosition;
+                    }
                 }
             }
             if (!string.IsNullOrEmpty(itemCfg.resLayer2))
@@ -246,8 +249,11 @@ namespace GFGGame
                 PhotographSceneManager.Instance.AddSceneItem(parentGameObj2, itemCfg, 2, setLayer);
                 if (setLayer)
                 {
-                    parentGameObj2.transform.localPosition = pos == Vector3.zero ? -parentGameObj2.transform.GetChild(0).localPosition : pos;
-                    pos = parentGameObj2.transform.localPosition;
+                    if (parentGameObj2.transform.childCount > 0)
+                    {
+                        parentGameObj2.transform.localPosition = pos == Vector3.zero ? -parentGameObj2.transform.GetChild(0).localPosition : pos;
+                        pos = parentGameObj2.transform.localPosition;
+                    }
                 }
             }
             if (!string.IsNullOrEmpty(itemCfg.resLayer1))
@@ -258,8 +264,12 @@ namespace GFGGame
 
                 if (setLayer)
                 {
-                    parentGameObj1.transform.localPosition = pos == Vector3.zero ? -parentGameObj1.transform.GetChild(0).localPosition : pos;
-                    pos = parentGameObj1.transform.localPosition;
+                    if (parentGameObj1.transform.childCount > 0)
+                    {
+                        parentGameObj1.transform.localPosition = pos == Vector3.zero ? -parentGameObj1.transform.GetChild(0).localPosition : pos;
+                        pos = parentGameObj1.transform.localPosition;
+                    }
+
                 }
             }
         }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnswerView.cs

@@ -86,14 +86,14 @@ namespace GFGGame
 
         private void OnBtnTeaPartyClick()
         {
-            Hide();
             var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
-            if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.NotOpen && roleTeapartyInfo.IsNoActDayEnterLeague)
+            if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo && roleTeapartyInfo.IsNoActDayEnterLeague)
             {
                 PromptController.Instance.ShowFloatTextPrompt("该活动暂未开启");
                 return;
             }
 
+            Hide();
             if (roleTeapartyInfo.IsQuitTeaParty && roleTeapartyInfo.LastOpenCfgId != 0 && roleTeapartyInfo.LastOpenCfgId == LeagueDataManager.Instance.TeaPartyId) {
                 PromptController.Instance.ShowFloatTextPrompt("该玩法不可以重复参加哦");
                 return;

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

@@ -24,6 +24,7 @@ namespace GFGGame
         private bool isActiveBoxOpen = false;
         private int _activeBoxId = 0;
         private int _curIndex = 0;
+        private int _activityId = 0;
 
         public override void Dispose()
         {
@@ -102,9 +103,7 @@ namespace GFGGame
             LuckyBoxDataManager.Instance.luckyBoxIds.Add(LuckyBoxDataManager.BOX_ID_2);
             LuckyBoxDataManager.Instance.luckyBoxIds.Add(LuckyBoxDataManager.BOX_ID_3);
             _activeBoxId = 0;
-            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
-            if (activityId > 0)
-                GetWishingPoolInfo(activityId);
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
 
             if (LuckyBoxDataManager.Instance.RotatingId > 0)
             {
@@ -123,6 +122,9 @@ namespace GFGGame
             if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0) 
                 boxId = LuckyBoxDataManager.BOX_ID_1;
 
+            if (_activityId > 0 && boxId == LuckyBoxDataManager.BOX_ID_2)
+                GetWishingPoolInfo(_activityId);
+
             LuckyBoxDataManager.Instance.currentBoxId = boxId;
 
             if (_activeBoxId > 0 || boxId == LuckyBoxDataManager.BOX_ID_2) Timers.inst.Add(1, 0, CheckTime);
@@ -194,6 +196,9 @@ namespace GFGGame
             int index = _curIndex - 1;
             if (index < 0) return;
             _ui.m_listBg.ScrollToView(index, true);
+
+            if (_activityId > 0 && _curIndex == LuckyBoxDataManager.BOX_ID_2)
+                GetWishingPoolInfo(_activityId);
         }
 
         private void OnBtnRightClick()
@@ -202,6 +207,9 @@ namespace GFGGame
             // if (index >= LuckyBoxDataManager.Instance.luckyBoxIds.Count) return;
             index = Mathf.Min(_ui.m_listBg.numItems - 1, index);
             _ui.m_listBg.ScrollToView(index, true);
+
+            if (_activityId > 0 && _curIndex == LuckyBoxDataManager.BOX_ID_2)
+                GetWishingPoolInfo(_activityId);
         }
 
         private void OnListBgScroll()

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

@@ -91,7 +91,7 @@ namespace GFGGame
 
         public static void OnCompleteChapterStoryDialog(bool isSkip, object param)
         {
-            if (!MainStoryDataManager.CheckCurrentLevelPass())
+            if (!MainStoryDataManager.CheckCurrentLevelPass() && isSkip)
             {
                 InstanceZonesSProxy.FinishStoryDialogLevel(InstanceZonesDataManager.currentLevelCfgId).Coroutine();
             }

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

@@ -178,7 +178,8 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            //Hide();
+            //this.Hide();
+            //ViewManager.GoBackFrom(typeof(StoryDialogView).FullName);
             //ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
             Over(false);
         }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -37,7 +37,7 @@ namespace GFGGame
             _ui = UI_StudioFilingUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            isReturnView = true;
+            isReturnView = false;
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
             _ui.m_Bg.url = ResPathUtil.GetBgImgPath("bg_fhl");