每日登录

FGUIProject/assets/CommonGame/package.xml

@@ -119,7 +119,7 @@
     <image id="m9wm8s" name="gxhd_gd_dik.png" path="/images/"/>
     <image id="m9wm8t" name="gxhd_bjbj.png" path="/bgimg/" exported="true" atlas="alone_npot"/>
     <component id="m9wm8u" name="ListRewardItem.xml" path="/components/" exported="true"/>
-    <image id="m9wm8v" name="ts_canghaiym.png" path="/images/"/>
+    <image id="m9wm8v" name="ts_canghaiym.png" path="/imagesExport/" exported="true"/>
     <image id="m9wm8w" name="ts_jiyuet.png" path="/images/"/>
     <image id="ighs8x" name="hd_suanc.png" path="/imagesExport/" exported="true"/>
     <image id="9cth8y" name="tctc_xiant_1.png" path="/imagesExport/" exported="true"/>

FGUIProject/assets/DailyLogin/DailyLoginUI.xml

@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="522,412">
+<component size="1080,1596">
   <displayList>
-    <list id="n0_lh8v" name="list" xy="36,48" size="459,300" overflow="scroll" defaultItem="ui://5uawdql9jyml7"/>
-    <text id="n2_jyml" name="txtTitle" xy="133,0" size="256,49" fontSize="36" align="center" text="七天登录领套装"/>
+    <image id="n4_ox5b" name="n4" src="ox5b9" fileName="images/yzhd_ditu.png" xy="43,101"/>
+    <list id="n0_lh8v" name="list" xy="120,167" size="839,693" layout="flow_hz" overflow="scroll" lineGap="15" colGap="10" defaultItem="ui://5uawdql9jyml7">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <loader id="n5_ox5b" name="loaIcon" xy="288,868" size="553,492" url="ui://5uawdql9ox5bg" autoSize="true"/>
+    <image id="n3_ox5b" name="n3" src="ox5bi" fileName="images/yzhd_zszs.png" xy="0,0"/>
   </displayList>
 </component>

FGUIProject/assets/DailyLogin/components/ListItem.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="256,49">
+<component size="270,334">
   <displayList>
-    <text id="n1_jyml" name="txtTitle" xy="0,0" size="256,49" fontSize="36" align="center" text="七天登录领套装"/>
+    <loader id="n2_ox5b" name="loaBg" xy="0,0" size="270,334" url="ui://5uawdql9ox5ba" autoSize="true"/>
+    <loader id="n3_ox5b" name="loaIcon" xy="60,98" size="150,150" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scaleMatchHeight"/>
+    <text id="n5_ox5b" name="txtName" xy="99,281" pivot="0.5,0" size="71,46" fontSize="34" color="#91a08b" text="名字"/>
+    <image id="n4_ox5b" name="imgGot" src="ox5b8" fileName="images/yzhl_yqd.png" xy="0,0"/>
   </displayList>
 </component>

FGUIProject/assets/DailyLogin/package.xml

@@ -3,6 +3,17 @@
   <resources>
     <component id="lh8v6" name="DailyLoginUI.xml" path="/" exported="true"/>
     <component id="jyml7" name="ListItem.xml" path="/components/"/>
+    <image id="ox5b8" name="yzhl_yqd.png" path="/images/"/>
+    <image id="ox5b9" name="yzhd_ditu.png" path="/images/"/>
+    <image id="ox5ba" name="yzhd_dyt_1.png" path="/images/" exported="true"/>
+    <image id="ox5bb" name="yzhd_dyt_2.png" path="/images/" exported="true"/>
+    <image id="ox5bc" name="yzhd_dyt_3.png" path="/images/" exported="true"/>
+    <image id="ox5bd" name="yzhd_dyt_4.png" path="/images/" exported="true"/>
+    <image id="ox5be" name="yzhd_dyt_5.png" path="/images/" exported="true"/>
+    <image id="ox5bf" name="yzhd_dyt_6.png" path="/images/" exported="true"/>
+    <image id="ox5bg" name="yzhd_dyt_7.png" path="/images/" exported="true"/>
+    <image id="ox5bh" name="yzhd_xt.png" path="/images/"/>
+    <image id="ox5bi" name="yzhd_zszs.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyLogin" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -22,7 +22,7 @@ namespace GFGGame
         /// 七日登录 当前奖励状态
         /// </summary>
         /// <value></value>
-        public int bonusStatus
+        public int dailyLoginBonusStatus
         {
             get { return _bonusStatus; }
             set { _bonusStatus = value; }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_DailyLoginUI.cs

@@ -8,7 +8,7 @@ namespace UI.DailyLogin
     {
         public GComponent target;
         public GList m_list;
-        public GTextField m_txtTitle;
+        public GLoader m_loaIcon;
         public const string URL = "ui://5uawdql9lh8v6";
         public const string PACKAGE_NAME = "DailyLogin";
         public const string RES_NAME = "DailyLoginUI";
@@ -57,12 +57,12 @@ namespace UI.DailyLogin
         private void Init(GComponent comp)
         {
             m_list = (GList)comp.GetChild("list");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_list = null;
-            m_txtTitle = null;
+            m_loaIcon = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_ListItem.cs

@@ -7,7 +7,10 @@ namespace UI.DailyLogin
     public partial class UI_ListItem
     {
         public GComponent target;
-        public GTextField m_txtTitle;
+        public GLoader m_loaBg;
+        public GLoader m_loaIcon;
+        public GTextField m_txtName;
+        public GImage m_imgGot;
         public const string URL = "ui://5uawdql9jyml7";
         public const string PACKAGE_NAME = "DailyLogin";
         public const string RES_NAME = "ListItem";
@@ -55,11 +58,17 @@ namespace UI.DailyLogin
 
         private void Init(GComponent comp)
         {
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtTitle = null;
+            m_loaBg = null;
+            m_loaIcon = null;
+            m_txtName = null;
+            m_imgGot = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -17,7 +17,7 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     ActivityDataManager.Instance.dailyLoginId = response.CuurentBonusId;
-                    ActivityDataManager.Instance.bonusStatus = response.BonusStatus;
+                    ActivityDataManager.Instance.dailyLoginBonusStatus = response.BonusStatus;
                     return true;
                 }
             }
@@ -31,7 +31,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ActivityDataManager.Instance.bonusStatus = response.BonusStatus;
+                    ActivityDataManager.Instance.dailyLoginBonusStatus = response.BonusStatus;
                     int[][] rewards = DailyLoginCfgArray.Instance.GetCfg(response.BonusId).rewardsArr;
 
                     BonusController.TryShowBonusList(rewards);

GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs

@@ -9,7 +9,7 @@ namespace GFGGame
     public class DailyLoginView : BaseWindow
     {
         private UI_DailyLoginUI _ui;
-        private List<FieldTaskCfg> _cfgs;
+        private DailyLoginCfg[] _cfgs;
 
         public override void Dispose()
         {
@@ -28,14 +28,16 @@ namespace GFGGame
 
             _ui.m_list.itemRenderer = ListItemRender;
             _ui.m_list.onClickItem.Add(OnListItemClick);
+            _ui.m_loaIcon.onClick.Add(OnListItemClick);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            _cfgs = FieldDataManager.Instance.GetTaskCfgs();
-            _ui.m_list.numItems = _cfgs.Count;
-
+            _cfgs = DailyLoginCfgArray.Instance.dataArray;
+            _ui.m_list.numItems = _cfgs.Length;
+            _ui.m_loaIcon.url = "ui://DailyLogin/yzhd_dyt_7";
+            _ui.m_loaIcon.data = _cfgs[_cfgs.Length - 1];
         }
 
         protected override void OnHide()
@@ -44,18 +46,35 @@ namespace GFGGame
         }
         private void ListItemRender(int index, GObject obj)
         {
-            // UI_ListItem item = UI_ListItem.Proxy(obj);
-
-
-            // UI_ListItem.ClearProxy();
+            DailyLoginCfg cfg = _cfgs[index];
+            UI_ListItem item = UI_ListItem.Proxy(obj);
+            item.m_loaBg.url = string.Format("ui://DailyLogin/yzhd_dyt_{0}", cfg.id);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.rewardsArr[0][0]);
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_txtName.text = itemCfg.name;
+            item.m_imgGot.visible = cfg.id < ActivityDataManager.Instance.dailyLoginId;
+            if (cfg.id == ActivityDataManager.Instance.dailyLoginId)
+            {
+                RedDotController.Instance.SetComRedDot(item.target, ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.CAN_GET);
+            }
+            item.target.data = cfg;
+            UI_ListItem.ClearProxy();
         }
         private async void OnListItemClick(EventContext context)
         {
-            int id = (int)(context.sender as GObject).data;
-            bool result = await ActivitySProxy.ReqGetDailyLoginRewards(id);
-            if (result)
+            DailyLoginCfg cfg = (context.sender as GObject).data as DailyLoginCfg;
+
+            if (cfg.id == ActivityDataManager.Instance.dailyLoginId && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.CAN_GET)
+            {
+                bool result = await ActivitySProxy.ReqGetDailyLoginRewards(cfg.id);
+                if (result)
+                {
+                    _ui.m_list.numItems = _cfgs.Length;
+                }
+            }
+            else
             {
-                _ui.m_list.numItems = _cfgs.Count;
+                GoodsItemTipsController.ShowItemTips(cfg.rewardsArr[0][0]);
             }
         }
     }

GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 228c0f5a17e84e047ba115cfb35a116e
+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: 

GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_atlas0_1.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 01775f4e6c49bf045a0ee3658c4635da
+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: