diff --git a/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_banzi3.png.meta b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_banzi3.png.meta index f7411a68d1..29c1a04e26 100644 --- a/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_banzi3.png.meta +++ b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_banzi3.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/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang.png.meta b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang.png.meta index 81257616a9..ab01c89dd6 100644 --- a/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang.png.meta +++ b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang.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/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang2.png.meta b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang2.png.meta index 7a4d7eb6d3..5563d7ec4f 100644 --- a/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang2.png.meta +++ b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang2.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/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang_waifaguang.png.meta b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang_waifaguang.png.meta index 6bbd556e78..9b3619890d 100644 --- a/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang_waifaguang.png.meta +++ b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_daojukuang_waifaguang.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/JourneyWithWindAtlas/p_piaomialzhilv_hua.png.meta b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_hua.png.meta index d37c81abaf..02cf6b0fe9 100644 --- a/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_hua.png.meta +++ b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_hua.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/JourneyWithWindAtlas/p_piaomialzhilv_huakuang.png.meta b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_huakuang.png.meta index 2e178de70f..54d5dea1e9 100644 --- a/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_huakuang.png.meta +++ b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_huakuang.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/JourneyWithWindAtlas/p_piaomialzhilv_mubiaobg.png.meta b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_mubiaobg.png.meta index 55c91c068c..0ac0ec1b71 100644 --- a/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_mubiaobg.png.meta +++ b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_mubiaobg.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/JourneyWithWindAtlas/p_piaomialzhilv_rukou.png.meta b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_rukou.png.meta index 4685e0e6ae..733c7fc074 100644 --- a/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_rukou.png.meta +++ b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_rukou.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/JourneyWithWindAtlas/p_piaomialzhilv_title.png.meta b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_title.png.meta index 059360898d..772b630d87 100644 --- a/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_title.png.meta +++ b/Assets/ManagedResources/Atlas/JourneyWithWindAtlas/p_piaomialzhilv_title.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/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_fatiaomichengzi_zh.png b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_fatiaomichengzi_zh.png deleted file mode 100644 index 223629ca96..0000000000 Binary files a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_fatiaomichengzi_zh.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_huangtubazhuzi_zh.png b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_huangtubazhuzi_zh.png deleted file mode 100644 index 26f807ac84..0000000000 Binary files a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_huangtubazhuzi_zh.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_moxindijunzi_zh.png b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_moxindijunzi_zh.png deleted file mode 100644 index eb7608403e..0000000000 Binary files a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_moxindijunzi_zh.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_suiwukong_zh.png b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_suiwukong_zh.png new file mode 100644 index 0000000000..6fd66c0dc0 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_suiwukong_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_moxindijunzi_zh.png.meta b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_suiwukong_zh.png.meta similarity index 96% rename from Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_moxindijunzi_zh.png.meta rename to Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_suiwukong_zh.png.meta index aca40eebcb..9d4dfcce9e 100644 --- a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_moxindijunzi_zh.png.meta +++ b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_suiwukong_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2e03071f3e620d241a3439bde8ba3453 +guid: 5384b4c5c22fb1a4f846bedd1bf86fde TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: d48395a3effab354a883d2574653e7c9 + spriteID: b07970a93a837ff4ca176c21cd81eddc vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_thsz_zh.png b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_thsz_zh.png new file mode 100644 index 0000000000..133fec641c Binary files /dev/null and b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_thsz_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_fatiaomichengzi_zh.png.meta b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_thsz_zh.png.meta similarity index 96% rename from Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_fatiaomichengzi_zh.png.meta rename to Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_thsz_zh.png.meta index 384b9459ac..553de58e75 100644 --- a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_fatiaomichengzi_zh.png.meta +++ b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_thsz_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9e60a3548ceca1046a069fcfe47b8673 +guid: ea0f0fc36e477b44997389385a004711 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 881cccb357080b74380b489197de00f9 + spriteID: f171e513042b1cd4eb0d41d2ce814153 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_tongtian_zh.png b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_tongtian_zh.png new file mode 100644 index 0000000000..508ae0a67e Binary files /dev/null and b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_tongtian_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_wujixingzhezi_zh.png.meta b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_tongtian_zh.png.meta similarity index 96% rename from Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_wujixingzhezi_zh.png.meta rename to Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_tongtian_zh.png.meta index 75e65e2f84..c35b2228df 100644 --- a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_wujixingzhezi_zh.png.meta +++ b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_tongtian_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ceaeea42216fca6409eeb6997b4eadc9 +guid: 727a2f69bb6279e4c96cb2d0be2e2fa5 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 30eda43a61b31e14dbacef57139f7333 + spriteID: 999cc615fe8ec4b429efce9e33e3df17 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_wujixingzhezi_zh.png b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_wujixingzhezi_zh.png deleted file mode 100644 index 520fe2c4f4..0000000000 Binary files a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_wujixingzhezi_zh.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_yuhuangdadi_zh.png b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_yuhuangdadi_zh.png new file mode 100644 index 0000000000..9b8dfc53a1 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_yuhuangdadi_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_huangtubazhuzi_zh.png.meta b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_yuhuangdadi_zh.png.meta similarity index 96% rename from Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_huangtubazhuzi_zh.png.meta rename to Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_yuhuangdadi_zh.png.meta index 78e04340ef..1cd153d4e2 100644 --- a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_huangtubazhuzi_zh.png.meta +++ b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_yuhuangdadi_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0975df3762e027e468ab30888144247b +guid: 3e6289532129ab5448419ce42830dd29 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 8612d9307dcf124419a4f94fcd563283 + spriteID: 5ac63b6a612d6024da4a677458d54238 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_zhubajie_zh.png b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_zhubajie_zh.png new file mode 100644 index 0000000000..fec782c962 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_zhubajie_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_zhubajie_zh.png.meta b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_zhubajie_zh.png.meta new file mode 100644 index 0000000000..0da56a85dc --- /dev/null +++ b/Assets/ManagedResources/Atlas/TeHuiShenZhuangAtlas/ArtFont/t_tehuishenzhuang_zhubajie_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: dbfe666fe04b0cb4ebca030cc658e439 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6db63d1a97ac69b45a53b48340c203af + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TeHuiShenZhuangAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/TeHuiShenZhuang/TeHuiShenZhuangPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TeHuiShenZhuang/TeHuiShenZhuangPanel.prefab index 6868330f6e..a191f9ef20 100644 --- a/Assets/ManagedResources/Prefabs/UI/TeHuiShenZhuang/TeHuiShenZhuangPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TeHuiShenZhuang/TeHuiShenZhuangPanel.prefab @@ -94,6 +94,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8541848192336793676} + - {fileID: 5912818896432541691} - {fileID: 1127203027444313718} m_Father: {fileID: 898193909354494019} m_RootOrder: 2 @@ -142,7 +143,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4957794194947264391} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -401,6 +402,86 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &3133122158697389110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3383171814414968218} + - component: {fileID: 6298772290171829105} + - component: {fileID: 4108224001695914233} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3383171814414968218 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3133122158697389110} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1421605945814085954} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6298772290171829105 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3133122158697389110} + m_CullTransparentMesh: 0 +--- !u!114 &4108224001695914233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3133122158697389110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9811321, g: 0.7448591, b: 0.58775365, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "3\u65E5\u540E\u53EF\u8D2D" + LanguageIndex: 0 --- !u!1 &3344270230499337201 GameObject: m_ObjectHideFlags: 0 @@ -586,6 +667,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4\uFF1A3\u592908\u65F634\u5206" LanguageIndex: 0 +--- !u!1 &3827661607881630473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1421605945814085954} + - component: {fileID: 2568250143643158960} + - component: {fileID: 4987627675543419895} + m_Layer: 5 + m_Name: bugDay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1421605945814085954 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3827661607881630473} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3383171814414968218} + m_Father: {fileID: 4957794194947264391} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 325, y: -45} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2568250143643158960 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3827661607881630473} + m_CullTransparentMesh: 0 +--- !u!114 &4987627675543419895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3827661607881630473} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ced8e30fcd084ab4bb18323d9b3183de, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4487168350906758530 GameObject: m_ObjectHideFlags: 0 @@ -734,6 +890,7 @@ RectTransform: m_Children: - {fileID: 6483765514905861047} - {fileID: 6692387534291180301} + - {fileID: 1421605945814085954} - {fileID: 7053404110353968548} - {fileID: 311860523735992108} m_Father: {fileID: 898193909354494019} @@ -1007,11 +1164,11 @@ RectTransform: m_Children: - {fileID: 8788889948934153483} m_Father: {fileID: 4957794194947264391} - m_RootOrder: 3 + m_RootOrder: 4 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: 330, y: 0} + m_AnchoredPosition: {x: 330, y: -10} m_SizeDelta: {x: 190, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8407601103703489248 @@ -1274,12 +1431,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8445008542788981736} - m_RootOrder: 1 + m_RootOrder: 2 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: 0, y: 105} - m_SizeDelta: {x: 605, y: 279} + m_AnchoredPosition: {x: -140, y: 22} + m_SizeDelta: {x: 337, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3653481042276158261 CanvasRenderer: @@ -1309,7 +1466,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ceaeea42216fca6409eeb6997b4eadc9, type: 3} + m_Sprite: {fileID: 21300000, guid: 5384b4c5c22fb1a4f846bedd1bf86fde, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1578,6 +1735,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8246592375605331194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5912818896432541691} + - component: {fileID: 853793127770573958} + - component: {fileID: 6497572054124041234} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5912818896432541691 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8246592375605331194} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8445008542788981736} + m_RootOrder: 1 + 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: 0, y: 105} + m_SizeDelta: {x: 593, y: 279} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &853793127770573958 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8246592375605331194} + m_CullTransparentMesh: 0 +--- !u!114 &6497572054124041234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8246592375605331194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ea0f0fc36e477b44997389385a004711, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8878934143957947337 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 06ce23998b..f01bf8f475 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -24845,19 +24845,23 @@ MonoBehaviour: extension: .png resPathIndex: 135 resAbNameIndex: 78 - - resName: t_tehuishenzhuang_fatiaomichengzi_zh + - resName: t_tehuishenzhuang_suiwukong_zh extension: .png resPathIndex: 136 resAbNameIndex: 78 - - resName: t_tehuishenzhuang_huangtubazhuzi_zh + - resName: t_tehuishenzhuang_thsz_zh extension: .png resPathIndex: 136 resAbNameIndex: 78 - - resName: t_tehuishenzhuang_moxindijunzi_zh + - resName: t_tehuishenzhuang_tongtian_zh extension: .png resPathIndex: 136 resAbNameIndex: 78 - - resName: t_tehuishenzhuang_wujixingzhezi_zh + - resName: t_tehuishenzhuang_yuhuangdadi_zh + extension: .png + resPathIndex: 136 + resAbNameIndex: 78 + - resName: t_tehuishenzhuang_zhubajie_zh extension: .png resPathIndex: 136 resAbNameIndex: 78 @@ -57445,14 +57449,6 @@ MonoBehaviour: extension: .prefab resPathIndex: 594 resAbNameIndex: 3834 - - resName: "\u7F25\u7F08\u4E4B\u65C5" - extension: .jpg - resPathIndex: 594 - resAbNameIndex: 3834 - - resName: "\u900D\u9065\u6E38\u5165\u53E3" - extension: .jpg - resPathIndex: 594 - resAbNameIndex: 3834 - resName: JumpView extension: .prefab resPathIndex: 595 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 63b888b0a3..ae4c925888 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -141,9 +141,9 @@ function this.InitActivityServerData(msg, isUpdate) this.CheckMoneyProgress(v) this.mission[v.activityId] = v - LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) + -- LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) for n, m in ipairs(v.mission) do - LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) + -- LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) if (v.activityId == ActivityTypeDef.OnlineGift) then this.onlineOpen = true this.onlineGetRewardState[m.missionId] = m.state @@ -1350,7 +1350,7 @@ function this.JourneyWithWindCurDayNoOpen() for i = 1, #curJourneyWithWindAllDayConFigData do if curDay >= curJourneyWithWindAllDayConFigData[i].Values[1][2] then local curRedPointState = this.GetJourneyWithWindPlayerPrefs(curJourneyWithWindAllDayConFigData[i].Values[1][2]) - if curRedPointState == 0 then + if tonumber(curRedPointState) == 0 then return true end end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index cf604f6b46..154a3e159b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -396,7 +396,7 @@ function TimeLimitUpHero:RefreshNextLevelReward() self.effect.gameObject:SetActive(true) elseif (curState == -1) then self.slider.value=1 - Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text").text="300/300" + self.sliderText2.text = rewardItem.Values[1][1].."/"..rewardItem.Values[1][1] self.sliderText.text="奖励已全部领取" Util.AddOnceClick(self.getBtn,function() UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecrutReward,self.actType,self.actId,curHeroId) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index 1e2305ad47..cf4754ddc3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -442,7 +442,7 @@ function this.DeleBackPatFaceDaqta() end function this.GetcurCanPatFace() if this.isLogin then return false end--登录界面不拍 - if MapManager.Mapping or UIManager.IsOpen(UIName.BattlePanel) or UIManager.IsOpen(UIName.SurpriseBoxPanel) then return false end--在关卡里 副本里不拍 + if MapManager.Mapping or UIManager.IsOpen(UIName.BattlePanel) or UIManager.IsOpen(UIName.SurpriseBoxPanel) or UIManager.IsOpen(UIName.RewardItemSingleShowPopup) then return false end--在关卡里 副本里不拍 if GuideManager.IsFunctionGuideExist() or GuideManager.IsInMainGuide() then return false end--引导不拍 if UIManager.IsOpen(UIName.SingleRecruitPanel) or UIManager.IsOpen(UIName.TenRecruitPanel) or UIManager.IsOpen(UIName.RecruitPanel) then return false end--抽卡界面不拍 if UIManager.IsOpen(UIName.PatFacePanel) then return false end--正在拍脸 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index 8e5efac523..5db2c68890 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -125,7 +125,7 @@ function PatFacePanel:OnShow() end function PatFacePanel:OnShowPatFaceData() if patFaceSingleData then - LogGreen("patFaceSingleData.Type:"..patFaceSingleData.Type) + -- LogGreen("patFaceSingleData.Type:"..patFaceSingleData.Type) self.obg1:SetActive(patFaceSingleData.Type == FacePanelType.Sbtj) self.obg2:SetActive(patFaceSingleData.Type == FacePanelType.Tesc) self.obg3:SetActive(patFaceSingleData.Type == FacePanelType.GuildFight or patFaceSingleData.Type == FacePanelType.Championship) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua index a86078f982..e9d6b29075 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua @@ -392,7 +392,13 @@ function this.RefreshJourneyWithWindShow() end end function this.JourneyWithWindBtnAutoClose() - this.btnJourneyWithWind:SetActive(false) + local idJourneyWithWind = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.JourneyWithWind) + if idJourneyWithWind and idJourneyWithWind > 0 then + this.btnJourneyWithWind:SetActive(true) + this.RefreshJourneyWithWindShow() + else + this.btnJourneyWithWind:SetActive(false) + end end --界面关闭时调用(用于子类重写) function InvadeMonsterView:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index 45e5c1e0df..fa9f1a24fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -84,7 +84,6 @@ function this:OnShow(_parent,...) break end end - LogGreen("pro:"..pro) UpItemList = {[1] = {Reward = {heroConfig.Id,1},Weight = num}} for k, v in ConfigPairs(pool) do if v.Camp == pro or v.Camp == 0 then @@ -162,12 +161,12 @@ function this:BuildRateData(actType,UpItem,upItemList) elseif actType == ActivityTypeDef.LimitUpHero then for n,m in ipairs(upItemList) do local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1]) - table.insert(rateList,{id = m.Reward[1],tag = "5星神将UP!", name=itemConfig.Name,value = m.WeightShow,color = "AD4152"}) - table.insert(_upRateList,{id = m.Reward[1],tag = "5星神将UP!", name=itemConfig.Name,value = m.WeightShow}) + table.insert(rateList,{id = m.Reward[1],tag = "5星神将UP!", name=itemConfig.Name,value = m.Weight,color = "AD4152"}) + table.insert(_upRateList,{id = m.Reward[1],tag = "5星神将UP!", name=itemConfig.Name,value = m.Weight}) end for n,m in ipairs(UpItem) do local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1]) - table.insert(rateList,{id = m.Reward[1],tag = itemConfig.Name, name=m.Reward[2],value = m.WeightShow,color = "BDB69C" }) + table.insert(rateList,{id = m.Reward[1],tag = itemConfig.Name, name=m.Reward[2],value = m.Weight,color = "BDB69C" }) end end diff --git a/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua b/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua index 5ce9b466f1..fbd3b3e648 100644 --- a/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua @@ -124,22 +124,23 @@ function this.SingleDayBtnDataShow(_go,data,index) end end end - if not redState then - redState = ActivityGiftManager.GetJourneyWithWindPlayerPrefs(data.Values[1][2]) == 0 + if not redState and curDay >= data.Values[1][2] then + redState = tonumber(ActivityGiftManager.GetJourneyWithWindPlayerPrefs(data.Values[1][2])) == 0 end redPoint:SetActive(redState) - + --上方按钮一个高一个低 if index%2 == 0 then go.transform.anchoredPosition = Vector3.New(3.05,23,0) else go.transform.anchoredPosition = Vector3.New(3.05,176.09,0) end - if data.Values[1][2] == curDayIndex then + if data.Values[1][2] == curDayIndex then--初始化按钮选中状态 this.selected.transform:SetParent(Util.GetGameObject(go, "selectedParent").transform) this.selected.transform.anchoredPosition = Vector3.New(4.3,9.4,0) + redPoint:SetActive(false) end Util.AddOnceClick(go, function() - this.ShowDayData(data.Values[1][2]) + this.ShowDayData(data.Values[1][2])--点击按钮刷新界面 this.selected.transform:SetParent(Util.GetGameObject(go, "selectedParent").transform) this.selected.transform.anchoredPosition = Vector3.New(4.3,9.4,0) end) @@ -164,7 +165,7 @@ function this.ShowDayData(_curDayIndex) end --组当前所有任务的后端数据 local AllTaskData = TaskManager.GetTypeTaskList(TaskTypeDef.JourneyWithWind) - for i = 1, #curDayAllTaskGos-2 do + for i = 1, #curDayAllTaskGos-2 do--curDayAllTaskGos-2 是因为上方任务至多只有五个 其余两个 一个是活动奖励 一个是礼包 if curDayAllTaskConFigData[i] then curDayAllTaskGos[i]:SetActive(true) Util.GetGameObject(curDayAllTaskGos[i], "pre1"):SetActive(true) @@ -178,7 +179,7 @@ function this.ShowDayData(_curDayIndex) local headName = Util.GetGameObject(curDayAllTaskGos[i], "headImage/name") headName:GetComponent("Text").text = curDayAllTaskConFigData[i].HeadName local size = headName:GetComponent("RectTransform").sizeDelta - if string.len(curDayAllTaskConFigData[i].HeadName) >= 15 then + if string.len(curDayAllTaskConFigData[i].HeadName) >= 15 then--每条任务的最前方标题 文字字节长度大于等于15个字节(五个字) text 要变宽否则显示不对 size.x = 130.3 headName.transform.sizeDelta = size else @@ -188,7 +189,7 @@ function this.ShowDayData(_curDayIndex) btnFinish:SetActive(false) btnJump:SetActive(false) buyInfo.text = "" - local curMissionData + local curMissionData--获取对应天数的后端活动数据 for j = 1, #AllTaskData do if AllTaskData[j].missionId == curDayAllTaskConFigData[i].Id then curMissionData = AllTaskData[j] @@ -196,7 +197,7 @@ function this.ShowDayData(_curDayIndex) end if curMissionData then local isOpen = false - if curDayAllTaskConFigData[i].SystemId == FUNCTION_OPEN_TYPE.EXPEDITION then + if curDayAllTaskConFigData[i].SystemId == FUNCTION_OPEN_TYPE.EXPEDITION then--大闹天宫 特殊判断 大闹天宫有 休息期 但不能显示关闭 if ActTimeCtrlManager.SingleFuncState(curDayAllTaskConFigData[i].SystemId) then isOpen = true else @@ -214,6 +215,7 @@ function this.ShowDayData(_curDayIndex) isOpenLock = curDay >= curDayIndex Util.SetGray(btnJump,false) if isOpenLock then--到天数 + btnJump.transform.anchoredPosition = Vector3.New(262.41,44.5,0) Util.SetGray(btnJump,false) btnJumpText.text = "前往" btnJump:GetComponent("Button").enabled = true @@ -225,7 +227,7 @@ function this.ShowDayData(_curDayIndex) btnJump:GetComponent("Button").enabled = true buyInfo.text = string.format("%s/%s",progress,curDayAllTaskConFigData[i].TaskValue[2][1]) Util.AddOnceClick(btnJump, function() - if curDayAllTaskConFigData[i].SystemId == FUNCTION_OPEN_TYPE.EXPEDITION then + if curDayAllTaskConFigData[i].SystemId == FUNCTION_OPEN_TYPE.EXPEDITION then--大闹天宫点击前往做特殊判断 也许是之前的跳转接口写的不合理 之后优化 if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then if #ExpeditionManager.nodeInfo <= 0 then if ExpeditionManager.expeditionLeve == -1 then @@ -261,11 +263,12 @@ function this.ShowDayData(_curDayIndex) btnJump:SetActive(true) Util.SetGray(btnJump,true) btnJump:GetComponent("Button").enabled = false - if curDayAllTaskConFigData[i].TaskType ~= 14 then + if curDayAllTaskConFigData[i].TaskType ~= 14 then--除了战力 其他任务当对应功能不开启是要显示开启条件 buyInfo.text = string.format(Language[11903],ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,curDayAllTaskConFigData[i].SystemId).OpenRules[2]) end end else--未到天数 + btnJump.transform.anchoredPosition = Vector3.New(262.41,27.2,0) btnJump:SetActive(true) Util.SetGray(btnJump,true) btnJumpText.text = "未开启" @@ -276,7 +279,7 @@ function this.ShowDayData(_curDayIndex) curDayAllTaskGos[i]:SetActive(false) end end - this.ShowDayDataActivityReward()--位置1 不变 + this.ShowDayDataActivityReward()--位置1 不变 因为该方法会对界面上的一些数据赋值 this.ShowDayDataGiftBag()--位置2 不变 CheckRedPointStatus(RedPointType.JourneyWithWind) end @@ -438,7 +441,6 @@ end --活动到期自动关闭 function this.AutoClose() - LogYellow("sssssssssssssssssssssssssss") if this.timer then this.timer:Stop() this.timer = nil diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 572d68c5c3..bd8d0b2d29 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1318,6 +1318,7 @@ function this:OnClose() this.ChatTipView:StopCheck() PatFaceManager.isLogin = false FixedUpdateBeat:Remove(this.OnUpdate, self) + PlayerPrefs.SetInt(PlayerManager.uid.."MainRightBarSetting",0) for k,v in ipairs(activitys) do if v.RpType > 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index 621a74763c..b74b94570a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -301,7 +301,7 @@ function this.InitSingleEndlessHero(_msgHeroData) local soulPrintList = {} for i, v in ipairs(_msgHeroData.soulPos) do local soulPrint = {equipId = v.equipId, position = v.position} - SoulPrintManager.AddSoulPrintUpHeroDynamicId(v.equipId,heroData.dynamicId) + --SoulPrintManager.AddSoulPrintUpHeroDynamicId(v.equipId,heroData.dynamicId) table.insert(soulPrintList, soulPrint) end heroData.soulPrintList = soulPrintList diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 62110bea5c..0d40e7e6dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -183,6 +183,7 @@ local TypeUpdateFunc = { curData.rewards[i].otherData.Reward = rechargeConfig[configData[j].PackId].RewardShow curData.rewards[i].otherData.Price = rechargeConfig[configData[j].PackId].Price curData.rewards[i].otherData.skinArtId = tonumber(configData[1].Warning) + curData.rewards[i].otherData.canBuyDay = configData[j].BuyDay - curData.value end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua index 695a15d08f..0c06979d11 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua @@ -67,7 +67,7 @@ function this:BindEvent() end) --长按升级按下状态 this._onPointerDown = function(Pointgo, data) - -- isTriggerLongClick = false + isTriggerLongClick = false _isClicked = true this.timePressStarted = Time.realtimeSinceStartup oldLv = curPokemonData.lv @@ -76,7 +76,7 @@ end --长按升级抬起状态 this._onPointerUp = function(Pointgo, data) LogPink("连续升级抬起请求升级 "..tostring(_isLongPress)) - if _isLongPress then--and isTriggerLongClick + if _isLongPress and isTriggerLongClick then --连续升级抬起请求升级 LogPink("连续升级抬起请求升级 ") this.LongLvUpClick(oldLv) @@ -232,6 +232,7 @@ function this.LvUpClick(isSingleLvUp) this.LongLvUpClick(oldLv) _isClicked = false _isLongPress = false + isTriggerLongClick = true end return end @@ -249,6 +250,7 @@ function this.LvUpClick(isSingleLvUp) FormationManager.CheckHeroIdExist() end) else + isTriggerLongClick = true --前端先扣除材料 for i = 1, #curUpLvConsume do BagManager.HeroLvUpUpdateItemsNum(curUpLvConsume[i][1],curUpLvConsume[i][2]) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua index 13d83402e5..1e679aa160 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua @@ -54,7 +54,7 @@ function this:OnShow(_parent,...) this.titleText.text=Language[11587] this.text1.text=string.format(Language[11588],_CostItem) this.text2.text=Language[11589] --后续改成读表 - this.text3.text= string.format("充值%s元或山河社稷图累计星数到达%s开启", string.format(MoneyUtil.GetMoneyUnitName(), _Con_Recharge), _Con_Star) + this.text3.text= string.format("充值%s或山河社稷图累计星数到达%s开启", string.format(MoneyUtil.GetMoneyUnitName(), _Con_Recharge), _Con_Star) --Language[11590]..string.format(MoneyUtil.GetMoneyUnitName(),_Con_Recharge)..Language[11591] local isUnlock = VipManager.GetChargedNum() >= _Con_Recharge or FightLevelManager.GetAllChapterStars() >= _Con_Star diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua index 236e22d927..6f5d5dbbff 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua @@ -91,6 +91,10 @@ function RoleTalismanPanelV2:BindEvent() end) --进阶按钮 Util.AddClick(this.RecallBtn, function() + if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then + PopupTipPanel.ShowTip(Language[12184]) + return + end if curHeroData.talismanList and curHeroData.talismanList <= 1 then PopupTipPanel.ShowTip(Language[12265]) return diff --git a/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua index b0255ee042..85eaa53cc8 100644 --- a/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua @@ -43,10 +43,12 @@ function SurpriseBox:BindEvent() end --添加事件监听(用于子类重写) function SurpriseBox:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self) end --移除事件监听(用于子类重写) function SurpriseBox:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self) end local fun diff --git a/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua b/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua index 206ed0756f..08ab2031a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua @@ -5,11 +5,11 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local textName = { - [1100023] = "t_tehuishenzhuang_wujixingzhezi_zh", - [1100026] = "t_tehuishenzhuang_wujixingzhezi_zh", - [1100003] = "t_tehuishenzhuang_huangtubazhuzi_zh", - [1100041] = "t_tehuishenzhuang_fatiaomichengzi_zh", - [1110026] = "t_tehuishenzhuang_moxindijunzi_zh", + [1100023] = "t_tehuishenzhuang_suiwukong_zh",--孙悟空 + [1100026] = "t_tehuishenzhuang_suiwukong_zh",--青阳先知 + [1100003] = "t_tehuishenzhuang_zhubajie_zh",--猪八戒 + [1100041] = "t_tehuishenzhuang_tongtian_zh",--通天 + [1110026] = "t_tehuishenzhuang_yuhuangdadi_zh",--玉皇大帝 } function TeHuiShenZhuang:InitComponent() @@ -48,10 +48,12 @@ function TeHuiShenZhuang:BindEvent() end --添加事件监听(用于子类重写) function TeHuiShenZhuang:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self) end --移除事件监听(用于子类重写) function TeHuiShenZhuang:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self) end function TeHuiShenZhuang:OnSortingOrderChange() @@ -108,6 +110,8 @@ function TeHuiShenZhuang:ShowSingleHero(go,data,index) local btnGet = Util.GetGameObject(go, "btnGet") local btnText = Util.GetGameObject(go, "btnGet/Text"):GetComponent("Text") local btnImg = Util.GetGameObject(go, "btnGet"):GetComponent("Image") + local buyDayImg = Util.GetGameObject(go, "bugDay") + local buyDayText = Util.GetGameObject(buyDayImg, "Text"):GetComponent("Text") if not self.itemViewList[go] then self.itemViewList[go] = {} @@ -124,15 +128,20 @@ function TeHuiShenZhuang:ShowSingleHero(go,data,index) self.itemViewList[go][i].gameObject:SetActive(true) end + -- LogBlue("data.progress:"..tostring(data.progress)) Util.SetGray(btnGet,false) btnText.text = string.format("%s 元",data.otherData.Price) btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuangse") + buyDayImg:SetActive(false) if data.progress == 8 then - -- Util.SetGray(btnGet,true) btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuise") btnText.text = Language[10514] elseif data.progress == 3 then Util.SetGray(btnGet,true) + elseif data.progress == 2 then + Util.SetGray(btnGet,true) + buyDayImg:SetActive(true) + buyDayText.text = string.format("%s日后可购",data.otherData.canBuyDay) end -- LogYellow("PackId:"..tostring(data.otherData.PackId).." progress:"..tostring(data.progress)) @@ -146,6 +155,8 @@ function TeHuiShenZhuang:ShowSingleHero(go,data,index) end) elseif data.progress == 3 then PopupTipPanel.ShowTip("请先购买上一礼包,即可解锁此礼包") + elseif data.progress == 2 then + PopupTipPanel.ShowTip("礼包尚未开启,请耐心等待") end end) end diff --git a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua index b0067229b1..e0a0d6b109 100644 --- a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua @@ -215,7 +215,9 @@ function JumpViewNew:GoToJumpData() end end end - DynamicActivityManager.SetSelectIndex(DataType.Direct,goodIdList) + DynamicActivityManager.SetSelectIndex(DataType.Direct,goodIdList) + elseif (self.jumpSData.type ~= JumpType.firstRecharge or self.jumpSData.type ~= JumpType.ZhiZunJiangShi) then + PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = false end JumpManager.GoJump(self.jumpSData.Id,function(isOpen) if isOpen then