战斗表现

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -8,8 +8,8 @@
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,80">
       <ProgressBar max="100"/>
     </component>
-    <component id="n15_mza1" name="comTargetCircle" src="v3k9cv" fileName="components/comMineCircle.xml" xy="680,1428" pivot="0.5,0.5" anchor="true" visible="false"/>
     <component id="n17_mza1" name="comMineCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="400,1428" pivot="0.5,0.5" anchor="true" visible="false"/>
+    <component id="n15_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="680,1428" pivot="0.5,0.5" anchor="true" visible="false"/>
     <component id="n24_vbe8" name="proMinusMine" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="190,700">
       <ProgressBar value="100" max="100"/>
     </component>
@@ -27,10 +27,10 @@
     <component id="n41_k1kh" name="ComRoleSkillMineShield" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="230,1132" group="n43_k1kh"/>
     <component id="n42_k1kh" name="ComRoleSkillNpcShield" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="750,1132" group="n43_k1kh"/>
     <group id="n43_k1kh" name="n43" xy="230,1132" size="620,100"/>
-    <component id="n1_8xpg" name="selfName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="48,1499">
+    <component id="n1_8xpg" name="selfName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="48,1499" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n4_8xpg" name="targetName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="596,1499">
+    <component id="n4_8xpg" name="targetName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="596,1499" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
     <component id="n20_vbe8" name="btnSkill0" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="70,1682">

FGUIProject/assets/Main/components/Component2.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="836,24">
   <displayList>
-    <component id="n1_uj53" name="bar" src="k1khe8" fileName="components/Component3.xml" xy="0,0" size="1169,24">
+    <component id="n1_uj53" name="bar" src="k1khe8" fileName="components/Component3.xml" xy="0,0">
       <relation target="" sidePair="width-width"/>
     </component>
     <image id="n6_uj53" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="836,15" pivot="0.65,0.6" anchor="true">
       <relation target="" sidePair="right-right"/>
     </image>
-    <graph id="n7_k1kh" name="holder" xy="733,-38" pivot="0.5,0.5" size="100,100">
+    <graph id="n7_k1kh" name="holder" xy="736,-38" pivot="0.5,0.5" size="100,100">
       <relation target="" sidePair="right-right"/>
     </graph>
   </displayList>

FGUIProject/assets/Main/components/comTargetCircle.xml

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="256,256">
   <displayList>
-    <loader id="n16_v3k9" name="loaIcon" xy="0,-1" size="256,259" url="ui://mfvz4q8kvuz5b7" autoSize="true"/>
-    <text id="n17_v3k9" name="txtPart" xy="128,78" pivot="0.5,0.5" anchor="true" size="124,79" fontSize="60" color="#fdfbee" align="center" text="饰品"/>
-    <text id="n15_mza1" name="txtCount" xy="0,124" pivot="0.5,0.5" size="256,60" font="ui://mfvz4q8kvuz5b3" fontSize="56" align="center" vAlign="middle" autoSize="none" text="999"/>
+    <loader id="n16_v3k9" name="loaIcon" xy="0,-1" size="256,259" visible="false" url="ui://mfvz4q8kvuz5b7" autoSize="true"/>
+    <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"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Alpha" target="n16_v3k9" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
-    <item time="0" type="Rotation" target="n17_v3k9" value="0"/>
-    <item time="0" type="Size" target="n15_mza1" value="10,60"/>
-    <item time="0" type="Skew" target="n17_v3k9" value="90,0"/>
-    <item time="6" type="Rotation" target="n17_v3k9" tween="true" startValue="15" endValue="0" duration="3" ease="Linear"/>
-    <item time="6" type="Skew" target="n17_v3k9" tween="true" startValue="-90,0" endValue="0,0" duration="3" ease="Linear"/>
-    <item time="10" type="Size" target="n15_mza1" tween="true" startValue="10,60" endValue="256,60" duration="4" ease="Linear"/>
-    <item time="18" type="Alpha" target="n16_v3k9" value="1"/>
+    <item time="0" type="Visible" target="n18_mueb" value="true"/>
+    <item time="14" type="Visible" target="n15_mza1" value="true"/>
+    <item time="14" type="Visible" target="n17_v3k9" value="true"/>
+    <item time="24" type="Visible" target="n15_mza1" value="false"/>
+    <item time="24" type="Visible" target="n17_v3k9" value="false"/>
+    <item time="24" type="Visible" target="n18_mueb" value="true"/>
   </transition>
 </component>

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

@@ -10,8 +10,8 @@ namespace UI.Main
         public GButton m_btnSkip;
         public GButton m_btnBack;
         public UI_ProgressBarTargetScore m_proScore;
-        public UI_comMineCircle m_comTargetCircle;
         public UI_comTargetCircle m_comMineCircle;
+        public UI_comTargetCircle m_comTargetCircle;
         public GProgressBar m_proMinusMine;
         public GProgressBar m_proMinusNpc;
         public UI_ComSkillShield m_ComShieldMine;
@@ -81,8 +81,8 @@ namespace UI.Main
             m_btnSkip = (GButton)comp.GetChild("btnSkip");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
-            m_comTargetCircle = (UI_comMineCircle)UI_comMineCircle.Create(comp.GetChild("comTargetCircle"));
             m_comMineCircle = (UI_comTargetCircle)UI_comTargetCircle.Create(comp.GetChild("comMineCircle"));
+            m_comTargetCircle = (UI_comTargetCircle)UI_comTargetCircle.Create(comp.GetChild("comTargetCircle"));
             m_proMinusMine = (GProgressBar)comp.GetChild("proMinusMine");
             m_proMinusNpc = (GProgressBar)comp.GetChild("proMinusNpc");
             m_ComShieldMine = (UI_ComSkillShield)UI_ComSkillShield.Create(comp.GetChild("ComShieldMine"));
@@ -109,10 +109,10 @@ namespace UI.Main
             m_btnBack = null;
             m_proScore.Dispose();
             m_proScore = null;
-            m_comTargetCircle.Dispose();
-            m_comTargetCircle = null;
             m_comMineCircle.Dispose();
             m_comMineCircle = null;
+            m_comTargetCircle.Dispose();
+            m_comTargetCircle = null;
             m_proMinusMine = null;
             m_proMinusNpc = null;
             m_ComShieldMine.Dispose();

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

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_comMineCircle
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public GTextField m_txtPart;
-        public GTextField m_txtCount;
-        public Transition m_t0;
-        public const string URL = "ui://mfvz4q8kv3k9cv";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "comMineCircle";
-        private static UI_comMineCircle _proxy;
-
-        public static UI_comMineCircle Create(GObject gObject = null)
-        {
-            var ui = new UI_comMineCircle();
-            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_comMineCircle Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_comMineCircle();
-            }
-            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtPart = (GTextField)comp.GetChild("txtPart");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_t0 = comp.GetTransition("t0");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            m_txtPart = null;
-            m_txtCount = null;
-            m_t0 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

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 GGraph m_holder;
         public GTextField m_txtPart;
         public GTextField m_txtCount;
         public Transition m_t0;
@@ -59,6 +60,7 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_txtPart = (GTextField)comp.GetChild("txtPart");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_t0 = comp.GetTransition("t0");
@@ -66,6 +68,7 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
+            m_holder = null;
             m_txtPart = null;
             m_txtCount = null;
             m_t0 = null;

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

@@ -46,6 +46,8 @@ namespace GFGGame
         private GameObject _gameObject10;
         private GameObject _gameObject11;
         private GameObject _gameObject12;
+        private GameObject _gameObject13;
+        private GameObject _gameObject14;
         private List<GameObject> _gameObjects = new List<GameObject>();
         // private GoWrapper _wrapper5;
         private Dictionary<int, RoleSkillCfg> _npcSkillDic;
@@ -204,6 +206,9 @@ namespace GFGGame
             string resPath7 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_jy");
             SceneController.AddObjectToView(_gameObject11, null, _ui.m_ComRoleSkillMineShield.m_holder, resPath7, out _gameObject11, out GoWrapper _wrapper11, 70);
             SceneController.AddObjectToView(_gameObject12, null, _ui.m_ComRoleSkillNpcShield.m_holder, resPath7, out _gameObject12, out GoWrapper _wrapper12, 70);
+            string resPath8 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_dfzj");
+            SceneController.AddObjectToView(_gameObject13, null, _ui.m_comMineCircle.m_holder, resPath8, out _gameObject13, out GoWrapper _wrapper13, 55);
+            SceneController.AddObjectToView(_gameObject14, null, _ui.m_comTargetCircle.m_holder, resPath8, out _gameObject14, out GoWrapper _wrapper14, 55);
 
 
             string resPath3 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_an");
@@ -268,8 +273,10 @@ namespace GFGGame
         //顶部评分进度条
         private void UpdateProgressBar()
         {
-            _ui.m_proScore.m_txtMineScore.text = string.Format("总分{0}", (int)_score);// ((int)_score).ToString();
-            _ui.m_proScore.m_txtNpcScore.text = string.Format("敌方{0}", (int)_targetScore); //((int)_targetScore).ToString();
+            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_comBar.m_imgAni.visible = true;
 
             double proportion = _score / (_score + _targetScore);
@@ -445,12 +452,14 @@ namespace GFGGame
                   {
                       score = (int)_targetMainScore * cfg.value / 100;
                       _targetScore -= score;
-
+                      if (_targetScore < 0) _targetScore = 0;
                   }
                   else
                   {
                       score = (int)_mainScore * cfg.value / 100;
                       _score -= score;
+                      if (_score < 0) _score = 0;
+
                   }
 
                   // comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 1;