直购修改，登录修改

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZGTHgiftDCTipsUI.cs

@@ -10,7 +10,7 @@ namespace UI.ActivityMain
         public GLoader m_suitIcon;
         public GTextField m_txtName;
         public GList m_Itemlist;
-        public GButton m_btnCharge;
+        public UI_Button12 m_btnCharge;
         public GTextField m_timeText;
         public GButton m_btnClose;
         public GTextField m_discountText;
@@ -70,7 +70,7 @@ namespace UI.ActivityMain
             m_suitIcon = (GLoader)comp.GetChild("suitIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_Itemlist = (GList)comp.GetChild("Itemlist");
-            m_btnCharge = (GButton)comp.GetChild("btnCharge");
+            m_btnCharge = (UI_Button12)UI_Button12.Create(comp.GetChild("btnCharge"));
             m_timeText = (GTextField)comp.GetChild("timeText");
             m_btnClose = (GButton)comp.GetChild("btnClose");
             m_discountText = (GTextField)comp.GetChild("discountText");
@@ -86,6 +86,7 @@ namespace UI.ActivityMain
             m_suitIcon = null;
             m_txtName = null;
             m_Itemlist = null;
+            m_btnCharge.Dispose();
             m_btnCharge = null;
             m_timeText = null;
             m_btnClose = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZGTHgiftTipsUI.cs

@@ -8,7 +8,7 @@ namespace UI.ActivityMain
     {
         public GComponent target;
         public GList m_Itemlist;
-        public GButton m_btnBuy;
+        public UI_Button13 m_btnBuy;
         public GButton m_btnClose;
         public GTextField m_timeText;
         public GImage m_TipImg;
@@ -64,7 +64,7 @@ namespace UI.ActivityMain
         private void Init(GComponent comp)
         {
             m_Itemlist = (GList)comp.GetChild("Itemlist");
-            m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_btnBuy = (UI_Button13)UI_Button13.Create(comp.GetChild("btnBuy"));
             m_btnClose = (GButton)comp.GetChild("btnClose");
             m_timeText = (GTextField)comp.GetChild("timeText");
             m_TipImg = (GImage)comp.GetChild("TipImg");
@@ -76,6 +76,7 @@ namespace UI.ActivityMain
         public void Dispose(bool disposeTarget = false)
         {
             m_Itemlist = null;
+            m_btnBuy.Dispose();
             m_btnBuy = null;
             m_btnClose = null;
             m_timeText = null;

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ZGTHgiftDCTipsView.cs

@@ -43,7 +43,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_Itemlist.itemRenderer = ListItemRender;
-            _ui.m_btnCharge.onClick.Add(OnBtnGetClick);
+            _ui.m_btnCharge.target.onClick.Add(OnBtnGetClick);
             _ui.m_btnClose.onClick.Add(this.Hide);
             _ui.m_notTips.onClick.Add(OnClickTips);
         }
@@ -100,12 +100,12 @@ namespace GFGGame
             if (remainBuyNum == 0)
             {
                 //已售完
-                _ui.m_btnCharge.visible = false;
+                _ui.m_btnCharge.target.visible = false;
             }
             else
             {
                 //未售完
-                _ui.m_btnCharge.visible = true;
+                _ui.m_btnCharge.target.visible = true;
             }
 
         }
@@ -137,21 +137,22 @@ namespace GFGGame
             _ui.m_suitIcon.url = string.Format("ui://ActivityMain/{0}", suitCfg.res);
             _ui.m_Itemlist.numItems = item.itemsArr.Length;
             _ui.m_txtName.text = suitCfg.name;
-            _ui.m_btnCharge.GetChild("title").text = string.Format("{0}元/购买", shopCfg.configPrice.ToString());
+            _ui.m_btnCharge.target.GetChild("txtPrice").text = string.Format("{0}", shopCfg.configPrice.ToString());
+            _ui.m_btnCharge.target.GetChild("txtOriginalPrice").text = string.Format("{0}", shopCfg.originalPrice.ToString());
             _ui.m_discountText.text = discount.ToString();
             int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
             if (shopCfg.maxBuyNum == 0 || buyNum < shopCfg.maxBuyNum)
             {
-                _ui.m_btnCharge.visible = true;
+                _ui.m_btnCharge.target.visible = true;
             }
             else
             {
-                _ui.m_btnCharge.visible = false;
+                _ui.m_btnCharge.target.visible = false;
             }
             //判断这个直购id是否购买是否显示按钮
             if (false)
             {
-                _ui.m_btnCharge.visible = false;
+                _ui.m_btnCharge.target.visible = false;
             }
         }
 
@@ -197,7 +198,7 @@ namespace GFGGame
             if (timeSale <= 0)
             {
                 _ui.m_timeText.text = "";
-                _ui.m_btnCharge.visible = false;
+                _ui.m_btnCharge.target.visible = false;
                 Timers.inst.Remove(UpdateTime);
                 return;
             }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ZGTHgiftTipsView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
 
             _ui.m_Itemlist.itemRenderer = ListItemRender;
 
-            _ui.m_btnBuy.onClick.Add(OnBtnGetClick);
+            _ui.m_btnBuy.target.onClick.Add(OnBtnGetClick);
             _ui.m_btnClose.onClick.Add(this.Hide);
             _ui.m_notTips.onClick.Add(OnClickTips);
         }
@@ -67,13 +67,14 @@ namespace GFGGame
             int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
             if (shopCfg.maxBuyNum == 0 || buyNum < shopCfg.maxBuyNum)
             {
-                _ui.m_btnBuy.visible = true;
+                _ui.m_btnBuy.target.visible = true;
             }
             else
             {
-                _ui.m_btnBuy.visible = false;
+                _ui.m_btnBuy.target.visible = false;
             }
-            _ui.m_btnBuy.GetChild("title").text = string.Format("{0}元/购买", shopCfg.configPrice.ToString());
+            _ui.m_btnBuy.target.GetChild("txtPrice").text = string.Format("{0}", shopCfg.configPrice.ToString());
+            _ui.m_btnBuy.target.GetChild("txtOriginalPrice").text = string.Format("{0}", shopCfg.originalPrice.ToString());
 
             var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(6002);
             long endTime = 0;
@@ -85,7 +86,7 @@ namespace GFGGame
             if (leftTime <= 0)
             {
                 _ui.m_timeText.text = "";
-                _ui.m_btnBuy.visible = false;
+                _ui.m_btnBuy.target.visible = false;
                 Timers.inst.Remove(UpdateTime);
                 return;
             }
@@ -108,7 +109,7 @@ namespace GFGGame
         }
         private void OnBtnGetClick()
         {
-            _ui.m_btnBuy.visible = false;
+            _ui.m_btnBuy.target.visible = false;
             ReqShopBuy(shopId).Coroutine();
         }
         private void UpdateBtn()
@@ -117,12 +118,12 @@ namespace GFGGame
             if (remainBuyNum == 0)
             {
                 //已售完
-                _ui.m_btnBuy.visible = false;
+                _ui.m_btnBuy.target.visible = false;
             }
             else
             {
                 //未售完
-                _ui.m_btnBuy.visible = true;
+                _ui.m_btnBuy.target.visible = true;
             }
             
         }
@@ -161,7 +162,7 @@ namespace GFGGame
             if (leftTime <= 0)
             {
                 _ui.m_timeText.text = "";
-                _ui.m_btnBuy.visible = false;
+                _ui.m_btnBuy.target.visible = false;
                 Timers.inst.Remove(UpdateTime);
                 return;
             }

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

@@ -57,7 +57,7 @@ namespace GFGGame
             _ui.m_loaEventa.onClick.Add(() => { FullScreenTextController.Show("event:a"); });
             _ui.m_loaEventb.onClick.Add(() => { FullScreenTextController.Show("event:b"); });
             _ui.m_loaEventc.onClick.Add(() => { FullScreenTextController.Show("event:c"); });
-            //_ui.m_btnAgree.onClick.Add(OnBtnAgreeCklick);
+            _ui.m_btnAgree.onClick.Add(OnBtnAgreeCklick);
         }
         protected override void AddEventListener()
         {
@@ -78,7 +78,7 @@ namespace GFGGame
             ServerInfosComponent serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
             ServerInfo recentlyServerInfo = serverInfosComponent.recentlyServerInfo;
             UpdateServer(recentlyServerInfo);
-            //_ui.m_btnAgree.selected = LocalCache.GetBool(GameConst.LAST_LOGIN_IS_AGREE_KEY, false);
+            _ui.m_btnAgree.selected = LocalCache.GetBool(GameConst.LAST_LOGIN_IS_VISITOR_KEY, false);
             _ui.m_btnAgree.selected = true;
 
             if(GameConfig.openTime > TimeHelper.ClientNow())
@@ -239,5 +239,9 @@ namespace GFGGame
             _ui.m_btnTapLogin.visible = QDManager.IsTaptap;
             _ui.m_btnStart.visible = !QDManager.IsTaptap;
         }
+        private void OnBtnAgreeCklick()
+        {
+            LocalCache.SetBool(LauncherConfig.LAST_LOGIN_IS_AGREE_KEY, _ui.m_btnAgree.selected);
+        }
     }
 }

GameClient/Assets/Game/Launcher/LauncherController.cs

@@ -19,7 +19,8 @@ namespace GFGGame
             HttpTool.Instance.Get(url, (string json) =>
             {
                 LauncherConfig.InitPlatform(json);
-                CheckShowAgreeView(CheckGameStatus);
+                //CheckShowAgreeView(CheckGameStatus);
+                CheckGameStatus();
             });
         }