浏览代码

竞技场改飞花令

zhaoyang 2 年之前
父节点
当前提交
9e510b1459

+ 4 - 4
FGUIProject/assets/Arena/components/ComValueInfo.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="277,254">
   <controller name="c1" alias="标签数量" pages="0,,1,,2,,3,,4,,5,,6,,7,,8,,9,,10,,11,,12,,13,,14," selected="0"/>
-  <controller name="c2" pages="0,,1," selected="1"/>
+  <controller name="c2" pages="0,,1," selected="0"/>
   <controller name="c3" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n91_jcej" name="n91" src="jcej2h" fileName="imagesExport/jjsy_zldi.png" pkg="eg2y0ldp" xy="0,0" size="282,56" group="n92_jcej">
       <relation target="n82_jcej" sidePair="width-width"/>
     </image>
-    <text id="n82_jcej" name="txtFightScore" xy="48,7" size="219,39" group="n92_jcej" fontSize="28" color="#a07943" vars="true" text="竞技场战力:{value=000}"/>
+    <text id="n82_jcej" name="txtFightScore" xy="48,7" size="213,39" group="n92_jcej" fontSize="28" color="#a07943" vars="true" text="飞花令战力:{value=000}"/>
     <component id="n108_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="10,13" size="29,29" group="n92_jcej">
-      <Button checked="true" icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
+      <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
     </component>
     <group id="n92_jcej" name="n92" xy="0,0" size="282,56"/>
     <image id="n83_jcej" name="n83" src="jcej3s" fileName="imagesExport/dz_hz_fsk_1.png" pkg="eg2y0ldp" xy="1,70" size="248,57" group="n86_jcej"/>
@@ -22,7 +22,7 @@
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
     <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="15,187" group="n90_jcej"/>
-    <text id="n89_jcej" name="txtTagScore" xy="176,187" pivot="0.5,0" size="18,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
+    <text id="n89_jcej" name="txtTagScore" xy="177,187" pivot="0.5,0" size="16,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
     <image id="n96_jcej" name="n96" src="jcej2m" fileName="imagesExport/jjsy_xx_2.png" pkg="eg2y0ldp" xy="16,229" group="n101_jcej"/>
     <image id="n97_jcej" name="n97" src="jcej2m" fileName="imagesExport/jjsy_xx_2.png" pkg="eg2y0ldp" xy="32,229" group="n101_jcej"/>
     <image id="n98_jcej" name="n98" src="jcej2m" fileName="imagesExport/jjsy_xx_2.png" pkg="eg2y0ldp" xy="48,229" group="n101_jcej"/>

+ 3 - 3
FGUIProject/assets/Arena/components/ListFightRecordItem.xml

@@ -11,7 +11,7 @@
     <remark page="1" value="胜利"/>
   </controller>
   <displayList>
-    <text id="n4_psph" name="txtTime" xy="50,0" pivot="0.5,0" size="193,36" group="n11_psph" fontSize="26" color="#a99070" align="center" autoClearText="true" text="10分钟 发起挑战"/>
+    <text id="n4_psph" name="txtTime" xy="51,0" pivot="0.5,0" size="190,36" group="n11_psph" fontSize="26" color="#a99070" align="center" autoClearText="true" text="10分钟 发起挑战"/>
     <image id="n13_jcej" name="n13" src="jcej1u" fileName="images/bpjly_xixian.png" xy="18,13" size="862,14" group="n11_psph"/>
     <loader id="n1_psph" name="loaResult" xy="5,47" size="888,151" group="n11_psph" url="ui://4lc5fhlbjcej2y" autoSize="true">
       <gearIcon controller="ctrResult" pages="1" values="ui://4lc5fhlbjcej2x" default="ui://4lc5fhlbjcej2y"/>
@@ -21,9 +21,9 @@
     </loader>
     <loader id="n3_psph" name="loaDanIcon" xy="229,69" size="108,101" group="n11_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <text id="n14_jcej" name="n14" xy="423,71" pivot="0.5,0" anchor="true" size="71,46" group="n11_psph" fontSize="34" color="#c09c6d" align="center" vars="true" text="排名"/>
-    <text id="n5_psph" name="txtRank" xy="423,107" pivot="0.5,0" anchor="true" size="133,64" group="n11_psph" fontSize="48" color="#c09c6d" align="center" letterSpacing="-2" vars="true" bold="true" text="10000"/>
+    <text id="n5_psph" name="txtRank" xy="423,107" pivot="0.5,0" anchor="true" size="116,64" group="n11_psph" fontSize="48" color="#c09c6d" align="center" letterSpacing="-2" vars="true" bold="true" text="10000"/>
     <text id="n7_psph" name="txtTargetName" xy="582,69" size="148,49" group="n11_psph" fontSize="36" color="#c09c6d" autoClearText="true" text="对手名字"/>
-    <text id="n8_psph" name="txtTargetFightScore" xy="582,122" size="219,39" group="n11_psph" fontSize="28" color="#c09c6d" text="竞技场战力:999"/>
+    <text id="n8_psph" name="txtTargetFightScore" xy="582,122" size="213,39" group="n11_psph" fontSize="28" color="#c09c6d" text="飞花令战力:999"/>
     <component id="n15_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="509,90" size="58,59" group="n11_psph"/>
     <component id="n9_psph" name="btnShow" src="psph14" fileName="components/BtnShow.xml" xy="832,97" size="37,46" group="n11_psph">
       <Button controller="c1" page="1"/>

+ 6 - 6
FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -2,19 +2,19 @@
 <component size="888,151">
   <displayList>
     <image id="n19_jcej" name="n19" src="jcej44" fileName="images/phbphb_phdi_1.png" xy="0,0"/>
-    <text id="n12_psph" name="txtRank" xy="19,41" pivot="0.5,0" size="150,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
+    <text id="n12_psph" name="txtRank" xy="28,41" pivot="0.5,0" size="132,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
     <component id="n31_v461" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="167,-18" size="229,230" group="n35_v461" scale="0.73,0.73"/>
     <image id="n32_v461" name="n32" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="188,9" group="n35_v461"/>
     <component id="n33_v461" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="272,11" group="n35_v461" scale="0.7,0.7"/>
-    <component id="n34_v461" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="273,99" group="n35_v461" scale="0.9,0.9"/>
+    <component id="n34_v461" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="273,99" group="n35_v461" scale="0.9,0.9"/>
     <group id="n35_v461" name="n35" xy="167,-18" size="229,230" group="n18_psph"/>
-    <text id="n14_psph" name="txtName" xy="331,20" size="48,52" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
+    <text id="n14_psph" name="txtName" xy="331,20" size="54,51" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
     <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="330,71" group="n29_jcej"/>
-    <text id="n15_psph" name="txtFightScore" xy="331,78" size="205,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力:--"/>
+    <text id="n15_psph" name="txtFightScore" xy="331,78" size="209,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="飞花令战力:--"/>
     <group id="n29_jcej" name="n29" xy="330,20" size="236,97" group="n18_psph"/>
     <loader id="n16_psph" name="loaDanIcon" xy="600,20" size="99,98" group="n18_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n26_jcej" name="n26" xy="729,24" size="122,42" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
-    <text id="n17_psph" name="txtDanRank" xy="764,58" pivot="0.5,0" size="52,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
+    <text id="n26_jcej" name="n26" xy="729,24" size="122,41" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
+    <text id="n17_psph" name="txtDanRank" xy="760,58" pivot="0.5,0" size="59,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
     <group id="n27_jcej" name="n27" xy="729,24" size="122,90" group="n18_psph"/>
     <group id="n18_psph" name="n18" xy="19,-18" size="832,230"/>
   </displayList>

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -181,7 +181,7 @@ namespace GFGGame
                 return;
             }
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.costIdBuyFightTimes);
-            AlertUI.Show(string.Format("是否使用{0}{1}增加1次竞技场挑战次数?", GlobalCfgArray.globalCfg.costNumBuyFightTimes, itemCfg.name),
+            AlertUI.Show(string.Format("是否使用{0}{1}增加1次飞花令挑战次数?", GlobalCfgArray.globalCfg.costNumBuyFightTimes, itemCfg.name),
             string.Format("(今天已购买{0}/{1}次)", GlobalCfgArray.globalCfg.limitDailyBuyFightTimes - RoleDataManager.ArenaBuyFightTimes, GlobalCfgArray.globalCfg.limitDailyBuyFightTimes))
             .SetLeftButton(true, "取消").SetRightButton(true, "确定", (object data) =>
             {
@@ -326,7 +326,7 @@ namespace GFGGame
             _ui.m_txtRank.text = string.Format("段位排名:{0}", _dataManager.Rank);
             _ui.m_txtDanTitle.text = ArenaRankCfgArray.Instance.GetCfg(_dataManager.Grade).gradeName;
             long fightScore = _dataManager.GetAllFightScore(_dataManager.DressupList);
-            _ui.m_txtFightScore.text = string.Format("竞技场战力:{0}", fightScore);
+            _ui.m_txtFightScore.text = string.Format("飞花令战力:{0}", fightScore);
             _ui.m_btnQuickFight.selected = _dataManager.QuickFight;
             ArenaViewManager.Instance.UpdateFightScore(_ui.m_comFightScore.target, _dataManager.DressupList);
         }
@@ -335,7 +335,7 @@ namespace GFGGame
         private void UpdateValue()
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.bonusSpecialWinArr[0][0]);
-            _ui.m_txtMoneyCount.text = string.Format("今日还可获得{0}次{1}货币", RoleDataManager.ArenaTimesBonusSpecial, itemCfg.name);
+            _ui.m_txtMoneyCount.text = string.Format("今日还可获得{0}次{1}", RoleDataManager.ArenaTimesBonusSpecial, itemCfg.name);
             _ui.m_txtFightCount.text = string.Format("剩余次数:{0}/{1}", RoleDataManager.ArenaFightTimes, GlobalCfgArray.globalCfg.fightTimesLimit);
             if (RoleDataManager.ArenaFreshTimes > 0)
             {
@@ -403,7 +403,7 @@ namespace GFGGame
             item.m_comLv.GetChild("txtLvl").asTextField.text = targetData.RoleInfo.roleLv.ToString();
 
             long fightScore = _dataManager.GetAllFightScore(targetData.FightDatas);
-            item.m_txtFightScore.text = string.Format("竞技场战力:{0}", fightScore);
+            item.m_txtFightScore.text = string.Format("飞花令战力:{0}", fightScore);
             item.m_txtRank.text = string.Format("段位排名:{0}", targetData.RankInGrade);
             item.m_imgUpDan.visible = targetData.Grade > ArenaDataManager.Instance.Grade;
             if (item.m_loaBg.data == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberView.cs

@@ -84,7 +84,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("消耗不足");
                 return;
             }
-            string tips = string.Format("是否花费{0}货币发布24小时招募成员信息,并临时增加新加入成员上限?", itemCfg.name);
+            string tips = string.Format("是否花费{0}*{1}发布24小时招募成员信息,并临时增加新加入成员上限?", itemCfg.name, needCount);
             AlertUI.Show(tips).
             SetLeftButton(true, "取消").
              SetRightButton(true, "确认", async (object param) =>

二进制
GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes