Browse Source

坐骑修改

zhenglijun 2 days ago
parent
commit
eb4a8c3120

BIN
Assets/Res/Addressable/FGUI/Mount/Mount_fui.bytes


+ 2 - 2
Assets/Scripts/Business/Runtime/Event/EventDefine.cs

@@ -280,11 +280,11 @@
         OpenMailUI = 3902,
         OpenMailUI = 3902,
         #endregion
         #endregion
 
 
-        #region 坐骑Mount 3900-3999
+        #region 坐骑Mount 4000-4099
         /// <summary>
         /// <summary>
         /// 服务器返回坐骑数据,刷新坐骑界面数据
         /// 服务器返回坐骑数据,刷新坐骑界面数据
         /// </summary>
         /// </summary>
-        RefreshMountInfo = 3900,
+        RefreshMountInfo = 4000,
         /// <summary>
         /// <summary>
         /// 坐骑骑乘状态变化
         /// 坐骑骑乘状态变化
         /// </summary>
         /// </summary>

+ 5 - 1
Assets/Scripts/Business/Runtime/FGUI/Mount/DevelopPanel/MountDevelopPanelCtrl.Upgrade.cs

@@ -245,7 +245,11 @@ namespace FL.FGUI
         /// <param name="args"></param>
         /// <param name="args"></param>
         private void FeedMountSucessful(int eventId, object args)
         private void FeedMountSucessful(int eventId, object args)
         {
         {
-            if (_universalId == MountData.Instance.universalId) return;
+            if (_universalId == MountData.Instance.universalId)
+            {
+                ShowExp();
+                return;
+            }
             GetMouuntModelData();
             GetMouuntModelData();
             ShowUniversalMountsUI();
             ShowUniversalMountsUI();
         }
         }

+ 5 - 6
fl-fgui-project/assets/Mount/DevelopPanel.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="756,1344" designImage="ui://s58m5vbw9sqt0" designImageOffsetX="-149">
 <component size="756,1344" designImage="ui://s58m5vbw9sqt0" designImageOffsetX="-149">
-  <controller name="PageCtrl" pages="0,,1,,2," selected="2">
+  <controller name="PageCtrl" pages="0,,1,,2," selected="0">
     <remark page="0" value="坐骑升级"/>
     <remark page="0" value="坐骑升级"/>
     <remark page="1" value="坐骑驯养"/>
     <remark page="1" value="坐骑驯养"/>
     <remark page="2" value="高级坐骑"/>
     <remark page="2" value="高级坐骑"/>
@@ -28,22 +28,22 @@
     </component>
     </component>
     <component id="n0_j7sp" name="n0" src="j7sp54" fileName="Components/PopWin/PopWin5.xml" pkg="gt6q23qw" xy="13,97" size="729,1028" group="n85_f8ih">
     <component id="n0_j7sp" name="n0" src="j7sp54" fileName="Components/PopWin/PopWin5.xml" pkg="gt6q23qw" xy="13,97" size="729,1028" group="n85_f8ih">
       <gearText controller="PageCtrl" pages="0,1,2" values="坐骑升级|坐骑驯养|高级坐骑"/>
       <gearText controller="PageCtrl" pages="0,1,2" values="坐骑升级|坐骑驯养|高级坐骑"/>
-      <Label title="高级坐骑"/>
+      <Label title="坐骑升级"/>
     </component>
     </component>
-    <image id="n14_j7sp" name="n14" src="rwcw4" fileName="images/pop/tanchuangdiban2.png" pkg="gt6q23qw" xy="32,571" size="692,557" group="n85_f8ih">
+    <image id="n14_j7sp" name="n14" src="rwcw4" fileName="images/pop/tanchuangdiban2.png" pkg="gt6q23qw" xy="32,571" size="692,426" group="n85_f8ih">
       <gearSize controller="PageCtrl" pages="2" values="692,557,1,1" default="692,426,1,1"/>
       <gearSize controller="PageCtrl" pages="2" values="692,557,1,1" default="692,426,1,1"/>
     </image>
     </image>
     <loader id="n5_j7sp" name="n5" xy="33,205" size="689,370" group="n85_f8ih" url="ui://s58m5vbwj7spi" align="center" vAlign="middle" autoSize="true">
     <loader id="n5_j7sp" name="n5" xy="33,205" size="689,370" group="n85_f8ih" url="ui://s58m5vbwj7spi" align="center" vAlign="middle" autoSize="true">
       <gearIcon controller="PageCtrl" pages="1" values="ui://s58m5vbwj7spj" default="ui://s58m5vbwj7spi"/>
       <gearIcon controller="PageCtrl" pages="1" values="ui://s58m5vbwj7spj" default="ui://s58m5vbwj7spi"/>
     </loader>
     </loader>
     <component id="n1_j7sp" name="UpgradeBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="76,1148" group="n85_f8ih">
     <component id="n1_j7sp" name="UpgradeBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="76,1148" group="n85_f8ih">
-      <Button title="坐骑升级" controller="PageCtrl" page="0"/>
+      <Button checked="true" title="坐骑升级" controller="PageCtrl" page="0"/>
     </component>
     </component>
     <component id="n2_j7sp" name="TrainBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="298,1148" group="n85_f8ih">
     <component id="n2_j7sp" name="TrainBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="298,1148" group="n85_f8ih">
       <Button title="坐骑驯养" controller="PageCtrl" page="1"/>
       <Button title="坐骑驯养" controller="PageCtrl" page="1"/>
     </component>
     </component>
     <component id="n3_j7sp" name="AdvancedMountBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="525,1148" group="n85_f8ih">
     <component id="n3_j7sp" name="AdvancedMountBtn" src="jofv4y" fileName="Components/ComButtons/ComPageBtn.xml" pkg="gt6q23qw" xy="525,1148" group="n85_f8ih">
-      <Button checked="true" title="高级坐骑" controller="PageCtrl" page="2"/>
+      <Button title="高级坐骑" controller="PageCtrl" page="2"/>
     </component>
     </component>
     <image id="n7_j7sp" name="n7" src="9sqtc" fileName="Images/mingzidikuang.png" xy="159,266" pivot="0.5,0.5" anchor="true" size="246,85" group="n85_f8ih">
     <image id="n7_j7sp" name="n7" src="9sqtc" fileName="Images/mingzidikuang.png" xy="159,266" pivot="0.5,0.5" anchor="true" size="246,85" group="n85_f8ih">
       <gearDisplay controller="PageCtrl" pages="0,2"/>
       <gearDisplay controller="PageCtrl" pages="0,2"/>
@@ -57,7 +57,6 @@
       <gearDisplay controller="PageCtrl" pages="0,2"/>
       <gearDisplay controller="PageCtrl" pages="0,2"/>
       <relation target="n7_j7sp" sidePair="middle-middle"/>
       <relation target="n7_j7sp" sidePair="middle-middle"/>
     </group>
     </group>
-    <component id="n92_ktqx" name="n92" pkg="s58m5vbw" src="ktqx14" fileName="EmptyNode.xml" xy="378,446" pivot="0.5,0.5" anchor="true" group="n85_f8ih"/>
     <loader id="n8_j7sp" name="MountPicture" xy="394,362" pivot="0.5,0.5" anchor="true" size="211,283" group="n85_f8ih" url="ui://s58m5vbw9sqtg" align="center" vAlign="middle" autoSize="true" clearOnPublish="true">
     <loader id="n8_j7sp" name="MountPicture" xy="394,362" pivot="0.5,0.5" anchor="true" size="211,283" group="n85_f8ih" url="ui://s58m5vbw9sqtg" align="center" vAlign="middle" autoSize="true" clearOnPublish="true">
       <gearDisplay controller="PageCtrl" pages="0,2"/>
       <gearDisplay controller="PageCtrl" pages="0,2"/>
     </loader>
     </loader>