diff --git a/Assets/ManagedResources/Icon/Hero.meta b/Assets/ManagedResources/Icon/Hero.meta new file mode 100644 index 0000000000..69f4289151 --- /dev/null +++ b/Assets/ManagedResources/Icon/Hero.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07ad2d993eb805848a79b068c2b52c6b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icons/c_dhdj_00042_s1_t1.png b/Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png similarity index 100% rename from Assets/ManagedResources/Icons/c_dhdj_00042_s1_t1.png rename to Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png diff --git a/Assets/ManagedResources/Icons/c_dhdj_00042_s1_t1.png.meta b/Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png.meta similarity index 69% rename from Assets/ManagedResources/Icons/c_dhdj_00042_s1_t1.png.meta rename to Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png.meta index 18d6345de0..c80b6944f5 100644 --- a/Assets/ManagedResources/Icons/c_dhdj_00042_s1_t1.png.meta +++ b/Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png.meta @@ -69,6 +69,39 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png b/Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png new file mode 100644 index 0000000000..275154d325 Binary files /dev/null and b/Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png differ diff --git a/Assets/ManagedResources/Icons/c_dhdj_00042_s1_t3.png.meta b/Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png.meta similarity index 57% rename from Assets/ManagedResources/Icons/c_dhdj_00042_s1_t3.png.meta rename to Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png.meta index 4721f63d11..bf92c53e6f 100644 --- a/Assets/ManagedResources/Icons/c_dhdj_00042_s1_t3.png.meta +++ b/Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: a877b1d4c64f7fc4a99b2590651da68b TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: c_dhdj_00042_s1_t3 externalObjects: {} serializedVersion: 9 mipmaps: @@ -40,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -69,9 +70,62 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_dhdj_00042_s1_t3 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 178 + height: 426 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 3bd91b693a84464479f2d60e907c1804 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/Icons/c_swk_00015_s1_t1.png b/Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png similarity index 100% rename from Assets/ManagedResources/Icons/c_swk_00015_s1_t1.png rename to Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png diff --git a/Assets/ManagedResources/Icons/c_swk_00015_s1_t1.png.meta b/Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png.meta similarity index 69% rename from Assets/ManagedResources/Icons/c_swk_00015_s1_t1.png.meta rename to Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png.meta index 17c1706192..077caf9a6f 100644 --- a/Assets/ManagedResources/Icons/c_swk_00015_s1_t1.png.meta +++ b/Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png.meta @@ -69,6 +69,39 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png b/Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png new file mode 100644 index 0000000000..c53d6701e4 Binary files /dev/null and b/Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png differ diff --git a/Assets/ManagedResources/Icons/c_swk_00015_s1_t3.png.meta b/Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png.meta similarity index 58% rename from Assets/ManagedResources/Icons/c_swk_00015_s1_t3.png.meta rename to Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png.meta index 4227daab9b..5f2b36e572 100644 --- a/Assets/ManagedResources/Icons/c_swk_00015_s1_t3.png.meta +++ b/Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: 7adca57982c2d6d4bbf0c46db97759b2 TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: c_swk_00015_s1_t3 externalObjects: {} serializedVersion: 9 mipmaps: @@ -40,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -69,9 +70,62 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: c_swk_00015_s1_t3 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 178 + height: 426 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: de7537584f98bbc4784a98006d608749 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/Icons/c_dhdj_00042_s1_t3.png b/Assets/ManagedResources/Icons/c_dhdj_00042_s1_t3.png deleted file mode 100644 index a711017503..0000000000 Binary files a/Assets/ManagedResources/Icons/c_dhdj_00042_s1_t3.png and /dev/null differ diff --git a/Assets/ManagedResources/Icons/c_swk_00015_s1_t3.png b/Assets/ManagedResources/Icons/c_swk_00015_s1_t3.png deleted file mode 100644 index c2f961c965..0000000000 Binary files a/Assets/ManagedResources/Icons/c_swk_00015_s1_t3.png and /dev/null differ diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab index 001e0aa732..adb71ed82f 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab @@ -107,9 +107,9 @@ RectTransform: m_Father: {fileID: 5211396039673714623} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.8000489, y: 234.75} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.8000489, y: 14.75} m_SizeDelta: {x: 307, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5211396038736745013 @@ -681,8 +681,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 200} + m_AnchoredPosition: {x: -1.6, y: 0} + m_SizeDelta: {x: 960.4, y: 346.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5211396040021950477 CanvasRenderer: @@ -713,7 +713,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 100, y: 100} - m_Spacing: {x: 60, y: 0} + m_Spacing: {x: 60, y: 50} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &6263630824520525492 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RankView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RankView.lua index 70ab0a4d00..641d89ae80 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RankView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RankView.lua @@ -91,9 +91,9 @@ end function ATM_RankView:OnOpen(...) this.RefreshRankInfo() end - +this.sortingOrder = 0 function ATM_RankView:OnSortingOrderChange(sortingOrder) - + this.sortingOrder = sortingOrder or 0 end --界面关闭时调用(用于子类重写)