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

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,GetHeavenApproach ,GetOpenServerFightApproach };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, CheckWeeklyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetArenaApproach,GetHeavenApproach ,GetOpenServerFightApproach, GetYuanXiaoGameConsumeApproach, GetYuanXiaoRewardItemApproach };
             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>>();
@@ -408,6 +408,34 @@ namespace GFGEditor
         }
 
         /// <summary>
+        /// 尝试获取元宵小游戏消耗门票的产出途径
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string GetYuanXiaoGameConsumeApproach(int itemId)
+        {
+            if (itemId == ConstItemID.YUANXIAO_GAME_CONSUME)
+            {
+                return "ACTIVITY_GET_YUAN_XIAO_TASK";
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 尝试获取元宵小游戏奖励的产出途径
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string GetYuanXiaoRewardItemApproach(int itemId)
+        {
+            if (itemId == ConstItemID.YUANXIAO_REWARD)
+            {
+                return "ACTIVITY_GET_YUAN_XIAO";
+            }
+            return null;
+        }
+
+        /// <summary>
         /// 尝试获取剧情关卡产出途径
         /// </summary>
         /// <param name="itemId"></param>
@@ -655,6 +683,12 @@ namespace GFGEditor
             List<ShopCfg> storyActivityCfg = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE);
             for (int i = 0; i < storyActivityCfg.Count; i++)
             {
+                // 去除未上架的活动商品
+                if (!string.IsNullOrEmpty(storyActivityCfg[i].startTime) && !TimeUtil.IsBeforeCurTime(storyActivityCfg[i].startTime) || !string.IsNullOrEmpty(storyActivityCfg[i].endTime) && !TimeUtil.IsLaterCurTime(storyActivityCfg[i].endTime))
+                {
+                    continue;
+                }
+
                 if (CheckIsHasItem(itemId, storyActivityCfg[i].itemId))
                 {
                     approachs.Add(ConstFunctionId.STORE + "=" + ConstStoreTabId.STORE_EXCHANGE + "=" + ConstStoreSubId.STORE_ACTIVITY_EXCHANGE);

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

@@ -113,5 +113,10 @@ namespace GFGGame
         ///新年筹备
         /// </summary>
         public const string OPEN_SERVER_FIGHT = "OPEN_SERVER_FIGHT";
+
+        public const string ACTIVITY_GET_YUAN_XIAO_TASK = "ACTIVITY_GET_YUAN_XIAO_TASK";
+
+        public const string ACTIVITY_GET_YUAN_XIAO = "ACTIVITY_GET_YUAN_XIAO";
+
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoEntryUI.cs

@@ -21,6 +21,7 @@ namespace UI.ActivityGetYuanXiao
         public GComponent m_valueBar;
         public GButton m_btnBack;
         public GGraph m_btnStart;
+        public GTextField m_txtTime;
         public Transition m_t0;
         public Transition m_listShow;
         public const string URL = "ui://tguohf7uqkvg4";
@@ -84,6 +85,7 @@ namespace UI.ActivityGetYuanXiao
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnStart = (GGraph)comp.GetChild("btnStart");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_t0 = comp.GetTransition("t0");
             m_listShow = comp.GetTransition("listShow");
         }
@@ -103,6 +105,7 @@ namespace UI.ActivityGetYuanXiao
             m_valueBar = null;
             m_btnBack = null;
             m_btnStart = null;
+            m_txtTime = null;
             m_t0 = null;
             m_listShow = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoUI.cs

@@ -24,6 +24,8 @@ namespace UI.ActivityGetYuanXiao
         public GTextField m_progress;
         public GTextField m_targetScore;
         public GGraph m_startEffect;
+        public GGraph m_startLeft;
+        public GGraph m_startRight;
         public const string URL = "ui://tguohf7ux0ey0";
         public const string PACKAGE_NAME = "ActivityGetYuanXiao";
         public const string RES_NAME = "ActivityGetYuanXiaoUI";
@@ -88,6 +90,8 @@ namespace UI.ActivityGetYuanXiao
             m_progress = (GTextField)comp.GetChild("progress");
             m_targetScore = (GTextField)comp.GetChild("targetScore");
             m_startEffect = (GGraph)comp.GetChild("startEffect");
+            m_startLeft = (GGraph)comp.GetChild("startLeft");
+            m_startRight = (GGraph)comp.GetChild("startRight");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -110,6 +114,8 @@ namespace UI.ActivityGetYuanXiao
             m_progress = null;
             m_targetScore = null;
             m_startEffect = null;
+            m_startLeft = null;
+            m_startRight = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_ComboBox1_popup.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Login
+{
+    public partial class UI_ComboBox1_popup
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://myoktu7pmfq35s";
+        public const string PACKAGE_NAME = "Login";
+        public const string RES_NAME = "ComboBox1_popup";
+        private static UI_ComboBox1_popup _proxy;
+
+        public static UI_ComboBox1_popup Create(GObject gObject = null)
+        {
+            var ui = new UI_ComboBox1_popup();
+            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_ComboBox1_popup Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComboBox1_popup();
+            }
+            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_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_ComboBox1_popup.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_LoginInputUI.cs

@@ -13,6 +13,7 @@ namespace UI.Login
         public GTextInput m_inputPassword;
         public GButton m_btnCancel;
         public GButton m_btnSure;
+        public GComboBox m_boxChooseCanal;
         public const string URL = "ui://myoktu7pq08xc";
         public const string PACKAGE_NAME = "Login";
         public const string RES_NAME = "LoginInputUI";
@@ -66,6 +67,7 @@ namespace UI.Login
             m_inputPassword = (GTextInput)comp.GetChild("inputPassword");
             m_btnCancel = (GButton)comp.GetChild("btnCancel");
             m_btnSure = (GButton)comp.GetChild("btnSure");
+            m_boxChooseCanal = (GComboBox)comp.GetChild("boxChooseCanal");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,6 +77,7 @@ namespace UI.Login
             m_inputPassword = null;
             m_btnCancel = null;
             m_btnSure = null;
+            m_boxChooseCanal = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,9 +10,8 @@ namespace GFGGame
     {
         public bool CheckOpen()
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.YuanXiao);
-            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
-                   activityInfo.EndTime > TimeHelper.ServerNow();
+            var activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.YuanXiao);
+            return activityID > 0;
         }
 
         public bool HaveNewLevelCanPlay()

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

@@ -4,6 +4,7 @@ using UI.ActivityGetYuanXiao;
 using FairyGUI;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using ET;
 
 namespace GFGGame
 {
@@ -61,7 +62,7 @@ namespace GFGGame
         {
             base.OnShown();
             _valueBarController.OnShown();
-            _valueBarController.UpdateList(new List<int>() { PickUpGameArray.Instance.dataArray[0].comsumePassArr[0][0] });
+            _valueBarController.UpdateList(new List<int>() { ConstItemID .YUANXIAO_REWARD, ConstItemID.YUANXIAO_GAME_CONSUME});
 
             _ui.m_list.visible = false;
             var result = await ActivityGetYuanXiaoProxy.ReqGetActivityGameInfos();
@@ -77,12 +78,17 @@ namespace GFGGame
             _ui.m_list.selectedIndex = Mathf.Min(_curLevel, ActivityGetYuanXiaoDataManager.Instance.gameinfoList.Count - 1);
             AutoLocationCurLevel();
             UpdateRedDots();
+
+            UpdateTime(null);
+            Timers.inst.Remove(UpdateTime);
+            Timers.inst.Add(1, 0, UpdateTime);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
             _valueBarController.OnHide();
+            Timers.inst.Remove(UpdateTime);
         }
 
         protected override void AddEventListener()
@@ -137,7 +143,7 @@ namespace GFGGame
 
             if (ActivityGetYuanXiaoDataManager.Instance.HaveNewLevelCanPlay() == false)
             {
-                PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                PromptController.Instance.ShowFloatTextPrompt("游园门票不足，请查看任务列表");
                 return;
             }
 
@@ -172,7 +178,7 @@ namespace GFGGame
             {
                 return;
             }
-            ViewManager.Show<ActivityGetYuanXiaoTaskView>(activityID);
+            ViewManager.Show<ActivityGetYuanXiaoTaskView>();
         }
 
         private void UpdateRedDots()
@@ -210,5 +216,23 @@ namespace GFGGame
         {
             _ui.m_list.ScrollToView(Mathf.Min(_curLevel, ActivityGetYuanXiaoDataManager.Instance.gameinfoList.Count - 1));
         }
+
+        private void UpdateTime(object param)
+        {
+            long curTime = TimeHelper.ServerNow();
+            int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.YuanXiao);
+            if (activityID == 0)
+            {
+                Hide();
+                return;
+            }
+
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(activityID);
+            if (activityInfo != null)
+            {
+                long endTime = activityInfo.EndTime;
+                _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            }
+        }
     }
 }

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

@@ -34,6 +34,7 @@ namespace GFGGame
             viewCom.Center();
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             modal = true;
+            isReturnWindow = true;
 
             _ui.m_itemList.itemRenderer = ListRenderer;
             _funcType = TaskFuncType.YuanXiaoActivity;
@@ -43,7 +44,12 @@ namespace GFGGame
         {
             base.OnShown();
 
-            _activityID = (int)viewData;
+            _activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.YuanXiao);
+            if (_activityID == 0)
+            {
+                return;
+            }
+
             UpdateTask();
             _ui.m_itemList.scrollPane.ScrollTop();
         }
@@ -64,6 +70,7 @@ namespace GFGGame
         private void UpdateTask()
         {
             _cfgs = TaskDataManager.Instance.GetTaskCfgs(_funcType);
+            SortList();
             _ui.m_itemList.numItems = _cfgs.Count;
         }
 
@@ -152,5 +159,21 @@ namespace GFGGame
             }
             ViewManager.JumpToView(taskCfg.jumpId, param, false, false);
         }
+
+        public void SortList()
+        {
+            _cfgs.Sort((TaskCfg a, TaskCfg b) =>
+            {
+                // 如果都是未达到状态，则按照ID排序
+                if ((TaskDataManager.Instance.TaskInfosDic[a.id].State == TaskDataManager.Instance.TaskInfosDic[b.id].State)
+                && TaskDataManager.Instance.TaskInfosDic[a.id].State == 0)
+                    return a.id.CompareTo(b.id);
+
+                var stateA = TaskDataManager.Instance.TaskInfosDic[a.id].State == 1 ? 1 : -1;
+                var stateB = TaskDataManager.Instance.TaskInfosDic[b.id].State == 1 ? 1 : -1;
+                if (stateA > stateB) return -1;
+                return stateB > stateA ? 1 : TaskDataManager.Instance.TaskInfosDic[a.id].State.CompareTo(TaskDataManager.Instance.TaskInfosDic[b.id].State);
+            });
+        }
     }
 }

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

@@ -236,7 +236,8 @@ namespace GFGGame
         {
             _ui.m_catcher.target.visible = true;
             _ui.m_catcher.target.draggable = true;
-            _ui.m_catcher.target.dragBounds = new Rect(-_ui.m_catcher.target.width / 2, _ui.m_catcher.target.y, Screen.width + _ui.m_catcher.target.width, 0);
+            //_ui.m_catcher.target.dragBounds = new Rect(-_ui.m_catcher.target.width / 2, _ui.m_catcher.target.y, Stage.inst.width + _ui.m_catcher.target.width, 0);
+            _ui.m_catcher.target.dragBounds = new Rect(_ui.m_startLeft.x, _ui.m_catcher.target.y, _ui.m_startRight.x - _ui.m_startLeft.x, 0);
         }
 
         private void StartGame()
@@ -245,6 +246,7 @@ namespace GFGGame
             UpdateTime(null);
             Timers.inst.Add(1, 0, UpdateTime);
             Timers.inst.AddUpdate(UpdateGame);
+            Timers.inst.Add(1, 0, CheckActivityEnd);
         }
 
         private async void PlayStartAnim()
@@ -303,13 +305,13 @@ namespace GFGGame
             _ui.m_catcher.target.visible = false;
             HideGameView();
 
-            ViewManager.Show<ModalStatusView>("加载中...");
-            // 请求游戏结束协议
-            await MiniGameProxy.ReqMiniGameEnd(_cfg.id, _cfg.type, 0, win, _activityID, false);
-            ViewManager.Hide<ModalStatusView>();
-
             if (win)
             {
+                ViewManager.Show<ModalStatusView>("加载中...");
+                // 请求游戏结束协议
+                await MiniGameProxy.ReqMiniGameEnd(_cfg.id, _cfg.type, 0, true, _activityID, false);
+                ViewManager.Hide<ModalStatusView>();
+
                 ViewManager.Show<ActivityGetYuanXiaoSuccessView>(_cfg);
             }
             else
@@ -426,6 +428,7 @@ namespace GFGGame
         {
             Timers.inst.Remove(UpdateTime);
             Timers.inst.Remove(UpdateGame);
+            Timers.inst.Remove(CheckActivityEnd);
             ClearYuanXiaoList();
         }
 
@@ -497,5 +500,14 @@ namespace GFGGame
             _effectUIDic.Add("YXJ_text_start", EffectUIPool.CreateEffectUI(_ui.m_startEffect, "ui_Activity", "YXJ_text_start"));
             _effectUIDic.Add("YXJ_gameing_bg_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "YXJ_gameing_bg_tx"));
         }
+
+        private void CheckActivityEnd(object param)
+        {
+            if (!ActivityGetYuanXiaoDataManager.Instance.CheckOpen())
+            {
+                _ui.m_catcher.target.visible = false;
+                Hide();
+            }
+        }
     }
 }

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

@@ -225,6 +225,8 @@ namespace GFGGame
                 case ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST_2:
                 case ConstItemID.OPEN_SERVER_COST_1:
                 case ConstItemID.GET_TICKETS:
+                case ConstItemID.YUANXIAO_GAME_CONSUME:
+                case ConstItemID.YUANXIAO_REWARD:
                     button.m_imgAdd.visible = true;
                     break;
                 default:

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

@@ -152,6 +152,7 @@ namespace GFGGame
             GObject btnGo = context.sender as GObject;
             string[] infos = btnGo.data as string[];
             string functionId = infos[0];
+            GameFunctionCfg gameFunctionCfg = GameFunctionCfgArray.Instance.GetCfg(functionId);
 
             long hasNum = ItemDataManager.GetItemNum(_itemId);
             long needCount = 0;
@@ -369,6 +370,12 @@ namespace GFGGame
                 case ConstFunctionId.OPEN_SERVER_FIGHT:
                     ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
                     break;
+                case ConstFunctionId.ACTIVITY_GET_YUAN_XIAO_TASK:
+                    ViewManager.Show($"GFGGame.{gameFunctionCfg.functionId}");
+                    break;
+                case ConstFunctionId.ACTIVITY_GET_YUAN_XIAO:                   
+                    ViewManager.Show($"GFGGame.{gameFunctionCfg.functionId}");
+                    break;
             }
             if (isJump)
             {

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

@@ -46,6 +46,9 @@ namespace GFGGame
             {
                 _ui.m_inputAccount.text = account;
             }
+
+            _ui.m_boxChooseCanal.items = new string[] { "TapTap" , "好游快爆", "Bilibil", "华为", "UC九游(阿里游戏)", "小米", "VIVO", "OPPO", "4399", "联想", "应用宝", "酷派", "魅族", "雷电游戏", "QuickGame_安卓", "WAN665", "AppStore", "抖音", "测试"};
+            _ui.m_boxChooseCanal.onChanged.Add(onChangedCanal);
         }
 
         protected override void OnHide()
@@ -53,7 +56,6 @@ namespace GFGGame
             base.OnHide();
         }
 
-
         protected override void AddEventListener()
         {
             base.AddEventListener();
@@ -67,6 +69,12 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.LOGIN_FAIL, OnLoginFail);
         }
 
+        private void onChangedCanal()
+        {
+            ET.Log.Debug("打印测试======选择的渠道==========" + (_ui.m_boxChooseCanal.selectedIndex + 1));
+
+        }
+
         private void OnClickBtnSure()
         {
             var account = _ui.m_inputAccount.text;