Эх сурвалжийг харах

升级升星恭喜获得特效

huangxiaoyue 1 жил өмнө
parent
commit
ddd3dc355a

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardUpUI.cs

@@ -9,6 +9,8 @@ namespace UI.Card
         public GComponent target;
         public Controller m_c1;
         public GGraph m_bgTouch;
+        public GGraph m_holderBgCom;
+        public GGraph m_holderTitle;
         public GTextField m_txtLast;
         public GTextField m_txtNow;
         public GList m_listProperty;
@@ -64,6 +66,8 @@ namespace UI.Card
         {
             m_c1 = comp.GetController("c1");
             m_bgTouch = (GGraph)comp.GetChild("bgTouch");
+            m_holderBgCom = (GGraph)comp.GetChild("holderBgCom");
+            m_holderTitle = (GGraph)comp.GetChild("holderTitle");
             m_txtLast = (GTextField)comp.GetChild("txtLast");
             m_txtNow = (GTextField)comp.GetChild("txtNow");
             m_listProperty = (GList)comp.GetChild("listProperty");
@@ -75,6 +79,8 @@ namespace UI.Card
         {
             m_c1 = null;
             m_bgTouch = null;
+            m_holderBgCom = null;
+            m_holderTitle = null;
             m_txtLast = null;
             m_txtNow = null;
             m_listProperty = null;

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs

@@ -8,6 +8,7 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public GGraph m_bg;
+        public GGraph m_holderBgCom;
         public GGraph m_holderTitle;
         public GGroup m_downTipsText;
         public UI_ComRewardList m_comList;
@@ -61,6 +62,7 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_bg = (GGraph)comp.GetChild("bg");
+            m_holderBgCom = (GGraph)comp.GetChild("holderBgCom");
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
             m_downTipsText = (GGroup)comp.GetChild("downTipsText");
             m_comList = (UI_ComRewardList)UI_ComRewardList.Create(comp.GetChild("comList"));
@@ -70,6 +72,7 @@ namespace UI.CommonGame
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
+            m_holderBgCom = null;
             m_holderTitle = null;
             m_downTipsText = null;
             m_comList.Dispose();

+ 13 - 0
GameClient/Assets/Game/HotUpdate/Views/Card/CardUpView.cs

@@ -21,6 +21,8 @@ namespace GFGGame
         private int _mainScore = 0;
         private int _otherScore = 0;
         private int _itemCfgMainScore = 0;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
 
         public override void Dispose()
         {
@@ -107,6 +109,13 @@ namespace GFGGame
                 _ui.m_listLastCardProperty.numItems = 1;
             }
             Timers.inst.AddUpdate(CheckGuide);
+
+            if (_type == "lv")
+                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXSJ_Text");
+            else
+                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXSX_Text");
+
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderBgCom, "ui_hd", "TC_Quad_ALL");
         }
 
         private void RenderListLastCardPropertyItem(int index, GObject obj)
@@ -189,6 +198,10 @@ namespace GFGGame
         {
             base.OnHide();
             Timers.inst.Remove(CheckGuide);
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
         }
 
         private void CheckGuide(object param)

+ 6 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -19,6 +19,7 @@ namespace GFGGame
         private const int maxHeight = 1030;
 
         private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
         private int counTime = 0;  //定时器计数
 
         public override void Dispose()
@@ -85,7 +86,8 @@ namespace GFGGame
             counTime += 1;
             if (counTime == 1)
             {
-                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD");
+                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD_Text");
+                _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderBgCom, "ui_hd", "TC_Quad_ALL");
             }
             else if (counTime == 2)
             {
@@ -108,7 +110,9 @@ namespace GFGGame
         {
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
-
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            
             Timers.inst.Remove(OnTimerUpdate);
 
             for (int i = 0; i < _effects.Count; i++)

BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_3!a.png


+ 0 - 120
GameClient/Assets/ResIn/UI/Card/Card_atlas0_3!a.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: df4e8f948cf454f4c88fd4ccab8ec2b6
-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/Card/Card_atlas0_3.png


+ 0 - 120
GameClient/Assets/ResIn/UI/Card/Card_atlas0_3.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: 60991e13f2d0cd340b589e7b1a471ed0
-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/Card/Card_fui.bytes


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes