每日签到修改

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

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyWelfare
-{
-    public partial class UI_DBGiftItem
-    {
-        public GComponent target;
-        public GLoader m_DBB;
-        public GLoader m_loaIcon;
-        public const string URL = "ui://t8nwuj7ievdh28";
-        public const string PACKAGE_NAME = "DailyWelfare";
-        public const string RES_NAME = "DBGiftItem";
-        private static UI_DBGiftItem _proxy;
-
-        public static UI_DBGiftItem Create(GObject gObject = null)
-        {
-            var ui = new UI_DBGiftItem();
-            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_DBGiftItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_DBGiftItem();
-            }
-            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_DBB = (GLoader)comp.GetChild("DBB");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_DBB = null;
-            m_loaIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

@@ -1,103 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyWelfare
-{
-    public partial class UI_LimitedRechargeDBGiftUI
-    {
-        public GComponent target;
-        public GComponent m_bg;
-        public UI_ProgressBar2 m_progress;
-        public UI_DBGiftItem m_DBGiftItem1;
-        public UI_DBGiftItem m_DBGiftItem2;
-        public UI_DBGiftItem m_DBGiftItem3;
-        public UI_DBGiftItem m_DBGiftItem4;
-        public GGroup m_DBGiftItemGroup;
-        public GTextField m_txtTime;
-        public GGroup m_grpTime;
-        public GButton m_btnTest;
-        public const string URL = "ui://t8nwuj7ievdh25";
-        public const string PACKAGE_NAME = "DailyWelfare";
-        public const string RES_NAME = "LimitedRechargeDBGiftUI";
-        private static UI_LimitedRechargeDBGiftUI _proxy;
-
-        public static UI_LimitedRechargeDBGiftUI Create(GObject gObject = null)
-        {
-            var ui = new UI_LimitedRechargeDBGiftUI();
-            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_LimitedRechargeDBGiftUI Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_LimitedRechargeDBGiftUI();
-            }
-            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_bg = (GComponent)comp.GetChild("bg");
-            m_progress = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progress"));
-            m_DBGiftItem1 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem1"));
-            m_DBGiftItem2 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem2"));
-            m_DBGiftItem3 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem3"));
-            m_DBGiftItem4 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem4"));
-            m_DBGiftItemGroup = (GGroup)comp.GetChild("DBGiftItemGroup");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_grpTime = (GGroup)comp.GetChild("grpTime");
-            m_btnTest = (GButton)comp.GetChild("btnTest");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_bg = null;
-            m_progress.Dispose();
-            m_progress = null;
-            m_DBGiftItem1.Dispose();
-            m_DBGiftItem1 = null;
-            m_DBGiftItem2.Dispose();
-            m_DBGiftItem2 = null;
-            m_DBGiftItem3.Dispose();
-            m_DBGiftItem3 = null;
-            m_DBGiftItem4.Dispose();
-            m_DBGiftItem4 = null;
-            m_DBGiftItemGroup = null;
-            m_txtTime = null;
-            m_grpTime = null;
-            m_btnTest = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

@@ -1,93 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyWelfare
-{
-    public partial class UI_ProgressBar2
-    {
-        public GProgressBar target;
-        public UI_ComProBonus2 m_comProBonus0;
-        public UI_ComProBonus2 m_comProBonus1;
-        public UI_ComProBonus2 m_comProBonus2;
-        public UI_ComProBonus2 m_comProBonus3;
-        public GGroup m_comProBonusGroup;
-        public GGraph m_holder;
-        public GGraph m_holderReward;
-        public const string URL = "ui://t8nwuj7ievdh26";
-        public const string PACKAGE_NAME = "DailyWelfare";
-        public const string RES_NAME = "ProgressBar2";
-        private static UI_ProgressBar2 _proxy;
-
-        public static UI_ProgressBar2 Create(GObject gObject = null)
-        {
-            var ui = new UI_ProgressBar2();
-            if(gObject == null)
-            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GProgressBar)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ProgressBar2 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ProgressBar2();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GProgressBar)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_comProBonus0 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus0"));
-            m_comProBonus1 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus1"));
-            m_comProBonus2 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus2"));
-            m_comProBonus3 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus3"));
-            m_comProBonusGroup = (GGroup)comp.GetChild("comProBonusGroup");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_holderReward = (GGraph)comp.GetChild("holderReward");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comProBonus0.Dispose();
-            m_comProBonus0 = null;
-            m_comProBonus1.Dispose();
-            m_comProBonus1 = null;
-            m_comProBonus2.Dispose();
-            m_comProBonus2 = null;
-            m_comProBonus3.Dispose();
-            m_comProBonus3 = null;
-            m_comProBonusGroup = null;
-            m_holder = null;
-            m_holderReward = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

@@ -23,6 +23,7 @@ namespace GFGGame
         private int _month;
         private int _day;
         private bool isOpenPanel = true;
+        DateTime dateTime;
 
         public override void Dispose()
         {
@@ -87,6 +88,8 @@ namespace GFGGame
             _day = TimeUtil.GetCurDay();
             _ui.m_txtMonth.text = NumberUtil.GetOldChiniseNumberText(_month);
 
+            DateTime unixStartTime = new DateTime(1970, 1, 1);
+            dateTime = unixStartTime.AddMilliseconds(GameGlobal.OpenServerTime);
             UpdateSignView();
             //从主界面自动打开这个界面的话,就显示 1
             if (this.viewData != null)
@@ -126,16 +129,28 @@ namespace GFGGame
             _signCount = MathUtil.CountOnes2(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay));
             _ui.m_proSign.m_txtSignCount.text = _signCount.ToString();
             List<DailySignBonusCfg> signBonusCfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
-            _ui.m_proSign.target.max = signBonusCfgs.Count;
-            _ui.m_proSign.target.value = _signCount;
-            _ui.m_proSign.m_holder.x = _signCount / signBonusCfgs.Count * _ui.m_proSign.target.width - 68;
+
             List<DailySignCfg> signCfgs = DailySignCfgArray.Instance.GetCfgsBymonth(_month);
+            _ui.m_proSign.target.max = signCfgs[signCfgs.Count - 1].day;
+            _ui.m_proSign.target.value = _signCount;
+            _ui.m_proSign.m_holder.x = _signCount / signCfgs[signCfgs.Count - 1].day * _ui.m_proSign.target.width - 88;
+            
             _ui.m_proSign.m_holderReward.visible = false;
             for (int i = 0; i < signCfgs.Count; i++)
             {
                 GComponent comProBonus = _ui.m_proSign.target.GetChild("comProBonus" + i).asCom;
-                comProBonus.x = ((float)signCfgs[i].day / (float)signBonusCfgs.Count) * _ui.m_proSign.target.width;
+                if (i == signCfgs.Count - 1)
+                {
+                    comProBonus.x = ((float)signCfgs[i].day / (float)signCfgs[signCfgs.Count - 1].day) * _ui.m_proSign.target.width - 30;
+                }
+                else
+                {
+                    comProBonus.x = ((float)signCfgs[i].day / (float)signCfgs[signCfgs.Count-1].day) * _ui.m_proSign.target.width - 10;
+                }
+
+
                 UI_ComProBonus item = UI_ComProBonus.Proxy(comProBonus);
+                item.target.visible = true;
                 item.m_loaIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(signCfgs[i].bonusArr[0][0]));
                 item.m_txtCount.text = signCfgs[i].bonusArr[0][1].ToString();
                 item.m_txtDay.text = signCfgs[i].day.ToString();
@@ -164,8 +179,14 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(item.target, canGet);
                 UI_ComProBonus.ProxyEnd();
             }
-
-            _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 : signBonusCfgs.Count;
+            if (_month > dateTime.Month)
+            {
+                _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 : signBonusCfgs.Count;
+            }
+            else if (_month == dateTime.Month)
+            {
+                _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 - dateTime.Day : signBonusCfgs.Count - dateTime.Day + 1;
+            }
         }
 
         private async void OnBtnGetProBonus(EventContext context)
@@ -181,7 +202,7 @@ namespace GFGGame
             {
                 bool result = await DailyWelfareSProxy.ReqGetSignReward(signCfg.day);
                 if (result)
-                {
+                { 
                     UpdateSignView();
                 }
             }
@@ -190,14 +211,20 @@ namespace GFGGame
         private void ListItemRender(int index, GObject obj)
         {
             UI_ListSignItem item = UI_ListSignItem.Proxy(obj);
-            if (index == 29)
+
+            if (_month == dateTime.Month)
+            {
+                index += dateTime.Day - 1;
+            }
+
+            if (index == 29 && _ui.m_list.numItems > 29)
             {
                 item.target.touchable = false;
                 item.target.visible = false;
                 return;
             }
 
-            int _index = index >= 29 ? index - 1 : index;
+            int _index = index >= 29 && _ui.m_list.numItems > 29 ? index - 1 : index;
             DailySignBonusCfg bonusCfg = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month)[_index];
             int itemType = ItemDataManager.GetItemType(bonusCfg.bonusArr[0][0]);
             bool isGot = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay), bonusCfg.day);

GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_6!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 186d8720358d4f24bb2ef965fe3742a6
-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/DailyWelfare/DailyWelfare_atlas0_6.png.meta

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