diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
index de6c37f5f8..961b52f6bc 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
@@ -11983,6 +11983,85 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u786E \u8BA4"
LanguageIndex: 10123
+--- !u!1 &2570075562108282243
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7858246822778438727}
+ - component: {fileID: 5413660572345632513}
+ - component: {fileID: 643456947987941065}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &7858246822778438727
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2570075562108282243}
+ 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: 4002341678660140781}
+ 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: -0}
+ m_SizeDelta: {x: 167.6, y: 51.1}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5413660572345632513
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2570075562108282243}
+ m_CullTransparentMesh: 0
+--- !u!114 &643456947987941065
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2570075562108282243}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0.8588236, b: 0.60784316, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 43
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 51
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "98\u5143"
--- !u!1 &2608535148006920750
GameObject:
m_ObjectHideFlags: 0
@@ -14831,7 +14910,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &7801970642132342922
RectTransform:
m_ObjectHideFlags: 0
@@ -16391,7 +16470,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &952792893445881680
RectTransform:
m_ObjectHideFlags: 0
@@ -29573,6 +29652,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7801970642132342922}
+ - {fileID: 7858246822778438727}
m_Father: {fileID: 7846968063202130352}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
index da8c46052a..45ae8ea7bd 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
@@ -24,6 +24,7 @@ function this:InitComponent(gameObject)
this.btnBack = Util.GetGameObject(gameObject, "frame/bg/closeBtn")
this.dealBtn = Util.GetGameObject(gameObject, "frame/bg/dealBtn")
this.dealBtnIma = Util.GetGameObject(this.dealBtn, "Image"):GetComponent("Image")
+ this.dealBtnText = Util.GetGameObject(this.dealBtn, "Text"):GetComponent("Text")
if MoneyUtil.MT == MoneyType.RMB then
this.dealBtnIma.sprite = this.spLoader:LoadSprite("q_qinlongmibao_jiesuozhenbao198")
else
@@ -63,14 +64,22 @@ function this:OnShow(_parent,...)
rewardData = TreasureOfHeavenManger.GetAllRewardData()
this:showRewardTianGong()
this.tip.text = Language[12286]
+ this.dealBtnIma.gameObject:SetActive(true)
+ this.dealBtnText.gameObject:SetActive(false)
elseif curType == 2 then
rewardData = QinglongSerectTreasureManager.GetAllRewardData()
this:showRewardQinglong()
this.tip.text = Language[12287]
+ this.dealBtnIma.gameObject:SetActive(true)
+ this.dealBtnText.gameObject:SetActive(false)
elseif curType == 3 then
rewardData,rewardData1 = EndLessMapManager.GetAllRewardData()
this:showRewardWuJin(rewardData,rewardData1)
this.tip.text = "解锁秘宝,激活进阶专属奖励+2000积分,可获取980妖晶"
+ this.dealBtnIma.gameObject:SetActive(false)
+ this.dealBtnText.gameObject:SetActive(true)
+ local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id)
+ this.dealBtnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(config.Price)
end
end