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

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

@@ -115,7 +115,7 @@ namespace GFGGame
                     else//道具
                     {
                         ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.CostIdReal);
-                        item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(costItemCfg.res);
+                        item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetIconPath(costItemCfg);
                         item.m_btnBuy.m_loaIcon.visible = true;
                         item.m_btnBuy.m_txtIcon.visible = false;
                     }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_StoryItem.cs

@@ -9,6 +9,7 @@ namespace UI.OpenServerActivity
         public GComponent target;
         public Controller m_storyImageType;
         public Controller m_posType;
+        public Controller m_openCloseType;
         public GLoader m_loaItemBg;
         public UI_item m_rewardItem;
         public GTextField m_txtTitle;
@@ -65,6 +66,7 @@ namespace UI.OpenServerActivity
         {
             m_storyImageType = comp.GetController("storyImageType");
             m_posType = comp.GetController("posType");
+            m_openCloseType = comp.GetController("openCloseType");
             m_loaItemBg = (GLoader)comp.GetChild("loaItemBg");
             m_rewardItem = (UI_item)UI_item.Create(comp.GetChild("rewardItem"));
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
@@ -77,6 +79,7 @@ namespace UI.OpenServerActivity
         {
             m_storyImageType = null;
             m_posType = null;
+            m_openCloseType = null;
             m_loaItemBg = null;
             m_rewardItem.Dispose();
             m_rewardItem = null;

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

@@ -65,8 +65,8 @@ namespace GFGGame
                     await ActivityTeaSProxy.ReqGetNPCVisitInfo();
                     await MiniGameProxy.ReqGetChallengeReward();
                     ActivitySProxy.ReqGetActivitySignInfos().Coroutine();
-                    NewYearRedEnvelopeSProxy.ReqGetRedPacketInfo().Coroutine();
-                    ActivityGetYuanXiaoProxy.ReqGetActivityGameInfos().Coroutine();
+                    await NewYearRedEnvelopeSProxy.ReqGetRedPacketInfo();
+                    await ActivityGetYuanXiaoProxy.ReqGetActivityGameInfos();
                     ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
                     ActivityDataManager.Instance.todayMonthlyCardTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity);
                     EventAgent.DispatchEvent(ConstMessage.RESET_DAILY_DATA);

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoEntryView.cs

@@ -126,7 +126,7 @@ namespace GFGGame
         {
             if (_ui.m_list.selectedIndex > _curLevel)
             {
-                PromptController.Instance.ShowFloatTextPrompt("关卡未解锁");
+                PromptController.Instance.ShowFloatTextPrompt("请先通关前置关卡");
                 return;
             }
             if (_ui.m_list.selectedIndex < _curLevel)
@@ -135,6 +135,12 @@ namespace GFGGame
                 return;
             }
 
+            if (ActivityGetYuanXiaoDataManager.Instance.HaveNewLevelCanPlay() == false)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                return;
+            }
+
             PickUpGame cfg = PickUpGameArray.Instance.dataArray[_ui.m_list.selectedIndex];
             ViewManager.Show<ActivityGetYuanXiaoTargetView>(cfg);
         }

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoView.cs

@@ -441,7 +441,7 @@ namespace GFGGame
             PauseGame();
 
             AlertMiniGame alertInfo = new AlertMiniGame();
-            alertInfo.desc = "确认是否退出游戏？退出游戏直接按失败结算";
+            alertInfo.desc = "退出游戏不保存进度，不扣除任何次数和道具，是否退出？";
             alertInfo.btnConfirmClickAction = () =>
             {
                 Hide();

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ResultTipsView.cs

@@ -230,7 +230,12 @@ namespace GFGGame
         private async void ReqResultReward()
         {
             var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameType, timeResult, gameResult, activityGameDate[0].id,false);
-            if (!result) return;
+            if (!result)
+            {
+                this.Hide();
+                ViewManager.Hide(viewJumpView[gameType]);
+                return;
+            }
             _ui.m_rewardList.numItems = MiniGameDateManager.Instance.itemList.Count;
         }
     }

GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameVIew.cs

@@ -122,7 +122,6 @@ namespace GFGGame
             .SetRightButton(true, "确定",async (object data) =>
             {
                 var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameDate.type, time, false, activityGameDate[0].id,true);
-                if (!result) return;
                 this.Hide();
             });
         }

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerStoryView.cs

@@ -126,10 +126,16 @@ namespace GFGGame
             }
             RedDotController.Instance.SetComRedDot(item.target, redVisible, "", posRedX, posRedY);
 
-            if (activityStoryCfg.needItemsArr.Length > 0) { 
-                item.m_txtNotOpenTitle.text = string.Format("收集{0}/{1}个", ItemDataManager.ItemCollect[activityStoryCfg.needItemsArr[0][0]], activityStoryCfg.needItemsArr[0][1]);
-                ItemCfg itemNeedCfg = ItemCfgArray.Instance.GetCfg(activityStoryCfg.needItemsArr[0][0]);
-                item.m_loaNeedIcon.url = ResPathUtil.GetIconPath(itemNeedCfg);
+            if (activityStoryCfg.needItemsArr.Length > 0) {
+                if (ItemDataManager.ItemCollect[activityStoryCfg.needItemsArr[0][0]] < activityStoryCfg.needItemsArr[0][1])
+                {
+                    item.m_openCloseType.selectedIndex = 0;
+                    item.m_txtNotOpenTitle.text = string.Format("收集{0}/{1}个", ItemDataManager.ItemCollect[activityStoryCfg.needItemsArr[0][0]], activityStoryCfg.needItemsArr[0][1]);
+                    ItemCfg itemNeedCfg = ItemCfgArray.Instance.GetCfg(activityStoryCfg.needItemsArr[0][0]);
+                    item.m_loaNeedIcon.url = ResPathUtil.GetIconPath(itemNeedCfg);
+                }
+                else
+                    item.m_openCloseType.selectedIndex = 1;
             }
 
             if (item.m_loaItemBg.data == null)