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

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

@@ -112,6 +112,12 @@ namespace GFGGame
                     stateA = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(a.num) ? 1 : -1;
                     stateB = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(b.num) ? 1 : -1;
                 }
+                else if (typeId == ConstLimitTimeActivityType.ActLimitStlyc)
+                {
+                    allPlayTimes = ActivityDataManager.Instance.allTsyPlayTimes;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+                    stateA = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(a.num) ? 1 : -1;
+                    stateB = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(b.num) ? 1 : -1;
+                }
 
                 if (allPlayTimes >= a.num && allPlayTimes < b.num && stateA < 0) return -1;
                 if (allPlayTimes >= b.num && allPlayTimes < a.num && stateB < 0) return 1;

GameClient/Assets/Game/HotUpdate/Data/VO/PoemPhotoData.cs

@@ -13,12 +13,12 @@ namespace GFGGame
         /// <summary>
         /// 创建时间,毫秒
         /// </summary>
-        public long CreationTime;
+        public long CreationTime { get; set; }
 
         /// <summary>
         /// 置顶状态
         /// </summary>
-        public bool ToppingStatus;
+        public bool ToppingStatus { get; set; }
 
         /// <summary>
         /// 锁定状态

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -28,6 +28,7 @@ namespace UI.Main
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
+        public UI_BtnModle2 m_btnOpenServerActivity;
         public UI_BtnModle2 m_btnActivityAfuGift;
         public UI_BtnModle2 m_btnWanShiLi;
         public UI_BtnModle m_btnFirstRecharge;
@@ -106,6 +107,7 @@ namespace UI.Main
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
             m_btnActivityAfuGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityAfuGift"));
             m_btnWanShiLi = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnWanShiLi"));
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
@@ -152,6 +154,8 @@ namespace UI.Main
             m_btnActivityDay7 = null;
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
+            m_btnOpenServerActivity.Dispose();
+            m_btnOpenServerActivity = null;
             m_btnActivityAfuGift.Dispose();
             m_btnActivityAfuGift = null;
             m_btnWanShiLi.Dispose();

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

@@ -8,12 +8,15 @@ namespace UI.OpenServerActivity
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GButton m_btnNineZhouPool;
-        public GButton m_btnTenShu;
+        public GButton m_btnBack;
         public GButton m_btnAnswerTianmen;
         public GButton m_btnMingTong;
         public GButton m_btnHeaven;
-        public GButton m_btnBack;
+        public GButton m_btnNineZhouPool;
+        public GButton m_btnTenShu;
+        public GTextField m_txtDay;
+        public GTextField m_txtHour;
+        public GTextField m_txtMinute;
         public const string URL = "ui://b8ha2mnsdedg0";
         public const string PACKAGE_NAME = "OpenServerActivity";
         public const string RES_NAME = "OpenServerActivityUI";
@@ -62,22 +65,28 @@ namespace UI.OpenServerActivity
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnNineZhouPool = (GButton)comp.GetChild("btnNineZhouPool");
-            m_btnTenShu = (GButton)comp.GetChild("btnTenShu");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnAnswerTianmen = (GButton)comp.GetChild("btnAnswerTianmen");
             m_btnMingTong = (GButton)comp.GetChild("btnMingTong");
             m_btnHeaven = (GButton)comp.GetChild("btnHeaven");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnNineZhouPool = (GButton)comp.GetChild("btnNineZhouPool");
+            m_btnTenShu = (GButton)comp.GetChild("btnTenShu");
+            m_txtDay = (GTextField)comp.GetChild("txtDay");
+            m_txtHour = (GTextField)comp.GetChild("txtHour");
+            m_txtMinute = (GTextField)comp.GetChild("txtMinute");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_btnNineZhouPool = null;
-            m_btnTenShu = null;
+            m_btnBack = null;
             m_btnAnswerTianmen = null;
             m_btnMingTong = null;
             m_btnHeaven = null;
-            m_btnBack = null;
+            m_btnNineZhouPool = null;
+            m_btnTenShu = null;
+            m_txtDay = null;
+            m_txtHour = null;
+            m_txtMinute = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPhotoPostcard.cs

@@ -7,6 +7,7 @@ namespace UI.Poem
     public partial class UI_ComPhotoPostcard
     {
         public GComponent target;
+        public Controller m_c1;
         public UI_ComTravel m_comTravel;
         public UI_Button1 m_btnLock;
         public UI_Button2 m_btnUp;
@@ -59,6 +60,7 @@ namespace UI.Poem
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_comTravel = (UI_ComTravel)UI_ComTravel.Create(comp.GetChild("comTravel"));
             m_btnLock = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLock"));
             m_btnUp = (UI_Button2)UI_Button2.Create(comp.GetChild("btnUp"));
@@ -67,6 +69,7 @@ namespace UI.Poem
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_comTravel.Dispose();
             m_comTravel = null;
             m_btnLock.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoUI.cs

@@ -17,8 +17,8 @@ namespace UI.Poem
         public GList m_typeList;
         public UI_Button7 m_btnConfirmDelete;
         public GButton m_btnRule;
-        public GButton m_btnDelete;
         public GTextField m_txtCount;
+        public GButton m_btnDelete;
         public const string URL = "ui://iyz778gkv4825";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "PoemPhotoUI";
@@ -76,8 +76,8 @@ namespace UI.Poem
             m_typeList = (GList)comp.GetChild("typeList");
             m_btnConfirmDelete = (UI_Button7)UI_Button7.Create(comp.GetChild("btnConfirmDelete"));
             m_btnRule = (GButton)comp.GetChild("btnRule");
-            m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_btnDelete = (GButton)comp.GetChild("btnDelete");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -92,8 +92,8 @@ namespace UI.Poem
             m_btnConfirmDelete.Dispose();
             m_btnConfirmDelete = null;
             m_btnRule = null;
-            m_btnDelete = null;
             m_txtCount = null;
+            m_btnDelete = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -90,7 +90,8 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     var activityCfg = ActivityOpenCfgArray.Instance.GetCfg(response.ActivityId);
-                    if (activityCfg.type == ConstLimitTimeActivityType.ActLimitLuckyBox) { 
+                    if (activityCfg.type == ConstLimitTimeActivityType.ActLimitLuckyBox)
+                    {
                         if (ActivityDataManager.Instance.actLuckyBoxId != response.ActivityId)
                         {
                             ActivityDataManager.Instance.luckyBoxActBonusState.Clear();
@@ -117,6 +118,10 @@ namespace GFGGame
                             ActivityDataManager.Instance.luckyActTsyBonusState[response.KsBonusState[i]] = response.VsBonusState[i];
                         }
                     }
+                    else if (activityCfg.type == ConstLimitTimeActivityType.ActLimitStlyc)
+                    { 
+
+                    }
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -171,6 +171,19 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 输入一段时间（毫秒），将时间转换成DD:HH:mm格式
+        /// </summary>
+        /// <param name="timeMsec"></param>
+        public static string FormattingTimeTo_DD_HH_mm(long timeMsec)
+        {
+            TimeSpan ts = new TimeSpan(0, 0, (int)(timeMsec / 1000));
+            string strD = ts.Days.ToString();
+            string strH = ts.Hours.ToString();
+            string strM = ts.Minutes.ToString();
+            return string.Format("{0}:{1}:{2}", strD, strH, strM);
+        }
+
+        /// <summary>
         /// <summary>
         /// 将时间戳转换成HH:mm格式
         /// </summary>

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -105,7 +105,7 @@ namespace GFGGame
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             if (endTime < curTime) return;
-            ViewManager.Show<LuckyBoxActivityView>(_activityId);
+            ViewManager.Show<LuckyBoxActivityView>(new object[] { _activityId, ConstLimitTimeActivityType.ActLimitLuckyBox});
         }
 
         private void OnBtnShopClick()

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideDetailView.cs

@@ -13,7 +13,6 @@ namespace GFGGame
         private UI_SuitGuideDetailUI _ui;
         private List<int> _suitIds;
         private int _suitTypeId;
-        private bool _startInAnim;
 
         public override void Dispose()
         {
@@ -39,7 +38,6 @@ namespace GFGGame
             _ui.m_listSuit.itemRenderer = RenderListSuitItem;
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
-            _startInAnim = true;
         }
         protected override void AddEventListener()
         {
@@ -56,9 +54,8 @@ namespace GFGGame
             base.OnShown();
             _suitTypeId = (int)viewData;
             UpdateListSuit();
-            if (_startInAnim)
+            if (backRefresh)
             {
-                _startInAnim = false;
                 _ui.m_In.Play();
             }
         }
@@ -100,8 +97,7 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            _startInAnim = true;
-            ViewManager.GoBackFrom(typeof(SuitGuideDetailView).FullName);
+            Hide();
         }
 
         private void OnClickBtnSearch()
@@ -180,7 +176,7 @@ namespace GFGGame
             {
                 if (haveSuit)
                 {
-                    ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, _suitIds });
+                    ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, _suitIds }, false, false);
                 }
                 else
                 {

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -13,7 +13,6 @@ namespace GFGGame
         private UI_SuitGuideUI _ui;
         private Dictionary<int, List<int>> _menuTypeAllDataDic;
         private List<UI_SuitTypeItem> _suitTypeItems;
-        private bool _needRefresh;
 
         public override void Dispose()
         {
@@ -42,7 +41,6 @@ namespace GFGGame
             _ui.m_suitType2Items.onClickItem.Add(OnClickListSuitType2Item);
             _ui.m_suitTypeList.onClick.Add(OnClickListSuitType);
             InitSuitGuideType();
-            _needRefresh = true;
         }
         protected override void AddEventListener()
         {
@@ -52,10 +50,10 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            if (_needRefresh)
+            if (backRefresh)
             {
-                _needRefresh = false;
                 // 让滑块直接置于最左边
+                _ui.m_suitTypeItems.target.scrollPane.ScrollTop();
                 _ui.m_t0.Play();
                 UpdateItemsByType(1);
             }
@@ -164,7 +162,7 @@ namespace GFGGame
             item.m_icon.url = string.Format("ui://FieldGuide/tj_tz_{0}", typeId);
             item.target.onClick.Add(() =>
             {
-                ViewManager.Show<SuitGuideDetailView>(typeId);
+                ViewManager.Show<SuitGuideDetailView>(typeId, false, false);
             });
 
             _suitTypeItems.Add(item);
@@ -207,13 +205,11 @@ namespace GFGGame
         {
             GObject obj = eventContext.data as GObject;
             int index = _ui.m_suitType2Items.GetChildIndex(obj);
-            ViewManager.Show<SuitGuideDetailView>(_menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index]);
+            ViewManager.Show<SuitGuideDetailView>(_menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index], false, false);
         }
 
         private void OnClickBtnBack()
         {
-            _needRefresh = true;
-            _ui.m_suitTypeItems.target.scrollPane.ScrollTop();
             Hide();
         }
 

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

@@ -17,6 +17,7 @@ namespace GFGGame
         private ActivityOpenCfg _activityCfg;
         private LuckyBoxCfg _luckyBoxCfg;
         private int _activityId;
+        private int _activityType;
         private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
 
         public override void Dispose()
@@ -77,7 +78,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _activityId = (int)this.viewData;
+            _activityId = (int)(this.viewData as object[])[0];
+            _activityType = (int)(this.viewData as object[])[1];
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
             _valueBarController.OnShown();
@@ -91,7 +93,7 @@ namespace GFGGame
             UpdateRedDot();
             _ui.m_comBox.m_c1.SetSelectedPage(_activityId.ToString());
 
-            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
             if(activityOpenCfg.params2Arr.Length > 0)
                 GetWishingPoolInfo(activityId);
@@ -262,7 +264,7 @@ namespace GFGGame
 
         private void OnClickBtnReward()
         {
-            ViewManager.Show<ActivityThemeLuckyBoxBonusView>(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            ViewManager.Show<ActivityThemeLuckyBoxBonusView>(_activityType);
         }
         private void OnClickBtnShop()
         {
@@ -310,7 +312,7 @@ namespace GFGGame
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(_activityType), "", -18, 11);
             RedDotController.Instance.SetComRedDot(_ui.m_btnShop, RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -18, 11);
             RedDotController.Instance.SetComRedDot(_ui.m_btnGiftBag, RedDotDataManager.Instance.GetMeiRiTeHuiRed(), "", -18, 11);
         }
@@ -331,7 +333,7 @@ namespace GFGGame
             {
                 int index = LuckyBoxDataManager.Instance.KsActivityId.IndexOf(activityId);
                 if (index < 0 || !LuckyBoxDataManager.Instance.VsStatus[index])
-                    ViewManager.Show<LuckyBoxWishView>(ConstLimitTimeActivityType.ActLimitLuckyBox);
+                    ViewManager.Show<LuckyBoxWishView>(_activityType);
             }
         }
     }

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

@@ -105,6 +105,7 @@ namespace GFGGame
             _ui.m_headBar.target.onClick.Add(OnClickHeadBar);
             _ui.m_btnDailyWelfare.target.onClick.Add(OnClickBtnDailyWelfare);
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
+            _ui.m_btnOpenServerActivity.target.onClick.Add(OnClickBtnOpenServerActivity);
             _ui.m_btnWanShiLi.target.onClick.Add(OnClickBtnWanShiLi);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
@@ -377,6 +378,11 @@ namespace GFGGame
 
         private void OnClickBtnActivityLuckyBox()
         {
+            ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
+        }
+
+        private void OnClickBtnOpenServerActivity()
+        {
             ViewManager.Show<OpenServerActivityView>();
         }
 
@@ -592,21 +598,21 @@ namespace GFGGame
 
         private void UpdateActLuckyBox()
         {
-            //int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
-            //_ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
-            //if (actLuckyBoxId > 0)
-            //{
-            //    if (actLuckyBoxId != ActivityDataManager.Instance.lastActLuckyBoxId)
-            //    {
-            //        ActivitySProxy.ReqGetTimeLimitLuckyBoxInfo(actLuckyBoxId).Coroutine();
-            //        ActivityDataManager.Instance.lastActLuckyBoxId = actLuckyBoxId;
-            //    }
-            //    ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
-            //    _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
-            //    _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_tb_" + activityOpenCfg.res;
-            //    long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
-            //    _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
-            //}
+            int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            _ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
+            if (actLuckyBoxId > 0)
+            {
+                if (actLuckyBoxId != ActivityDataManager.Instance.lastActLuckyBoxId)
+                {
+                    ActivitySProxy.ReqGetTimeLimitLuckyBoxInfo(actLuckyBoxId).Coroutine();
+                    ActivityDataManager.Instance.lastActLuckyBoxId = actLuckyBoxId;
+                }
+                ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
+                _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
+                _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_tb_" + activityOpenCfg.res;
+                long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
+                _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+            }
         }
 
         private void UpdateLimitedActvityState()
@@ -801,7 +807,8 @@ namespace GFGGame
             _ui.m_btnCiPai.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             _ui.m_btnZhaiXing.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
             _ui.m_btnMain.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
-            //_ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox) > 0;
+            _ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox) > 0;
+            _ui.m_btnOpenServerActivity.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc) > 0;
             List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
             int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;
             _ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||

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

@@ -12,6 +12,7 @@ namespace GFGGame
         private UI_FlipGameStartUI _ui;
         //后续这里改成读表内容
         private List<string> name = new List<string>(){ "翻牌", "2048" };
+        private List<string> viewName = new List<string>() { "FlipGameView", "TZFEGameView" };
         private List<string> CustemsDesc = new List<string>()
         {
             "首次评价达到卓越奖励：",
@@ -52,6 +53,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _ui.m_c1.selectedIndex = 0;
             UpdateView();
             UpdateList();
         }
@@ -92,6 +94,7 @@ namespace GFGGame
             switch (index)
             {
                 case 0:
+
                         break;
                 case 1:
                     descItem.m_star3.visible = false;
@@ -137,11 +140,8 @@ namespace GFGGame
         }
         private void OnClickBtnStart()
         {
-            if(_ui.m_c1.selectedIndex == 0)
-            {
-                ViewManager.Show<FlipGameView>();
-                this.Hide();
-            }
+            ViewManager.Show($"GFGGame.{viewName[_ui.m_c1.selectedIndex]}");
+            this.Hide();
         }
     }
 }

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

@@ -12,7 +12,7 @@ namespace GFGGame
         private UI_TZFEGameView _ui;
 
         private int[,] Map;
-        enum Direction { up, down, left, right };
+        enum Direction { up, down, left, right};
         private Vector2 touchFirst = Vector2.zero;//手指开始按下的位置
         private Vector2 touchSecond = Vector2.zero;//手指拖动的位置
         private System.Random rand;
@@ -33,8 +33,10 @@ namespace GFGGame
             public int y;
             public bool isCreat;
         }
+        //需要播放动效的列表
         private List<NumPos> numPosArray = new List<NumPos>();
 
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -107,8 +109,35 @@ namespace GFGGame
             int x = index / rows;
             int y = index % columns;
             numItem.m_numTxt.text = Map[x,y].ToString();
+            if(Map[x,y] == 0)
+            {
+                numItem.m_numTxt.visible = false;
+            }
+            else
+            {
+                numItem.m_numTxt.visible = true;
+            }
             //这个后续根据数组内容替换图片
             //_ui.m_icon.url = 
+            //播放生成和合并动效
+            for(int i=0; i<numPosArray.Count; i++)
+            {
+                if(x == numPosArray[i].x && y == numPosArray[i].y)
+                {
+                    if(numPosArray[i].isCreat)
+                    {
+                        numItem.m_t0.Play();
+                        numPosArray.RemoveAt(i);
+                        break;
+                    }
+                    else
+                    {
+                        numItem.m_t1.Play();
+                        numPosArray.RemoveAt(i);
+                        break;
+                    }
+                }
+            }
             UI_numItem.ProxyEnd();
         }
 
@@ -162,7 +191,7 @@ namespace GFGGame
         /// 去零
         /// </summary>
         /// <param name="row">对于一行或一列元素</param>
-        private void Remove0(int[] row)
+        private void Remove0(int[] row,Direction dir,int xy = 0)
         {
             int pos = 0;
             int[] rowB = new int[row.Length];
@@ -175,7 +204,54 @@ namespace GFGGame
                 if (row[i] != 0)
                 {
                     row[pos] = row[i];
+                    
+                    //-----这里修改需要播放动效的列表-----
+                    int x = 0;
+                    int y = 0;
+                    int nextX = 0;
+                    int nextY = 0;
+                    for (int t = 0; t < numPosArray.Count; t++)
+                    {
+                        switch (dir)
+                        {
+                            case Direction.up:
+                                x = i;
+                                y = xy;
+                                nextX = pos;
+                                nextY = xy;
+                                break;
+                            case Direction.down:
+                                x = row.Length - 1 - i;
+                                y = xy;
+                                nextX = row.Length - 1 - pos;
+                                nextY = xy;
+                                break;
+                            case Direction.left:
+                                x = xy;
+                                y = i;
+                                nextX = xy;
+                                nextY = pos;
+                                break;
+                            case Direction.right:
+                                x = xy;
+                                y = row.Length - 1 - i;
+                                nextX = xy;
+                                nextY = row.Length - 1 - pos;
+                                break;
+                        }
+                        if(numPosArray.Count != 0 && numPosArray[t].x == x && numPosArray[t].y == y && pos != i)
+                        {
+                            numPosArray.RemoveAt(t);
+                            NumPos item;
+                            item.x = nextX;
+                            item.y = nextY;
+                            item.isCreat = false;
+                            numPosArray.Add(item);
+                        }
+                    }
+                    //---------------------------------------
                     pos++;
+                    
                 } 
             }
             for (; pos < row.Length; ++pos) row[pos] = 0;
@@ -192,9 +268,9 @@ namespace GFGGame
         /// 合并
         /// </summary>
         /// <param name="row">对于一行或一列元素，完成一次向左合并的操作</param>
-        private void Merge(int[] row , int colrow = 0)
+        private void Merge(int[] row , Direction dir, int xy)
         {
-            Remove0(row);
+            Remove0(row,dir,xy);
             // 相邻相同则合并
             for (int i = 0; i < row.Length - 1; ++i)
             {
@@ -202,6 +278,11 @@ namespace GFGGame
                 {
                     row[i] *= 2;
                     row[i + 1] = 0;
+                    //将合并的数字放入列表
+                    NumPos item;
+                    item = MoveAddNum(i, xy, dir, row.Length-1);
+                    numPosArray.Add(item);
+                    //-------
                     score += row[i];
                     UpdateScore();
                     if (row[i] == targetNum)
@@ -211,9 +292,37 @@ namespace GFGGame
                     isMerge = true;
                 }
             }
-            Remove0(row);
+            Remove0(row,dir,xy);
+        }
+        //将合并的数字放入列表的准备
+        private NumPos MoveAddNum(int i, int xy, Direction dir,int length)
+        {
+            NumPos item = new NumPos();
+            switch (dir)
+            {
+                case Direction.up:
+                    item.x = i;
+                    item.y = xy;
+                    item.isCreat = false;
+                    break;
+                case Direction.down:
+                    item.x = length - i;
+                    item.y = xy;
+                    item.isCreat = false;
+                    break;
+                case Direction.left:
+                    item.x = xy;
+                    item.y = i;
+                    item.isCreat = false;
+                    break;
+                case Direction.right:
+                    item.x = xy;
+                    item.y = length - i;
+                    item.isCreat = false;
+                    break;
+            }
+            return item;
         }
-
         /// <summary>
         /// 上移
         /// </summary>
@@ -224,8 +333,11 @@ namespace GFGGame
             int[] arr = new int[rows];
             for (int j = 0; j < columns; ++j)
             {
-                for (int i = 0; i < rows; ++i) arr[i] = map[i, j];
-                Merge(arr);
+                for (int i = 0; i < rows; ++i)
+                {
+                    arr[i] = map[i, j]; 
+                }
+                Merge(arr,Direction.up,j);
                 for (int i = 0; i < rows; ++i) map[i, j] = arr[i];
             }
         }
@@ -237,8 +349,11 @@ namespace GFGGame
             int[] arr = new int[rows];
             for (int j = 0; j < columns; ++j)
             {
-                for (int i = 0; i < rows; ++i) arr[rows - 1 - i] = map[i, j];
-                Merge(arr);
+                for (int i = 0; i < rows; ++i)
+                {
+                    arr[rows - 1 - i] = map[i, j];
+                }
+                Merge(arr,Direction.down ,j);
                 for (int i = 0; i < rows; ++i) map[i, j] = arr[rows - 1 - i];
             }
             return map;
@@ -252,13 +367,15 @@ namespace GFGGame
             int[] arr = new int[columns];
             for (int i = 0; i < rows; ++i)
             {
-                for (int j = 0; j < columns; ++j) arr[j] = map[i, j];
-                Merge(arr);
+                for (int j = 0; j < columns; ++j)
+                {
+                    arr[j] = map[i, j];
+                }
+                Merge(arr,Direction.left,i);
                 for (int j = 0; j < columns; ++j) map[i, j] = arr[j];
             }
             return map;
         }
-
         /// <summary>
         /// 右移
         /// </summary>
@@ -267,8 +384,11 @@ namespace GFGGame
             int[] arr = new int[columns];
             for (int i = 0; i < rows; ++i)
             {
-                for (int j = 0; j < columns; ++j) arr[columns - 1 - j] = map[i, j];
-                Merge(arr);
+                for (int j = 0; j < columns; ++j)
+                {
+                    arr[columns - 1 - j] = map[i, j];
+                }
+                Merge(arr,Direction.right,i);
                 for (int j = 0; j < columns; ++j) map[i, j] = arr[columns - 1 - j];
             }
             return map;

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

@@ -10,8 +10,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-     
-
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -45,7 +43,6 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-        
         }
 
         protected override void OnShown()
@@ -53,18 +50,35 @@ namespace GFGGame
             base.OnShown();
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("kfhd_sdcy_bg");
 
+            RefreshTimeText();
 
+            Timers.inst.Add(1, 0, UpdateTime);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(UpdateTime);
         }
-       
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-           
+        }
+
+        private void UpdateTime(object param)
+        {
+            RefreshTimeText();
+        }
+
+        private void RefreshTimeText()
+        {
+            int time = 1000000;
+            string strTime = TimeUtil.FormattingTimeTo_DD_HH_mm(time);
+            string[] str = strTime.Split(':');
+            _ui.m_txtDay.text = str[0];
+            _ui.m_txtHour.text = str[1];
+            _ui.m_txtMinute.text = str[2];
         }
 
         private void OnClickBtnBack()
@@ -81,30 +95,32 @@ namespace GFGGame
 
         private void OnClickBtnMingTong()
         {
+            //副本入口
             PromptController.Instance.ShowFloatTextPrompt("暂未开启");
             //ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
         }
 
         private void OnClickBtnAnswerTianmen()
         {
+            //剧情入口
             PromptController.Instance.ShowFloatTextPrompt("暂未开启");
             //ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
         }
 
         private void OnClickBtnTenShu()
         {
-            int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
-            if (actLuckyBoxId <= 0)
+            int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            if (actLimitId <= 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动未开启");
                 return;
             }
-            ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
+            ViewManager.Show<LuckyBoxActivityView>(new object[]{actLimitId, ConstLimitTimeActivityType.ActLimitStlyc});
         }
 
         private void OnClickBtnNineZhouPool() 
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_ARENA, ConstStoreSubId.STORE_ARENA_ITEM });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoView.cs

@@ -126,7 +126,7 @@ namespace GFGGame
                 _photoInfos = PoemPhotoDataManager.Instance.PersonalPhotoInfos;
                 _sourceType = (int)PictureSourceType.PersonalAlbum;
                 _ui.m_list.numItems = _photoInfos.Count;
-                _ui.m_txtCount.text = string.Format("（{0}/{1}）", _photoInfos.Count, GlobalCfgArray.globalCfg.maxPhotoCount);
+                _ui.m_txtCount.text = string.Format("{0}/{1}", _photoInfos.Count, GlobalCfgArray.globalCfg.maxPhotoCount);
             }
             else
             {
@@ -135,11 +135,11 @@ namespace GFGGame
                 _photoInfos = PoemPhotoDataManager.Instance.WsqsPhotoInfos;
                 _sourceType = (int)PictureSourceType.WanShuiQianShan;
                 _ui.m_listTravel.numItems = _photoInfos.Count;
-                _ui.m_txtCount.text = string.Format("（{0}/{1}）", _photoInfos.Count, RoleDataManager.WanShuiQianShanMaxStorageCount);
+                _ui.m_txtCount.text = string.Format("{0}/{1}", _photoInfos.Count, RoleDataManager.WanShuiQianShanMaxStorageCount);
             }
 
            
-            _ui.m_btnConfirmDelete.m_txtTitle.text = string.Format("删除（{0}/{1}）", _listDelete.Count, _photoInfos.Count);
+            _ui.m_btnConfirmDelete.m_txtTitle.text = string.Format("删除 {0}/{1}", _listDelete.Count, _photoInfos.Count);
         }
 
         private void RenderListItem(int index, GObject obj)
@@ -193,7 +193,7 @@ namespace GFGGame
 
             UI_ComPhotoPostcard item = UI_ComPhotoPostcard.Proxy(obj);
 
-            item.m_imgSelect.visible = _ui.m_c2.selectedIndex == 1 && _listDelete.IndexOf(_photoInfos[index].PictureId) >= 0;
+            item.m_c1.selectedIndex = _ui.m_c2.selectedIndex == 1 && _listDelete.IndexOf(_photoInfos[index].PictureId) >= 0 ? 1 : 0;
             item.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
             item.m_comTravel.m_loaRole.url = "";
             if (poemPhotoData.TravelSuitId > 0)
@@ -311,6 +311,7 @@ namespace GFGGame
             }
 
         }
+
         private void OnBtnUpClick(EventContext context)
         {
             if (_ui.m_c2.selectedIndex == 1)

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

@@ -77,10 +77,8 @@ namespace GFGGame
         {
             base.OnShown();
             _valueBarController.OnShown();
-            // _valueBarController.Controller(7);
 
             UpdateView();
-
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -116,6 +114,8 @@ namespace GFGGame
                 UpdateTime(null);
                 Timers.inst.Add(1, secCount + 2, UpdateTime);
             }
+
+            UpdateRedDots();
         }
 
         private void UpdateTime(object param)
@@ -196,5 +196,10 @@ namespace GFGGame
                 _ui.m_btnPhoto.y + _ui.m_btnPhoto.height + 100);
             GuideController.TryCompleteGuide(ConstGuideId.TRAVEL, 1);
         }
+
+        private void UpdateRedDots()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnFieldGuide, RedDotDataManager.Instance.GetTravelGuideRed(), "", -15, 8);
+        }
     }
 }