bug修改

Assets/BingoBrain/FGUI/Package/ACommon/btn_green_vid.cs

@@ -8,6 +8,7 @@ namespace FGUI.ACommon
     public partial class btn_green_vid : GButton
     {
         public Controller cont_button;
+        public GImage img_saveingpot;
         public const string URL = "ui://pmf3wbjia9pgfg";
 
         public static btn_green_vid CreateInstance()
@@ -20,6 +21,7 @@ namespace FGUI.ACommon
             base.ConstructFromXML(xml);
 
             cont_button = GetControllerAt(0);
+            img_saveingpot = (GImage)GetChildAt(3);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/Common_01/Common_01Binder.cs

@@ -25,8 +25,6 @@ namespace FGUI.Common_01
             UIObjectFactory.SetPackageItemExtension(btn_head.URL, typeof(btn_head));
             UIObjectFactory.SetPackageItemExtension(btn_claim3.URL, typeof(btn_claim3));
             UIObjectFactory.SetPackageItemExtension(com_add_points.URL, typeof(com_add_points));
-            UIObjectFactory.SetPackageItemExtension(com_broadcast_text1.URL, typeof(com_broadcast_text1));
-            UIObjectFactory.SetPackageItemExtension(com_broadcast1.URL, typeof(com_broadcast1));
             UIObjectFactory.SetPackageItemExtension(wheel.URL, typeof(wheel));
             UIObjectFactory.SetPackageItemExtension(item_wheel.URL, typeof(item_wheel));
             UIObjectFactory.SetPackageItemExtension(wheel_.URL, typeof(wheel_));

Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs

@@ -1,35 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-using FairyGUI.Utils;
-
-namespace FGUI.Common_01
-{
-    public partial class com_broadcast1 : GComponent
-    {
-        public GButton btn_record;
-        public com_broadcast_text1 broad_cast_text;
-        public GGroup broad;
-        public GGroup group_;
-        public Transition t0;
-        public Transition t1;
-        public const string URL = "ui://o9974uc5qp92ao";
-
-        public static com_broadcast1 CreateInstance()
-        {
-            return (com_broadcast1)UIPackage.CreateObject("Common_01", "com_broadcast1");
-        }
-
-        public override void ConstructFromXML(XML xml)
-        {
-            base.ConstructFromXML(xml);
-
-            btn_record = (GButton)GetChildAt(1);
-            broad_cast_text = (com_broadcast_text1)GetChildAt(2);
-            broad = (GGroup)GetChildAt(3);
-            group_ = (GGroup)GetChildAt(4);
-            t0 = GetTransitionAt(0);
-            t1 = GetTransitionAt(1);
-        }
-    }
-}

Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast1.cs.meta

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

Assets/BingoBrain/FGUI/Package/Common_01/com_broadcast_text1.cs

@@ -7,11 +7,10 @@ namespace FGUI.Common_01
 {
     public partial class com_broadcast_text1 : GComponent
     {
-        public GGraph bg_panel;
         public GRichTextField cast_text;
-        public GRichTextField hide_text;
+        public GRichTextField show_text;
-        public GButton btn_broad;
+        public Transition t0;
-        public const string URL = "ui://o9974uc5qp92an";
+        public const string URL = "ui://o9974uc5cgqg1o";
 
         public static com_broadcast_text1 CreateInstance()
         {
@@ -22,10 +21,9 @@ namespace FGUI.Common_01
         {
             base.ConstructFromXML(xml);
 
-            bg_panel = (GGraph)GetChildAt(0);
+            cast_text = (GRichTextField)GetChildAt(0);
-            cast_text = (GRichTextField)GetChildAt(1);
+            show_text = (GRichTextField)GetChildAt(1);
-            hide_text = (GRichTextField)GetChildAt(2);
+            t0 = GetTransitionAt(0);
-            btn_broad = (GButton)GetChildAt(3);
         }
     }
 }

Assets/BingoBrain/FGUI/Package/JWheel/btn_spin.cs

@@ -9,7 +9,9 @@ namespace FGUI.JWheel
     {
         public Controller cont_button;
         public Controller cont_video;
+        public Controller saveing_open;
         public GTextField text_time;
+        public GImage img_saveingpot;
         public const string URL = "ui://qpan47byp653e";
 
         public static btn_spin CreateInstance()
@@ -23,7 +25,9 @@ namespace FGUI.JWheel
 
             cont_button = GetControllerAt(0);
             cont_video = GetControllerAt(1);
+            saveing_open = GetControllerAt(2);
             text_time = (GTextField)GetChildAt(3);
+            img_saveingpot = (GImage)GetChildAt(4);
         }
     }
 }

Assets/BingoBrain/Harmony/GameHelper.cs

@@ -1164,8 +1164,9 @@ namespace BingoBrain
                 look_interad_numbers = 0;
                 if (UnityEngine.Random.Range(0, 100) < ConfigSystem.GetConfig<CommonModel>().interstitialtype)
                 {
-                    if (UI.Instance.IsExistUI(UIConst.H5UI)) GameHelper.ShowInterstitial("interstitial_h5reward");
+                    // if (UI.Instance.IsExistUI(UIConst.H5UI)) GameHelper.ShowInterstitial("interstitial_h5reward");
-                    else UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AdcomingUI_Open);
+                    // else UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AdcomingUI_Open);
+                    GameHelper.ShowInterstitial("interstitial_Ad");
                 }
             }
         }

Assets/BingoBrain/ModuleUI/BingoEnd/BingoEndUI.cs

@@ -91,7 +91,8 @@ namespace BingoBrain
         {
             CtrlCloseUI();
             GameDispatcher.Instance.Dispatch(BingoInfo.EndBingoGame, true);
-             GameHelper.ShowInterstitial("interstitial_endgameAd");
+            //  GameHelper.addInterAdnumber("interstitial_endgameAd");
+             GameHelper.addInterAdnumber();
         }
 
         #endregion

Assets/BingoBrain/ModuleUI/BingoToy/BingoToyUI.cs

@@ -98,6 +98,8 @@ namespace BingoBrain
             ui.com_Spinn.SetClick(ClickSpinBtn);
             ui.fairyBatching = false;
             Hall.Instance.UpdateSecondEvent += UpdateTime;
+
+
         }
 
         private void UpdateTime()
@@ -147,6 +149,10 @@ namespace BingoBrain
             RefreshUI();
             ui.cont_state.selectedIndex =
                 PreferencesMgr.Instance.IsOnceWheel ? com_wheel.State_normal : com_wheel.State_videl;
+            if (!PreferencesMgr.Instance.IsOnceWheel && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1)
+            {
+                ui.btn_spin.saveing_open.selectedIndex = 1;
+            }
         }
 
         private void RefreshUI(object o = null)
@@ -285,6 +291,10 @@ namespace BingoBrain
                                 ui.cont_state.selectedIndex = PreferencesMgr.Instance.IsOnceWheel
                                     ? com_wheel.State_normal
                                     : com_wheel.State_videl;
+                                if (!PreferencesMgr.Instance.IsOnceWheel && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1)
+                                {
+                                    ui.btn_spin.saveing_open.selectedIndex = 1;
+                                }
                                 SetWheelData();
                                 RefreshUI();
                                 ui.fx_enter.Play();

Assets/BingoBrain/ModuleUI/Broadcast/BroadcastUI.cs

@@ -129,10 +129,12 @@ namespace BingoBrain
                 // OnChangeCardFinish(null);
                 NAAVsa.PlayAnim(sk, "animation", true);
             }, closeCallback);
-            ui.group_.y = 220;
+
+            // ui.group_.y = 220;
+
             if (Screen.safeArea.y != 0)
             {//刘海屏
-                ui.group_.y += Screen.safeArea.y;
+             // ui.group_.y += Screen.safeArea.y;
             }
         }
 

Assets/BingoBrain/ModuleUI/EnterBingo/EnterBingoUI.cs

@@ -165,11 +165,6 @@ namespace BingoBrain
             // WebviewManager.Instance.SetDarkThough(true);
             // WebviewManager.Instance.ShowH5View(false);
             // WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig<CommonModel>().propCoord[0], ConfigSystem.GetConfig<CommonModel>().propCoord[1], 60, 60);
-            if (GameHelper.IsGiftSwitch())
-            {
-
-                BingoDataSystem.CheckMakeupTaskData();
-            }
             GameHelper.PostFunnelLogin("enterButtonClick");
             ctrlDispatcher.Dispatch(CtrlMsg.Game_Start);
 

Assets/BingoBrain/ModuleUI/ExtraItem/ExtraItemUI.cs

@@ -129,6 +129,8 @@ namespace BingoBrain
                     {
                         GameHelper.DelayedShowGObject(this, ui.closeButton, ui.btn_claim);
                     }
+
+                    if ( ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1) ui.btn_more.GetChild("img_saveingpot").visible = true;
                 }
             }
         }
@@ -142,7 +144,8 @@ namespace BingoBrain
 
         private void OnBtnClaimClick()
         {
-            GameHelper.ShowInterstitial("interstitial_skipAd");
+            // GameHelper.ShowInterstitial("interstitial_skipAd");
+             GameHelper.addInterAdnumber();
             OpenCloseClick(false);
             if (data.cont_index == ui._Extra_extraball)
             {

Assets/BingoBrain/ModuleUI/GodPle/GodPleUI.cs

@@ -3,6 +3,7 @@ using DG.Tweening;
 using BingoBrain.Core;
 using FGUI.JRewardPop;
 using DontConfuse;
+using FGUI.ACommon;
 
 namespace BingoBrain
 {
@@ -93,9 +94,10 @@ namespace BingoBrain
 
             var isFree = model.rewardInfo.condition == RewardCondition.None;
 
-            if (ui.btn_collect is btn_collect btn_collect)
+            if (ui.btn_collect is btn_green_vid btn_collect)
             {
-                btn_collect.cont_state.selectedIndex = isFree ? btn_collect._State_free : btn_collect._State_video;
+                btn_collect.cont_button.selectedIndex = isFree ? 0 : 1;
+                if (!isFree && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1) btn_collect.img_saveingpot.visible = true;
             }
 
 
@@ -144,7 +146,8 @@ namespace BingoBrain
             model.rewardInfo.GetRewardDataList()[0].value = model.rewardInfo.GetRewardDataList()[0].value / 10;
             UsaSystem.GetReward(model.rewardInfo);
             CtrlCloseUI();
-            GameHelper.ShowInterstitial("interstitial_skipAd");
+            // GameHelper.ShowInterstitial("interstitial_skipAd");
+            GameHelper.addInterAdnumber();
         }
     }
 }

Assets/BingoBrain/ModuleUI/GodPleAc/GodPleAcUI.cs

@@ -41,6 +41,7 @@ namespace BingoBrain
         private bool isRiseUI;
 
         private Action CloseCb;
+        public int ui_index = 0;
 
         public GodPleAcUI(GodPleAcUICtrl ctrl) : base(ctrl)
         {
@@ -103,6 +104,8 @@ namespace BingoBrain
 
         protected override void OnOpenBefore(object args)
         {
+            ui_index = UnityEngine.Random.Range(0, 99999);
+            Debug.Log("fasongyiciguanbi" + ui_index);
             UICtrlDispatcher.Instance.Dispatch(SkinInfo.MaskUI_Open);
             if (args is GodDa displayModel)
             {
@@ -184,7 +187,11 @@ namespace BingoBrain
 
                                 if (completeSum >= ui.com_Coins.numChildren)
                                 {
-                                    var tw6 = DOVirtual.DelayedCall(0.2f, CtrlCloseUI);
+                                    var tw6 = DOVirtual.DelayedCall(0.2f, () =>
+                                    {
+                                        uiCtrlDispatcher.Dispatch(SkinInfo.GodPleAcUI_Close, ui_index);
+                                        Debug.Log("fasongyiciguanbi" + ui_index);
+                                    });
                                     tweenQueue.Enqueue(tw6);
                                 }
                             });

Assets/BingoBrain/ModuleUI/GodPleAc/GodPleAcUICtrl.cs

@@ -1,5 +1,7 @@
+
 using BingoBrain.Core;
 using BingoBrain.HotFix;
+using UnityEngine;
 
 namespace BingoBrain
 {
@@ -29,6 +31,7 @@ namespace BingoBrain
 
         public override void CloseUI(object args = null)
         {
+            if (args != null && ui.ui_index != (int)args) return;
             if (ui != null && !ui.isClose)
             {
                 ui.Close();

Assets/BingoBrain/ModuleUI/Smail/SmailUI.cs

@@ -70,6 +70,7 @@ namespace BingoBrain
             SetName();
             ui.settings.SetClick(OnClickSetting);
             ui.com_avatar.loader_flag.visible = false;
+            if(GameHelper.IsGiftSwitch()) ui.btn_cash.gift.selectedIndex=1;
             if (GameHelper.IsGiftSwitch())
             {
                 // ui.visible = false;

Assets/BingoBrain/ModuleUI/StarReward/StarRewardUI.cs

@@ -96,7 +96,8 @@ namespace BingoBrain
                 DOVirtual.DelayedCall(1.7f, () =>
                 {
                     UICtrlDispatcher.Instance.Dispatch(SkinInfo.StarRewardUI_Close);
-                    GameHelper.ShowInterstitial("interstitial_skipAd");
+                    // GameHelper.ShowInterstitial("interstitial_skipAd");
+                     GameHelper.addInterAdnumber();
                 });
 
             });

Assets/BingoBrain/System/Game/BingoDataSystem.cs

@@ -240,13 +240,12 @@ namespace BingoBrain
                 PreferencesMgr.Instance.Currency101 = GameHelper.GetCommonModel().Initial101;
                 GameDispatcher.Instance.Dispatch(BingoInfo.Update101Completed);
             }
-
             if (PreferencesMgr.Instance.CardBoardSum == -1 ||
-                (PreferencesMgr.Instance.CardBoardSum == 0 && PlayerPrefs.GetInt("First", 0) == 0))
+                (PreferencesMgr.Instance.CardBoardSum <= 0 && PlayerPrefs.GetInt("First", 0) == 0))
             {
                 PreferencesMgr.Instance.CardBoardSum = GameHelper.GetCommonModel().Fisrtcard[0];
                 Debug.Log("777777777777777777777777777");
-                //PlayerPrefs.SetInt("First", 1);
+                PlayerPrefs.SetInt("First", 1);
             }
 
             if (PreferencesMgr.Instance.Currency102 == -1)

Assets/BingoBrain/System/Game/BingoSystem.cs

@@ -154,6 +154,7 @@ namespace BingoBrain
                 {
                     UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHallUI_Open);
                     UICtrlDispatcher.Instance.Dispatch(SkinInfo.BingoHalldUI_Open);
+                     UICtrlDispatcher.Instance.Dispatch(SkinInfo.GodPleAcUI_Close);
                     if (GameHelper.IsGiftSwitch() && Random.Range(0, 100) < ConfigSystem.GetConfig<CommonModel>().backhallrate)
                     {
                       //  BingoHalldUI.Instance.OnClickHall();

Assets/BingoBrain/System/Game/JsonSystem.cs

@@ -150,6 +150,7 @@ namespace BingoBrain
 
             var dictionary = Havva.ToObject<Dictionary<string, object>>(json);
             ParseGameConfig(dictionary);
+                                CtrlDispatcher.Instance.Dispatch(CtrlMsg.Game_StartBefore);
             ModuleBoardk.Instance.AllModuleReadData();
         }
 

Assets/Resources/AssetHotFix/Atlas/Game/money_icon.png.meta

@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: e3097af93d1f1eb4e900a8a865039dfb
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/AssetHotFix/Atlas/Game/money_small.png.meta

@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 81b0837bfaf950f468971b3727bf4a38
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/AssetHotFix/Prefab/Game/Card/CardItem_gift.prefab

@@ -111,7 +111,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.65, y: 0.65, z: 1}
+  m_LocalScale: {x: 0.55, y: 0.55, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6079456359455626590}
@@ -157,7 +157,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 60b7644950296d04c9451af0db22614a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e3097af93d1f1eb4e900a8a865039dfb, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 0.74509805}
   m_FlipX: 0
   m_FlipY: 0
@@ -382,7 +382,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 64072f58c3c27aa479ba7dfffc32a4da, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 81b0837bfaf950f468971b3727bf4a38, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 0.74509805}
   m_FlipX: 0
   m_FlipY: 0