zhaoyang 3 жил өмнө
parent
commit
1c5a3b6a65

+ 1 - 1
FGUIProject/assets/CommonGame/components/ButtonTab1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="292,84" extention="Button">
 <component size="292,84" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
   <displayList>
     <image id="n0_ga16" name="n0" src="qr4etht" fileName="imagesExport/wpzs_anniu_2.png" xy="0,0">
     <image id="n0_ga16" name="n0" src="qr4etht" fileName="imagesExport/wpzs_anniu_2.png" xy="0,0">
       <gearDisplay controller="button" pages="1,2,3"/>
       <gearDisplay controller="button" pages="1,2,3"/>

+ 1 - 1
FGUIProject/assets/CommonGame/components/ComItem.xml

@@ -5,7 +5,7 @@
     <loader id="n12_ehs9" name="loaIcon" xy="110,96" pivot="0.5,0.5" anchor="true" size="116,116" group="n21_qr4e" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale"/>
     <loader id="n12_ehs9" name="loaIcon" xy="110,96" pivot="0.5,0.5" anchor="true" size="116,116" group="n21_qr4e" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale"/>
     <text id="n14_ehs9" name="txtName" xy="111,194" pivot="0.5,0" anchor="true" size="228,44" group="n21_qr4e" fontSize="32" color="#9b7f61" text="赵钱孙李·巴拉"/>
     <text id="n14_ehs9" name="txtName" xy="111,194" pivot="0.5,0" anchor="true" size="228,44" group="n21_qr4e" fontSize="32" color="#9b7f61" text="赵钱孙李·巴拉"/>
     <image id="n16_j8b3" name="imgGot" src="j48o9b" fileName="images/yx_yilq.png" xy="23,80" group="n21_qr4e"/>
     <image id="n16_j8b3" name="imgGot" src="j48o9b" fileName="images/yx_yilq.png" xy="23,80" group="n21_qr4e"/>
-    <image id="n22_cs8j" name="imgNotGot" src="cs8jthx" fileName="images/yx_whd.png" xy="21,83" group="n21_qr4e"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="21,83" group="n21_qr4e"/>
     <text id="n17_j48o" name="txtHasCount" xy="112,243" pivot="0.5,0" anchor="true" size="105,36" group="n21_qr4e" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
     <text id="n17_j48o" name="txtHasCount" xy="112,243" pivot="0.5,0" anchor="true" size="105,36" group="n21_qr4e" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
     <loader id="n18_j48o" name="loaRarity" xy="164,0" size="44,94" group="n21_qr4e" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n18_j48o" name="loaRarity" xy="164,0" size="44,94" group="n21_qr4e" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n19_tc53" name="loaShouTongReward" xy="32,81" size="160,40" group="n21_qr4e" url="ui://eg2y0ldptc539z" autoSize="true"/>
     <loader id="n19_tc53" name="loaShouTongReward" xy="32,81" size="160,40" group="n21_qr4e" url="ui://eg2y0ldptc539z" autoSize="true"/>

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs

@@ -10,7 +10,7 @@ namespace UI.CommonGame
         public GLoader m_loaIcon;
         public GLoader m_loaIcon;
         public GTextField m_txtName;
         public GTextField m_txtName;
         public GImage m_imgGot;
         public GImage m_imgGot;
-        public GImage m_imgNotGot;
+        public GImage m_imgNotHas;
         public GTextField m_txtHasCount;
         public GTextField m_txtHasCount;
         public GLoader m_loaRarity;
         public GLoader m_loaRarity;
         public GLoader m_loaShouTongReward;
         public GLoader m_loaShouTongReward;
@@ -66,7 +66,7 @@ namespace UI.CommonGame
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_imgGot = (GImage)comp.GetChild("imgGot");
             m_imgGot = (GImage)comp.GetChild("imgGot");
-            m_imgNotGot = (GImage)comp.GetChild("imgNotGot");
+            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
             m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaShouTongReward = (GLoader)comp.GetChild("loaShouTongReward");
             m_loaShouTongReward = (GLoader)comp.GetChild("loaShouTongReward");
@@ -78,7 +78,7 @@ namespace UI.CommonGame
             m_loaIcon = null;
             m_loaIcon = null;
             m_txtName = null;
             m_txtName = null;
             m_imgGot = null;
             m_imgGot = null;
-            m_imgNotGot = null;
+            m_imgNotHas = null;
             m_txtHasCount = null;
             m_txtHasCount = null;
             m_loaRarity = null;
             m_loaRarity = null;
             m_loaShouTongReward = null;
             m_loaShouTongReward = null;

+ 5 - 5
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -10,7 +10,7 @@ namespace GFGGame
         private GTextField _txtCount;
         private GTextField _txtCount;
         private GTextField _txtHasCount;
         private GTextField _txtHasCount;
         private GImage _imgGot;
         private GImage _imgGot;
-        private GImage _imgNotGot;
+        private GImage _imgNotHas;
         private GLoader _loaShouTongRewardVisble;
         private GLoader _loaShouTongRewardVisble;
         private GGroup _grpCount;
         private GGroup _grpCount;
 
 
@@ -25,7 +25,7 @@ namespace GFGGame
             _txtCount = obj.GetChild("txtCount") as GTextField;
             _txtCount = obj.GetChild("txtCount") as GTextField;
             _txtHasCount = obj.GetChild("txtHasCount") as GTextField;
             _txtHasCount = obj.GetChild("txtHasCount") as GTextField;
             _imgGot = obj.GetChild("imgGot") as GImage;
             _imgGot = obj.GetChild("imgGot") as GImage;
-            _imgNotGot = obj.GetChild("imgNotGot") as GImage;
+            _imgNotHas = obj.GetChild("imgNotHas") as GImage;
             _loaShouTongRewardVisble = obj.GetChild("loaShouTongReward") as GLoader;
             _loaShouTongRewardVisble = obj.GetChild("loaShouTongReward") as GLoader;
             _grpCount = obj.GetChild("grpCount") as GGroup;
             _grpCount = obj.GetChild("grpCount") as GGroup;
             AddClickListener();
             AddClickListener();
@@ -51,7 +51,7 @@ namespace GFGGame
             _loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             _loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             RarityIconController.UpdateRarityIcon(_loaRarity, _itemData.id, false);
             RarityIconController.UpdateRarityIcon(_loaRarity, _itemData.id, false);
             _imgGot.visible = false;
             _imgGot.visible = false;
-            _imgNotGot.visible = false;
+            _imgNotHas.visible = false;
             _loaShouTongRewardVisble.visible = false;
             _loaShouTongRewardVisble.visible = false;
             _grpCount.visible = true;
             _grpCount.visible = true;
             _showTips = true;
             _showTips = true;
@@ -84,11 +84,11 @@ namespace GFGGame
         {
         {
             get
             get
             {
             {
-                return _imgNotGot.visible;
+                return _imgNotHas.visible;
             }
             }
             set
             set
             {
             {
-                _imgNotGot.visible = value;
+                _imgNotHas.visible = value;
             }
             }
         }
         }
 
 

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes