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

FGUIProject/assets/Card/CardStoryUI.xml

@@ -9,6 +9,6 @@
       <item/>
       <item/>
     </list>
-    <component id="n71_lc71" name="btnMood" src="lc718h" fileName="components/btnMood.xml" xy="687,840"/>
+    <component id="n71_lc71" name="btnMood" src="lc718h" fileName="components/btnMood.xml" xy="687,840" visible="false"/>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -2,9 +2,10 @@
 <component size="1080,831" opaque="false">
   <controller name="ctrlFullStar" pages="0,,1," selected="0"/>
   <controller name="ctrlFullLv" pages="0,,1," selected="0"/>
-  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="2"/>
-  <controller name="ctrlSkillCount" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="0"/>
+  <controller name="ctrlSkillCount" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
+    <loader id="n116_o4m7" name="n116" xy="0,127" size="1080,704" group="n115_o9gh"/>
     <image id="n70_lc71" name="n70" src="qkjsbm" fileName="imagesNew/dikuang_back.png" xy="0,-212" size="1080,1039" group="n115_o9gh"/>
     <image id="n97_qkjs" name="n97" src="qkjsbb" fileName="imagesNew/card_DividingLine.png" xy="38,426" size="972,8" group="n115_o9gh"/>
     <loader id="n101_qkjs" name="loaRarity" xy="55,143" size="44,94" group="n115_o9gh" url="ui://eg2y0ldpo9ghtll" autoSize="true"/>
@@ -88,13 +89,13 @@
       <item/>
       <item/>
     </list>
-    <image id="n110_o9gh" name="n110" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="280,520" group="n112_o9gh">
+    <image id="n110_o9gh" name="n110" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="540,520" group="n112_o9gh">
       <gearDisplay controller="ctrlSkillCount" pages="2,3"/>
     </image>
-    <image id="n111_o9gh" name="n111" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="610,520" group="n112_o9gh">
+    <image id="n111_o9gh" name="n111" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="870,520" group="n112_o9gh">
       <gearDisplay controller="ctrlSkillCount" pages="3"/>
     </image>
-    <group id="n112_o9gh" name="n112" xy="280,520" size="520,40" group="n113_o9gh" advanced="true" layout="hz" colGap="140" excludeInvisibles="true">
+    <group id="n112_o9gh" name="n112" xy="540,520" size="0,0" group="n113_o9gh" advanced="true" layout="hz" colGap="140" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n114_o9gh" name="btnUpSkillLv" src="qkjstlg" fileName="components/BtnNormal0.xml" pkg="eg2y0ldp" xy="706,6" size="374,342" group="n113_o9gh">
@@ -104,7 +105,7 @@
       <gearDisplay controller="ctrlTab" pages="2"/>
     </group>
     <component id="n17_ojlz" name="btnLv" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="75,331" size="290,70" group="n22_842s">
-      <Button controller="ctrlTab" page="0"/>
+      <Button checked="true" controller="ctrlTab" page="0"/>
       <property target="title" propertyId="0" value="升级"/>
     </component>
     <component id="n18_ojlz" name="btnStar" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="395,331" size="290,70" group="n22_842s">
@@ -112,7 +113,7 @@
       <property target="title" propertyId="0" value="升星"/>
     </component>
     <component id="n19_ojlz" name="btnSkill" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="715,331" size="290,70" group="n22_842s">
-      <Button checked="true" controller="ctrlTab" page="2"/>
+      <Button controller="ctrlTab" page="2"/>
       <property target="title" propertyId="0" value="技能"/>
     </component>
     <group id="n22_842s" name="grpTab" xy="75,331" size="930,70" group="n115_o9gh" advanced="true" layout="hz" colGap="30" excludeInvisibles="true"/>
@@ -122,6 +123,6 @@
       <item/>
       <item/>
     </list>
-    <group id="n115_o9gh" name="n115" xy="0,-212" size="1080,1039"/>
+    <group id="n115_o9gh" name="n115" xy="0,-212" size="1080,1043"/>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ListCardStoryItem.xml

@@ -6,11 +6,11 @@
     <image id="n72_lc71" name="n72" src="lc718c" fileName="images/kp_cp_xian_1.png" xy="189,67">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n67_lc71" name="txtTitle" xy="53,48" size="115,51" fontSize="38" color="#a8895c" text="第一节"/>
-    <text id="n70_lc71" name="txtDescribe" xy="316,49" size="364,49" fontSize="36" color="#c9b79e" text="词牌等级达到10级解锁">
+    <text id="n67_lc71" name="txtTitle" xy="53,48" size="117,51" fontSize="38" color="#a8895c" text="第一节"/>
+    <text id="n70_lc71" name="txtDescribe" xy="316,49" size="363,49" fontSize="36" color="#c9b79e" text="词牌等级达到10级解锁">
       <gearDisplay controller="c1" pages="1"/>
     </text>
-    <component id="n69_lc71" name="btnGo" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="588,34" size="232,70">
+    <component id="n69_lc71" name="btnGo" src="jx6ztof" fileName="components/BtnStyle002.xml" pkg="eg2y0ldp" xy="617,45" size="170,56" aspect="true">
       <gearDisplay controller="c1" pages="0"/>
       <Button title="前往"/>
     </component>

FGUIProject/assets/Main/components/ComponentChapterPic.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="462,1591" opaque="false">
   <displayList>
-    <loader id="n0_slb4" name="pic" xy="86,292" size="290,1006" url="ui://mfvz4q8kjvi38d" autoSize="true"/>
+    <loader id="n0_slb4" name="pic" xy="46,291" size="350,1099" url="ui://mfvz4q8ko4m7fsg" autoSize="true"/>
     <image id="n3_s17n" name="n3" src="o4m7fsc" fileName="imagesNew/zxian_chapter_frame_l.png" xy="0,33"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComponentListChapterItem.xml

@@ -29,9 +29,8 @@
     <graph id="n14_o4m7" name="n14" xy="319,1185" size="2,58" group="n15_o4m7" rotation="31" type="rect" lineSize="0" fillColor="#ff906c51"/>
     <text id="n13_o4m7" name="txtMaxProgress" xy="309,1196" size="31,39" group="n15_o4m7" fontSize="28" color="#906c51" align="center" text="00"/>
     <group id="n15_o4m7" name="n15" xy="221,1092" size="154,232"/>
-    <image id="n1_slb4" name="imgLockBg" src="slb41n" fileName="imagesStory/zhuxian_zhedang.png" xy="86,259"/>
-    <image id="n2_slb4" name="imgLock" src="slb41m" fileName="imagesStory/zhuxian_shuoto.png" xy="195,743"/>
-    <text id="n10_q8od" name="txtLockDesc" xy="130,717" size="202,89" fontSize="28" color="#fffcf1" align="center" autoSize="none" text="通关上一章&#xA;并达到x级开启">
+    <image id="n1_slb4" name="imgLockBg" src="o4m7fso" fileName="imagesNew/zxian_chapter_lock_bg_l.png" xy="40,275"/>
+    <text id="n10_q8od" name="txtLockDesc" xy="67,808" pivot="0.5,0" size="307,126" fontSize="40" color="#fffcf1" align="center" autoSize="none" text="通关上一章&#xA;并达到x级开启">
       <relation target="" sidePair="center-center"/>
     </text>
   </displayList>

FGUIProject/assets/Main/package.xml

@@ -163,22 +163,11 @@
     <image id="ed2z8a" name="zhuxian_zixz_3.png" path="/imagesStory/"/>
     <image id="ed2z8b" name="zhuxian_zixz_1.png" path="/imagesStory/"/>
     <image id="ed2z8c" name="zhuxian_zixz_2.png" path="/imagesStory/"/>
-    <image id="pq5x8d" name="zhuxian_jy_1.png" path="/imagesExport/"/>
-    <image id="jvi38d" name="zhuxian_zj_pic_1.png" path="/imagesExport/" exported="true"/>
-    <image id="jvi38e" name="zhuxian_zj_pic_2.png" path="/imagesExport/" exported="true"/>
-    <image id="jvi38f" name="zhuxian_zj_pic_3.png" path="/imagesExport/" exported="true"/>
-    <image id="jvi38g" name="zhuxian_zj_pic_4.png" path="/imagesExport/" exported="true"/>
-    <image id="jvi38h" name="zhuxian_zj_pic_5.png" path="/imagesExport/" exported="true"/>
     <component id="kpb08i" name="CompChapter20002.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08j" name="CompChapter20001.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08k" name="CompChapter20003.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08l" name="CompChapter20004.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08m" name="CompChapter20005.xml" path="/componentsLevel/" exported="true"/>
-    <image id="wg7t8n" name="zhuxian_zj_pic_1.jpg" path="/imagesExport/"/>
-    <image id="wg7t8o" name="zhuxian_zj_pic_2.jpg" path="/imagesExport/"/>
-    <image id="wg7t8p" name="zhuxian_zj_pic_3.jpg" path="/imagesExport/"/>
-    <image id="wg7t8q" name="zhuxian_zj_pic_4.jpg" path="/imagesExport/"/>
-    <image id="wg7t8r" name="zhuxian_zj_pic_5.jpg" path="/imagesExport/"/>
     <image id="wg7t8t" name="zjm_gn_dik_1.png" path="/images/" scale="9grid" scale9grid="42,26,84,52"/>
     <image id="wg7t8u" name="zjm_gndj_1.png" path="/images/"/>
     <image id="wg7t8v" name="zjm_gndj_2.png" path="/images/"/>
@@ -724,6 +713,15 @@
     <image id="o4m7fsd" name="zxian_yeqian_select.png" path="/imagesNew/"/>
     <image id="o4m7fse" name="zxian_yeqian_select_jingying.png" path="/imagesNew/"/>
     <component id="o4m7fsf" name="ButtonStoryType1.xml" path="/components/"/>
+    <image id="o4m7fsg" name="zxian_chapter_1.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsh" name="zxian_chapter_2.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsi" name="zxian_chapter_3.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsj" name="zxian_chapter_4.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsk" name="zxian_chapter_5.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsl" name="zxian_chapter_6.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsm" name="zxian_chapter_7.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsn" name="zxian_chapter_8.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fso" name="zxian_chapter_lock_bg_l.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Studio/components/ListLevelItem.xml

@@ -6,8 +6,8 @@
       <gearXY controller="c1" pages="1" values="47,0" default="0,0"/>
       <gearSize controller="c1" pages="1" values="913,254,-1,1" default="913,254,1,1"/>
     </loader>
-    <loader id="n30_v482" name="loaIcon" xy="38,32" size="166,190" url="ui://xz8kxrecv4822h" autoSize="true">
-      <gearXY controller="c1" pages="0,1" values="38,32|744,32"/>
+    <loader id="n30_v482" name="loaIcon" xy="48,29" size="156,190" url="ui://xz8kxreco4m73k" autoSize="true">
+      <gearXY controller="c1" pages="0,1" values="48,29|766,32"/>
     </loader>
     <loader id="n43_v482" name="loaItem" xy="58,57" size="137,140" url="ui://eg2y0ldpm9wm8v" fill="scale">
       <gearXY controller="c1" pages="0" values="58,57" default="763,57"/>

FGUIProject/assets/Studio/package.xml

@@ -68,10 +68,6 @@
     <image id="v4822m" name="cyjd_di_7.png" path="/images/"/>
     <component id="v4822n" name="ComLevelItem.xml" path="/components/"/>
     <component id="v4822p" name="ListLevelItem.xml" path="/components/"/>
-    <image id="wono2q" name="jinbixie.png" path="/imgExpot/" exported="true"/>
-    <image id="wono2r" name="songhuizong.png" path="/imgExpot/" exported="true"/>
-    <image id="wono2s" name="xingcijing.png" path="/imgExpot/" exported="true"/>
-    <image id="wono2t" name="yizugongzhu.png" path="/imgExpot/" exported="true"/>
     <image id="ysx92u" name="gzs_gzs.png" path="/images/"/>
     <image id="f2bf2v" name="ejzjm_bj.png" path="/images/"/>
     <component id="f2bf2w" name="ComPorcelain.xml" path="/" exported="true"/>
@@ -91,6 +87,14 @@
     <image id="psph3b" name="cwxf_zidi_2.png" path="/imgExpot/" exported="true"/>
     <image id="psph3c" name="cwxf_zidi_3.png" path="/imgExpot/" exported="true"/>
     <image id="psph3d" name="ejzjm_5.png" path="/images/"/>
+    <image id="o4m73e" name="cyjd_tx_1.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73f" name="cyjd_tx_2.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73g" name="cyjd_tx_3.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73h" name="cyjd_tx_4.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73i" name="cyjd_tx_5.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73j" name="cyjd_tx_6.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73k" name="cyjd_tx_7.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73l" name="cyjd_tx_8.png" path="/imgExpot/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Studio" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -17,7 +17,6 @@ namespace UI.Main
         public GTextField m_txtCurProgress;
         public GTextField m_txtMaxProgress;
         public GImage m_imgLockBg;
-        public GImage m_imgLock;
         public GTextField m_txtLockDesc;
         public const string URL = "ui://mfvz4q8kslb41t";
         public const string PACKAGE_NAME = "Main";
@@ -76,7 +75,6 @@ namespace UI.Main
             m_txtCurProgress = (GTextField)comp.GetChild("txtCurProgress");
             m_txtMaxProgress = (GTextField)comp.GetChild("txtMaxProgress");
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
             m_txtLockDesc = (GTextField)comp.GetChild("txtLockDesc");
         }
         public void Dispose(bool disposeTarget = false)
@@ -92,7 +90,6 @@ namespace UI.Main
             m_txtCurProgress = null;
             m_txtMaxProgress = null;
             m_imgLockBg = null;
-            m_imgLock = null;
             m_txtLockDesc = null;
             if(disposeTarget && target != null)
             {

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

@@ -37,6 +37,7 @@ namespace GFGGame
             base.OnShown();
             _viewData = this.viewData as CardData;
             _ui.m_btnMood.grayed = _viewData.star < _viewData.itemCfg.cardMoodStar ? true : false;
+            _ui.m_btnMood.visible = false;
             _ui.m_listCardStory.numItems = CardDataManager.GetStoryCfgsById(_viewData.itemCfg.id).Count;
         }
         private void RenderListCardStoryItem(int index, GObject obj)

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

@@ -84,7 +84,7 @@ namespace GFGGame
 
             PassivitySkillCfg cfg = ScoreSystemData.Instance.GetShowSkillCfg(cardId);
             if (cfg == null) return;
-            _ui.m_txtName.text = cfg.name;
+            _ui.m_txtName.text = cardList[index].itemCfg.name;
 
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
             _ui.m_listSkill.data = skillCfgs;

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

@@ -152,13 +152,11 @@ namespace GFGGame
                 listItem.m_content.m_txtMaxProgress.text = chapterCfg.bonusStar3.ToString();
                 if (MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {
-                    listItem.m_content.m_imgLock.visible = false;
                     listItem.m_content.m_imgLockBg.visible = false;
                     listItem.m_content.m_txtLockDesc.visible = false;
                 }
                 else
                 {
-                    listItem.m_content.m_imgLock.visible = true;
                     listItem.m_content.m_imgLockBg.visible = true;
                     listItem.m_content.m_txtLockDesc.visible = true;
                     if (chapterCfg.lvl > GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl))

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingNpcView.cs

@@ -75,11 +75,11 @@ namespace GFGGame
             StudioCfg cfg = StudioDataManager.Instance.FilingDatas[index];
             UI_ListNpcItem item = UI_ListNpcItem.Proxy(obj);
             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
-            item.m_ComIcon.m_loaIcon.url = isPass ? ResPathUtil.GetNpcPicSPath(cfg.res) : ResPathUtil.GetNpcPicSPath(cfg.inRes);
-            item.m_imgLock.visible = !isPass;
+            item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetNpcPicSPath(cfg.res);// isPass ? ResPathUtil.GetNpcPicSPath(cfg.res) : ResPathUtil.GetNpcPicSPath(cfg.inRes);
+            item.m_imgLock.visible = true;
             item.m_txtName.text = cfg.name;
             item.m_txtName.visible = isPass;
-            item.m_txtNone.visible = !isPass;
+            item.m_txtNone.visible = false;
             item.target.data = cfg;
             if (cfg.id == StudioDataManager.Instance.filingChapterId)
             {

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

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

GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png.meta

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