Merge remote-tracking branch 'remotes/origin/master' into dev

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -18,7 +18,7 @@ namespace GFGEditor
         public static void startScan()
         {
             ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
-            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach  };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach,GetHeavenApproach ,GetOpenServerFightApproach };
             Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
             Dictionary<ItemCfg, List<int>> syntheticSuitDic = new Dictionary<ItemCfg, List<int>>();
             Dictionary<SuitCfg, Dictionary<string, string>> suitTagsDic = new Dictionary<SuitCfg, Dictionary<string, string>>();
@@ -378,7 +378,34 @@ namespace GFGEditor
             }
             return null;
         }
-            
+
+        /// <summary>
+        /// 尝试获取天堂产出途径
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string GetHeavenApproach(int itemId)
+        {
+            if (itemId == ConstItemID.GET_TICKETS)
+            {
+                return "HEAVEN_SMALL_GAMW";
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 尝试获取明堂产出途径
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string GetOpenServerFightApproach(int itemId)
+        {
+            if (itemId == ConstItemID.PAIR_CARD)
+            {
+                return "OPEN_SERVER_FIGHT";
+            }
+            return null;
+        }
 
         /// <summary>
         /// 尝试获取剧情关卡产出途径

GameClient/Assets/Game/HotUpdate/Constant/ConstFunctionId.cs

@@ -105,5 +105,13 @@ namespace GFGGame
         ///技能书
         /// </summary>
         public const string SKILLBOOK = "SKILLBOOK";
+        /// <summary>
+        ///天堂
+        /// </summary>
+        public const string  HEAVEN_SMALL_GAMW = "HEAVEN_SMALL_GAMW";
+        /// <summary>
+        ///新年筹备
+        /// </summary>
+        public const string OPEN_SERVER_FIGHT = "OPEN_SERVER_FIGHT";
     }
 }

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -2,6 +2,9 @@ using UnityEngine;
 using ET;
 using static GFGGame.LauncherConfig;
 using System;
+using YooAsset;
+using System.Collections;
+using FairyGUI;
 
 namespace GFGGame
 {
@@ -375,5 +378,37 @@ namespace GFGGame
                         }
                     });
         }
+
+        public static void CheckUpdateVersion()
+        {
+            if (ET.TimeHelper.ClientNowSeconds() - GameGlobal.pauseTime > 180 || LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
+            {
+                Timers.inst.StartCoroutine(CheckVersion(VersionController.DefaultPackage));
+            }
+        }
+
+        private static IEnumerator CheckVersion(string packageName)
+        {
+            var package = YooAssets.GetPackage(packageName);
+            string oldVersion = package.GetPackageVersion();
+            var operation = package.UpdatePackageVersionAsync();
+            yield return operation;
+
+            if (operation.Status == EOperationStatus.Succeed)
+            {
+                VersionController.Instance.PackageVersion = operation.PackageVersion;
+                LogUtil.LogDev($"版本对比: {oldVersion} {operation.PackageVersion}");
+                if (!operation.PackageVersion.Equals(oldVersion))
+                {
+                    AlertSystem.Show("游戏已有更新，您可以立即重启游戏获取最佳游戏体验，也可以稍后重启更新。")
+                        .SetLeftButton(true, "稍后更新")
+                        .SetRightButton(true, "重启游戏", (obj) =>
+                        {
+                            Application.Quit();
+                        });
+                }
+            }
+        }
+
     }
 }

GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -261,7 +261,7 @@ namespace GFGGame
             LoadingView.Instance.SetDesc("正在加载数据...");
             LogServerHelper.SendNodeLog((int)LogNode.StartEnterGame);
             await GameGlobal.zoneScene.GetComponent<ObjectWait>().Wait<ET.WaitType.Wait_SceneChangeFinish>();
-            AlertSystem.hide();
+            AlertSystem.Hide();
             await GameController.PreEnterGameAsync();
             LogServerHelper.SendNodeLog((int)LogNode.OnEnterGame);
         }
@@ -299,8 +299,9 @@ namespace GFGGame
             await GameGlobal.zoneScene.GetComponent<ObjectWait>().Wait<ET.WaitType.Wait_SceneChangeFinish>();
             EventAgent.DispatchEvent(ConstMessage.NUMERIC_CHANGE, NumericType.All);
             GameController.OnReconnected();
-            AlertSystem.hide();
+            AlertSystem.Hide();
             ViewManager.Hide<ModalStatusView>();
+            GameController.CheckUpdateVersion();
         }
     }
 }

GameClient/Assets/Game/HotUpdate/DressUp/DressUpBodyOffsetInfo.cs → GameClient/Assets/Game/HotUpdate/DressUp/DressUpOffsetInfo.cs

@@ -2,7 +2,7 @@
 
 namespace GFGGame
 {
-    public class DressUpBodyOffsetInfo : MonoBehaviour
+    public class DressUpOffsetInfo : MonoBehaviour
     {
         public Vector3 OffsetPosition;
         public Quaternion Rotation;

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -339,16 +339,16 @@ namespace GFGGame
             }
             if (objName == BODY_ANIMATION_NAME)
             {
-                DressUpBodyOffsetInfo dressUpBodyOffsetInfo = gameObj.GetComponent<DressUpBodyOffsetInfo>();
-                if(dressUpBodyOffsetInfo == null)
+                DressUpOffsetInfo dressUpOffsetInfo = gameObj.GetComponent<DressUpOffsetInfo>();
+                if(dressUpOffsetInfo == null)
                 {
-                    dressUpBodyOffsetInfo = gameObj.AddComponent<DressUpBodyOffsetInfo>();
-                    dressUpBodyOffsetInfo.OffsetPosition = gameObj.transform.localPosition;
-                    dressUpBodyOffsetInfo.Rotation = gameObj.transform.localRotation;
+                    dressUpOffsetInfo = gameObj.AddComponent<DressUpOffsetInfo>();
+                    dressUpOffsetInfo.OffsetPosition = gameObj.transform.localPosition;
+                    dressUpOffsetInfo.Rotation = gameObj.transform.localRotation;
                 }
                 //如果是动作动画，就根据动画位置及角度信息设置给Role对象
-                parentObj.transform.localPosition = dressUpBodyOffsetInfo.OffsetPosition;
-                parentObj.transform.rotation = dressUpBodyOffsetInfo.Rotation;
+                parentObj.transform.localPosition = dressUpOffsetInfo.OffsetPosition;
+                parentObj.transform.rotation = dressUpOffsetInfo.Rotation;
                 //.SetPositionAndRotation(Vector3.zero, Quaternion.identity); 
             }
             gameObj.transform.localPosition = Vector3.zero;
@@ -384,6 +384,16 @@ namespace GFGGame
             {
                 return null;
             }
+
+            DressUpOffsetInfo dressUpOffsetInfo = gameObj.GetComponent<DressUpOffsetInfo>();
+            if (dressUpOffsetInfo == null)
+            {
+                dressUpOffsetInfo = gameObj.AddComponent<DressUpOffsetInfo>();
+                dressUpOffsetInfo.OffsetPosition = gameObj.transform.localPosition;
+                dressUpOffsetInfo.Rotation = gameObj.transform.localRotation;
+            }
+            gameObj.transform.localPosition = dressUpOffsetInfo.OffsetPosition;
+            gameObj.transform.rotation = dressUpOffsetInfo.Rotation;
             gameObj.transform.SetParent(parentObj.transform, false);
             gameObj.name = objName;
             var sortingGroup = gameObj.transform.GetComponent<SortingGroup>();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVisitNPCUI.cs

@@ -12,7 +12,6 @@ namespace UI.ActivityAfternoonTea
         public UI_CompDialogText m_DialogText;
         public GLoader m_nextChatBtn;
         public GButton m_btnBack;
-        public GTextField m_name;
         public GTextField m_titleIcon;
         public UI_Component2 m_taskIcon;
         public GLoader m_listBg;
@@ -70,7 +69,6 @@ namespace UI.ActivityAfternoonTea
             m_DialogText = (UI_CompDialogText)UI_CompDialogText.Create(comp.GetChild("DialogText"));
             m_nextChatBtn = (GLoader)comp.GetChild("nextChatBtn");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_name = (GTextField)comp.GetChild("name");
             m_titleIcon = (GTextField)comp.GetChild("titleIcon");
             m_taskIcon = (UI_Component2)UI_Component2.Create(comp.GetChild("taskIcon"));
             m_listBg = (GLoader)comp.GetChild("listBg");
@@ -85,7 +83,6 @@ namespace UI.ActivityAfternoonTea
             m_DialogText = null;
             m_nextChatBtn = null;
             m_btnBack = null;
-            m_name = null;
             m_titleIcon = null;
             m_taskIcon.Dispose();
             m_taskIcon = null;

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

@@ -8,6 +8,7 @@ namespace UI.OpenServerActivity
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GComponent m_valueBar;
         public GButton m_btnBack;
         public GList m_list;
         public const string URL = "ui://b8ha2mnspll2g";
@@ -58,12 +59,14 @@ namespace UI.OpenServerActivity
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_valueBar = null;
             m_btnBack = null;
             m_list = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -24,6 +24,11 @@ namespace GFGGame
         //兑换码
         public static int hCode;
 
+        //0 正常，1 维护中
+        public static int serverStatus;
+        public static string statusPrompt;
+
+
         public static void InitData(string json)
         {
             ET.Log.Debug($"gamecfg \n{json}");
@@ -48,6 +53,11 @@ namespace GFGGame
             {
                 hCode = int.Parse(result.hCode);
             }
+            if (!string.IsNullOrEmpty(result.serverStatus))
+            {
+                serverStatus = int.Parse(result.serverStatus);
+            }
+            statusPrompt = result.statusPrompt;
             GameConfig.logApiReportUrl = LauncherConfig.logApiRootUrl + "ReportGet";
         }
 
@@ -59,6 +69,8 @@ namespace GFGGame
             public string tsStatus;
             public string tsServer;
             public string hCode;
+            public string serverStatus;
+            public string statusPrompt;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -49,6 +49,9 @@ namespace GFGGame
         //最大显示充值物品的订单时间差
         public static int maxShowOrderTime = GameConst.DEFAULT_MAX_ORDER_TIME;
 
+        //游戏暂停时间
+        public static long pauseTime;
+
         public static void Init()
         {
             cfgName = LauncherConfig.cfgName + "_in";

GameClient/Assets/Game/HotUpdate/HotUpdateDriver.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using GFGGame.Launcher;
+using System.Collections;
 using UniFramework.Pooling;
 using UnityEngine;
 using YooAsset;
@@ -50,43 +51,12 @@ namespace GFGGame
             }
         }
 
-        private long pauseTime;
 
         private void OnApplicationPause(bool pause)
         {
             if(pause)
             {
-                pauseTime = ET.TimeHelper.ClientNowSeconds();
-            }
-            else
-            {
-                if(ET.TimeHelper.ClientNowSeconds() - pauseTime > 180 || LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
-                {
-                    StartCoroutine(CheckVersion(VersionController.DefaultPackage));
-                }
-            }
-        }
-
-        private IEnumerator CheckVersion(string packageName)
-        {
-            var package = YooAssets.GetPackage(packageName);
-            string oldVersion = package.GetPackageVersion();
-            var operation = package.UpdatePackageVersionAsync();
-            yield return operation;
-
-            if (operation.Status == EOperationStatus.Succeed)
-            {
-                VersionController.Instance.PackageVersion = operation.PackageVersion;
-                LogUtil.LogDev($"版本对比: {oldVersion} {operation.PackageVersion}");
-                if(!operation.PackageVersion.Equals(oldVersion))
-                {
-                    AlertSystem.Show("游戏已有更新，您可以立即重启游戏获取最佳游戏体验，也可以稍后重启更新。")
-                        .SetLeftButton(true, "稍后更新")
-                        .SetRightButton(true, "重启游戏", (obj)=> 
-                        {
-                            Application.Quit();
-                        });
-                }
+                GameGlobal.pauseTime = ET.TimeHelper.ClientNowSeconds();
             }
         }
 

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

@@ -76,10 +76,9 @@ namespace GFGGame
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(NewYearRedEnvelopeDataManager.ItemId);
                     if (!AntiAddictionController.CheckAntiAddictionRecharge(1))
                     {
-                        NewYearRedEnvelopeDataManager.Status = 2;
                         ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
                         ShopSProxy.ReqShopBuy(activityOpenCfg.paramsArr[0], 1).Coroutine();
-                        LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+                        //LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
                     }
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaVisitView.cs

@@ -92,7 +92,7 @@ namespace GFGGame
             long curTime = TimeHelper.ServerNow();
             if (endTime < curTime)
             {
-                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                PromptController.Instance.ShowFloatTextPrompt("拜访活动已结束");
                 Timers.inst.Remove(UpdateTime);
                 GameController.GoBackToMainView();
                 return;

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityVisitNpcView.cs

@@ -64,14 +64,12 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            npcId = (int)this.viewData;
             if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearVisit) == 0)
             {
-                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-                Timers.inst.Remove(UpdateView);
-                ViewManager.Show<ActivityTeaMainView>();
-                return;
+                _ui.target.touchable = false;
+                Timers.inst.Add(0.5f, 1, UpdateActivity);
             }
-            npcId = (int)this.viewData;
             if (!TaskDataManager.Instance.TaskInfosDic.TryGetValue(ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr[0], out TaskInfo item))
             {
                 TaskSProxy.GetTaskInfos();
@@ -79,7 +77,10 @@ namespace GFGGame
                 {
                     return;
                 }
-                Timers.inst.Add(2.0f, 1, UpdateView);
+                if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearVisit) != 0)
+                {
+                    Timers.inst.Add(2.0f, 1, UpdateView);
+                }
             }
             else
             {
@@ -94,13 +95,19 @@ namespace GFGGame
             base.OnHide();
         }
 
+        private void UpdateActivity(object param = null)
+        {
+            PromptController.Instance.ShowFloatTextPrompt("拜访活动已结束");
+            Timers.inst.Remove(UpdateActivity);
+            GameController.GoBackToMainView();
+            return;
+        }
         private void UpdateView(object param = null)
         {
             var taskCfgs = TaskDataManager.Instance.GetTaskCfgs(ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr);
             _ui.m_taskList.data = taskCfgs;
             _ui.m_npcIcon.url = ResPathUtil.GetNpcPicSPath(ActivityVisitCfgArray.Instance.dataArray[npcId].picRes);
             _ui.m_loaBg.url = ResPathUtil.GetSceneBgPath(ActivityVisitCfgArray.Instance.dataArray[npcId].bgRes);
-            _ui.m_name.text = ActivityVisitCfgArray.Instance.dataArray[npcId].name;
             _ui.m_taskList.numItems = ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr.Length;
             redDot = true;
             for (int i = 0; i < taskCfgs.Count; i++)

GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertSystem.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             return _alertWindow;
         }
 
-        public static void hide()
+        public static void Hide()
         {
             if (_alertWindow != null)
             {

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -224,6 +224,7 @@ namespace GFGGame
                 case ConstItemID.ARENA_PAST_COST:
                 case ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST_2:
                 case ConstItemID.OPEN_SERVER_COST_1:
+                case ConstItemID.GET_TICKETS:
                     button.m_imgAdd.visible = true;
                     break;
                 default:

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -363,6 +363,12 @@ namespace GFGGame
                 case ConstFunctionId.SKILLBOOK:
                     ViewManager.Show<ExchangeGoodsView>(_itemId);
                     break;
+                case ConstFunctionId.HEAVEN_SMALL_GAMW:
+                    ViewManager.Show<GameStartView>();
+                    break;
+                case ConstFunctionId.OPEN_SERVER_FIGHT:
+                    ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
+                    break;
             }
             if (isJump)
             {

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

@@ -114,7 +114,7 @@ namespace GFGGame
             ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, true }, true);
         }
 
-        private static void OnCompletePriorStoryDialog(bool isSkip, object param)
+        private static void OnCompletePriorStoryDialog(bool done, object param)
         {
             ViewManager.DeleteViewStackCountDown(null, 2);
             ViewManager.Show<LeagueTeaPartyOverView>();

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -2,6 +2,7 @@ using UnityEngine;
 using FairyGUI;
 using UI.Login;
 using ET;
+using GFGGame.Launcher;
 
 namespace GFGGame
 {
@@ -194,20 +195,41 @@ namespace GFGGame
 
         private void TryLogin()
         {
-            var serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
-            if (serverInfosComponent.ServerInfoList.Count <= 0)
+            var url = LauncherConfig.cfgUrl.Replace("{cfgName}", GameGlobal.cfgName);
+            url = url + "?t=" + TimeHelper.ClientNow();
+            HttpTool.Instance.Get(url, (string data) =>
             {
-                QDManager.Login();
-            }
-            else
-            {
-                if (!_ui.m_btnAgree.selected)
+                //重新加载游戏配置
+                GameConfig.InitData(data);
+                if (GameConfig.serverStatus == 1)
                 {
-                    PromptController.Instance.ShowFloatTextPrompt("请仔细阅读并同意游戏用户协议、隐私保护指引、儿童隐私政策");
+                    if (string.IsNullOrEmpty(GameConfig.statusPrompt))
+                    {
+                        GameConfig.statusPrompt = "游戏正在更新维护中，请稍后再试。";
+                    }
+                    AlertSystem.Show(GameConfig.statusPrompt)
+                        .SetLeftButton(true, "知道了", (data) =>
+                        {
+                            Application.Quit();
+                        });
                     return;
                 }
-                LoginController.GetRoles().Coroutine();
-            }
+
+                var serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
+                if (serverInfosComponent.ServerInfoList.Count <= 0)
+                {
+                    QDManager.Login();
+                }
+                else
+                {
+                    if (!_ui.m_btnAgree.selected)
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("请仔细阅读并同意游戏用户协议、隐私保护指引、儿童隐私政策");
+                        return;
+                    }
+                    LoginController.GetRoles().Coroutine();
+                }
+            });
         }
 
         private void ResetLoginButton()

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

@@ -115,7 +115,7 @@ namespace GFGGame
             ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog),null,false }, true);
         }
 
-        private static void OnCompletePriorStoryDialog(bool isSkip, object param)
+        private static void OnCompletePriorStoryDialog(bool done, object param)
         {
             //ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
         }

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

@@ -177,6 +177,7 @@ namespace GFGGame
 
             _ui.m_btnAutoPlay.selected = _autoPlay;
             _ui.m_btnBack.visible = InstanceZonesDataManager.CheckLevelPass(100001001);
+
             StoryDialogDataManager.Instance.Clear();
 
             InitStepListById(_storyStartID);
@@ -937,11 +938,11 @@ namespace GFGGame
             }
         }
 
-        private void Over(bool isSkip = true)
+        private void Over(bool done = true)
         {
             if (_onCompleteStoryDialogCall != null)
             {
-                _onCompleteStoryDialogCall(isSkip, _onCompleteStoryDialogCallParam);
+                _onCompleteStoryDialogCall(done, _onCompleteStoryDialogCallParam);
             }
             this.Hide();
         }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -219,16 +219,10 @@ namespace GFGGame
             }
 
             //StorageSProxy.ReqSetClientValue(1012, 4).Coroutine();
+
             // 临时设置内网显示时间
-            if (LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
-            {
-                _ui.m_serverTime.visible = true;
-                Timers.inst.AddUpdate(ServerTimeUpdate);
-            }
-            else
-            {
-                _ui.m_serverTime.visible = false;
-            }
+            _ui.m_serverTime.visible = true;
+            Timers.inst.AddUpdate(ServerTimeUpdate);
         }
 
         protected override void OnHide()
@@ -385,7 +379,22 @@ namespace GFGGame
 
         private void OnClickBtnOpenServerActivity()
         {
-            ViewManager.Show<OpenServerActivityView>();
+            var titleIndex = PlayerPrefs.GetString("seeOpenServerActivityStory" + GameGlobal.userId);
+            if (titleIndex == null || titleIndex == "")
+            {
+                ViewManager.Show<StoryDialogView>(new object[] { "10151", false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, false }, true);
+            }
+            else
+                ViewManager.Show<OpenServerActivityView>();
+        }
+
+        private static void OnCompletePriorStoryDialog(bool done, object param)
+        {
+            if (done) { 
+                PlayerPrefs.SetString("seeOpenServerActivityStory" + GameGlobal.userId, "1");
+                ViewManager.DeleteViewStackCountDown(null, 1);
+                ViewManager.Show<OpenServerActivityView>();
+            }
         }
 
         private void OnClickBtnWanShiLi()
@@ -1197,7 +1206,7 @@ namespace GFGGame
         private void ServerTimeUpdate(object param = null)
         {
             long timestamp = (long)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalMilliseconds;
-            if (Math.Abs(TimeHelper.ServerNow() - timestamp) >= 50000)
+            if (Math.Abs(TimeHelper.ServerNow() - timestamp) >= 60000)
             {
                 dateTime = unixStartTime.AddMilliseconds(TimeHelper.ServerNow());
                 _ui.m_serverTime.text = dateTime.ToString();

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

@@ -166,10 +166,9 @@ namespace GFGGame
             .SetRightButton(true, "确定", async (object data) =>
             {
                 var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameDate.type, timeIndex, false, activityGameDate[0].id, true);
-                if (!result) return;
                 this.Hide();
             }).SetShowCheck(false);
-        }
+        }         
 
         private void ListCardItem(int index, GObject item)
         {
@@ -268,6 +267,7 @@ namespace GFGGame
             if (StartHit)
             {
                 StartHit = false;
+                _ui.m_back.touchable = false;
                 Timers.inst.Add(1.0f, 1, StartTime);
             }
             Card card = (Card)item.m_card;
@@ -330,7 +330,7 @@ namespace GFGGame
                     UI_cardItem.ProxyEnd();
 
                     UI_cardItem item2 = UI_cardItem.Proxy(_ui.m_cardList.GetChildAt(cardList[i - 1]["index"]));
-                    item2.m_t0.Play();
+                    item2.m_t0.Play(()=> { _ui.m_back.touchable = true; });
                     UI_cardItem.ProxyEnd();
 
                     currentCardNum -= 2;
@@ -393,6 +393,7 @@ namespace GFGGame
             firstHit = true;
             canHit = true;
             _ui.m_cardList.touchable = true;
+            _ui.m_back.touchable = true;
             Timers.inst.Remove(UpdateHit);
         }
         private void UpdateOneHit(object param = null)

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

@@ -87,7 +87,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.AddEventListener(ConstMessage.MINI_GAME_UPDATE, UpdateRed);
+            EventAgent.RemoveEventListener(ConstMessage.MINI_GAME_UPDATE, UpdateRed);
         }
         protected override void OnHide()
         {

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

@@ -492,28 +492,28 @@ namespace GFGGame
         }
         private void OnClickEnd()
         {
-                touchSecond = Input.mousePosition;//记录拖动的位置
-                if ((touchSecond.x - touchFirst.x) < -80 && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
-                {
-                    //向左滑动
-                    Move(Map, Direction.left);
-                }
-                if ( (touchSecond.x - touchFirst.x) > 80 && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
-                {
-                    //向右滑动
-                    Move(Map, Direction.right);
-                }
-                if ((touchSecond.y - touchFirst.y) < -80 && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
-                {
-                    //向下滑动
-                    Move(Map, Direction.down);
-                }
-                if ((touchSecond.y - touchFirst.y) > 80 && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
-                {
-                    //向上滑动
-                    Move(Map, Direction.up);
-                }
-                touchFirst = touchSecond;
+            touchSecond = Input.mousePosition;//记录拖动的位置
+            if (touchSecond.x < touchFirst.x && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
+            {
+                //向左滑动
+                Move(Map, Direction.left);
+            }
+            if (touchSecond.x > touchFirst.x && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
+            {
+                //向右滑动
+                Move(Map, Direction.right);
+            }
+            if (touchSecond.y < touchFirst.y && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
+            {
+                //向下滑动
+                Move(Map, Direction.down);
+            }
+            if (touchSecond.y > touchFirst.y && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
+            {
+                //向上滑动
+                Move(Map, Direction.up);
+            }
+            touchFirst = touchSecond;
         }
 
         private void OnClickMergeTips()

GameClient/Assets/Game/HotUpdate/Views/NewYearRedEnvelope/NewYearRedEnvelopeView.cs

@@ -71,13 +71,19 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshViewInfo);
+            EventAgent.AddEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshBuySuccess);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshViewInfo);
+            EventAgent.RemoveEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshBuySuccess);
+        }
+
+        private void RefreshBuySuccess()
+        {
+            RefreshOpenView();
+            RefreshViewInfo();
         }
 
         private void RefreshViewInfo()
@@ -129,8 +135,8 @@ namespace GFGGame
             bool result = await NewYearRedEnvelopeSProxy.ReqDoubleRedPacket(actRedPacketId);
             if (result)
             {
-                RefreshOpenView();
-                RefreshViewInfo();
+                //RefreshOpenView();
+                //RefreshViewInfo();
             }
         }
 

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

@@ -36,7 +36,7 @@ namespace GFGGame
             base.OnInit();
             packageName = UI_OpenServerFightUI.PACKAGE_NAME;
             _ui = UI_OpenServerFightUI.Create();
-            viewCom = _ui.target;
+            this.viewCom = _ui.target;
             isfullScreen = true;
             isReturnView = true;
             _ui.m_list.itemRenderer = RenderListItem;

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

@@ -13,9 +13,16 @@ namespace GFGGame
         private int _activityId;
         private int _activityType;
         private ActivityOpenCfg _activityCfg;
+        private ValueBarController _valueBarController;
 
         public override void Dispose()
         {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -38,6 +45,8 @@ namespace GFGGame
             isfullScreen = true;
             isReturnView = true;
 
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
+
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_list.itemRenderer = RenderListItem;
         }
@@ -50,6 +59,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _valueBarController.OnShown();
+            _valueBarController.UpdateList(new List<int>() {  ConstItemID.GET_TICKETS });
             _activityType = (int)this.viewData;
             StudioDataManager.Instance.VIEW_NAME = typeof(OpenServerStoryView).FullName;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _activityType;
@@ -63,6 +74,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            _valueBarController.OnHide();
         }
 
         protected override void RemoveEventListener()

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -30,13 +30,13 @@ namespace GFGGame
         public static string apkVersion;
         //0 正常，1 维护中
         public static int serverStatus;
+        public static string statusPrompt;
         //0 关闭所有log界面，1 开启后台log界面， 2 开启弹窗log界面
         public static int onDebug;
         //AB资源版本
         public static string manifest_v;
         //隐私政策文件地址模版
         public static string privacy_v;
-        public static string statusPrompt;
         public static string updateAppPrompt;
         public static string updateResPrompt;
         public static int promptSizeMB;