雅集技能特效

FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="114,46">
+<component size="119,46">
   <controller name="c1" exported="true" pages="0,,1," selected="1">
     <remark page="0" value="免费"/>
     <remark page="1" value="付费"/>
   </controller>
-  <controller name="style" exported="true" pages="0,,1,,2," selected="2">
+  <controller name="style" exported="true" pages="0,,1,,2," selected="0">
     <remark page="0" value="默认"/>
   </controller>
   <displayList>
-    <loader id="n1_ojlz" name="loaIcon" xy="0,3" size="40,40" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n6_j5a5" name="txtNeed" xy="45,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fff6ed" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999">
+    <loader id="n1_ojlz" name="loaIcon" xy="0,0" size="45,45" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n6_j5a5" name="txtNeed" xy="50,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999">
       <gearColor controller="style" pages="1,2" values="#8c8580,#000000|#fff6ed,#000000" default="#716b59,#000000"/>
     </text>
-    <group id="n7_si5z" name="n7" xy="0,0" size="114,46" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
+    <group id="n7_si5z" name="n7" xy="0,0" size="119,46" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n11_a0cf" name="n11" xy="20,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
+    <text id="n11_a0cf" name="n11" xy="22,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </text>

FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -8,7 +8,8 @@
     </loader>
     <loader id="n7_d4iw" name="rarity" xy="173,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n5_8xpg" name="ScoreType" xy="24,142" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n6_8xpg" name="txtScore" xy="150,160" pivot="0.5,0" size="54,36" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
+    <image id="n13_ofwu" name="n13" src="ofwuf8" fileName="images/huanzhuang_sz_db.png" xy="138,164"/>
+    <text id="n6_8xpg" name="txtScore" xy="146,156" pivot="0.5,0" size="66,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#e9e2d1" align="center" autoClearText="true" text="3500"/>
     <image id="n8_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="13,0" size="67,68"/>
     <image id="n10_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,70" size="70,70"/>
     <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="13,198" size="208,42" group="n11_wono"/>

FGUIProject/assets/DressUp/package.xml

@@ -197,6 +197,7 @@
     <image id="v461f4" name="jjcdi_jjcdi.png" path="/images/"/>
     <image id="v461f5" name="jjcdi_jjxian.png" path="/images/"/>
     <image id="ofwuf7" name="tb_gou_yiyongyou.png" path="/imagesNew/"/>
+    <image id="ofwuf8" name="huanzhuang_sz_db.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/components/ListSkillItem.xml

@@ -11,5 +11,6 @@
     <image id="n17_gfx4" name="imgLock" src="miy37h" fileName="images/lm_ch_wdl_zz.png" xy="-6,-6"/>
     <image id="n21_miy3" name="imgSuo" src="miy37t" fileName="imagesNew/tb_suo.png" pkg="eg2y0ldp" xy="59,75"/>
     <component id="n12_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="16,127" pivot="0.5,0" scale="0.75,0.75" controller="c1,1"/>
+    <graph id="n24_ofwu" name="holder" xy="76,76" size="10,10"/>
   </displayList>
 </component>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillItem.cs

@@ -14,6 +14,7 @@ namespace UI.League
         public GImage m_imgLock;
         public GImage m_imgSuo;
         public GComponent m_comCost;
+        public GGraph m_holder;
         public const string URL = "ui://tw70qm9dpvb45d";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListSkillItem";
@@ -68,6 +69,7 @@ namespace UI.League
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_imgSuo = (GImage)comp.GetChild("imgSuo");
             m_comCost = (GComponent)comp.GetChild("comCost");
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +80,7 @@ namespace UI.League
             m_imgLock = null;
             m_imgSuo = null;
             m_comCost = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs

@@ -19,6 +19,8 @@ namespace GFGGame
         private GoWrapper _wrapper0;
         private GoWrapper _wrapper1;
         private GoWrapper _wrapper2;
+        private List<GameObject> _gameObjects = new List<GameObject>();
+        private List<GoWrapper> _wrappers = new List<GoWrapper>();
         private int _pageCount;
         private int _type;
         public override void Dispose()
@@ -26,6 +28,10 @@ namespace GFGGame
             SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
             SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
             SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            for (int i = 0; i < _gameObjects.Count; i++)
+            {
+                SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
+            }
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -196,7 +202,33 @@ namespace GFGGame
                     break;
                 }
             }
+
             item.m_imgSuo.visible = !canActive;
+            item.m_holder.visible = isLock && canActive;
+            if (isLock && canActive)
+            {
+                GameObject gameObject;
+                GoWrapper wrapper;
+                if (_gameObjects.Count > index)
+                {
+                    gameObject = _gameObjects[index];
+                    wrapper = _wrappers[index];
+                }
+                string resPath = ResPathUtil.GetViewEffectPath("ui_league", "tea_nolearn");
+                SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject, out wrapper);
+
+                if (_gameObjects.Count <= index)
+                {
+                    _gameObjects.Add(gameObject);
+                    _wrappers.Add(wrapper);
+                }
+                else
+                {
+                    _gameObjects[index] = gameObject;
+                    _wrappers[index] = wrapper;
+                }
+            }
+
             ItemUtil.UpdateItemNeedNum(item.m_comCost, skillCfgs[index].consumeArr[0], false, "#FFFBF4");
             if (item.target.data == null)
             {