Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -9,7 +9,6 @@ namespace UI.Main
         public GButton target;
         public Controller m_c1;
         public Controller m_c2;
-        public GImage m_min;
         public GTextField m_txtTime;
         public GGroup m_grpTime;
         public const string URL = "ui://mfvz4q8kvolso9";
@@ -61,7 +60,6 @@ namespace UI.Main
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
-            m_min = (GImage)comp.GetChild("min");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
         }
@@ -69,7 +67,6 @@ namespace UI.Main
         {
             m_c1 = null;
             m_c2 = null;
-            m_min = null;
             m_txtTime = null;
             m_grpTime = null;
             if(disposeTarget && target != null)

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

@@ -9,6 +9,7 @@ namespace UI.Main
         public GButton target;
         public Controller m_c1;
         public Controller m_c2;
+        public GLoader m_iconMain;
         public GTextField m_txtTime;
         public const string URL = "ui://mfvz4q8kt6j1ow";
         public const string PACKAGE_NAME = "Main";
@@ -59,12 +60,14 @@ namespace UI.Main
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_iconMain = (GLoader)comp.GetChild("iconMain");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_c2 = null;
+            m_iconMain = null;
             m_txtTime = null;
             if(disposeTarget && target != null)
             {

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

@@ -11,11 +11,9 @@ namespace UI.Main
         public Controller m_ProbabilityUpType;
         public GLoader m_icon0;
         public GGraph m_holder;
+        public GLoader m_iconMain;
         public GGraph m_holder1;
-        public GLoader m_icon1;
-        public GLoader m_loaLockIcon;
-        public GLoader m_loaLockIcon2;
-        public GGroup m_loaLockIcons;
+        public GLoader m_loaLockIcons;
         public const string URL = "ui://mfvz4q8kq08xu";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ButtonModle1";
@@ -67,11 +65,9 @@ namespace UI.Main
             m_ProbabilityUpType = comp.GetController("ProbabilityUpType");
             m_icon0 = (GLoader)comp.GetChild("icon0");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_iconMain = (GLoader)comp.GetChild("iconMain");
             m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
-            m_loaLockIcon2 = (GLoader)comp.GetChild("loaLockIcon2");
-            m_loaLockIcons = (GGroup)comp.GetChild("loaLockIcons");
+            m_loaLockIcons = (GLoader)comp.GetChild("loaLockIcons");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -79,10 +75,8 @@ namespace UI.Main
             m_ProbabilityUpType = null;
             m_icon0 = null;
             m_holder = null;
+            m_iconMain = null;
             m_holder1 = null;
-            m_icon1 = null;
-            m_loaLockIcon = null;
-            m_loaLockIcon2 = null;
             m_loaLockIcons = null;
             if(disposeTarget && target != null)
             {

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

@@ -12,34 +12,37 @@ namespace UI.Main
         public GComponent m_valueBar;
         public GTextField m_grpLeaguetext;
         public GGroup m_grpLeagueTips;
-        public UI_ButtonModle1 m_btnMain;
-        public UI_ButtonModle1 m_btnXiuFang;
-        public UI_ButtonModle1 m_btnHuanZhuang;
-        public UI_ButtonModle1 m_btnZhaiXing;
-        public UI_ButtonModle1 m_btnCiPai;
-        public UI_ButtonModle1 m_btnHaiZhiShi;
         public GGraph m_BottomEffectHolder;
         public UI_ComponentHeadBar m_headBar;
         public GButton m_btnYouJian;
         public GButton m_btnGongGao;
         public GList m_list;
         public UI_ButtonChange m_btnChange;
-        public UI_ComAd m_comListAd;
-        public UI_BtnModle1 m_btnDailyWelfare;
-        public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
-        public UI_BtnModle2 m_btnOpenServerActivity;
         public UI_BtnModle2 m_btnActivityAfuGift;
         public UI_BtnModle2 m_btnWanShiLi;
         public UI_BtnModle2 m_btnTea;
+        public UI_BtnModle2 m_btnOpenServerActivity;
+        public GTextField m_serverTime;
+        public GLoader m_loaGuidestudio;
+        public UI_ComAd m_comListAd;
         public UI_BtnModle m_btnFirstRecharge;
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
-        public GGroup m_grpLeft;
-        public GTextField m_serverTime;
-        public GGroup m_grpMove;
-        public GLoader m_loaGuidestudio;
+        public UI_ButtonModle1 m_btnZhaiXing;
+        public UI_BtnModle1 m_btnDailyWelfare;
+        public UI_BtnModle2 m_btnActivityDay7;
+        public UI_BtnModle1 m_btnShow;
+        public UI_ButtonModle1 m_btnCiPai;
+        public UI_ButtonModle1 m_btnXiuFang;
+        public UI_ButtonModle1 m_btnHuanZhuang;
+        public UI_ButtonModle1 m_btnHaiZhiShi;
+        public UI_ButtonModle1 m_btnMain;
+        public GGroup m_AllUI;
+        public GGraph m_touchMask;
         public Transition m_openViewAction;
+        public Transition m_hide;
+        public Transition m_show;
         public const string URL = "ui://mfvz4q8kq08x0";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "MainUI";
@@ -92,34 +95,37 @@ namespace UI.Main
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_grpLeaguetext = (GTextField)comp.GetChild("grpLeaguetext");
             m_grpLeagueTips = (GGroup)comp.GetChild("grpLeagueTips");
-            m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
-            m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
-            m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
-            m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
-            m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
-            m_btnHaiZhiShi = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHaiZhiShi"));
             m_BottomEffectHolder = (GGraph)comp.GetChild("BottomEffectHolder");
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_btnYouJian = (GButton)comp.GetChild("btnYouJian");
             m_btnGongGao = (GButton)comp.GetChild("btnGongGao");
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
-            m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
-            m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
-            m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
-            m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
             m_btnActivityAfuGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityAfuGift"));
             m_btnWanShiLi = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnWanShiLi"));
             m_btnTea = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnTea"));
+            m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
+            m_serverTime = (GTextField)comp.GetChild("serverTime");
+            m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
+            m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
-            m_grpLeft = (GGroup)comp.GetChild("grpLeft");
-            m_serverTime = (GTextField)comp.GetChild("serverTime");
-            m_grpMove = (GGroup)comp.GetChild("grpMove");
-            m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
+            m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
+            m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
+            m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
+            m_btnShow = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnShow"));
+            m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
+            m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
+            m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
+            m_btnHaiZhiShi = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHaiZhiShi"));
+            m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
+            m_AllUI = (GGroup)comp.GetChild("AllUI");
+            m_touchMask = (GGraph)comp.GetChild("touchMask");
             m_openViewAction = comp.GetTransition("openViewAction");
+            m_hide = comp.GetTransition("hide");
+            m_show = comp.GetTransition("show");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -128,18 +134,6 @@ namespace UI.Main
             m_valueBar = null;
             m_grpLeaguetext = null;
             m_grpLeagueTips = null;
-            m_btnMain.Dispose();
-            m_btnMain = null;
-            m_btnXiuFang.Dispose();
-            m_btnXiuFang = null;
-            m_btnHuanZhuang.Dispose();
-            m_btnHuanZhuang = null;
-            m_btnZhaiXing.Dispose();
-            m_btnZhaiXing = null;
-            m_btnCiPai.Dispose();
-            m_btnCiPai = null;
-            m_btnHaiZhiShi.Dispose();
-            m_btnHaiZhiShi = null;
             m_BottomEffectHolder = null;
             m_headBar.Dispose();
             m_headBar = null;
@@ -148,33 +142,49 @@ namespace UI.Main
             m_list = null;
             m_btnChange.Dispose();
             m_btnChange = null;
-            m_comListAd.Dispose();
-            m_comListAd = null;
-            m_btnDailyWelfare.Dispose();
-            m_btnDailyWelfare = null;
-            m_btnActivityDay7.Dispose();
-            m_btnActivityDay7 = null;
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
-            m_btnOpenServerActivity.Dispose();
-            m_btnOpenServerActivity = null;
             m_btnActivityAfuGift.Dispose();
             m_btnActivityAfuGift = null;
             m_btnWanShiLi.Dispose();
             m_btnWanShiLi = null;
             m_btnTea.Dispose();
             m_btnTea = null;
+            m_btnOpenServerActivity.Dispose();
+            m_btnOpenServerActivity = null;
+            m_serverTime = null;
+            m_loaGuidestudio = null;
+            m_comListAd.Dispose();
+            m_comListAd = null;
             m_btnFirstRecharge.Dispose();
             m_btnFirstRecharge = null;
             m_btnGiftBag1.Dispose();
             m_btnGiftBag1 = null;
             m_btnGiftBag2.Dispose();
             m_btnGiftBag2 = null;
-            m_grpLeft = null;
-            m_serverTime = null;
-            m_grpMove = null;
-            m_loaGuidestudio = null;
+            m_btnZhaiXing.Dispose();
+            m_btnZhaiXing = null;
+            m_btnDailyWelfare.Dispose();
+            m_btnDailyWelfare = null;
+            m_btnActivityDay7.Dispose();
+            m_btnActivityDay7 = null;
+            m_btnShow.Dispose();
+            m_btnShow = null;
+            m_btnCiPai.Dispose();
+            m_btnCiPai = null;
+            m_btnXiuFang.Dispose();
+            m_btnXiuFang = null;
+            m_btnHuanZhuang.Dispose();
+            m_btnHuanZhuang = null;
+            m_btnHaiZhiShi.Dispose();
+            m_btnHaiZhiShi = null;
+            m_btnMain.Dispose();
+            m_btnMain = null;
+            m_AllUI = null;
+            m_touchMask = null;
             m_openViewAction = null;
+            m_hide = null;
+            m_show = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameUI.cs

@@ -23,6 +23,7 @@ namespace UI.MiniGame
         public GButton m_rewardGet;
         public GButton m_shopBtn;
         public UI_NewMaterialShowView m_newMaterial;
+        public UI_MergeGameItemUI m_guildDouBaoBtn;
         public const string URL = "ui://wgkh30qjqbf42v";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "MergeGameUI";
@@ -86,6 +87,7 @@ namespace UI.MiniGame
             m_rewardGet = (GButton)comp.GetChild("rewardGet");
             m_shopBtn = (GButton)comp.GetChild("shopBtn");
             m_newMaterial = (UI_NewMaterialShowView)UI_NewMaterialShowView.Create(comp.GetChild("newMaterial"));
+            m_guildDouBaoBtn = (UI_MergeGameItemUI)UI_MergeGameItemUI.Create(comp.GetChild("guildDouBaoBtn"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -109,6 +111,8 @@ namespace UI.MiniGame
             m_shopBtn = null;
             m_newMaterial.Dispose();
             m_newMaterial = null;
+            m_guildDouBaoBtn.Dispose();
+            m_guildDouBaoBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -121,8 +121,9 @@ namespace GFGGame
             _btnBag.onClick.Add(OnClickBtnBag);
             _ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag2);
             _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag1);
-
             _ui.m_btnHaiZhiShi.target.onClick.Add(OnClickBtnInstanceZones);
+            _ui.m_touchMask.onClick.Add(ShowMainUI);
+            _ui.m_btnShow.target.onClick.Add(HideMainUI);
 
             _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
             _ui.m_comListAd.m_listAd.SetVirtualAndLoop();
@@ -262,11 +263,11 @@ namespace GFGGame
 
         private void AddEffect()
         {
-            _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ZJM_szl_down_3"));
-            _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder1, "ui_zjm", "ZJM_szl_top_1"));
-            _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder, "ui_zjm", "ZJM_hzs_down_3"));
-            _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder1, "ui_zjm", "ZJM_hzs_top_1"));
-            _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_BottomEffectHolder, "ui_zjm", "ZJM_DiBan"));
+            //_effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ZJM_szl_down_3"));
+            //_effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder1, "ui_zjm", "ZJM_szl_top_1"));
+            //_effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder, "ui_zjm", "ZJM_hzs_down_3"));
+            //_effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder1, "ui_zjm", "ZJM_hzs_top_1"));
+            //_effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_BottomEffectHolder, "ui_zjm", "ZJM_DiBan"));
         }
 
         private void OnClickBtnInstanceZones()
@@ -809,6 +810,8 @@ namespace GFGGame
             _ui.m_btnGiftBag1.target.visible = false;
             _ui.m_btnGiftBag2.target.visible = false;
 
+            _ui.m_btnHaiZhiShi.m_loaLockIcons.visible = false;
+
             _ui.m_btnXiuFang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
             _ui.m_btnHuanZhuang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
             _ui.m_btnCiPai.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
@@ -1149,8 +1152,16 @@ namespace GFGGame
             {
                 _ui.m_serverTime.visible = false;
             }
+        }
 
+        private void HideMainUI()
+        {
+            _ui.m_hide.Play();
         }
 
+        private void ShowMainUI()
+        {
+            _ui.m_show.Play();
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/MainBgChooseView.cs

@@ -78,6 +78,7 @@ namespace GFGGame
     RoleDataManager.headBorderId);
             mainUI.m_headBar.m_txtName.text = RoleDataManager.roleName;
             mainUI.m_btnXiuFang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
+            mainUI.m_btnHaiZhiShi.m_loaLockIcons.visible = false;
             mainUI.m_btnHuanZhuang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
             mainUI.m_btnCiPai.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             mainUI.m_btnZhaiXing.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);

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

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: bce10b67842ebd44cbe7538535bad21f
+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_11.png.meta

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