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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -11,6 +11,7 @@ namespace UI.LuckyBox
         public Controller m_ctrlRewardsType;
         public GLoader m_bg;
         public GGraph m_holder_star;
+        public GGraph m_holder_star_sky;
         public GGraph m_holder_bg;
         public GGraph m_holder_cloud;
         public GButton m_btnBack;
@@ -102,6 +103,7 @@ namespace UI.LuckyBox
             m_ctrlRewardsType = comp.GetController("ctrlRewardsType");
             m_bg = (GLoader)comp.GetChild("bg");
             m_holder_star = (GGraph)comp.GetChild("holder_star");
+            m_holder_star_sky = (GGraph)comp.GetChild("holder_star_sky");
             m_holder_bg = (GGraph)comp.GetChild("holder_bg");
             m_holder_cloud = (GGraph)comp.GetChild("holder_cloud");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -149,6 +151,7 @@ namespace UI.LuckyBox
             m_ctrlRewardsType = null;
             m_bg = null;
             m_holder_star = null;
+            m_holder_star_sky = null;
             m_holder_bg = null;
             m_holder_cloud = null;
             m_btnBack = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleLvUp/UI_RoleLvUpUI.cs

@@ -7,9 +7,12 @@ namespace UI.RoleLvUp
     public partial class UI_RoleLvUpUI
     {
         public GComponent target;
+        public GGroup m_downTipsText;
+        public GGraph m_holderTitle;
         public GTextField m_txtLv;
         public GTextField m_txtLastLv;
         public GTextField m_txtCurLv;
+        public GGraph m_holderNumber;
         public UI_Component1 m_com0;
         public UI_Component2 m_com1;
         public const string URL = "ui://ns2d6qb2mueb0";
@@ -59,17 +62,23 @@ namespace UI.RoleLvUp
 
         private void Init(GComponent comp)
         {
+            m_downTipsText = (GGroup)comp.GetChild("downTipsText");
+            m_holderTitle = (GGraph)comp.GetChild("holderTitle");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtLastLv = (GTextField)comp.GetChild("txtLastLv");
             m_txtCurLv = (GTextField)comp.GetChild("txtCurLv");
+            m_holderNumber = (GGraph)comp.GetChild("holderNumber");
             m_com0 = (UI_Component1)UI_Component1.Create(comp.GetChild("com0"));
             m_com1 = (UI_Component2)UI_Component2.Create(comp.GetChild("com1"));
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_downTipsText = null;
+            m_holderTitle = null;
             m_txtLv = null;
             m_txtLastLv = null;
             m_txtCurLv = null;
+            m_holderNumber = null;
             m_com0.Dispose();
             m_com0 = null;
             m_com1.Dispose();

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -26,6 +26,7 @@ namespace GFGGame
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
         private EffectUI _effectUI3;
+        private EffectUI _effectUI4;
         private GObject curComStar;//当前选中的星星
         private Vector2 lastPos;//鼠标的上一个位置，每颗星星初始时默认为Vector2.right;
 
@@ -44,6 +45,8 @@ namespace GFGGame
             _effectUI2 = null;
             EffectUIPool.Recycle(_effectUI3);
             _effectUI3 = null;
+            EffectUIPool.Recycle(_effectUI4);
+            _effectUI4 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -103,6 +106,7 @@ namespace GFGGame
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holder_star, "ui_LuckyBox", "bg_liuxing");
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holder_bg, "ui_LuckyBox", "bg_thing");
             _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holder_cloud, "ui_LuckyBox", "bg_cloud");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_holder_star_sky, "ui_LuckyBox", "Bg_Sky_lizi");
         }
         protected override void OnShown()
         {
@@ -178,7 +182,7 @@ namespace GFGGame
             else
             {
                 gcom = UIPackage.CreateObject("LuckyBox", "ComHolder").asCom;
-                EffectUI _effectUI = EffectUIPool.CreateEffectUI(gcom.GetChild("holder").asGraph, "ui_LuckyBox", name);
+                EffectUI _effectUI = EffectUIPool.CreateEffectUI(gcom.GetChild("holder").asGraph, "ui_LuckyBox", name,120);
                 dicEffect.Add(_effectUI);
             }
             return gcom;
@@ -219,7 +223,7 @@ namespace GFGGame
                     comStar.target.GetChildAt(2).asCom.visible = true;
                     // comStar.target.GetChildAt(1).asCom.visible = false;
                     string resPath = _isLuckyBox ? "LINE_Bule" : "LINE";
-                    EffectUI _effectUI = EffectUIPool.CreateEffectUI(comStar.m_comLine.m_holder, "ui_LuckyBox", resPath);
+                    EffectUI _effectUI = EffectUIPool.CreateEffectUI(comStar.m_comLine.m_holder, "ui_LuckyBox", resPath,120);
                     effObj.Add(_effectUI);
                     UI_ComStar.ProxyEnd();
 

GameClient/Assets/Game/HotUpdate/Views/RoleLvUp/RoleLvUpView.cs

@@ -8,11 +8,19 @@ namespace GFGGame
 {
     public class RoleLvUpView : BaseWindow
     {
-
         private UI_RoleLvUpUI _ui;
         private int oldLvValue;
+
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -30,7 +38,7 @@ namespace GFGGame
             this.viewCom.Center();
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
-
+            AddEffect();
         }
 
         protected override void OnShown()
@@ -66,5 +74,14 @@ namespace GFGGame
                 // ViewManager.Show(viewName, null, null, true);
             }
         }
+
+        private void AddEffect()
+        {
+            //ÉýźśłÉšŚĚŘЧ
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_sj", "SJ");
+
+            //ľČźśĚŘЧ
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderNumber, "ui_sj", "SJ_Number");
+        }
     }
 }