diff --git a/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/g_guanka_lijiqianwang_zh.png b/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/g_guanka_lijiqianwang_zh.png new file mode 100644 index 0000000000..ff90103537 Binary files /dev/null and b/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/g_guanka_lijiqianwang_zh.png differ diff --git a/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/g_guanka_lijiqianwang_zh.png.meta b/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/g_guanka_lijiqianwang_zh.png.meta new file mode 100644 index 0000000000..b520fcc87d --- /dev/null +++ b/Assets/ManagedResources/Atlas/FightAtlas/ArtFont/g_guanka_lijiqianwang_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 662b65eb098e8334fa3a497edea3c08f +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7c6ffe5277b57d041a29e033c4295404 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FightAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FightAtlas/g_guanka_tishikuang.png b/Assets/ManagedResources/Atlas/FightAtlas/g_guanka_tishikuang.png new file mode 100644 index 0000000000..041d387e29 Binary files /dev/null and b/Assets/ManagedResources/Atlas/FightAtlas/g_guanka_tishikuang.png differ diff --git a/Assets/ManagedResources/Atlas/FightAtlas/g_guanka_tishikuang.png.meta b/Assets/ManagedResources/Atlas/FightAtlas/g_guanka_tishikuang.png.meta new file mode 100644 index 0000000000..c4659ee750 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FightAtlas/g_guanka_tishikuang.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: a5e3b4ac687cf7b4687c7cb4b82a2eed +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 385beb84e2c5c364eb1ddab871469d85 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FightAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index cfed3657a9..6b505857a9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -10019,6 +10019,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &762939337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 762939338} + - component: {fileID: 762939340} + - component: {fileID: 762939339} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &762939338 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762939337} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} + m_Children: [] + m_Father: {fileID: 5073206815621103962} + 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: 114, y: -33} + m_SizeDelta: {x: 260, y: 94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &762939340 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762939337} + m_CullTransparentMesh: 0 +--- !u!114 &762939339 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762939337} + 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: 662b65eb098e8334fa3a497edea3c08f, 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 &796774146 GameObject: m_ObjectHideFlags: 0 @@ -10053,8 +10127,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.3999939, y: 0.69999695} - m_SizeDelta: {x: -42.8, y: -18.6} + m_AnchoredPosition: {x: -110.7, y: -45} + m_SizeDelta: {x: -267, y: -109.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &796774150 CanvasRenderer: @@ -10097,7 +10171,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: '************************************************************************************' + m_Text: '************************************************' LanguageIndex: 10530 --- !u!1 &921277673 GameObject: @@ -10817,8 +10891,8 @@ 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: 302, y: 17} - m_SizeDelta: {x: 400, y: 150} + m_AnchoredPosition: {x: 219, y: 40} + m_SizeDelta: {x: 640, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1322237863 CanvasRenderer: @@ -10848,7 +10922,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: cea2de122c1a9514ca0fccab6368d837, type: 3} + m_Sprite: {fileID: 21300000, guid: a5e3b4ac687cf7b4687c7cb4b82a2eed, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -75030,7 +75104,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5073206815621103962 RectTransform: m_ObjectHideFlags: 0 @@ -75043,6 +75117,7 @@ RectTransform: m_LocalScale: {x: 0.7013334, y: 0.7013334, z: 1} m_Children: - {fileID: 7844368557844343178} + - {fileID: 762939338} m_Father: {fileID: 7718967529276036518} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -146005,15 +146080,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} ---- !u!1 &1533186584701823329 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf, - type: 3} - m_PrefabInstance: {fileID: 8971074634032498639} - m_PrefabAsset: {fileID: 0} --- !u!224 &830511510176938944 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} m_PrefabInstance: {fileID: 8971074634032498639} m_PrefabAsset: {fileID: 0} +--- !u!1 &1533186584701823329 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf, + type: 3} + m_PrefabInstance: {fileID: 8971074634032498639} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 32912d0bf7..9fdb66f3a7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -231,7 +231,9 @@ function FightPointPassMainPanel:InitComponent() this.OpenSeverWelfareInfoText = Util.GetGameObject(this.OpenSeverWelfare, "info"):GetComponent("Text") this.OpenSeverWelfareRed = Util.GetGameObject(this.OpenSeverWelfare, "redpot") this.battleUpLvTip = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip") + this.battleUpLvTipImg = this.battleUpLvTip:GetComponent("Image") this.battleUpLvTipTxt = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip/Text"):GetComponent("Text") + this.battleLockGo = Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip/Image") --山河社稷图 this.btnFightLevel = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnFightLevel") this.btnFightLevel:SetActive(false) @@ -1047,7 +1049,10 @@ end function this.RefreshBattleUpLvTip(isShowUIOpen) -- Util.AddOnceClick(this.battleUpLvTip, function() end) - this.battleUpLvTip:GetComponent("Image").raycastTarget = false + this.battleUpLvTip:SetActive(false) + this.battleUpLvTipImg.enabled = false + this.battleUpLvTipTxt.gameObject:SetActive(false) + this.battleLockGo:SetActive(false) -- 么解锁章节不显示 if not FightPointPassManager.IsChapterClossState() then return @@ -1059,8 +1064,12 @@ function this.RefreshBattleUpLvTip(isShowUIOpen) -- 可以挑战显示 挑战关卡快速升级 if not isShowUIOpen and isOk then - this.battleUpLvTipTxt.text = Language[10610] this.battleUpLvTip:SetActive(true) + this.battleUpLvTipImg.enabled = true + this.battleUpLvTipTxt.gameObject:SetActive(true) + this.battleLockGo:SetActive(false) + + this.battleUpLvTipTxt.text = Language[10610] return end @@ -1082,25 +1091,28 @@ function this.RefreshBattleUpLvTip(isShowUIOpen) if ruleType then if ruleType == 1 then -- 山河社稷图 - this.battleUpLvTipTxt.text = "立即前往>>" this.battleUpLvTip:SetActive(true) - this.battleUpLvTip:GetComponent("Image").raycastTarget = true + this.battleUpLvTipImg.enabled = false + this.battleUpLvTipTxt.gameObject:SetActive(false) + this.battleLockGo:SetActive(true) Util.AddOnceClick(this.battleUpLvTip, function() JumpManager.GoJump(36023) end) elseif ruleType == 2 then -- 心魔试炼 - this.battleUpLvTipTxt.text = "立即前往>>" this.battleUpLvTip:SetActive(true) - this.battleUpLvTip:GetComponent("Image").raycastTarget = true + this.battleUpLvTipImg.enabled = false + this.battleUpLvTipTxt.gameObject:SetActive(false) + this.battleLockGo:SetActive(true) Util.AddOnceClick(this.battleUpLvTip, function() JumpManager.GoJump(1011) end) elseif ruleType == 4 then -- 获取神将 - this.battleUpLvTipTxt.text = "立即前往>>" this.battleUpLvTip:SetActive(true) - this.battleUpLvTip:GetComponent("Image").raycastTarget = true + this.battleUpLvTipImg.enabled = false + this.battleUpLvTipTxt.gameObject:SetActive(false) + this.battleLockGo:SetActive(true) Util.AddOnceClick(this.battleUpLvTip, function() JumpManager.GoJump(22001) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua index 89f285af26..e47c2d2e25 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua @@ -669,11 +669,11 @@ function this.GetCurLevelTips() LogError(id) if config.Type == 1 then if this.CarbonIdCompare(this.GetCurFightId(), config.Parameter) < 0 then - return string.format("通关%s,%s", mainLevelConfig[config.Parameter].Name, config.Desc) + return config.Desc -- string.format("通关%s,%s", mainLevelConfig[config.Parameter].Name, config.Desc) end elseif config.Type == 2 then if PlayerManager.level < config.Parameter then - return string.format("等级达%s,%s", config.Parameter, config.Desc) + return config.Desc -- string.format("等级达%s,%s", config.Parameter, config.Desc) end end end