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

FGUIProject/assets/ClothingShop/components/CompItemInfo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="462,825">
-  <controller name="c1" pages="1,,2,,6,,7,,10," selected="4">
+  <controller name="c1" pages="1,,2,,6,,7,,10," selected="0">
     <remark page="1" value="服装店"/>
     <remark page="2" value="落星商店"/>
     <remark page="3" value="活动商店"/>
@@ -8,20 +8,20 @@
   </controller>
   <displayList>
     <image id="n7_hinb" name="n7" src="hinb3" fileName="images/fzd_diban_1.png" xy="0,0"/>
-    <text id="n8_hinb" name="txtName" xy="62,41" size="186,62" font="ui://eg2y0ldpwonotja" fontSize="46" color="#b59158" text="衣服名字"/>
+    <text id="n8_hinb" name="txtName" xy="57,41" size="323,61" font="ui://eg2y0ldpwonotja" fontSize="46" color="#b59158" text="衣服名字·名字"/>
     <text id="n30_hinb" name="txtDesc" xy="64,143" size="336,39" fontSize="28" color="#af9a7d" autoSize="height" autoClearText="true" text="赵钱孙李周吴郑王"/>
-    <loader id="n43_hinb" name="rarity" xy="360,23" size="44,94" visible="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n32_hinb" name="txtOwned" xy="170,610" size="122,36" fontSize="26" color="#c97f7a" align="center" ubb="true" vars="true" text="[color=#B39B75]已拥有：[/color]{v1=0}"/>
-    <component id="n20_hinb" name="btnBuy" src="r9ritjq" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="83,652">
+    <loader id="n43_hinb" name="rarity" xy="379,20" size="44,94" visible="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <text id="n32_hinb" name="txtOwned" xy="170,610" size="119,36" fontSize="26" color="#c97f7a" align="center" ubb="true" vars="true" text="[color=#B39B75]已拥有：[/color]{v1=0}"/>
+    <component id="n20_hinb" name="btnBuy" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="83,652">
       <Button title=" "/>
     </component>
     <loader id="n47_ugdz" name="iconPrice" xy="182,674" size="34,34" group="n46_hinb" touchable="false" url="ui://eg2y0ldpq08x3" fill="scale">
       <gearDisplay controller="c1" pages="0,1,2"/>
     </loader>
-    <text id="n48_ugdz" name="txtPrice" xy="226,667" size="103,44" group="n46_hinb" fontSize="32" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" autoClearText="true" text="99999">
+    <text id="n48_ugdz" name="txtPrice" xy="226,667" size="96,44" group="n46_hinb" fontSize="32" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" autoClearText="true" text="99999">
       <gearDisplay controller="c1" pages="0,1,2"/>
     </text>
-    <text id="n45_hinb" name="txtBtnBuy" xy="182,662" size="76,49" group="n46_hinb" fontSize="36" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" text="兑换">
+    <text id="n45_hinb" name="txtBtnBuy" xy="182,662" size="75,49" group="n46_hinb" fontSize="36" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" text="购买">
       <gearText controller="c1" pages="6,7,10" values="兑换|兑换|兑换" default="购买"/>
     </text>
     <group id="n46_hinb" name="n46" xy="182,662" size="76,49" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
@@ -33,16 +33,16 @@
       <item/>
       <item/>
     </list>
-    <image id="n54_v95q" name="n54" src="9cth60" fileName="images/fzd_xiant_1.png" xy="43,127"/>
+    <image id="n54_v95q" name="n54" src="9cth60" fileName="images/fzd_xiant_1.png" xy="43,117"/>
     <image id="n55_v95q" name="n55" src="v95qek" fileName="images/fzd_kuangdidi.png" xy="42,353"/>
     <image id="n33_hinb" name="n33" src="842s6h" fileName="imagesExport/kp_sx_1.png" pkg="eg2y0ldp" xy="53,363" size="36,36" group="n56_v95q" aspect="true"/>
     <image id="n34_hinb" name="n34" src="842s6i" fileName="imagesExport/kp_sx_2.png" pkg="eg2y0ldp" xy="173,363" size="36,36" group="n56_v95q" aspect="true"/>
     <image id="n35_hinb" name="n35" src="842s6j" fileName="imagesExport/kp_sx_3.png" pkg="eg2y0ldp" xy="286,363" size="36,36" group="n56_v95q" aspect="true"/>
     <image id="n36_hinb" name="n36" src="842s6k" fileName="imagesExport/kp_sx_4.png" pkg="eg2y0ldp" xy="53,418" size="36,36" group="n56_v95q" aspect="true"/>
-    <text id="n38_hinb" name="txtGong" xy="99,364" size="58,32" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n40_hinb" name="txtShang" xy="221,364" size="58,32" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n42_hinb" name="txtJue" xy="333,365" size="58,32" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n39_hinb" name="txtZhi" xy="100,420" size="58,32" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
+    <text id="n38_hinb" name="txtGong" xy="99,364" size="54,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
+    <text id="n40_hinb" name="txtShang" xy="221,364" size="54,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
+    <text id="n42_hinb" name="txtJue" xy="333,365" size="54,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
+    <text id="n39_hinb" name="txtZhi" xy="100,420" size="54,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
     <group id="n56_v95q" name="n56" xy="53,363" size="338,91"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingShop/package.xml

@@ -2,7 +2,7 @@
 <packageDescription id="e5hnfx8a">
   <resources>
     <component id="hinb0" name="ClothingShopUI.xml" path="/" exported="true"/>
-    <image id="hinb3" name="fzd_diban_1.png" path="/images/"/>
+    <image id="hinb3" name="fzd_diban_1.png" path="/images/" scale9grid="115,206,230,412"/>
     <image id="hinb5" name="fzd_diban_3.png" path="/images/" scale="tile"/>
     <image id="hinba" name="fzd_wxtb_1.png" path="/images/"/>
     <image id="hinbb" name="fzd_wxtb_2.png" path="/images/"/>
@@ -73,5 +73,5 @@
     <image id="v95qek" name="fzd_kuangdidi.png" path="/images/"/>
     <image id="v95qel" name="fzd_xiant_2.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/Common/ModalStatusUI.xml

@@ -7,7 +7,7 @@
     <graph id="n1_d4iw" name="n1" xy="390,20" size="300,40" visible="false" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <image id="n5_pac9" name="n5" src="qp4l4q" fileName="imagesExport/zx_jq_rwbszik_normal.png" xy="20,962" color="#e8dbb3"/>
+    <image id="n5_pac9" name="n5" src="qp4l4q" fileName="imagesExport/zx_jq_rwbszik_normal.png" xy="20,962" visible="false" color="#e8dbb3"/>
     <text id="n2_d4iw" name="txtMessage" xy="290,976" size="500,44" fontSize="32" color="#ebe4ce" align="center" autoSize="none" autoClearText="true" text="这是一个提示"/>
     <graph id="n4_t6aj" name="holder" xy="539,959" size="1,1"/>
   </displayList>

FGUIProject/assets/Travel/components/Button6.xml

@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="221,222" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_wono" src="wono1b" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
+    <image id="n1_pac9" name="n1" src="pac910f" fileName="images/xqfs_ylxfdi.png" xy="0,0"/>
+    <image id="n0_wono" name="n0" src="wono1b" fileName="images/xqfs_ylxftb.png" xy="15,39" pivot="0.5,0.5" rotation="18">
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
+  <Button/>
+  <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
+    <item time="0" type="Rotation" target="n0_wono" tween="true" startValue="18" endValue="0" duration="3" ease="Linear"/>
+    <item time="3" type="Rotation" target="n0_wono" tween="true" startValue="0" endValue="18" duration="3" ease="Linear"/>
+    <item time="6" type="Rotation" target="n0_wono" tween="true" startValue="18" endValue="36" duration="3" ease="Linear"/>
+    <item time="9" type="Rotation" target="n0_wono" tween="true" startValue="36" endValue="18" duration="3" ease="Linear"/>
+    <item time="12" type="Rotation" target="n0_wono" tween="true" startValue="18" endValue="0" duration="3" ease="Linear"/>
+    <item time="15" type="Rotation" target="n0_wono" tween="true" startValue="0" endValue="18" duration="3" ease="Linear"/>
+    <item time="18" type="Rotation" target="n0_wono" tween="true" startValue="18" endValue="36" duration="3" ease="Linear"/>
+    <item time="21" type="Rotation" target="n0_wono" tween="true" startValue="36" endValue="18" duration="3" ease="Linear"/>
+    <item time="54" type="Visible" target="n0_wono" value="true"/>
+  </transition>
 </component>

FGUIProject/assets/Travel/package.xml

@@ -48,6 +48,7 @@
     <image id="wono1b" name="xqfs_ylxftb.png" path="/images/"/>
     <component id="wono1c" name="Button6.xml" path="/components/"/>
     <component id="wono1d" name="ComPostcard.xml" path="/components/"/>
+    <image id="pac910f" name="xqfs_ylxfdi.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Travel" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/CardDataManager.cs

@@ -25,6 +25,7 @@ namespace GFGGame
         public static void Clear()
         {
             _cardDicByType.Clear();
+            _cardStoryCfgDic.Clear();
         }
 
 
@@ -110,7 +111,8 @@ namespace GFGGame
         /// <returns></returns>
         public static CardData GetCardDataById(int cardId)
         {
-            return _cardDicByType[0].ContainsKey(cardId) ? _cardDicByType[0][cardId] : null;
+            if (!_cardDicByType.ContainsKey(0) || !_cardDicByType[0].ContainsKey(cardId)) return null;
+            return _cardDicByType[0][cardId];
         }
         /// <summary>
         /// 根据男主类型获取卡牌列表

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_Button6.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Travel
+{
+    public partial class UI_Button6
+    {
+        public GButton target;
+        public Transition m_t0;
+        public const string URL = "ui://jitclg1gwono1c";
+        public const string PACKAGE_NAME = "Travel";
+        public const string RES_NAME = "Button6";
+        private static UI_Button6 _proxy;
+
+        public static UI_Button6 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button6();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button6 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button6();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_Button6.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelUI.cs

@@ -18,7 +18,7 @@ namespace UI.Travel
         public GTextField m_txtTime;
         public GGroup m_grpTime;
         public UI_Button2 m_btnGo;
-        public GButton m_btnGet;
+        public UI_Button6 m_btnGet;
         public GButton m_btnPhoto;
         public GButton m_btnFieldGuide;
         public const string URL = "ui://jitclg1gwono0";
@@ -79,7 +79,7 @@ namespace UI.Travel
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
             m_btnGo = (UI_Button2)UI_Button2.Create(comp.GetChild("btnGo"));
-            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_btnGet = (UI_Button6)UI_Button6.Create(comp.GetChild("btnGet"));
             m_btnPhoto = (GButton)comp.GetChild("btnPhoto");
             m_btnFieldGuide = (GButton)comp.GetChild("btnFieldGuide");
         }
@@ -97,6 +97,7 @@ namespace UI.Travel
             m_grpTime = null;
             m_btnGo.Dispose();
             m_btnGo = null;
+            m_btnGet.Dispose();
             m_btnGet = null;
             m_btnPhoto = null;
             m_btnFieldGuide = null;

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -206,7 +206,7 @@ namespace GFGGame
                             StudioDataManager.Instance.filingChapterId = studioCfg.id;
                             ViewManager.Show<StudioFilingView>(null, _fromeViewDatas);
                             MainStoryDataManager.currentLevelCfgId = levelCfg.id;
-                            InstanceZonesController.ShowLevelView(levelCfg.id, StudioDataManager.Instance.OnFinishFilingStoryLevel);
+                            InstanceZonesController.ShowLevelView(levelCfg.id, StudioDataManager.Instance.OnFinishFilingStoryLevel, _itemId, _needCount);
                             isJump = true;
                         }
                         else

GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs

@@ -138,7 +138,7 @@ namespace GFGGame
         {
             this.Hide();
             GObject btnGo = context.sender as GObject;
-            ViewManager.Show(string.Format("GFGGame.{0}", btnGo.data), null, new object[] { typeof(DailyTaskView).FullName, this.viewData });
+            ViewManager.Show(string.Format("GFGGame.{0}", btnGo.data), null, new object[] { typeof(DailyTaskView).FullName, this.viewData }, true);
         }
 
         private void ListBoxRewardItemRender(int index, GObject obj)

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -433,18 +433,17 @@ namespace GFGGame
             GameObject bg = _sceneObject.transform.Find(bgName).gameObject;
             bg.SetActive(false);
             Color backgroundColor = Camera.main.backgroundColor;
-            Camera.main.backgroundColor = new Color(255, 255, 255, 0);
-            GRoot.inst.visible = false;
+            Camera.main.backgroundColor = new Color(0, 0, 0, 0);
+            // GRoot.inst.visible = false;
             yield return new WaitForEndOfFrame();
 
             Rect rect = new Rect(0, 0, UnityEngine.Screen.width, UnityEngine.Screen.height);
             Texture2D tex = new Texture2D((int)rect.width, (int)rect.height, TextureFormat.ARGB32, false);//新建一个Texture2D对象
             tex.ReadPixels(rect, 0, 0);//读取像素，屏幕左下角为0点
             tex.Apply();//保存像素信息
-            // NTexture _nTexture = new NTexture(tex);
-            // EquipDataCache.cacher.FightRoleRes = tex.EncodeToJPG();
+
             EquipDataCache.cacher.RoleTextuex = tex;
-            GRoot.inst.visible = true;
+            // GRoot.inst.visible = true;
             bg.SetActive(true);
             Camera.main.backgroundColor = backgroundColor;
 
@@ -455,8 +454,6 @@ namespace GFGGame
             }
             else
             {
-                // StartCalculateScore();
-                // OnClickBtnPhotograph();
                 StartCalculateScore();
             }
         }

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

@@ -32,10 +32,12 @@ namespace GFGGame
                         MainStoryDataManager.currentLevelCfgId = 0;
 
                     }
-                    object[] objects = ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName);
-                    object obj = null;
-                    if (objects.Length > 1) obj = objects[1];
-                    ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW, obj, null, true);
+                    int index = 0;
+                    if (levelCfg.type == ConstInstanceZonesType.Story && levelCfg.subType == ConstInstanceZonesSubType.Hard)
+                    {
+                        index = 1;
+                    }
+                    ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW, index, null, true);
                 }
                 else
                 {

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             // _ui.m_btnTips.onClick.Add(OnBtnTipsClick);
             _ui.m_btnGo.target.onClick.Add(OnBtnGoClick);
-            _ui.m_btnGet.onClick.Add(OnBtnGetClick);
+            _ui.m_btnGet.target.onClick.Add(OnBtnGetClick);
             _ui.m_btnPhoto.onClick.Add(OnBtnPhotoClick);
             _ui.m_btnFieldGuide.onClick.Add(OnBtnFieldGuideClick);
 

GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 0a34e672f663e654791f6a6c997f2b25
-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: -100
-    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
-  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/ClothingShop/ClothingShop_atlas_lj7e62!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 04d1564f1779bc34f827189405d49132
-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
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: