抽检预览替换资源

FGUIProject/assets/CommonGame/components/ButtonTab1.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="220,76" extention="Button">
+<component size="292,84" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ga16" name="n0" src="ga165a" fileName="imagesExport/hz_ssuo.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"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n2_ga16" name="title" xy="0,0" size="220,76" fontSize="36" color="#f3f3fc" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <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>

FGUIProject/assets/CommonGame/components/ComItem.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="192,280" overflow="hidden">
+<component size="221,280" overflow="hidden">
   <displayList>
-    <image id="n11_ehs9" name="n11" src="j48o99" fileName="images/kp_sjsj_di_3.png" xy="0,0"/>
-    <loader id="n12_ehs9" name="loaIcon" xy="96,96" pivot="0.5,0.5" anchor="true" size="150,150" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale"/>
-    <text id="n14_ehs9" name="txtName" xy="95,194" pivot="0.5,0" anchor="true" size="105,46" fontSize="34" color="#9b7f61" text="赵钱孙"/>
-    <image id="n16_j8b3" name="imgGot" src="j48o9b" fileName="images/yx_yilq.png" xy="7,80"/>
-    <text id="n17_j48o" name="txtHasCount" xy="96,243" pivot="0.5,0" anchor="true" size="105,36" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
-    <loader id="n18_j48o" name="loaRarity" xy="148,0" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <loader id="n19_tc53" name="loaShouTongReward" xy="16,81" size="160,40" url="ui://eg2y0ldptc539z" autoSize="true"/>
-    <image id="n13_ehs9" name="n13" src="j48o9a" fileName="images/kp_sjsj_di_4.png" xy="16,162" group="n20_ox5b"/>
-    <text id="n15_ehs9" name="txtCount" xy="95,159" pivot="0.5,0" anchor="true" size="32,34" group="n20_ox5b" fontSize="24" color="#fff8ea" vars="true" text="x{count=0}"/>
-    <group id="n20_ox5b" name="grpCount" xy="16,159" size="160,34" advanced="true"/>
+    <image id="n11_ehs9" name="n11" src="j48o99" fileName="images/kp_sjsj_di_3.png" xy="16,0" group="n21_qr4e"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="112,96" pivot="0.5,0.5" anchor="true" size="150,150" 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="赵钱孙李·巴拉"/>
+    <image id="n16_j8b3" name="imgGot" src="j48o9b" fileName="images/yx_yilq.png" xy="23,80" 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}"/>
+    <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"/>
+    <image id="n13_ehs9" name="n13" src="j48o9a" fileName="images/kp_sjsj_di_4.png" xy="32,162" group="n20_ox5b"/>
+    <text id="n15_ehs9" name="txtCount" xy="111,159" pivot="0.5,0" anchor="true" size="32,34" group="n20_ox5b" fontSize="24" color="#fff8ea" vars="true" text="x{count=0}"/>
+    <group id="n20_ox5b" name="grpCount" xy="32,159" size="160,34" group="n21_qr4e" advanced="true"/>
+    <group id="n21_qr4e" name="n21" xy="-3,0" size="228,279"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -195,6 +195,7 @@
     <image id="kzteths" name="gxhd_scjlscjl.png" path="/images/"/>
     <component id="hspqf4" name="ComRedDot.xml" path="/components/" exported="true"/>
     <image id="kjq37" name="gg_gg_hdhdgth.png" path="/imagesExport/" exported="true"/>
+    <image id="qr4etht" name="wpzs_anniu_2.png" path="/imagesExport/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/LuckyBoxPreShowUI.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="912,987">
+<component size="936,1215">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n0_ga16" name="bg" xy="0,0" size="912,987" url="ui://mk0fwx0xq08x4" fill="scaleFree"/>
-    <image id="n1_ga16" name="n1" src="ga16f" fileName="imagesExport/zx_jq_djdikbti.png" pkg="eg2y0ldp" xy="9,8"/>
-    <text id="n2_ga16" name="txtTitle" xy="93,22" size="726,56" fontSize="42" color="#ffffff" align="center" autoSize="none" text="物品展示"/>
-    <image id="n3_ga16" name="n3" src="ga165b" fileName="imagesExport/hz_ssuodikuang.png" pkg="eg2y0ldp" xy="236,115"/>
-    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="236,114">
+    <loader id="n0_ga16" name="bg" xy="0,0" size="936,1215" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
+    <text id="n2_ga16" name="txtTitle" xy="105,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="44,145"/>
+    <image id="n3_ga16" name="n3" src="qr4e27" fileName="images/wpzs_anniu_1.png" xy="177,198"/>
+    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="176,199">
       <Button checked="true" title="物品预览" controller="c1" page="0"/>
     </component>
-    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="456,114">
+    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="469,198">
       <Button title="概率公示" controller="c1" page="1"/>
     </component>
-    <list id="n6_ga16" name="list" xy="71,231" size="770,689" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
+    <list id="n6_ga16" name="list" xy="83,334" size="770,790" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>
@@ -20,7 +20,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n8_ga16" name="compText" src="ga16j" fileName="components/Component1.xml" xy="53,250">
+    <component id="n8_ga16" name="compText" src="ga16j" fileName="components/Component1.xml" xy="57,334" size="822,790">
       <gearDisplay controller="c1" pages="1"/>
     </component>
   </displayList>

FGUIProject/assets/LuckyBox/components/CompLuckyBoxBonusListItem.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="761,355">
+<component size="770,355">
   <displayList>
-    <text id="n9_ga16" name="txtName" xy="8,-4" size="372,36" fontSize="26" color="#8b85e3" autoSize="none" text="示例"/>
-    <image id="n10_ga16" name="n10" src="s2cc55" fileName="imagesExport/zd_xztup_1.png" pkg="eg2y0ldp" xy="0,29" size="761,12"/>
-    <list id="n11_ga16" name="list" xy="2,55" size="757,300" layout="flow_hz" lineGap="31" colGap="52" defaultItem="ui://eg2y0ldpga165d" autoClearItems="true">
+    <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" lineGap="-20" colGap="50" lineItemCount="3" defaultItem="ui://eg2y0ldpj48o98" 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="34" color="#837ecf" letterSpacing="3" ubb="true" autoSize="none" autoClearText="true" text="示例\nhahakdfjla"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/package.xml

@@ -33,7 +33,6 @@
     <component id="vek811" name="ComListBgItem.xml" path="/components/"/>
     <component id="vek812" name="ComCost.xml" path="/components/"/>
     <image id="qdrt14" name="hd_dkdk_1.png" path="/images/"/>
-    <image id="qdrt15" name="hd_sxicon_1.png" path="/images/" exported="true"/>
     <image id="qdrt16" name="hd_sxicon_2.png" path="/images/" exported="true"/>
     <image id="qdrt17" name="hd_sxicon_3.png" path="/images/" exported="true"/>
     <image id="qdrt18" name="hd_sxicon_4.png" path="/images/" exported="true"/>
@@ -49,6 +48,9 @@
     <component id="xg6g1k" name="ComHolder.xml" path="/components/" exported="true"/>
     <movieclip id="jpnf1x" name="MovieClip1.jta" path="/effect/"/>
     <movieclip id="jpnf26" name="MovieClip2.jta" path="/effect/"/>
+    <image id="qr4e27" name="wpzs_anniu_1.png" path="/images/"/>
+    <image id="qr4e28" name="wpzs_bji.png" path="/images/"/>
+    <image id="qr4e29" name="wpzs_yhd.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -50,23 +50,33 @@ namespace GFGGame
             listItem.m_txtName.text = luckyBoxBonusData.name;
             listItem.m_list.itemRenderer = (int index, GObject item) =>
             {
-                UI_BonusItem1 goodsItem = UI_BonusItem1.Proxy(item);
+                // UI_ComItem goodsItem = UI_ComItem.Proxy(item);
                 ItemData itemData = luckyBoxBonusData.itemList[index] as ItemData;
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
-                goodsItem.m_iconOwned.visible = ItemDataManager.GetItemNum(itemData.id) > 0;
-                goodsItem.m_txtName.text = itemCfg.name;
-                goodsItem.m_iconItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
-                RarityIconController.UpdateRarityIcon(goodsItem.m_iconItem.m_rarity, itemData.id, true);
-                goodsItem.target.data = itemData.id;
+                // goodsItem.m_iconOwned.visible = ItemDataManager.GetItemNum(itemData.id) > 0;
+                // goodsItem.m_txtName.text = itemCfg.name;
+                // goodsItem.m_iconItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+                // RarityIconController.UpdateRarityIcon(goodsItem.m_iconItem.m_rarity, itemData.id, true);
+                // goodsItem.target.data = itemData.id;
+
+                // ItemData reward = ItemUtil.createItemData(_cfg.rewardsArr[index]);
+                if (item.data == null)
+                {
+                    item.data = new ItemView(item as GComponent);
+                }
+                (item.data as ItemView).SetData(itemData);
+                (item.data as ItemView).TxtHasCountVisble = false;
+
             };
-            listItem.m_list.onClickItem.Add((EventContext context) =>
-            {
-                GComponent item = context.data as GComponent;
-                int itemID = (int)item.data;
-                GoodsItemTipsController.ShowItemTips(itemID);
-            });
+            // listItem.m_list.onClickItem.Add((EventContext context) =>
+            // {
+            //     GComponent item = context.data as GComponent;
+            //     int itemID = (int)item.data;
+            //     GoodsItemTipsController.ShowItemTips(itemID);
+            // });
             listItem.m_list.numItems = luckyBoxBonusData.itemList.Count;
             listItem.m_list.ResizeToFit();
+            // listItem.m_list.columnGap = 50;
             listItem.target.height = listItem.m_list.y + listItem.m_list.height;
         }
     }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -345,6 +345,7 @@ namespace GFGGame
             _ui.m_btnZhaiXing.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
             _ui.m_btnCiPai.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             _ui.m_btnDailyLogin.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyLoginView).Name, false);
+            _ui.m_btnField.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
 
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
             _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);