diff --git a/Assets/Editor/BFOthersTools/BoardEditorTools/BoardEditorWindow.cs b/Assets/Editor/BFOthersTools/BoardEditorTools/BoardEditorWindow.cs index c40f47066..23d1c3b2b 100644 --- a/Assets/Editor/BFOthersTools/BoardEditorTools/BoardEditorWindow.cs +++ b/Assets/Editor/BFOthersTools/BoardEditorTools/BoardEditorWindow.cs @@ -348,7 +348,36 @@ namespace BFEditor GUILayout.BeginVertical(); GUILayout.Label("棋盘边缘元素"); boardEdgeStr = GUILayout.TextField(boardEdgeStr, GUILayout.Width(500), GUILayout.Height(300)); - if(GUILayout.Button("重新加载边缘元素")) + if(GUILayout.Button("加载边缘元素配置")) + { + JArray edgeJo = edgeDict[curIndex]; + string str = "["; + for (int i = 0; i < edgeJo.Count; i++) + { + JArray gridInfo = (JArray)edgeJo[i]; + if (gridInfo.Count < 3) + { + continue; + } + string s = "{"; + for (int j = 0; j < 3; j++) + { + s = s + gridInfo[j].ToString(); + if(j != 2) + { + s = s + ", "; + } + } + s = s + "}"; + str = str + s; + if (i != edgeJo.Count) + { + str = str + ", "; + } + } + boardEdgeStr = str; + } + if(GUILayout.Button("重新刷新边缘元素")) { string[] units = boardEdgeStr.Split('{'); List edgeList = new List(); diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_bg_1.png.meta b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_bg_1.png.meta index be91c3af9..0c295f5f9 100644 --- a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_bg_1.png.meta +++ b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_bg_1.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_1.png b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_1.png index fc23289d9..6c95dd234 100644 Binary files a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_1.png and b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_1.png differ diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_1.png.meta b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_1.png.meta index af6a56ab0..6d5a5f94e 100644 --- a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_1.png.meta +++ b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_1.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_10.png.meta b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_10.png.meta index a8b69b7f8..f9788ef20 100644 --- a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_10.png.meta +++ b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_10.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_2.png b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_2.png index a8e2d7a01..b22f7c1db 100644 Binary files a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_2.png and b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_2.png differ diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_2.png.meta b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_2.png.meta index e20662620..3b35c87a0 100644 --- a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_2.png.meta +++ b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_2.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -79,7 +79,7 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_3.png b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_3.png index 70284fece..fa3839df8 100644 Binary files a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_3.png and b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_3.png differ diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_3.png.meta b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_3.png.meta index 745396f84..6e090c923 100644 --- a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_3.png.meta +++ b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_3.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -79,7 +79,7 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_4.png b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_4.png index 89b154789..b3bcee473 100644 Binary files a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_4.png and b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_4.png differ diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_4.png.meta b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_4.png.meta index 70e04ed4f..15fbe742a 100644 --- a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_4.png.meta +++ b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_4.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -79,7 +79,7 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_5.png.meta b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_5.png.meta index df50ddaf1..e961308df 100644 --- a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_5.png.meta +++ b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_5.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_6.png.meta b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_6.png.meta index f49c93d30..e3b2610f0 100644 --- a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_6.png.meta +++ b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_6.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_7.png b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_7.png index 41c9858e7..122d9904e 100644 Binary files a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_7.png and b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_7.png differ diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_7.png.meta b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_7.png.meta index 0c88c5d06..68018d10d 100644 --- a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_7.png.meta +++ b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_7.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_8.png b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_8.png index a00c56d57..ba2386373 100644 Binary files a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_8.png and b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_8.png differ diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_8.png.meta b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_8.png.meta index a5a7b5ba0..26ecd94a7 100644 --- a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_8.png.meta +++ b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_8.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_9.png.meta b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_9.png.meta index f3f3a91ad..719538ee9 100644 --- a/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_9.png.meta +++ b/Assets/arts/textures/background/dungeon_armor/dungeon_armor_map_9.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/shop/shop_gift_banner_3.png b/Assets/arts/textures/background/shop/shop_gift_banner_3.png index 8fd72421b..53f3386ee 100644 Binary files a/Assets/arts/textures/background/shop/shop_gift_banner_3.png and b/Assets/arts/textures/background/shop/shop_gift_banner_3.png differ diff --git a/Assets/arts/textures/background/shop/shop_gift_banner_3_1.png b/Assets/arts/textures/background/shop/shop_gift_banner_3_1.png index e15ee3e6a..f0863a7c7 100644 Binary files a/Assets/arts/textures/background/shop/shop_gift_banner_3_1.png and b/Assets/arts/textures/background/shop/shop_gift_banner_3_1.png differ diff --git a/Assets/arts/textures/icon/hero/16.png b/Assets/arts/textures/icon/hero/16.png index 3ae8c0451..088707030 100644 Binary files a/Assets/arts/textures/icon/hero/16.png and b/Assets/arts/textures/icon/hero/16.png differ diff --git a/Assets/arts/textures/icon/hero_2/16.png b/Assets/arts/textures/icon/hero_2/16.png index cf07c4793..cf2333611 100644 Binary files a/Assets/arts/textures/icon/hero_2/16.png and b/Assets/arts/textures/icon/hero_2/16.png differ diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_1.png b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_1.png index d2c9890e8..005d877c4 100644 Binary files a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_1.png and b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_1.png differ diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_1_1.png b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_1_1.png index abda75357..bc51e1d5d 100644 Binary files a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_1_1.png and b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_1_1.png differ diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_2.png b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_2.png index 681b2b757..fcb98f713 100644 Binary files a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_2.png and b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_2.png differ diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_2_1.png b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_2_1.png index 18144f80b..ddd6e5da4 100644 Binary files a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_2_1.png and b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_2_1.png differ diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_4.png b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_4.png index 368495d53..8ac417ae9 100644 Binary files a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_4.png and b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_4.png differ diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_4_1.png b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_4_1.png index f1ad9354f..8da9a6cc6 100644 Binary files a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_4_1.png and b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_4_1.png differ diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_5.png b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_5.png index 3b02e9fd8..4af5e3e25 100644 Binary files a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_5.png and b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_5.png differ diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_5_1.png b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_5_1.png index ccc279677..54019f9dc 100644 Binary files a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_5_1.png and b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_house_5_1.png differ