Browse Source

功能开启替换资源

zhaoyang 3 years ago
parent
commit
e8dffd2d9c

+ 0 - 10
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>

+ 6 - 5
FGUIProject/assets/CommonGame/FunctionOpenUI.xml

@@ -1,11 +1,12 @@
 <?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="25" type="Scale" target="n0_g3nf" tween="true" startValue="1,1" endValue="0,0" duration="2" ease="Linear"/>
   </transition>
 </component>

+ 10 - 0
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>

BIN
FGUIProject/assets/CommonGame/images/js_xiant_1.png


BIN
FGUIProject/assets/CommonGame/images/js_xinjiesuo.png


BIN
FGUIProject/assets/CommonGame/images/xjs_ditu_1.png


BIN
FGUIProject/assets/CommonGame/images/xjs_ditu_2.png


BIN
FGUIProject/assets/CommonGame/images/xjs_ditu_3.png


+ 4 - 3
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>

+ 8 - 0
GameClient/Assets/Editor/ToolsMenu.cs

@@ -186,6 +186,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()
         {

+ 0 - 3
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)
             {

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -235,10 +235,10 @@ namespace GFGGame
                 isOpen = false;
 
             });
-            // List<string> list = new List<string>();
-            // list.Add("GFGGame.ClothingShopView");
-            // list.Add("GFGGame.LuckyBoxView");
-            // ViewManager.Show<FunctionOpenView>(list);
+            List<string> list = new List<string>();
+            list.Add("GFGGame.ClothingShopView");
+            list.Add("GFGGame.LuckyBoxView");
+            ViewManager.Show<FunctionOpenView>(list);
         }
 
 

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes