Browse Source

新年登录

huangxiaoyue 1 year ago
parent
commit
2ee811ada7
18 changed files with 538 additions and 3 deletions
  1. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin.meta
  2. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_ComLoginItem.cs
  3. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_ComLoginItem.cs.meta
  4. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_NewYearLoginUI.cs
  5. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_NewYearLoginUI.cs.meta
  6. 3 2
      GameClient/Assets/Game/HotUpdate/ServerProxy/NewYearRedEnvelopeSproxy.cs
  7. 8 0
      GameClient/Assets/Game/HotUpdate/Views/NewYearLogin.meta
  8. 89 0
      GameClient/Assets/Game/HotUpdate/Views/NewYearLogin/NewYearLoginView.cs
  9. 11 0
      GameClient/Assets/Game/HotUpdate/Views/NewYearLogin/NewYearLoginView.cs.meta
  10. 0 1
      GameClient/Assets/Game/HotUpdate/Views/NewYearRedEnvelope/NewYearRedEnvelopeView.cs
  11. 8 0
      GameClient/Assets/ResIn/UI/NewYearLogin.meta
  12. BIN
      GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0!a.png
  13. 120 0
      GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0!a.png.meta
  14. BIN
      GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0.png
  15. 120 0
      GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0.png.meta
  16. BIN
      GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_fui.bytes
  17. 7 0
      GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_fui.bytes.meta
  18. BIN
      GameClient/Assets/ResIn/UI/NewYearRedEnvelope/NewYearRedEnvelope_fui.bytes

+ 8 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d599998babbe8fc4ab50c5591fab7a1a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_ComLoginItem.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.NewYearLogin
+{
+    public partial class UI_ComLoginItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public const string URL = "ui://euyo6bk3t2f05";
+        public const string PACKAGE_NAME = "NewYearLogin";
+        public const string RES_NAME = "ComLoginItem";
+        private static UI_ComLoginItem _proxy;
+
+        public static UI_ComLoginItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ComLoginItem();
+            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_ComLoginItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComLoginItem();
+            }
+            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_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_ComLoginItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9ba76158e65f7494d8b937b3993d45d5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_NewYearLoginUI.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.NewYearLogin
+{
+    public partial class UI_NewYearLoginUI
+    {
+        public GComponent target;
+        public GList m_ListLogin;
+        public const string URL = "ui://euyo6bk3t2f00";
+        public const string PACKAGE_NAME = "NewYearLogin";
+        public const string RES_NAME = "NewYearLoginUI";
+        private static UI_NewYearLoginUI _proxy;
+
+        public static UI_NewYearLoginUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NewYearLoginUI();
+            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_NewYearLoginUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NewYearLoginUI();
+            }
+            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_ListLogin = (GList)comp.GetChild("ListLogin");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ListLogin = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearLogin/UI_NewYearLoginUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 106191dedddfe4343b978bfb8015e4ac
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 2
GameClient/Assets/Game/HotUpdate/ServerProxy/NewYearRedEnvelopeSproxy.cs

@@ -9,7 +9,6 @@ namespace ET
         protected override async ETTask Run(Session session, S2C_NoticeRedPacketDouble message)
         {
             NewYearRedEnvelopeDataManager.Status = RedPacketStatus.Double;
-            ET.Log.Debug("打印测试======双倍推送==========");
             var itemData = ItemUtil.CreateItemDataList(message.ItemId, message.ItemNum);
             BonusController.TryShowBonusList(itemData);
             await ETTask.CompletedTask;
@@ -24,8 +23,10 @@ namespace GFGGame
         //获取红包信息
         public static async ETTask<bool> ReqGetRedPacketInfo()
         {
-            ET.Log.Debug("打印测试====进入游戏请求红包信息============");
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+            if (activityId <= 0)
+                return false;
+
             S2C_GetRedPacketInfo response = null;
             response = (S2C_GetRedPacketInfo)await MessageHelper.SendToServer(new C2S_GetRedPacketInfo() { ActivityId = activityId });
             if (response != null)

+ 8 - 0
GameClient/Assets/Game/HotUpdate/Views/NewYearLogin.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a8f1887a0edb40e458fbced0e1a72c4e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 89 - 0
GameClient/Assets/Game/HotUpdate/Views/NewYearLogin/NewYearLoginView.cs

@@ -0,0 +1,89 @@
+using FairyGUI;
+using ET;
+using UnityEngine;
+using System;
+using UI.NewYearLogin;
+
+namespace GFGGame
+{
+    public class NewYearLoginView : BaseWindow
+    {
+        private UI_NewYearLoginUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_NewYearLoginUI.PACKAGE_NAME;
+            _ui = UI_NewYearLoginUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            //viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            //_ui.m_btnOpen.onClick.Add(OnClickBtnOpen);
+            //_ui.m_btnDoubleGet.target.onClick.Add(OnClickBtnDoubleGet);
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshViewInfo);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshViewInfo);
+        }
+
+        private void RefreshViewInfo()
+        {
+            //_ui.m_btnDoubleGet.target.visible = NewYearRedEnvelopeDataManager.Status != RedPacketStatus.Double;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            //int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+            //if (NewYearRedEnvelopeDataManager.Status == RedPacketStatus.None) { 
+            //    _ui.m_openType.selectedIndex = 0;
+            //    _ui.m_titleImgType.selectedIndex = 0; 
+            //}
+            //else if (NewYearRedEnvelopeDataManager.Status == RedPacketStatus.Open) { 
+            //    RefreshOpenView();
+            //}
+
+            //_ui.m_textGetNum.text = NewYearRedEnvelopeDataManager.ItemNum.ToString();
+        }
+
+        private void OnClickBtnOpen(EventContext context)
+        {
+            ReqLeagueList();
+        }
+
+        private async void ReqLeagueList()
+        {
+            int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
+            bool result = await NewYearRedEnvelopeSProxy.ReqOpenRedPacket(actRedPacketId);
+            if (result)
+            {
+            }
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/NewYearLogin/NewYearLoginView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7188fa1dc2119ff42a93351d3c31f0be
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/NewYearRedEnvelope/NewYearRedEnvelopeView.cs

@@ -73,7 +73,6 @@ namespace GFGGame
         {
             _ui.m_openType.selectedIndex = 1;
             var titleIndex = PlayerPrefs.GetString("NewYearRedEnvelopeRamdomInt");
-            ET.Log.Debug("´òÓ¡²âÊÔ=====È¡³öËæ»úÊý===========" + Convert.ToInt32(titleIndex));
             _ui.m_titleImgType.selectedIndex = Convert.ToInt32(titleIndex);
             UI_ComItem item = UI_ComItem.Proxy(_ui.m_itemReward);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(NewYearRedEnvelopeDataManager.ItemId);

+ 8 - 0
GameClient/Assets/ResIn/UI/NewYearLogin.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c1996dd142f2844f9dc3fb1c805e602
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0!a.png


+ 120 - 0
GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 5051200c0b0f1dd478320adeba32f3ce
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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: 

BIN
GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0.png


+ 120 - 0
GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_atlas0.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: fc5461988a73b8f478c82705fc176c1e
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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: 

BIN
GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_fui.bytes


+ 7 - 0
GameClient/Assets/ResIn/UI/NewYearLogin/NewYearLogin_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b8e5781244d4a7a478b3a8aec10e9145
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/NewYearRedEnvelope/NewYearRedEnvelope_fui.bytes