战斗表现

FGUIProject/assets/CommonGame/components/ComHeadIcon.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="167,166" overflow="hidden" mask="n39_r9ri">
+<component size="167,167" overflow="hidden" mask="n39_r9ri">
   <displayList>
-    <graph id="n39_r9ri" name="n39" xy="0,0" pivot="0.5,0.5" size="166,166" aspect="true" type="eclipse" lineSize="0" fillColor="#ffeed5be">
+    <graph id="n39_r9ri" name="n39" xy="0,0" pivot="0.5,0.5" size="167,167" aspect="true" type="eclipse" lineSize="0" fillColor="#ffeed5be">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <loader id="n40_r9ri" name="loaIcon" xy="1,1" size="166,164" url="ui://eg2y0ldpjcejtkh" align="center" fill="scaleMatchWidth">
+    <loader id="n40_r9ri" name="loaIcon" xy="1,1" size="165,165" url="ui://eg2y0ldpjcejtkh" align="center" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>

FGUIProject/assets/CommonGame/components/ComHeadWithLv1.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="126,120">
+  <displayList>
+    <image id="n5_qkjs" name="n5" src="qkjskh" fileName="imagesNew/txk_dikuang.png" xy="0,0" group="n6_qkjs"/>
+    <component id="n4_qkjs" name="comHead" src="jcejtki" fileName="components/ComHeadIcon.xml" xy="11,12" size="95,95" group="n6_qkjs" aspect="true"/>
+    <image id="n3_qkjs" name="n3" src="qkjsko" fileName="imagesNew/txk_bk.png" xy="25,11" group="n6_qkjs"/>
+    <loader id="n7_qkjs" name="loaHeadBorder" xy="-6,-11" size="139,139" group="n6_qkjs" aspect="true" url="ui://eg2y0ldpqkjstlb" align="center" vAlign="middle" fill="scale"/>
+    <group id="n6_qkjs" name="n6" xy="-6,-11" size="139,139"/>
+    <image id="n8_qkjs" name="n8" src="qkjski" fileName="imagesNew/txk_LevelDikuang.png" xy="-19,-20"/>
+    <text id="n9_qkjs" name="txtLv" xy="-10,-18" pivot="0.5,0" size="52,66" font="ui://eg2y0ldpa0cftks" fontSize="50" color="#e3c684" align="center" text="99"/>
+    <text id="n10_qkjs" name="n10" xy="-21,-25" pivot="0.5,0" size="35,34" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#e3c684" align="center" text="Lv."/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -255,6 +255,11 @@
     <component id="a0cftl2" name="BtnCloose.xml" path="/components/" exported="true"/>
     <image id="wm60tl4" name="grxx_2000012_1.png" path="/images/" exported="true"/>
     <image id="wm60tl7" name="grxx_xtkk_1.png" path="/images/"/>
+    <component id="qkjstl8" name="ComHeadWithLv1.xml" path="/components/" exported="true"/>
+    <image id="qkjski" name="txk_LevelDikuang.png" path="/imagesNew/"/>
+    <image id="qkjsko" name="txk_bk.png" path="/imagesNew/"/>
+    <image id="qkjskh" name="txk_dikuang.png" path="/imagesNew/"/>
+    <image id="qkjstl9" name="grxx_xtkk_2.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/ArenaFightResultUI.xml

@@ -4,7 +4,7 @@
     <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>
-    <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="815,119" pivot="0.5,0" size="265,601"/>
+    <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="48,38" pivot="0.5,0"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Size" target="n8_wono" value="265,0"/>

FGUIProject/assets/Main/StoryFightResultUI.xml

@@ -4,15 +4,9 @@
     <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>
-    <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="815,119" pivot="0.5,0" size="265,601"/>
-    <component id="n2_8xpg" name="comExpBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="0,1673" alpha="0">
+    <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="48,38" pivot="0.5,0"/>
+    <component id="n2_8xpg" name="comExpBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="20,1673">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
   </displayList>
-  <transition name="t1">
-    <item time="0" type="Alpha" target="n2_8xpg" value="0"/>
-    <item time="0" type="Size" target="n8_wono" value="265,0"/>
-    <item time="6" type="Size" target="n8_wono" tween="true" startValue="265,0" endValue="265,601" duration="12" ease="Linear"/>
-    <item time="18" type="Alpha" target="n2_8xpg" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
-  </transition>
 </component>

FGUIProject/assets/Main/components/ComResult.xml

@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="265,601" pivot="0.5,0" anchor="true" overflow="hidden">
+<component size="983,374" pivot="0.5,0" anchor="true" overflow="hidden">
   <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
-    <loader id="n9_wono" name="logResult" xy="0,0" size="265,601" url="ui://mfvz4q8kwonoge" autoSize="true">
-      <gearIcon controller="c1" pages="1,2,3" values="ui://mfvz4q8kwonogc|ui://mfvz4q8kwonogd|ui://mfvz4q8kwonoge" default="ui://mfvz4q8kwonog1"/>
+    <image id="n16_qkjs" name="n16" src="qkjskj" fileName="imagesNew/zdpf_dikuang.png" xy="90,138"/>
+    <image id="n17_qkjs" name="n17" src="qkjsk7" fileName="imagesNew/result.png" xy="450,159"/>
+    <loader id="n15_qkjs" name="loaResultBg" xy="0,0" size="360,374" url="ui://mfvz4q8kqkjsjc" autoSize="true">
+      <gearIcon controller="c1" pages="0,1,2" values="ui://mfvz4q8kqkjsju|ui://mfvz4q8kqkjsjj|ui://mfvz4q8kqkjsjt" default="ui://mfvz4q8kqkjsjc"/>
     </loader>
-    <image id="n10_wono" name="n10" src="wonog7" fileName="imagesFight/zd_js_xing_1.png" xy="177,210" group="n13_wono">
+    <loader id="n9_wono" name="logResult" xy="68,95" pivot="0.5,0.5" size="216,184" url="ui://mfvz4q8kqkjsjh" autoSize="true">
+      <gearIcon controller="c1" pages="0,1,2,3" values="ui://mfvz4q8kqkjsje|ui://mfvz4q8kqkjsjg|ui://mfvz4q8kqkjsjf|ui://mfvz4q8kqkjsjh"/>
+    </loader>
+    <image id="n10_wono" name="n10" src="qkjsnz" fileName="imagesNew/zspf_picture.png" xy="401,70" group="n13_wono">
       <gearDisplay controller="c1" pages="1,2,3"/>
     </image>
-    <image id="n11_wono" name="n11" src="wonog7" fileName="imagesFight/zd_js_xing_1.png" xy="177,243" group="n13_wono">
+    <image id="n11_wono" name="n11" src="qkjsnz" fileName="imagesNew/zspf_picture.png" xy="476,70" group="n13_wono">
       <gearDisplay controller="c1" pages="2,3"/>
     </image>
-    <image id="n12_wono" name="n12" src="wonog7" fileName="imagesFight/zd_js_xing_1.png" xy="177,276" group="n13_wono">
+    <image id="n12_wono" name="n12" src="qkjsnz" fileName="imagesNew/zspf_picture.png" xy="551,70" group="n13_wono">
       <gearDisplay controller="c1" pages="3"/>
     </image>
-    <group id="n13_wono" name="grpStar" xy="177,210" size="32,99" advanced="true" layout="vt" excludeInvisibles="true"/>
-    <text id="n14_wono" name="txtScore" xy="111,352" pivot="0.5,0" size="73,54" fontSize="40" color="#ecf6fc" strokeColor="#c49a49" strokeSize="2" singleLine="true" text="666">
+    <group id="n13_wono" name="grpStar" xy="401,70" size="210,60" advanced="true" layout="hz" colGap="15" excludeInvisibles="true"/>
+    <text id="n14_wono" name="txtScore" xy="567,158" size="104,60" font="ui://mfvz4q8kqkjsnx" fontSize="40" color="#ecf6fc" letterSpacing="-10" singleLine="true" text="666">
       <gearColor controller="c1" pages="0" values="#ecf6fc,#749dc8" default="#ecf6fc,#c49a49"/>
     </text>
   </displayList>

FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -2,7 +2,7 @@
 <component size="256,259">
   <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <graph id="n28_qkjs" name="holderResult" xy="130,130" pivot="0.5,0.5" anchor="true" size="30,30" visible="false" type="rect"/>
+    <graph id="n28_qkjs" name="holderResult" xy="130,130" pivot="0.5,0.5" anchor="true" size="30,30" type="rect"/>
     <image id="n18_f2bf" name="n18" src="qkjsli" fileName="imagesNew/font_zdqp_dikuang.png" xy="122,126" pivot="0.48,0.48" anchor="true" visible="false"/>
     <loader id="n25_qkjs" name="loaPart" xy="80,78" size="88,100" group="n21_f2bf" url="ui://mfvz4q8kqkjsl6" autoSize="true"/>
     <graph id="n24_qkjs" name="holderNormal" xy="127,129" pivot="0.5,0.5" anchor="true" size="1,1" group="n21_f2bf"/>
@@ -58,7 +58,7 @@
     <item time="30" type="Visible" target="n22_f2bf" value="false"/>
     <item time="30" type="Visible" target="n28_qkjs" value="true"/>
     <item time="30" type="Visible" target="n9_vuz5" value="false"/>
-    <item time="30" type="XY" target="n28_qkjs" label="start" tween="true" startValue="130,130" endValue="-75,-500" duration="18" label2="end" ease="Circ.Out"/>
+    <item time="30" type="XY" target="n28_qkjs" label="start" tween="true" startValue="130,130" endValue="130,-500" duration="18" label2="end" ease="Linear"/>
     <item time="48" type="Visible" target="n28_qkjs" value="false"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/CompFightExpBar.xml

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,247">
+<component size="1040,151">
   <displayList>
-    <image id="n2_8xpg" name="n2" src="8xpg4r" fileName="imagesFight/zd_jsjm_ditu.png" xy="0,0"/>
-    <text id="n7_8xpg" name="txtLvl" xy="234,100" size="124,46" fontSize="34" color="#9b7a47" autoClearText="true" text="等级 99"/>
-    <text id="n8_8xpg" name="txtLvlAdded" xy="825,113" pivot="1,0" size="200,46" fontSize="34" color="#9b7a47" leading="0" singleLine="true" text="经验值：+20"/>
-    <component id="n9_8xpg" name="pbExp" src="sd8cei" fileName="components/Component6.xml" xy="221,157"/>
-    <component id="n10_wono" name="n10" src="wonogi" fileName="components/ComHead.xml" xy="36,54" size="165,165" aspect="true"/>
-    <image id="n13_wono" name="n13" src="wonogg" fileName="imagesFight/zjm_txkuang.png" xy="36,55"/>
+    <component id="n19_qkjs" name="proExp" src="qkjso0" fileName="components/ProgressBar3.xml" xy="112,70">
+      <ProgressBar value="100" max="100"/>
+    </component>
+    <text id="n8_8xpg" name="txtExpAdded" xy="880,25" pivot="1,0" size="117,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fff1c1" leading="0" vars="true" singleLine="true" text="+EXP{value=20}"/>
+    <text id="n15_qkjs" name="txtCurExp" xy="155,20" size="62,54" group="n18_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#fff1c1" leading="0" vars="true" singleLine="true" text="999"/>
+    <text id="n17_qkjs" name="n17" xy="211,31" size="17,42" group="n18_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#fff1c1" leading="0" vars="true" singleLine="true" text="/"/>
+    <text id="n16_qkjs" name="txtAllExp" xy="222,31" size="47,42" group="n18_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#fff1c1" leading="0" vars="true" singleLine="true" text="999"/>
+    <group id="n18_qkjs" name="n18" xy="155,20" size="114,54" advanced="true" layout="hz" colGap="-6" excludeInvisibles="true"/>
+    <component id="n10_wono" name="comHead" src="qkjstl8" fileName="components/ComHeadWithLv1.xml" pkg="eg2y0ldp" xy="22,26" aspect="true"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ProgressBar3.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="923,33" extention="ProgressBar">
+  <displayList>
+    <image id="n0_qkjs" name="n0" src="qkjsla" fileName="imagesNew/pro_bk_in.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_qkjs" name="bar" src="qkjsl9" fileName="imagesNew/pro_activate.png" xy="37,5" fillMethod="hz"/>
+  </displayList>
+  <ProgressBar/>
+</component>

FGUIProject/assets/Main/package.xml

@@ -611,6 +611,7 @@
     <font id="qkjsnw" name="Font_Prefect.fnt" path="/FontNew/" exported="true"/>
     <font id="qkjsnx" name="Font_Result.fnt" path="/FontNew/" exported="true"/>
     <font id="qkjsny" name="Font_Score.fnt" path="/FontNew/" exported="true"/>
+    <image id="qkjsnz" name="zspf_picture.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -172,6 +172,20 @@ namespace GFGGame
             UI_ComHeadWithLv.ProxyEnd();
 
         }
+        public void UpdateHeadWithLv1(GComponent component, int headId, int roleBorderId, int lv)
+        {
+
+            UI_ComHeadWithLv1 comHeadWithLv = UI_ComHeadWithLv1.Proxy(component);
+
+            ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(headId == 0 ? ConstItemID.HEADID : headId);
+            ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(roleBorderId == 0 ? ConstItemID.HEADBORDERID : roleBorderId);
+
+            comHeadWithLv.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
+            comHeadWithLv.m_loaHeadBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+            comHeadWithLv.m_txtLv.text = lv > 0 ? lv.ToString() : "--";
+            UI_ComHeadWithLv1.ProxyEnd();
+
+        }
         public void UpdateHead(GComponent component, int headId, int roleBorderId)
         {
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component5.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv1.cs

@@ -2,20 +2,22 @@
 
 using FairyGUI;
 
-namespace UI.Main
+namespace UI.CommonGame
 {
-    public partial class UI_Component5
+    public partial class UI_ComHeadWithLv1
     {
         public GComponent target;
-        public GImage m_bar;
-        public const string URL = "ui://mfvz4q8ksd8ceh";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "Component5";
-        private static UI_Component5 _proxy;
+        public UI_ComHeadIcon m_comHead;
+        public GLoader m_loaHeadBorder;
+        public GTextField m_txtLv;
+        public const string URL = "ui://eg2y0ldpqkjstl8";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComHeadWithLv1";
+        private static UI_ComHeadWithLv1 _proxy;
 
-        public static UI_Component5 Create(GObject gObject = null)
+        public static UI_ComHeadWithLv1 Create(GObject gObject = null)
         {
-            var ui = new UI_Component5();
+            var ui = new UI_ComHeadWithLv1();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +26,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_Component5 Proxy(GObject gObject = null)
+        public static UI_ComHeadWithLv1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Component5();
+                _proxy = new UI_ComHeadWithLv1();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +57,16 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bar = (GImage)comp.GetChild("bar");
+            m_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
+            m_loaHeadBorder = (GLoader)comp.GetChild("loaHeadBorder");
+            m_txtLv = (GTextField)comp.GetChild("txtLv");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bar = null;
+            m_comHead.Dispose();
+            m_comHead = null;
+            m_loaHeadBorder = null;
+            m_txtLv = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component6.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: de333b6e8a6ffa04ba68656cf901e38c
+guid: 4a7b0f52b96665549a0e7751e941dfb1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_loaResultBg;
         public GLoader m_logResult;
         public GGroup m_grpStar;
         public GTextField m_txtScore;
@@ -59,6 +60,7 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_loaResultBg = (GLoader)comp.GetChild("loaResultBg");
             m_logResult = (GLoader)comp.GetChild("logResult");
             m_grpStar = (GGroup)comp.GetChild("grpStar");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
@@ -66,6 +68,7 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_loaResultBg = null;
             m_logResult = null;
             m_grpStar = null;
             m_txtScore = null;

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

@@ -23,6 +23,7 @@ namespace UI.Main
         public GGroup m_grpResult;
         public Transition m_t0;
         public Transition m_t1;
+        public Transition m_t2;
         public const string URL = "ui://mfvz4q8kvuz5bi";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComScoreResult";
@@ -86,6 +87,7 @@ namespace UI.Main
             m_grpResult = (GGroup)comp.GetChild("grpResult");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
+            m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -105,6 +107,7 @@ namespace UI.Main
             m_grpResult = null;
             m_t0 = null;
             m_t1 = null;
+            m_t2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,9 +7,11 @@ namespace UI.Main
     public partial class UI_CompFightExpBar
     {
         public GComponent target;
-        public GTextField m_txtLvl;
-        public GTextField m_txtLvlAdded;
-        public UI_Component6 m_pbExp;
+        public GProgressBar m_proExp;
+        public GTextField m_txtExpAdded;
+        public GTextField m_txtCurExp;
+        public GTextField m_txtAllExp;
+        public GComponent m_comHead;
         public const string URL = "ui://mfvz4q8k8xpg52";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompFightExpBar";
@@ -57,16 +59,19 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
-            m_txtLvlAdded = (GTextField)comp.GetChild("txtLvlAdded");
-            m_pbExp = (UI_Component6)UI_Component6.Create(comp.GetChild("pbExp"));
+            m_proExp = (GProgressBar)comp.GetChild("proExp");
+            m_txtExpAdded = (GTextField)comp.GetChild("txtExpAdded");
+            m_txtCurExp = (GTextField)comp.GetChild("txtCurExp");
+            m_txtAllExp = (GTextField)comp.GetChild("txtAllExp");
+            m_comHead = (GComponent)comp.GetChild("comHead");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtLvl = null;
-            m_txtLvlAdded = null;
-            m_pbExp.Dispose();
-            m_pbExp = null;
+            m_proExp = null;
+            m_txtExpAdded = null;
+            m_txtCurExp = null;
+            m_txtAllExp = null;
+            m_comHead = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component5.cs.meta

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

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

@@ -1,78 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_Component6
-    {
-        public GComponent target;
-        public UI_Component5 m_bar;
-        public GTextField m_title;
-        public GGraph m_holder;
-        public const string URL = "ui://mfvz4q8ksd8cei";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "Component6";
-        private static UI_Component6 _proxy;
-
-        public static UI_Component6 Create(GObject gObject = null)
-        {
-            var ui = new UI_Component6();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_Component6 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Component6();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_bar = (UI_Component5)UI_Component5.Create(comp.GetChild("bar"));
-            m_title = (GTextField)comp.GetChild("title");
-            m_holder = (GGraph)comp.GetChild("holder");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_bar.Dispose();
-            m_bar = null;
-            m_title = null;
-            m_holder = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

@@ -10,7 +10,6 @@ namespace UI.Main
         public GGraph m_btnClose;
         public UI_ComResult m_comResult;
         public UI_CompFightExpBar m_comExpBar;
-        public Transition m_t1;
         public const string URL = "ui://mfvz4q8k8xpg3y";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightResultUI";
@@ -61,7 +60,6 @@ namespace UI.Main
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_comResult = (UI_ComResult)UI_ComResult.Create(comp.GetChild("comResult"));
             m_comExpBar = (UI_CompFightExpBar)UI_CompFightExpBar.Create(comp.GetChild("comExpBar"));
-            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -70,7 +68,6 @@ namespace UI.Main
             m_comResult = null;
             m_comExpBar.Dispose();
             m_comExpBar = null;
-            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -65,8 +65,7 @@ namespace GFGGame
 
             _ui.m_comResult.m_c1.selectedIndex = _resultData.Star;
             _ui.m_comResult.m_txtScore.text = "" + _resultData.Score;
-            _ui.m_comExpBar.m_txtLvl.text = string.Format("等级 {0}", GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl));
-
+            RoleInfoManager.Instance.UpdateHeadWithLv1(_ui.m_comExpBar.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId, RoleDataManager.lvl);
 
             if (!this._resultData.Result)
             {
@@ -80,7 +79,7 @@ namespace GFGGame
 
                 StoryLevelCfg _levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
                 StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
-                _ui.m_comExpBar.m_txtLvlAdded.text = string.Format("经验值：+{0}", fightCfg.exp);
+                _ui.m_comExpBar.m_txtExpAdded.SetVar("value", fightCfg.exp.ToString()).FlushVars();
             }
 
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Field)
@@ -88,9 +87,7 @@ namespace GFGGame
                 _ui.m_comExpBar.target.visible = false;
                 Timers.inst.Add(3, 1, OnClickBtnClose);
             }
-
-            _ui.m_t1.Play(AddExp);
-
+            AddExp();
         }
 
         protected override void OnHide()
@@ -103,9 +100,7 @@ namespace GFGGame
             }
             InstanceZonesDataManager.isResultFighting = false;
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
-            _ui.m_comResult.target.height = 0;
-            _ui.m_comExpBar.target.alpha = 0;
-            _ui.m_t1.Stop(true, false);
+
         }
 
         private async void OnClickBtnClose(object param)
@@ -142,26 +137,17 @@ namespace GFGGame
 
         private void AddExp()
         {
-            int lv = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
-            _ui.m_comExpBar.m_txtLvl.text = string.Format("等级 {0}", GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl));
             float exp = GameGlobal.myNumericComponent.GetAsInt(NumericType.Exp);
-            float cfgExp = RoleLevelCfgArray.Instance.GetCfg(lv).exp;
-            _ui.m_comExpBar.m_pbExp.m_title.text = string.Format("{0}/{1}", exp, cfgExp);
-            float initWidth = _ui.m_comExpBar.m_pbExp.m_bar.target.initWidth;
-            float curWidth = _ui.m_comExpBar.m_pbExp.m_bar.target.width;
-            float width = exp / cfgExp * initWidth;
-            if (width <= curWidth)
+            float cfgExp = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).exp;
+            _ui.m_comExpBar.m_txtCurExp.text = exp.ToString();
+            _ui.m_comExpBar.m_txtAllExp.text = cfgExp.ToString();
+
+            _ui.m_comExpBar.m_proExp.max = cfgExp;
+            _ui.m_comExpBar.m_proExp.value = 0;
+            _ui.m_comExpBar.m_proExp.TweenValue(exp, 0.2f).OnComplete(() =>
             {
-                _ui.m_comExpBar.m_pbExp.m_bar.target.width = 0;
-            }
-            GTween.To(_ui.m_comExpBar.m_pbExp.m_bar.target.width, width, 0.2f).SetTarget(_ui.m_comExpBar.m_pbExp.m_bar).OnUpdate((GTweener t) =>
-                {
-                    _ui.m_comExpBar.m_pbExp.m_bar.target.width = t.value.x;
-                }).OnComplete(() =>
-                {
-                    InstanceZonesDataManager.isResultFighting = false;
-                }); ;
-            // _ui.m_expBar.m_pbExp..TweenValue(exp, 0.2f);
+                InstanceZonesDataManager.isResultFighting = false;
+            });
             _ui.m_btnClose.enabled = true;
 
             UpdateToCheckGuide(null);

GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 8f48749c8e06de94d94e995d02d708a2
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: a8df243afd809c1418cb63a8cd519327
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: