Merge remote-tracking branch 'remotes/origin/master' into GFG

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -32,6 +32,7 @@ namespace UI.Main
         public UI_BtnModle2 m_btnGetYuanXiao;
         public UI_BtnModle2 m_btnActivityFYJY;
         public UI_BtnModle2 m_btnActivityZQ;
+        public UI_BtnModle2 m_btnActivityXDMH;
         public GTextField m_serverTime;
         public GLoader m_loaGuidestudio;
         public UI_ComAd m_comListAd;
@@ -130,6 +131,7 @@ namespace UI.Main
             m_btnGetYuanXiao = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnGetYuanXiao"));
             m_btnActivityFYJY = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityFYJY"));
             m_btnActivityZQ = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityZQ"));
+            m_btnActivityXDMH = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityXDMH"));
             m_serverTime = (GTextField)comp.GetChild("serverTime");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
@@ -198,6 +200,8 @@ namespace UI.Main
             m_btnActivityFYJY = null;
             m_btnActivityZQ.Dispose();
             m_btnActivityZQ = null;
+            m_btnActivityXDMH.Dispose();
+            m_btnActivityXDMH = null;
             m_serverTime = null;
             m_loaGuidestudio = null;
             m_comListAd.Dispose();

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxRewardView.cs

@@ -11,6 +11,7 @@ namespace GFGGame
         private UI_BlindBoxRewardUI _ui;
         private List<DropOutCfg> _rewardNormal = null;
         private List<DropOutCfg> _rewardSpecial = null;
+        private const int _blindBoxId = 3;
         public override void Dispose()
         {
             if (_ui != null)
@@ -36,7 +37,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(2);
+            BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(_blindBoxId);
             int id1 = blindBoxCfg.OrdinaryDropDisplay; //(int)(this.viewData as object[])[0];
             int id2 = blindBoxCfg.HideDropDisplay; //(int)(this.viewData as object[])[1];
             _rewardNormal = DropOutCfgArray.Instance.GetCfgsByid(id1);

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxView.cs

@@ -18,11 +18,17 @@ namespace GFGGame
     public class BlindBoxView : BaseWindow
     {
         private UI_BlindBoxUI _ui;
+
         //private EffectUI _effectUI1;
         private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
         private ItemCfg itemcfg;
+
         private int listIndex = 0;
-        BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(2);
+        
+        //TODO 每次开盲盒要在这里写盲盒的id
+        private const int _blindBoxId = 3;
+        BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(_blindBoxId);
+
         public override void Dispose()
         {
             // EffectUIPool.Recycle(_effectUI1);
@@ -58,12 +64,12 @@ namespace GFGGame
             _ui.m_rewardList.onClick.Add(OnClickRewardBtn);
             _ui.m_ruleBtn.onClick.Add(OnClickRuleBtn);
             _ui.m_rewardList.itemRenderer = RenderRewardList;
-            
+
             List<DropOutCfg> dropOutCfgList = DropOutCfgArray.Instance.GetCfgsByid(blindBoxCfg.OrdinaryDropDisplay);
             List<DropOutCfg> hidDropOutCfgList = DropOutCfgArray.Instance.GetCfgsByid(blindBoxCfg.HideDropDisplay);
             ItemCfg hidItemCfg = ItemCfgArray.Instance.GetCfg(hidDropOutCfgList[0].item);
             _ui.m_rewardList.numItems = dropOutCfgList.Count;
-            _ui.m_hiddenItem.url =  ResPathUtil.GetIconPath(hidItemCfg);
+            _ui.m_hiddenItem.url = ResPathUtil.GetIconPath(hidItemCfg);
             _ui.m_buyBtn.m_num.text = blindBoxCfg.CostIDNumArr[1].ToString();
 
             _ui.m_boxList.itemRenderer = RenderBoxList;
@@ -82,7 +88,7 @@ namespace GFGGame
                 Log.Error(string.Format("没有{0}物品"));
             }
 
-             _ui.m_buyBtn.m_newimg.url = "ui://eg2y0ldpuje19g0w";
+            _ui.m_buyBtn.m_newimg.url = "ui://eg2y0ldpuje19g0w";
             // _ui.m_buyBtn.m_img.width = 5;
             _ui.m_boxList.numItems = 6;
             _ui.m_rewardList.numItems = 6;
@@ -115,7 +121,11 @@ namespace GFGGame
 
         private void OnClickRewardBtn()
         {
-            ViewManager.Show<BlindBoxRewardView>(new object[] { 30000066, 30000078 });
+            ViewManager.Show<BlindBoxRewardView>(new object[]
+            {
+                blindBoxCfg.OrdinaryDropDisplay,
+                blindBoxCfg.HideDropDisplay
+            });
         }
 
         private void OnClickRuleBtn()
@@ -128,10 +138,10 @@ namespace GFGGame
             UI_rewardItem uiItemChild = UI_rewardItem.Proxy(obj);
             List<DropOutCfg> dropOutCfgList = DropOutCfgArray.Instance.GetCfgsByid(blindBoxCfg.OrdinaryDropDisplay);
             ItemCfg itemCfgChild = ItemCfgArray.Instance.GetCfg(dropOutCfgList[index].item);
-            
+
             uiItemChild.target.data = itemCfgChild;
             uiItemChild.m_reward.url = ResPathUtil.GetIconPath(itemCfgChild);
-            
+
             UI_rewardItem.ProxyEnd();
         }
 
@@ -174,7 +184,7 @@ namespace GFGGame
         private async void ReqBuyAll()
         {
             bool result;
-            result = await LuckyBoxSProxy.ReqGetBlindBox(2, 6);
+            result = await LuckyBoxSProxy.ReqGetBlindBox(_blindBoxId, 6);
             if (result)
             {
                 UpdateAllBoxAni();
@@ -184,7 +194,7 @@ namespace GFGGame
         private async void ReqBuyOne()
         {
             bool result;
-            result = await LuckyBoxSProxy.ReqGetBlindBox(2, 1);
+            result = await LuckyBoxSProxy.ReqGetBlindBox(_blindBoxId, 1);
             if (result)
             {
                 UI_boxItem listItem = UI_boxItem.Proxy(_ui.m_boxList.GetChildAt(listIndex));
@@ -262,7 +272,7 @@ namespace GFGGame
         private void UpdateTime(object param)
         {
             long curTime = TimeHelper.ServerNow();
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(10302);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(10303);
             if (activityInfo != null)
             {
                 long endTime = activityInfo.EndTime;

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -150,7 +150,7 @@ namespace GFGGame
             _btnGallery.onClick.Add(OnClickGallery);
             _btnPoem.onClick.Add(OnClickPoem);
 
-            //_ui.m_btnActivityXDMH.target.onClick.Add(OnClickBtnXDMH);
+            _ui.m_btnActivityXDMH.target.onClick.Add(OnClickBtnXDMH);
 
             _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
             _ui.m_comListAd.m_listAd.SetVirtualAndLoop();
@@ -366,7 +366,7 @@ namespace GFGGame
         //限定盲盒按钮显示
         private void RefreshBtnXdmhActivity()
         {
-           // _ui.m_btnActivityXDMH.target.visible = ActivityGlobalDataManager.Instance.IsActivityOpen(10302);
+            _ui.m_btnActivityXDMH.target.visible = ActivityGlobalDataManager.Instance.IsActivityOpen(10303);
         }
 
         private void RefreshBtnActivityFYJY()

GameClient/Assets/ResIn/UI/Main/Main_atlas0_12!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: de8f6b5d11d0f504c85d6bef6bad0eff
+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: 

GameClient/Assets/ResIn/UI/Main/Main_atlas0_12.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 20af18afdab407f48922e1fafdbfd34c
+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: