Merge branch 'master' of http://10.108.64.190:3000/gfg/Client

* 'master' of http://10.108.64.190:3000/gfg/Client:
  限时礼包动效调整
  抽卡
  主界面
  套装隐藏处理
  抽卡奖励不展示赠送道具
  删除卡牌技能提示
  竞技场loading

FGUIProject/assets/Arena/ArenaLoadingUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <displayList>
     <loader id="n0_rv09" name="loaBg" xy="0,-240" size="1080,2400" fill="scale">
-      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n1_rv09" name="progressBar1" src="rv0955" fileName="components/ProgressBar2.xml" xy="95,1676" group="n4_rv09">
       <relation target="" sidePair="center-center,bottom-bottom"/>

FGUIProject/assets/CommonGame/components/ComHead.xml

@@ -4,7 +4,7 @@
     <remark page="0" value="可见"/>
     <remark page="1" value="不可见"/>
   </controller>
-  <controller name="c2" exported="true" pages="0,,1,,2,,3,,4," selected="4">
+  <controller name="c2" exported="true" pages="0,,1,,2,,3,,4,,5," selected="0">
     <remark page="0" value="默认边框"/>
   </controller>
   <displayList>
@@ -29,6 +29,9 @@
     <image id="n49_qik1" name="n49" src="qik1tm5" fileName="images/phbphb_txkk.png" xy="30,38" size="166,166" group="n41_r9ri">
       <gearDisplay controller="c2" pages="4"/>
     </image>
+    <image id="n50_t6j1" name="n50" src="kubi7f" fileName="images/zjm_txkuang_1.png" xy="23,32" size="178,179" group="n41_r9ri">
+      <gearDisplay controller="c2" pages="5"/>
+    </image>
     <loader id="n37_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>

FGUIProject/assets/CommonGame/package.xml

@@ -187,7 +187,7 @@
     <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
     <image id="kubi7e" name="self.png" path="/images/"/>
     <image id="q08xh" name="zjm_txkuang.png" path="/images/"/>
-    <image id="kubi7f" name="zjm_txkuang_1.png" path="/images/" scale="9grid" scale9grid="31,31,62,62"/>
+    <image id="kubi7f" name="zjm_txkuang_1.png" path="/images/" scale9grid="31,31,62,62"/>
     <image id="r9ritjs" name="grxx_zytxtx.png" path="/images/"/>
     <image id="r9ri12k" name="hl_xz_ddik_1.png" path="/images/" exported="true"/>
     <image id="r9ri12o" name="hl_ddandik.png" path="/images/" exported="true"/>

FGUIProject/assets/EnduringGiftBox/SpecialOfferGiftBoxUI.xml

@@ -3,8 +3,9 @@
   <displayList>
     <image id="n0_yjmk" name="n0" src="yjmk2v" fileName="images/bg02.png" xy="-9,142"/>
     <image id="n1_yjmk" name="n1" src="yjmk2u" fileName="images/bg01.png" xy="29,15"/>
-    <image id="n3_yjmk" name="n3" src="yjmk2e" fileName="images/thlb_lihui.png" xy="51,-5"/>
+    <graph id="n25_fter" name="holderBaby" xy="261,161" size="97,73"/>
     <image id="n2_yjmk" name="n2" src="yjmk2g" fileName="images/wz_thlb.png" xy="76,39"/>
+    <graph id="n26_fter" name="holderChiXuTx" xy="366,110" size="100,100"/>
     <image id="n5_yjmk" name="n5" src="yjmk2f" fileName="images/thlb_sj_db.png" xy="699,233"/>
     <text id="n6_yjmk" name="txtBoxResidueTime" xy="701,229" size="251,42" fontSize="28" color="#fffcf9" align="center" autoSize="none" text="剩余6天23时13分"/>
     <list id="n18_yjmk" name="list" xy="68,270" size="957,690" layout="flow_vt" scroll="both" lineGap="15" defaultItem="ui://bdi1qe15yjmk37">
@@ -15,5 +16,27 @@
     <component id="n22_droi" name="btnUp" src="droi3c" fileName="components/BtnUp.xml" xy="-22,488"/>
     <component id="n23_droi" name="btnNext" src="droi3d" fileName="components/BtnNext.xml" xy="933,488"/>
     <component id="n24_droi" name="back" src="qqhz26" fileName="components/BnBack.xml" xy="494,1098"/>
+    <graph id="n27_fter" name="holderOneTx" xy="661,156" size="100,100"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n0_yjmk" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
+    <item time="0" type="Alpha" target="n18_yjmk" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
+    <item time="0" type="Alpha" target="n1_yjmk" tween="true" startValue="0" endValue="1" duration="15"/>
+    <item time="0" type="Alpha" target="n22_droi" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
+    <item time="0" type="Alpha" target="n23_droi" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.InOut"/>
+    <item time="0" type="Alpha" target="n24_droi" value="0"/>
+    <item time="0" type="Alpha" target="n25_fter" tween="true" startValue="0" endValue="1" duration="15"/>
+    <item time="0" type="Alpha" target="n2_yjmk" tween="true" startValue="0" endValue="1" duration="15"/>
+    <item time="0" type="Alpha" target="n5_yjmk" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
+    <item time="0" type="Alpha" target="n6_yjmk" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
+    <item time="0" type="Rotation" target="n0_yjmk" tween="true" startValue="0" endValue="0" duration="15" ease="Quad.In"/>
+    <item time="0" type="Rotation" target="n1_yjmk" tween="true" startValue="0.18" endValue="0" duration="15" ease="Quad.In"/>
+    <item time="0" type="XY" target="n0_yjmk" tween="true" startValue="6,142" endValue="-9,142" duration="8" ease="Quint.In"/>
+    <item time="0" type="XY" target="n1_yjmk" tween="true" startValue="18,15" endValue="29,15" duration="8" ease="Quad.In"/>
+    <item time="0" type="XY" target="n25_fter" tween="true" startValue="249,161" endValue="261,161" duration="8" ease="Quad.In"/>
+    <item time="0" type="XY" target="n2_yjmk" tween="true" startValue="53,39" endValue="82,39" duration="8"/>
+    <item time="8" type="Alpha" target="n24_droi" tween="true" startValue="0" endValue="1" duration="7" ease="Quad.InOut"/>
+    <item time="8" type="XY" target="n2_yjmk" value="82,39"/>
+    <item time="15" type="Rotation" target="n1_yjmk" value="0"/>
+  </transition>
 </component>

FGUIProject/assets/EnduringGiftBox/components/ComRewardIconItem.xml

@@ -8,5 +8,6 @@
     <image id="n6_qqhz" name="bagYellowEx" src="qqhz1f" fileName="images/wpk_sz_db.png" xy="7,95" size="118,31"/>
     <image id="n1_nd17" name="bagBlueEx" src="qqhz1b" fileName="images/wpk_sz_db2.png" xy="7,95" size="118,31"/>
     <text id="n2_nd17" name="num" xy="9,85" size="116,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" autoSize="none" text="120"/>
+    <graph id="n7_fter" name="holderItem" xy="68,69" size="71,63"/>
   </displayList>
 </component>

FGUIProject/assets/EnduringGiftBox/components/ComSpecialOfferGiftBoxItem.xml

@@ -4,6 +4,7 @@
     <image id="n0_yjmk" name="nczlb" src="qqhzg" fileName="images/cz_lb_db.png" xy="0,0" size="940,220" group="n8_yjmk"/>
     <text id="n2_yjmk" name="txtBoxItemName" xy="55,7" size="459,44" group="n8_yjmk" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#cc9974" autoSize="none" text="体力补给礼包"/>
     <component id="n3_yjmk" name="btnBuy" src="qqhzy" fileName="components/BtnBuy.xml" xy="660,85" size="261,73" group="n8_yjmk"/>
+    <graph id="n11_fter" name="holderBtn" xy="788,116" size="80,56" group="n8_yjmk"/>
     <image id="n4_yjmk" name="n4" src="qqhz8" fileName="images/lm_dt_tsdb_2.png" xy="679,8" group="n8_yjmk"/>
     <text id="n5_yjmk" name="txtUrc" xy="714,13" size="216,42" group="n8_yjmk" rotation="-0.6" fontSize="28" color="#cc6960" align="center" leading="0" autoSize="none" text="今日限购1/1"/>
     <text id="n6_yjmk" name="txtGetJf" xy="660,165" size="269,33" group="n8_yjmk" fontSize="28" color="#c69652" align="center" autoSize="none" text="可获得120会员积分"/>
@@ -14,5 +15,9 @@
     </list>
     <group id="n8_yjmk" name="n8" xy="0,0" size="940,220"/>
     <image id="n1_yjmk" name="n1" src="yjmk2b" fileName="images/xsqg_zsx.png" xy="46,48"/>
+    <graph id="n10_fter" name="holderZheKou" xy="667,97" size="49,47"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="XY" target="n2_yjmk" tween="true" startValue="38,7" endValue="55,7" duration="8" ease="Quad.In"/>
+  </transition>
 </component>

FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <displayList>
     <loader id="n40_mbf1" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391h" align="center" vAlign="middle" fill="scale">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <list id="n23_vek8" name="listBg" xy="0,0" size="1080,1920" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="154" defaultItem="ui://drx9d1usnjmn2p">
       <relation target="" sidePair="height-height,center-center,middle-middle"/>

FGUIProject/assets/Main/MainUI.xml

@@ -5,7 +5,7 @@
     <image id="n68_v95q" name="n68" src="v95qi0" fileName="images/zjm_mbmbmb.png" xy="0,1448" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
-    <component id="n61_r9ri" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="34,160" group="n52_qqat"/>
+    <component id="n61_r9ri" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="30,160" group="n52_qqat"/>
     <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1617" size="310,275" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fm"/>
@@ -70,10 +70,10 @@
       <relation target="" sidePair="left-left,top-top"/>
       <Button title="活动" icon="ui://mfvz4q8kvolsof"/>
     </component>
-    <component id="n78_bhmm" name="btnActivityDay7" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,609" size="141,159" group="n89_vols" controller="c1,1">
+    <component id="n78_bhmm" name="btnActivityDay7" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,609" size="141,159" group="n89_vols">
       <Button title="七日活动" icon="ui://mfvz4q8kvolsoh"/>
     </component>
-    <component id="n75_mbf1" name="btnActivityLuckyBox" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,778" size="141,159" group="n89_vols" controller="c1,1">
+    <component id="n75_mbf1" name="btnActivityLuckyBox" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,778" size="141,159" group="n89_vols">
       <Button title="镜花水月" icon="ui://mfvz4q8kvolsog"/>
     </component>
     <group id="n89_vols" name="n89" xy="0,314" size="411,623" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true">

FGUIProject/assets/Main/components/ComponentHeadBar.xml

@@ -2,7 +2,7 @@
 <component size="125,125">
   <displayList>
     <image id="n19_q08x" name="n19" src="q08xc" fileName="images/zjm_mzkuang.png" xy="60,71"/>
-    <component id="n42_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-52,-52" pivot="0.55,0.5" scale="0.7,0.7"/>
+    <component id="n42_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-52,-52" pivot="0.55,0.5" scale="0.65,0.65" controller="c2,5"/>
     <text id="n20_q08x" name="txtName" xy="141,74" size="156,39" fontSize="28" color="#fdf2df" align="center" autoSize="none" text="名字五个字">
       <relation target="n19_q08x" sidePair="left-left,top-top"/>
     </text>
@@ -10,7 +10,7 @@
       <relation target="" sidePair="height-height"/>
     </graph>
     <image id="n37_slb4" name="n37" src="wg7t8w" fileName="images/zjm_dj_1.png" xy="88,78" group="n41_qqat"/>
-    <text id="n38_slb4" name="txtLvl" xy="95,84" size="27,29" group="n41_qqat" fontSize="20" color="#ffffff" align="center" text="99">
+    <text id="n38_slb4" name="txtLvl" xy="95,84" size="23,29" group="n41_qqat" fontSize="20" color="#ffffff" align="center" text="99">
       <relation target="n37_slb4" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n41_qqat" name="n41" xy="88,78" size="42,43"/>

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -41,7 +41,10 @@ namespace GFGEditor
                 //套装
                 foreach (var a in suitDic)
                 {
-                    suitPartTotalCount += a.Value.Count;
+                    if(a.Key.isHide <= 0)
+                    {
+                        suitPartTotalCount += a.Value.Count;
+                    }
                     var names = new string[] { nameof(a.Key.partsArr).Replace("Arr", "") };
                     var values = new string[] { string.Join(";", a.Value) };
                     SQLiteHelper.Instance.UpdateValues(nameof(SuitCfgArray), names, values, nameof(a.Key.id), a.Key.id.ToString());

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/EnduringGiftBox/UI_ComRewardIconItem.cs

@@ -14,6 +14,7 @@ namespace UI.EnduringGiftBox
         public GImage m_bagYellowEx;
         public GImage m_bagBlueEx;
         public GTextField m_num;
+        public GGraph m_holderItem;
         public const string URL = "ui://bdi1qe15qqhz1g";
         public const string PACKAGE_NAME = "EnduringGiftBox";
         public const string RES_NAME = "ComRewardIconItem";
@@ -68,6 +69,7 @@ namespace UI.EnduringGiftBox
             m_bagYellowEx = (GImage)comp.GetChild("bagYellowEx");
             m_bagBlueEx = (GImage)comp.GetChild("bagBlueEx");
             m_num = (GTextField)comp.GetChild("num");
+            m_holderItem = (GGraph)comp.GetChild("holderItem");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +80,7 @@ namespace UI.EnduringGiftBox
             m_bagYellowEx = null;
             m_bagBlueEx = null;
             m_num = null;
+            m_holderItem = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/EnduringGiftBox/UI_ComSpecialOfferGiftBoxItem.cs

@@ -10,10 +10,13 @@ namespace UI.EnduringGiftBox
         public GImage m_nczlb;
         public GTextField m_txtBoxItemName;
         public UI_BtnBuy m_btnBuy;
+        public GGraph m_holderBtn;
         public GTextField m_txtUrc;
         public GTextField m_txtGetJf;
         public UI_ComDiscount m_comDiscount;
         public GList m_list;
+        public GGraph m_holderZheKou;
+        public Transition m_t0;
         public const string URL = "ui://bdi1qe15yjmk37";
         public const string PACKAGE_NAME = "EnduringGiftBox";
         public const string RES_NAME = "ComSpecialOfferGiftBoxItem";
@@ -64,10 +67,13 @@ namespace UI.EnduringGiftBox
             m_nczlb = (GImage)comp.GetChild("nczlb");
             m_txtBoxItemName = (GTextField)comp.GetChild("txtBoxItemName");
             m_btnBuy = (UI_BtnBuy)UI_BtnBuy.Create(comp.GetChild("btnBuy"));
+            m_holderBtn = (GGraph)comp.GetChild("holderBtn");
             m_txtUrc = (GTextField)comp.GetChild("txtUrc");
             m_txtGetJf = (GTextField)comp.GetChild("txtGetJf");
             m_comDiscount = (UI_ComDiscount)UI_ComDiscount.Create(comp.GetChild("comDiscount"));
             m_list = (GList)comp.GetChild("list");
+            m_holderZheKou = (GGraph)comp.GetChild("holderZheKou");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,11 +81,14 @@ namespace UI.EnduringGiftBox
             m_txtBoxItemName = null;
             m_btnBuy.Dispose();
             m_btnBuy = null;
+            m_holderBtn = null;
             m_txtUrc = null;
             m_txtGetJf = null;
             m_comDiscount.Dispose();
             m_comDiscount = null;
             m_list = null;
+            m_holderZheKou = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/EnduringGiftBox/UI_SpecialOfferGiftBoxUI.cs

@@ -7,11 +7,15 @@ namespace UI.EnduringGiftBox
     public partial class UI_SpecialOfferGiftBoxUI
     {
         public GComponent target;
+        public GGraph m_holderBaby;
+        public GGraph m_holderChiXuTx;
         public GTextField m_txtBoxResidueTime;
         public GList m_list;
         public GComponent m_btnUp;
         public GComponent m_btnNext;
         public GComponent m_back;
+        public GGraph m_holderOneTx;
+        public Transition m_t0;
         public const string URL = "ui://bdi1qe15yjmk28";
         public const string PACKAGE_NAME = "EnduringGiftBox";
         public const string RES_NAME = "SpecialOfferGiftBoxUI";
@@ -59,19 +63,27 @@ namespace UI.EnduringGiftBox
 
         private void Init(GComponent comp)
         {
+            m_holderBaby = (GGraph)comp.GetChild("holderBaby");
+            m_holderChiXuTx = (GGraph)comp.GetChild("holderChiXuTx");
             m_txtBoxResidueTime = (GTextField)comp.GetChild("txtBoxResidueTime");
             m_list = (GList)comp.GetChild("list");
             m_btnUp = (GComponent)comp.GetChild("btnUp");
             m_btnNext = (GComponent)comp.GetChild("btnNext");
             m_back = (GComponent)comp.GetChild("back");
+            m_holderOneTx = (GGraph)comp.GetChild("holderOneTx");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_holderBaby = null;
+            m_holderChiXuTx = null;
             m_txtBoxResidueTime = null;
             m_list = null;
             m_btnUp = null;
             m_btnNext = null;
             m_back = null;
+            m_holderOneTx = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Utils/SuitUtil.cs

@@ -237,6 +237,11 @@ namespace GFGGame
             List<int> result = new List<int>();
             void CheckToAdd(int targetId)
             {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(targetId);
+                if(suitCfg == null || suitCfg.isHide > 0)
+                {
+                    return;
+                }
                 if (notGet && haveGot)
                 {
                     result.Add(targetId);

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/RushSaleGiftBoxView.cs

@@ -22,13 +22,14 @@ namespace GFGGame
 
         private List<GGraph> _graphList = new List<GGraph>();
         private List<GameObject> _gameObjectList = new List<GameObject>();
+        private List<GoWrapper> _wrapperList = new List<GoWrapper>();
+        
         private GameObject _gameObject1;
         private GameObject _gameObject2;
         private GameObject _gameObject3;
         private GameObject _gameObject4;
         private GameObject _gameObject5;
 
-        private List<GoWrapper> _wrapperList = new List<GoWrapper>();
         private GoWrapper _wrapper1;
         private GoWrapper _wrapper2;
         private GoWrapper _wrapper3;
@@ -231,7 +232,7 @@ namespace GFGGame
                 mTxtNewPrice = $"{shopCfg.price}元";
                 //_ui.m_btnBuyPink.m_txtNewPrice.align = AlignType.Left;
                 //_ui.m_btnBuyPink.m_txtNewPrice.x = 166;
-                _ui.m_txtLrc.text = $"可获得{shopCfg.price * 10}充值经验";
+                _ui.m_txtLrc.text = $"可获得{shopCfg.price * 10}会员积分";
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/SpecialOfferGiftBoxView.cs

@@ -15,6 +15,17 @@ namespace GFGGame
         private UI_SpecialOfferGiftBoxUI _ui;
 
         private int _pageIndex; //当前页码,需要显示的数据的索引
+        private List<GGraph> _graphList = new List<GGraph>();
+        private List<GameObject> _gameObjectList = new List<GameObject>();
+        private List<GoWrapper> _wrapperList = new List<GoWrapper>();
+
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GameObject _gameObject3;
+
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
+        private GoWrapper _wrapper3;
 
         protected override void OnInit()
         {
@@ -46,6 +57,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _ui.m_t0.Play();
             AddEffect();
             InitPageInex();
 
@@ -70,6 +82,15 @@ namespace GFGGame
 
         private void AddEffect()
         {
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_Activity", "Prefer_person");
+            SceneController.AddObjectToView(null, null, _ui.m_holderBaby, resPath1,
+                out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_Activity", "Prefer_chixu_tx");
+            SceneController.AddObjectToView(null, null, _ui.m_holderChiXuTx, resPath2,
+                out _gameObject2, out _wrapper2);
+            string resPath3 = ResPathUtil.GetViewEffectPath("ui_Activity", "Prefer_one_tx");
+            SceneController.AddObjectToView(null, null, _ui.m_holderOneTx, resPath3,
+                out _gameObject3, out _wrapper3);
         }
 
         public void UpTime()
@@ -109,7 +130,7 @@ namespace GFGGame
 
             var data = ListUtil.Navigate(list, type, _pageIndex, out int newIndex);
             _pageIndex = newIndex;
-            
+
             _ui.m_btnUp.visible = true;
             _ui.m_btnNext.visible = true;
             if (list.Count == 1)
@@ -199,7 +220,7 @@ namespace GFGGame
                 uiItem.m_btnBuy.m_txtNewPrice.align = AlignType.Left;
                 uiItem.m_btnBuy.m_txtNewPrice.x = 125;
                 uiItem.m_btnBuy.m_txtOldPrice.x = 30;
-                uiItem.m_txtGetJf.text = $"可获得{shopCfg.price * 10}充值经验";
+                uiItem.m_txtGetJf.text = $"可获得{shopCfg.price * 10}会员积分";
             }
             else
             {
@@ -216,7 +237,29 @@ namespace GFGGame
             uiItem.m_txtUrc.text = mTxtUrc;
             uiItem.m_btnBuy.target.onClick.Add(OnBtnBuyClick);
             uiItem.m_txtBoxItemName.text = shopCfg.itemName;
-            
+
+            if (!_graphList.Contains(uiItem.m_holderZheKou))
+            {
+                string resPath = ResPathUtil.GetViewEffectPath("ui_Activity", "Prefer_but_zhekou");
+                SceneController.AddObjectToView(null, null, uiItem.m_holderZheKou, resPath, out var gameObject,
+                    out var wrapper);
+                _graphList.Add(uiItem.m_holderZheKou);
+                _gameObjectList.Add(gameObject);
+                _wrapperList.Add(wrapper);
+            }
+
+            if (!_graphList.Contains(uiItem.m_holderBtn))
+            {
+                string resPath = ResPathUtil.GetViewEffectPath("ui_Activity", "Prefer_button_buy");
+                SceneController.AddObjectToView(null, null, uiItem.m_holderBtn, resPath, out var gameObject,
+                    out var wrapper);
+                _graphList.Add(uiItem.m_holderBtn);
+                _gameObjectList.Add(gameObject);
+                _wrapperList.Add(wrapper);
+            }
+
+            uiItem.m_t0.Play();
+
             //子列表
             uiItem.m_list.itemRenderer = ChildListItemRender;
             uiItem.m_list.numItems = shopItemCfg.itemsArr.Length;
@@ -254,6 +297,17 @@ namespace GFGGame
             uiItemChild.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfgChild);
             uiItemChild.m_num.text = itemArr[1].ToString();
             uiItemChild.target.data = itemCfgChild;
+
+            if (!_graphList.Contains(uiItemChild.m_holderItem))
+            {
+                string resPath = ResPathUtil.GetViewEffectPath("ui_Activity", "Prefer_kuang");
+                SceneController.AddObjectToView(null, null, uiItemChild.m_holderItem, resPath, out var gameObject,
+                    out var wrapper);
+                _graphList.Add(uiItemChild.m_holderItem);
+                _gameObjectList.Add(gameObject);
+                _wrapperList.Add(wrapper);
+            }
+
             UI_ComRewardIconItem.ProxyEnd();
         }
 
@@ -314,9 +368,38 @@ namespace GFGGame
                 ViewManager.Show<ItemExchangeView>(cfg.id);
             }
         }
+        
+        private void DestroyObjectFromView()
+        {
+            foreach (var itemGameObject in _gameObjectList)
+            {
+                if (itemGameObject != null)
+                {
+                    GameObject.DestroyImmediate(itemGameObject);
+                }
+            }
+            
+            _gameObjectList.Clear();
+
+            foreach (var itemWrapper in _wrapperList)
+            {
+                if (itemWrapper != null)
+                {
+                    itemWrapper.Dispose();
+                }
+            }
+
+            _wrapperList.Clear();
+            _graphList.Clear();
+        }
 
         protected override void OnHide()
         {
+            
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
+            DestroyObjectFromView();
             this.RemoveEventListener();
             Dispose();
             base.Hide();

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

@@ -79,6 +79,7 @@ namespace GFGGame
             ShowBonusList();
 
             _ui.m_t0.Play(UpdateView);
+            //
         }
 
         protected override void OnHide()
@@ -137,9 +138,9 @@ namespace GFGGame
         {
 
             _ui.m_loaMask.visible = false;
-            int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
-            List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
-            ViewManager.Show<LuckyBoxNewDressView>(itemDatas);
+            // int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
+            // List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
+            // ViewManager.Show<LuckyBoxNewDressView>(itemDatas);
         }
         private void ShowBonusList()
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StorySkillView.cs

@@ -67,7 +67,7 @@ namespace GFGGame
                 if (string.IsNullOrEmpty(skillCfg.res))
                 {
                     res = ItemCfgArray.Instance.GetCfg(skillCfg.cardId).res;
-                    ET.Log.Error("技能" + skillCfg.skillId + "  未配资源");
+                    // ET.Log.Debug("技能" + skillCfg.skillId + "  未配资源");
                 }
                 _ui.m_comSkillShow.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(res);
                 _ui.m_comSkillShow.m_t0.timeScale = FightDataManager.Instance.fightSpeed;

GameClient/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_3!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: d1115f93bee24cb4aa5963736e6aa3d2
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0_3.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 1128778c24bf4a449a8369462ac9f495
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: