From c6704e6ed415f283f315bcd0a6963e187d707726 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 20 Oct 2020 00:38:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=80=8D=E9=81=A5=E6=B8=B8=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BD=E7=89=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BG/UI/XiaoYao/x_xiaoyaoyou_dazhezhao.png.meta | 15 ++------------- .../x_xiaoyaoyou_huanshen_xetiao_01.png.meta | 15 ++------------- .../x_xiaoyaoyou_huanshen_xetiao_02.png.meta | 15 ++------------- .../XiaoYao/x_xiaoyaoyou_zhuanpandi_ditu.png.meta | 15 ++------------- .../BG/UI/XiaoYao/x_xiaoyaoyou_zidi.png.meta | 15 ++------------- .../~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua | 5 ++++- 6 files changed, 14 insertions(+), 66 deletions(-) diff --git a/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_dazhezhao.png.meta b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_dazhezhao.png.meta index fdac1f458b..c5b66f2044 100644 --- a/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_dazhezhao.png.meta +++ b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_dazhezhao.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9d7cddc1469e27b43a9d6972df52b08a +guid: dd33dc07990f85b4898959da64469f87 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -108,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 55db3e598a5b6d54281809da51109e5b + spriteID: 849808019cb88ea44a826d92b5919632 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_01.png.meta b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_01.png.meta index 964dde52da..a20408f8cb 100644 --- a/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_01.png.meta +++ b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_01.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1f405bbd99022aa4a9a07cada55ad333 +guid: 0ac2a617d7aaa3849b86fbd2ba22e70b TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -108,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 46cd0a7a1126fd74581c095c23377104 + spriteID: 72f8315e4dba3c4429db52c3f434f091 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_02.png.meta b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_02.png.meta index 5bcbf579a1..4a3fd14580 100644 --- a/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_02.png.meta +++ b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_huanshen_xetiao_02.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9515d79a7df714c409f08f7ffc5e5291 +guid: a1463ec780f084546a35f88038d4087d TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -108,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: bebf05fa4a836f345b78bbb4510bc131 + spriteID: 53a8413ff56bd054b9f33970499ae2de vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_zhuanpandi_ditu.png.meta b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_zhuanpandi_ditu.png.meta index ad0081b8e7..26c270035b 100644 --- a/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_zhuanpandi_ditu.png.meta +++ b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_zhuanpandi_ditu.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f5a0df4dea895324ca1368b5cc417e1f +guid: 0bd9d805cbf5a4b46b4f8e593ca8c0d3 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -108,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 69b07ac43f83f654a83be15c58fac12c + spriteID: 758ca595e19a48e46957eaff0732933b vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_zidi.png.meta b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_zidi.png.meta index 0266dc7ca4..c872bbc36b 100644 --- a/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_zidi.png.meta +++ b/Assets/ManagedResources/BG/UI/XiaoYao/x_xiaoyaoyou_zidi.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 99c1872e47465ce4a9332827a3fb8d92 +guid: 6a8851429d5982a458c1af37ed7176f9 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -108,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: c73a8a34478e03b478d7db26345be3bb + spriteID: 4815bda03874c194fac63150625c9d4b vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua index d7d9a7cf50..b321547266 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua @@ -224,7 +224,10 @@ function this.UpdateYunYouVleShow() end --界面关闭时调用(用于子类重写) function this:OnClose() - + if this.timer then + this.timer:Stop() + end + this.timer = nil end --界面销毁时调用(用于子类重写)