公用机提交

FGUIProject/assets/CommonGame/RewardUI.xml

@@ -4,12 +4,9 @@
     <loader id="n11_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n1_m9wm" name="imgTitle" src="m9wm8r" fileName="images/gxhd_btbt.png" xy="0,300" group="n8_m9wm">
-      <relation target="" sidePair="center-center"/>
-    </image>
+    <graph id="n12_ruej" name="holderTitle" xy="580,500" size="69,35" group="n8_m9wm"/>
     <component id="n6_m9wm" name="comListReward" src="kztethp" fileName="components/ComListReward.xml" xy="49,577" size="1000,1030" group="n8_m9wm"/>
-    <graph id="n12_ruej" name="holderTitle" xy="179,278" size="69,35" group="n8_m9wm"/>
-    <group id="n8_m9wm" name="grp" xy="0,278" size="1080,1329" advanced="true"/>
+    <group id="n8_m9wm" name="grp" xy="49,500" size="1000,1107" advanced="true"/>
     <text id="n7_m9wm" name="n7" xy="430,1822" size="220,49" fontSize="36" color="#958163" text="点击屏幕继续">
       <relation target="" sidePair="bottom-bottom"/>
     </text>

FGUIProject/assets/CommonGame/components/ListRewardItem.xml

@@ -2,6 +2,7 @@
 <component size="400,450" overflow="hidden">
   <displayList>
     <component id="n2_m9wm" name="comRewardItem" src="wet2tae" fileName="components/ComRewardItem.xml" xy="98,109" pivot="0.5,0.45"/>
-    <movieclip id="n10_kzte" name="effect" src="wet2td7" fileName="effect/MovieClip2.jta" xy="-16,-50" blend="add"/>
+    <movieclip id="n10_kzte" name="effect" src="wet2td7" fileName="effect/MovieClip2.jta" xy="-16,-50" visible="false" blend="add"/>
+    <graph id="n11_ruej" name="holderReware" xy="285,307" size="69,35"/>
   </displayList>
 </component>

FGUIProject/assets/Mail/package.xml

@@ -19,7 +19,6 @@
     <image id="oq7rp" name="yx_xiant_1.png" path="/images/"/>
     <image id="m5qxr" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>
     <image id="m5qxv" name="tb_youjian.png" path="/images/"/>
-    <image id="ruejw" name="系统邮箱.png" path="/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Mail" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListRewardItem.cs

@@ -9,6 +9,7 @@ namespace UI.CommonGame
         public GComponent target;
         public UI_ComRewardItem m_comRewardItem;
         public GMovieClip m_effect;
+        public GGraph m_holderReware;
         public const string URL = "ui://eg2y0ldpm9wm8u";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ListRewardItem";
@@ -58,12 +59,14 @@ namespace UI.CommonGame
         {
             m_comRewardItem = (UI_ComRewardItem)UI_ComRewardItem.Create(comp.GetChild("comRewardItem"));
             m_effect = (GMovieClip)comp.GetChild("effect");
+            m_holderReware = (GGraph)comp.GetChild("holderReware");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comRewardItem.Dispose();
             m_comRewardItem = null;
             m_effect = null;
+            m_holderReware = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs

@@ -8,9 +8,8 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GImage m_imgTitle;
-        public UI_ComListReward m_comListReward;
         public GGraph m_holderTitle;
+        public UI_ComListReward m_comListReward;
         public GGroup m_grp;
         public const string URL = "ui://eg2y0ldpm9wm8q";
         public const string PACKAGE_NAME = "CommonGame";
@@ -60,18 +59,16 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_imgTitle = (GImage)comp.GetChild("imgTitle");
-            m_comListReward = (UI_ComListReward)UI_ComListReward.Create(comp.GetChild("comListReward"));
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
+            m_comListReward = (UI_ComListReward)UI_ComListReward.Create(comp.GetChild("comListReward"));
             m_grp = (GGroup)comp.GetChild("grp");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_imgTitle = null;
+            m_holderTitle = null;
             m_comListReward.Dispose();
             m_comListReward = null;
-            m_holderTitle = null;
             m_grp = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -14,12 +14,28 @@ namespace GFGGame
 
         private Action onSuccess = null;
 
-        private List<GMovieClip> _effects = new List<GMovieClip>();
+        private List<EffectUI> _effects = new List<EffectUI>();
         // private List<GoWrapper> _wrappers = new List<GoWrapper>();
 
         private const int maxHeight = 1030;
+
+        private EffectUI _effectUI1;
+
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+
+            for (int i = 0; i < _effects.Count; i++)
+            {
+                if (_effects[i] != null)
+                {
+                    EffectUIPool.Recycle(_effects[i]);
+                    _effects[i] = null;
+                }
+            }
+            _effects.Clear();
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -80,7 +96,11 @@ namespace GFGGame
             }
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gxhd_bjbj");
 
+            
+            //邊框左上角特效
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD");
         }
+
         protected override void OnHide()
         {
             if (onSuccess != null)
@@ -88,7 +108,7 @@ namespace GFGGame
                 onSuccess();
             }
             base.OnHide();
-            _effects.Clear();
+            //_effects.Clear();
             GetSuitItemController.TryShow(0);
         }
         private void RenderListRewardItem(int index, GObject obj)
@@ -124,8 +144,11 @@ namespace GFGGame
             int childIndex = _ui.m_comListReward.m_listReward.ItemIndexToChildIndex(index);
             if (_effects.Count <= childIndex)
             {
-                _effects.Add(item.m_effect);
-                item.m_effect.SetPlaySettings(0, -1, 1, -1);
+                //EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderReware, "ui_hd", "GXHD_WuPin");
+                //_effects.Add(_effectUI);
+
+                //_effects.Add(item.m_effect);
+                //item.m_effect.SetPlaySettings(0, -1, 1, -1);
             }
 
             if (item.m_comRewardItem.target.data == null)