zhaoyang 2 年 前
コミット
2574bf7e24

BIN
FGUIProject/assets/DailyLogin/images/yzhd_ditu.png


+ 6 - 6
FGUIProject/assets/RechargeStore/components/Component2.xml

@@ -2,17 +2,17 @@
 <component size="264,79">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n15_iftf" name="loaIcon" xy="82,19" size="60,60" group="n17_iftf" url="ui://eg2y0ldpq08x4" autoSize="true">
+    <loader id="n15_iftf" name="loaIcon" xy="88,19" size="60,60" group="n17_iftf" url="ui://eg2y0ldpq08x4" autoSize="true">
       <gearDisplay controller="c1" pages="0"/>
     </loader>
-    <text id="n16_iftf" name="n16" xy="82,17" size="52,64" group="n17_iftf" fontSize="48" color="#8b6540" text="¥">
+    <image id="n20_qqat" name="n20" src="qqattah" fileName="images/scsc_fuhao.png" xy="88,31" group="n17_iftf">
       <gearDisplay controller="c1" pages="1"/>
-    </text>
-    <group id="n17_iftf" name="n17" xy="82,17" size="52,64" group="n19_iftf" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <text id="n18_iftf" name="txtTitle" xy="134,17" size="64,64" group="n19_iftf" fontSize="48" color="#8b6540" align="center" vAlign="middle" vars="true" singleLine="true" text="60">
+    </image>
+    <group id="n17_iftf" name="n17" xy="88,31" size="40,37" group="n19_iftf" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <text id="n18_iftf" name="txtTitle" xy="128,17" size="64,64" group="n19_iftf" fontSize="48" color="#8b6540" align="center" vAlign="middle" vars="true" singleLine="true" text="60">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <group id="n19_iftf" name="n19" xy="82,17" size="116,64" advanced="true" layout="hz" excludeInvisibles="true">
+    <group id="n19_iftf" name="n19" xy="88,17" size="104,64" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

BIN
FGUIProject/assets/RechargeStore/images/scsc_fuhao.png


+ 1 - 0
FGUIProject/assets/RechargeStore/package.xml

@@ -48,6 +48,7 @@
     <image id="iftftae" name="sc_xtxtxt(1).png" path="/images/" scale="9grid" scale9grid="12,0,44,2"/>
     <component id="iftftaf" name="Component2.xml" path="/components/"/>
     <image id="t8xrtag" name="sc_kuangdikjia_3.png" path="/images/"/>
+    <image id="qqattah" name="scsc_fuhao.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\RechargeStore" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 6 - 6
FGUIProject/assets/RoleLvUp/RoleLvUpUI.xml

@@ -3,20 +3,20 @@
   <displayList>
     <image id="n0_mueb" name="n0" src="mueb2" fileName="images/sjsd_kuangdi_1.png" xy="12,0"/>
     <text id="n1_mueb" name="txtLv" xy="350,307" pivot="0.5,0.5" anchor="true" size="190,191" fontSize="150" color="#cda45f" text="35"/>
-    <text id="n4_mueb" name="n4" xy="155,635" size="62,49" group="n7_mueb" fontSize="36" color="#e4c084" text="LV.">
+    <text id="n4_mueb" name="n4" xy="81,603" size="143,79" group="n7_mueb" fontSize="60" color="#e4c084" text="等级.">
       <relation target="n3_mueb" sidePair="right-left"/>
     </text>
-    <text id="n3_mueb" name="txtLastLv" xy="217,599" pivot="1,0" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="34">
+    <text id="n3_mueb" name="txtLastLv" xy="226,599" pivot="1,0" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="34">
       <relation target="n5_mueb" sidePair="right-left"/>
     </text>
-    <text id="n5_mueb" name="n5" xy="326,635" size="47,49" group="n7_mueb" fontSize="36" color="#e4c084" text="&gt;&gt;"/>
-    <text id="n6_mueb" name="n6" xy="389,635" size="62,49" group="n7_mueb" fontSize="36" color="#e4c084" text="LV.">
+    <text id="n5_mueb" name="n5" xy="335,635" size="47,49" group="n7_mueb" fontSize="36" color="#e4c084" text="&gt;&gt;"/>
+    <text id="n6_mueb" name="n6" xy="382,603" size="143,79" group="n7_mueb" fontSize="60" color="#e4c084" text="等级.">
       <relation target="n5_mueb" sidePair="left-right"/>
     </text>
-    <text id="n2_mueb" name="txtCurLv" xy="451,599" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="35">
+    <text id="n2_mueb" name="txtCurLv" xy="525,599" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="35">
       <relation target="n6_mueb" sidePair="left-right"/>
     </text>
-    <group id="n7_mueb" name="n7" xy="155,599" size="389,94" advanced="true">
+    <group id="n7_mueb" name="n7" xy="81,599" size="537,94" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n8_mueb" name="com0" src="mueb4" fileName="components/Component1.xml" xy="92,723" group="n11_mueb"/>

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Card/CardUpView.cs

@@ -53,8 +53,8 @@ namespace GFGGame
             if (_type == "lv")
             {
                 _ui.m_c1.selectedIndex = 0;
-                _ui.m_txtLast.text = string.Format("Lv{0}", _lastNum);
-                _ui.m_txtNow.text = string.Format("Lv{0}", _curNum);
+                _ui.m_txtLast.text = string.Format("等级{0}", _lastNum);
+                _ui.m_txtNow.text = string.Format("等级{0}", _curNum);
             }
             else
             {

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -168,14 +168,14 @@ namespace GFGGame
         {
             if (ItemDataManager.GetItemNum(_selectedItemId) > 0)
             {
-                PromptController.Instance.ShowFloatTextPrompt("不能制作已经拥有的物品");
+                PromptController.Instance.ShowFloatTextPrompt("不能制作已经拥有的物品");
                 return;
             }
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_selectedItemId);
             //合成消耗判断
             if (ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum)
             {
-                PromptController.Instance.ShowFloatTextPrompt("消耗不足", MessageType.WARNING);
+                PromptController.Instance.ShowFloatTextPrompt("消耗不足", MessageType.WARNING);
                 return;
             }
 
@@ -190,7 +190,7 @@ namespace GFGGame
                 int numSynthetic = ItemDataManager.GetItemNum(itemData.id);
                 if (numSynthetic < itemData.num)
                 {
-                    PromptController.Instance.ShowFloatTextPrompt("材料不足", MessageType.WARNING);
+                    PromptController.Instance.ShowFloatTextPrompt("材料不足", MessageType.WARNING);
                     return;
                 }
             }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyConfirmView.cs

@@ -108,7 +108,7 @@ namespace GFGGame
 
             if (result)
             {
-                PromptController.Instance.ShowFloatTextPrompt("购买成功", MessageType.SUCCESS);
+                PromptController.Instance.ShowFloatTextPrompt("购买成功", MessageType.SUCCESS);
                 if (_onSuccess != null)
                 {
                     _onSuccess();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs

@@ -231,7 +231,7 @@ namespace GFGGame
                     else
                     {
                         ItemCfg costCfg = ItemCfgArray.Instance.GetCfg(_costId);
-                        PromptController.Instance.ShowFloatTextPrompt(string.Format("{0}不足", costCfg.name));
+                        PromptController.Instance.ShowFloatTextPrompt(string.Format("{0}不足", costCfg.name));
                     }
                 }
                 else

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -394,14 +394,14 @@ namespace GFGGame
         {
             if (!EquipDataCache.cacher.CheckPutOnFinish())
             {
-                AlertUI.Show("只有换好衣服才能出门哦~")
+                AlertUI.Show("只有换好衣服才能出门哦")
                     .SetRightButton(true, "好的");
                 return;
             }
             int _suitId = EquipDataCache.cacher.CheckCurDressIsSuit(); ;
             if (_fightCfg.needItemId > 0 && (_suitId <= 0 && EquipDataCache.cacher.equipDatas.IndexOf(_fightCfg.needItemId) < 0 || _suitId > 0 && Array.IndexOf(SuitCfgArray.Instance.GetCfg(_suitId).partsArr, _fightCfg.needItemId) < 0) || _fightCfg.needSuitId > 0 && _suitId != _fightCfg.needSuitId)
             {
-                AlertUI.Show("未穿戴必须品~").SetRightButton(true, "好的");
+                AlertUI.Show("未穿戴必需品。").SetRightButton(true, "好的");
                 return;
             }
             if (CardDataManager.GetCardListByRarity(0).Count > 0)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -470,7 +470,7 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰。", -1, false);
 
             GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 6);
-            GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里,可以自由搭配服饰和分享。", -1, false);
+            GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里,可以自由搭配服饰和分享。", -1, false);
 
             GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_DECOMPOSE, 2, "绣坊里增添了新功能。", -1, false);
 

BIN
GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0.png


BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_atlas0.png


BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_fui.bytes


BIN
GameClient/Assets/ResIn/UI/RoleLvUp/RoleLvUp_fui.bytes