diff --git a/Assets/arts/atlas/ui/act_common.asset b/Assets/arts/atlas/ui/act_common.asset index aa79e0ce2..eac6f2475 100644 --- a/Assets/arts/atlas/ui/act_common.asset +++ b/Assets/arts/atlas/ui/act_common.asset @@ -48,6 +48,8 @@ MonoBehaviour: - {fileID: 21300000, guid: 802e658d6f57f9b47aee77e8e8522826, type: 3} - {fileID: 21300000, guid: 41f05facab6c90349a9d210b6694273c, type: 3} - {fileID: 21300000, guid: f9526b59c13c3294d871e18019325fba, type: 3} + - {fileID: 21300000, guid: 3f4bc20ca51384338af6237771875beb, type: 3} + - {fileID: 21300000, guid: a84a6f6855741442a8b5e7d769217e2e, type: 3} - {fileID: 21300000, guid: cc14e3e6431d3be4cab00cbc97131f86, type: 3} - {fileID: 21300000, guid: c7347360084fc66449a031e524975a42, type: 3} - {fileID: 21300000, guid: e28dfe8ca34221e458141880d94104d4, type: 3} @@ -226,4 +228,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 9b0c72ee6bd91d64b9793aa8a2e4bfe4, type: 3} - {fileID: 21300000, guid: e0db0ada99791964bac9c02f92e6b04b, type: 3} - {fileID: 21300000, guid: 5cbb4c1d1c46f9d43870f838755ed134, type: 3} - spriteNameList: 81edc3405eb071e0925bc42d935bc42d945bc42d955bc42d965bc42d975bc42d985bc42d995bc42d9a5bc42d5fb071e0b15bc42db25bc42db35bc42db45bc42db55bc42db65bc42db75bc42db85bc42db95bc42dba5bc42d60b071e0d05bc42dd15bc42dd25bc42dd35bc42dd45bc42dd55bc42dd65bc42dd75bc42dd85bc42dd95bc42d61b071e0ef5bc42d62b071e063b071e064b071e065b071e066b071e0110efddb3fb4a4a340b4a4a341b4a4a342b4a4a343b4a4a3120efddb130efddb140efddb150efddb160efddb170efddb180efddb190efddb449e01cf459e01cf469e01cf479e01cf489e01cf499e01cf4a9e01cf4782ca2d391833e53a1833e53b442fc13c442fc1fc472fc1fd472fc1bd4b2fc1be4b2fc17e4f2fc17f4f2fc13f532fc140532fc100572fc101572fc1c15a2fc1c25a2fc1825e2fc1835e2fc143622fc144622fc104662fc105662fc14882ca2dfa1b33e5fb1b33e59ab82fc19bb82fc15bbc2fc15cbc2fc11cc02fc11dc02fc1ddc32fc1dec32fc19ec72fc19fc72fc15fcb2fc160cb2fc120cf2fc121cf2fc1e1d22fc1e2d22fc1a2d62fc1a3d62fc163da2fc164da2fc1bb1f33e5bc1f33e5f92c30c1fa2c30c1ba3030c1bb3030c17b3430c17c3430c13c3830c13d3830c1fd3b30c1fe3b30c1be3f30c1bf3f30c17f4330c1804330c1404730c1414730c1014b30c1024b30c1c24e30c1c34e30c17c2333e57d2333e558a130c159a130c119a530c11aa530c1daa830c1dba830c19bac30c19cac30c15cb030c15db030c13d2733e53e2733e5fe2a33e5ff2a33e5bf2e33e5c02e33e5803233e5813233e5413633e5423633e536e96489503cce976c6b2a056d6b2a056e6b2a056db6df2d6317178e6417178e6517178e6617178e6717178e6817178e6917178e6a17178e6b17178e6eb6df2d6fb6df2d70b6df2d71b6df2d72b6df2d73b6df2d74b6df2d75b6df2daf4ffb4ab04ffb4ab14ffb4aeb3a1f96740c33668d56fb9b8e56fb9b380d789d390d789d3b7203c13c7203c13d7203c13e7203c10673dde60773dde60c73dde6589250040d73dde6b706510410f4d0f4c23b6404c33b6404e3fcb3a74059bf2e4159bf2e438d0701032df98a82068b0583068b05fb068552fc068552fd068552ad279fe6ae279fe6af279fe6b0279fe6246d861a974096eb984096eb + spriteNameList: 81edc3405eb071e0925bc42d935bc42d945bc42d955bc42d965bc42d975bc42d985bc42d995bc42d9a5bc42d5fb071e0b15bc42db25bc42db35bc42db45bc42db55bc42db65bc42db75bc42db85bc42db95bc42dba5bc42d60b071e0d05bc42dd15bc42dd25bc42dd35bc42dd45bc42dd55bc42dd65bc42dd75bc42dd85bc42dd95bc42d61b071e0ef5bc42df35bc42df45bc42d62b071e063b071e064b071e065b071e066b071e0110efddb3fb4a4a340b4a4a341b4a4a342b4a4a343b4a4a3120efddb130efddb140efddb150efddb160efddb170efddb180efddb190efddb449e01cf459e01cf469e01cf479e01cf489e01cf499e01cf4a9e01cf4782ca2d391833e53a1833e53b442fc13c442fc1fc472fc1fd472fc1bd4b2fc1be4b2fc17e4f2fc17f4f2fc13f532fc140532fc100572fc101572fc1c15a2fc1c25a2fc1825e2fc1835e2fc143622fc144622fc104662fc105662fc14882ca2dfa1b33e5fb1b33e59ab82fc19bb82fc15bbc2fc15cbc2fc11cc02fc11dc02fc1ddc32fc1dec32fc19ec72fc19fc72fc15fcb2fc160cb2fc120cf2fc121cf2fc1e1d22fc1e2d22fc1a2d62fc1a3d62fc163da2fc164da2fc1bb1f33e5bc1f33e5f92c30c1fa2c30c1ba3030c1bb3030c17b3430c17c3430c13c3830c13d3830c1fd3b30c1fe3b30c1be3f30c1bf3f30c17f4330c1804330c1404730c1414730c1014b30c1024b30c1c24e30c1c34e30c17c2333e57d2333e558a130c159a130c119a530c11aa530c1daa830c1dba830c19bac30c19cac30c15cb030c15db030c13d2733e53e2733e5fe2a33e5ff2a33e5bf2e33e5c02e33e5803233e5813233e5413633e5423633e536e96489503cce976c6b2a056d6b2a056e6b2a056db6df2d6317178e6417178e6517178e6617178e6717178e6817178e6917178e6a17178e6b17178e6eb6df2d6fb6df2d70b6df2d71b6df2d72b6df2d73b6df2d74b6df2d75b6df2daf4ffb4ab04ffb4ab14ffb4aeb3a1f96740c33668d56fb9b8e56fb9b380d789d390d789d3b7203c13c7203c13d7203c13e7203c10673dde60773dde60c73dde6589250040d73dde6b706510410f4d0f4c23b6404c33b6404e3fcb3a74059bf2e4159bf2e438d0701032df98a82068b0583068b05fb068552fc068552fd068552ad279fe6ae279fe6af279fe6b0279fe6246d861a974096eb984096eb diff --git a/Assets/arts/atlas/ui/act_sevenday.asset b/Assets/arts/atlas/ui/act_sevenday.asset index 137d2030e..68c533aae 100644 --- a/Assets/arts/atlas/ui/act_sevenday.asset +++ b/Assets/arts/atlas/ui/act_sevenday.asset @@ -18,7 +18,13 @@ MonoBehaviour: - {fileID: 21300000, guid: fac43e36a903120468b2f9403902bc12, type: 3} - {fileID: 21300000, guid: 0021dd3e4d3d5694da221e56c411facd, type: 3} - {fileID: 21300000, guid: faaa72e32d5ad984d96eebae182eeea7, type: 3} + - {fileID: 21300000, guid: dc3a636ac41a9415c80525fb6f9aa96e, type: 3} + - {fileID: 21300000, guid: 45f879f9302d641d9b1eaabaca80eece, type: 3} - {fileID: 21300000, guid: 4dc2ae73e3e696f4f91b46d31e84c4e2, type: 3} - {fileID: 21300000, guid: 1d8640fe372faf34e85062b3746184c2, type: 3} - {fileID: 21300000, guid: b62751b2a059ee049b6128a78434b444, type: 3} - spriteNameList: 828e09fd223b203b9af752ad9bf752ad9cf752ad55adddf756adddf7b15627fd + - {fileID: 21300000, guid: ca87192a802f541059176174b37e8df8, type: 3} + - {fileID: 21300000, guid: 8522a6ff9442d4ff0bbec676b3980511, type: 3} + - {fileID: 21300000, guid: 0b4aa1ca854ea4392aa8a9835c5e9281, type: 3} + - {fileID: 21300000, guid: d47ffd9e1a2fd4595925bcca530be4a7, type: 3} + spriteNameList: 828e09fd223b203b9af752ad9bf752ad9cf752ad9df752ad9ef752ad55adddf756adddf7b15627fdb25627fd747524b7757524b747ccd9a6 diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index 9d32cb3ac..76ca5000a 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -264,6 +264,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 3b14bc3747e2c3248b47a3ac14d44d6d, type: 3} - {fileID: 21300000, guid: 89783d5ddc9ab034687ff93732ebdfe0, type: 3} - {fileID: 21300000, guid: 31c5ffb6550fe564ab9f5159f4e9a1a6, type: 3} + - {fileID: 21300000, guid: 8853155b9492147b1b82822907ebe345, type: 3} - {fileID: 21300000, guid: baeff88190bbfdb4a926b47619fcb1e6, type: 3} - {fileID: 21300000, guid: e74dcab94de80bd4199e8ddd36ce28d4, type: 3} - {fileID: 21300000, guid: 5140a3a33b636314fb3d07bdc4c9c0f3, type: 3} @@ -293,6 +294,11 @@ MonoBehaviour: - {fileID: 21300000, guid: e1851e4af6a455e4a9cca4865506f18d, type: 3} - {fileID: 21300000, guid: cafb6d0b4ae9ac742b8103f2d88332f3, type: 3} - {fileID: 21300000, guid: 41c63054fe0534a80923a5668c34f7f1, type: 3} + - {fileID: 21300000, guid: d31d90548330f4a20ba6681fa394b94e, type: 3} + - {fileID: 21300000, guid: 9bb72de2076394f60b63ac2a52e27091, type: 3} + - {fileID: 21300000, guid: 35b60bfd1dffe45799bc174bccede7a0, type: 3} + - {fileID: 21300000, guid: febcd2bc822d64cd2aa2cd4ecf40b046, type: 3} + - {fileID: 21300000, guid: b9e8cd393ec7543a39842eba6fe4f055, type: 3} - {fileID: 21300000, guid: 578eaf55069df4f44a1df580a13fa05d, type: 3} - {fileID: 21300000, guid: 646ad906d9c5043ae880e677c5b79eae, type: 3} - {fileID: 21300000, guid: 44e0043f30ae645daa3a3138184c881c, type: 3} @@ -327,4 +333,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a8f243e8d90243e8d91243e8d92243e8d93243e8d1677c01e5ff0dec416c1dad9c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0498e3b3fbb2b915e16dc813f85d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1973546eb874546eb8c22f500f90c9348d7fea0537be2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea945815ec9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8033eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47f316cb47297452d3252af848262af848272af848282af8482a2af8482b2af8484c159f46fefd2e1b6e97448da07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb6927d06cd828d06cd8f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5977449601b6e3feee1794eaac0611e220557aa025458aa025459aa02545aaa0254b36a811ba595d140a695d140b46a811b6699d1406799d140b09961d9b56a811bed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4cce34e1d55e44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 + spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a8f243e8d90243e8d91243e8d92243e8d93243e8d1677c01e5ff0dec416c1dad9c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0498e3b3fbb2b915e16dc813f85d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1973546eb874546eb8c22f500f90c9348d7fea0537be2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea945815ec9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8033eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47f316cb47297452d3252af848262af848272af848282af8482a2af8482b2af8484c159f46fefd2e1b6e97448da07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb6926d06cd827d06cd828d06cd8f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5977449601b6e3feee1794eaac0611e220557aa025458aa025459aa02545aaa0254b36a811ba595d140a695d140b46a811b6699d1406799d140b09961d9b56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4cce34e1d55e44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 diff --git a/Assets/arts/effects/texture/fx_animal_004_1.png.meta b/Assets/arts/effects/texture/fx_animal_004_1.png.meta index bce0ef2b5..e66bf6259 100644 --- a/Assets/arts/effects/texture/fx_animal_004_1.png.meta +++ b/Assets/arts/effects/texture/fx_animal_004_1.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -101,6 +101,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/fx_animal_007_1.png.meta b/Assets/arts/effects/texture/fx_animal_007_1.png.meta index c26012227..4cce7990d 100644 --- a/Assets/arts/effects/texture/fx_animal_007_1.png.meta +++ b/Assets/arts/effects/texture/fx_animal_007_1.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -101,6 +101,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/lightning_strike_2_sheet_b02.png.meta b/Assets/arts/effects/texture/lightning_strike_2_sheet_b02.png.meta index bb51885b7..4700f51fd 100644 --- a/Assets/arts/effects/texture/lightning_strike_2_sheet_b02.png.meta +++ b/Assets/arts/effects/texture/lightning_strike_2_sheet_b02.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -101,6 +101,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index f71c46a75..0c351d77e 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes index 824fc6f67..9651054bd 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/act_seven_day/cell/gift_cell.lua.bytes b/Assets/lua/app/ui/activity/act_seven_day/cell/gift_cell.lua.bytes index 7e2b30e97..5e8539fd3 100644 Binary files a/Assets/lua/app/ui/activity/act_seven_day/cell/gift_cell.lua.bytes and b/Assets/lua/app/ui/activity/act_seven_day/cell/gift_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/act_seven_day/cell/task_cell.lua.bytes b/Assets/lua/app/ui/activity/act_seven_day/cell/task_cell.lua.bytes index a2482efd0..aab001d85 100644 Binary files a/Assets/lua/app/ui/activity/act_seven_day/cell/task_cell.lua.bytes and b/Assets/lua/app/ui/activity/act_seven_day/cell/task_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes index 2ba9ac912..7d893ce59 100644 Binary files a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab b/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab index b233c9e6a..53d618d4f 100644 --- a/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab +++ b/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab @@ -239,7 +239,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -609,7 +609,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ef8ec43b1a3f659418e2f5e22ccd6d03, type: 3} + m_Sprite: {fileID: 21300000, guid: 35b60bfd1dffe45799bc174bccede7a0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1045,7 +1045,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ef8ec43b1a3f659418e2f5e22ccd6d03, type: 3} + m_Sprite: {fileID: 21300000, guid: 35b60bfd1dffe45799bc174bccede7a0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2144,7 +2144,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ef8ec43b1a3f659418e2f5e22ccd6d03, type: 3} + m_Sprite: {fileID: 21300000, guid: 35b60bfd1dffe45799bc174bccede7a0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5031,7 +5031,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d31d90548330f4a20ba6681fa394b94e, type: 3} + m_Sprite: {fileID: 21300000, guid: 9bb72de2076394f60b63ac2a52e27091, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6724,8 +6724,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -8722,7 +8722,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ef8ec43b1a3f659418e2f5e22ccd6d03, type: 3} + m_Sprite: {fileID: 21300000, guid: 35b60bfd1dffe45799bc174bccede7a0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9296,7 +9296,7 @@ MonoBehaviour: direction: 0 reverse: 0 cellWidth: 684 - cellHeight: 184 + cellHeight: 164 perLineNum: 1 --- !u!222 &406035066655400353 CanvasRenderer: @@ -9392,7 +9392,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ef8ec43b1a3f659418e2f5e22ccd6d03, type: 3} + m_Sprite: {fileID: 21300000, guid: 35b60bfd1dffe45799bc174bccede7a0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9756,7 +9756,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9c7ba2f65802ee942aee21eb29de068e, type: 3} + m_Sprite: {fileID: 21300000, guid: d31d90548330f4a20ba6681fa394b94e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -10167,7 +10167,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 3} - m_SizeDelta: {x: 370, y: 60} + m_SizeDelta: {x: 370, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8983348913716007475 CanvasRenderer: @@ -10200,7 +10200,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 3867a45abce498941a20e7bae19ceb9e, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -10209,12 +10209,12 @@ MonoBehaviour: rgba: 4294967295 m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 1 - m_colorMode: 3 + m_colorMode: 2 m_fontColorGradient: - topLeft: {r: 0.29411766, g: 0.67058825, b: 0.99215686, a: 1} - topRight: {r: 0.29411766, g: 0.67058825, b: 0.99215686, a: 1} - bottomLeft: {r: 0.7607843, g: 1, b: 1, a: 1} - bottomRight: {r: 0.7607843, g: 1, b: 1, a: 1} + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 0, g: 0.7490196, b: 1, a: 1} + bottomRight: {r: 0, g: 0.7490196, b: 1, a: 1} m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 @@ -10224,12 +10224,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 20 - m_fontSizeMax: 36 + m_fontSizeMax: 60 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -11146,7 +11146,7 @@ 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: 16, y: -1} + m_AnchoredPosition: {x: 16, y: 0} m_SizeDelta: {x: 80, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6650680504798027049 @@ -11180,7 +11180,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 3867a45abce498941a20e7bae19ceb9e, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -12413,7 +12413,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9c7ba2f65802ee942aee21eb29de068e, type: 3} + m_Sprite: {fileID: 21300000, guid: d31d90548330f4a20ba6681fa394b94e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/common/reward_cell.prefab b/Assets/prefabs/ui/common/reward_cell.prefab index f106e5e0d..28bfe10f2 100644 --- a/Assets/prefabs/ui/common/reward_cell.prefab +++ b/Assets/prefabs/ui/common/reward_cell.prefab @@ -1301,8 +1301,8 @@ RectTransform: m_GameObject: {fileID: 6779517126958811877} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 8717611866707408473} m_RootOrder: 2