Merge remote-tracking branch 'remotes/origin/master' into xiaojie

FGUIProject/assets/CreateRole/CreateRoleUI.xml

@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,476" bgColor="#000000">
+<component size="1080,1920" bgColor="#000000">
   <displayList>
-    <component id="n4_xt5s" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,476"/>
-    <image id="n11_hpgr" name="n11" src="hpgr5" fileName="images/mc_jlkuang_1.png" xy="114,112"/>
-    <component id="n5_xt5s" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,304">
-      <Button title="确认" titleColor="#ffffff" titleFontSize="42"/>
+    <loader id="n12_o4m7" name="loaBg" xy="0,-240" size="1080,2400" url="ui://5al8chbdo4m76" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,center-center,middle-middle"/>
+    </loader>
+    <image id="n11_hpgr" name="n11" src="hpgr5" fileName="images/mc_jlkuang_1.png" xy="360,884" group="n14_o4m7"/>
+    <text id="n10_xt5s" name="inputName" xy="383,889" size="237,44" group="n14_o4m7" fontSize="32" color="#9a7849" autoSize="none" autoClearText="true" text="啦啦啦啦啦啦啦" input="true" prompt="[color=#C1A187]请输入角色名称[/color]" maxLength="7"/>
+    <component id="n5_xt5s" name="btnSure" src="o4m78" fileName="components/Button1.xml" xy="623,825" group="n14_o4m7">
+      <Button title="确认" titleColor="#ffffff" titleFontSize="42" icon="ui://5al8chbdo4m77"/>
     </component>
-    <component id="n8_xt5s" name="btnDice" src="xt5s4" fileName="components/ButtonDice.xml" xy="719,84"/>
-    <text id="n10_xt5s" name="inputName" xy="168,125" size="560,56" fontSize="42" color="#9e8056" autoSize="none" text="" input="true" prompt="[color=#B6A688]请输入角色名称[/color]" maxLength="7"/>
+    <component id="n8_xt5s" name="btnDice" src="xt5s4" fileName="components/ButtonDice.xml" xy="278,873" size="81,71" group="n14_o4m7" aspect="true"/>
+    <group id="n14_o4m7" name="n14" xy="278,825" size="526,179" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/CreateRole/components/Button1.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="181,179" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_o4m7" src="o4m77" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/CreateRole/components/ButtonDice.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="128,128" extention="Button">
+<component size="59,52" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n0_xt5s" name="n0" src="xt5s1" fileName="images/jianlinicheng.png" xy="0,0">

FGUIProject/assets/CreateRole/package.xml

@@ -5,6 +5,8 @@
     <image id="xt5s1" name="jianlinicheng.png" path="/images/"/>
     <component id="xt5s4" name="ButtonDice.xml" path="/components/"/>
     <image id="hpgr5" name="mc_jlkuang_1.png" path="/images/"/>
+    <image id="o4m77" name="an_queren.png" path="/images/"/>
+    <component id="o4m78" name="Button1.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CreateRole" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/FieldGuide/components/ChapterGuideItem.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="457,551">
   <displayList>
-    <loader id="n5_s61p" name="loaIcon" xy="0,0" size="457,551" url="ui://vqq9h9h4s61p20" autoSize="true"/>
+    <image id="n10_o4m7" name="n10" src="o4m744" fileName="images/chapter_3.png" xy="0,0"/>
+    <loader id="n5_s61p" name="loaIcon" xy="8,10" size="440,531" aspect="true" url="ui://vqq9h9h4s61p2e" align="center" vAlign="middle" fill="scaleMatchHeight"/>
     <image id="n6_s61p" name="n6" src="s61p23" fileName="images/jbhc_diban_4.png" xy="2,1" size="453,543" group="n9_s61p"/>
     <image id="n7_s61p" name="n7" src="ohuntac" fileName="imagesExport/zhuxian_shuoto.png" pkg="eg2y0ldp" xy="193,223" group="n9_s61p"/>
     <text id="n8_s61p" name="txtDesc" xy="64,281" pivot="0.5,0" size="328,49" group="n9_s61p" fontSize="36" color="#f1e6d9" align="center" text="通关主线第六章解锁"/>

FGUIProject/assets/FieldGuide/package.xml

@@ -54,14 +54,6 @@
     <image id="s61p23" name="jbhc_diban_4.png" path="/images/" scale="9grid" scale9grid="113,135,226,270"/>
     <image id="s61p24" name="bwtj_bti.png" path="/images/"/>
     <component id="s61p29" name="ChapterGuideItem.xml" path="/components/"/>
-    <image id="s61p2a" name="beijing1_bg.png" path="/itemGuideExport/" exported="true"/>
-    <image id="s61p2b" name="beijing2_bg.png" path="/itemGuideExport/" exported="true"/>
-    <image id="s61p2c" name="beijing3_bg.png" path="/itemGuideExport/" exported="true"/>
-    <image id="s61p2d" name="beijing4_bg.png" path="/itemGuideExport/" exported="true"/>
-    <image id="s61p2e" name="chapter_2.png" path="/itemGuideExport/" exported="true"/>
-    <image id="s61p2f" name="chapter_3.png" path="/itemGuideExport/" exported="true"/>
-    <image id="s61p2g" name="chapter_4.png" path="/itemGuideExport/" exported="true"/>
-    <image id="s61p2h" name="chapter_5.png" path="/itemGuideExport/" exported="true"/>
     <component id="s61p2i" name="ChapterItemShowUI.xml" path="/" exported="true"/>
     <component id="wono2j" name="TravelGuideUI.xml" path="/" exported="true"/>
     <component id="wono2k" name="TravelShowUI.xml" path="/" exported="true"/>
@@ -105,6 +97,7 @@
     <image id="mzf841" name="tujian_qiehuan_3.png" path="/imagesExport/"/>
     <image id="mzf842" name="tujian_sjdu.png" path="/imagesExport/"/>
     <image id="mzf843" name="tujian_taoz_3.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m744" name="chapter_3.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Constant/ConstStorageId.cs

@@ -14,6 +14,7 @@ namespace GFGGame
         public const int LAST_LOGIN_TIME = 20006;//上次登录时间
         public const int STUDIO_FILING_CHAPTERID = 20007;//当前选择的副本id
         public const int ARENA_QUICK_FIGHT = 20008;//竞技场快速挑战，0不快速挑战，1快速挑战
+        public const int CHANGE_NAME = 20009;//是否创建过名称，0没有，1已创建
 
     }
 }

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Login/LoginHelper.cs

@@ -1,5 +1,6 @@
 using System;
 using GFGGame;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
 
 namespace ET
 {
@@ -415,9 +416,16 @@ namespace ET
         public static async ETTask<(int, string)> ReqRandomRoleName()
         {
             A2C_GetRandomRoleName response = null;
+            bool notLogin = false;
+            Session accountSession = GameGlobal.zoneScene.GetComponent<SessionComponent>().AccountSession;
+            if (accountSession == null || accountSession.IsDisposed)
+            {
+                notLogin = true;
+                accountSession = GameGlobal.zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
+            }
             try
             {
-                response = (A2C_GetRandomRoleName)await GameGlobal.zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetRandomRoleName()
+                response = (A2C_GetRandomRoleName)await accountSession?.Call(new C2A_GetRandomRoleName()
                 {
                     ServerId = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>().CurrentServerId
                 });
@@ -425,15 +433,27 @@ namespace ET
             catch (Exception e)
             {
                 Log.Debug(e.ToString());
+                if(notLogin)
+                {
+                    accountSession?.Dispose();
+                }
                 return (ErrorCode.ERR_NetWorkError, "");
             }
 
             if (response.Error != ErrorCode.ERR_Success)
             {
                 //Log.Error(response.Error.ToString());
+                if (notLogin)
+                {
+                    accountSession?.Dispose();
+                }
                 return (ErrorCode.ERR_NetWorkError, "");
             }
 
+            if (notLogin)
+            {
+                accountSession?.Dispose();
+            }
             return (ErrorCode.ERR_Success, response.Name);
         }
     }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_CreateRoleUI.cs

@@ -7,10 +7,10 @@ namespace UI.CreateRole
     public partial class UI_CreateRoleUI
     {
         public GComponent target;
-        public GComponent m_bg;
+        public GLoader m_loaBg;
+        public GTextInput m_inputName;
         public GButton m_btnSure;
         public GButton m_btnDice;
-        public GTextInput m_inputName;
         public const string URL = "ui://5al8chbdxt5s0";
         public const string PACKAGE_NAME = "CreateRole";
         public const string RES_NAME = "CreateRoleUI";
@@ -58,17 +58,17 @@ namespace UI.CreateRole
 
         private void Init(GComponent comp)
         {
-            m_bg = (GComponent)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_inputName = (GTextInput)comp.GetChild("inputName");
             m_btnSure = (GButton)comp.GetChild("btnSure");
             m_btnDice = (GButton)comp.GetChild("btnDice");
-            m_inputName = (GTextInput)comp.GetChild("inputName");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
+            m_inputName = null;
             m_btnSure = null;
             m_btnDice = null;
-            m_inputName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -74,7 +74,11 @@ namespace GFGGame
         }
         public static string GetFieldGuideIconPath(string res, string extName = "png")
         {
-            return $"{TEXTURE_DIR_PATH}/FieldGuide/Icon/{res}.{extName}";
+            return $"{TEXTURE_DIR_PATH}/FieldGuide/SuitIcon/{res}.{extName}";
+        }
+        public static string GetChapterGuideIconPath(string res, string extName = "png")
+        {
+            return $"{TEXTURE_DIR_PATH}/FieldGuide/ChapterIcon/{res}.{extName}";
         }
 
         public static string GetNpcHeadPath(string res, string extName = "png")

GameClient/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs

@@ -26,10 +26,11 @@ namespace GFGGame
             packageName = UI_CreateRoleUI.PACKAGE_NAME;
             _ui = UI_CreateRoleUI.Create();
             this.viewCom = _ui.target;
-            this.viewCom.Center();
+            // this.viewCom.Center();
+            this.isfullScreen = true;
             this.clickBlankToClose = false;
             this.modal = true;
-
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_yaoqinghan");
             _ui.m_btnSure.onClick.Add(OnClickBtnSure);
             _ui.m_btnDice.onClick.Add(() =>
             {
@@ -49,7 +50,7 @@ namespace GFGGame
             base.OnHide();
         }
 
-        private void OnClickBtnSure()
+        private async void OnClickBtnSure()
         {
             string roleName = _ui.m_inputName.text;
             if (string.IsNullOrEmpty(roleName))
@@ -69,7 +70,12 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("角色名仅允许汉字、数字、下划线");
                 return;
             }
-            LoginController.ReqCreateRole(roleName).Coroutine();
+            bool result = await RoleInfoSProxy.ReqModifyRoleName(roleName);
+            if (result)
+            {
+                StorageSProxy.ReqSetClientValue(ConstStorageId.CHANGE_NAME, 1).Coroutine();
+                this.Hide();
+            }
         }
 
         private async void RandomRoleName()

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

@@ -63,7 +63,7 @@ namespace GFGGame
             CulturalRelicCfg cfg = culturalRelicCfg[index];
             StoryChapterCfg storyChapterCfg = StoryChapterCfgArray.Instance.GetCfg(cfg.chapterId);
             UI_ChapterGuideItem item = UI_ChapterGuideItem.Proxy(obj);
-            item.m_loaIcon.url = string.Format("ui://FieldGuide/{0}", cfg.iconRes);
+            item.m_loaIcon.url = ResPathUtil.GetChapterGuideIconPath(cfg.bgRes);// string.Format("ui://FieldGuide/{0}", cfg.iconRes);
             bool isPass = InstanceZonesDataManager.CheckChapterPass(storyChapterCfg.type, storyChapterCfg.subType, storyChapterCfg.id, storyChapterCfg.levelCount);
             item.m_grpLock.visible = !isPass;
             item.m_txtDesc.text = string.Format("通关主线第{0}章解锁", NumberUtil.GetChiniseNumberText(storyChapterCfg.order));

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

@@ -59,7 +59,7 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            _ui.m_loaItem.url = string.Format("ui://FieldGuide/{0}", _cfg.bgRes);
+            _ui.m_loaItem.url = ResPathUtil.GetChapterGuideIconPath(_cfg.bgRes); //string.Format("ui://FieldGuide/{0}", _cfg.bgRes);
             _ui.m_txtTitle.text = _cfg.name;
             _ui.m_txtDesc.text = _cfg.desc;
         }

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

@@ -199,16 +199,7 @@ namespace GFGGame
                 UI_CompStoryLevelItem.ProxyEnd();
             }
             _ui.m_chapter.m_compChapterScroll.target.y = 0;// _ui.m_chapter.target.height - _ui.m_chapter.m_compChapterScroll.target.height;
-            if (_endLevelItem != null)
-            {
-                // float tx = _endLevelItem.x + _endLevelItem.width / 2;
-                // float ty = _endLevelItem.y + _endLevelItem.height / 2;
-                // tx = tx - _ui.m_chapter.target.width / 2;
-                // ty = ty - _ui.m_chapter.target.height / 2;
-                // _ui.m_chapter.target.scrollPane.SetPosX(tx, false);
-                // _ui.m_chapter.target.scrollPane.SetPosY(ty, false);
-                // _ui.m_chapter.target.scrollPane.ScrollTop();
-            }
+
         }
 
         private void OnClickLevelItem(EventContext context)

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

@@ -366,6 +366,10 @@ namespace GFGGame
 
         private void ShowDialog(StoryDialogCfg storyDialogCfg)
         {
+            if (storyDialogCfg.showChangeName == 1 && StorageDataManager.Instance.GetStorageValue(ConstStorageId.CHANGE_NAME) == 0)
+            {
+                GameController.ShowCreateRole();
+            }
             _ui.m_loaMask.url = ResPathUtil.GetBgImgPath(storyDialogCfg.maskRes);
             _ui.m_btnAutoPlay.enabled = true;
             _ui.m_list.visible = false;

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

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

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: a527b8145d53c084ea336eef84fc86e1
-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_4!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 6e77a134701556c43a767249759472c1
-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_4.png.meta

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