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

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -143,7 +143,7 @@ namespace GFGEditor
         public static string LeagueIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/LeagueIcon/";
         public static string LeagueIconMd5FileSaveName = "LeagueIconMd5";
 
-        public static string[] MiniGameSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/" }; } }
+        public static string[] MiniGameSrcPaths { get { return new string[] { ResRootPath + "MiniGame/" }; } }
         public static string MiniGameTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/";
         public static string MiniGameMd5FileSaveName = "MiniGameMd5";
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_TZFEGameCheckUI.cs

@@ -0,0 +1,128 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_TZFEGameCheckUI
+    {
+        public GComponent target;
+        public GLoader m_backBtn;
+        public GLoader m_bg;
+        public GTextField m_gameTitle1;
+        public GLoader m_game1;
+        public GLoader m_newGame1;
+        public GLoader m_needIcon1;
+        public GTextField m_needNum1;
+        public GTextField m_gameTitle2;
+        public GLoader m_game2;
+        public GLoader m_newGame2;
+        public GLoader m_gameLock2;
+        public GLoader m_needIcon2;
+        public GTextField m_needNum2;
+        public GTextField m_gameTitle3;
+        public GLoader m_game3;
+        public GLoader m_newGame3;
+        public GLoader m_gameLock3;
+        public GLoader m_needIcon3;
+        public GTextField m_needNum3;
+        public GLoader m_tipsOne;
+        public const string URL = "ui://wgkh30qjnjon2n";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "TZFEGameCheckUI";
+        private static UI_TZFEGameCheckUI _proxy;
+
+        public static UI_TZFEGameCheckUI Create(GObject gObject = null)
+        {
+            var ui = new UI_TZFEGameCheckUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_TZFEGameCheckUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TZFEGameCheckUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_gameTitle1 = (GTextField)comp.GetChild("gameTitle1");
+            m_game1 = (GLoader)comp.GetChild("game1");
+            m_newGame1 = (GLoader)comp.GetChild("newGame1");
+            m_needIcon1 = (GLoader)comp.GetChild("needIcon1");
+            m_needNum1 = (GTextField)comp.GetChild("needNum1");
+            m_gameTitle2 = (GTextField)comp.GetChild("gameTitle2");
+            m_game2 = (GLoader)comp.GetChild("game2");
+            m_newGame2 = (GLoader)comp.GetChild("newGame2");
+            m_gameLock2 = (GLoader)comp.GetChild("gameLock2");
+            m_needIcon2 = (GLoader)comp.GetChild("needIcon2");
+            m_needNum2 = (GTextField)comp.GetChild("needNum2");
+            m_gameTitle3 = (GTextField)comp.GetChild("gameTitle3");
+            m_game3 = (GLoader)comp.GetChild("game3");
+            m_newGame3 = (GLoader)comp.GetChild("newGame3");
+            m_gameLock3 = (GLoader)comp.GetChild("gameLock3");
+            m_needIcon3 = (GLoader)comp.GetChild("needIcon3");
+            m_needNum3 = (GTextField)comp.GetChild("needNum3");
+            m_tipsOne = (GLoader)comp.GetChild("tipsOne");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_backBtn = null;
+            m_bg = null;
+            m_gameTitle1 = null;
+            m_game1 = null;
+            m_newGame1 = null;
+            m_needIcon1 = null;
+            m_needNum1 = null;
+            m_gameTitle2 = null;
+            m_game2 = null;
+            m_newGame2 = null;
+            m_gameLock2 = null;
+            m_needIcon2 = null;
+            m_needNum2 = null;
+            m_gameTitle3 = null;
+            m_game3 = null;
+            m_newGame3 = null;
+            m_gameLock3 = null;
+            m_needIcon3 = null;
+            m_needNum3 = null;
+            m_tipsOne = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_TZFEGameCheckUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: de750e9c648de1f4384c5bd24fea85be
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -1325,7 +1325,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnAll, ConstGuideId.UP_CARD_LV, 4, "");
-            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpLv, ConstGuideId.UP_CARD_LV, 5, "");
+            //GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpLv, ConstGuideId.UP_CARD_LV, 5, "");
             GuideController.TryGuide(_ui.m_ComFosterTop.m_btnback, ConstGuideId.UP_CARD_LV, 7, "让我们继续新旅程吧~");
 
             GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnStar, ConstGuideId.UP_CARD_STAR, 4, "");

GameClient/Assets/Game/HotUpdate/Views/Card/CardUpLevelView.cs

@@ -70,6 +70,7 @@ namespace GFGGame
             _ui.m_slideUpLevel.value = 100;
             tidyData(_countCanUpMaxLevel);  //  _cardData.lv  
             ReferViewInfo();
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         private void tidyData(int setLevel,string tidyType = "")
@@ -165,6 +166,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(CheckGuide);
         }
 
         private void AddEffect()
@@ -258,5 +260,23 @@ namespace GFGGame
             ReferViewInfo();
             ReferSlide();
         }
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_btnUse, ConstGuideId.UP_CARD_LV, 5, "");
+        }
     }
 }

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

@@ -192,7 +192,7 @@ namespace GFGGame
 
             _luckyBoxCtrl.Add(boxId, new LuckyBoxController(comBox.m_comModel.target));
 
-            comBox.m_comLuckBoxBtn.m_holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            //comBox.m_comLuckBoxBtn.m_holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
             comBox.m_comLuckBoxBtn.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
             comBox.m_comLuckBoxBtn.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
 
@@ -208,9 +208,12 @@ namespace GFGGame
 
             if (comBox.m_comLuckBoxBtn.m_btnBuyTen.data == null)
             {
-                _effectUIDic.Add("Button_Text_DianCang" + boxId, EffectUIPool.CreateEffectUI(comBox.m_comLuckBoxBtn.m_Special_eff, "ui_LuckyBox", "Button_Text_DianCang"));
-                _effectUIDic.Add("Button_public" + boxId, EffectUIPool.CreateEffectUI(comBox.m_comLuckBoxBtn.m_btnBuyTen_eff, "ui_LuckyBox", "Button_public"));
-           
+                if (boxId != LuckyBoxDataManager.BOX_ID_3) { 
+                    if (!_effectUIDic.ContainsKey("Button_Text_DianCang" + boxId))
+                        _effectUIDic.Add("Button_Text_DianCang" + boxId, EffectUIPool.CreateEffectUI(comBox.m_comLuckBoxBtn.m_Special_eff, "ui_LuckyBox", "Button_Text_DianCang"));
+                    if(!_effectUIDic.ContainsKey("Button_public" + boxId))
+                        _effectUIDic.Add("Button_public" + boxId, EffectUIPool.CreateEffectUI(comBox.m_comLuckBoxBtn.m_btnBuyTen_eff, "ui_LuckyBox", "Button_public"));
+                }
                 comBox.m_comLuckBoxBtn.m_btnBuyTen.onClick.Add(OnClickBtnBuyTen);
             }
             comBox.m_comLuckBoxBtn.m_btnBuyTen.data = boxId;

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

@@ -342,7 +342,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0, true, _ui.target.height / 2);
-            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_1, 3, "", 0, true, _ui.target.height / 2);
+            //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_1, 3, "", 0, true, _ui.target.height / 2);
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_2, 3, "", 1, true, _ui.target.height / 2);
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_3, 2, "", 1, true, _ui.target.height / 2);
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_4, 3, "", 1, true, _ui.target.height / 2);

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

@@ -515,8 +515,8 @@ namespace GFGGame
             bool isGuide1 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.FREEDOM_DRESS, 1, "获得的服饰随时可以查看和试穿。");
             bool isGuide2 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER, 4, "来继续我们的旅程吧。");
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 4);
-            bool isGuide3 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_1, 4, "来继续我们的旅程吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 4);
+            bool isGuide3 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_1, 3, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 3);
 
             bool isGuide4 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.BUY_CLOTHING, 1, "衣服被弄脏了，到机场更衣室换身衣服吧。");
             bool isGuide5 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。");
@@ -549,8 +549,8 @@ namespace GFGGame
             GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 4);
             // GuideCfg cfg1 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_1);
-            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_1, 4);
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 4);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_1, 3);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 3);
             // GuideCfg cfg2 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_2);
             GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_2, 3);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 3);

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

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+using System.Text.RegularExpressions;
+
+namespace GFGGame
+{
+    public class TZFEGameCheckView : BaseWindow
+    {
+        private UI_TZFEGameCheckUI _ui;
+        //后续这里改成读表内容,1:CardGame,2:Merge2048Game,3:HuarongRoadGame
+        private List<string> viewJumpName = new List<string>() {"","FlipGameView", "TZFEGameView" };
+        private List<ActivityOpenCfg> activityGameDate;
+        private List<Merge2048Game> gameDate;
+        private int type;
+        private int subType;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_TZFEGameCheckUI.PACKAGE_NAME;
+            _ui = UI_TZFEGameCheckUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_game1.onClick.Add(OnClickBtnGameOne);
+            _ui.m_game2.onClick.Add(OnClickBtnGameTwo);
+            _ui.m_game3.onClick.Add(OnClickBtnGameThree);
+            _ui.m_backBtn.onClick.Add(OnClickBtnBack);
+            _ui.m_tipsOne.onClick.Add(RuleController.ShowRuleView);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            type = (int)(this.viewData as object[])[0];
+            subType = (int)(this.viewData as object[])[1];
+            activityGameDate = ActivityOpenCfgArray.Instance.GetCfgsBytype(ConstLimitTimeActivityType.ActLimitStlyc);
+            gameDate = Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType);
+            UpdateView();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void UpdateView()
+        {
+            _ui.m_needNum1.text = gameDate[0].comsumeStartArr[0][1].ToString();
+            _ui.m_needNum2.text = gameDate[1].comsumeStartArr[0][1].ToString();
+            _ui.m_needNum3.text = gameDate[2].comsumeStartArr[0][1].ToString();
+            _ui.m_needIcon1.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
+            _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
+            _ui.m_needIcon3.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
+            _ui.m_gameLock2.visible = false;
+            _ui.m_gameLock3.visible = false;
+            _ui.m_tipsOne.data = 300027;
+        }
+        private void OnClickBtnBack()
+        {
+            this.Hide();
+        }
+
+        private async void OnClickBtnGameOne()
+        {
+            var result = await MiniGameProxy.ReqMiniGameStart(Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[0].id, type, activityGameDate[0].id);
+            if (!result) return;
+            //当存在关卡时需要获取后台数据，哪一关了,这个可以在关卡界面写
+            ViewManager.Show($"GFGGame.{viewJumpName[type]}", new object[] { Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[0].id });
+        }
+        private async void OnClickBtnGameTwo()
+        {
+            var result = await MiniGameProxy.ReqMiniGameStart(Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[1].id, type, activityGameDate[0].id);
+            if (!result) return;
+            //当存在关卡时需要获取后台数据，哪一关了,这个可以在关卡界面写
+            ViewManager.Show($"GFGGame.{viewJumpName[type]}", new object[] { Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[1].id });
+        }
+
+        private async void OnClickBtnGameThree()
+        {
+            var result = await MiniGameProxy.ReqMiniGameStart(Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[2].id, type, activityGameDate[0].id);
+            if (!result) return;
+            //当存在关卡时需要获取后台数据，哪一关了,这个可以在关卡界面写
+            ViewManager.Show($"GFGGame.{viewJumpName[type]}", new object[] { Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(type, subType)[2].id });
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameCheckView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1a5a6826da1088c46bb3aa853687353c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -130,6 +130,12 @@ namespace GFGGame
                 UpdateView();
             }
 
+            // 如果大于1分钟，则显示上少1s
+            if(endTime - curTime > 60000)
+            {
+                endTime -= 1000;
+            }
+
             _ui.m_txtTime.text = string.Format("大约{0}后归来", TimeUtil.FormattingTime(curTime, endTime));
         }