zhangyuqian 1 рік тому
батько
коміт
414dfa4442

+ 0 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComProperty.cs

@@ -9,7 +9,6 @@ namespace UI.Studio
         public GComponent target;
         public Controller m_c1;
         public GLoader m_bg0;
-        public GLoader m_bg1;
         public GList m_list;
         public GTextField m_txtNum;
         public GButton m_btnBuy;
@@ -68,7 +67,6 @@ namespace UI.Studio
         {
             m_c1 = comp.GetController("c1");
             m_bg0 = (GLoader)comp.GetChild("bg0");
-            m_bg1 = (GLoader)comp.GetChild("bg1");
             m_list = (GList)comp.GetChild("list");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
@@ -83,7 +81,6 @@ namespace UI.Studio
         {
             m_c1 = null;
             m_bg0 = null;
-            m_bg1 = null;
             m_list = null;
             m_txtNum = null;
             m_btnBuy = null;

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioBuyNumUI.cs

@@ -18,6 +18,8 @@ namespace UI.Studio
         public GComponent m_comCostCurrent;
         public GButton m_btnBuy;
         public GButton m_btnBack;
+        public GGraph m_LeftTopEffect;
+        public GGraph m_RightDownEffect;
         public const string URL = "ui://xz8kxrecn3xhh";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioBuyNumUI";
@@ -76,6 +78,8 @@ namespace UI.Studio
             m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_LeftTopEffect = (GGraph)comp.GetChild("LeftTopEffect");
+            m_RightDownEffect = (GGraph)comp.GetChild("RightDownEffect");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -90,6 +94,8 @@ namespace UI.Studio
             m_comCostCurrent = null;
             m_btnBuy = null;
             m_btnBack = null;
+            m_LeftTopEffect = null;
+            m_RightDownEffect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioFilingRewardUI.cs

@@ -12,6 +12,8 @@ namespace UI.Studio
         public GList m_list;
         public GButton m_btnGet;
         public GButton m_btnBack;
+        public GGraph m_LeftTopEffect;
+        public GGraph m_RightDownEffect;
         public const string URL = "ui://xz8kxrecrqo41k";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioFilingRewardUI";
@@ -64,6 +66,8 @@ namespace UI.Studio
             m_list = (GList)comp.GetChild("list");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_LeftTopEffect = (GGraph)comp.GetChild("LeftTopEffect");
+            m_RightDownEffect = (GGraph)comp.GetChild("RightDownEffect");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +76,8 @@ namespace UI.Studio
             m_list = null;
             m_btnGet = null;
             m_btnBack = null;
+            m_LeftTopEffect = null;
+            m_RightDownEffect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 17 - 0
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs

@@ -19,6 +19,9 @@ namespace GFGGame
         private const int BUY_TYPE_0 = 0;
         private const int BUY_TYPE_1 = 1;
 
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -26,6 +29,10 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
             base.Dispose();
         }
 
@@ -41,6 +48,7 @@ namespace GFGGame
             _ui.m_btnExchange.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_0); });
             _ui.m_btnBuy.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_1); });
             _ui.m_btnBack.onClick.Add(this.Hide);
+            AddEffect();
 
         }
         protected override void AddEventListener()
@@ -94,6 +102,15 @@ namespace GFGGame
         {
             base.OnHide();
         }
+
+        private void AddEffect()
+        {
+            //边框左上角特效
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_LeftTopEffect, "ui_Activity", "Com_window_L_up");
+
+            //边框右下角特效
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_RightDownEffect, "ui_Activity", "Com_window_R_Down");
+        }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();

+ 15 - 0
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs

@@ -12,6 +12,8 @@ namespace GFGGame
     {
         private UI_StudioFilingRewardUI _ui;
         private List<int> rewardList;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
 
         public override void Dispose()
         {
@@ -20,6 +22,10 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
             base.Dispose();
         }
 
@@ -36,6 +42,7 @@ namespace GFGGame
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_btnGet.onClick.Add(OnBtnGetClcik);
             _ui.m_btnBack.onClick.Add(this.Hide);
+            AddEffect();
         }
         protected override void AddEventListener()
         {
@@ -62,6 +69,14 @@ namespace GFGGame
             _ui.m_list.ScrollToView(0);
         }
 
+        private void AddEffect()
+        {
+            //边框左上角特效
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_LeftTopEffect, "ui_Activity", "Com_window_L_up");
+
+            //边框右下角特效
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_RightDownEffect, "ui_Activity", "Com_window_R_Down");
+        }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();

+ 11 - 10
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -8,10 +8,8 @@ namespace GFGGame
 {
     public class StudioPropertyView : StudioBaseView
     {
-        // private GList _listProperty;
-        private GComponent com;
+        //private GList _listProperty;
         private GLoader _bg0;
-        private GLoader _bg1;
         private GLoader _btnChageLine;
         private Controller _croProperty;
         private int _propertySelectIndex = 0;
@@ -28,24 +26,26 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             // _ui.m_listProperty.itemRenderer = ListPropertyItemRender;
             // _ui.m_listProperty.onClickItem.Add(OnClickListProperty);
-            com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComProperty").asCom;
+            //com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComProperty").asCom;
             //AddChildCom(com, false);
             //list.itemRenderer = ListItemRender;
-            _croProperty = com.GetController("c1");
 
-            _bg0 = com.GetChild("bg0").asLoader;
-            _bg1 = com.GetChild("bg1").asLoader;
-            _btnChageLine = com.GetChild("btnChageLine").asLoader;
         }
 
         protected override void OnShown()
         {
-            AddChildCom(com, false);
+            GComponent com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComProperty").asCom;
+            AddChildCom(com);
+            _croProperty = com.GetController("c1");
+
+            _bg0 = com.GetChild("bg0").asLoader;
+            _btnChageLine = com.GetChild("btnChageLine").asLoader;
+
             list.itemRenderer = ListItemRender;
             _croProperty.onChanged.Add(OnControllerChange);
 
             _bg0.url = ResPathUtil.GetBgImgPath("bg_fhl");
-            _bg1.url = "ui://Studio/lm_db_chang_2";
+            //_bg1.url = "ui://Studio/lm_db_chang_2";
             _btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
             
             _propertySelectIndex = this.viewData == null ? 0 : (int)this.viewData;
@@ -75,6 +75,7 @@ namespace GFGGame
 
             
             base.OnShown();
+            com.height = _ui.target.height;
             _ui.m_loaBg.visible = false;
         }
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -102,7 +102,7 @@ namespace GFGGame
         }
         private void OnComProperty()
         {
-            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 1);
+            //LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPropertyView).FullName, true)) return;
             ViewManager.Show<StudioPropertyView>(null, new object[] { typeof(StudioView).FullName, this.viewData });

BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes