diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao.png new file mode 100644 index 0000000000..b642b25ad6 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao.png.meta new file mode 100644 index 0000000000..dc418a024d --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: fe4c4e4491e5b33459d6b31627dd774a +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: 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: abc35b9a3d184f54eba40c44d3368a74 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 8d899a4447..77705d1fe9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -96692,7 +96692,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: 7f7048bbca85a5840964fa035063d661, type: 3} + m_Sprite: {fileID: 21300000, guid: fe4c4e4491e5b33459d6b31627dd774a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 762b9fc4af..258170355e 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -14192,46 +14192,6 @@ MonoBehaviour: extension: .mp3 resPathIndex: 87 resAbNameIndex: 495 - - resName: s_jieling_fl_3008_skeff_casting_attacked_mp3 - extension: .mp3 - resPathIndex: 87 - resAbNameIndex: 495 - - resName: s_jieling_fl_3008_skeff_casting_screeneff_mp3 - extension: .mp3 - resPathIndex: 87 - resAbNameIndex: 495 - - resName: s_jieling_hs_3006_skeff_casting_attacked_mp3 - extension: .mp3 - resPathIndex: 87 - resAbNameIndex: 495 - - resName: s_jieling_hs_3006_skeff_casting_screeneff_mp3 - extension: .mp3 - resPathIndex: 87 - resAbNameIndex: 495 - - resName: s_jieling_lms_3009_skeff_casting_attacked_mp3 - extension: .mp3 - resPathIndex: 87 - resAbNameIndex: 495 - - resName: s_jieling_lms_3009_skeff_casting_screeneff_mp3 - extension: .mp3 - resPathIndex: 87 - resAbNameIndex: 495 - - resName: s_jieling_md_3007_skeff_casting_attacked_mp3 - extension: .mp3 - resPathIndex: 87 - resAbNameIndex: 495 - - resName: s_jieling_md_3007_skeff_casting_screeneff_mp3 - extension: .mp3 - resPathIndex: 87 - resAbNameIndex: 495 - - resName: s_jieling_sl_3005_skeff_casting_attacked_mp3 - extension: .mp3 - resPathIndex: 87 - resAbNameIndex: 495 - - resName: s_jieling_sl_3005_skeff_casting_screeneff_mp3 - extension: .mp3 - resPathIndex: 87 - resAbNameIndex: 495 - resName: Audio_skeff_debuff_012 extension: .mp3 resPathIndex: 88 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua index cb00475ad0..78134e48db 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua @@ -155,9 +155,9 @@ function this.SingleDataShow(pre,value) local sConFigData = value local titleText = Util.GetGameObject(activityRewardGo, "title"):GetComponent("Text") - titleText.text = sConFigData.title + titleText.text = sConFigData.title .."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")" local missionText = Util.GetGameObject(activityRewardGo, "mission"):GetComponent("Text") - missionText.text = sConFigData.content.."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")" + missionText.text = sConFigData.content local timeText = Util.GetGameObject(activityRewardGo, "btn/Text") local reward = Util.GetGameObject(activityRewardGo.gameObject, "reward")