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

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

@@ -351,6 +351,14 @@ namespace GFGGame
         //茶话会奖励是否可以领取
         public bool CheckTeaPartyRewardCanGet()
         {
+            var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
+            //该活动暂未开启
+            if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo && roleTeapartyInfo.IsNoActDayEnterLeague)
+                return false;
+            //该玩法不可以重复参加哦
+            if (roleTeapartyInfo.IsQuitTeaParty && roleTeapartyInfo.LastOpenCfgId != 0 && roleTeapartyInfo.LastOpenCfgId == LeagueDataManager.Instance.TeaPartyId)
+                return false;
+
             var teapartyRewardRoleCfg = TeapartyRewardRoleCfgArray.Instance.dataArray;
             var teapartyRewardLeagueCfgs = TeapartyRewardLeagueCfgArray.Instance.GetCfgsByid(LeagueDataManager.Instance.TeaPartyId);
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearRedEnvelope.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: be1ea0f07aea1ce41bf400950b3898a9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearRedEnvelope/UI_Button1.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.NewYearRedEnvelope
+{
+    public partial class UI_Button1
+    {
+        public GButton target;
+        public Controller m_ButtonType;
+        public GRichTextField m_txtTime;
+        public const string URL = "ui://pt3t9f1ujsko7";
+        public const string PACKAGE_NAME = "NewYearRedEnvelope";
+        public const string RES_NAME = "Button1";
+        private static UI_Button1 _proxy;
+
+        public static UI_Button1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button1();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_ButtonType = comp.GetController("ButtonType");
+            m_txtTime = (GRichTextField)comp.GetChild("txtTime");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ButtonType = null;
+            m_txtTime = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearRedEnvelope/UI_Button1.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearRedEnvelope/UI_NewYearRedEnvelopeUI.cs

@@ -0,0 +1,91 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.NewYearRedEnvelope
+{
+    public partial class UI_NewYearRedEnvelopeUI
+    {
+        public GComponent target;
+        public Controller m_titleImgType;
+        public Controller m_openType;
+        public GButton m_btnOpen;
+        public GRichTextField m_txtTime;
+        public UI_Button1 m_btnGet;
+        public UI_Button1 m_btnDoubleGet;
+        public GRichTextField m_textGetNum;
+        public const string URL = "ui://pt3t9f1ujsko0";
+        public const string PACKAGE_NAME = "NewYearRedEnvelope";
+        public const string RES_NAME = "NewYearRedEnvelopeUI";
+        private static UI_NewYearRedEnvelopeUI _proxy;
+
+        public static UI_NewYearRedEnvelopeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NewYearRedEnvelopeUI();
+            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_NewYearRedEnvelopeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NewYearRedEnvelopeUI();
+            }
+            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_titleImgType = comp.GetController("titleImgType");
+            m_openType = comp.GetController("openType");
+            m_btnOpen = (GButton)comp.GetChild("btnOpen");
+            m_txtTime = (GRichTextField)comp.GetChild("txtTime");
+            m_btnGet = (UI_Button1)UI_Button1.Create(comp.GetChild("btnGet"));
+            m_btnDoubleGet = (UI_Button1)UI_Button1.Create(comp.GetChild("btnDoubleGet"));
+            m_textGetNum = (GRichTextField)comp.GetChild("textGetNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_titleImgType = null;
+            m_openType = null;
+            m_btnOpen = null;
+            m_txtTime = null;
+            m_btnGet.Dispose();
+            m_btnGet = null;
+            m_btnDoubleGet.Dispose();
+            m_btnDoubleGet = null;
+            m_textGetNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearRedEnvelope/UI_NewYearRedEnvelopeUI.cs.meta

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

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

@@ -450,12 +450,14 @@ namespace GFGGame
                 tArray.Add(i);
             }
             RandomCardList(tArray, numCount);
+            int j = 0;
             for (int i = 0; i < cardNum; i += 4)
             {
-                cardArray[i] = tArray[i];
-                cardArray[i + 1] = tArray[i];
-                cardArray[i + 2] = tArray[i];
-                cardArray[i + 3] = tArray[i];
+                cardArray[i] = tArray[j];
+                cardArray[i + 1] = tArray[j];
+                cardArray[i + 2] = tArray[j];
+                cardArray[i + 3] = tArray[j];
+                j++;
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/NewYearRedEnvelope.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ccf973b9578e2f5438efa30138578858
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,75 @@
+using FairyGUI;
+using ET;
+using UI.NewYearRedEnvelope;
+
+namespace GFGGame
+{
+    public class NewYearRedEnvelopeView : BaseWindow
+    {
+        private UI_NewYearRedEnvelopeUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_NewYearRedEnvelopeUI.PACKAGE_NAME;
+            _ui = UI_NewYearRedEnvelopeUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            //viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_btnOpen.onClick.Add(OnClickBtnOpen);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            //EventAgent.AddEventListener(ConstMessage.MAIL_REFRESH, RefreshList);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            //EventAgent.RemoveEventListener(ConstMessage.MAIL_REFRESH, RefreshList);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            Timers.inst.Add(1, 0, UpdateTime);
+        }
+
+        private void UpdateTime(object param)
+        {
+            int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLimitId);
+            long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
+            string strTime = TimeUtil.FormattingTimeTo_DD_HH_mm(time);
+            _ui.m_txtTime.text = strTime;
+            UI_Button1 btn = UI_Button1.Proxy(_ui.m_btnDoubleGet.target);
+            btn.m_txtTime.text = strTime;
+            UI_Button1.ProxyEnd();
+        }
+
+        private void OnClickBtnOpen(EventContext context)
+        {
+
+            _ui.m_openType.selectedIndex = 1;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            Timers.inst.Remove(UpdateTime);
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -96,7 +96,6 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.FILLING_CHANGE_CHAPTER, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, OnLimitChanged);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-            EventAgent.RemoveEventListener(ConstMessage.STUDIO_FILING_UPDATE, UpdateView);
 
         }
 
@@ -223,7 +222,6 @@ namespace GFGGame
                 return;
             }
             ViewManager.Show<ClothingSyntheticView>(new object[] { _studioCfg.suitId }, false);
-            EventAgent.AddEventListener(ConstMessage.STUDIO_FILING_UPDATE, UpdateView);
             //if (_viewData == StudioDataManager.Instance.GetLuckyBoxActivityID())
             //{
             //    int _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);

GameClient/Assets/ResIn/UI/NewYearRedEnvelope.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d5c6a50dfec803d4cbe16c57bf005abe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_9!a.png.meta → GameClient/Assets/ResIn/UI/NewYearRedEnvelope/NewYearRedEnvelope_atlas0!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 23cd6a994bf961b4b9bd7428cb851f33
+guid: f79958547ae560140949b5924ddf0308
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_9.png.meta → GameClient/Assets/ResIn/UI/NewYearRedEnvelope/NewYearRedEnvelope_atlas0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 948a4a39b5437b041bf8fd286dab80a9
+guid: 1f7984d258c89e348858fd9f5c5817be
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/NewYearRedEnvelope/NewYearRedEnvelope_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fc2ebb1ef775293409655118dbceb38c
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: