Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -45,8 +45,7 @@
     <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="789,1158" group="n25_iakb"/>
     <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="228,1363" group="n25_iakb"/>
     <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="487,1692" group="n25_iakb"/>
-    <component id="n49_qi04" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="902,102" group="n25_iakb"/>
-    <group id="n25_iakb" name="grpComStar1" xy="158,63" size="783,1668" advanced="true">
+    <group id="n25_iakb" name="grpComStar1" xy="158,186" size="670,1545" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>

FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
     <list id="n23_vek8" name="listBg" xy="0,0" size="1080,1920" pageController="c1" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="154" defaultItem="ui://drx9d1usvek811">
       <relation target="" sidePair="height-height,center-center,middle-middle"/>
@@ -29,7 +29,8 @@
     </component>
     <component id="n10_ga16" name="btnBuyOne" src="ga16b" fileName="components/Button1.xml" xy="91,1748" group="n31_vek8"/>
     <component id="n11_ga16" name="btnBuyTen" src="ga16c" fileName="components/Button2.xml" xy="577,1748" group="n31_vek8"/>
-    <image id="n21_ga16" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="919,1663" group="n31_vek8">
+    <image id="n21_ga16" name="iconSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="919,1663" group="n31_vek8">
+      <gearDisplay controller="c1" pages="0"/>
       <relation target="n11_ga16" sidePair="left-left,top-top"/>
     </image>
     <text id="n16_ga16" name="txtRemainTimes" xy="540,1869" pivot="0.5,0" anchor="true" size="248,44" group="n31_vek8" fontSize="32" color="#fff7d4" align="center" vars="true" text="今日剩余次数：{v1=0}">

FGUIProject/assets/LuckyBox/components/Button1.xml

@@ -5,7 +5,6 @@
     <image id="n0_ga16" name="n0" src="fka70" fileName="images/cj_anniu_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <graph id="n1_qi04" name="holder" xy="201,47" size="10,10"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/LuckyBox/components/Button2.xml

@@ -5,7 +5,6 @@
     <image id="n0_ga16" name="n0" src="fka71" fileName="images/cj_anniu_2.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <graph id="n1_qi04" name="holder" xy="201,47" size="10,10"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/LuckyBox/components/ComListBgItem.xml

@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" overflow="hidden" designImageLayer="1">
+<component size="1080,1920">
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
     <loader id="n25_vek8" name="loaBg" xy="0,-240" size="1080,2400" url="ui://drx9d1useshh1f" autoSize="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <graph id="n31_qi04" name="holder1" xy="653,759" size="100,100" lineSize="0">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </graph>
-    <image id="n30_qi04" name="imgTitle" src="qi041k" fileName="images/cj_zizi_2.png" xy="83,365">
-      <relation target="" sidePair="top-middle"/>
-    </image>
-    <graph id="n29_qi04" name="holder" xy="164,689" size="100,100" lineSize="0">
-      <relation target="" sidePair="top-middle"/>
-    </graph>
-    <text id="n28_vek8" name="txtTime" xy="324,409" size="90,902" fontSize="40" color="#fffbdd" align="center" vAlign="middle" autoSize="none" text="shengyu ">
-      <relation target="" sidePair="height-height,top-top"/>
-    </text>
-    <loader id="n26_vek8" name="loaImg" xy="0,1378" size="1080,542" visible="false" url="ui://drx9d1usvek8s" autoSize="true">
+    <loader id="n26_vek8" name="n26" xy="0,1378" size="1080,542" url="ui://drx9d1usvek8s" autoSize="true">
+      <gearDisplay controller="c1" pages="2"/>
       <relation target="" sidePair="bottom-bottom"/>
     </loader>
+    <text id="n28_vek8" name="txtTime" xy="324,409" size="55,902" fontSize="40" color="#fffbdd" align="center" vAlign="middle" autoSize="none" text="剩余81天">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="height-height,top-top"/>
+    </text>
   </displayList>
   <customProperty target="loaBg" propertyId="1"/>
 </component>

FGUIProject/assets/LuckyBox/components/ComStar.xml

@@ -2,8 +2,13 @@
 <component size="78,78" pivot="0.5,0.5" anchor="true">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n4_l5nz" name="imgLine" src="l5nzp" fileName="images/cj_xk_xian.png" xy="38,33" pivot="0,0.5" size="2,12"/>
-    <image id="n7_qi04" name="n7" src="l5nzn" fileName="images/cj_xk_xx.png" xy="0,0"/>
+    <image id="n4_l5nz" name="imgLine" src="l5nzp" fileName="images/cj_xk_xian.png" xy="36,34" pivot="0,0.5" size="10,12"/>
+    <image id="n3_l5nz" name="n3" src="l5nzo" fileName="images/cj_xk_yd.png" xy="15,15" pivot="0.5,0.5">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n2_l5nz" name="n2" src="l5nzn" fileName="images/cj_xk_xx.png" xy="0,0" pivot="0.5,0.5">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
     <graph id="n5_tt1q" name="holder" xy="38,38" size="1,1">
       <gearDisplay controller="c1" pages="0"/>
     </graph>

FGUIProject/assets/LuckyBox/package.xml

@@ -22,14 +22,14 @@
     <component id="l5nzm" name="LuckyBoxStarUI.xml" path="/" exported="true"/>
     <image id="l5nzn" name="cj_xk_xx.png" path="/images/"/>
     <image id="l5nzo" name="cj_xk_yd.png" path="/images/"/>
-    <image id="l5nzp" name="cj_xk_xian.png" path="/images/" scale="9grid" scale9grid="5,0,30,12"/>
+    <image id="l5nzp" name="cj_xk_xian.png" path="/images/" scale="9grid" scale9grid="8,0,9,12"/>
     <component id="l5nzq" name="ComStar.xml" path="/components/"/>
-    <image id="vek8r" name="cj_bj_1.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
+    <image id="vek8r" name="cj_bj_1.jpg" path="/images/" exported="true" atlas="alone_npot"/>
     <image id="vek8s" name="cj_ditua.png" path="/images/"/>
     <image id="vek8t" name="cj_duihuan.png" path="/images/"/>
     <image id="vek8v" name="cj_yulan.png" path="/images/"/>
-    <image id="vek8x" name="cj_bj_2.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
-    <image id="vek8y" name="cj_bj_3.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
+    <image id="vek8x" name="cj_bj_2.jpg" path="/images/" exported="true" atlas="alone_npot"/>
+    <image id="vek8y" name="cj_bj_3.jpg" path="/images/" exported="true" atlas="alone_npot"/>
     <component id="vek811" name="ComListBgItem.xml" path="/components/"/>
     <component id="vek812" name="ComCost.xml" path="/components/"/>
     <image id="qdrt14" name="hd_dkdk_1.png" path="/images/"/>
@@ -43,12 +43,10 @@
     <component id="qdrt1c" name="Button4.xml" path="/components/"/>
     <image id="ly9g1d" name="cj_xhua.png" path="/images/"/>
     <component id="ly9g1e" name="Button5.xml" path="/components/"/>
-    <image id="eshh1f" name="cj_bj_4.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
+    <image id="eshh1f" name="cj_bj_4.jpg" path="/images/" exported="true" atlas="alone_npot"/>
     <image id="o1391g" name="cj_tp_3.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="o1391h" name="cj_tp_1.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="o1391i" name="cj_tp_2.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
-    <image id="qi041j" name="jiyuet_bg.jpg" path="/imagesExport/"/>
-    <image id="qi041k" name="cj_zizi_2.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/componentsLevel/CompChapter2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1170,2600" scroll="both">
+<component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n36_rbmg" name="bg" src="slb41o" fileName="imagesStory/zhuxian_ditu.jpg" xy="-1,-1" size="1170,2600" aspect="true"/>
+    <image id="n37_n1kn" name="n37" src="n1knde" fileName="componentsLevel/beijing2_bg.jpg" xy="-4,-3" aspect="true"/>
     <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,2400"/>
     <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,2273"/>
     <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,2091"/>

FGUIProject/assets/Main/package.xml

@@ -238,7 +238,6 @@
     <component id="r1a99d" name="StoryCardChooseUI.xml" path="/" exported="true"/>
     <component id="r1a99f" name="ListCardItem.xml" path="/components/"/>
     <image id="r1a99g" name="fzd_fzxzhong.png" path="/imagesStory/"/>
-    <image id="uo1t9j" name="815fdfad7130eb284ed17c13c7f81dd.png" path="/imagesStory/"/>
     <component id="cn279k" name="ComAllCircle.xml" path="/components/"/>
     <component id="py009l" name="StorySkillUI.xml" path="/" exported="true"/>
     <image id="py009m" name="zd_kpdi_2.png" path="/imagesStory/"/>
@@ -330,7 +329,6 @@
     <component id="v3k9c5" name="ProgressBarCD.xml" path="/components/"/>
     <component id="v3k9c6" name="ProgressBarSingleScore.xml" path="/components/"/>
     <component id="v3k9c7" name="ProgressBarTargetScore.xml" path="/components/"/>
-    <image id="v3k9c8" name="f08dc01e397bcd8d2e04da1517d6cf7.png" path="/imagesStory/"/>
     <image id="v3k9c9" name="zd_daoshu_1.png" path="/imagesStory/"/>
     <image id="v3k9ca" name="zd_daoshu_2.png" path="/imagesStory/"/>
     <image id="v3k9cb" name="zd_jinengdi_1.png" path="/imagesStory/"/>
@@ -369,7 +367,7 @@
     <component id="lki4db" name="ComRoleSkill1.xml" path="/components/"/>
     <component id="txgzdc" name="CompChapter2.xml" path="/componentsLevel/" exported="true"/>
     <component id="txgzdd" name="CompChapter1.xml" path="/componentsLevel/" exported="true"/>
-    <image id="qi04de" name="beijing2_bg.jpg" path="/imagesStory/"/>
+    <image id="n1knde" name="beijing2_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -6,12 +6,6 @@ namespace GFGGame
 {
     public class LuckyBoxDataManager : SingletonBase<LuckyBoxDataManager>
     {
-
-        public const int BOX_ID_1 = 1;
-        public const int BOX_ID_2 = 2;
-        public const int BOX_ID_3 = 3;
-
-
         private List<ItemData> _rewardsList;//当前奖励，每次抽奖后刷新
         private Dictionary<int, ItemData> _firstRewardsList = new Dictionary<int, ItemData>();//首次获得的奖励
         public int[] luckyBoxIds = new int[] { 1, 2, 3 };//奖池列表

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -319,13 +319,5 @@ namespace GFGGame
             wrapper = _wrapper;
             gameObject = _gameObject;
         }
-        public static void DestroyObjectFromView(GameObject _gameObject)
-        {
-            if (_gameObject != null)
-            {
-                GameObject.Destroy(_gameObject);
-                _gameObject = null;
-            }
-        }
     }
 }

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

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.LuckyBox
-{
-    public partial class UI_Button1
-    {
-        public GButton target;
-        public GGraph m_holder;
-        public const string URL = "ui://drx9d1usga16b";
-        public const string PACKAGE_NAME = "LuckyBox";
-        public const string RES_NAME = "Button1";
-        private static UI_Button1 _proxy;
-
-        public static UI_Button1 Create(GObject gObject = null)
-        {
-            var ui = new UI_Button1();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_Button1 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Button1();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)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_holder = (GGraph)comp.GetChild("holder");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button1.cs.meta

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

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

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.LuckyBox
-{
-    public partial class UI_Button2
-    {
-        public GButton target;
-        public GGraph m_holder;
-        public const string URL = "ui://drx9d1usga16c";
-        public const string PACKAGE_NAME = "LuckyBox";
-        public const string RES_NAME = "Button2";
-        private static UI_Button2 _proxy;
-
-        public static UI_Button2 Create(GObject gObject = null)
-        {
-            var ui = new UI_Button2();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_Button2 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Button2();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)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_holder = (GGraph)comp.GetChild("holder");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button2.cs.meta

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

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

@@ -7,12 +7,9 @@ namespace UI.LuckyBox
     public partial class UI_ComListBgItem
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaBg;
-        public GGraph m_holder1;
-        public GImage m_imgTitle;
-        public GGraph m_holder;
         public GTextField m_txtTime;
-        public GLoader m_loaImg;
         public const string URL = "ui://drx9d1usvek811";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComListBgItem";
@@ -60,21 +57,15 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_imgTitle = (GImage)comp.GetChild("imgTitle");
-            m_holder = (GGraph)comp.GetChild("holder");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_loaImg = (GLoader)comp.GetChild("loaImg");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaBg = null;
-            m_holder1 = null;
-            m_imgTitle = null;
-            m_holder = null;
             m_txtTime = null;
-            m_loaImg = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -32,7 +32,6 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_1_5;
         public UI_ComStar m_comStar1_1_6;
         public UI_ComStar m_comStar1_1_7;
-        public UI_ComStar m_comStar1_1_8;
         public GGroup m_grpComStar1;
         public UI_ComStar m_comStar1_2_0;
         public UI_ComStar m_comStar1_2_1;
@@ -116,7 +115,6 @@ namespace UI.LuckyBox
             m_comStar1_1_5 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_5"));
             m_comStar1_1_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_6"));
             m_comStar1_1_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_7"));
-            m_comStar1_1_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_8"));
             m_grpComStar1 = (GGroup)comp.GetChild("grpComStar1");
             m_comStar1_2_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_0"));
             m_comStar1_2_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_1"));
@@ -176,8 +174,6 @@ namespace UI.LuckyBox
             m_comStar1_1_6 = null;
             m_comStar1_1_7.Dispose();
             m_comStar1_1_7 = null;
-            m_comStar1_1_8.Dispose();
-            m_comStar1_1_8 = null;
             m_grpComStar1 = null;
             m_comStar1_2_0.Dispose();
             m_comStar1_2_0 = null;

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

@@ -18,9 +18,9 @@ namespace UI.LuckyBox
         public GGroup m_grpTop;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
-        public UI_Button1 m_btnBuyOne;
-        public UI_Button2 m_btnBuyTen;
-        public GImage m_imgSpecial;
+        public GButton m_btnBuyOne;
+        public GButton m_btnBuyTen;
+        public GImage m_iconSpecial;
         public GTextField m_txtRemainTimes;
         public GGroup m_grpBottom;
         public GButton m_btnLeft;
@@ -83,9 +83,9 @@ namespace UI.LuckyBox
             m_grpTop = (GGroup)comp.GetChild("grpTop");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
-            m_btnBuyOne = (UI_Button1)UI_Button1.Create(comp.GetChild("btnBuyOne"));
-            m_btnBuyTen = (UI_Button2)UI_Button2.Create(comp.GetChild("btnBuyTen"));
-            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
+            m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
+            m_iconSpecial = (GImage)comp.GetChild("iconSpecial");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
             m_grpBottom = (GGroup)comp.GetChild("grpBottom");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
@@ -106,11 +106,9 @@ namespace UI.LuckyBox
             m_comCostOne = null;
             m_comCostTen.Dispose();
             m_comCostTen = null;
-            m_btnBuyOne.Dispose();
             m_btnBuyOne = null;
-            m_btnBuyTen.Dispose();
             m_btnBuyTen = null;
-            m_imgSpecial = null;
+            m_iconSpecial = null;
             m_txtRemainTimes = null;
             m_grpBottom = null;
             m_btnLeft = null;

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

@@ -7,7 +7,6 @@ namespace UI.Main
     public partial class UI_CompChapter2
     {
         public GComponent target;
-        public GImage m_bg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -75,7 +74,6 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
@@ -99,7 +97,6 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

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

@@ -22,66 +22,35 @@ namespace GFGGame
 
             return (int)timeSpan.TotalSeconds;
         }
-        //direction排版方向：0横向，1纵向
-        public string getFormatBySecond(int second, int type = 1, int direction = 0)
+        public string getFormatBySecond(int second, int type = 1, int showLength = 2)
         {
-            string str = "";
+            string str  = "";
             int ms = second * 1000;
             switch (type)
             {
                 case DateUtils.TIME_FORMAT_1:
-                    str = this.format_1(second, direction);
+                    str = this.format_1(second);
                     break;
             }
             return str;
         }
         //剩余时间大于1天返回天数，小于一天返回小时数，小于一小时返回分钟数，小于1分钟返回秒数
-        public string format_1(int second, int direction = 0)
+        public string format_1(int second)
         {
             if (second / this.SECOND_PER_DAY >= 1)
             {
-                if (direction == 0)
-                {
-                    return string.Format("剩余{0}天", Mathf.Floor(second / this.SECOND_PER_DAY));
-                }
-                else
-                {
-                    return string.Format("剩\n余\n{0}\n天", Mathf.Floor(second / this.SECOND_PER_DAY));
-                }
+                return string.Format ("剩余{0}天", Mathf.Floor(second / this.SECOND_PER_DAY));
             }
-            else if (second / this.SECOND_PER_DAY < 1 && second / (this.MUNITE_PER_HOUR * this.SECOND_PER_MUNITE) >= 1)
+            else if(second / this.SECOND_PER_DAY<1&& second/(this.MUNITE_PER_HOUR*this.SECOND_PER_MUNITE) >= 1)
             {
-                if (direction == 0)
-                {
-                    return string.Format("剩余{0}小时", Mathf.Floor(second / (this.MUNITE_PER_HOUR * this.SECOND_PER_MUNITE)));
-
-                }
-                else
-                {
-                    return string.Format("剩\n余\n{0}\n小\n时", Mathf.Floor(second / (this.MUNITE_PER_HOUR * this.SECOND_PER_MUNITE)));
-                }
+                return string.Format("剩余{0}小时", Mathf.Floor(second /( this.MUNITE_PER_HOUR * this.SECOND_PER_MUNITE)));
             }
-            else if (second / this.SECOND_PER_DAY < 1 && second / (this.MUNITE_PER_HOUR * this.SECOND_PER_MUNITE) < 1 && second / this.SECOND_PER_MUNITE >= 1)
+            else if (second / this.SECOND_PER_DAY < 1 && second / (this.MUNITE_PER_HOUR * this.SECOND_PER_MUNITE) < 1&& second/this. SECOND_PER_MUNITE>=1)
             {
-                if (direction == 0)
-                {
-                    return string.Format("剩余{0}分钟", Mathf.Floor(second / this.SECOND_PER_MUNITE));
-                }
-                else
-                {
-                    return string.Format("剩\n余\n{0}\n分\n钟", Mathf.Floor(second / this.SECOND_PER_MUNITE));
-                }
-            }
-            else if (second < this.SECOND_PER_MUNITE)
+                return string.Format("剩余{0}分钟", Mathf.Floor(second / this.SECOND_PER_MUNITE));
+            }else if (second< this.SECOND_PER_MUNITE)
             {
-                if (direction == 0)
-                {
-                    return string.Format("剩余{0}秒", second);
-                }
-                else
-                {
-                    return string.Format("剩\n余\n{0}\n秒", second);
-                }
+                return string.Format("剩余{0}秒", second);
             }
             return "";
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -197,12 +197,12 @@ namespace GFGGame
         }
         private void UpdateCJGoodsCount()
         {
-            int luckyBoxId1 = LuckyBoxDataManager.BOX_ID_3;
+            int luckyBoxId1 = LuckyBoxDataManager.Instance.luckyBoxIds[0];
             LuckyBoxCfg luckyBoxCfg1 = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId1);
             _ui.m_txtCount0.text = "" + ItemDataManager.GetItemNum(luckyBoxCfg1.drop);
             _ui.m_loaIcon0.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg1.drop).res);
 
-            int luckyBoxId2 = LuckyBoxDataManager.BOX_ID_2;
+            int luckyBoxId2 = LuckyBoxDataManager.Instance.luckyBoxIds[1];
             LuckyBoxCfg luckyBoxCfg2 = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId2);
             _ui.m_txtCount1.text = "" + ItemDataManager.GetItemNum(luckyBoxCfg2.drop);
             _ui.m_loaIcon1.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg2.drop).res);

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

@@ -131,12 +131,12 @@ namespace GFGGame
         //ÕªÐÇ£¨³é½±£©¶Ò»»
         private void UpdateCJExchange()
         {
-            int luckyBoxId1 = LuckyBoxDataManager.BOX_ID_2;
+            int luckyBoxId1 = LuckyBoxDataManager.Instance.luckyBoxIds[1];
             LuckyBoxCfg luckyBoxCfg1 = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId1);
             _valueBar.m_btnCJLuoXing.text = "" + ItemDataManager.GetItemNum(luckyBoxCfg1.drop);
             _valueBar.m_btnCJLuoXing.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg1.drop).res);
 
-            int luckyBoxId2 = LuckyBoxDataManager.BOX_ID_1;
+            int luckyBoxId2 = LuckyBoxDataManager.Instance.luckyBoxIds[2];
             LuckyBoxCfg luckyBoxCfg2 = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId2);
             _valueBar.m_btnCJHuoDong.text = "" + ItemDataManager.GetItemNum(luckyBoxCfg2.drop);
             _valueBar.m_btnCJHuoDong.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg2.drop).res);

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

@@ -9,11 +9,10 @@ namespace GFGGame
     {
         private UI_FunctionOpenUI _ui;
         List<string> _funList = new List<string>();
-        private GameObject _gameObject;
+        private GameObject _effectObj;
         private GoWrapper _wrapper;
         public override void Dispose()
         {
-            SceneController.DestroyObjectFromView(_gameObject);
             base.Dispose();
         }
 
@@ -56,7 +55,7 @@ namespace GFGGame
                 return;
             }
             string resPath = ResPathUtil.GetViewEffectPath("ui_xjs", "ui_xjs");
-            SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_holder, resPath, out _gameObject, out _wrapper);
+            SceneController.AddObjectToView(_effectObj, _wrapper, _ui.m_holder, resPath, out _effectObj, out _wrapper);
             FunctionOpenCfg cfg = FunctionOpenCfgArray.Instance.GetCfg(_funList[0]);
             _ui.m_ComFunctionOpen.m_txtName.text = cfg.name;
             _ui.m_ComFunctionOpen.m_logIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);

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

@@ -64,9 +64,7 @@ namespace GFGGame
         private void OnClickBg()
         {
             this.Hide();
-
-            ViewManager.Show(ViewName.LUCKY_BOX_VIEW, ViewManager.GetGoBackDatas(ViewName.LUCKY_BOX_STAR_VIEW));
-            // ViewManager.GoBackFrom(ViewName.LUCKY_BOX_VIEW);
+            ViewManager.Show(ViewName.LUCKY_BOX_VIEW);
         }
 
         private void ShowBonusList(List<ItemData> itemList)

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

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using FairyGUI;
 using System.Threading;
 using System.Threading.Tasks;
-using System;
 
 namespace GFGGame
 {
@@ -14,10 +13,8 @@ namespace GFGGame
         private UI_LuckyBoxStarUI _ui;
         private List<GObject> comStars = new List<GObject>();
 
-        private List<GameObject> _gameObjects = new List<GameObject>();
-        private List<GoWrapper> _wrappers = new List<GoWrapper>();
-        private List<GameObject> _gameObjects1 = new List<GameObject>();
-        private List<GoWrapper> _wrappers1 = new List<GoWrapper>();
+        private GameObject[] _effectObjs;
+        private GoWrapper[] _wrappers;
 
         private GObject curComStar;//当前选中的星星
         private Vector2 lastPos;//鼠标的上一个位置，每颗星星初始时默认为Vector2.right;
@@ -30,11 +27,6 @@ namespace GFGGame
         private bool isGuide = false;
         public override void Dispose()
         {
-            for (int i = 0; i < _gameObjects.Count; i++)
-            {
-                SceneController.DestroyObjectFromView(_gameObjects[i]);
-                SceneController.DestroyObjectFromView(_gameObjects1[i]);
-            }
             base.Dispose();
         }
 
@@ -57,8 +49,7 @@ namespace GFGGame
 
             _rewardList = LuckyBoxDataManager.Instance.RewardList;
             _ui.m_ctrlBuyType.selectedIndex = _rewardList != null && _rewardList.Count > 1 ? 1 : 0;
-
-            _ui.m_ctrlRewardsType.selectedIndex = Array.IndexOf(LuckyBoxCfgArray.Instance.dataArray, LuckyBoxCfgArray.Instance.GetCfg((int)viewData)); ;
+            _ui.m_ctrlRewardsType.selectedIndex = (int)viewData;
 
             ResetStartView();
 
@@ -80,20 +71,6 @@ namespace GFGGame
                 comStar.m_imgLine.width = imgLineWidth;
                 comStar.m_imgLine.rotation = 0;
 
-                GameObject gameObject = _gameObjects.Count > index ? _gameObjects[index] : null;
-                GoWrapper wrapper = _wrappers.Count > index ? _wrappers[index] : null;
-                string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck");
-                SceneController.AddObjectToView(gameObject, wrapper, comStar.m_holder, resPath, out gameObject, out wrapper);
-                if (_gameObjects.Count <= index) _gameObjects.Add(gameObject);
-                if (_wrappers.Count <= index) _wrappers.Add(wrapper);
-
-                GameObject gameObject1 = _gameObjects1.Count > index ? _gameObjects1[index] : null;
-                GoWrapper wrapper1 = _wrappers1.Count > index ? _wrappers1[index] : null;
-                string resPath1 = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_dj");
-                SceneController.AddObjectToView(gameObject1, wrapper1, comStar.m_holder1, resPath1, out gameObject1, out wrapper1);
-                if (_gameObjects1.Count <= index) _gameObjects1.Add(gameObject);
-                if (_wrappers1.Count <= index) _wrappers1.Add(wrapper);
-
                 star.data = new Vector2(comStar.target.x, comStar.target.y);
                 comStars.Add(star);
 

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

@@ -2,8 +2,6 @@ using FairyGUI;
 using UI.LuckyBox;
 using UI.CommonGame;
 using System;
-using System.Collections.Generic;
-using UnityEngine;
 
 namespace GFGGame
 {
@@ -12,18 +10,6 @@ namespace GFGGame
         private UI_LuckyBoxUI _ui;
         private ValueBarController _valueBarController;
 
-        private GameObject _gameObject;
-        private GoWrapper _wrapper;
-        private GameObject _gameObject1;
-        private GoWrapper _wrapper1;
-        private GameObject _gameObject2;
-        private GoWrapper _wrapper2;
-        private GameObject _gameObject3;
-        private GoWrapper _wrapper3;
-
-        private bool isActiveBoxOpen = false;
-        private int _selectedIndex = 0;
-
         public override void Dispose()
         {
             _valueBarController.Dispose();
@@ -43,8 +29,8 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
-            _ui.m_btnBuyOne.target.onClick.Add(OnClickBtnBuyOne);
-            _ui.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
+            _ui.m_btnBuyOne.onClick.Add(OnClickBtnBuyOne);
+            _ui.m_btnBuyTen.onClick.Add(OnClickBtnBuyTen);
             _ui.m_btnPreview.onClick.Add(OnClickBtnPreview);
             _ui.m_btnExchange.onClick.Add(OnClickBtnExChange);
             _ui.m_btnLeft.onClick.Add(() => { onClickChange(-1); });
@@ -53,7 +39,7 @@ namespace GFGGame
             _ui.m_listBg.itemRenderer = RenderListBgItem;
             _ui.m_c1.onChanged.Add(OnListBgScroll);//分页控制器
 
-            // Reset();//初始默认值
+            Reset();//初始默认值
         }
 
         protected override void OnShown()
@@ -63,36 +49,25 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateNormal);
             EventAgent.AddEventListener(ConstMessage.MONEY_CHANGE, UpdateNormal);
 
-            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
-            if (this.viewData != null)
-            {
-                object[] datas = (this.viewData as object[]);
-                if (datas != null && datas.Length > 1)
-                {
-                    boxId = (int)datas[1];
-                }
-                else
-                {
-                    boxId = (int)this.viewData;
-                }
-            }
 
-            LuckyBoxBonusDataCache.currentBoxId = boxId;
-            isActiveBoxOpen = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1) >= 0;
 
-            _ui.m_listBg.numItems = LuckyBoxDataManager.Instance.luckyBoxIds.Length;
-            _ui.m_listBg.ScrollToView(Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxBonusDataCache.currentBoxId));
+            _ui.m_listBg.numItems = 3;
+            int index = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxBonusDataCache.currentBoxId);
+            // if (!GuideDataManager.CheckGuideIsCompletedAtThisLogin(ConstGuideId.MAIN_UI_BTN_ZHAI_XING))
+            // {
+            //     index = _ui.m_listBg.numItems - 1;
+            // }
+            _ui.m_listBg.ScrollToView(index);
             _ui.m_listBg.scrollPane.decelerationRate = 0.8f;
-
             Timers.inst.Add(1, 0, CheckTime);
 
             _valueBarController.OnShown();
             _valueBarController.Controller(4);
 
             onClickChange(0);
-            updateActiveBox();
-        }
 
+
+        }
         private void RenderListBgItem(int index, GObject obj)
         {
             UI_ComListBgItem item = UI_ComListBgItem.Proxy(obj);
@@ -101,31 +76,32 @@ namespace GFGGame
         }
         private void CheckTime(object param = null)
         {
-            // int index = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1);
-            if (!isActiveBoxOpen)
+            int startTime = LuckyBoxDataManager.Instance.startTime;
+            int endTime = LuckyBoxDataManager.Instance.endTime;
+            int curTime = DateUtils.Instance.GetCurTime();
+            if (curTime < startTime || curTime >= endTime)
             {
-                //活动未开启
-                LuckyBoxBonusDataCache.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
+                //抽奖活动未开启或已过时
+                if (_ui.m_c1.selectedIndex == 2)
+                {
+                    _ui.m_listBg.ScrollToView(0);
+                }
+                _ui.m_listBg.numItems = 2;
                 Timers.inst.Remove(CheckTime);
                 return;
             }
-            int endTime = LuckyBoxDataManager.Instance.endTime;
-            int curTime = DateUtils.Instance.GetCurTime();
-            UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(0)).m_txtTime.text = DateUtils.Instance.getFormatBySecond(endTime - curTime, 1, 1);
+            UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(2)).m_txtTime.text = DateUtils.Instance.getFormatBySecond(endTime - curTime);
         }
         private void OnListBgScroll()
         {
-            // if (_ui.m_c1.selectedIndex == -1 || _ui.m_listBg.numChildren <= 0) return;
+            if (_ui.m_c1.selectedIndex == -1 || _ui.m_listBg.numChildren <= 0) return;
+            onClickChange(0);
 
             UI_ComListBgItem item = UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(_ui.m_c1.selectedIndex));
+            item.m_c1.selectedIndex = _ui.m_c1.selectedIndex;
+
             LuckyBoxBonusDataCache.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_ui.m_c1.selectedIndex];
-            item.m_txtTime.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
-            item.m_imgTitle.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
-            item.m_loaImg.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_3;
-            item.m_holder.visible = isActiveBoxOpen && LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
-            item.m_holder1.visible = isActiveBoxOpen && LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
 
-            onClickChange(0);
             UpdateNormal();
         }
 
@@ -135,13 +111,19 @@ namespace GFGGame
             _valueBarController.UpdateCJ(LuckyBoxBonusDataCache.currentBoxId);
 
 
-            _ui.m_comCostOne.m_txtCost.text = luckyBoxCfg.costNum.ToString();
-            _ui.m_comCostTen.m_txtCost.text = luckyBoxCfg.costNumTen.ToString();
+            _ui.m_comCostOne.m_txtCost.text = luckyBoxCfg.costNum.ToString();// string.Format("{0}",);
+            _ui.m_comCostTen.m_txtCost.text = luckyBoxCfg.costNumTen.ToString();// string.Format("{1}", );
             _ui.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
             _ui.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
 
+            // if (!GuideController.TryGuideByGuideId(_ui.m_btnBuyTen, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击按钮，开始抽奖，可以抽到好看的服装哦"))
+            // {
+            //     GuideController.TryGuideByGuideId(_ui.m_btnBack, ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK, 1, true, "点击按钮，返回主界面", 0, ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
+            // }
+            // if (GuideDataManager.GetGuideCount(ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK) <= 0)
+            // {
             Timers.inst.AddUpdate(UpdateToCheckGuide);
-
+            // }
             int count = LuckyBoxBonusDataCache.GetOwnedCount();
             _ui.m_txtOwned.SetVar("v1", "" + count).FlushVars();
 
@@ -150,34 +132,38 @@ namespace GFGGame
         private void onClickChange(int count)
         {
             _ui.m_c1.selectedIndex = _ui.m_c1.selectedIndex + count;
-            _ui.m_imgSpecial.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
-            _ui.m_btnRight.visible = _ui.m_c1.selectedIndex != _ui.m_listBg.numItems - 1;
-            _ui.m_btnLeft.visible = _ui.m_c1.selectedIndex != 0;
-            _ui.m_btnBuyOne.m_holder.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
-            _ui.m_btnBuyTen.m_holder.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
-        }
 
-        private void updateActiveBox()
-        {
-            if (isActiveBoxOpen)
+            if (_ui.m_c1.selectedIndex == _ui.m_listBg.numItems - 1)
             {
-                int index = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1);
-                UI_ComListBgItem item = UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(index));
-                string resPath = ResPathUtil.GetViewEffectPath("ui_cj", "ui_cj_bt");
-                SceneController.AddObjectToView(_gameObject, _wrapper, item.m_holder, resPath, out _gameObject, out _wrapper);
-                string resPath3 = ResPathUtil.GetDressUpAnimationPath("dz_jiyuet");
-                SceneController.AddObjectToView(_gameObject3, _wrapper3, item.m_holder1, resPath3, out _gameObject3, out _wrapper3, 120);
-
-                string resPath1 = ResPathUtil.GetViewEffectPath("ui_cj", "ui_cj_sl");
-                SceneController.AddObjectToView(_gameObject1, _wrapper1, _ui.m_btnBuyOne.m_holder, resPath1, out _gameObject1, out _wrapper1);
-                SceneController.AddObjectToView(_gameObject2, _wrapper2, _ui.m_btnBuyTen.m_holder, resPath1, out _gameObject2, out _wrapper2);
-
+                _ui.m_btnRight.visible = false;
+            }
+            else
+            {
+                _ui.m_btnRight.visible = true;
+            }
+            if (_ui.m_c1.selectedIndex == 0)
+            {
+                _ui.m_btnLeft.visible = false;
+            }
+            else
+            {
+                _ui.m_btnLeft.visible = true;
             }
         }
+
+
         private void OnClickBtnExChange()
         {
-            int storeId = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1 ? ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID : ConstStoreId.LUCKY_BOX_STORE_ID;
-            ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { storeId }, new object[] { ViewName.LUCKY_BOX_VIEW, LuckyBoxBonusDataCache.currentBoxId });
+            int storeId = ConstStoreId.CLOTHING_STORE_ID;
+            if (_ui.m_c1.selectedIndex == 2 || _ui.m_c1.selectedIndex == 1 || _ui.m_c1.selectedIndex == -1)
+            {
+                storeId = ConstStoreId.LUCKY_BOX_STORE_ID;
+            }
+            else if (_ui.m_c1.selectedIndex == 0)
+            {
+                storeId = ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID;
+            }
+            ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { storeId }, new object[] { ViewName.LUCKY_BOX_VIEW });
             this.Hide();
         }
         private void OnClickBtnPreview()
@@ -191,7 +177,7 @@ namespace GFGGame
              {
                  ItemDataManager.Remove(luckyBoxCfg.costID, luckyBoxCfg.costNum);
                  LuckyBoxDataManager.Instance.RewardList = LuckyBoxBonusDataCache.GetBonusList(1);
-                 ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, LuckyBoxBonusDataCache.currentBoxId, new object[] { ViewName.LUCKY_BOX_VIEW, LuckyBoxBonusDataCache.currentBoxId });
+                 ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, _ui.m_c1.selectedIndex);
              });
 
         }
@@ -205,7 +191,7 @@ namespace GFGGame
                 Timers.inst.AddUpdate(UpdateToCheckGuide);
                 ItemDataManager.Remove(luckyBoxCfg.costID, luckyBoxCfg.costNumTen);
                 LuckyBoxDataManager.Instance.RewardList = LuckyBoxBonusDataCache.GetBonusList(10, true);
-                ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, LuckyBoxBonusDataCache.currentBoxId, new object[] { ViewName.LUCKY_BOX_VIEW, LuckyBoxBonusDataCache.currentBoxId });
+                ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, _ui.m_c1.selectedIndex);
             }
             else
             {
@@ -214,7 +200,7 @@ namespace GFGGame
                  {
                      ItemDataManager.Remove(luckyBoxCfg.costID, luckyBoxCfg.costNumTen);
                      LuckyBoxDataManager.Instance.RewardList = LuckyBoxBonusDataCache.GetBonusList(10, false);
-                     ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, LuckyBoxBonusDataCache.currentBoxId, new object[] { ViewName.LUCKY_BOX_VIEW, LuckyBoxBonusDataCache.currentBoxId });
+                     ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, _ui.m_c1.selectedIndex);
 
                  });
             }
@@ -225,7 +211,7 @@ namespace GFGGame
             {
                 if (GRoot.inst.GetTopWindow() == this.viewCom)
                 {
-                    if (GuideController.TryGuideByGuideId(_ui.m_btnBuyTen.target, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击摘取十次"))
+                    if (GuideController.TryGuideByGuideId(_ui.m_btnBuyTen, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击摘取十次"))
                     {
                         Timers.inst.Remove(UpdateToCheckGuide);
                     }
@@ -256,7 +242,7 @@ namespace GFGGame
         {
             GuideController.TryCompleteGuide(ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK);
             this.Hide();
-
+            // ViewManager.Show(ViewName.MAINUI_VIEW, null, new object[] { ViewName.LUCKY_BOX_VIEW });
             Reset();
             ViewManager.GoBackFrom(ViewName.LUCKY_BOX_VIEW);
         }
@@ -264,11 +250,12 @@ namespace GFGGame
         private void OnClickBtnHome()
         {
             GameController.GoBackToMainView();
-            // Reset();
+            Reset();
         }
         private void Reset()
         {
-            LuckyBoxBonusDataCache.currentBoxId = LuckyBoxDataManager.BOX_ID_1;
+            LuckyBoxBonusDataCache.currentBoxId = 1;
+            _ui.m_c1.selectedIndex = 0;
         }
 
     }

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

@@ -15,7 +15,7 @@ namespace GFGGame
         private GObject _unPasslevelItem;
         private GObject _endLevelItem;
 
-        private GameObject _gameObject;
+        private GameObject _effectObj;
         private GoWrapper _wrapper;
 
         public override void Dispose()
@@ -25,8 +25,6 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
-            SceneController.DestroyObjectFromView(_gameObject);
-
             base.Dispose();
         }
 
@@ -161,10 +159,10 @@ namespace GFGGame
                             if (levelItem.m_holder.visible)
                             {
                                 _unPasslevelItem = levelItem.target;
-                                _gameObject = null;
+                                _effectObj = null;
                                 _wrapper = null;
                                 string resPath = ResPathUtil.GetViewEffectPath("ui_gk", "ui_gk_sg");
-                                SceneController.AddObjectToView(_gameObject, _wrapper, levelItem.m_holder, resPath, out _gameObject, out _wrapper);
+                                SceneController.AddObjectToView(_effectObj, _wrapper, levelItem.m_holder, resPath, out _effectObj, out _wrapper);
                             }
                             if (level > endLevel)
                             {

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

@@ -25,14 +25,14 @@ namespace GFGGame
         private const int _range = 30;//圆圈随机范围
         private float _time = 0;// 登峰造极按住的时间
 
-        private GameObject _gameObject0;
+        private GameObject _effectObj0;
         private GoWrapper _wrapper0;
-        private GameObject _gameObject1;
+        private GameObject _effectObj0_1;
+        private GoWrapper _wrapper0_1;
+        private GameObject _effectObj1;
         private GoWrapper _wrapper1;
-        private GameObject _gameObject2;
-        private GoWrapper _wrapper2;
-        private GameObject _gameObject3;
-        private GoWrapper _wrapper3;
+        private GameObject _effectObj1_1;
+        private GoWrapper _wrapper1_1;
         private Dictionary<int, RoleSkillCfg> _npcSkillDic;
 
         private bool playStop = false;
@@ -44,11 +44,6 @@ namespace GFGGame
                 GameObject.Destroy(_scenePrefab);
                 _scenePrefab = null;
             }
-            SceneController.DestroyObjectFromView(_gameObject0);
-            SceneController.DestroyObjectFromView(_gameObject1);
-            SceneController.DestroyObjectFromView(_gameObject2);
-            SceneController.DestroyObjectFromView(_gameObject3);
-
             base.Dispose();
         }
 
@@ -140,11 +135,11 @@ namespace GFGGame
         private void AddEffect()
         {
             string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_sc");
-            SceneController.AddObjectToView(_gameObject0, _wrapper0, _ui.m_ComShieldMine.m_holder, resPath0, out _gameObject0, out _wrapper0);
-            SceneController.AddObjectToView(_gameObject2, _wrapper2, _ui.m_ComShieldNpc.m_holder, resPath0, out _gameObject2, out _wrapper2);
+            SceneController.AddObjectToView(_effectObj0, _wrapper0, _ui.m_ComShieldMine.m_holder, resPath0, out _effectObj0, out _wrapper0);
+            SceneController.AddObjectToView(_effectObj1, _wrapper1, _ui.m_ComShieldNpc.m_holder, resPath0, out _effectObj1, out _wrapper1);
             string resPath1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_ps");
-            SceneController.AddObjectToView(_gameObject1, _wrapper1, _ui.m_ComShieldMine.m_holder1, resPath1, out _gameObject1, out _wrapper1);
-            SceneController.AddObjectToView(_gameObject3, _wrapper3, _ui.m_ComShieldNpc.m_holder1, resPath1, out _gameObject3, out _wrapper3);
+            SceneController.AddObjectToView(_effectObj0_1, _wrapper0_1, _ui.m_ComShieldMine.m_holder1, resPath1, out _effectObj0_1, out _wrapper0_1);
+            SceneController.AddObjectToView(_effectObj1_1, _wrapper1_1, _ui.m_ComShieldNpc.m_holder1, resPath1, out _effectObj1_1, out _wrapper1_1);
             _ui.m_ComShieldMine.m_holder.visible = false;
             _ui.m_ComShieldMine.m_holder1.visible = false;
             _ui.m_ComShieldNpc.m_holder.visible = false;

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

@@ -54,17 +54,6 @@ 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);
-
             base.Dispose();
         }
 

GameClient/Assets/MD5/PicSMd5

@@ -1 +1 @@
-6../../../gfg/正式资源/npc/对话立绘/default.png 9fa2f9169f0007dd27288096798534717../../../gfg/正式资源/npc/对话立绘/qixiongf.png b997621ae91a994e6783b38a6d28a3024../../../gfg/正式资源/npc/对话立绘/qujuf.png d36f7b90fc98048fb22fde10609e802a:../../../gfg/正式资源/npc/对话立绘/shangzuochi.png d426880934501292d2cd5f88867f6d47;../../../gfg/正式资源/npc/对话立绘/shangzuochit.png a3824cb23128e1cbb263342f7cdc756c9../../../gfg/正式资源/npc/对话立绘/yangguifei.png 36571bd4f4c9186ee484add37078e8e0;../../../gfg/正式资源/npc/对话立绘/yuanlingpaom.png 045f4a52a15b6c50370c64e8349a08dd5../../../gfg/正式资源/npc/对话立绘/zhijuf.png 372b7f8752bff99e73d23936ed3d43d3:../../../gfg/正式资源/npc/对话立绘/yizugongzhu.png 94e0ee15a97836d459eac5e4346b417a
+6../../../gfg/正式资源/npc/对话立绘/default.png 9fa2f9169f0007dd27288096798534717../../../gfg/正式资源/npc/对话立绘/qixiongf.png b997621ae91a994e6783b38a6d28a3024../../../gfg/正式资源/npc/对话立绘/qujuf.png d36f7b90fc98048fb22fde10609e802a:../../../gfg/正式资源/npc/对话立绘/shangzuochi.png d426880934501292d2cd5f88867f6d47;../../../gfg/正式资源/npc/对话立绘/shangzuochit.png a3824cb23128e1cbb263342f7cdc756c9../../../gfg/正式资源/npc/对话立绘/yangguifei.png 36571bd4f4c9186ee484add37078e8e0;../../../gfg/正式资源/npc/对话立绘/yuanlingpaom.png 045f4a52a15b6c50370c64e8349a08dd5../../../gfg/正式资源/npc/对话立绘/zhijuf.png 372b7f8752bff99e73d23936ed3d43d3:../../../gfg/正式资源/npc/对话立绘/yizugongzhu.png 94e0ee15a97836d459eac5e4346b417a7../../../gfg/正式资源/npc/对话立绘/shenjiao.png bd369246ca008e97351e1dcf2f9fd442