Merge branch 'master' of http://192.168.2.10:3000/GFG/Client into yuqian

GameClient/Assets/Editor/ToolsMenu.cs

@@ -40,6 +40,12 @@ namespace GFGEditor
         {
             
         }
+#elif PT_IOS
+        [MenuItem("IOS/")]
+        public static void VersionTag()
+        {
+            
+        }
 #elif PT_DOUYOU
         [MenuItem("DouYou/")]
         public static void VersionTag()

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs

@@ -9,6 +9,7 @@ namespace UI.ActivityThemeLuckyBox
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
+        public UI_ComImgCard m_card;
         public GGraph m_bgEffectHolder;
         public GButton m_btnBack;
         public UI_Button1 m_btnChapter;
@@ -74,6 +75,7 @@ namespace UI.ActivityThemeLuckyBox
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_card = (UI_ComImgCard)UI_ComImgCard.Create(comp.GetChild("card"));
             m_bgEffectHolder = (GGraph)comp.GetChild("bgEffectHolder");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChapter = (UI_Button1)UI_Button1.Create(comp.GetChild("btnChapter"));
@@ -95,6 +97,8 @@ namespace UI.ActivityThemeLuckyBox
         {
             m_c1 = null;
             m_loaBg = null;
+            m_card.Dispose();
+            m_card = null;
             m_bgEffectHolder = null;
             m_btnBack = null;
             m_btnChapter.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ComCardImgRes.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ComCardImgRes.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ComImgCard.cs

@@ -0,0 +1,72 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityThemeLuckyBox
+{
+    public partial class UI_ComImgCard
+    {
+        public GComponent target;
+        public UI_ComCardImgRes m_ComCardImgRes;
+        public const string URL = "ui://ubfk2kobt88a1e";
+        public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
+        public const string RES_NAME = "ComImgCard";
+        private static UI_ComImgCard _proxy;
+
+        public static UI_ComImgCard Create(GObject gObject = null)
+        {
+            var ui = new UI_ComImgCard();
+            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_ComImgCard Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComImgCard();
+            }
+            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_ComCardImgRes = (UI_ComCardImgRes)UI_ComCardImgRes.Create(comp.GetChild("ComCardImgRes"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ComCardImgRes.Dispose();
+            m_ComCardImgRes = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ComImgCard.cs.meta

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

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComCardHolder.cs.meta

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

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

@@ -0,0 +1,72 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComCardObj
+    {
+        public GComponent target;
+        public UI_ComCardHolder m_comCardHolder;
+        public const string URL = "ui://mfvz4q8kt88a9fzx";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComCardObj";
+        private static UI_ComCardObj _proxy;
+
+        public static UI_ComCardObj Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCardObj();
+            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_ComCardObj Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCardObj();
+            }
+            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_comCardHolder = (UI_ComCardHolder)UI_ComCardHolder.Create(comp.GetChild("comCardHolder"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comCardHolder.Dispose();
+            m_comCardHolder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComCardObj.cs.meta

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

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

@@ -9,7 +9,7 @@ namespace UI.Main
         public GComponent target;
         public Controller m_type;
         public UI_ComImgCard m_cardBgIcon;
-        public GGraph m_cardBg;
+        public UI_ComCardObj m_cardBg;
         public GLoader m_loaBg;
         public GComponent m_valueBar;
         public GGraph m_BottomEffectHolder;
@@ -106,7 +106,7 @@ namespace UI.Main
         {
             m_type = comp.GetController("type");
             m_cardBgIcon = (UI_ComImgCard)UI_ComImgCard.Create(comp.GetChild("cardBgIcon"));
-            m_cardBg = (GGraph)comp.GetChild("cardBg");
+            m_cardBg = (UI_ComCardObj)UI_ComCardObj.Create(comp.GetChild("cardBg"));
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_BottomEffectHolder = (GGraph)comp.GetChild("BottomEffectHolder");
@@ -160,6 +160,7 @@ namespace UI.Main
             m_type = null;
             m_cardBgIcon.Dispose();
             m_cardBgIcon = null;
+            m_cardBg.Dispose();
             m_cardBg = null;
             m_loaBg = null;
             m_valueBar = null;

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

@@ -3,6 +3,7 @@ using ET;
 using FairyGUI;
 using System.Collections.Generic;
 using UI.ActivityThemeLuckyBox;
+using UnityEngine;
 
 namespace GFGGame
 {
@@ -64,7 +65,21 @@ namespace GFGGame
 
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res);
-
+            if(_activityId == 5)
+            {
+                _ui.m_card.target.visible = true;
+                float width = 2560;
+                float height = 1920;
+                float proportion = width / height;
+                float targetWidth = proportion * _ui.target.height;
+                _ui.m_card.m_ComCardImgRes.target.width = targetWidth;
+                _ui.m_card.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetBgImgPath("bg_jfyl","jpg");
+            }
+            else
+            {
+                _ui.m_card.target.visible = false;
+            }
+            
             UpdateEffect();
             UpdateRedDot();
             UpdateTime();

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

@@ -172,6 +172,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshBtnNewYearRedEnvelope);
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_RED_CHANGE, UpdateActivityRedDot);
             EventAgent.AddEventListener(ConstMessage.STORY_LEVEL_CHANGE, UpdateNewPlayerReward); 
+            EventAgent.AddEventListener(ConstMessage.CARD_INFO, CardBgRes);
         }
 
         protected override void RemoveEventListener()
@@ -188,6 +189,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_RED_CHANGE, UpdateActivityRedDot);
             EventAgent.RemoveEventListener(ConstMessage.RESET_DAILY_DATA, ResetDailyData);
             EventAgent.RemoveEventListener(ConstMessage.STORY_LEVEL_CHANGE, UpdateNewPlayerReward);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_INFO, CardBgRes);
         }
 
         protected override void OnShown()
@@ -944,23 +946,31 @@ namespace GFGGame
             }
             if(MainDataManager.Instance.CardBgID == 0)
             {
-                _ui.m_cardBgIcon.m_ComCardImgRes.m_loaCard.url = "";
+                _ui.m_cardBgIcon.target.visible = false;
+                _ui.m_cardBg.target.visible = false;
                 return;
             }
             ItemCfg cardItem = ItemCfgArray.Instance.GetCfg(MainDataManager.Instance.CardBgID);
             string resName = cardItem.res;
             string resPath = ResPathUtil.GetCardAnimationPath(resName);
+            var _cardData = CardDataManager.GetCardDataById(MainDataManager.Instance.CardBgID);
             Vector2 omCardImgResTargetSize = new Vector2((ViewGlobal.GetRealTopOffset() + _ui.target.height) * CardDataManager.CardResInitWidth / CardDataManager.CardResInitHight, (ViewGlobal.GetRealTopOffset() + _ui.target.height));
-            if (YooAssets.CheckResExist(resPath))
+            if (_cardData != null && _cardData.itemCfg.animationCardStar > 0
+                && _cardData.star >= _cardData.itemCfg.animationCardStar
+                && YooAssets.CheckResExist(resPath))
             {
                 await LoadManager.Instance.CheckResExsitedOrDownload(resPath);
                 _effectUI1 = new EffectUI();
-                _effectUI1.Reset(_ui.m_cardBg, resName, resName, 110, EffectUIType.Card);
+                _effectUI1.Reset(_ui.m_cardBg.m_comCardHolder.m_holder, resName, resName, 110, EffectUIType.Card);
                 float offY = GRoot.inst.height / 1000;
-                _ui.m_cardBg.y = _ui.m_cardBg.y + (offY*70);
+                _ui.m_cardBg.target.visible = true;
+                _ui.m_cardBgIcon.target.visible = false;
+                _ui.m_cardBg.m_comCardHolder.m_holder.y = _ui.m_cardBg.m_comCardHolder.m_holder.y + (offY*50);
             }
             else
             {
+                _ui.m_cardBg.target.visible = false;
+                _ui.m_cardBgIcon.target.visible = true;
                 _ui.m_cardBgIcon.m_ComCardImgRes.target.size = omCardImgResTargetSize;
                 _ui.m_cardBgIcon.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetCardPath(resName);
             }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeThemeView.cs

@@ -132,6 +132,7 @@ namespace GFGGame
         {
             await ActivitySProxy.SetOnceStatus(MainDataManager.Instance.CardBgKey, 0, 0);
             MainDataManager.Instance.CardBgID = 0;
+            PromptController.Instance.ShowFloatTextPrompt("关闭成功！");
             this.Hide();
         }
         private void AddEffect()