Merge remote-tracking branch 'remotes/origin/master' into dev

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

@@ -73,7 +73,7 @@ namespace GFGGame
                 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");
+                _ui.m_card.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetBgImgPath("bg_jfyl","jpg");
             }
             else
             {

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

@@ -955,9 +955,9 @@ namespace GFGGame
             {
                 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.m_comCardHolder.m_holder.y = _ui.m_cardBg.m_comCardHolder.m_holder.y + (offY*50);
             }
             else
             {