处理朝代更替、UI替换的问题

UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_主界面.spriteatlas

@@ -71,6 +71,8 @@ SpriteAtlas:
     secondaryTextureSettings: {}
     variantMultiplier: 1
     packables:
+    - {fileID: 21300000, guid: f602b4f90c80ffb42b32186d8075f24d, type: 3}
+    - {fileID: 21300000, guid: 8d10d57a9612abc4d8186cdc0eb7647a, type: 3}
     - {fileID: 21300000, guid: 7bb55d6ab10161a4e8ebf0033432909a, type: 3}
     - {fileID: 21300000, guid: 98ee06a4f7f7e7e488584f6872038044, type: 3}
     - {fileID: 21300000, guid: c23c25c21a0ab48448d8fbcd9846a1d6, type: 3}
@@ -115,9 +117,6 @@ SpriteAtlas:
     - {fileID: 21300000, guid: cfd2f569a0b350d41be563c8c0c3c8dc, type: 3}
     - {fileID: 21300000, guid: b8ba25f72aad3364c9cf90b708dcf73d, type: 3}
     - {fileID: 21300000, guid: dc1fef4f2611ecf4e88e5869cfbea019, type: 3}
-    - {fileID: 21300000, guid: f602b4f90c80ffb42b32186d8075f24d, type: 3}
-    - {fileID: 21300000, guid: 8d10d57a9612abc4d8186cdc0eb7647a, type: 3}
-    - {fileID: 21300000, guid: dcc007fc353774d48b94e30f0e6a3485, type: 3}
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
@@ -159,7 +158,6 @@ SpriteAtlas:
     - 280312aa89342d240a9aae00ee6542b8: 21300000
     - 13c28b9bef016f149aa882bc73c50ce7: 21300000
     - 6ce9cf9bf19c0904db471d9c65874892: 21300000
-    - dcc007fc353774d48b94e30f0e6a3485: 21300000
     - 30f8a8fd10da84a42acb2d23aad7d118: 21300000
     - 516d8abe3c2c1bc42b6390c10af872bf: 21300000
     - 481fe1de817043646ad49730f16ffd48: 21300000
@@ -208,7 +206,6 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 280312aa89342d240a9aae00ee6542b8, type: 3}
   - {fileID: 21300000, guid: 13c28b9bef016f149aa882bc73c50ce7, type: 3}
   - {fileID: 21300000, guid: 6ce9cf9bf19c0904db471d9c65874892, type: 3}
-  - {fileID: 21300000, guid: dcc007fc353774d48b94e30f0e6a3485, type: 3}
   - {fileID: 21300000, guid: 30f8a8fd10da84a42acb2d23aad7d118, type: 3}
   - {fileID: 21300000, guid: 516d8abe3c2c1bc42b6390c10af872bf, type: 3}
   - {fileID: 21300000, guid: 481fe1de817043646ad49730f16ffd48, type: 3}
@@ -250,13 +247,12 @@ SpriteAtlas:
   - zjm_mz_9
   - zjm_YS_DT8
   - zjm_jdt_9
-  - zjm_ys_BT
+  - zjm_1_BT
   - zjm_LCJDT
-  - zjm_ys_sjsj
+  - zjm_1_sjsj
   - zjm_bt_zqdn
   - zjm_cj_BJ
   - zjm_jdt_4
-  - "\u4E3B\u754C\u9762\u2014\u4FEE\u4ED9"
   - zjm_YS_DT4
   - zjm_YS_DT10
   - zjm_YS_DT3

UnityProject/Assets/AssetRaw/Materials/JDT6.mat

@@ -11,7 +11,8 @@ Material:
   m_Shader: {fileID: 4800000, guid: 8051d8a533a10b541a591e43ef313e96, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _USEONEEM_ON
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -191,7 +192,7 @@ Material:
     - _UseEmTex_R_A: 0
     - _UseMainTex_RGB_A: 0
     - _UseMainTex_Ramp_RGB_A: 0
-    - _UseOneEM: 0
+    - _UseOneEM: 1
     - _UseOneNoise: 1
     - _UseTur_Mask: 0
     - _Use_Flash: 0

UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/主界面—修仙.png.meta

@@ -1,114 +0,0 @@
-fileFormatVersion: 2
-guid: dcc007fc353774d48b94e30f0e6a3485
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  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
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 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: 0
-  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
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs

@@ -126,7 +126,7 @@ namespace GameLogic
                 // 移除超时的Buff
                 foreach (var buff in m_tempBuffList)
                 {
-                    Log.Debug("移除Buff列表:" + buff.m_Id);
+                    //Log.Debug("移除Buff列表:" + buff.m_Id);
                     if (buff.m_EffectGo != null)
                     {
                         GameObject.Destroy(buff.m_EffectGo);
@@ -197,7 +197,7 @@ namespace GameLogic
         public void AddBuff(Buff buff, UnitPlayerData unitPlayerData, GiftConfig giftConfig)
         {
 
-            Log.Debug("获得Buff " + buff.m_Id);
+            //Log.Debug("获得Buff " + buff.m_Id);
             // 确认Buff效果,生成指定Buff特效.
             if (buff.m_Id == 5)
             {
@@ -366,17 +366,5 @@ namespace GameLogic
 
             m_rectCar.transform.GetChild(key).gameObject.SetActive(true);
         }
-
-
-        /// <summary>
-        /// Unity 的 Update 方法
-        /// </summary>
-        protected override void OnUpdate()
-        {
-            base.OnUpdate();
-
-        }
-
-
     }
 }

UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs

@@ -643,6 +643,8 @@ namespace GameLogic
                 }
             }
 
+            Log.Debug("当前朝代id" + id);
+
             // 选出当前朝代Id
             if (id != m_TeamId)
             {

UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs

@@ -94,7 +94,7 @@ namespace GameLogic
                 // 计算位置
                 r.anchorMin = new Vector2(0.5f, 0.5f);
                 r.anchorMax = new Vector2(0.5f, 0.5f);
-                r.anchoredPosition = new Vector2(0, 478 - i * (109 - 5f));
+                r.anchoredPosition = new Vector2(0, 478 -65 - i * (109 - 5f));
                 r.localPosition = new Vector3(r.localPosition.x, r.localPosition.y, 0);
                 actorHItem.OnInit(i);
                 DataGameSceneManager.Instance.m_DicTeamList.Add((i + 1).ToString(), actorHItem);
@@ -233,7 +233,8 @@ namespace GameLogic
         /// </summary>
         private void SwitchUIResource()
         {
-            m_img_BT.sprite = GameModule.Resource.LoadAsset<Sprite>(string.Format("zjm_{0}_BT",DataGameSceneManager.Instance.m_TeamId));
+            m_img_BT.sprite = GameModule.Resource.LoadAsset<Sprite>(string.Format("zjm_{0}_BT",DataGameSceneManager.Instance.m_TeamId + 1));
+            m_img_BT.SetNativeSize();
         }
 
         /// <summary>