Browse Source

战斗表现

zhaoyang 3 years ago
parent
commit
689a88fece

+ 1 - 1
FGUIProject/assets/Main/components/ComBtnSkill.xml

@@ -11,7 +11,7 @@
       <gearDisplay controller="c1" pages="0"/>
     </image>
     <image id="n29_k1kh" name="n29" src="k1khe0" fileName="imagesStory/zd_cishukuang.png" xy="155,8"/>
-    <text id="n30_k1kh" name="n30" xy="172,14" pivot="0.5,0" size="23,42" fontSize="30" color="#fbf4ed" align="center" bold="true" text="1"/>
+    <text id="n30_k1kh" name="txtCount" xy="172,14" pivot="0.5,0" size="23,42" fontSize="30" color="#fbf4ed" align="center" bold="true" text="1"/>
   </displayList>
   <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
     <item time="0" type="Scale" target="n26_v3k9" tween="true" startValue="1,1" endValue="0.9,0.9" duration="18" ease="Linear"/>

+ 1 - 0
FGUIProject/assets/Main/components/comClickCircle.xml

@@ -3,6 +3,7 @@
   <displayList>
     <loader id="n13_vuz5" name="loaCircle" xy="-59,-72" pivot="0.5,0.5" size="362,382" group="n12_vuz5" scale="0.5,0.5" url="ui://mfvz4q8kvuz5bk"/>
     <image id="n11_vuz5" name="imgCircle" src="vuz5bj" fileName="imagesStory/zd_pfguang_2.png" xy="-59,-72" pivot="0.5,0.5" size="362,382" group="n12_vuz5" aspect="true"/>
+    <text id="n14_k1kh" name="txtPart" xy="122,118" pivot="0.5,0.5" anchor="true" size="124,79" group="n12_vuz5" fontSize="60" color="#fdfbee" align="center" text="饰品"/>
     <group id="n12_vuz5" name="grpCircle" xy="-59,-72" size="362,382" advanced="true"/>
     <component id="n7_vuz5" name="ComScoreResult" src="vuz5bi" fileName="components/ComScoreResult.xml" xy="-7,-8" visible="false"/>
   </displayList>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtnSkill.cs

@@ -10,6 +10,7 @@ namespace UI.Main
         public Controller m_c1;
         public GLoader m_icon;
         public GProgressBar m_proCD;
+        public GTextField m_txtCount;
         public Transition m_t0;
         public const string URL = "ui://mfvz4q8kv3k9c0";
         public const string PACKAGE_NAME = "Main";
@@ -61,6 +62,7 @@ namespace UI.Main
             m_c1 = comp.GetController("c1");
             m_icon = (GLoader)comp.GetChild("icon");
             m_proCD = (GProgressBar)comp.GetChild("proCD");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
@@ -68,6 +70,7 @@ namespace UI.Main
             m_c1 = null;
             m_icon = null;
             m_proCD = null;
+            m_txtCount = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comClickCircle.cs

@@ -9,6 +9,7 @@ namespace UI.Main
         public GComponent target;
         public GLoader m_loaCircle;
         public GImage m_imgCircle;
+        public GTextField m_txtPart;
         public GGroup m_grpCircle;
         public UI_ComScoreResult m_ComScoreResult;
         public Transition m_t0;
@@ -62,6 +63,7 @@ namespace UI.Main
         {
             m_loaCircle = (GLoader)comp.GetChild("loaCircle");
             m_imgCircle = (GImage)comp.GetChild("imgCircle");
+            m_txtPart = (GTextField)comp.GetChild("txtPart");
             m_grpCircle = (GGroup)comp.GetChild("grpCircle");
             m_ComScoreResult = (UI_ComScoreResult)UI_ComScoreResult.Create(comp.GetChild("ComScoreResult"));
             m_t0 = comp.GetTransition("t0");
@@ -71,6 +73,7 @@ namespace UI.Main
         {
             m_loaCircle = null;
             m_imgCircle = null;
+            m_txtPart = null;
             m_grpCircle = null;
             m_ComScoreResult.Dispose();
             m_ComScoreResult = null;

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -80,6 +80,8 @@ namespace GFGGame
         {
             Debug.Log("_index:" + _index + "   length:" + FightScoreCfgArray.Instance.dataArray.Length);
             int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
+            _ui.m_comClickCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
+
             _skillScore = 0;//技能附加分
             _showCard = false;
             ScoreSystemData.Instance.GetPartItemCardScore(_mainScore, partId, out _skillScore, out _showCard);

+ 4 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -152,6 +152,8 @@ namespace GFGGame
             for (int i = 0; i < roleSkillCfgs.Length; i++)
             {
                 GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
+                UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(btnSkill);
+                item.m_txtCount.text = roleSkillCfgs[i].limiteCount.ToString();
                 if (EquipDataCache.cacher.autoPlay)
                 {
                     isAutoPlay = true;
@@ -298,6 +300,8 @@ namespace GFGGame
             if (count >= cfg.limiteCount) return;//超过最大限制次数
             item.m_c1.selectedIndex = 1;
             item.m_icon.data = count + 1;
+            item.m_txtCount.text = (cfg.limiteCount - (count + 1)).ToString();
+
             SetCdState(obj, cfg.cd);
             SetSkillValue(cfg, SkillDataManager.MINE);
         }

BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes