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

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

@@ -71,6 +71,10 @@ namespace GFGGame
         /// 当前难度
         /// </summary>
         public int difficulty = 0;
+        /// <summary>
+        /// 多轮可获得奖励
+        /// </summary>
+        public int accumulateReward = 0;
 
 
         /// <summary>

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -82,7 +82,7 @@ namespace GFGGame
             this.onUpdateAction = onUpdateAction;
             if (_dressUpData.IsNew)
             {
-                PutOnDefaultDressUpData();
+                PutOnDefaultDressUpData(_showBg);
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaLoadingView.cs

@@ -29,7 +29,7 @@ namespace GFGGame
             _ui = UI_ArenaLoadingUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            isReturnView = true;
+            //isReturnView = true;
 
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holder, "ui_dljm", "ui_dljm_jdt_tw");
         }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -147,11 +147,11 @@ namespace GFGGame
 
         private void OnBtnBackClick()
         {
+            this.Hide();
             GuideController.TryCompleteGuideIndex(ConstGuideId.ARENA_OPEN, 12);
             GuideController.TryCompleteGuide(ConstGuideId.ARENA_OPEN, 12);
             //ViewManager.GoBackFrom(typeof(ArenaView).FullName);
-            this.OnHide();
-            ViewManager.Show<InstanceZonesUIView>();
+            //ViewManager.Show<InstanceZonesUIView>();
         }
         private void OnBtnShopClick()
         {
@@ -424,7 +424,7 @@ namespace GFGGame
             }
             item.m_btnLook.data = targetData;
             item.m_comHead.data = targetData;
-            UI_ListTargetItem.Proxy();
+            UI_ListTargetItem.ProxyEnd();
         }
 
         private void OnSelectRoleClick(EventContext context)

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

@@ -98,7 +98,7 @@ namespace GFGGame
             _ui = UI_CardFosterUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-            isReturnView = true;
+            //isReturnView = true;
 
             //公共组件：返回，页签，属性列表
             _ui.m_ComFosterTop.m_btnback.onClick.Add(OnClickBtnBack);
@@ -1040,7 +1040,7 @@ namespace GFGGame
             }
             else
             {
-                RedDotController.Instance.SetComRedDot(item.target, RedDotDataManager.Instance.GetCardSkillRed(skillCfg.skillId), "", -10, 10);
+                RedDotController.Instance.SetComRedDot(item.target, RedDotDataManager.Instance.GetCardSkillRed(skillCfg.skillId), "", -26, 30);
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -438,7 +438,6 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 5, "点击获得新的服饰。");
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 6, "获得新衣服啦，继续通关主线剧情吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 6);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -146,6 +146,7 @@ namespace GFGGame
             }
             item.m_listGiftBag.data = lastVipCfg.bonusArr;
             item.m_listGiftBag.numItems = lastVipCfg.bonusArr.Length;
+            item.m_listGiftBag.scrollPane.SetPosX(0, false);
 
             if (_rechargeCfgs[index].suitId != previousIndex)
             {

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

@@ -144,8 +144,8 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneArenaDressUpFight"));
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
-
+                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false,null,true);
+                MyDressUpHelper.dressUpObj.AddOrRemove(180001, false);
                 // GameObject copyObj = _sceneObject.transform.Find("CopyRole").gameObject;
                 // _dressUpData.setSceneObj(copyObj);
             }

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

@@ -667,6 +667,8 @@ namespace GFGGame
 
         private void StartCalculateScore()
         {
+            InstanceZonesDataManager.currentLevelCfgId = _levelID;
+
             //不可移动代码位置
             bool hasFightTarget = _fightCfg.targetName != null && _fightCfg.targetName.Length > 0;
             if (_levelCfg.type == ConstInstanceZonesType.Field)
@@ -1494,10 +1496,11 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnRecommend, ConstGuideId.AUTOPLAY_FIGHT, 1, "", -1, true, 0, true, true);//这个引导自动完成，测试中策划要求件推荐搭配引导提前，为避免意外，没有改引导表，而是直接吧推荐搭配加到买必须品的引导力，这个引导自动完成
             if (GuideDataManager.currentGuideId == GuideCfgArray.Instance.GetCfg(ConstGuideId.AUTOPLAY_FIGHT).id) { 
                 GuideController.TryCompleteGuideIndex(ConstGuideId.AUTOPLAY_FIGHT, 1);
-                GuideController.TryCompleteGuide(ConstGuideId.AUTOPLAY_FIGHT, 1);
             }
+            GuideController.TryCompleteGuide(ConstGuideId.AUTOPLAY_FIGHT, 1);
 
             GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "当提示有\"必需品\"时。需要穿上对应物品才能通关",-1,false);
+            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 6);
         }
 
         protected override void TryCompleteGuide()

GameClient/Assets/Game/HotUpdate/Views/Field/FieldFightInfoView.cs

@@ -92,6 +92,7 @@ namespace GFGGame
                 bool result = await FieldSProxy.ReqFieldInstanceResult();
                 if (result)
                 {
+                    FieldDataManager.Instance.accumulateReward = 0;
                     ViewManager.Show<FieldFightEndView>();
                 }
             });

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -153,6 +153,7 @@ namespace GFGGame
             SuitGuideMenuCfg cfg = SuitGuideMenuCfgArray.Instance.GetCfg(typeId);
             item.m_title.text = cfg.name;
             item.target.data = typeId;
+            item.m_icon.url = string.Format("ui://FieldGuide/tj_tz_{0}", typeId);
             item.target.onClick.Add(() =>
             {
                 ViewManager.Show<SuitGuideDetailView>(typeId, new object[] { typeof(SuitGuideView).FullName, this.viewData });

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesUIView.cs

@@ -75,7 +75,9 @@ namespace GFGGame
 
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0)
             {
                 UpdateToCheckGuide(null);
             }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -177,7 +177,7 @@ namespace GFGGame
                     comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex = 1;
                     comBox.m_comLuckBoxBtn.m_txtFreeTime.visible = false;
                 }
-                RedDotController.Instance.SetComRedDot(comBox.m_comLuckBoxBtn.m_btnBuyOne, comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex == 1);
+                RedDotController.Instance.SetComRedDot(comBox.m_comLuckBoxBtn.m_btnBuyOne, comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex == 1, "", -29, 9);
             }
 
             RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, LuckyBoxDataManager.Instance.RedBtnLeft(_curIndex));
@@ -657,7 +657,7 @@ namespace GFGGame
                 comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex = 0;
                 comBox.m_comLuckBoxBtn.m_txtFreeTime.visible = false;
             }
-            RedDotController.Instance.SetComRedDot(comBox.m_comLuckBoxBtn.m_btnBuyOne, comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex == 1);
+            RedDotController.Instance.SetComRedDot(comBox.m_comLuckBoxBtn.m_btnBuyOne, comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex == 1, "", -29, 9);
 
             UI_ComBox1.ProxyEnd();
         }

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

@@ -346,7 +346,7 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_2, 3, "", 1, true, _ui.target.height / 2);
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_3, 2, "", 1, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_4, 3, "", 1, true, _ui.target.height / 2);
-            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_5, 3, "", 1, true, _ui.target.height / 2);
+            //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_5, 3, "", 1, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_PORCELAIN, 1, "点击返回主界面。");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_FILING, 1, "点击返回主界面。");
         }

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

@@ -65,7 +65,7 @@ namespace GFGGame
             _ui = UI_StoryChapterUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-            isReturnView = false;
+            //isReturnView = false;
         }
 
         protected override void OnInit()
@@ -171,8 +171,8 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            //ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
-            GameController.GoBackToMainView();
+            ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
+            //GameController.GoBackToMainView();
         }
         
         private void OnClickSwitchBack()
@@ -198,7 +198,7 @@ namespace GFGGame
                 StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID + 1);
                 if (GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) < chapterCfg.lvl)
                 {
-                    PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到%d级开启",chapterCfg.lvl));
+                    PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到{0}级开启",chapterCfg.lvl));
                 }
                 else
                 {
@@ -478,8 +478,8 @@ namespace GFGGame
             bool isGuide10 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_4, 4, "来继续我们的旅程吧。");
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);
 
-            bool isGuide11 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_5, 4, "来继续我们的旅程吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 4);
+            bool isGuide11 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_5, 3, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 3);
 
             bool isGuide9 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_STAR, 1, "点击返回主界面。");
             bool isGuide12 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ARENA_OPEN, 1, "点击返回主界面。");
@@ -507,8 +507,8 @@ namespace GFGGame
             GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_4, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);
             // GuideCfg cfg5 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_5);
-            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_5, 4);
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 4);
+            //GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_5, 4);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 3);
 
         }
 

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

@@ -174,6 +174,14 @@ namespace GFGGame
             _onCompleteStoryDialogCall = null;
             _onCompleteStoryDialogCallParam = null;
             StoryDialogDataManager.Instance.Clear();
+
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 3);
+        }
+
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 3);
         }
 
         private void OnClickBtnBack()
@@ -214,6 +222,7 @@ namespace GFGGame
 
         private void OnBtnSkip()
         {
+
             Over(true);
         }
 
@@ -768,7 +777,7 @@ namespace GFGGame
             }
         }
 
-        private void Over(bool isSkip = false)
+        private void Over(bool isSkip = true)
         {
             if (_onCompleteStoryDialogCall != null)
             {

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

@@ -93,8 +93,8 @@ namespace GFGGame
                 DressUpFightType dressUpFightType = new DressUpFightType();
                 dressUpFightType.levelID = _levelID;
                 dressUpFightType.teaPartID = 0;
-                this.Hide();
                 ViewManager.Show<DressUpFightView>(dressUpFightType, null, true);
+                this.Hide();
             }
             else
             {

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

@@ -179,12 +179,14 @@ namespace GFGGame
                 {
                     ViewManager.Show<FieldView>();
                     FieldDataManager _dataManager = FieldDataManager.Instance;
+                    _dataManager.accumulateReward += (FieldDataManager.Instance.difficulty + 1) * 5;
                     //这里判断如果获取的马蹄金超过上限了，就终止挑战
-                    if (_dataManager.fieldInfos.bonusWeekly >= _dataManager.fieldInfos.bonusMaxLimit)
+                    if (_dataManager.fieldInfos.bonusWeekly + _dataManager.accumulateReward >= _dataManager.fieldInfos.bonusMaxLimit)
                     {
                         AlertUI.Show("本周可获得奖励已达上限，是否继续挑战？")
                         .SetLeftButton(true, "取消",async (object data) =>
                         {
+                            _dataManager.accumulateReward = 0;
                             ViewManager.Show<FieldView>();
                             bool result = await FieldSProxy.ReqFieldInstanceResult();
                             if (result)
@@ -192,14 +194,19 @@ namespace GFGGame
                                 ViewManager.Show<FieldFightEndView>();
                             }
                         })
-                        .SetRightButton(true, "确认",(object data) =>
+                        .SetRightButton(true, "确认", async (object data) =>
                         {
-                                InstanceZonesDataManager.currentCardId = FieldFightDataManager.Instance.CurrentCardId;
-                                InstanceZonesDataManager.currentScoreType = FieldFightDataManager.Instance.CurrentScoreType;
-                                InstanceZonesDataManager.currentLevelCfgId = FieldFightDataManager.Instance.currentLevelCfgId;
-
-                                ViewManager.Hide<FieldView>();
-                                ViewManager.Show<StoryFightTargetView>();
+                            bool result = await FieldSProxy.ReqFieldInstanceResult();
+                            _dataManager.accumulateReward = 0;
+                            ViewManager.Hide<FieldView>();
+                            FieldCfg _curCfg = FieldCfgArray.Instance.dataArray[FieldDataManager.Instance.difficulty]; 
+                            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 2);
+                            int curLevelId = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_curCfg.type, 0, _curCfg.id)[0].id;
+                            DressUpFightType dressUpFightType = new DressUpFightType();
+                            dressUpFightType.levelID = curLevelId;
+                            dressUpFightType.teaPartID = 0;
+                            ViewManager.Show<DressUpFightView>(dressUpFightType, new object[] { typeof(FieldView).FullName, this.viewData }, true);
+                            InstanceZonesDataManager.currentLevelCfgId = curLevelId;
                         });
                     }
                     else

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

@@ -210,6 +210,8 @@ namespace GFGGame
             {
                 _ui.m_openViewAction.Play(MainUIAnimFinished);
             }
+
+            //StorageSProxy.ReqSetClientValue(1012, 4).Coroutine();
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeAddUpView.cs

@@ -156,7 +156,7 @@ namespace GFGGame
             item.m_btnWeek.data = vipCfg.id;
             bool canGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv == vipCfg.id;
             item.m_btnWeek.grayed = !canGet;
-            RedDotController.Instance.SetComRedDot(item.m_btnWeek, canGet);
+            RedDotController.Instance.SetComRedDot(item.m_btnWeek, canGet, "", -28, -3);
             UI_ListVipItem.ProxyEnd();
         }
 

GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 7a68d7d95bb345048a147820cda47d3d
+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/FieldGuide/FieldGuide_atlas0_3.png.meta

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