Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

FGUIProject/assets/CommonGame/GetSuitItemUI.xml

@@ -11,7 +11,7 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     <image id="n1_tu96" name="n1" src="tu965j" fileName="images/cj_tskuang_1.png" xy="199,1366" group="n6_tu96"/>
-    <text id="n2_tu96" name="txtName" xy="465,1389" size="140,47" group="n6_tu96" fontSize="34" color="#a17472" autoClearText="true" text="套装名称">
+    <text id="n2_tu96" name="txtName" xy="465,1389" size="138,46" group="n6_tu96" fontSize="34" color="#a17472" autoClearText="true" text="套装名称">
       <relation target="" sidePair="center-center"/>
     </text>
     <component id="n4_tu96" name="probar" src="tu965k" fileName="components/ProgressBar1.xml" xy="241,1457" group="n6_tu96">
@@ -26,8 +26,8 @@
     <group id="n6_tu96" name="n6" xy="199,1366" size="672,166" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="395,1523">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1687">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/Component2.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="250,256">
+  <displayList>
+    <image id="n1_ga16" name="n1" src="9cth8z" fileName="imagesExport/cj_hd_kdi.png" xy="0,6"/>
+    <text id="n2_ga16" name="txtName" xy="95,203" size="60,39" fontSize="28" color="#efe4af" align="center" text="物品">
+      <relation target="n1_ga16" sidePair="center-center"/>
+    </text>
+    <loader id="n3_ga16" name="icon" xy="65,59" size="120,120" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
+    <loader id="n4_ga16" name="rarity" xy="192,18" size="42,96" url="ui://eg2y0ldpd4iw52"/>
+    <image id="n5_9cth" name="n5" src="9cth90" fileName="imagesExport/cj_hd_zik.png" xy="1,203"/>
+    <image id="n7_pzq1" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" xy="19,0" visible="false"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/components/LuckyBoxBonusItem.xml

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="290,293">
+<component size="290,293" pivot="0.5,0.5" anchor="true">
   <displayList>
-    <image id="n1_ga16" name="n1" src="9cth8z" fileName="imagesExport/cj_hd_kdi.png" xy="20,21"/>
-    <text id="n2_ga16" name="txtName" xy="115,218" size="60,39" fontSize="28" color="#efe4af" align="center" text="物品">
-      <relation target="n1_ga16" sidePair="center-center"/>
-    </text>
-    <loader id="n3_ga16" name="icon" xy="85,74" size="120,120" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
-    <loader id="n4_ga16" name="rarity" xy="212,33" size="42,96" url="ui://eg2y0ldpd4iw52"/>
-    <image id="n5_9cth" name="n5" src="9cth90" fileName="imagesExport/cj_hd_zik.png" xy="21,218"/>
-    <image id="n7_pzq1" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" xy="39,15" visible="false"/>
+    <component id="n1_ga16" name="comIcon" src="dcrotaa" fileName="components/Component2.xml" xy="145,146" pivot="0.5,0.5" anchor="true"/>
+    <graph id="n8_dcro" name="holder" xy="144,146" size="1,1" touchable="false" type="rect"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Scale" target="n1_ga16" tween="true" startValue="0,0" endValue="1,1" duration="4" ease="Expo.In"/>
+  </transition>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -182,6 +182,7 @@
     <component id="10nota7" name="Button15.xml" path="/components/" exported="true"/>
     <image id="dmsi1h" name="sc_xtxtxt.png" path="/images/" scale="9grid" scale9grid="12,0,44,2"/>
     <image id="iftfta9" name="sc_tc_kuang_2.png" path="/images/"/>
+    <component id="dcrotaa" name="Component2.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/LuckBoxBonusUI.xml

@@ -4,18 +4,18 @@
     <loader id="n0_fka7" name="bg" xy="0,-240" size="1080,2400" url="ui://eg2y0ldpvxw539">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <component id="n1_ga16" name="item0" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="215,287" group="n15_ga16"/>
-    <component id="n5_ga16" name="item1" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="573,287" group="n15_ga16"/>
-    <component id="n6_ga16" name="item2" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="37,625" group="n15_ga16"/>
-    <component id="n7_ga16" name="item3" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="395,625" group="n15_ga16"/>
-    <component id="n8_ga16" name="item4" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="753,625" group="n15_ga16"/>
-    <component id="n9_ga16" name="item5" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="37,963" group="n15_ga16"/>
-    <component id="n10_ga16" name="item6" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="395,963" group="n15_ga16"/>
-    <component id="n11_ga16" name="item7" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="753,963" group="n15_ga16"/>
-    <component id="n12_ga16" name="item8" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="215,1301" group="n15_ga16"/>
-    <component id="n13_ga16" name="item9" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="573,1301" group="n15_ga16"/>
-    <component id="n14_ga16" name="itemOne" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="395,813" group="n15_ga16"/>
-    <group id="n15_ga16" name="n15" xy="37,287" size="1006,1307" advanced="true">
+    <component id="n1_ga16" name="item0" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="360,452" group="n15_ga16"/>
+    <component id="n5_ga16" name="item1" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="718,452" group="n15_ga16"/>
+    <component id="n6_ga16" name="item2" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="182,790" group="n15_ga16"/>
+    <component id="n7_ga16" name="item3" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="540,790" group="n15_ga16"/>
+    <component id="n8_ga16" name="item4" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="898,790" group="n15_ga16"/>
+    <component id="n9_ga16" name="item5" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="182,1128" group="n15_ga16"/>
+    <component id="n10_ga16" name="item6" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="540,1128" group="n15_ga16"/>
+    <component id="n11_ga16" name="item7" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="898,1128" group="n15_ga16"/>
+    <component id="n12_ga16" name="item8" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="360,1466" group="n15_ga16"/>
+    <component id="n13_ga16" name="item9" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="718,1466" group="n15_ga16"/>
+    <component id="n14_ga16" name="itemOne" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="540,978" group="n15_ga16"/>
+    <group id="n15_ga16" name="n15" xy="37,306" size="1006,1307" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>

FGUIProject/assets/LuckyBox/LuckyBoxCardUI.xml

@@ -12,9 +12,10 @@
     </component>
   </displayList>
   <transition name="t_open">
-    <item time="0" type="Scale" target="n0_qdrt" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>
+    <item time="0" type="Scale" target="n0_qdrt" value="0,0"/>
+    <item time="3" type="Scale" target="n0_qdrt" tween="true" startValue="0,0" endValue="1,1" duration="3" ease="Expo.In"/>
   </transition>
   <transition name="t_close">
-    <item time="0" type="Scale" target="n0_qdrt" tween="true" startValue="1,1" endValue="0,0" duration="6" ease="Linear"/>
+    <item time="0" type="Scale" target="n0_qdrt" tween="true" startValue="1,1" endValue="0,0" duration="3" ease="Expo.In"/>
   </transition>
 </component>

FGUIProject/assets/LuckyBox/components/ComCard.xml

@@ -7,5 +7,6 @@
     <loader id="n3_qdrt" name="loaProperty" xy="248,231" size="60,60" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
     <text id="n4_qdrt" name="txtName" xy="474,75" pivot="0.5,0.5" anchor="true" size="100,64" fontSize="48" color="#feeac2" text="服装"/>
     <text id="n5_qdrt" name="txtDiscribe" xy="474,656" pivot="0.5,0" anchor="true" size="360,235" fontSize="30" color="#c2a773" autoSize="height" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
+    <graph id="n6_dcro" name="holder" xy="473,484" size="1,1" touchable="false" type="rect"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ListCardItem.xml

@@ -8,9 +8,10 @@
     <component id="n11_wzce" name="comStar" src="ojlzh" fileName="components/ComStar.xml" pkg="eg2y0ldp" xy="10,196"/>
     <text id="n12_wzce" name="txtLv" xy="169,170" pivot="0.5,0" size="39,56" fontSize="24" color="#fff9f1" leading="-8" ubb="true" vars="true" text="Lv.&#xA;30"/>
     <loader id="n7_sx2v" name="loaRarity" xy="160,6" size="50,50" url="ui://eg2y0ldppq5x62" autoSize="true"/>
-    <image id="n10_wzce" name="n10" src="sx2v9t" fileName="imagesStory/zd_tctcdikugn_2.png" xy="-1,0">
+    <image id="n15_dcro" name="n15" src="sx2v9t" fileName="imagesStory/zd_tctcdikugn_2.png" xy="-1,0"/>
+    <graph id="n13_dcro" name="holder" xy="107,114" size="1,1" touchable="false" type="rect">
       <gearDisplay controller="button" pages="1"/>
-    </image>
+    </graph>
   </displayList>
   <Button mode="Radio"/>
 </component>

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

@@ -205,10 +205,7 @@ namespace GFGGame
             EquipDataCache.cacher.autoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY) <= 0 ? false : true;
             EquipDataCache.cacher.fightSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED) <= 1 ? 1 : StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED);
             GameGlobal.skipCheckOpen = StorageDataManager.Instance.GetStorageValue(ConstStorageId.SKIP_CHECK_OPEN) <= 0 ? false : true;
-
+            GameGlobal.isEnterGame = true;
         }
-
-
-
     }
 }

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

@@ -13,7 +13,7 @@ namespace GFGGame
 
         public static bool IsGuide()
         {
-
+            if (!GameGlobal.isEnterGame) return false;//未进入游戏
             bool isAllGuideFinish = false;
             for (int i = 0; i < GuideCfgArray.Instance.dataArray.Length; i++)
             {

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

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_Component2
+    {
+        public GComponent target;
+        public GTextField m_txtName;
+        public GLoader m_icon;
+        public GLoader m_rarity;
+        public GImage m_imgNew;
+        public const string URL = "ui://eg2y0ldpdcrotaa";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Component2";
+        private static UI_Component2 _proxy;
+
+        public static UI_Component2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component2();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Component2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_rarity = (GLoader)comp.GetChild("rarity");
+            m_imgNew = (GImage)comp.GetChild("imgNew");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtName = null;
+            m_icon = null;
+            m_rarity = null;
+            m_imgNew = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component2.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 473266a065d2a6649a233bd3e65a6233
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -7,10 +7,9 @@ namespace UI.CommonGame
     public partial class UI_LuckyBoxBonusItem
     {
         public GComponent target;
-        public GTextField m_txtName;
-        public GLoader m_icon;
-        public GLoader m_rarity;
-        public GImage m_imgNew;
+        public UI_Component2 m_comIcon;
+        public GGraph m_holder;
+        public Transition m_t0;
         public const string URL = "ui://eg2y0ldpga16g";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "LuckyBoxBonusItem";
@@ -58,17 +57,16 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_icon = (GLoader)comp.GetChild("icon");
-            m_rarity = (GLoader)comp.GetChild("rarity");
-            m_imgNew = (GImage)comp.GetChild("imgNew");
+            m_comIcon = (UI_Component2)UI_Component2.Create(comp.GetChild("comIcon"));
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtName = null;
-            m_icon = null;
-            m_rarity = null;
-            m_imgNew = null;
+            m_comIcon.Dispose();
+            m_comIcon = null;
+            m_holder = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -13,6 +13,7 @@ namespace UI.LuckyBox
         public GLoader m_loaProperty;
         public GTextField m_txtName;
         public GTextField m_txtDiscribe;
+        public GGraph m_holder;
         public const string URL = "ui://drx9d1usqdrt1a";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComCard";
@@ -66,6 +67,7 @@ namespace UI.LuckyBox
             m_loaProperty = (GLoader)comp.GetChild("loaProperty");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,6 +77,7 @@ namespace UI.LuckyBox
             m_loaProperty = null;
             m_txtName = null;
             m_txtDiscribe = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardItem.cs

@@ -12,6 +12,7 @@ namespace UI.Main
         public GComponent m_comStar;
         public GTextField m_txtLv;
         public GLoader m_loaRarity;
+        public GGraph m_holder;
         public const string URL = "ui://mfvz4q8kr1a99f";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ListCardItem";
@@ -64,6 +65,7 @@ namespace UI.Main
             m_comStar = (GComponent)comp.GetChild("comStar");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -73,6 +75,7 @@ namespace UI.Main
             m_comStar = null;
             m_txtLv = null;
             m_loaRarity = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -17,8 +17,9 @@ namespace GFGGame
         public static int userAge = 0;
 
         public static bool skipGuide;
-
         public static bool skipCheckOpen;//跳过功能开启检查
+        public static bool isEnterGame = false;
+
 
         public static string loginApiUrl;
         public static string gameApiUrl;

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterView.cs

@@ -79,9 +79,8 @@ namespace GFGGame
         private void OnListMaterialsItem(EventContext context)
         {
             int itemId = (int)(context.data as GComponent).data;
-            // GoodsItemTipsController.ShowItemTips(itemId);
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(SuitFosterView).FullName, this.viewData } });
-
+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(SuitView).Name, ( this.viewData as object[])[4]  }
+    });
         }
 
         private void ListPropertyItemRender(int index, GObject obj)

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitView.cs

@@ -219,7 +219,7 @@ namespace GFGGame
             }
             else if (state == 1)
             {
-                ViewManager.Show<SuitFosterView>(new object[] { _suitId, index, _propertyList, _addPropertyList });
+                ViewManager.Show<SuitFosterView>(new object[] { _suitId, index, _propertyList, _addPropertyList, this.viewData });
             }
             else
             {

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

@@ -85,10 +85,10 @@ namespace GFGGame
         {
             UI_LuckyBoxBonusItem itemUI = _ui.m_item;
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemdId);
-            itemUI.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+            itemUI.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
             string itemName = itemCfg.name;
-            itemUI.m_txtName.text = itemName;
-            RarityIconController.UpdateRarityIcon(itemUI.m_rarity, itemdId, false);
+            itemUI.m_comIcon.m_txtName.text = itemName;
+            RarityIconController.UpdateRarityIcon(itemUI.m_comIcon.m_rarity, itemdId, false);
             itemUI.target.data = itemdId;
             itemUI.target.onClick.Clear();
             itemUI.target.onClick.Add(OnClickItemUI);

GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs

@@ -70,8 +70,9 @@ namespace GFGGame
         }
         private void OnBtnGoClick(EventContext context)
         {
+            this.Hide();
             GObject btnGo = context.sender as GObject;
-            ViewManager.Show(btnGo.data.ToString(), null, new object[] { typeof(DailyTaskView).Name, this.viewData });
+            ViewManager.Show(string.Format("GFGGame.{0}", btnGo.data), null, new object[] { typeof(DailyTaskView).Name, this.viewData });
         }
         private void ListRewardItemRender(int index, GObject obj)
         {

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

@@ -10,9 +10,21 @@ namespace GFGGame
     {
         private UI_LuckBoxBonusUI _ui;
 
+        private List<GameObject> _effects = new List<GameObject>();
+        private List<GoWrapper> _wrappers = new List<GoWrapper>();
+
+        private GameObject _effect = new GameObject();
+        private GoWrapper _wrapper = new GoWrapper();
         public override void Dispose()
         {
             base.Dispose();
+            for (int i = 0; i < _effects.Count; i++)
+            {
+                SceneController.DestroyObjectFromView(_effects[i]);
+
+            }
+            SceneController.DestroyObjectFromView(_effect);
+
         }
 
         protected override void OnInit()
@@ -26,6 +38,18 @@ namespace GFGGame
             InitAllItem();
             _ui.m_bg.touchable = false;
             _ui.m_bg.onClick.Add(OnClickBg);
+
+            string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_zl");
+            for (int i = 0; i < 10; i++)
+            {
+                GameObject gameObject0;
+                GoWrapper wrapper0;
+                GGraph holder = _ui.target.GetChild("item" + i).asCom.GetChild("holder").asGraph;
+                SceneController.AddObjectToView(null, null, holder, resPath, out gameObject0, out wrapper0);
+                _effects.Add(gameObject0);
+            }
+            SceneController.AddObjectToView(_effect, _wrapper, _ui.m_itemOne.GetChild("holder").asGraph, resPath, out _effect, out _wrapper);
+
         }
 
         protected override void OnShown()
@@ -79,7 +103,7 @@ namespace GFGGame
                 {
                     UI_LuckyBoxBonusItem itemUI = UI_LuckyBoxBonusItem.Proxy(itemObject);
                     UpdateItem(itemUI, itemData);
-                    Timers.inst.Add(0.1f * i, 1, (object param) =>
+                    Timers.inst.Add(0.3f * i, 1, (object param) =>
                     {
                         itemObject.visible = true;
                         if ((int)param == 9)
@@ -128,16 +152,19 @@ namespace GFGGame
         private void UpdateItem(UI_LuckyBoxBonusItem itemUI, ItemData itemData)
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
-            itemUI.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
-            itemUI.m_imgNew.visible = ItemDataManager.GetItemNum(itemData.id) == 1 ? true : false;
+            itemUI.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+            itemUI.m_comIcon.m_imgNew.visible = ItemDataManager.GetItemNum(itemData.id) == 1 ? true : false;
             string itemName = itemCfg.name;
             if (itemData.num > 1)
             {
                 itemName += "x" + itemData.num;
             }
-            itemUI.m_txtName.text = itemName;
-            RarityIconController.UpdateRarityIcon(itemUI.m_rarity, itemData.id, false);
+            itemUI.m_comIcon.m_txtName.text = itemName;
+            RarityIconController.UpdateRarityIcon(itemUI.m_comIcon.m_rarity, itemData.id, false);
             itemUI.target.data = itemData.id;
+            itemUI.m_comIcon.target.SetScale(0, 0);
+            itemUI.m_t0.Play();
+            // GTween.To(0, 1, 0.2f).SetTarget(itemUI).OnUpdate((GTweener t) => { itemUI.target.SetScale(t.value.x, t.value.x); });
         }
 
         private void InitAllItem()

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

@@ -2,6 +2,7 @@
 using UnityEngine;
 using UI.LuckyBox;
 using System.Collections.Generic;
+using FairyGUI;
 
 namespace GFGGame
 {
@@ -12,9 +13,13 @@ namespace GFGGame
         private List<ItemData> _rewardList;
         private int _type = 0;//弹窗类型：0可跳过，1：首次获得物品不可跳过,2首次获得物品不可跳过,不弹获得套装界面
 
+        private GameObject gameObject;
+        private GoWrapper wrapper;
         public override void Dispose()
         {
             base.Dispose();
+            SceneController.DestroyObjectFromView(gameObject);
+
         }
 
         protected override void OnInit()
@@ -31,6 +36,8 @@ namespace GFGGame
             _ui.m_bg.onTouchBegin.Add(OnClickBg);
             _ui.m_btnPass.onClick.Add(OnClickBtnPass);
 
+            string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_zs");
+            SceneController.AddObjectToView(gameObject, null, _ui.m_comCard.m_holder, resPath, out gameObject, out wrapper);
         }
         protected override void OnShown()
         {
@@ -55,6 +62,7 @@ namespace GFGGame
 
             _ui.m_comCard.m_txtName.text = itemCfg.name;
             _ui.m_comCard.m_txtDiscribe.text = itemCfg.desc;
+            _ui.m_comCard.m_holder.visible = true;
 
             if (LuckyBoxDataManager.Instance.FirstRewardList.ContainsKey(_rewardList.Count - 1) == true)
             {
@@ -84,6 +92,7 @@ namespace GFGGame
 
             _ui.m_t_close.Play(() =>
             {
+                _ui.m_comCard.m_holder.visible = false;
                 _ui.m_t_open.Play();
                 UpdateView();
             });

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

@@ -13,9 +13,15 @@ namespace GFGGame
         private List<CardData> cardList = new List<CardData>();
         private static int _scoreType;
 
+        private List<GameObject> _effects = new List<GameObject>();
+        private List<GoWrapper> _wrappers = new List<GoWrapper>();
         public override void Dispose()
         {
             base.Dispose();
+            for (int i = 0; i < _effects.Count; i++)
+            {
+                SceneController.DestroyObjectFromView(_effects[i]);
+            }
         }
 
         protected override void OnInit()
@@ -66,14 +72,27 @@ namespace GFGGame
         private void RenderListCardItem(int index, GObject obj)
         {
             CardData cardData = cardList[index];
-            GButton item = obj as GButton;
-            item.GetChild("txtName").asTextField.text = cardData.itemCfg.name;
-            item.GetChild("comCardMask").asCom.GetChild("loaCard").asLoader.url = ResPathUtil.GetCardSmallPath(cardData.resources[cardData.resIndex]);
-            item.GetChild("txtLv").asTextField.text = string.Format("Lv.\n{0}", cardData.lv);
-            item.GetChild("loaRarity").asLoader.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + cardData.itemCfg.rarity);
-            UI_ComStar comStar = UI_ComStar.Proxy(item.GetChild("comStar").asCom);
+            UI_ListCardItem item = UI_ListCardItem.Proxy(obj);// obj as GButton;
+            // item.GetChild("txtName").asTextField.text = cardData.itemCfg.name;
+            // item.GetChild("comCardMask").asCom.GetChild("loaCard").asLoader.url = ResPathUtil.GetCardSmallPath(cardData.resources[cardData.resIndex]);
+            // item.GetChild("txtLv").asTextField.text = string.Format("Lv.\n{0}", cardData.lv);
+            // item.GetChild("loaRarity").asLoader.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + cardData.itemCfg.rarity);
+            // UI_ComStar comStar = UI_ComStar.Proxy(item.GetChild("comStar").asCom);
+            // comStar.m_c1.selectedIndex = cardData.star;
+            item.m_txtName.text = cardData.itemCfg.name;
+            item.m_comCardMask.m_loaCard.asLoader.url = ResPathUtil.GetCardSmallPath(cardData.resources[cardData.resIndex]);
+            item.m_txtLv.text = string.Format("Lv.\n{0}", cardData.lv);
+            item.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + cardData.itemCfg.rarity);
+            UI_ComStar comStar = UI_ComStar.Proxy(item.m_comStar);
             comStar.m_c1.selectedIndex = cardData.star;
-
+            if (_effects.Count <= index)
+            {
+                string resPath = ResPathUtil.GetViewEffectPath("ui_xz", "ui_xz_zd_kq");
+                GameObject gameObject0;
+                GoWrapper wrapper0;
+                SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject0, out wrapper0);
+                _effects.Add(gameObject0);
+            }
         }
         private void OnListCardItemClick(EventContext context)
         {

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -26,25 +26,10 @@ namespace GFGGame
         private GButton _btnStore;
         private GButton _btnTuJian;
 
-        private GameObject _effectObj0;
-        private GoWrapper _wrapper0;
-        private GameObject _effectObj1;
-        private GoWrapper _wrapper1;
-        private GameObject _effectObj2;
-        private GoWrapper _wrapper2;
-        private GameObject _effectObj3;
-        private GoWrapper _wrapper3;
+
         private GameObject _effectObj4;
         private GoWrapper _wrapper4;
 
-        private GameObject _effectObj0_1;
-        private GoWrapper _wrapper0_1;
-        private GameObject _effectObj1_1;
-        private GoWrapper _wrapper1_1;
-        private GameObject _effectObj2_1;
-        private GoWrapper _wrapper2_1;
-        private GameObject _effectObj3_1;
-        private GoWrapper _wrapper3_1;
         private GameObject _effectObj4_1;
         private GoWrapper _wrapper4_1;
 
@@ -60,16 +45,7 @@ namespace GFGGame
         {
             _valueBarController.Dispose();
             _valueBarController = null;
-            // SceneController.DestroyObjectFromView(_effectObj0);
-            // SceneController.DestroyObjectFromView(_effectObj1);
-            // SceneController.DestroyObjectFromView(_effectObj2);
-            // SceneController.DestroyObjectFromView(_effectObj3);
-            // SceneController.DestroyObjectFromView(_effectObj4);
-            // SceneController.DestroyObjectFromView(_effectObj0_1);
-            // SceneController.DestroyObjectFromView(_effectObj1_1);
-            // SceneController.DestroyObjectFromView(_effectObj2_1);
-            // SceneController.DestroyObjectFromView(_effectObj3_1);
-            // SceneController.DestroyObjectFromView(_effectObj4_1);
+
             for (int i = 0; i < _btns.Length; i++)
             {
                 SceneController.DestroyObjectFromView(_effects[i]);

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs

@@ -23,7 +23,7 @@ namespace GFGGame
 
         protected override void OnShown()
         {
-            _ui.m_c1.selectedIndex = (int)(this.viewData as object[])[0];
+            _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[0];
             StudioDataManager.Instance.TYPE_SELECT_INDEX = _ui.m_c1.selectedIndex;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = 0;
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioFabricView).Name;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioMetalView.cs

@@ -24,7 +24,7 @@ namespace GFGGame
         protected override void OnShown()
         {
 
-            _ui.m_c1.selectedIndex = (int)(this.viewData as object[])[0];
+            _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[0];
             StudioDataManager.Instance.TYPE_SELECT_INDEX = _ui.m_c1.selectedIndex;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = 0;
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioMetalView).Name;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -28,8 +28,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             firstOpenProperty = -1;
-            _typeSelectIndex = (int)(this.viewData as object[])[0];
-            _propertySelectIndex = (int)(this.viewData as object[])[1];
+            _typeSelectIndex = this.viewData == null ? 1 : (int)(this.viewData as object[])[0];
+            _propertySelectIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[1];
             _ui.m_c1.selectedIndex = _typeSelectIndex;
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPropertyView).Name;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -41,10 +41,7 @@ namespace GFGGame
             isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPropertyView).FullName, false) ? 1 : 0;
             _ui.m_comProperty.m_c1.selectedIndex = isopen;
             var dataArray = FieldCfgArray.Instance.dataArray;
-            foreach (var cfg in dataArray)
-            {
-                Debug.Log("zoya:" + StoryLevelCfgArray.Instance.GetCfgs(cfg.type, cfg.subType, cfg.id).Count);
-            }
+
         }
 
         protected override void OnHide()