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

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1250">
+<component size="1080,1250" opaque="false">
   <displayList>
     <component id="n37_qdaz" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,0" size="1080,1250">
       <relation target="n33_l500" sidePair="height-height"/>

FGUIProject/assets/League/components/ComLeader.xml

@@ -5,8 +5,8 @@
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <image id="n6_wm60" name="n6" src="wm6037" fileName="images/lm_db_touxiang.png" xy="0,0"/>
-    <loader id="n10_wm60" name="loaHeadBorder" xy="157,180" pivot="0.5,0.5" anchor="true" size="230,203" scale="1.2,1.2" url="ui://eg2y0ldpwm60tl7" autoSize="true"/>
-    <loader id="n4_rv09" name="loaTitle" xy="45,112" size="35,113" url="ui://tw70qm9dwm603p" autoSize="true" clearOnPublish="true"/>
+    <loader id="n10_wm60" name="loaHeadBorder" xy="157,180" pivot="0.5,0.5" anchor="true" size="230,203" scale="1.2,1.2" touchable="false" url="ui://eg2y0ldpwm60tl7" autoSize="true"/>
+    <loader id="n4_rv09" name="loaTitle" xy="45,112" size="35,113" touchable="false" url="ui://tw70qm9dwm603p" autoSize="true" clearOnPublish="true"/>
     <image id="n8_wm60" name="n8" src="wm6035" fileName="images/lm_mz_db.png" xy="30,257" group="n11_wm60"/>
     <text id="n9_wm60" name="txtLvl" xy="41,259" pivot="0.5,0" size="35,44" group="n11_wm60" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" text="20"/>
     <group id="n11_wm60" name="n11" xy="30,257" size="300,55"/>

FGUIProject/assets/League/components/ListSkillItem.xml

@@ -5,12 +5,11 @@
     <image id="n16_gfx4" name="n16" src="miy37n" fileName="images/lm_ch_dldb.png" xy="0,0" pivot="0.5,0"/>
     <loader id="n23_miy3" name="loaIcon" xy="22,22" pivot="0.5,0.5" size="115,115" url="ui://tw70qm9de05086" autoSize="true"/>
     <image id="n20_miy3" name="n20" src="miy37i" fileName="images/lm_ch_szdk.png" xy="-7,127"/>
+    <image id="n17_gfx4" name="imgLock" src="miy37h" fileName="images/lm_ch_wdl_zz.png" xy="-6,-6"/>
     <loader id="n10_pvb4" name="loaScore" xy="28,3" size="44,44" group="n13_pvb4" url="ui://eg2y0ldp842s6h"/>
     <text id="n11_pvb4" name="txtScore" xy="73,0" size="60,50" group="n13_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="37" color="#7c561e" letterSpacing="-2" text="+10"/>
     <group id="n13_pvb4" name="n13" xy="28,0" size="105,50"/>
-    <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>

FGUIProject/assets/LuckyBox/combox/ComModel.xml

@@ -8,5 +8,14 @@
     <graph id="n39_dhoa" name="holder" xy="540,900" pivot="0.5,0.5" anchor="true" size="10,10">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
+    <loader id="n44_ofwu" name="loaMask" xy="0,-240" size="1080,2400" alpha="0" url="ui://drx9d1usduuftf2" align="center" vAlign="middle" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n44_ofwu" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n44_ofwu" tween="true" startValue="1" endValue="0" duration="18" ease="Linear"/>
+  </transition>
 </component>

FGUIProject/assets/Main/FontNew/Font_Result.fnt

@@ -1,3 +1,4 @@
+info size=56 colored=false
 char id=48 img=qkjslx xoffset=0 yoffset=0 xadvance=0
 char id=49 img=qkjsly xoffset=0 yoffset=0 xadvance=0
 char id=50 img=qkjslz xoffset=0 yoffset=0 xadvance=0

FGUIProject/assets/Main/components/ComResult.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="983,374" pivot="0.5,0" anchor="true" overflow="hidden">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <graph id="n22_fqor" name="holderScore" xy="560,186" size="1,1" visible="false" type="rect"/>
     <image id="n17_qkjs" name="n17" src="qkjsk7" fileName="imagesNew/result.png" xy="477,159" visible="false"/>
-    <text id="n14_wono" name="txtScore" xy="594,158" size="104,60" visible="false" font="ui://mfvz4q8kqkjsnx" fontSize="40" color="#ecf6fc" letterSpacing="-10" singleLine="true" text="666">
+    <text id="n14_wono" name="txtScore" xy="594,158" size="134,60" visible="false" font="ui://mfvz4q8kqkjsnx" fontSize="40" color="#ecf6fc" letterSpacing="-10" singleLine="true" text="1111">
       <gearColor controller="c1" pages="0" values="#ecf6fc,#749dc8" default="#ecf6fc,#c49a49"/>
     </text>
     <graph id="n18_fqor" name="holderResult0" xy="184,186" size="2,2" visible="false" type="rect">

FGUIProject/assets/Main/package.xml

@@ -538,11 +538,11 @@
     <image id="qkjslu" name="font_prefect_6.png" path="/FontNew/"/>
     <image id="qkjslv" name="font_prefect_8.png" path="/FontNew/"/>
     <image id="qkjslw" name="font_prefect_9.png" path="/FontNew/"/>
-    <image id="qkjslx" name="font_result_0.png" path="/FontNew/"/>
-    <image id="qkjsly" name="font_result_1.png" path="/FontNew/"/>
-    <image id="qkjslz" name="font_result_2.png" path="/FontNew/"/>
-    <image id="qkjsm0" name="font_result_3.png" path="/FontNew/"/>
-    <image id="qkjsm1" name="font_result_4.png" path="/FontNew/"/>
+    <image id="qkjslx" name="font_result_0.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsly" name="font_result_1.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjslz" name="font_result_2.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsm0" name="font_result_3.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsm1" name="font_result_4.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsm2" name="font_prefect_7.png" path="/FontNew/"/>
     <image id="qkjsm3" name="font_great_9.png" path="/FontNew/"/>
     <image id="qkjsm4" name="font_great_8.png" path="/FontNew/"/>
@@ -564,10 +564,10 @@
     <image id="qkjsmk" name="font_great_4.png" path="/FontNew/"/>
     <image id="qkjsml" name="font_great_5.png" path="/FontNew/"/>
     <image id="qkjsmm" name="font_great_6.png" path="/FontNew/"/>
-    <image id="qkjsmn" name="font_result_5.png" path="/FontNew/"/>
+    <image id="qkjsmn" name="font_result_5.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsmo" name="font_zdqp_6.png" path="/FontNew/"/>
-    <image id="qkjsmp" name="font_result_6.png" path="/FontNew/"/>
-    <image id="qkjsmq" name="font_result_8.png" path="/FontNew/"/>
+    <image id="qkjsmp" name="font_result_6.png" path="/FontNew/" atlas="10"/>
+    <image id="qkjsmq" name="font_result_8.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsmr" name="font_zdka_0.png" path="/FontNew/"/>
     <image id="qkjsms" name="font_zdka_1.png" path="/FontNew/"/>
     <image id="qkjsmt" name="font_zdka_2.png" path="/FontNew/"/>
@@ -587,7 +587,7 @@
     <image id="qkjsn8" name="font_zdjs_8.png" path="/FontNew/"/>
     <image id="qkjsn9" name="font_zdjs_7.png" path="/FontNew/"/>
     <image id="qkjsna" name="font_zdjs_6.png" path="/FontNew/"/>
-    <image id="qkjsnb" name="font_result_9.png" path="/FontNew/"/>
+    <image id="qkjsnb" name="font_result_9.png" path="/FontNew/" atlas="10"/>
     <image id="qkjsnc" name="font_score_0.png" path="/FontNew/"/>
     <image id="qkjsnd" name="font_score_1.png" path="/FontNew/"/>
     <image id="qkjsne" name="font_score_2.png" path="/FontNew/"/>
@@ -604,7 +604,7 @@
     <image id="qkjsnp" name="font_zdjs_3.png" path="/FontNew/"/>
     <image id="qkjsnq" name="font_zdjs_4.png" path="/FontNew/"/>
     <image id="qkjsnr" name="font_zdjs_5.png" path="/FontNew/"/>
-    <image id="qkjsns" name="font_result_7.png" path="/FontNew/"/>
+    <image id="qkjsns" name="font_result_7.png" path="/FontNew/" atlas="10"/>
     <font id="qkjsnu" name="Font_Fail.fnt" path="/FontNew/" exported="true"/>
     <font id="qkjsnv" name="Font_Great.fnt" path="/FontNew/" exported="true"/>
     <font id="qkjsnw" name="Font_Prefect.fnt" path="/FontNew/" exported="true"/>

GameClient/Assets/Game/HotUpdate/Controller/BonusController.cs

@@ -32,7 +32,7 @@ namespace GFGGame
             {
                 var t = bonusList[i];
                 var itemCfg = ItemCfgArray.Instance.GetCfg(t.id);
-                if (itemCfg.itemType == ConstItemType.USEABLE &&
+                if (itemCfg != null && itemCfg.itemType == ConstItemType.USEABLE &&
                     (itemCfg.subType == ConstItemSubType.USEABLE_AUTO))
                 {
                     itemDatasFromAutoUsedItem.AddRange(ItemUtil.CreateItemDataList(itemCfg.itemsArr, t.num));

GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -89,7 +89,7 @@ namespace GFGGame
                 StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0).Coroutine();
             }
         }
-        public int maxFightSpeed = 2;
+        public int maxFightSpeed = 4;
         private int _fightSpeed = 1;
         public int fightSpeed
         {

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

@@ -9,12 +9,11 @@ namespace UI.League
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaIcon;
+        public GImage m_imgLock;
         public GLoader m_loaScore;
         public GTextField m_txtScore;
-        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";
@@ -64,23 +63,21 @@ namespace UI.League
         {
             m_c1 = comp.GetController("c1");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
             m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
-            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)
         {
             m_c1 = null;
             m_loaIcon = null;
+            m_imgLock = null;
             m_loaScore = null;
             m_txtScore = null;
-            m_imgLock = null;
             m_imgSuo = null;
             m_comCost = null;
-            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,6 +10,9 @@ namespace UI.LuckyBox
         public GLoader m_loaBg;
         public GLoader m_loaRes;
         public GGraph m_holder;
+        public GLoader m_loaMask;
+        public Transition m_t0;
+        public Transition m_t1;
         public const string URL = "ui://drx9d1usmbf1tah";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComModel";
@@ -60,12 +63,18 @@ namespace UI.LuckyBox
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaRes = (GLoader)comp.GetChild("loaRes");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_loaMask = (GLoader)comp.GetChild("loaMask");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_loaRes = null;
             m_holder = null;
+            m_loaMask = null;
+            m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/ServerProxy/CardSProxy.cs

@@ -51,6 +51,7 @@ namespace GFGGame
                     {
                         cardData.scores[response.KsAttribute[i]] = response.VsAttribute[i];
                     }
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -618,7 +618,7 @@ namespace GFGGame
                 _comFosterBottom.m_ctrlFullStar.selectedIndex = 0;
                 // List<CardStarCfg> starCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(_cardData.id);
 
-                _comFosterBottom.m_btnUpStar.data = 0;//data  0:可以升级，1：材料不足
+                _comFosterBottom.m_btnUpStar.data = 0;//data  0:材料不足，1：可以升级
 
                 ItemUtil.UpdateItemNeedNum(_comFosterBottom.m_comStarCousumeGold, cardStarCfg.costID, cardStarCfg.costNum);
 
@@ -626,7 +626,7 @@ namespace GFGGame
                 _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
                 _comFosterBottom.m_txtTips.text = _cardData.lv < cardStarCfg.needLv ? string.Format("需等级达到{0}级", cardStarCfg.needLv) : "";
                 _comFosterBottom.m_comStarCousumeGold.visible = _cardData.lv >= cardStarCfg.needLv;
-                _comFosterBottom.m_btnUpStar.grayed = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString()) == 1 ? true : false;
+                _comFosterBottom.m_btnUpStar.grayed = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString()) == 0 ? true : false;
                 // _comFosterBottom.m_btnUpStar.GetChild("ani").asMovieClip.visible = false;// !_comFosterBottom.m_btnUpStar.grayed;
 
             }
@@ -713,7 +713,7 @@ namespace GFGGame
             }
 
             int state = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString());
-            if (state == 1)
+            if (state == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("材料不足");
                 return;

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -29,14 +29,18 @@ namespace GFGGame
             // _comModel = UI_ComModel.Proxy(_com);
             _curTime = _turnTime;
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId);
+            _com.GetChild("loaMask").asLoader.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
             ChangeRes();
             Timers.inst.Remove(UpdateTime);
-            Timers.inst.Add(_turnTime, 0, UpdateTime);
+            if (_luckyBoxCfg.resArr.Length > 1 || _luckyBoxCfg.suitIdArr.Length > 1)
+            {
+                Timers.inst.Add(_turnTime, 0, UpdateTime);
+            }
         }
 
         private void UpdateTime(object param)
         {
-
+            _com.GetChild("loaMask").asLoader.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
             _bgIndex = _bgIndex + 1 == _luckyBoxCfg.bgResArr.Length ? 0 : _bgIndex + 1;
             if (_luckyBoxCfg.resArr.Length > 0)
             {
@@ -46,7 +50,9 @@ namespace GFGGame
             {
                 _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitIdArr.Length ? 0 : _modelIndex + 1;
             }
-            ChangeRes();
+
+            _com.GetTransition("t0").Play(ChangeRes);
+            // ChangeRes();
         }
 
         private void ChangeRes()
@@ -86,6 +92,8 @@ namespace GFGGame
                     _comModel.m_holder.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
                 }
             }
+            _comModel.m_t1.Play();
+            // _com.GetTransition("t1").Play();
             UI_ComModel.ProxyEnd();
         }
         public void OnHide()

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

@@ -36,8 +36,8 @@ namespace GFGGame
             _ui.m_btnMemberLog.onClick.Add(OnBtnMemberLogClick);
             _ui.m_btnExit.onClick.Add(OnBtnExitClick);
             _ui.m_btnExit1.onClick.Add(OnBtnExitClick);
-            _ui.m_comChairman.target.onClick.Add(OnShowOhterInfo);
-            _ui.m_comCoChairman.target.onClick.Add(OnShowOhterInfo);
+            _ui.m_comChairman.m_comHead.target.onClick.Add(OnShowOhterInfo);
+            _ui.m_comCoChairman.m_comHead.target.onClick.Add(OnShowOhterInfo);
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.SetVirtual();
 
@@ -219,7 +219,7 @@ namespace GFGGame
                     com.m_btnAppoint.onClick.Add(OnBtnAppointClick);
                 }
                 com.m_btnAppoint.data = memberData;
-                com.target.data = roleId;
+                com.m_comHead.target.data = roleId;
             }
             UI_ComLeader.Proxy();
         }

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

@@ -21,6 +21,7 @@ namespace GFGGame
         private GoWrapper _wrapper2;
         private List<GameObject> _gameObjects = new List<GameObject>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
+        private List<GComponent> _items = new List<GComponent>();
         private int _pageCount;
         private int _type;
         public override void Dispose()
@@ -28,10 +29,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]);
-            }
+            // for (int i = 0; i < _gameObjects.Count; i++)
+            // {
+            //     SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
+            // }
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -83,8 +84,11 @@ namespace GFGGame
             _type = (int)this.viewData;
             _valueBarController.OnShown();
             _valueBarController.Controller(11);
-            _ui.m_comSkill.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
-            _ui.m_t0.Play();
+            _ui.m_t0.Play(() =>
+            {
+                _ui.m_comSkill.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
+            });
+
             UpdateView();
         }
 
@@ -93,10 +97,24 @@ namespace GFGGame
             base.OnHide();
             _valueBarController.OnHide();
             if (_ui.m_comSkill.m_list.numItems > 0) _ui.m_comSkill.m_list.ScrollToView(0);
+            _ui.m_comSkill.m_list.numItems = 0;
             _ui.m_t0.Stop();
             _ui.m_t1.Stop();
+
+            DestroySkillAni();
         }
+        private void DestroySkillAni()
+        {
+            for (int i = 0; i < _gameObjects.Count; i++)
+            {
+                SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
+                _items[i].RemoveChildAt(4);
+            }
+            _gameObjects.Clear();
+            _wrappers.Clear();
+            _items.Clear();
 
+        }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -179,6 +197,10 @@ namespace GFGGame
             {
                 item.m_listSkill.itemRenderer = RenderListSkillItem;
             }
+            if (LeagueDataManager.Instance.CurLayer == index + 1)
+            {
+                DestroySkillAni();
+            }
             item.m_listSkill.data = skillCfgs;
             item.m_listSkill.numItems = skillCfgs.Count;
             UI_ListSkillLayerItem.ProxyEnd();
@@ -204,29 +226,27 @@ namespace GFGGame
             }
 
             item.m_imgSuo.visible = !canActive;
-            item.m_holder.visible = isLock && canActive;
-            if (isLock && canActive)
+
+            if (isLock && canActive && _gameObjects.Count <= index)
             {
                 GameObject gameObject = null;
                 GoWrapper wrapper = null;
-                if (_gameObjects.Count > index)
-                {
-                    gameObject = _gameObjects[index];
-                    wrapper = _wrappers[index];
-                }
+                GGraph holder = new GGraph();
+                holder.SetSize(1, 1);
+                holder.SetPosition(80, 80, 0);
+                holder.name = "holder";
+                item.target.AddChildAt(holder, 4);
                 string resPath = ResPathUtil.GetViewEffectPath("ui_league", "tea_nolearn");
-                SceneController.AddObjectToView(gameObject, wrapper, item.m_holder, resPath, out gameObject, out wrapper);
+                SceneController.AddObjectToView(gameObject, wrapper, holder, resPath, out gameObject, out wrapper, 100);
 
-                if (_gameObjects.Count <= index)
-                {
-                    _gameObjects.Add(gameObject);
-                    _wrappers.Add(wrapper);
-                }
-                else
-                {
-                    _gameObjects[index] = gameObject;
-                    _wrappers[index] = wrapper;
-                }
+                _gameObjects.Add(gameObject);
+                _wrappers.Add(wrapper);
+                _items.Add(item.target);
+            }
+            GObject gObject = item.target.GetChild("holder");
+            if (gObject != null)
+            {
+                gObject.visible = isLock && canActive;
             }
 
             ItemUtil.UpdateItemNeedNum(item.m_comCost, skillCfgs[index].consumeArr[0], false, "#FFFBF4");

GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png.meta → GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_duuftf2!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5693a3c31479518409027f70f9fae4a3
+guid: ce967f454f2c41345afd56909937744d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png.meta → GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_duuftf2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8fbfdfb83d755254bb0147d894b2f1cc
+guid: da4191a6d5337b445a35573df383e1ca
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Main/Main_atlas10!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 0e9819f43ba742e44b7ddede28b4a9e4
+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/Main/Main_atlas10.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: b56b8942b6d3d4744bed73499611cf37
+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: