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

FGUIProject/assets/CommonGame/ComFunctionOpen.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="482,482">
-  <displayList>
-    <image id="n0_g3nf" name="n0" src="g3nf9s" fileName="images/js_xinjiesuo.png" xy="0,0"/>
-    <image id="n1_g3nf" name="n1" src="g3nf9u" fileName="images/js_xiant_1.png" xy="84,130"/>
-    <loader id="n2_g3nf" name="logIcon" xy="161,187" size="160,160" autoSize="true"/>
-    <text id="n3_g3nf" name="txtTitle" xy="173,60" size="136,59" fontSize="44" color="#aa8e46" align="center" text="新解锁"/>
-    <text id="n4_g3nf" name="txtName" xy="185,360" pivot="0.5,0" size="112,49" fontSize="36" color="#aa8e46" align="center" text="新解锁"/>
-  </displayList>
-</component>

FGUIProject/assets/CommonGame/FunctionOpenUI.xml

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="482,482">
+<component size="1080,1920">
   <displayList>
-    <component id="n0_g3nf" name="ComFunctionOpen" src="eiwu9v" fileName="ComFunctionOpen.xml" xy="0,0" pivot="0.5,0.5"/>
-    <graph id="n1_o139" name="holder" xy="240,240" size="1,1"/>
+    <graph id="n2_tt1q" name="n2" xy="0,0" size="1080,1920" alpha="0.72" type="rect" lineSize="0" fillColor="#ff000000"/>
+    <component id="n0_g3nf" name="ComFunctionOpen" src="eiwu9v" fileName="components/ComFunctionOpen.xml" xy="299,719" pivot="0.5,0.5"/>
+    <graph id="n1_o139" name="holder" xy="539,959" size="1,1"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Scale" target="n0_g3nf" tween="true" startValue="0,0" endValue="1,1" duration="3" ease="Linear"/>
-    <item time="21" type="Scale" target="n0_g3nf" tween="true" startValue="1,1" endValue="0,0" duration="3" ease="Linear"/>
+    <item time="0" type="Scale" target="n0_g3nf" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Bounce.Out"/>
+    <item time="0" type="Visible" target="n1_o139" value="true"/>
+    <item time="25" type="Scale" target="n0_g3nf" tween="true" startValue="1,1" endValue="0,0" duration="2" ease="Linear"/>
+    <item time="25" type="Visible" target="n1_o139" value="false"/>
   </transition>
 </component>

FGUIProject/assets/CommonGame/components/ComFunctionOpen.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="482,482">
+  <displayList>
+    <image id="n5_tt1q" name="n5" src="tt1q9w" fileName="images/xjs_ditu_1.png" xy="38,38"/>
+    <image id="n6_tt1q" name="n6" src="tt1q9x" fileName="images/xjs_ditu_2.png" xy="29,29"/>
+    <image id="n7_tt1q" name="n7" src="tt1q9y" fileName="images/xjs_ditu_3.png" xy="-146,-97"/>
+    <loader id="n2_g3nf" name="logIcon" xy="161,161" size="160,160" autoSize="true"/>
+    <text id="n4_g3nf" name="txtName" xy="179,327" pivot="0.5,0" size="124,54" fontSize="40" color="#b08b57" align="center" text="新解锁"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -161,10 +161,11 @@
     <image id="nz0ts" name="sc_anniu_1(1).png" path="/imagesExport/"/>
     <image id="g3nf9q" name="jinbi_1.png" path="/imagesExport/"/>
     <component id="g3nf9r" name="FunctionOpenUI.xml" path="/" exported="true"/>
-    <image id="g3nf9s" name="js_xinjiesuo.png" path="/images/"/>
     <image id="g3nf9t" name="js_icon_.png" path="/imgFunIcon/" exported="true"/>
-    <image id="g3nf9u" name="js_xiant_1.png" path="/images/"/>
-    <component id="eiwu9v" name="ComFunctionOpen.xml" path="/"/>
+    <component id="eiwu9v" name="ComFunctionOpen.xml" path="/components/"/>
+    <image id="tt1q9w" name="xjs_ditu_1.png" path="/images/"/>
+    <image id="tt1q9x" name="xjs_ditu_2.png" path="/images/"/>
+    <image id="tt1q9y" name="xjs_ditu_3.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Guide/GuideUI.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n15_tu96" name="rectFrame" src="tu96f" fileName="components/Component3.xml" xy="404,798" touchable="false"/>
-    <component id="n17_tu96" name="compTxt" src="tu96d" fileName="components/Component1.xml" xy="182,1099" size="700,200" touchable="false"/>
+    <component id="n17_tu96" name="compTxt" src="tu96d" fileName="components/Component1.xml" xy="261,1099" touchable="false"/>
     <image id="n18_a5x3" name="rectFrameTemp" src="tu96c" fileName="images/yd_tykuang_2.png" xy="272,822"/>
   </displayList>
 </component>

FGUIProject/assets/Guide/components/Component1.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="690,126" restrictSize="0,0,200,0">
+<component size="558,139" restrictSize="0,0,200,0">
   <displayList>
     <image id="n17_tu96" name="txtBg" src="tu96b" fileName="images/yd_tykuang_1.png" xy="0,1"/>
-    <text id="n18_tu96" name="txt" xy="100,16" size="489,97" fontSize="30" color="#9b7853" autoSize="none" autoClearText="true" text="点击继续"/>
-    <image id="n19_o139" name="n19" src="o139g" fileName="images/yd_tykuang_3.png" xy="-72,-55"/>
+    <text id="n18_tu96" name="txt" xy="34,16" size="489,97" fontSize="30" color="#9b7853" autoSize="none" autoClearText="true" text="点击继续"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -4,9 +4,9 @@
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
   </controller>
-  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="0"/>
+  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="1"/>
   <displayList>
-    <loader id="n0_l5nz" name="bg" xy="0,-120" size="1080,2400" url="ui://drx9d1uso1391h" autoSize="true">
+    <loader id="n0_l5nz" name="bg" xy="0,-240" size="1080,2400" url="ui://drx9d1uso1391i" autoSize="true">
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
@@ -23,44 +23,43 @@
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
     </component>
-    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="185,406" group="n19_l5nz"/>
-    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="505,236" group="n19_l5nz"/>
-    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="909,709" group="n19_l5nz"/>
-    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="199,1085" group="n19_l5nz"/>
-    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="295,1244" group="n19_l5nz"/>
-    <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="906,1257" group="n19_l5nz"/>
-    <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="177,1435" group="n19_l5nz"/>
-    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="733,1559" group="n19_l5nz"/>
-    <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="384,1648" group="n19_l5nz"/>
-    <group id="n19_l5nz" name="grpComStar0" xy="138,197" size="810,1490" advanced="true">
+    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="193,291" group="n19_l5nz"/>
+    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="513,121" group="n19_l5nz"/>
+    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="913,581" group="n19_l5nz"/>
+    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="207,970" group="n19_l5nz"/>
+    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="294,1130" group="n19_l5nz"/>
+    <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="914,1142" group="n19_l5nz"/>
+    <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="185,1320" group="n19_l5nz"/>
+    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="741,1444" group="n19_l5nz"/>
+    <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="392,1533" group="n19_l5nz"/>
+    <group id="n19_l5nz" name="grpComStar0" xy="146,82" size="807,1490" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>
     </group>
-    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="887,59" group="n25_iakb"/>
-    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="716,365" group="n25_iakb"/>
-    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="301,345" group="n25_iakb"/>
-    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="205,675" group="n25_iakb"/>
-    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="634,1010" group="n25_iakb"/>
-    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="789,1278" group="n25_iakb"/>
-    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="228,1483" group="n25_iakb"/>
-    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="487,1812" group="n25_iakb"/>
-    <component id="n43_o139" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="198,1247" group="n25_iakb"/>
-    <group id="n25_iakb" name="grpComStar1" xy="159,20" size="767,1831" advanced="true">
+    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="197,1085" group="n25_iakb"/>
+    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="716,245" group="n25_iakb"/>
+    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="301,225" group="n25_iakb"/>
+    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="205,555" group="n25_iakb"/>
+    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="634,890" group="n25_iakb"/>
+    <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"/>
+    <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"/>
     </group>
-    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="956,417" group="n30_iakb"/>
-    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="908,666" group="n30_iakb"/>
-    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="143,784" group="n30_iakb"/>
-    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="338,1165" group="n30_iakb"/>
-    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="638,1170" group="n30_iakb"/>
-    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="599,1512" group="n30_iakb"/>
-    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="771,1748" group="n30_iakb"/>
-    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="930,1503" group="n30_iakb"/>
-    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="579,656" group="n30_iakb"/>
-    <group id="n30_iakb" name="grpComStar2" xy="104,378" size="891,1409" advanced="true">
+    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="951,308" group="n30_iakb"/>
+    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="903,557" group="n30_iakb"/>
+    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="138,675" group="n30_iakb"/>
+    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="333,1056" group="n30_iakb"/>
+    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="633,1061" group="n30_iakb"/>
+    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="581,1394" group="n30_iakb"/>
+    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="758,1646" group="n30_iakb"/>
+    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="932,1394" group="n30_iakb"/>
+    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="574,547" group="n30_iakb"/>
+    <group id="n30_iakb" name="grpComStar2" xy="99,269" size="891,1416" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>

FGUIProject/assets/LuckyBox/components/ComStar.xml

@@ -9,5 +9,11 @@
     <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>
+    <graph id="n6_tt1q" name="holder1" xy="38,38" size="1,1">
+      <gearDisplay controller="c1" pages="1"/>
+    </graph>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompStoryLevelItem.xml

@@ -6,6 +6,7 @@
       <relation target="n1_xuzk" sidePair="center-center,middle-middle"/>
     </text>
     <component id="n3_xuzk" name="flower" src="s2cc5l" fileName="components/CompFlower2.xml" xy="23,116"/>
-    <image id="n8_nmnb" name="iconUnPass" src="v35420" fileName="imagesStory/zx_gka_guang.png" xy="-29,-24"/>
+    <image id="n8_nmnb" name="iconUnPass" src="v35420" fileName="imagesStory/zx_gka_guang.png" xy="-29,-24" visible="false"/>
+    <graph id="n9_tt1q" name="holder" xy="67,72" size="1,1"/>
   </displayList>
 </component>

GameClient/Assets/Editor/ToolsMenu.cs

@@ -191,6 +191,14 @@ namespace GFGEditor
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.TextureTargetPath, ImportArtResTool.TextureSrcPaths[0]);
         }
 
+        [MenuItem("策划/其它/清除冗余动画")]
+        public static void DeleteUnnecessaryAni()
+        {
+            FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.DressUpAnimationTargetPath, ImportArtResTool.DressUpAnimationSrcPaths[0]);
+            FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.EffectTargetPath, ImportArtResTool.EffectSrcPaths[0]);
+            FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.MaterialTargetPath, ImportArtResTool.MaterialSrcPaths[0]);
+            FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.TextureTargetPath, ImportArtResTool.TextureSrcPaths[0]);
+        }
         [MenuItem("Tools/List Player Assemblies in Console")]
         public static void PrintAssemblyNames()
         {

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

@@ -8,7 +8,6 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public GLoader m_logIcon;
-        public GTextField m_txtTitle;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpeiwu9v";
         public const string PACKAGE_NAME = "CommonGame";
@@ -58,13 +57,11 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_logIcon = (GLoader)comp.GetChild("logIcon");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_logIcon = null;
-            m_txtTitle = null;
             m_txtName = null;
             if(disposeTarget && target != null)
             {

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

@@ -9,6 +9,8 @@ namespace UI.LuckyBox
         public GComponent target;
         public Controller m_c1;
         public GImage m_imgLine;
+        public GGraph m_holder;
+        public GGraph m_holder1;
         public const string URL = "ui://drx9d1usl5nzq";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComStar";
@@ -58,11 +60,15 @@ namespace UI.LuckyBox
         {
             m_c1 = comp.GetController("c1");
             m_imgLine = (GImage)comp.GetChild("imgLine");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_imgLine = null;
+            m_holder = null;
+            m_holder1 = 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/Main/UI_CompStoryLevelItem.cs

@@ -11,6 +11,7 @@ namespace UI.Main
         public GTextField m_txtOrder;
         public UI_CompFlower2 m_flower;
         public GImage m_iconUnPass;
+        public GGraph m_holder;
         public const string URL = "ui://mfvz4q8kxuzk2d";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompStoryLevelItem";
@@ -62,6 +63,7 @@ namespace UI.Main
             m_txtOrder = (GTextField)comp.GetChild("txtOrder");
             m_flower = (UI_CompFlower2)UI_CompFlower2.Create(comp.GetChild("flower"));
             m_iconUnPass = (GImage)comp.GetChild("iconUnPass");
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -70,6 +72,7 @@ namespace UI.Main
             m_flower.Dispose();
             m_flower = null;
             m_iconUnPass = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -102,7 +102,7 @@ namespace GFGGame
             {
                 case ConstFunctionId.FU_ZHUANG_DIAN:
                     this.Hide();
-                    ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { null, null, _itemId }, null, false, true);
+                    ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { null, null, _itemId }, _fromeViewDatas, true, true);
                     break;
                 case ConstFunctionId.JU_QING_GUAN_QIA:
                     string value = infos[1];
@@ -122,7 +122,7 @@ namespace GFGGame
                     if (suitId > 0)
                     {
                         this.Hide();
-                        ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, suitId);
+                        ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, suitId, _fromeViewDatas);
                     }
                     break;
                 case ConstFunctionId.ZHAI_XING:

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

@@ -52,8 +52,8 @@ namespace GFGGame
                 this.Hide();
                 return;
             }
-            // string resPath = ResPathUtil.GetDressUpAnimationPath("ui_xjs");
-            // SceneController.AddObjectToView(_effectObj, _wrapper, _ui.m_holder, resPath, out _effectObj, out _wrapper);
+            string resPath = ResPathUtil.GetViewEffectPath("ui_xjs", "ui_xjs");
+            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/DressUp/DressUpFightView.cs

@@ -184,7 +184,8 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             this.Hide();
-            ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter);
+            // ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter);
+            ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_VIEW);
         }
 
         private void OnClickBtnHome()
@@ -645,7 +646,7 @@ namespace GFGGame
             if (_fightCfg.needSuitId > 0)
             {
 
-                ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, new object[] { _ui.m_compNeed.target.data, new object[] { ViewName.DRESS_UP_FIGHT_VIEW, this.viewData } });
+                ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, new object[] { _ui.m_compNeed.target.data, new object[] { ViewName.DRESS_UP_FIGHT_VIEW, this.viewData } }, new object[] { ViewName.DRESS_UP_FIGHT_VIEW, this.viewData });
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

@@ -8,8 +8,8 @@ namespace GFGGame
     public class FieldGuideView : BaseWindow
     {
         private UI_FieldGuideUI _ui;
-        private int[] _listBannerDatas = new int[3]{ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING};
-        private int[] _listGuideDatas = new int[1]{ConstFieldGuideId.SUIT_GUIDE};
+        private int[] _listBannerDatas = new int[3] { ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING };
+        private int[] _listGuideDatas = new int[1] { ConstFieldGuideId.SUIT_GUIDE };
 
         public override void Dispose()
         {
@@ -53,7 +53,8 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            this.Hide();
+            // this.Hide();
+            ViewManager.GoBackFrom(ViewName.FIELD_GUIDE_VIEW);
         }
 
         private void ListBannerItemRenderer(int index, GObject item)
@@ -66,7 +67,7 @@ namespace GFGGame
         private void OnClickBannerPic()
         {
             int id = _listBannerDatas[_ui.m_compBanner.m_listTab.selectedIndex];
-            switch(id)
+            switch (id)
             {
                 case ConstBannerId.ZHAI_XING:
                     ViewManager.Show(ViewName.LUCKY_BOX_VIEW);
@@ -92,17 +93,17 @@ namespace GFGGame
         {
             GObject listItem = context.data as GObject;
             int id = (int)listItem.data;
-            switch(id)
+            switch (id)
             {
                 case ConstFieldGuideId.SUIT_GUIDE:
-                    ViewManager.Show(ViewName.SUIT_GUIDE_VIEW);
-                break;
+                    ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    break;
             }
         }
 
         private void GetGuideProgress(int id, out int haveCount, out int totalCount)
         {
-            switch(id)
+            switch (id)
             {
                 case ConstFieldGuideId.SUIT_GUIDE:
                     DressUpMenuSuitDataManager.GetTotalProgress(out haveCount, out totalCount);
@@ -117,14 +118,14 @@ namespace GFGGame
         private void UpdatePrgress()
         {
             int num = _ui.m_listGuide.numChildren;
-            for(int i = 0; i < num; i++)
+            for (int i = 0; i < num; i++)
             {
                 UI_CompGuideItem listItem = UI_CompGuideItem.Proxy(_ui.m_listGuide.GetChildAt(i));
                 int id = (int)listItem.target.data;
                 int haveCount = 0;
                 int totalCount = 1;
                 GetGuideProgress(id, out haveCount, out totalCount);
-                decimal value = Math.Floor((decimal)100*haveCount/totalCount);
+                decimal value = Math.Floor((decimal)100 * haveCount / totalCount);
                 listItem.m_txtProgress.text = value + "%";
             }
         }
@@ -133,10 +134,10 @@ namespace GFGGame
         {
             string resName = "tujian_huodtu_1";
             int id = (int)listItem.data;
-            switch(id)
+            switch (id)
             {
                 case ConstBannerId.ZHAI_XING:
-                resName = "tujian_huodtu_1";
+                    resName = "tujian_huodtu_1";
                     break;
             }
             _ui.m_compBanner.m_loaderPic.url = "ui://FieldGuide/" + resName;
@@ -146,10 +147,10 @@ namespace GFGGame
         private void UpdateListBannerItems()
         {
             int num = _ui.m_compBanner.m_listTab.numChildren;
-            for(int i = 0; i < num; i++)
+            for (int i = 0; i < num; i++)
             {
                 UI_ButtonBannerPage listItem = UI_ButtonBannerPage.Proxy(_ui.m_compBanner.m_listTab.GetChildAt(i));
-                if(listItem.target.selected)
+                if (listItem.target.selected)
                 {
                     listItem.target.width = 47;
                 }
@@ -165,7 +166,7 @@ namespace GFGGame
         {
             int index = _ui.m_compBanner.m_listTab.selectedIndex;
             index++;
-            if(index >= _listBannerDatas.Length)
+            if (index >= _listBannerDatas.Length)
             {
                 index = 0;
             }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -30,7 +30,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
-            
+
             _ui.m_listSuit.itemRenderer = ListSuitItemRenderer;
             _ui.m_listType.itemRenderer = ListTypeItemRenderer;
             _ui.m_comBoxSort.items = new string[] { "默认排序", "稀有度高", "稀有度低", "收集度高", "收集度低" };
@@ -74,7 +74,8 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            this.Hide();
+            // this.Hide();
+            ViewManager.GoBackFrom(ViewName.SUIT_GUIDE_VIEW);
         }
 
         private void OnClickBtnSwitch()
@@ -104,13 +105,13 @@ namespace GFGGame
         private void UpdateListType()
         {
             _ui.m_listType.RemoveChildrenToPool();
-            switch(_menuType)
+            switch (_menuType)
             {
                 case ConstSuitGuideTypeId.TYPE_1:
-                    _menuTypeDataArray = new int[]{0, 1, 2, 3, 4, 5};
+                    _menuTypeDataArray = new int[] { 0, 1, 2, 3, 4, 5 };
                     break;
                 default:
-                    _menuTypeDataArray = new int[]{6, 7, 8, 9, 10};
+                    _menuTypeDataArray = new int[] { 6, 7, 8, 9, 10 };
                     break;
             }
             _ui.m_listType.numItems = _menuTypeDataArray.Length;
@@ -148,11 +149,12 @@ namespace GFGGame
             listItem.m_txtName.text = suitCfg.name;
             listItem.m_loaderPic.url = ResPathUtil.GetFieldGuideIconPath(suitCfg.res);
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, suitId, false, true);
-            
+
             listItem.target.data = suitId;
             UpdateSuitStatusView(listItem);
             listItem.m_loaderBonusBox.onClick.Clear();
-            listItem.m_loaderBonusBox.onClick.Add(() => {
+            listItem.m_loaderBonusBox.onClick.Add(() =>
+            {
                 SuitUtil.ShowSuitGuideBonus(suitId);
             });
         }
@@ -160,7 +162,7 @@ namespace GFGGame
         private void UpdateSuitStatus(EventContext eventContext)
         {
             int num = _ui.m_listSuit.numChildren;
-            for(int i = 0; i < num; i++)
+            for (int i = 0; i < num; i++)
             {
                 UI_CompSuitItem listItem = UI_CompSuitItem.Proxy(_ui.m_listSuit.GetChildAt(i));
                 UpdateSuitStatusView(listItem);
@@ -178,7 +180,7 @@ namespace GFGGame
             bool haveSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitId);
             listItem.m_imgLock.visible = listItem.m_imgLockBg.visible = !haveSuit;
             int status = DressUpMenuSuitDataManager.GetSuitGuideBonusStatus(suitId);
-            if(status == ConstBonusStatus.CAN_GET)
+            if (status == ConstBonusStatus.CAN_GET)
             {
                 listItem.m_loaderBonusBox.url = "ui://FieldGuide/tujian_lw_1";
             }
@@ -187,14 +189,15 @@ namespace GFGGame
                 listItem.m_loaderBonusBox.url = "ui://FieldGuide/tujian_lw_2";
             }
             listItem.m_bg.onClick.Clear();
-            listItem.m_bg.onClick.Add(() => {
+            listItem.m_bg.onClick.Add(() =>
+            {
                 if (haveSuit)
                 {
-                    ViewManager.Show(ViewName.SUIT_SHOW_VIEW, new object[] { _suitTypeId, suitId, _suitIds });
+                    ViewManager.Show(ViewName.SUIT_SHOW_VIEW, new object[] { _suitTypeId, suitId, _suitIds }, new object[] { ViewName.SUIT_SHOW_VIEW, this.viewData });
                 }
                 else
                 {
-                    ViewManager.Show(ViewName.SUIT_PARTS_DETAIL_VIEW, suitId);
+                    ViewManager.Show(ViewName.SUIT_PARTS_DETAIL_VIEW, suitId, new object[] { ViewName.SUIT_PARTS_DETAIL_VIEW, this.viewData });
                 }
             });
         }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitPartsDetailView.cs

@@ -74,7 +74,7 @@ namespace GFGGame
             else
             {
                 this.Hide();
-                ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.SUIT_PARTS_DETAIL_VIEW, this.viewData } });
+                ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.SUIT_GUIDE_VIEW, this.viewData } });
             }
         }
     }

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -87,7 +87,8 @@ namespace GFGGame
                 _ui.m_mask.target.visible = false;
                 _ui.m_compTxt.target.y = Math.Min(yTxt, GRoot.inst.height - _ui.m_compTxt.target.height - 3);
             }
-            _ui.m_rectFrame.target.visible = _ui.m_mask.target.visible;
+            // _ui.m_rectFrame.target.visible = _ui.m_mask.target.visible;
+            _ui.m_rectFrame.target.visible = false;
             _ui.m_rectFrameTemp.visible = _ui.m_mask.target.visible;
         }
 
@@ -127,6 +128,7 @@ namespace GFGGame
                 else
                 {
                     _ui.m_rectFrameTemp.visible = false;
+                    _ui.m_rectFrame.target.visible = _ui.m_mask.target.visible;
                 }
             }
         }

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

@@ -13,6 +13,8 @@ namespace GFGGame
         private UI_LuckyBoxStarUI _ui;
         private List<GObject> comStars = new List<GObject>();
 
+        private GameObject[] _effectObjs;
+        private GoWrapper[] _wrappers;
 
         private GObject curComStar;//当前选中的星星
         private Vector2 lastPos;//鼠标的上一个位置，每颗星星初始时默认为Vector2.right;

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

@@ -63,8 +63,9 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            this.Hide();
-            ViewManager.Show(ViewName.MAINUI_VIEW);
+            // this.Hide();
+            // ViewManager.Show(ViewName.MAINUI_VIEW);
+            ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_LIST_VIEW);
         }
 
         private void OnClickBtnHome()

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

@@ -2,6 +2,8 @@ using FairyGUI;
 using UI.CommonGame;
 using UI.Main;
 using System.Collections.Generic;
+using UnityEngine;
+
 namespace GFGGame
 {
     public class StoryChapterView : BaseView
@@ -13,6 +15,9 @@ namespace GFGGame
         private GObject _unPasslevelItem;
         private GObject _endLevelItem;
 
+        private GameObject _effectObj;
+        private GoWrapper _wrapper;
+
         public override void Dispose()
         {
             if (_valueBarController != null)
@@ -145,10 +150,18 @@ namespace GFGGame
                                 levelItem.m_flower.target.visible = false;
 
                             }
-                            levelItem.m_iconUnPass.visible = !StoryDataManager.CheckLevelPass(_chapterID, level);
-                            if (levelItem.m_iconUnPass.visible)
+                            // levelItem.m_iconUnPass.visible = 
+                            levelItem.m_holder.visible = !StoryDataManager.CheckLevelPass(_chapterID, level);
+                            // if (levelItem.m_holder.visible)
+                            // {
+                            // }
+                            if (levelItem.m_holder.visible)
                             {
                                 _unPasslevelItem = levelItem.target;
+                                _effectObj = null;
+                                _wrapper = null;
+                                string resPath = ResPathUtil.GetViewEffectPath("ui_gk", "ui_gk_sg");
+                                SceneController.AddObjectToView(_effectObj, _wrapper, levelItem.m_holder, resPath, out _effectObj, out _wrapper);
                             }
                             if (level > endLevel)
                             {

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

@@ -165,8 +165,8 @@ namespace GFGGame
             Timers.inst.Add(effectTime, 1, (param) =>
             {
                 _ui.m_btnMain.m_holder1.visible = false;
-                this.Hide();
-                ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW);
+                // this.Hide();
+                ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
                 isOpen = false; ;
 
 

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -83,17 +83,18 @@ namespace GFGGame
                 {
                     view.Refresh();
                 }
-                if (goBackParams != null)
-                {
-                    _goBackDatas[viewName] = goBackParams;
-                }
-                else if (resetGobackParams)
+                if (resetGobackParams)
                 {
                     if (_goBackDatas.ContainsKey(viewName) == true)
                     {
                         _goBackDatas.Remove(viewName);
                     }
                 }
+                if (goBackParams != null)
+                {
+                    _goBackDatas[viewName] = goBackParams;
+                }
+                // else 
             }
 
         }