zhaoyang 2 жил өмнө
parent
commit
9796016cf1

+ 10 - 4
FGUIProject/assets/DailyWelfare/components/ListSignItem.xml

@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="178,143">
+  <controller name="c1" pages="0,,1,,2," selected="0">
+    <remark page="1" value="金卡"/>
+    <remark page="2" value="黑金"/>
+  </controller>
   <displayList>
-    <loader id="n15_fqor" name="loaDoubleTag" xy="49,0" size="50,50"/>
+    <loader id="n15_fqor" name="loaDoubleTag" xy="35,7" size="117,28" autoSize="true">
+      <gearIcon controller="c1" pages="0,2" values="|ui://t8nwuj7ifqorb" default="ui://t8nwuj7ifqorc"/>
+    </loader>
     <loader id="n14_fqor" name="loaIcon" xy="24,51" pivot="0.5,0.5" size="92,92" aspect="true" fill="scale"/>
-    <text id="n16_fqor" name="txtDay" xy="121,52" size="40,42" fontSize="30" text=""/>
     <text id="n17_fqor" name="txtCount" xy="121,99" size="40,42" fontSize="30" text=""/>
-    <image id="n18_fqor" name="n18" src="fka77" fileName="imagesExport/cj_yihde.png" pkg="eg2y0ldp" xy="19,82"/>
-    <image id="n19_fqor" name="n19" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="0,78"/>
+    <text id="n16_fqor" name="txtDay" xy="121,52" size="40,42" fontSize="30" text=""/>
+    <image id="n18_fqor" name="imgGot" src="fka77" fileName="imagesExport/cj_yihde.png" pkg="eg2y0ldp" xy="19,82"/>
+    <image id="n19_fqor" name="imgNotGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="0,78"/>
   </displayList>
 </component>

BIN
FGUIProject/assets/DailyWelfare/imagesTest/lm_bq_dcm.png


BIN
FGUIProject/assets/DailyWelfare/imagesTest/lm_bq_xcm.png


+ 0 - 0
FGUIProject/assets/DailyWelfare/images/pro_activate.png → FGUIProject/assets/DailyWelfare/imagesTest/pro_activate.png


+ 0 - 0
FGUIProject/assets/DailyWelfare/images/pro_bk_in.png → FGUIProject/assets/DailyWelfare/imagesTest/pro_bk_in.png


+ 0 - 0
FGUIProject/assets/DailyWelfare/images/wpbb_xtxt.png → FGUIProject/assets/DailyWelfare/imagesTest/wpbb_xtxt.png


+ 0 - 0
FGUIProject/assets/DailyWelfare/images/wpbb_zi.png → FGUIProject/assets/DailyWelfare/imagesTest/wpbb_zi.png


+ 6 - 4
FGUIProject/assets/DailyWelfare/package.xml

@@ -2,14 +2,16 @@
 <packageDescription id="t8nwuj7i">
   <resources>
     <component id="fqor0" name="DailyWelfareUI.xml" path="/" exported="true"/>
-    <image id="fqor1" name="wpbb_zi.png" path="/images/"/>
-    <image id="fqor2" name="wpbb_xtxt.png" path="/images/"/>
-    <image id="fqor5" name="pro_activate.png" path="/images/"/>
-    <image id="fqor6" name="pro_bk_in.png" path="/images/"/>
+    <image id="fqor1" name="wpbb_zi.png" path="/imagesTest/"/>
+    <image id="fqor2" name="wpbb_xtxt.png" path="/imagesTest/"/>
+    <image id="fqor5" name="pro_activate.png" path="/imagesTest/"/>
+    <image id="fqor6" name="pro_bk_in.png" path="/imagesTest/"/>
     <component id="fqor7" name="ProgressBar1.xml" path="/components/"/>
     <component id="fqor8" name="ComProBonus.xml" path="/components/" exported="true"/>
     <component id="fqor9" name="ListSignItem.xml" path="/components/"/>
     <component id="fqora" name="ComSupply.xml" path="/components/"/>
+    <image id="fqorb" name="lm_bq_dcm.png" path="/imagesTest/" exported="true"/>
+    <image id="fqorc" name="lm_bq_xcm.png" path="/imagesTest/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

+ 16 - 6
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -55,8 +55,6 @@ namespace GFGGame
             _valueBarController.OnShown();
             _month = DateTime.Now.Month;
             _day = DateTime.Now.Day;
-            UpdateList();
-            UpdateReward();
             _ui.m_list.ScrollToView(0);
 
         }
@@ -82,23 +80,35 @@ namespace GFGGame
                 comProBonus.x = (signCfgs[i].day / (float)_ui.m_proSign.target.max) * _ui.m_proSign.target.width;
                 UI_ComProBonus item = UI_ComProBonus.Proxy(comProBonus);
                 item.m_loaIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(signCfgs[i].bonusArr[0][0]));
-                // item
+                item.m_txtCount.text = signCfgs[i].bonusArr[0][1].ToString();
+                item.m_txtDay.text = signCfgs[i].day.ToString();
                 UI_ComProBonus.ProxyEnd();
             }
+            _ui.m_list.numItems = DailySignCfgArray.Instance.GetCfgsBymonth(_month).Count;
         }
         private void UpdateSupplyView()
         {
 
         }
-        private void UpdateList()
-        {
-        }
         private void UpdateReward()
         {
 
         }
         private void ListItemRender(int index, GObject obj)
         {
+            DailySignBonusCfg bonusCfg = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month)[index];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(bonusCfg.bonusArr[0][0]);
+
+            UI_ListSignItem item = UI_ListSignItem.Proxy(obj);
+
+            item.m_c1.selectedIndex = itemCfg.itemType == ConstItemType.ITEM ? 0 : bonusCfg.type;
+            item.m_txtDay.text = bonusCfg.day.ToString();
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_txtCount.text = bonusCfg.bonusArr[0][1].ToString();
+            item.m_imgGot.visible = DailyWelfareManager.Instance.DailySignDatas.IndexOf(bonusCfg.day) >= 0;
+            // item.m_imgNotGet.visible = DailyWelfareManager.Instance.DailySignDatas.IndexOf(bonusCfg.day) >= 0;
+
+            UI_ListSignItem.ProxyEnd();
         }
         private void ListBonusItemRender(int index, GObject obj)
         {

BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0.png


BIN
GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_fui.bytes