diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_senluohuanjing.png b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_senluohuanjing.png new file mode 100644 index 0000000000..aa9ad23327 Binary files /dev/null and b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_senluohuanjing.png differ diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_senluohuanjing.png.meta b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_senluohuanjing.png.meta new file mode 100644 index 0000000000..44bb5748a1 --- /dev/null +++ b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_senluohuanjing.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 5ccc5eca69132144b8aa6f0757b7e30a +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: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: dd063c329c8336148bb68fd57b925e53 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: CarbonAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_wanxiangjing.png b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_wanxiangjing.png new file mode 100644 index 0000000000..f74b806af2 Binary files /dev/null and b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_wanxiangjing.png differ diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_wanxiangjing.png.meta b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_wanxiangjing.png.meta new file mode 100644 index 0000000000..720f90651b --- /dev/null +++ b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_wanxiangjing.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 91f9f6ee7a698e649acd66ff36ce699e +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: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 985bf7c69c260f348ad080857b333716 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: CarbonAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_xuanyuanbaojing.png b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_xuanyuanbaojing.png new file mode 100644 index 0000000000..15cb5e0133 Binary files /dev/null and b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_xuanyuanbaojing.png differ diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_xuanyuanbaojing.png.meta b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_xuanyuanbaojing.png.meta new file mode 100644 index 0000000000..f556039c80 --- /dev/null +++ b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/r_Dungeon_xuanyuanbaojing.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 877a6a869afbe3c44af0dfd0520ade7a +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: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: d042104e230d7344682c2c6df260b873 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: CarbonAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png b/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png new file mode 100644 index 0000000000..d30319315d Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png.meta b/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png.meta new file mode 100644 index 0000000000..b161700063 --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: cef97d40af40d01488b14ed27f2765ac +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: -1 + 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: 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: fbb4e34b24bda43469de0a70ea0bcc30 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 189679eb00..e515f21719 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -4171,6 +4171,10 @@ MonoBehaviour: extension: .png resPathIndex: 13 resAbNameIndex: 5 + - resName: r_Dungeon_senluohuanjing + extension: .png + resPathIndex: 13 + resAbNameIndex: 5 - resName: r_Dungeon_shilianfuben extension: .png resPathIndex: 13 @@ -4179,6 +4183,10 @@ MonoBehaviour: extension: .png resPathIndex: 13 resAbNameIndex: 5 + - resName: r_Dungeon_wanxiangjing + extension: .png + resPathIndex: 13 + resAbNameIndex: 5 - resName: r_Dungeon_wujinfuben extension: .png resPathIndex: 13 @@ -4187,6 +4195,10 @@ MonoBehaviour: extension: .png resPathIndex: 13 resAbNameIndex: 5 + - resName: r_Dungeon_xuanyuanbaojing + extension: .png + resPathIndex: 13 + resAbNameIndex: 5 - resName: r_Dungeon_xuanze_jiandan extension: .png resPathIndex: 13 @@ -16651,6 +16663,10 @@ MonoBehaviour: extension: .jpg resPathIndex: 117 resAbNameIndex: 1088 + - resName: m_chsm_0035 + extension: .png + resPathIndex: 117 + resAbNameIndex: 1088 - resName: m_syjm_0026_png extension: .png resPathIndex: 117 @@ -35515,10 +35531,6 @@ MonoBehaviour: extension: .txt resPathIndex: 355 resAbNameIndex: 1755 - - resName: m_chsm_0035 - extension: .png - resPathIndex: 355 - resAbNameIndex: 1755 - resName: m_chsm_0035.skel extension: .bytes resPathIndex: 355 @@ -35531,6 +35543,10 @@ MonoBehaviour: extension: .mat resPathIndex: 355 resAbNameIndex: 1755 + - resName: m_chsm_0035_png + extension: .png + resPathIndex: 355 + resAbNameIndex: 1755 - resName: m_chsm_0035_SkeletonData extension: .asset resPathIndex: 355 diff --git a/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035.png.meta b/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035.png.meta index 4edb6bf802..5cecc6c641 100644 --- a/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035.png.meta +++ b/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 90460778e185bda4ca37b1b26a085530 +guid: 58eb956e62475be41b19de1e6e714b13 TextureImporter: fileIDToRecycleName: {} externalObjects: {} diff --git a/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png b/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png new file mode 100644 index 0000000000..cf5e7db25e Binary files /dev/null and b/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png differ diff --git a/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png.meta b/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png.meta new file mode 100644 index 0000000000..4edb6bf802 --- /dev/null +++ b/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 90460778e185bda4ca37b1b26a085530 +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: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 55 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index da58429fa4..fef6baa1a3 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -156,6 +156,7 @@ ConfigName = { ArenaBattleReward = "ArenaBattleReward", RaceTowerConfig = "RaceTowerConfig", RaceTowerRewardConfig = "RaceTowerRewardConfig", + HeroSacrifice = "HeroSacrifice", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua index e403efedf9..2308c764da 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua @@ -26,7 +26,7 @@ function Shield:OnStart() self.target.buffFilter:Add(immune0) -- 清除所有负面buff BattleLogic.BuffMgr:ClearBuff(self.target, function (buff) - return buff.type == BuffName.Control or buff.type == BuffName.Dot + return buff.type == BuffName.Control or buff.type == BuffName.DOT end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 5b990d7cf7..2d234e72aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -20,7 +20,7 @@ local type = { liveSize = Vector2(1024, 1145) }, [2] = { - id = 1011, --心魔 + id = FUNCTION_OPEN_TYPE.MONSTER_COMING, --心魔 bg = "r_Dungeon_rendi_02", name = "r_Dungeon_xinmoshilian", live = "shixueguimo", @@ -52,7 +52,7 @@ local type = { namePos = Vector2(-323.01, 0), nameSize = Vector2(257, 268), [1] = { - id = 30, --森罗 + id = FUNCTION_OPEN_TYPE.TRIAL, --森罗 bg = "r_Dungeon_rendi_03", name = "r_Dungeon_senluohuanjing", live = "m_chsm_0035", @@ -231,8 +231,6 @@ function this.UpdateCarbonContent() end if data.id == -1 then Util.SetGray(v,true) - elseif data.id == 1011 then - Util.SetGray(v,not ActTimeCtrlManager.SingleFuncState(30)) else Util.SetGray(v,not ActTimeCtrlManager.SingleFuncState(data.id)) end @@ -241,15 +239,15 @@ end function this.BtnClick(id) if id == FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN then - if ActTimeCtrlManager.SingleFuncState(67) == false then --如果未解锁 + if ActTimeCtrlManager.SingleFuncState(id) == false then --如果未解锁 PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN)) return end UIManager.OpenPanel(UIName.DailyCarbonPanel) - elseif id == 1011 then + elseif id == FUNCTION_OPEN_TYPE.MONSTER_COMING then JumpManager.GoJump(1011) elseif id == FUNCTION_OPEN_TYPE.EXPEDITION then - if ActTimeCtrlManager.SingleFuncState(JumpType.Expedition) then + if ActTimeCtrlManager.SingleFuncState(id) then if #ExpeditionManager.nodeInfo <= 0 then if ExpeditionManager.expeditionLeve == -1 then NetManager.GetExpeditionRequest( @@ -282,8 +280,8 @@ function this.BtnClick(id) return end UIManager.OpenPanel(UIName.GuildCarDelayMainPanel) - elseif id == 30 then - if ActTimeCtrlManager.SingleFuncState(30) then + elseif id == FUNCTION_OPEN_TYPE.TRIAL then + if ActTimeCtrlManager.SingleFuncState(id) then CarbonManager.difficulty = 2 local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index c52ff35341..25c994c4f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2164,18 +2164,18 @@ function this.GetHeroReturnItems(selectHeroData, type) end else if v.breakId > 0 then - local heroRankUpConfig = ConfigManager.GetConfigData(ConfigName.HeroRankupConfig, v.breakId) + local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",2,"Key",v.breakId) if heroRankUpConfig then - local sumConsume = heroRankUpConfig.SumConsume + local sumConsume = heroRankUpConfig.Value for i = 1, #sumConsume do table.insert(ShowItemlist, {sumConsume[i][1], sumConsume[i][2] * specificValue}) end end end if v.upStarId > 0 then - local heroRankUpConfig = ConfigManager.GetConfigData(ConfigName.HeroRankupConfig, v.upStarId) + local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",1,"Key",v.upStarId) if heroRankUpConfig then - local sumConsume = heroRankUpConfig.SumConsume + local sumConsume = heroRankUpConfig.Value for i = 1, #sumConsume do table.insert(ShowItemlist, {sumConsume[i][1], sumConsume[i][2] * specificValue}) end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 37221599c7..6469db469b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -653,7 +653,11 @@ function this:BindEvent() this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ARENA) end) Util.AddClick(this.btnColorfulWorld, function() - UIManager.OpenPanel(UIName.CarbonTypePanelV2,2) + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then + UIManager.OpenPanel(UIName.CarbonTypePanelV2,2) + else + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL)) + end end) Util.AddClick(this.btnFenjie, function() JumpManager.GoJump(24001) diff --git a/data_execl/base_data/DialRewardConfig.xlsx b/data_execl/base_data/DialRewardConfig.xlsx index 0ad96f968e..bd669a513b 100644 Binary files a/data_execl/base_data/DialRewardConfig.xlsx and b/data_execl/base_data/DialRewardConfig.xlsx differ diff --git a/data_execl/base_data/HeroSacrifice.xlsx b/data_execl/base_data/HeroSacrifice.xlsx index a2ce5fc7f4..e799ae3a82 100644 Binary files a/data_execl/base_data/HeroSacrifice.xlsx and b/data_execl/base_data/HeroSacrifice.xlsx differ diff --git a/data_execl/base_data/RechargeCommodityConfig.xlsx b/data_execl/base_data/RechargeCommodityConfig.xlsx index 5ae0b6376a..8838820cf8 100644 Binary files a/data_execl/base_data/RechargeCommodityConfig.xlsx and b/data_execl/base_data/RechargeCommodityConfig.xlsx differ