zhangyuqian 1 жил өмнө
parent
commit
1d5453439c
24 өөрчлөгдсөн 53 нэмэгдсэн , 5 устгасан
  1. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GetSuitItemUI.cs
  2. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxNewCardUI.cs
  3. 13 0
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs
  4. 0 1
      GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs
  5. 13 0
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewCardView.cs
  6. 21 4
      GameClient/Assets/Game/HotUpdate/Views/Share/ShareView.cs
  7. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  8. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  9. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  10. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  11. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png
  12. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png
  13. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png
  14. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png
  15. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png
  16. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5.png
  18. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6.png
  20. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7.png
  22. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  23. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes
  24. BIN
      GameClient/Assets/ResIn/UI/Share/Share_fui.bytes

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GetSuitItemUI.cs

@@ -13,6 +13,7 @@ namespace UI.CommonGame
         public GTextField m_txtName;
         public GLoader m_icon;
         public GComponent m_item;
+        public GLoader m_btnShare;
         public const string URL = "ui://eg2y0ldptu965e";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "GetSuitItemUI";
@@ -66,6 +67,7 @@ namespace UI.CommonGame
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_icon = (GLoader)comp.GetChild("icon");
             m_item = (GComponent)comp.GetChild("item");
+            m_btnShare = (GLoader)comp.GetChild("btnShare");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,6 +77,7 @@ namespace UI.CommonGame
             m_txtName = null;
             m_icon = null;
             m_item = null;
+            m_btnShare = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxNewCardUI.cs

@@ -8,6 +8,7 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_btnShare;
         public Transition m_t_open;
         public Transition m_t_close;
         public const string URL = "ui://drx9d1usv95q37";
@@ -58,12 +59,14 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnShare = (GLoader)comp.GetChild("btnShare");
             m_t_open = comp.GetTransition("t_open");
             m_t_close = comp.GetTransition("t_close");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_btnShare = null;
             m_t_open = null;
             m_t_close = null;
             if(disposeTarget && target != null)

+ 13 - 0
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -43,6 +43,7 @@ namespace GFGGame
 
             _dressUpObjUI = new DressUpObjUI("SceneDressUp",onShowAction);
             _ui.m_loaBg.onClick.Add(OnClickBg);
+            _ui.m_btnShare.onClick.Add(OnClickShare);
 
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderEffect, "ui_ck", "ui_ck_tz");
         }
@@ -66,6 +67,14 @@ namespace GFGGame
             {
                 _ui.m_icon.x = 0;
             }
+            if (!GetSuitItemController.isAuto)
+            {
+                _ui.m_btnShare.visible = true;
+            }
+            else
+            {
+                _ui.m_btnShare.visible = false;
+            }
             UpdateView(suitId);
             Timers.inst.Add(0.5f, 1, OnTimerClick);
         }
@@ -103,6 +112,10 @@ namespace GFGGame
             }
         }
 
+        private void OnClickShare()
+        {
+            ShareDataManager.Instance.CaptureCameraToImage();
+        }
         private void UpdateItem(int itemdId)
         {
             UI_LuckyBoxBonusItem itemUI = UI_LuckyBoxBonusItem.Proxy(_ui.m_item);

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -38,7 +38,6 @@ namespace GFGGame
             float height = width * tex.height / tex.width;
             _ui.m_imgRes.SetSize(width, height);
             _ui.m_imgBorder.SetSize(width, height + 12);
-            _ui.m_share.visible = false;
             Timers.inst.AddUpdate(CheckGuide);
         }
 

+ 13 - 0
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewCardView.cs

@@ -31,6 +31,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_loaBg.onClick.Add(OnClickBg);
+            _ui.m_btnShare.onClick.Add(OnClickShare);
         }
         protected override void AddEventListener()
         {
@@ -44,6 +45,14 @@ namespace GFGGame
 
             _cardId = (int)this.viewData;
             // _newCardList = new List<int>((this.viewData as object[])[0] as List<int>);
+            if (!GetSuitItemController.isAuto)
+            {
+                _ui.m_btnShare.visible = true;
+            }
+            else
+            {
+                _ui.m_btnShare.visible = false;
+            }
             updateView();
             Timers.inst.Add(0.5f, 1, OnTimerClick);
         }
@@ -77,6 +86,10 @@ namespace GFGGame
                 this.Hide();
             }
         }
+        private void OnClickShare()
+        {
+            ShareDataManager.Instance.CaptureCameraToImage();
+        }
 
     }
 }

+ 21 - 4
GameClient/Assets/Game/HotUpdate/Views/Share/ShareView.cs

@@ -12,7 +12,7 @@ using UI.Share;
 
 namespace GFGGame
 {
-    public class ShareView : BaseView
+    public class ShareView : BaseWindow
     {
         private UI_ShareUI _ui;
         public override void Dispose()
@@ -32,19 +32,21 @@ namespace GFGGame
             _ui = UI_ShareUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            isReturnView = true;
 
             _ui.m_btnShare.onClick.Add(BtnOnclickShare);
             _ui.m_btnClose.onClick.Add(this.Hide);
             _ui.m_btnShareWB.onClick.Add(BtnOnclickShareWb);
             _ui.m_btnShareWX.onClick.Add(BtnOnClickShareWX);
+            _ui.m_btnShareQQ.onClick.Add(BtnOnClickShareQQ);
+            _ui.m_btnShareQQZone.onClick.Add(BtnOnClickShareQQPlatform);
+            _ui.m_btnShareDouYin.onClick.Add(BtnOnClickShareDouYin);
         }
         protected override void OnShown()
         {
             base.OnShown();
             _ui.m_btnShareWB.visible = false;
-            _ui.m_btnShareQQ.visible = false;
-            _ui.m_btnShareQQZone.visible = false;
+            //_ui.m_btnShareQQ.visible = false;
+            //_ui.m_btnShareQQZone.visible = false;
             _ui.m_btnShareDouYin.visible = false;
             RoleInfoManager.Instance.UpdateHead(_ui.m_head, RoleDataManager.headId, RoleDataManager.headBorderId);
             _ui.m_levelText.text = RoleDataManager.lvl.ToString();
@@ -72,6 +74,21 @@ namespace GFGGame
             ShareDataManager.Instance.CaptureCameraToImage(false);
             ShareSDKFun(PlatformType.WeChat);
         }
+        private void BtnOnClickShareQQ()
+        {
+            ShareDataManager.Instance.CaptureCameraToImage(false);
+            ShareSDKFun(PlatformType.QQ);
+        }
+        private void BtnOnClickShareQQPlatform()
+        {
+            ShareDataManager.Instance.CaptureCameraToImage(false);
+            ShareSDKFun(PlatformType.QQPlatform);
+        }
+        private void BtnOnClickShareDouYin()
+        {
+            ShareDataManager.Instance.CaptureCameraToImage(false);
+            ShareSDKFun(PlatformType.Douyin);
+        }
         private void ShareSDKFun(PlatformType platformType)
         {
             QDShareManager.Instance.SubmitPolicyGrantResult();

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Share/Share_fui.bytes