Explorar o código

抽奖显示部件总数

zhaoyang %!s(int64=2) %!d(string=hai) anos
pai
achega
cfcca9b2a4

+ 2 - 2
FGUIProject/assets/LuckyBox/combox/ComBox_1.xml

@@ -11,7 +11,7 @@
       <Button icon="ui://drx9d1usvek8t"/>
     </component>
     <image id="n34_njmn" name="n34" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n36_njmn"/>
-    <text id="n35_njmn" name="txtOwned" xy="905,288" size="122,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}">
+    <text id="n35_njmn" name="txtOwned" xy="891,288" size="147,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}/{v2=0}">
       <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n36_njmn" name="n36" xy="854,177" size="226,147" advanced="true">
@@ -35,7 +35,7 @@
     <image id="n30_njmn" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1603" group="n31_njmn">
       <relation target="n29_njmn" sidePair="left-left,top-top"/>
     </image>
-    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="248,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" text="今日剩余次数:{v1=0}">
+    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="243,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" text="今日剩余次数:{v1=0}">
       <relation target="" sidePair="center-center"/>
     </text>
     <group id="n31_njmn" name="n31" xy="45,1603" size="989,250" advanced="true">

+ 2 - 2
FGUIProject/assets/LuckyBox/combox/ComBox_2.xml

@@ -11,7 +11,7 @@
       <Button icon="ui://drx9d1usvek8t"/>
     </component>
     <image id="n34_njmn" name="n34" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n36_njmn"/>
-    <text id="n35_njmn" name="txtOwned" xy="905,288" size="122,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}">
+    <text id="n35_njmn" name="txtOwned" xy="891,288" size="147,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}/{v2=0}">
       <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n36_njmn" name="n36" xy="854,177" size="226,147" advanced="true">
@@ -28,7 +28,7 @@
     <image id="n30_njmn" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1603" group="n31_njmn">
       <relation target="n29_njmn" sidePair="left-left,top-top"/>
     </image>
-    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="248,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" text="今日剩余次数:{v1=0}">
+    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="243,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" text="今日剩余次数:{v1=0}">
       <relation target="" sidePair="center-center"/>
     </text>
     <group id="n31_njmn" name="n31" xy="45,1603" size="989,250" advanced="true">

+ 3 - 3
FGUIProject/assets/LuckyBox/combox/ComBox_3.xml

@@ -14,10 +14,10 @@
       <Button icon="ui://drx9d1usvek8t"/>
     </component>
     <image id="n35_njmn" name="n35" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n37_njmn"/>
-    <text id="n36_njmn" name="txtOwned" xy="905,288" size="122,36" group="n37_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}">
+    <text id="n36_njmn" name="txtOwned" xy="891,288" size="147,36" group="n37_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}/{v2=0}">
       <relation target="n35_njmn" sidePair="center-center,middle-middle"/>
     </text>
-    <group id="n37_njmn" name="n37" xy="854,177" size="226,147" advanced="true">
+    <group id="n37_njmn" name="n37" xy="854,177" size="226,147" visible="false" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     <component id="n26_njmn" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="301,1635" pivot="0.5,0" anchor="true" group="n31_njmn">
@@ -28,7 +28,7 @@
     </component>
     <component id="n28_njmn" name="btnBuyOne" src="ga16b" fileName="components/Button1.xml" xy="90,1688" group="n31_njmn"/>
     <component id="n29_njmn" name="btnBuyTen" src="ga16c" fileName="components/Button2.xml" xy="576,1688" group="n31_njmn"/>
-    <text id="n38_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="248,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" text="今日剩余次数:{v1=0}">
+    <text id="n38_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="243,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" text="今日剩余次数:{v1=0}">
       <relation target="" sidePair="center-center"/>
     </text>
     <group id="n31_njmn" name="n31" xy="90,1635" size="898,218" advanced="true">

+ 4 - 3
GameClient/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs

@@ -89,9 +89,10 @@ namespace GFGGame
             return list;
         }
 
-        public int GetOwnedCount(int boxId)
+        public void GetOwnedCount(int boxId, out int count, out int totalCount)
         {
-            int count = 0;
+            count = 0;
+            totalCount = 0;
             foreach (LuckyBoxBonusData luckyBoxBonusData in _dicShowList[boxId])
             {
                 foreach (ItemData itemData in luckyBoxBonusData.itemList)
@@ -100,9 +101,9 @@ namespace GFGGame
                     {
                         count++;
                     }
+                    totalCount++;
                 }
             }
-            return count;
         }
 
         public List<LuckyBoxBonusData> GetCurrentShowList(int boxId)

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -136,8 +136,9 @@ namespace GFGGame
             GButton btnExchange = (obj as GComponent).GetChild("btnExchange").asButton;
             btnExchange.GetController("c1").selectedIndex = boxId;
             GTextField txtOwned = (obj as GComponent).GetChild("txtOwned").asTextField;
-            int count = LuckyBoxDataManager.Instance.GetOwnedCount(boxId);
+            LuckyBoxDataManager.Instance.GetOwnedCount(boxId, out int count, out int totalCount);
             txtOwned.SetVar("v1", "" + count).FlushVars();
+            txtOwned.SetVar("v2", "" + totalCount).FlushVars();
             GTextField txtRemainTimes = (obj as GComponent).GetChild("txtRemainTimes").asTextField;
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(cfg.numericType);
             txtRemainTimes.text = string.Format("今日剩余次数:{0}", cfg.maxCount - boughtCount);

BIN=BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes