战斗结算表现

FGUIProject/assets/Main/components/CompFightExpBar.xml

@@ -5,10 +5,8 @@
     <image id="n4_8xpg" name="n4" src="8xpg4y" fileName="imagesFight/zd_jsjm_jyz.png" xy="807,58"/>
     <component id="n5_8xpg" name="iconHead" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="17,0" size="147,147"/>
     <text id="n6_8xpg" name="n6" xy="179,68" size="52,34" fontSize="24" color="#fffcf7" text="等级"/>
-    <text id="n7_8xpg" name="txtLvl" xy="252,39" size="68,74" fontSize="56" color="#ffffff" autoClearText="true" text="99"/>
-    <text id="n8_8xpg" name="txtLvlAdded" xy="926,58" size="56,41" fontSize="30" color="#ffffff" leading="0" singleLine="true" text="+00"/>
-    <component id="n9_8xpg" name="pbExp" src="8xpg50" fileName="components/ProgressBarExp.xml" xy="171,110">
-      <ProgressBar value="50" max="100"/>
-    </component>
+    <text id="n7_8xpg" name="txtLvl" xy="252,39" size="73,74" fontSize="56" color="#ffffff" autoClearText="true" text="99"/>
+    <text id="n8_8xpg" name="txtLvlAdded" xy="926,58" size="58,41" fontSize="30" color="#ffffff" leading="0" singleLine="true" text="+00"/>
+    <component id="n9_8xpg" name="pbExp" src="sd8cei" fileName="components/Component6.xml" xy="171,102"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/CompFightScoreResult.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1064,402">
   <displayList>
-    <loader id="n0_8xpg" name="bg" xy="0,0" size="1064,402" url="ui://mfvz4q8k8xpg4u" fill="scale"/>
+    <loader id="n0_8xpg" name="bg" xy="0,0" size="1064,402" visible="false" url="ui://mfvz4q8k8xpg4u" fill="scale"/>
+    <graph id="n7_svck" name="holder" xy="531,200" size="1,1" type="rect"/>
     <text id="n5_8xpg" name="txtScore" xy="695,263" size="244,66" font="ui://mfvz4q8k8xpg4q" fontSize="38" color="#ffffff" autoClearText="true" text="99999">
       <relation target="n0_8xpg" sidePair="left-left,top-top"/>
     </text>

FGUIProject/assets/Main/components/Component5.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="815,20" overflow="hidden">
+  <displayList>
+    <image id="n1_8xpg" name="bar" src="8xpg4s" fileName="imagesFight/zd_jsjm_jdt_2.png" xy="0,0" size="815,20"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/Component6.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="829,44">
+  <displayList>
+    <image id="n4_8xpg" name="n4" src="8xpg51" fileName="imagesFight/zd_drpf_jdt_1.png" xy="0,11"/>
+    <component id="n1_8xpg" name="bar" src="sd8ceh" fileName="components/Component5.xml" xy="2,13"/>
+    <text id="n2_8xpg" name="title" xy="0,3" size="819,40" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+    <image id="n3_8xpg" name="n3" src="8xpg4t" fileName="imagesFight/zd_jsjm_jdt_3.png" xy="807,0">
+      <relation target="n1_8xpg" sidePair="right-right"/>
+    </image>
+    <graph id="n5_sd8c" name="holder" xy="818,22" size="1,1" type="rect">
+      <relation target="n1_8xpg" sidePair="right-right"/>
+    </graph>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ProgressBarExp.xml

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="819,24" extention="ProgressBar">
   <displayList>
-    <image id="n4_8xpg" name="n4" src="8xpg51" fileName="imagesFight/zd_drpf_jdt_1.png" xy="0,0"/>
-    <image id="n1_8xpg" name="bar" src="8xpg4s" fileName="imagesFight/zd_jsjm_jdt_2.png" xy="2,2" size="815,20"/>
-    <text id="n2_8xpg" name="title" xy="0,-8" size="819,40" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-    <image id="n3_8xpg" name="n3" src="8xpg4t" fileName="imagesFight/zd_jsjm_jdt_3.png" xy="807,-11">
-      <relation target="n1_8xpg" sidePair="right-right"/>
-    </image>
+    <component id="n4_8xpg" name="n4" src="sd8cei" fileName="components/Component6.xml" xy="0,-11"/>
   </displayList>
   <ProgressBar titleType="valueAndmax"/>
 </component>

FGUIProject/assets/Main/package.xml

@@ -381,6 +381,8 @@
     <image id="muebed" name="sjsd_ss_2.png" path="/images/"/>
     <component id="muebef" name="Component4.xml" path="/components/"/>
     <component id="c2umeg" name="comMineCircle.xml" path="/components/"/>
+    <component id="sd8ceh" name="Component5.xml" path="/components/"/>
+    <component id="sd8cei" name="Component6.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -280,10 +280,10 @@ namespace GFGGame
                     searchList.Add(list[i]);
                 }
             }
-            if (searchList.Count == 0)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("搜索不到相关物品");
-            }
+            // if (searchList.Count == 0)
+            // {
+            //     PromptController.Instance.ShowFloatTextPrompt("搜索不到相关物品");
+            // }
             return searchList;
         }
         public static List<int> DressFilter(List<int> list, bool isTaoZhuang)

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

@@ -10,7 +10,7 @@ namespace UI.Main
         public GComponent m_iconHead;
         public GTextField m_txtLvl;
         public GTextField m_txtLvlAdded;
-        public GProgressBar m_pbExp;
+        public UI_Component6 m_pbExp;
         public const string URL = "ui://mfvz4q8k8xpg52";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompFightExpBar";
@@ -61,13 +61,14 @@ namespace UI.Main
             m_iconHead = (GComponent)comp.GetChild("iconHead");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_txtLvlAdded = (GTextField)comp.GetChild("txtLvlAdded");
-            m_pbExp = (GProgressBar)comp.GetChild("pbExp");
+            m_pbExp = (UI_Component6)UI_Component6.Create(comp.GetChild("pbExp"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_iconHead = null;
             m_txtLvl = null;
             m_txtLvlAdded = null;
+            m_pbExp.Dispose();
             m_pbExp = null;
             if(disposeTarget && target != null)
             {

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

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public GLoader m_bg;
+        public GGraph m_holder;
         public GTextField m_txtScore;
         public UI_CompFlower3 m_flower;
         public const string URL = "ui://mfvz4q8k8xpg4z";
@@ -58,12 +59,14 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_bg = (GLoader)comp.GetChild("bg");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_flower = (UI_CompFlower3)UI_CompFlower3.Create(comp.GetChild("flower"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
+            m_holder = null;
             m_txtScore = null;
             m_flower.Dispose();
             m_flower = null;

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_Component5
+    {
+        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 static UI_Component5 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component5();
+            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_Component5 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component5();
+            }
+            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 = (GImage)comp.GetChild("bar");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bar = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,78 @@
+/** 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_Component6.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -224,13 +224,12 @@ namespace GFGGame
             }
             else
             {
-                if (_ui.m_partsList.m_list.numItems <= 0)
+                if (this.showListParts(item1.type) == false)
                 {
                     PromptController.Instance.ShowFloatTextPrompt("未获得此类部件");
                     return;
                 }
                 this.showListParts(item1.type);
-                this.showListParts(item1.type);
 
             }
             this.hideListType1();
@@ -243,12 +242,14 @@ namespace GFGGame
             GObject typeItem = context.data as GObject;
             int order = (int)typeItem.data;
             DressUpMenuItemCfg2 item2 = DressUpMenuItemCfg2Array.Instance.dataArray[order - 1];
-            if (_ui.m_partsList.m_list.numItems <= 0)
+
+            if (this.showListParts(item2.type) == false)
             {
+
                 PromptController.Instance.ShowFloatTextPrompt("未获得此类部件");
                 return;
+
             }
-            this.showListParts(item2.type);
             this.hideListType2();
         }
 
@@ -438,11 +439,12 @@ namespace GFGGame
                 });
         }
 
-        private void showListParts(int type, bool selectItem = false)
+        private bool showListParts(int type, bool selectItem = false)
         {
             _currentMenuType = type;
 
             UpdatePartsListSort();
+            if (_ui.m_partsList.m_list.numItems <= 0) return false;
             _ui.m_partsList.m_list.ResizeToFit(_ui.m_partsList.m_list.numItems);
             float maxHeight = _ui.m_partsList.target.height - _ui.m_partsList.m_list.y;
             if (_ui.m_partsList.m_list.height > maxHeight)
@@ -466,6 +468,7 @@ namespace GFGGame
                     _ui.m_partsList.target.x = t.value.x;
                 });
             UpdateListPartsSelected();
+            return true;
         }
         private void OnComboBoxRarityChanged()
         {

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -156,12 +156,17 @@ namespace GFGGame
             }
             else
             {
-                if (_ui.m_partsList.m_list.numItems <= 0)
+                // if (_ui.m_partsList.m_list.numItems <= 0)
+                // {
+                //     PromptController.Instance.ShowFloatTextPrompt("未获得此类部件");
+                //     return;
+                // }
+                if (this.showListParts(item1.type) == false)
                 {
                     PromptController.Instance.ShowFloatTextPrompt("未获得此类部件");
                     return;
                 }
-                this.showListParts(item1.type);
+                // this.showListParts(item1.type);
             }
             this.hideListType1();
             UpdateListPartsSelected();
@@ -173,12 +178,13 @@ namespace GFGGame
             GObject typeItem = (GObject)context.data as GObject;
             int order = (int)typeItem.data;
             DressUpMenuItemCfg2 item2 = DressUpMenuItemCfg2Array.Instance.dataArray[order - 1];
-            if (_ui.m_partsList.m_list.numItems <= 0)
+
+            if (this.showListParts(item2.type) == false)
             {
                 PromptController.Instance.ShowFloatTextPrompt("未获得此类部件");
                 return;
+
             }
-            this.showListParts(item2.type);
             this.hideListType2();
 
         }
@@ -346,7 +352,7 @@ namespace GFGGame
                 });
         }
 
-        private void showListParts(int type, bool selectItem = false)
+        private bool showListParts(int type, bool selectItem = false)
         {
             _currentMenuType = type;
             if (type == (int)ConstDressUpItemType.TAO_ZHUANG)
@@ -362,6 +368,7 @@ namespace GFGGame
                 _ui.m_partsList.m_comboBoxRarity.items = new string[] { "高稀有度", "低稀有度", "最近获得" };
             }
             this.UpdatePartsListSort();
+            if (_ui.m_partsList.m_list.numItems <= 0) return false;
             _ui.m_partsList.m_list.ResizeToFit(_ui.m_partsList.m_list.numItems);
             float maxHeight = _ui.m_partsList.target.height - _ui.m_partsList.m_list.y;// - DressUpView.BOTTOM_BLANK;
             if (_ui.m_partsList.m_list.height > maxHeight)
@@ -386,7 +393,7 @@ namespace GFGGame
                 });
             UpdateBtnAction();
             UpdateListPartsSelected();
-
+            return true;
         }
 
         private void hideListParts()

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

@@ -22,10 +22,17 @@ namespace GFGGame
         private GameObject _sceneObject;
         private GameObject _scenePrefab;
 
+        private GameObject _gameObject;
+        private GameObject _gameObject1;
+        private GoWrapper _wrapper;
+
         private StoryFightResultData _resultData;
 
         public override void Dispose()
         {
+            SceneController.DestroyObjectFromView(_gameObject);
+            SceneController.DestroyObjectFromView(_gameObject1);
+
             if (_scenePrefab != null)
             {
                 GameObject.Destroy(_scenePrefab);
@@ -36,6 +43,7 @@ namespace GFGGame
                 _ui.Dispose();
             }
             _ui = null;
+
             base.Dispose();
         }
 
@@ -54,6 +62,9 @@ namespace GFGGame
             base.OnInit();
             _ui.m_btnClose.enabled = false;
             _ui.m_btnClose.onClick.Add(OnClickBtnClose);
+
+            string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_zdjs_jdt");
+            SceneController.AddObjectToView(_gameObject1, null, _ui.m_expBar.m_pbExp.m_holder, resPath, out _gameObject1, out GoWrapper wrapper);
         }
 
         protected override void OnShown()
@@ -71,11 +82,15 @@ namespace GFGGame
             _ui.m_selfScore.m_txtScore.text = "" + _resultData.Score;
             _ui.m_expBar.m_txtLvl.text = "" + GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
             RoleLevelCfg roleLevelCfg = RoleLevelCfgArray.Instance.GetCfg(GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl));
-            _ui.m_expBar.m_pbExp.max = roleLevelCfg.exp;
-            _ui.m_expBar.m_pbExp.value = GameGlobal.myNumericComponent.GetAsInt(NumericType.Exp);
+            // _ui.m_expBar.m_pbExp.max = roleLevelCfg.exp;
+            // _ui.m_expBar.m_pbExp.value = GameGlobal.myNumericComponent.GetAsInt(NumericType.Exp);
 
             StoryUtil.UpdateStar(_resultData.Star, _ui.m_selfScore.m_flower.target);
-            _ui.m_selfScore.m_bg.url = "ui://Main/zd_jsjm_jszi_" + _resultData.Star;
+
+            string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", string.Format("zd_zdjs_{0}", _resultData.Star));
+            SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_selfScore.m_holder, resPath, out _gameObject, out _wrapper, 120);
+
+            // _ui.m_selfScore.m_bg.url = "ui://Main/zd_jsjm_jszi_" + _resultData.Star;
             TextFormat tf = _ui.m_selfScore.m_txtScore.textFormat;
             UpdateToCheckGuide(null);
             if (!this._resultData.Result)
@@ -123,13 +138,22 @@ namespace GFGGame
 
         private void AddExp(object param)
         {
-            _ui.m_expBar.m_txtLvl.text = "" + GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
-            int exp = GameGlobal.myNumericComponent.GetAsInt(NumericType.Exp);
-            if (exp <= _ui.m_expBar.m_pbExp.value)
+            int lv = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+            _ui.m_expBar.m_txtLvl.text = lv.ToString();
+            float exp = GameGlobal.myNumericComponent.GetAsInt(NumericType.Exp);
+            float cfgExp = RoleLevelCfgArray.Instance.GetCfg(lv).exp;
+            float initWidth = _ui.m_expBar.m_pbExp.m_bar.target.initWidth;
+            float curWidth = _ui.m_expBar.m_pbExp.m_bar.target.width;
+            float width = exp / cfgExp * initWidth;
+            if (width <= curWidth)
             {
-                _ui.m_expBar.m_pbExp.value = 0;
+                _ui.m_expBar.m_pbExp.m_bar.target.width = 0;
             }
-            _ui.m_expBar.m_pbExp.TweenValue(exp, 0.2f);
+            GTween.To(_ui.m_expBar.m_pbExp.m_bar.target.width, width, 0.2f).SetTarget(_ui.m_expBar.m_pbExp.m_bar).OnUpdate((GTweener t) =>
+                {
+                    _ui.m_expBar.m_pbExp.m_bar.target.width = t.value.x;
+                }); ;
+            // _ui.m_expBar.m_pbExp..TweenValue(exp, 0.2f);
             _ui.m_btnClose.enabled = true;
 
         }