From e615af90114979feec6e768fb32a5684b5976ca9 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 27 May 2021 14:09:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A6=8F=E6=98=9F=E9=AB=98=E7=85=A7?= =?UTF-8?q?=E3=80=91bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../r_guanka_shanheshejitubiao.png.meta | 11 +++++++ .../r_guanka_shanheshejituzi.png.meta | 11 +++++++ .../s_shanhe_xiaoditu_baoxiang_01.png.meta | 11 +++++++ ...s_shanhe_xiaoditu_biaoxiamingzidi.png.meta | 11 +++++++ ...hanhe_xiaoditu_biaoxiamingzidi_01.png.meta | 11 +++++++ .../s_shanhe_xiaoditu_dabiao.png.meta | 11 +++++++ .../s_shanhe_xiaoditu_dabiao_01.png.meta | 11 +++++++ .../s_shanhe_xiaoditu_jian.png.meta | 11 +++++++ .../s_shanhe_xiaoditu_jian_01.png.meta | 11 +++++++ .../s_shanhe_xiaoditu_xiabao.png.meta | 11 +++++++ .../s_shanhe_xiaoditu_xiabao_01.png.meta | 11 +++++++ .../s_shanhe_xiaoditu_xingxing.png.meta | 11 +++++++ .../s_shanhe_xiaoditu_zhongbiao.png.meta | 11 +++++++ .../s_shanhe_xiaoditu_zhongbiao_01.png.meta | 11 +++++++ .../BG/ArtFont/b_baibao_banzi_zh.png.meta | 2 +- .../r_zjm_paihangbang_banner01_zh.png.meta | 2 +- .../r_zjm_paihangbang_banner02_zh.png.meta | 2 +- .../r_zjm_paihangbang_banner03_zh.png.meta | 2 +- .../r_zjm_paihangbang_banner04_zh.png.meta | 2 +- .../ArtFont/x_xrsc_banner_zh.png.meta | 2 +- .../~Lua/Modules/Expert/PatFaceManager.lua | 32 +++++++++---------- .../~Lua/Modules/Expert/PatFacePanel.lua | 20 ++++++------ .../FuXingGaoZhao/FuXingGaoZhaoManager.lua | 14 ++++++-- .../FuXingGaoZhao/FuXingGaoZhaoPanel.lua | 6 ++++ 24 files changed, 203 insertions(+), 35 deletions(-) diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejitubiao.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejitubiao.png.meta index 24c4d06619..1010a75b29 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejitubiao.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejitubiao.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejituzi.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejituzi.png.meta index 9028625a61..5a70c593eb 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejituzi.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/r_guanka_shanheshejituzi.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_baoxiang_01.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_baoxiang_01.png.meta index c61edc9fe9..697cb56b17 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_baoxiang_01.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_baoxiang_01.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_biaoxiamingzidi.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_biaoxiamingzidi.png.meta index 239718269f..6bdf7b62f9 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_biaoxiamingzidi.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_biaoxiamingzidi.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_biaoxiamingzidi_01.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_biaoxiamingzidi_01.png.meta index 2673ec606d..4ea5bb6d9a 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_biaoxiamingzidi_01.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_biaoxiamingzidi_01.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_dabiao.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_dabiao.png.meta index add1845437..b9e30f3290 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_dabiao.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_dabiao.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_dabiao_01.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_dabiao_01.png.meta index a2cf3dcc63..a42f814932 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_dabiao_01.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_dabiao_01.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_jian.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_jian.png.meta index bb2fa85133..5e477721f5 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_jian.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_jian.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_jian_01.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_jian_01.png.meta index 12fd1fd5af..8ccea07f44 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_jian_01.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_jian_01.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao.png.meta index 62a79a3278..27960b0f98 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao_01.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao_01.png.meta index 8053c7c4c1..beaaaf81d2 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao_01.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao_01.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xingxing.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xingxing.png.meta index 4acbf422ac..f4a7470168 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xingxing.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xingxing.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_zhongbiao.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_zhongbiao.png.meta index 371e5c1d71..3bf6f45f46 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_zhongbiao.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_zhongbiao.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_zhongbiao_01.png.meta b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_zhongbiao_01.png.meta index 93eab5eba9..921347e5ca 100644 --- a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_zhongbiao_01.png.meta +++ b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_zhongbiao_01.png.meta @@ -80,6 +80,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/BG/ArtFont/b_baibao_banzi_zh.png.meta b/Assets/ManagedResources/BG/ArtFont/b_baibao_banzi_zh.png.meta index cf1797fa6b..78bc0e6551 100644 --- a/Assets/ManagedResources/BG/ArtFont/b_baibao_banzi_zh.png.meta +++ b/Assets/ManagedResources/BG/ArtFont/b_baibao_banzi_zh.png.meta @@ -41,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png.meta index 4e5e3a71e9..7160a59279 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png.meta @@ -41,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png.meta index 73fc7e673d..321a7d43a0 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png.meta @@ -41,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png.meta index 36b1f75bf4..8b45048b8a 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png.meta @@ -41,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png.meta index 981f556c42..029a360bd3 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png.meta @@ -41,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/x_xrsc_banner_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/x_xrsc_banner_zh.png.meta index c97aa6a9d8..5c77e2bd24 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/x_xrsc_banner_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/x_xrsc_banner_zh.png.meta @@ -41,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index b214ffce75..293f5f26e6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -244,22 +244,22 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum) table.insert(patFaceAllData,v) end end - elseif v.Type == 12 then--福星高照活动 - local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao) - local data = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#") - local time = 0--ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp() - if ActData.value == 0 then - time = ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp() - elseif ActData.value == 1 then - time = ActData.mission[1].progress + #ActData.mission*86400 - GetTimeStamp() - elseif ActData.value == 2 then - time = 0 - end - if time >0 then - if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then - table.insert(patFaceAllData,v) - end - end + -- elseif v.Type == 12 then--福星高照活动 + -- local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao) + -- local data = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#") + -- local time = 0--ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp() + -- if ActData.value == 0 then + -- time = ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp() + -- elseif ActData.value == 1 then + -- time = ActData.mission[1].progress + #ActData.mission*86400 - GetTimeStamp() + -- elseif ActData.value == 2 then + -- time = 0 + -- end + -- if time >0 then + -- if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then + -- table.insert(patFaceAllData,v) + -- end + -- end else if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then table.insert(patFaceAllData,v) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index f5b150c932..6738ad5994 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -75,8 +75,8 @@ function PatFacePanel:InitComponent() self.obg7 = Util.GetGameObject(self.transform, "frame/obg7") --限时神装礼包 self.obg8 = Util.GetGameObject(self.transform, "frame/obg8") - --福星高照活动 - self.obg9 = Util.GetGameObject(self.transform, "frame/obg9") + -- --福星高照活动 + -- self.obg9 = Util.GetGameObject(self.transform, "frame/obg9") end --绑定事件(用于子类重写) @@ -135,7 +135,7 @@ function PatFacePanel:OnShowPatFaceData() patFaceSingleData.Type == FacePanelType.MainLevel or patFaceSingleData.Type == FacePanelType.Pokemon) self.obg8:SetActive(patFaceSingleData.Type == FacePanelType.TimeLimitSkin) - self.obg9:SetActive(patFaceSingleData.Type == FacePanelType.FuXingGaoZhao) + -- self.obg9:SetActive(patFaceSingleData.Type == FacePanelType.FuXingGaoZhao) if patFaceSingleData.Type == FacePanelType.Sbtj then self:OnShowOb1Data() elseif patFaceSingleData.Type == FacePanelType.Tesc then @@ -158,9 +158,9 @@ function PatFacePanel:OnShowPatFaceData() self:OnShowOb7Data(patFaceSingleData.Type) elseif patFaceSingleData.Type == FacePanelType.TimeLimitSkin then self:OnShowOb8Data() - elseif patFaceSingleData.Type == FacePanelType.FuXingGaoZhao then - LogRed("patFaceSingleData.Type == FacePanelType.FuXingGaoZhao") - self:OnShowOb9Data() + -- elseif patFaceSingleData.Type == FacePanelType.FuXingGaoZhao then + -- LogRed("patFaceSingleData.Type == FacePanelType.FuXingGaoZhao") + -- self:OnShowOb9Data() end end end @@ -363,10 +363,10 @@ function PatFacePanel:OnShowOb8Data() end --第九种 --福星高照活动 -function PatFacePanel:OnShowOb9Data() - LogRed("function PatFacePanel:OnShowOb9Data()") - UIManager.OpenPanel(UIName.FuXingGaoZhaoPanel,function() self:ClosePanel() end) -end +-- function PatFacePanel:OnShowOb9Data() +-- LogRed("function PatFacePanel:OnShowOb9Data()") +-- UIManager.OpenPanel(UIName.FuXingGaoZhaoPanel,function() self:ClosePanel() end) +-- end function PatFacePanel:JumpBtnClickEvent() if openPanle then diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua index d15c005b2c..c893e2c026 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua @@ -1,6 +1,7 @@ FuXingGaoZhaoManager = {} local this = FuXingGaoZhaoManager local Data = {} +local timeData = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#") function this.Initialize() end @@ -55,15 +56,22 @@ end function this.CheckRedPoint() this.InitRewardData() - if Data.ActState == 1 then + if Data.ActState == 0 then + local time = Data.startTime + tonumber(timeData[1])*86400 - GetTimeStamp() + local curDay = math.ceil(time/86400) + local str = PlayerPrefs.GetInt(PlayerManager.uid.."FuXingGaoZhao"..curDay) + if str == 0 then + return true + end + elseif Data.ActState == 1 then for i = 1, #Data.rewards do if Data.rewards[i].State == 0 and Data.rewards[i].Progress <= GetTimeStamp() then - -- LogBlue("Return true") + LogBlue("Return true") return true end end end - -- LogBlue("Return false") + LogBlue("Return false") return false end diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua index 82851610dd..008ad7a035 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua @@ -66,10 +66,12 @@ end --添加事件监听(用于子类重写) function FuXingGaoZhaoPanel:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, self.Refresh,self) end --移除事件监听(用于子类重写) function FuXingGaoZhaoPanel:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, self.Refresh,self) end function FuXingGaoZhaoPanel:OnSortingOrderChange() @@ -110,6 +112,7 @@ end function FuXingGaoZhaoPanel:Refresh() self.data = FuXingGaoZhaoManager.GetData() + LogYellow("self.data.ActState:"..tostring(self.data.ActState)) self:SetBtn() if self.data.ActState == 0 then self:SetTime() @@ -144,6 +147,9 @@ function FuXingGaoZhaoPanel:SetTime() self.timer = nil end local time = self.data.startTime + tonumber(timeData[1])*86400 - GetTimeStamp() + local curDay = math.ceil(time/86400) + PlayerPrefs.SetInt(PlayerManager.uid.."FuXingGaoZhao"..curDay,1) + CheckRedPointStatus(RedPointType.FuXingGaoZhao) self.time.text = string.format(Language[12246],TimeToFelaxible(time)) self.timer = Timer.New(function() time = time - 1