Browse Source

改文件名

zhaoyang 3 years ago
parent
commit
a26f0d6919

BIN
FGUIProject/assets/Friend/images/dz_hz_rwdh_1.png


+ 1 - 1
FGUIProject/assets/Main/RoleInfoUI.xml

@@ -7,7 +7,7 @@
     <image id="n23_mhyh" name="n23" src="mhyhd7" fileName="images/grxx_mzk_1.png" xy="200,280" pivot="0.5,0" size="303,67">
       <relation target="n5_d4iw" sidePair="width-width"/>
     </image>
-    <text id="n5_d4iw" name="txtRoleName" xy="238,280" pivot="0.5,0" size="232,62" fontSize="46" color="#a37349" align="center" text="名称七个字"/>
+    <text id="n5_d4iw" name="txtRoleName" xy="238,280" pivot="0.5,0" size="232,61" fontSize="46" color="#a37349" align="center" text="名称七个字"/>
     <loader id="n24_mhyh" name="loaChangeName" xy="501,298" size="34,36" url="ui://mfvz4q8kmhyhd8" autoSize="true">
       <relation target="n23_mhyh" sidePair="left-right"/>
     </loader>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -118,7 +118,7 @@ namespace GFGGame
 
             if (skipGuide <= 0 && LauncherConfig.netType == EnumNetType.LOCAL)
             {
-                Alert.Show("是否跳过引导?如果您是第一次体验,建议不要跳过引导!")
+                AlertUI.Show("是否跳过引导?如果您是第一次体验,建议不要跳过引导!")
                            .SetLeftButton(true, "不用", (obj) =>
                            {
                                EnterGame();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs

@@ -128,7 +128,7 @@ namespace GFGGame
             int hasNum = ItemDataManager.GetItemNum(itemCfg.id);
             if (hasNum >= costNum)
             {
-                Alert.Show(string.Format("是否花费{0}个{1}摘星{2}次?", costNum, itemCfg.name, times)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(); });
+                AlertUI.Show(string.Format("是否花费{0}个{1}摘星{2}次?", costNum, itemCfg.name, times)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(); });
             }
             else
             {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Account/A2C_DisconnectHandler.cs

@@ -26,7 +26,7 @@ namespace ET
                         });
                     break;
                 case ErrorCode.Err_ServerMaintain:
-                    Alert.Show("服务器维护中!")
+                    AlertUI.Show("服务器维护中!")
                         .SetLeftButton(true, "稍后再试", (obj) =>
                         {
                             Application.Quit();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -254,7 +254,7 @@ namespace GFGGame
         {
             if (_curRarity > ConstDressRarity.Rarity_ZHENXI)
             {
-                Alert.Show(string.Format("当前选择的稀有度为{0},是否确定分解?", ConstDressRarity.DressRarityList()[_curRarity])).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { DecomposeItem(); });
+                AlertUI.Show(string.Format("当前选择的稀有度为{0},是否确定分解?", ConstDressRarity.DressRarityList()[_curRarity])).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { DecomposeItem(); });
             }
             else
             {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Common/Alert/Alert.cs → GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertUI.cs

@@ -12,7 +12,7 @@
 
 namespace GFGGame
 {
-    public class Alert
+    public class AlertUI
     {
         private static AlertWindow _alertWindow;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Common/Alert/Alert.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b0e523c41970f25488bb409903a79bc1
+guid: f70bc54c3309378478ba1451e8c25073
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs

@@ -31,7 +31,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
-            Alert.Dispose();
+            AlertUI.Dispose();
             AlertSystem.Dispose();
             base.Dispose();
         }

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

@@ -93,7 +93,7 @@ namespace GFGGame
                 }
                 else
                 {
-                    Alert.Show(costCfg.name + "不足,是否前往购买?").SetLeftButton(true).SetRightButton(true, "确认", (AlertWindow.AlertCallback)((object data) =>
+                    AlertUI.Show(costCfg.name + "不足,是否前往购买?").SetLeftButton(true).SetRightButton(true, "确认", (AlertWindow.AlertCallback)((object data) =>
                     {
                         int costNeedCount = coustNum - ItemDataManager.GetItemNum(costId);
                         BuyItemConteoller.Show(costId, costNeedCount, ConstBuyType.TYPE_ITEM, 0, null, true, true, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED);

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

@@ -214,7 +214,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            Alert.Show("是否确定退出?")
+            AlertUI.Show("是否确定退出?")
             .SetLeftButton(true, "否").SetRightButton(true, "是", (object data) =>
             {
                 if (_levelCfg.type == ConstInstanceZonesType.Studio)
@@ -241,7 +241,7 @@ namespace GFGGame
 
         private void OnClickBtnHome()
         {
-            Alert.Show("是否返回?")
+            AlertUI.Show("是否返回?")
            .SetLeftButton(true, "否").SetRightButton(true, "是", (object data) =>
            {
                EquipDataCache.cacher.TakeOffAll();
@@ -390,14 +390,14 @@ namespace GFGGame
         {
             if (!EquipDataCache.cacher.CheckPutOnFinish())
             {
-                Alert.Show("只有换好衣服才能出门哦~")
+                AlertUI.Show("只有换好衣服才能出门哦~")
                     .SetRightButton(true, "好的");
                 return;
             }
             int _suitId = DressUpMenuSuitDataManager.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)
             {
-                Alert.Show("未穿戴必须品~").SetRightButton(true, "好的");
+                AlertUI.Show("未穿戴必须品~").SetRightButton(true, "好的");
                 return;
             }
             if (CardDataManager.GetCardListByRarity(0).Count > 0)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Field/FieldFightInfoView.cs

@@ -82,7 +82,7 @@ namespace GFGGame
         private void OnBtnStopClick()
         {
             Timers.inst.Remove(OnTimerUpdate);
-            Alert.Show("确认中止本轮挑战?")
+            AlertUI.Show("确认中止本轮挑战?")
             .SetLeftButton(true, "取消", (object data) =>
             {
                 Timers.inst.Add(1, _time, OnTimerUpdate, 1);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -148,7 +148,7 @@ namespace GFGGame
             }
             if (_dataManager.fieldInfos.bonusWeekly >= _dataManager.fieldInfos.bonusMaxLimit)
             {
-                Alert.Show("本周可获得奖励已达上限,是否继续挑战?")
+                AlertUI.Show("本周可获得奖励已达上限,是否继续挑战?")
                 .SetLeftButton(true)
                 .SetRightButton(true, "确定", (object data) =>
                 {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Mail/MailView.cs

@@ -184,7 +184,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("暂无邮件可删除");
                 return;
             }
-            Alert.Show("是否删除所有已读文件?").SetLeftButton(true).SetRightButton(true, "确认", (object data) =>
+            AlertUI.Show("是否删除所有已读文件?").SetLeftButton(true).SetRightButton(true, "确认", (object data) =>
             {
                 SendDeleteAll();
             });

+ 5 - 0
GameClient/Assets/Game/HotUpdate/Views/MainUI/RoleInfoView.cs

@@ -33,6 +33,7 @@ namespace GFGGame
             _ui.m_btnSound.onClick.Add(OnClickBtnSound);
             _ui.m_btnMusic.onClick.Add(OnClickBtnMusic);
             _ui.m_btnHelp.onClick.Add(OnClickBtnHelp);
+            _ui.m_txtSlogan.onFocusOut.Add(OnFocuseOut);
 
         }
 
@@ -105,5 +106,9 @@ namespace GFGGame
             }
         }
 
+        private void OnFocuseOut()
+        {
+
+        }
     }
 }