ui优化

FGUIProject/assets/Common/ModalStatusUI.xml

@@ -4,7 +4,7 @@
     <graph id="n3_ityj" name="n3" xy="0,0" size="1080,1920" alpha="0" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <graph id="n1_d4iw" name="n1" xy="390,20" size="300,40" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
+    <graph id="n1_d4iw" name="n1" xy="390,20" size="300,40" visible="false" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     <text id="n2_d4iw" name="txtMessage" xy="290,976" size="500,42" fontSize="30" color="#ad987d" align="center" autoSize="none" autoClearText="true" text="这是一个提示"/>

FGUIProject/assets/CommonGame/RewardUI.xml

@@ -6,15 +6,12 @@
     <image id="n1_m9wm" name="imgTitle" src="m9wm8r" fileName="images/gxhd_btbt.png" xy="0,300" group="n8_m9wm">
       <relation target="" sidePair="center-center"/>
     </image>
-    <list id="n6_m9wm" name="listReward" xy="95,730" size="889,580" group="n8_m9wm" layout="flow_hz" overflow="scroll" lineGap="60" colGap="91" defaultItem="ui://eg2y0ldpm9wm8u" align="center">
+    <list id="n6_m9wm" name="listReward" xy="95,730" size="889,580" group="n8_m9wm" layout="flow_hz" overflow="scroll" lineGap="60" colGap="91" defaultItem="ui://eg2y0ldpm9wm8u" autoItemSize="true" align="center">
       <relation target="" sidePair="center-center"/>
       <item/>
       <item/>
       <item/>
       <item/>
-      <item/>
-      <item/>
-      <item/>
     </list>
     <group id="n8_m9wm" name="grp" xy="0,300" size="1080,1010" advanced="true"/>
     <text id="n7_m9wm" name="n7" xy="430,1822" size="220,49" fontSize="36" color="#958163" text="点击屏幕继续">

FGUIProject/assets/Launcher/LauncherAlertUI.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="936,472">
   <displayList>
-    <image id="n0_l55o" name="bg" src="k0v5h" fileName="images/di_1.png" xy="0,0" size="936,472">
+    <image id="n0_l55o" name="bg" src="wgy9k" fileName="images/hc_kuang_6.png" xy="0,0" size="936,472">
       <relation target="n5_l55o" sidePair="height-height"/>
     </image>
-    <text id="n5_l55o" name="txtContent" xy="111,124" size="714,144" fontSize="36" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例"/>
-    <component id="n3_l55o" name="btnLeft" src="k0v5i" fileName="components/Button1.xml" xy="83,322">
+    <text id="n5_l55o" name="txtContent" xy="111,124" size="714,142" fontSize="36" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例"/>
+    <component id="n3_l55o" name="btnLeft" src="k0v5i" fileName="components/Button1.xml" xy="54,322">
       <relation target="n0_l55o" sidePair="bottom-bottom"/>
       <Button title="取消"/>
     </component>
-    <component id="n4_l55o" name="btnRight" src="k0v5j" fileName="components/Button2.xml" xy="525,322">
+    <component id="n4_l55o" name="btnRight" src="k0v5j" fileName="components/Button2.xml" xy="496,322">
       <relation target="n3_l55o" sidePair="top-top"/>
       <Button title="确认"/>
     </component>

FGUIProject/assets/Launcher/components/Button1.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="331,111" extention="Button">
+<component size="380,111" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n0_q08x" name="n0" src="k0v5f" fileName="images/ANNIU_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_q08x" name="title" xy="0,0" size="331,111" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <text id="n1_q08x" name="title" xy="0,-5" size="380,111" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="666">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Launcher/components/Button2.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="331,111" extention="Button">
+<component size="380,111" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n0_q08x" name="n0" src="k0v5g" fileName="images/ANNIU_2.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_q08x" name="title" xy="0,0" size="331,111" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <text id="n1_q08x" name="title" xy="0,-5" size="380,111" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="666">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Launcher/package.xml

@@ -16,6 +16,7 @@
     <image id="k0v5h" name="di_1.png" path="/images/" scale="9grid" scale9grid="22,22,44,44" gridTile="16"/>
     <component id="k0v5i" name="Button1.xml" path="/components/"/>
     <component id="k0v5j" name="Button2.xml" path="/components/"/>
+    <image id="wgy9k" name="hc_kuang_6.png" path="/images/" scale="9grid" scale9grid="49,57,16,10"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\Resources\UI\Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/StoryFightResultUI.xml

@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <component id="n0_8xpg" name="selfScore" src="8xpg4z" fileName="components/CompFightScoreResult.xml" xy="8,17">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <component id="n0_8xpg" name="selfScore" src="8xpg4z" fileName="components/CompFightScoreResult.xml" xy="8,-415"/>
+    <component id="n2_8xpg" name="expBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="33,1924">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n2_8xpg" name="expBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="33,1685">
-      <relation target="" sidePair="bottom-bottom"/>
-    </component>
-    <graph id="n1_8xpg" name="btnClose" xy="0,0" size="1080,1920" alpha="0" type="rect" fillColor="#ffff0000">
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
+    <graph id="n1_8xpg" name="btnClose" xy="0,0" size="1080,1920" alpha="0" type="rect" fillColor="#ffff0000"/>
   </displayList>
-  <transition name="t0" autoPlay="true">
+  <transition name="t0">
     <item time="0" type="Alpha" target="n0_8xpg" tween="true" startValue="0" endValue="1" duration="6" ease="Quad.In"/>
     <item time="0" type="Alpha" target="n2_8xpg" tween="true" startValue="0" endValue="1" duration="6"/>
-    <item time="0" type="XY" target="n0_8xpg" tween="true" startValue="8,-813" endValue="8,47" duration="5" ease="Quad.In"/>
-    <item time="0" type="XY" target="n2_8xpg" tween="true" startValue="33,2105" endValue="33,1665" duration="6" ease="Quad.In"/>
-    <item time="5" type="XY" target="n0_8xpg" tween="true" startValue="8,47" endValue="8,17" duration="2"/>
-    <item time="6" type="XY" target="n2_8xpg" tween="true" startValue="33,1665" endValue="33,1685" duration="2"/>
+    <item time="0" type="XY" target="n0_8xpg" tween="true" startValue="8,-813" endValue="8,47" duration="6" ease="Bounce.Out"/>
+    <item time="0" type="XY" target="n2_8xpg" tween="true" startValue="33,2105" endValue="33,1665" duration="6" label2="posY" ease="Bounce.Out"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/comTargetCircle.xml

@@ -2,6 +2,7 @@
 <component size="256,256">
   <displayList>
     <loader id="n16_v3k9" name="loaIcon" xy="0,-1" size="256,259" visible="false" url="ui://mfvz4q8kvuz5b7" autoSize="true"/>
+    <image id="n19_wgy9" name="imgGuide" src="vuz5b9" fileName="imagesStory/zd_pfanniu_4.png" xy="-52,-52" scale="0.95,0.95" visible="false"/>
     <graph id="n18_mueb" name="holder" xy="127,127" size="1,1"/>
     <text id="n17_v3k9" name="txtPart" xy="128,78" pivot="0.5,0.5" anchor="true" size="148,94" fontSize="72" color="#d1a962" align="center" strokeColor="#feefc0" strokeSize="2" text="饰品"/>
     <text id="n15_mza1" name="txtCount" xy="0,107" pivot="0.5,0.5" size="256,94" font="ui://eg2y0ldpkst18" fontSize="72" color="#c49c56" align="center" vAlign="middle" autoSize="none" strokeColor="#feefc0" strokeSize="2" text="999"/>
@@ -10,10 +11,12 @@
     <item time="0" type="Visible" target="n15_mza1" value="false"/>
     <item time="0" type="Visible" target="n17_v3k9" value="false"/>
     <item time="0" type="Visible" target="n18_mueb" value="true"/>
+    <item time="0" type="Visible" target="n19_wgy9" value="false"/>
     <item time="14" type="Visible" target="n15_mza1" value="true"/>
     <item time="14" type="Visible" target="n17_v3k9" value="true"/>
     <item time="30" type="Visible" target="n15_mza1" value="false"/>
     <item time="30" type="Visible" target="n17_v3k9" value="false"/>
+    <item time="30" type="Visible" target="n19_wgy9" value="false"/>
     <item time="72" type="Visible" target="n18_mueb" value="true"/>
   </transition>
   <transition name="t1" autoPlay="true">

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

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public GLoader m_loaIcon;
+        public GImage m_imgGuide;
         public GGraph m_holder;
         public GTextField m_txtPart;
         public GTextField m_txtCount;
@@ -61,6 +62,7 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_imgGuide = (GImage)comp.GetChild("imgGuide");
             m_holder = (GGraph)comp.GetChild("holder");
             m_txtPart = (GTextField)comp.GetChild("txtPart");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
@@ -70,6 +72,7 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
+            m_imgGuide = null;
             m_holder = null;
             m_txtPart = null;
             m_txtCount = null;

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

@@ -286,11 +286,6 @@ namespace GFGGame
             _targetScore += targetScore;
             EquipDataCache.cacher.npcTotalScore = (int)Math.Round(_targetScore);
 
-            // GTween.To(_ui.m_comMineCircle.target.position, _ui.m_proScore.target.position, 0.2f).SetTarget(_ui.m_holderParttScore).OnUpdate((GTweener t) =>
-            // {
-            //     _ui.m_holderParttScore.position = t.value.vec2;
-            // }).OnComplete(UpdateProgressBar);
-            // UpdateProgressBar();
             ReleaseNpcSkill();
             PlayScoreAni();
         }
@@ -299,8 +294,8 @@ namespace GFGGame
         {
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
-            _ui.m_proScore.m_txtNpcScore.text = string.Format("{0}{1}", fightCfg.targetName, (int)_targetScore); //((int)_targetScore).ToString();
-            _ui.m_proScore.m_txtMineScore.text = string.Format("{0}{1}", RoleDataManager.roleName, (int)_score);// ((int)_score).ToString();
+            _ui.m_proScore.m_txtNpcScore.text = string.Format("{0}{1}", fightCfg.targetName, (int)_targetScore);
+            _ui.m_proScore.m_txtMineScore.text = string.Format("{0}{1}", RoleDataManager.roleName, (int)_score);
             _ui.m_proScore.m_comBar.m_imgAni.visible = true;
 
             double proportion = (_score + _targetScore) > 0 ? _score / (_score + _targetScore) : 0;
@@ -330,11 +325,15 @@ namespace GFGGame
             _ui.m_comTargetCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
             if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
             {
-                _ui.m_comMineCircle.m_t0.Play(1, 0, 0, 0.75f, () =>
+                _ui.m_comMineCircle.m_t0.Play(1, 0, 0, 1f, () =>
                 {
+                    _ui.m_comMineCircle.m_imgGuide.visible = true;
                     playStop = true;
                 });
-                _ui.m_comTargetCircle.m_t0.Play(1, 0, 0, 0.75f, null);
+                _ui.m_comTargetCircle.m_t0.Play(1, 0, 0, 1f, () =>
+                {
+                    _ui.m_comTargetCircle.m_imgGuide.visible = true;
+                });
                 return;
             }
             _ui.m_comMineCircle.m_t0.ignoreEngineTimeScale = false;

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

@@ -97,7 +97,8 @@ namespace GFGGame
                 Timers.inst.Add(0.5f, 1, this.AddExp);
             }
             _ui.m_selfScore.m_txtScore.textFormat = tf;
-
+            _ui.m_t0.SetValue("posY", 33, this.viewCom.height - 235);
+            _ui.m_t0.Play();
         }
 
         protected override void OnHide()