抽卡预览ui

FGUIProject/assets/CommonGame/components/BtnStyle005.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="316,102" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n2_idkd" name="icon" xy="0,0" pivot="0.5,0.5" size="316,102" url="ui://eg2y0ldpvolstnf" autoSize="true"/>
+    <text id="n1_9qpb" name="title" xy="0,-4" size="316,102" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="前往">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n2_idkd" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/CommonGame/components/BtnStyle006.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="94,94" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n2_idkd" name="icon" xy="0,0" pivot="0.5,0.5" size="94,94" url="ui://eg2y0ldpvolstni" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <text id="n1_9qpb" name="title" xy="0,0" size="94,94" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n2_idkd" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/CommonGame/components/ButtonTab1.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="292,84" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
-  <displayList>
-    <image id="n0_ga16" name="n0" src="qr4etht" fileName="imagesExport/wpzs_anniu_2.png" xy="0,0">
-      <gearDisplay controller="button" pages="1,2,3"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n2_ga16" name="title" xy="0,0" size="292,84" fontSize="38" color="#998b7d" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
-      <gearColor controller="button" pages="0" values="#998b7d,#000000" default="#fff7e4,#000000"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button mode="Radio"/>
-</component>

FGUIProject/assets/CommonGame/components/ComIcon003.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="180,180">
+<component size="210,210">
   <displayList>
-    <image id="n25_pu55" name="n25" src="hhx9j" fileName="imagesNew/wp_baseboard1.png" xy="1,1"/>
-    <loader id="n12_ehs9" name="loaIcon" xy="89,94" pivot="0.5,0.5" anchor="true" size="122,122" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
-    <text id="n17_j48o" name="txtHasCount" xy="90,225" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
-    <loader id="n18_j48o" name="loaRarity" xy="115,38" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
-    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
-    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
-    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="8,73" size="160,40" group="n29_pu55"/>
-    <group id="n29_pu55" name="n29" xy="-1,73" size="178,40" group="n30_9jv6" advanced="true"/>
-    <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="32,37" group="n27_pu55"/>
-    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="46,68" size="85,49" group="n27_pu55"/>
-    <group id="n27_pu55" name="grpGot" xy="32,37" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
-    <group id="n30_9jv6" name="n30" xy="-1,33" size="178,228"/>
+    <image id="n25_pu55" name="n25" src="volstc1" fileName="imagesNew/wp_bg_yuan.png" xy="1,1"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="105,105" pivot="0.5,0.5" anchor="true" size="152,152" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <text id="n17_j48o" name="txtHasCount" xy="105,225" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n18_j48o" name="loaRarity" xy="162,0" size="44,94" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale" autoSize="true"/>
+    <image id="n23_slyz" name="imgHas" src="volstc2" fileName="imagesNew/wp_own.png" xy="16,91" size="178,40" group="n29_pu55" visible="false"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="16,91" size="178,40" group="n29_pu55" visible="false"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="25,91" size="160,40" group="n29_pu55" visible="false"/>
+    <group id="n29_pu55" name="n29" xy="16,91" size="178,40" group="n30_9jv6" advanced="true"/>
+    <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="49,49" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="63,80" size="85,49" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="49,49" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
+    <group id="n30_9jv6" name="n30" xy="16,0" size="190,261"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/ComItem003.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="210,210" pivot="0.5,0.5" overflow="hidden" opaque="false">
+  <displayList>
+    <component id="n25_pu55" name="comItemIcon" src="volstnj" fileName="components/ComIcon003.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
+    <text id="n26_r9ri" name="txtName" xy="105,224" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+      <relation target="n25_pu55" sidePair="bottom-bottom"/>
+    </text>
+    <image id="n27_qik1" name="n27" src="qik1tm0" fileName="imagesNew/dikuang_SkillLevel.png" xy="162,192" pivot="0.5,0.5" anchor="true" size="90,33" group="n28_qik1">
+      <relation target="n15_ehs9" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n15_ehs9" name="txtCount" xy="161,169" pivot="0.5,0" anchor="true" size="50,44" group="n28_qik1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" align="center" vars="true" text="x00">
+      <relation target="n25_pu55" sidePair="center-center"/>
+    </text>
+    <group id="n28_qik1" name="n28" xy="117,169" size="90,44"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -20,7 +20,6 @@
     <image id="d4iwj" name="sc_anniu_1.png" path="/imagesExport/" exported="true"/>
     <image id="pal5v" name="zx_anniutz_1.png" path="/imagesExport/" exported="true"/>
     <image id="ga165b" name="hz_ssuodikuang.png" path="/imagesExport/" exported="true"/>
-    <component id="ga165c" name="ButtonTab1.xml" path="/components/" exported="true"/>
     <image id="s2cc55" name="zd_xztup_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="21,3,8,6"/>
     <image id="fka77" name="cj_yihde.png" path="/imagesExport/" exported="true"/>
     <component id="tu965e" name="GetSuitItemUI.xml" path="/" exported="true"/>
@@ -340,7 +339,15 @@
     <image id="idkdtnb" name="hl_jfscibt.png" path="/imagesNew/"/>
     <image id="qqhzk" name="an_yellow_1.png" path="/imagesNew/" exported="true"/>
     <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
-    <component id="volstnd" name="ComIcon003.xml" path="/components/" exported="true"/>
+    <component id="volstne" name="BtnStyle005.xml" path="/components/" exported="true"/>
+    <image id="volstnf" name="an_bt_jin.png" path="/imagesNew/" exported="true"/>
+    <image id="volstng" name="an_bt_bai.png" path="/imagesNew/" exported="true"/>
+    <component id="volstnh" name="BtnStyle006.xml" path="/components/" exported="true"/>
+    <image id="volstni" name="an_bt_cut.png" path="/imagesNew/" exported="true"/>
+    <component id="volstnj" name="ComIcon003.xml" path="/components/" exported="true"/>
+    <image id="volstc1" name="wp_bg_yuan.png" path="/imagesNew/"/>
+    <image id="volstc2" name="wp_own.png" path="/imagesNew/"/>
+    <component id="volstnk" name="ComItem003.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/LuckyBoxPreShowUI.xml

@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1158">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <component id="n0_ga16" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1167"/>
-    <text id="n2_ga16" name="txtTitle" xy="118,53" size="726,69" fontSize="52" color="#9b7853" align="center" autoSize="none" text="物品展示"/>
-    <image id="n9_qr4e" name="n9" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,145"/>
-    <image id="n3_ga16" name="n3" src="qr4e27" fileName="images/wpzs_anniu_1.png" xy="190,181" group="n10_dhoa"/>
-    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="189,182" group="n10_dhoa">
-      <Button checked="true" title="物品预览" controller="c1" page="0"/>
+    <image id="n13_vols" name="n13" src="volstc4" fileName="imageNews/zx_tc_piaodai_shang.png" xy="-47,-130" group="n15_vols"/>
+    <image id="n14_vols" name="n14" src="volstc5" fileName="imageNews/zx_tc_piaodai_xia.png" xy="545,841" group="n15_vols"/>
+    <image id="n11_vols" name="n11" src="volstc3" fileName="imageNews/zx_tc_bg.png" xy="5,11" group="n15_vols"/>
+    <group id="n15_vols" name="n15" xy="-47,-130" size="1046,1353"/>
+    <image id="n16_vols" name="n16" src="volstbz" fileName="imageNews/zx_tc_title_zhuangshi.png" xy="28,62" group="n20_vols"/>
+    <text id="n2_ga16" name="n2" xy="68,71" size="64,79" group="n20_vols" fontSize="60" color="#5a3e16" text="物"/>
+    <text id="n17_vols" name="n17" xy="123,84" size="54,66" group="n20_vols" fontSize="50" color="#5a3e16" text="品"/>
+    <text id="n18_vols" name="n18" xy="168,71" size="64,79" group="n20_vols" fontSize="60" color="#5a3e16" text="展"/>
+    <text id="n19_vols" name="n19" xy="223,84" size="54,66" group="n20_vols" fontSize="50" color="#5a3e16" text="示"/>
+    <group id="n20_vols" name="n20" xy="28,62" size="249,110" advanced="true"/>
+    <image id="n3_ga16" name="n3" src="volstc6" fileName="imageNews/zx_tc_tab_bg.png" xy="247,182" size="468,74" group="n10_dhoa"/>
+    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" xy="244,181" group="n10_dhoa">
+      <Button title="物品预览" controller="c1" page="0"/>
     </component>
-    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="482,181" group="n10_dhoa">
-      <Button title="概率公示" controller="c1" page="1"/>
+    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" xy="479,181" group="n10_dhoa" controller="c1,1">
+      <Button checked="true" title="概率公示" controller="c1" page="1"/>
     </component>
-    <group id="n10_dhoa" name="n10" xy="189,181" size="585,85"/>
-    <list id="n6_ga16" name="list" xy="96,318" size="770,790" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
+    <image id="n12_vols" name="n12" src="volstc7" fileName="imageNews/zx_tc_tab_biankuang.png" xy="33,181" group="n10_dhoa"/>
+    <group id="n10_dhoa" name="n10" xy="33,181" size="896,75"/>
+    <list id="n6_ga16" name="list" xy="96,318" size="770,735" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
     </list>
-    <component id="n8_ga16" name="compText" src="ga16j" fileName="components/Component1.xml" xy="70,334" size="822,790">
+    <component id="n8_ga16" name="compText" src="ga16j" fileName="components/Component1.xml" xy="96,318" size="770,732">
       <gearDisplay controller="c1" pages="1"/>
     </component>
   </displayList>

FGUIProject/assets/LuckyBox/combox/ComBox.xml

@@ -4,34 +4,37 @@
     <component id="n44_mbf1" name="comModel" src="mbf1tah" fileName="combox/ComModel.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n32_njmn" name="btnPreview" src="ga16d" fileName="components/Button3.xml" xy="925,240" group="n36_njmn">
+    <component id="n62_vols" name="btnPreview" src="ga16d" fileName="components/Button3.xml" xy="927,241" group="n66_vols" controller="c1,0">
       <Button icon="ui://drx9d1usvek8v"/>
     </component>
-    <image id="n34_njmn" name="n34" src="idkdtar" fileName="imagesNews/zx_jindu_bg.png" xy="911,343" group="n36_njmn"/>
-    <text id="n35_njmn" name="txtOwned" xy="940,372" pivot="0.5,0" size="44,39" group="n36_njmn" fontSize="28" color="#faf6e6" align="center" vars="true" text="{v1=0}/{v2=0}">
-      <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
+    <image id="n64_vols" name="n64" src="fka75" fileName="images/cj_dikuangtw.png" xy="861,354" group="n66_vols"/>
+    <text id="n65_vols" name="txtOwned" xy="898,353" size="143,36" group="n66_vols" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有：{v1=0}/{v2=0}">
+      <relation target="n64_vols" sidePair="center-center,middle-middle"/>
     </text>
-    <group id="n36_njmn" name="n36" xy="911,240" size="108,203" advanced="true">
+    <group id="n66_vols" name="n66" xy="861,241" size="226,148" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
-    <image id="n46_idkd" name="n46" src="idkdtar" fileName="imagesNews/zx_jindu_bg.png" xy="637,1632" group="n31_njmn"/>
-    <image id="n45_idkd" name="n45" src="idkdtar" fileName="imagesNews/zx_jindu_bg.png" xy="154,1563" group="n31_njmn"/>
-    <component id="n26_njmn" name="comCostOne" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="256,1597" pivot="0.5,0" anchor="true" group="n31_njmn">
+    <image id="n68_vols" name="n68" src="qi041j" fileName="images/cj_zizi_2.png" xy="392,545" group="n71_vols"/>
+    <image id="n69_vols" name="n69" src="mzf8tac" fileName="images/cj_zizi_3.png" xy="676,700" group="n71_vols"/>
+    <text id="n70_vols" name="txtTime" xy="643,949" size="62,237" group="n71_vols" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#fffbdd" align="center" vAlign="middle" autoSize="height" strokeColor="#a98538" strokeSize="2" text="剩余80天"/>
+    <group id="n71_vols" name="n71" xy="392,545" size="387,700" visible="false" advanced="true">
+      <relation target="" sidePair="middle-middle"/>
+    </group>
+    <component id="n55_vols" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="256,1635" pivot="0.5,0" anchor="true" group="n61_vols">
       <relation target="" sidePair="left-left"/>
     </component>
-    <component id="n27_njmn" name="comCostTen" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="741,1597" pivot="0.5,0" anchor="true" group="n31_njmn">
+    <component id="n56_vols" name="comCostTen" src="vek812" fileName="components/ComCost.xml" xy="741,1635" pivot="0.5,0" anchor="true" group="n61_vols">
       <relation target="" sidePair="left-left"/>
     </component>
-    <image id="n30_njmn" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1565" group="n31_njmn">
-      <relation target="n29_njmn" sidePair="left-left,top-top"/>
+    <component id="n57_vols" name="btnBuyOne" src="ga16b" fileName="components/Button1.xml" xy="45,1688" group="n61_vols"/>
+    <component id="n58_vols" name="btnBuyTen" src="ga16c" fileName="components/Button2.xml" xy="531,1688" group="n61_vols"/>
+    <image id="n59_vols" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1603" group="n61_vols">
+      <relation target="n58_vols" sidePair="left-left,top-top"/>
     </image>
-    <text id="n37_njmn" name="txtRemainTimes" xy="540,1464" pivot="0.5,0" anchor="true" size="303,54" group="n31_njmn" fontSize="40" color="#915e15" align="center" vars="true" text="今日剩余次数：{v1=0}">
+    <text id="n60_vols" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="244,44" group="n61_vols" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数：{v1=0}">
       <relation target="" sidePair="center-center"/>
     </text>
-    <component id="n28_njmn" name="btnBuyOne" src="idkdtnh" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="45,1650" group="n47_idkd"/>
-    <component id="n29_njmn" name="btnBuyTen" src="idkdtnh" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="531,1650" group="n47_idkd"/>
-    <group id="n47_idkd" name="n47" xy="45,1650" size="802,102" group="n31_njmn" advanced="true"/>
-    <group id="n31_njmn" name="n31" xy="45,1464" size="989,288" advanced="true">
+    <group id="n61_vols" name="n61" xy="45,1603" size="989,250" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
   </displayList>

FGUIProject/assets/LuckyBox/components/ButtonTab1.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="238,74" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n0_ga16" name="n0" src="volstc8" fileName="imageNews/zx_tc_tab_xuanzhong.png" xy="0,0" pivot="0.5,0.5" scale="-1,1">
+      <gearDisplay controller="button" pages="1,2,3"/>
+      <gearSize controller="c1" pages="1" values="238,74,-1,1" default="238,74,1,1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n2_ga16" name="title" xy="0,0" size="238,74" fontSize="40" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="物品预览">
+      <gearColor controller="button" pages="0,1" values="#716660,#000000|#5a3e16,#000000"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/LuckyBox/components/CompLuckyBoxBonusListItem.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="770,355">
   <displayList>
-    <image id="n12_qr4e" name="n12" src="qr4e28" fileName="images/wpzs_bji.png" xy="21,2"/>
-    <text id="n9_ga16" name="txtName" xy="72,2" size="349,60" fontSize="40" color="#998570" autoSize="none" text="示例"/>
-    <list id="n11_ga16" name="list" xy="0,65" size="770,290" layout="flow_hz" colGap="50" lineItemCount="3" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
+    <image id="n12_qr4e" name="n12" src="volstc9" fileName="imageNews/zx_tc_taozhuang_zhuagnshi.png" xy="21,22"/>
+    <text id="n9_ga16" name="txtName" xy="57,6" size="84,54" fontSize="40" color="#5a3e16" text="示例"/>
+    <list id="n11_ga16" name="list" xy="0,65" size="770,290" layout="flow_hz" lineGap="25" colGap="70" lineItemCount="3" defaultItem="ui://eg2y0ldpvolstnk" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/LuckyBox/components/Component1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="805,677" overflow="scroll">
   <displayList>
-    <text id="n9_ga16" name="txtShow" xy="0,0" size="805,677" fontSize="36" color="#9b8355" letterSpacing="3" ubb="true" autoSize="none" autoClearText="true" text="示例\nhahakdfjla"/>
+    <text id="n9_ga16" name="txtShow" xy="0,0" size="805,677" fontSize="38" color="#5a3e16" letterSpacing="3" ubb="true" autoSize="none" autoClearText="true" text="示例\nhahakdfjla"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/package.xml

@@ -72,6 +72,72 @@
     <image id="mbf1tal" name="cj_sj_db.png" path="/images/"/>
     <image id="mbf1tam" name="cj_tswz_db.png" path="/images/"/>
     <image id="volstan" name="bt_tiaoguo.png" path="/imageNews/"/>
+    <image id="volstao" name="zx_bg_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstap" name="zx_jindu_bg.png" path="/imageNews/"/>
+    <image id="volstaq" name="zx_title_bg.png" path="/imageNews/"/>
+    <image id="volstar" name="zx_title_guangdian.png" path="/imageNews/"/>
+    <image id="volstas" name="zx_title_xianding.png" path="/imageNews/"/>
+    <image id="volstat" name="zx_title_zi.png" path="/imageNews/"/>
+    <image id="volstau" name="zx_title_zi_guangxiao.png" path="/imageNews/"/>
+    <image id="volstav" name="zx_title_zi_star.png" path="/imageNews/"/>
+    <image id="volstaw" name="zx_title_zi_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstax" name="zx_yulan_diaoshi.png" path="/imageNews/"/>
+    <image id="volstay" name="zx_yulan_tubiao.png" path="/imageNews/"/>
+    <image id="volstaz" name="zx_yulan_tubiao_bg.png" path="/imageNews/"/>
+    <image id="volstb0" name="zx_yulan_xinggui.png" path="/imageNews/"/>
+    <image id="volstb1" name="bt_jiaobiao_bichu.png" path="/imageNews/"/>
+    <image id="volstb2" name="zx_bg_yueliang.png" path="/imageNews/"/>
+    <image id="volstb3" name="zx_lianxian_lan_guangquan.png" path="/imageNews/"/>
+    <image id="volstb4" name="zx_lianxian_lan_shang.png" path="/imageNews/"/>
+    <image id="volstb5" name="zx_lianxian_lan_star_1.png" path="/imageNews/"/>
+    <image id="volstb6" name="zx_lianxian_lan_star_2.png" path="/imageNews/"/>
+    <image id="volstb7" name="zx_lianxian_lan_star_3.png" path="/imageNews/"/>
+    <image id="volstb8" name="zx_lianxian_lan_xia.png" path="/imageNews/"/>
+    <image id="volstb9" name="zx_lianxian_lan_xian.png" path="/imageNews/"/>
+    <image id="volstba" name="zx_lianxian_bg_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstbb" name="zx_lianxian_huang_guangquan.png" path="/imageNews/"/>
+    <image id="volstbc" name="zx_lianxian_huang_shang.png" path="/imageNews/"/>
+    <image id="volstbd" name="zx_lianxian_huang_star_1.png" path="/imageNews/"/>
+    <image id="volstbe" name="zx_lianxian_huang_star_2.png" path="/imageNews/"/>
+    <image id="volstbf" name="zx_lianxian_huang_star_3.png" path="/imageNews/"/>
+    <image id="volstbg" name="zx_lianxian_huang_xia.png" path="/imageNews/"/>
+    <image id="volstbh" name="zx_lianxian_huang_xian.png" path="/imageNews/"/>
+    <image id="volstbi" name="zx_yuan_tx_waiquan.png" path="/imageNews/"/>
+    <image id="volstbj" name="zx_yuan_tx_hengguang.png" path="/imageNews/"/>
+    <image id="volstbk" name="zx_yuan_tx_diandian.png" path="/imageNews/"/>
+    <image id="volstbl" name="zx_wp_mingcheng_bg.png" path="/imageNews/"/>
+    <image id="volstbm" name="zx_wp_lan_diguang.png" path="/imageNews/"/>
+    <image id="volstbn" name="zx_wp_lan_bg.png" path="/imageNews/"/>
+    <image id="volstbo" name="zx_wp_jin_xian.png" path="/imageNews/"/>
+    <image id="volstbp" name="zx_yuan_tx_neiquan.png" path="/imageNews/"/>
+    <image id="volstbq" name="zx_wp_jin_jiaobiao.png" path="/imageNews/"/>
+    <image id="volstbr" name="zx_wp_jin_diguang.png" path="/imageNews/"/>
+    <image id="volstbs" name="zx_wp_jin_bg.png" path="/imageNews/"/>
+    <image id="volstbt" name="zx_wp_fen_xian.png" path="/imageNews/"/>
+    <image id="volstbu" name="zx_wp_fen_guangxiao.png" path="/imageNews/"/>
+    <image id="volstbv" name="zx_wp_fen_diguang.png" path="/imageNews/"/>
+    <image id="volstbw" name="zx_wp_fen_bg.png" path="/imageNews/"/>
+    <image id="volstbx" name="zx_wp_jin_guangxiao.png" path="/imageNews/"/>
+    <image id="volstby" name="zx_yuan_tx_star.png" path="/imageNews/"/>
+    <image id="volstbz" name="zx_tc_title_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstc0" name="wp_bg_shuliang.png" path="/imageNews/"/>
+    <image id="volstc3" name="zx_tc_bg.png" path="/imageNews/"/>
+    <image id="volstc4" name="zx_tc_piaodai_shang.png" path="/imageNews/"/>
+    <image id="volstc5" name="zx_tc_piaodai_xia.png" path="/imageNews/"/>
+    <image id="volstc6" name="zx_tc_tab_bg.png" path="/imageNews/" scale="9grid" scale9grid="21,0,111,74"/>
+    <image id="volstc7" name="zx_tc_tab_biankuang.png" path="/imageNews/"/>
+    <image id="volstc8" name="zx_tc_tab_xuanzhong.png" path="/imageNews/"/>
+    <image id="volstc9" name="zx_tc_taozhuang_zhuagnshi.png" path="/imageNews/"/>
+    <image id="volstca" name="zx_zhuangshi_xinggui.png" path="/imageNews/"/>
+    <image id="volstcb" name="zx_tx_hengxiang.png" path="/imageNews/"/>
+    <image id="volstcc" name="zx_tx_jiguang.png" path="/imageNews/"/>
+    <image id="volstcd" name="zx_tx_qianjing.png" path="/imageNews/"/>
+    <image id="volstce" name="zx_tx_star.png" path="/imageNews/"/>
+    <image id="volstcf" name="zx_tx_yuanquan.png" path="/imageNews/"/>
+    <image id="volstcg" name="zx_tx_zhongjian.png" path="/imageNews/"/>
+    <image id="volstch" name="zx_wp_baseboard.png" path="/imageNews/"/>
+    <image id="volstci" name="zx_zhuangshi_diaoshi.png" path="/imageNews/"/>
+    <component id="ga165c" name="ButtonTab1.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs

@@ -79,7 +79,7 @@ namespace GFGGame
             Dictionary<int, LuckyBoxBonusData> dic = new Dictionary<int, LuckyBoxBonusData>();
             AddToBonusDataDic(dropId, dic);
             List<LuckyBoxBonusData> list = new List<LuckyBoxBonusData>();
-            foreach(var t in dic)
+            foreach (var t in dic)
             {
                 list.Add(t.Value);
             }
@@ -106,11 +106,11 @@ namespace GFGGame
                     if (cfg.group <= 0)
                     {
                         ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.item);
-                        if (itemCfg == null || itemCfg.suitId <= 0)
+                        if (itemCfg == null || itemCfg.suitId <= 0 && itemCfg.showSuitId <= 0)
                         {
                             continue;
                         }
-                        group = itemCfg.suitId;
+                        group = itemCfg.suitId == 0 ? itemCfg.showSuitId : itemCfg.suitId;
                     }
                     LuckyBoxBonusData luckyBoxBonusData = GetBonusData(group, dic);
                     if (luckyBoxBonusData == null)
@@ -125,7 +125,7 @@ namespace GFGGame
         private LuckyBoxBonusData GetBonusData(int group, Dictionary<int, LuckyBoxBonusData> dic)
         {
             dic.TryGetValue(group, out LuckyBoxBonusData luckyBoxBonusData);
-            if(luckyBoxBonusData != null)
+            if (luckyBoxBonusData != null)
             {
                 return luckyBoxBonusData;
             }
@@ -153,11 +153,11 @@ namespace GFGGame
 
         public int CompareBonusData(LuckyBoxBonusData a, LuckyBoxBonusData b)
         {
-            if(b.order < a.order)
+            if (b.order < a.order)
             {
                 return 1;
             }
-            if(b.order > a.order)
+            if (b.order > a.order)
             {
                 return -1;
             }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs

@@ -14,7 +14,7 @@ namespace UI.CommonGame
         public GImage m_imgNotHas;
         public GImage m_imgShowTong;
         public GGroup m_grpGot;
-        public const string URL = "ui://eg2y0ldpvolstnd";
+        public const string URL = "ui://eg2y0ldpvolstnj";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComIcon003";
         private static UI_ComIcon003 _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem003.cs

@@ -0,0 +1,78 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComItem003
+    {
+        public GComponent target;
+        public UI_ComIcon003 m_comItemIcon;
+        public GTextField m_txtName;
+        public GTextField m_txtCount;
+        public const string URL = "ui://eg2y0ldpvolstnk";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComItem003";
+        private static UI_ComItem003 _proxy;
+
+        public static UI_ComItem003 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComItem003();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComItem003 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComItem003();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comItemIcon = (UI_ComIcon003)UI_ComIcon003.Create(comp.GetChild("comItemIcon"));
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comItemIcon.Dispose();
+            m_comItemIcon = null;
+            m_txtName = null;
+            m_txtCount = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem003.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4a41fe5724576014fa844fef55020b00
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ButtonTab1
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://drx9d1usga165c";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ButtonTab1";
+        private static UI_ButtonTab1 _proxy;
+
+        public static UI_ButtonTab1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonTab1();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonTab1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonTab1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 85968a23564a5d7478d64f3d02f08b9c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox.cs

@@ -9,10 +9,7 @@ namespace UI.LuckyBox
         public GComponent target;
         public UI_ComModel m_comModel;
         public UI_Button3 m_btnPreview;
-        public UI_Button3 m_btnExchange;
         public GTextField m_txtOwned;
-        public GGraph m_holder;
-        public GGraph m_holder1;
         public GTextField m_txtTime;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
@@ -69,10 +66,7 @@ namespace UI.LuckyBox
         {
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
-            m_btnExchange = (UI_Button3)UI_Button3.Create(comp.GetChild("btnExchange"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
@@ -87,11 +81,7 @@ namespace UI.LuckyBox
             m_comModel = null;
             m_btnPreview.Dispose();
             m_btnPreview = null;
-            m_btnExchange.Dispose();
-            m_btnExchange = null;
             m_txtOwned = null;
-            m_holder = null;
-            m_holder1 = null;
             m_txtTime = null;
             m_comCostOne.Dispose();
             m_comCostOne = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxPreShowUI.cs

@@ -8,10 +8,8 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_c1;
-        public GComponent m_bg;
-        public GTextField m_txtTitle;
-        public GButton m_btnItem;
-        public GButton m_btnProb;
+        public UI_ButtonTab1 m_btnItem;
+        public UI_ButtonTab1 m_btnProb;
         public GList m_list;
         public UI_Component1 m_compText;
         public const string URL = "ui://drx9d1usga16e";
@@ -62,19 +60,17 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_bg = (GComponent)comp.GetChild("bg");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
-            m_btnItem = (GButton)comp.GetChild("btnItem");
-            m_btnProb = (GButton)comp.GetChild("btnProb");
+            m_btnItem = (UI_ButtonTab1)UI_ButtonTab1.Create(comp.GetChild("btnItem"));
+            m_btnProb = (UI_ButtonTab1)UI_ButtonTab1.Create(comp.GetChild("btnProb"));
             m_list = (GList)comp.GetChild("list");
             m_compText = (UI_Component1)UI_Component1.Create(comp.GetChild("compText"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_bg = null;
-            m_txtTitle = null;
+            m_btnItem.Dispose();
             m_btnItem = null;
+            m_btnProb.Dispose();
             m_btnProb = null;
             m_list = null;
             m_compText.Dispose();

GameClient/Assets/Game/HotUpdate/ServerProxy/LuckyBoxSProxy.cs

@@ -15,7 +15,7 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLuckyBoxId);
-                    if (activityOpenCfg.paramsArr[0] == luckyBoxId)
+                    if (activityOpenCfg != null && activityOpenCfg.paramsArr[0] == luckyBoxId)
                     {
                         ActivityDataManager.Instance.allPlayTimes += response.Times;
                     }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxPreShowView.cs

@@ -46,6 +46,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
             _ui.m_list.RemoveChildrenToPool();
         }
 
@@ -54,24 +55,27 @@ namespace GFGGame
             UI_CompLuckyBoxBonusListItem listItem = UI_CompLuckyBoxBonusListItem.Proxy(item);
             LuckyBoxBonusData luckyBoxBonusData = _bonusList[index];
             listItem.m_txtName.text = luckyBoxBonusData.name;
-            listItem.m_list.itemRenderer = (int index, GObject item) =>
+            if (listItem.m_list.data == null)
             {
-                ItemData itemData = luckyBoxBonusData.itemList[index] as ItemData;
-
-                if (item.data == null)
-                {
-                    item.data = new ItemView(item as GComponent);
-                }
-                (item.data as ItemView).SetData(itemData);
-                (item.data as ItemView).ShowHasCount = false;
-                (item.data as ItemView).ImgHasVisible = ItemDataManager.GetItemNum(itemData.id) > 0;
-
-            };
-
+                listItem.m_list.itemRenderer = ListItemRewardRender;
+            }
+            listItem.m_list.data = luckyBoxBonusData.itemList;
             listItem.m_list.numItems = luckyBoxBonusData.itemList.Count;
             listItem.m_list.ResizeToFit();
             listItem.target.height = listItem.m_list.y + listItem.m_list.height;
             UI_CompLuckyBoxBonusListItem.ProxyEnd();
         }
+        private void ListItemRewardRender(int index, GObject obj)
+        {
+            ItemData itemData = (obj.parent.data as List<ItemData>)[index];
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+                (obj.data as ItemView).SetData(itemData);
+            (obj.data as ItemView).ShowHasCount = false;
+            (obj.data as ItemView).ImgHasVisible = ItemDataManager.GetItemNum(itemData.id) > 0;
+
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeAddUpView.cs

@@ -68,13 +68,14 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, RefreshList);
         }
         protected override void OnShown()
         {
             base.OnShown();
             _valueBarController.OnShown();
 
-            _ui.m_list.numItems = VipCfgArray.Instance.dataArray.Length - 1;
+            RefreshList();
             _curSelectIndex = Math.Max(0, RoleDataManager.vipLv - 1);
             _ui.m_list.selectedIndex = _curSelectIndex;
             _ui.m_list.ScrollToView(_curSelectIndex);
@@ -89,11 +90,12 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, RefreshList);
         }
 
         private void RefreshList()
         {
-
+            _ui.m_list.numItems = VipCfgArray.Instance.dataArray.Length - 1;
         }
         private void ListItemRenderer(int index, GObject obj)
         {