From 0bcd6ade1fd420aa41ee0908c43d73e1cec2e519 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 27 May 2021 14:06:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=B1=B1=E6=B2=B3=E7=A4=BE?= =?UTF-8?q?=E7=A8=B7=E5=9B=BE=E3=80=91bug=20+=20=E8=B5=84=E6=BA=90=20=20?= =?UTF-8?q?=20=E5=89=8D=E7=AB=AF=E5=BE=97=E5=88=B7=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../s_shanhe_xiaoditu_xiabao.png | Bin 1521 -> 1101 bytes .../s_shanhe_xiaoditu_xiabao_01.png | Bin 1496 -> 1119 bytes .../Prefabs/UI/Common/CardRendererRoot.prefab | 1254 +++++++++++++++++ .../FightLevelSingleChapterPanel.prefab | 4 +- .../FightLevelSingleLevelInfoPopup.prefab | 8 +- .../RTexture/CardTexture10.renderTexture | 34 + .../RTexture/CardTexture10.renderTexture.meta | 8 + .../RTexture/CardTexture11.renderTexture | 34 + .../RTexture/CardTexture11.renderTexture.meta | 8 + .../RTexture/CardTexture12.renderTexture | 34 + .../RTexture/CardTexture12.renderTexture.meta | 8 + .../RTexture/CardTexture7.renderTexture | 34 + .../RTexture/CardTexture7.renderTexture.meta | 8 + .../RTexture/CardTexture8.renderTexture | 34 + .../RTexture/CardTexture8.renderTexture.meta | 8 + .../RTexture/CardTexture9.renderTexture | 34 + .../RTexture/CardTexture9.renderTexture.meta | 8 + .../Framework/Manager/CardRendererManager.lua | 2 +- .../FightLevelSingleLevelInfoPopup.lua | 3 - .../FightLevelInfoPopup_AssistantLevel.lua | 4 +- .../MonsterCamp/MonsterCampNewPanel.lua | 4 +- .../~Lua/View/MonsterCampSingleWave.lua | 2 +- 22 files changed, 1518 insertions(+), 15 deletions(-) create mode 100644 Assets/ManagedResources/RTexture/CardTexture10.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta create mode 100644 Assets/ManagedResources/RTexture/CardTexture11.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta create mode 100644 Assets/ManagedResources/RTexture/CardTexture12.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta create mode 100644 Assets/ManagedResources/RTexture/CardTexture7.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta create mode 100644 Assets/ManagedResources/RTexture/CardTexture8.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta create mode 100644 Assets/ManagedResources/RTexture/CardTexture9.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao.png b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao.png index 5eda53d1fbfccd99069fb5e4380a565d4be8c50c..dff04b74475f833f841da990ad8cb2c8321bad42 100644 GIT binary patch literal 1101 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 literal 1496 zcmV;}1tb>h+E&!*)+WOwrcGGnOfp_0}9Ut!6Lps1X0P)5lXOQsM{Q%d@8r4u0poEzYrLzpHE!+9t?74S7 z|KiI_0BW8hqyyZydez+nPi)%wBV%-kkpBZ-SgxxHFs?k8N(fUdfO{l_fUr!M!m9m# z^3>KHJ9i%kU`sVT*)0IEx8Hnux8G+yL+R~-cP_>`I5QL&H;fJfi^rkVa2)*g!Ygk) z4qy&Im3!U;=!r$cj~R@?ahy9QAVHZI2f|d(+~5!r*x-tYbSshQSq`9AD^T|c_yNSL zc7v~8wH%X~EEr?A1x$1_Nnk1eKP1E=34jVE z8#k;qS1dD;oymbxirb9^O4-6ONF`)E2%%(`_mpuA3=W{TH-V3K?3D6`H74ac1`PS) z%J8WB$)2z9+P1A&w{{Im^Cjf-ML0Up=zoxL6#=Rgpo}R%LlcR|dywqwLw0%w@4f#4 z4j(xxx0^cM6@kUV6OTolk&#jC`fM*YtY3qN9$1gT!2z|U)oh{NZlPXppxti&D?2>} zEX#**IHDAA92dp;d3>|~d+hu6J4{SWAel%Yn=5+Nl<*roab1$=?EzyHKm2qEhmZY^ zEt?<4eXH(4I2=+QhC(3(O#%0YKqbm^sgiBiaPIsC)a!M$nsuD`;|vZR{uP$bhh;-U zD3!{jqcpo70adRlAw*_?45HQduEh1}9DX_a8^*@QkV+;HjfN48M&Yw8m|~&uNH1mD zHX1EdZ5xF`0dx5R>a`lmRU31~GScZZEK8{Da$Lvl><_%7d9-Tv#&`s{Uv89Vno9QI z>g09U^%k1#HZBd1A=Mj4Um~tpSM8c2(QLM03ZaO|cZE_JmSv(+YhX5CKsXeH-)E`& za>c&b(HmT zi)CbI^C(wqxI8?L*|~zseMwG!7Yz8&Zab(}?cC_qse`%(G$aY8(@@A-;5cp|J2O|b zEVC~jjRfV#z455>Kzg6<>&4P^QU#Vr(BSgyfr?#2tzJhg7C|%|#^}{+h=hXbTUm@Q z506e=xH5VGz%YPu05bq8tg8!3B0M)&C}*d0ElP=iOAO8^3kLm40io(WLonb+I21r> zzJgFN0Lxs6dY>s!u2j{(x-Qz|lbOPaGv_W&X0oRMT+sw30pw*<>g)wk080Se1z-h$ zWdKsLYDL4L?X6#fdcckGIzw yNIeoB5$UP4#k}txQ15gq?zZlpbZ1jBfWHBV5E%lm^WTjC0000 Date: Thu, 27 May 2021 14:09:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=A6=8F=E6=98=9F=E9=AB=98?= =?UTF-8?q?=E7=85=A7=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