每日补给

FGUIProject/assets/CommonGame/components/BtnStyle000.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="204,63" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="o9gh4k" fileName="imagesExport/lm_an__xuanzhong_qifu.png" xy="0,0">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n2_qik1" name="n2" src="o9gh4l" fileName="imagesNew/lm_an__weixuan_qifu.png" xy="0,0" size="204,63">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="204,63" fontSize="34" color="#685539" align="center" vAlign="middle" autoSize="none" singleLine="true" text="领取">
+      <gearColor controller="c1" pages="1" values="#685539,#000000" default="#744d16,#000000"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="119,46">
+<component size="114,46">
   <controller name="c1" exported="true" pages="0,,1," selected="1">
     <remark page="0" value="免费"/>
     <remark page="1" value="付费"/>
   </controller>
-  <controller name="style" exported="true" pages="0,,1," selected="1">
+  <controller name="style" exported="true" pages="0,,1,,2," selected="2">
     <remark page="0" value="默认"/>
   </controller>
   <displayList>
     <loader id="n1_ojlz" name="loaIcon" xy="0,3" size="40,40" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n6_j5a5" name="txtNeed" xy="50,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#8c8580" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999">
-      <gearColor controller="style" pages="1" values="#8c8580,#000000" default="#716b59,#000000"/>
+    <text id="n6_j5a5" name="txtNeed" xy="45,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fff6ed" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999">
+      <gearColor controller="style" pages="1,2" values="#8c8580,#000000|#fff6ed,#000000" default="#716b59,#000000"/>
     </text>
-    <group id="n7_si5z" name="n7" xy="0,0" size="119,46" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
+    <group id="n7_si5z" name="n7" xy="0,0" size="114,46" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n11_a0cf" name="n11" xy="23,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
+    <text id="n11_a0cf" name="n11" xy="20,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </text>

FGUIProject/assets/CommonGame/package.xml

@@ -291,7 +291,7 @@
     <image id="a0cf2h" name="lm_tb.png" path="/imagesNew/" exported="true"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4o" name="lm_an_jujue.png" path="/imagesNew/" exported="true"/>
-    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="47,14,94,28"/>
     <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
     <image id="a0cf2o" name="lm_an_yellow.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="54,15,108,30"/>
     <image id="o9gh4g" name="lm_kuang_icon.png" path="/imagesNew/" exported="true"/>
@@ -305,6 +305,7 @@
     <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/"/>
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
+    <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/DailySupplyUI.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1865">
+<component size="1080,837" opaque="false">
   <displayList>
-    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,0"/>
-    <component id="n10_qik1" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="244,686" group="n12_qik1"/>
-    <component id="n11_qik1" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="556,687" group="n12_qik1"/>
-    <group id="n12_qik1" name="n12" xy="244,686" size="534,354" advanced="true"/>
+    <component id="n10_qik1" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="207,69"/>
+    <component id="n11_qik1" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="577,100" controller="c1,1"/>
+    <image id="n0_qik1" name="n0" src="qik1w" fileName="images/mrbj_shu.png" xy="0,194"/>
+    <image id="n13_qik1" name="n13" src="qik111" fileName="images/wz_mrbj.png" xy="36,168"/>
+    <image id="n14_qik1" name="n14" src="qik1v" fileName="images/wz_mrbj_ms.png" xy="955,161"/>
+    <image id="n15_qik1" name="n15" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="271,806" pivot="0.5,0.5" group="n18_qik1"/>
+    <text id="n16_qik1" name="txtGiftBag" xy="420,792" pivot="0.5,0" size="239,46" group="n18_qik1" fontSize="34" color="#d4d0c9" align="center" vars="true" text="点击空白处关闭"/>
+    <image id="n17_qik1" name="n17" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="678,806" pivot="0.5,0.5" group="n18_qik1" scale="-1,1"/>
+    <group id="n18_qik1" name="n18" xy="271,792" size="537,46" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -10,8 +10,7 @@
     <component id="n1_fqor" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n3_fqor">
       <Button icon="ui://t8nwuj7ifqor1"/>
     </component>
-    <image id="n2_fqor" name="n2" src="fqor2" fileName="imagesTest/wpbb_xtxt.png" xy="54,312" group="n3_fqor"/>
-    <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,229"/>
+    <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,191"/>
     <component id="n4_fqor" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,408">
       <Button title="每日签到"/>
     </component>

FGUIProject/assets/DailyWelfare/components/ComSupply.xml

@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="222,422">
+<component size="378,643" opaque="false">
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
   <displayList>
-    <text id="n25_fqor" name="txtTime" xy="91,5" pivot="0.5,0" size="40,42" fontSize="30" align="center" text=""/>
-    <component id="n22_fqor" name="comItem" src="j48o98" fileName="components/ComItem.xml" pkg="eg2y0ldp" xy="0,65" size="222,225"/>
-    <component id="n23_fqor" name="btnGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="17,295">
+    <image id="n29_qik1" name="n29" src="qik1z" fileName="images/mrbj_tb1.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n30_qik1" name="n30" src="qik110" fileName="images/mrbj_wz2.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n28_qik1" name="n28" src="qik1x" fileName="images/mrbj_sj_db.png" xy="75,17" group="n27_qik1"/>
+    <image id="n31_qik1" name="n31" src="qik1y" fileName="images/mrbj_sz_db.png" xy="204,287" group="n27_qik1"/>
+    <text id="n25_fqor" name="txtTime" xy="102,13" pivot="0.5,0" size="174,46" group="n27_qik1" fontSize="34" color="#fff9f8" align="center" text="11:00-17:00"/>
+    <component id="n23_fqor" name="btnGet" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="87,395" group="n27_qik1">
       <Button title="补领"/>
     </component>
-    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="46,372" pivot="0.5,0" controller="c1,1"/>
+    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="144,469" pivot="0.4,0" group="n27_qik1" controller="c1,1,style,2"/>
+    <text id="n32_qik1" name="txtCount" xy="272,281" pivot="0.5,0" size="37,46" group="n27_qik1" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fffdf3" text="99"/>
+    <text id="n34_qik1" name="n34" xy="250,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="-20" fontSize="29" color="#fffdf3" text="\"/>
+    <text id="n33_qik1" name="n33" xy="251,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="20" fontSize="29" color="#fffdf3" text="/"/>
+    <group id="n35_qik1" name="n35" xy="250,284" size="18,40" group="n27_qik1"/>
+    <group id="n27_qik1" name="n27" xy="-8,13" size="378,612"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/package.xml

@@ -2,16 +2,10 @@
 <packageDescription id="t8nwuj7i">
   <resources>
     <component id="fqor0" name="DailyWelfareUI.xml" path="/" exported="true"/>
-    <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"/>
     <image id="qik1d" name="mrqd_sz_db.png" path="/images/"/>
     <image id="qik1e" name="mrqd_zz.png" path="/images/"/>
     <image id="qik1f" name="mrrw_jl_db.png" path="/images/"/>
@@ -29,6 +23,14 @@
     <image id="qik1s" name="wz_jksb.png" path="/images/"/>
     <component id="qik1t" name="DailySupplyUI.xml" path="/" exported="true"/>
     <component id="qik1u" name="Button1.xml" path="/components/"/>
+    <image id="qik1v" name="wz_mrbj_ms.png" path="/images/"/>
+    <image id="qik1w" name="mrbj_shu.png" path="/images/"/>
+    <image id="qik1x" name="mrbj_sj_db.png" path="/images/"/>
+    <image id="qik1y" name="mrbj_sz_db.png" path="/images/"/>
+    <image id="qik1z" name="mrbj_tb1.png" path="/images/"/>
+    <image id="qik110" name="mrbj_wz2.png" path="/images/"/>
+    <image id="qik111" name="wz_mrbj.png" path="/images/"/>
+    <image id="qik112" name="ornamental_title.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupply.cs

@@ -7,10 +7,11 @@ namespace UI.DailyWelfare
     public partial class UI_ComSupply
     {
         public GComponent target;
+        public Controller m_c1;
         public GTextField m_txtTime;
-        public GComponent m_comItem;
         public GButton m_btnGet;
         public GComponent m_comCost;
+        public GTextField m_txtCount;
         public const string URL = "ui://t8nwuj7ifqora";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ComSupply";
@@ -58,17 +59,19 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_comItem = (GComponent)comp.GetChild("comItem");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_comCost = (GComponent)comp.GetChild("comCost");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_txtTime = null;
-            m_comItem = null;
             m_btnGet = null;
             m_comCost = null;
+            m_txtCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySupplyUI.cs

@@ -9,6 +9,7 @@ namespace UI.DailyWelfare
         public GComponent target;
         public UI_ComSupply m_comSupply0;
         public UI_ComSupply m_comSupply1;
+        public GTextField m_txtGiftBag;
         public const string URL = "ui://t8nwuj7iqik1t";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "DailySupplyUI";
@@ -58,6 +59,7 @@ namespace UI.DailyWelfare
         {
             m_comSupply0 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply0"));
             m_comSupply1 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply1"));
+            m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -65,6 +67,7 @@ namespace UI.DailyWelfare
             m_comSupply0 = null;
             m_comSupply1.Dispose();
             m_comSupply1 = null;
+            m_txtGiftBag = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySupplyView.cs

@@ -124,13 +124,14 @@ namespace GFGGame
             long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.openTime).ToString("HH:mm:ss"));
             long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
             item.m_txtTime.text = TimeUtil.FormattingTime6(openTime) + "-" + TimeUtil.FormattingTime6(endTime);
-            if (item.m_comItem.data == null)
-            {
-                item.m_comItem.data = new ItemView(item.m_comItem);
-            }
-            ItemData itemData = ItemUtil.createItemData(supplyCfg.bonusArr[0]);
-            (item.m_comItem.data as ItemView).SetData(itemData);
-            (item.m_comItem.data as ItemView).ShowTips = false;
+            item.m_txtCount.text = supplyCfg.bonusArr[0][1].ToString();
+            // if (item.m_comItem.data == null)
+            // {
+            //     item.m_comItem.data = new ItemView(item.m_comItem);
+            // }
+            // ItemData itemData = ItemUtil.createItemData(supplyCfg.bonusArr[0]);
+            // (item.m_comItem.data as ItemView).SetData(itemData);
+            // (item.m_comItem.data as ItemView).ShowTips = false;
             ItemUtil.UpdateItemNeedNum(item.m_comCost, GlobalCfgArray.globalCfg.dailySupplyConsumeArr[0]);
             item.m_comCost.visible = false;
 

GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_1.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 62e559896712d774a89e04cfc5b9bb8c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: