Merge remote-tracking branch 'origin/master' into ios

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaMainUI.cs

@@ -9,6 +9,7 @@ namespace UI.ActivityAfternoonTea
         public GComponent target;
         public GLoader m_Bg;
         public GButton m_btnBack;
+        public GLoader m_BgOne;
         public GLoader m_titleBg;
         public GLoader m_oneTimeIcon;
         public GButton m_oneViewIcon;
@@ -69,6 +70,7 @@ namespace UI.ActivityAfternoonTea
         {
             m_Bg = (GLoader)comp.GetChild("Bg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_BgOne = (GLoader)comp.GetChild("BgOne");
             m_titleBg = (GLoader)comp.GetChild("titleBg");
             m_oneTimeIcon = (GLoader)comp.GetChild("oneTimeIcon");
             m_oneViewIcon = (GButton)comp.GetChild("oneViewIcon");
@@ -85,6 +87,7 @@ namespace UI.ActivityAfternoonTea
         {
             m_Bg = null;
             m_btnBack = null;
+            m_BgOne = null;
             m_titleBg = null;
             m_oneTimeIcon = null;
             m_oneViewIcon = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityMainTipsUI.cs

@@ -10,6 +10,7 @@ namespace UI.ActivityMain
         public GLoader m_btnChange;
         public GLoader m_icon;
         public GTextField m_activityDesc;
+        public GImage m_tipImg;
         public GLoader m_notTips;
         public GLoader m_backBtn;
         public Transition m_t0;
@@ -65,6 +66,7 @@ namespace UI.ActivityMain
             m_btnChange = (GLoader)comp.GetChild("btnChange");
             m_icon = (GLoader)comp.GetChild("icon");
             m_activityDesc = (GTextField)comp.GetChild("activityDesc");
+            m_tipImg = (GImage)comp.GetChild("tipImg");
             m_notTips = (GLoader)comp.GetChild("notTips");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_t0 = comp.GetTransition("t0");
@@ -76,6 +78,7 @@ namespace UI.ActivityMain
             m_btnChange = null;
             m_icon = null;
             m_activityDesc = null;
+            m_tipImg = null;
             m_notTips = null;
             m_backBtn = null;
             m_t0 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_MonthlyCardTipsUI.cs

@@ -12,6 +12,7 @@ namespace UI.ActivityMain
         public GLoader m_btnBuy;
         public GLoader m_btnBuyTxt;
         public GList m_rewardList;
+        public GImage m_TipImg;
         public GLoader m_notTips;
         public GLoader m_backBtn;
         public Transition m_t0;
@@ -67,6 +68,7 @@ namespace UI.ActivityMain
             m_btnBuy = (GLoader)comp.GetChild("btnBuy");
             m_btnBuyTxt = (GLoader)comp.GetChild("btnBuyTxt");
             m_rewardList = (GList)comp.GetChild("rewardList");
+            m_TipImg = (GImage)comp.GetChild("TipImg");
             m_notTips = (GLoader)comp.GetChild("notTips");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_t0 = comp.GetTransition("t0");
@@ -78,6 +80,7 @@ namespace UI.ActivityMain
             m_btnBuy = null;
             m_btnBuyTxt = null;
             m_rewardList = null;
+            m_TipImg = null;
             m_notTips = null;
             m_backBtn = null;
             m_t0 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveUI.cs

@@ -11,7 +11,6 @@ namespace UI.Task
         public GButton m_btnBack;
         public GList m_listAchieveItem;
         public Transition m_fadeIn;
-        public Transition m_hide;
         public const string URL = "ui://5mpsibzzaigntny";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "TaskAchieveUI";
@@ -63,7 +62,6 @@ namespace UI.Task
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listAchieveItem = (GList)comp.GetChild("listAchieveItem");
             m_fadeIn = comp.GetTransition("fadeIn");
-            m_hide = comp.GetTransition("hide");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -71,7 +69,6 @@ namespace UI.Task
             m_btnBack = null;
             m_listAchieveItem = null;
             m_fadeIn = null;
-            m_hide = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -1,7 +1,4 @@
-using System.Collections;
-using ET;
-using LitJson;
-using UnityEngine;
+using LitJson;
 
 namespace GFGGame
 {
@@ -24,6 +21,8 @@ namespace GFGGame
         public static long openTime = 0;
         public static int tsStatus;
         public static int tsServer;
+        //兑换码
+        public static int code;
 
         public static void InitData(string json)
         {
@@ -45,6 +44,10 @@ namespace GFGGame
             {
                 tsServer = int.Parse(result.tsServer);
             }
+            if(!string.IsNullOrEmpty(result.code))
+            {
+                code = int.Parse(result.code);
+            }
             GameConfig.logApiReportUrl = LauncherConfig.logApiRootUrl + "ReportGet";
         }
 
@@ -55,6 +58,7 @@ namespace GFGGame
             public string openTime;
             public string tsStatus;
             public string tsServer;
+            public string code;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivitySyntheticView.cs

@@ -100,7 +100,7 @@ namespace GFGGame
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(5005);
             long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
             string strTime = TimeUtil.FormattingTimeTo_DDHHmm(time);
-            _ui.m_txtTime.text = "สฃำเ:" + strTime;
+            _ui.m_txtTime.text = "剩余:" + strTime;
         }
         
         private void RenderListSyntheticItem(int index, GObject obj)

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaMainView.cs

@@ -41,13 +41,15 @@ namespace GFGGame
             _ui.m_threeViewIcon.onClick.Add(OnClickBtnMergeView);
 
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_effectBg, "ui_Activity", "GFXWC_bg_tx");
-        }
+    }
 
         protected override void OnShown()
         {
             base.OnShown();
+            _ui.m_Bg.url = ResPathUtil.GetBgImgPath("gfxwc_zymbj");
+            _ui.m_BgOne.url = ResPathUtil.GetBgImgPath("gfxwc_zjmlp");
             RedDotController.Instance.SetComRedDot(_ui.m_twoViewIcon, ActivityTeaDataManager.Instance.GetRewardRed());
-            RedDotController.Instance.SetComRedDot(_ui.m_oneViewIcon, ActivityTeaDataManager.Instance.CheckHRDRed(),"",-70);
+            RedDotController.Instance.SetComRedDot(_ui.m_oneViewIcon, ActivityTeaDataManager.Instance.CheckHRDRed(),"",-85);
         }
 
         protected override void OnHide()

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

@@ -46,6 +46,7 @@ namespace GFGGame
             {
                 ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
                 _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
+                _ui.m_tipImg.visible = false;
             }
             UpdateInfo();
         }
@@ -143,12 +144,12 @@ namespace GFGGame
         {
             if(ActivityDataManager.Instance.todayActivityTips == 0)
             {
-                _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
+                _ui.m_tipImg.visible = true;
                 ActivityDataManager.Instance.todayActivityTips = 1;
             }
             else
             {
-                _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
+                _ui.m_tipImg.visible = false;
                 ActivityDataManager.Instance.todayActivityTips = 0;
             }
             

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

@@ -56,6 +56,7 @@ namespace GFGGame
             {
                 ActivityDataManager.Instance.todayMonthlyCardTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity);
                 _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
+                _ui.m_TipImg.visible = false;
             }
             _ui.m_rewardList.numItems = rewards;
         }
@@ -89,12 +90,12 @@ namespace GFGGame
         {
             if (ActivityDataManager.Instance.todayMonthlyCardTips == 0)
             {
-                _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
+                _ui.m_TipImg.visible = true;
                 ActivityDataManager.Instance.todayMonthlyCardTips = 1;
             }
             else
             {
-                _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
+                _ui.m_TipImg.visible = false;
                 ActivityDataManager.Instance.todayMonthlyCardTips = 0;
             }
 

GameClient/Assets/Game/HotUpdate/Views/Card/CardView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gxhd_bjbj");
 
         }
-        /*******************************************************¼àÌýº¯Êý**************************************************/
+        /*******************************************************监听函数**************************************************/
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(typeof(CardView).FullName);
@@ -53,7 +53,7 @@ namespace GFGGame
         }
         private void OnClickLoaStory(int roleId)
         {
-            PromptController.Instance.ShowFloatTextPrompt("ÔÝ먦·Å" + roleId);
+            PromptController.Instance.ShowFloatTextPrompt("暂未开放" + roleId);
         }
         private void OnClickLoaDetail()
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLookBackView.cs

@@ -163,7 +163,7 @@ namespace GFGGame
             {
                 roleName = RoleDataManager.roleName;
             }
-            //»Ø¹Ë
+            //回顾
             if (!string.IsNullOrEmpty(roleName))
             {
                 _dialogListLookBack.Add("[color=#FDA2B1]" + roleName + "[/color]");

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

@@ -74,6 +74,7 @@ namespace GFGGame
                 _ui.m_suit.Play();
                 _ui.m_c1.SetSelectedIndex(0);
             }
+            _ui.m_btnGiftCode.target.visible = GameConfig.code == 0;
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveView.cs

@@ -43,7 +43,7 @@ namespace GFGGame
         {
             int subIndex = (int)(context.sender as GObject).data;
             if (subIndex > 3)
-                PromptController.Instance.ShowFloatTextPrompt("ÔÝ먦Æô");
+                PromptController.Instance.ShowFloatTextPrompt("暂未开启");
             else
                 ViewManager.Show<TaskAchieveDetailView>(subIndex);
         }
@@ -74,10 +74,8 @@ namespace GFGGame
         }
         protected async void UpdateInfo()
         {
-            _ui.m_hide.Play();
             var result = await TaskSProxy.GetTaskTypePro();
             if (!result) return;
-            _ui.m_fadeIn.Play();
         }
 
         protected override void OnHide()

GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2!a.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: 748a10093a7f8634e8ff3381ca643b78
-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/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: 0b01f954a8f28194c9203b26d8e63406
-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/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3!a.png.meta

@@ -1,120 +0,0 @@
-fileFormatVersion: 2
-guid: 4d59a2aab5ef67b4bb691ad52fdabbe5
-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/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3.png.meta

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