From c6eb719fa60ee46be08bc118eac5c976801555cd Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Wed, 15 Dec 2021 14:41:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=9E=E9=80=80=E6=B6=88?=
=?UTF-8?q?=E8=80=97=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Prefabs/UI/Popup/GeneralPopup.prefab | 162 +++++++++++++++++-
.../Popup/View/GeneralPopup_ResolveReStar.lua | 18 ++
2 files changed, 177 insertions(+), 3 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
index ac8460a72b..04fcb77173 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
@@ -5155,7 +5155,7 @@ 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: -200, y: -250}
+ m_AnchoredPosition: {x: -200, y: -221.89}
m_SizeDelta: {x: 250, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6326318158986269378
@@ -19497,6 +19497,80 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
+--- !u!1 &3366415730380631022
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3770160863885627275}
+ - component: {fileID: 871341731707611719}
+ - component: {fileID: 1943646780142877553}
+ m_Layer: 5
+ m_Name: itemImage
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3770160863885627275
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3366415730380631022}
+ 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: 2721705888471023913}
+ 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: -21.789864, y: -78}
+ m_SizeDelta: {x: 54.376, y: 61.11}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &871341731707611719
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3366415730380631022}
+ m_CullTransparentMesh: 0
+--- !u!114 &1943646780142877553
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3366415730380631022}
+ 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: 0
+ 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: 5341503cbcd7cd54a9f1cac2364cffef, 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 &3377238175967397195
GameObject:
m_ObjectHideFlags: 0
@@ -29185,7 +29259,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &252139921712663492
RectTransform:
m_ObjectHideFlags: 0
@@ -38294,12 +38368,14 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6117573221201135091}
+ - {fileID: 3770160863885627275}
+ - {fileID: 4198242912804743013}
m_Father: {fileID: 252139921712663492}
m_RootOrder: 5
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: 200, y: -250}
+ m_AnchoredPosition: {x: 200, y: -221.89}
m_SizeDelta: {x: 250, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6034950785758288794
@@ -40373,6 +40449,86 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -28}
m_SizeDelta: {x: 800, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7646077006759241808
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4198242912804743013}
+ - component: {fileID: 1299252007534824681}
+ - component: {fileID: 940874928411970056}
+ m_Layer: 5
+ m_Name: itemText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4198242912804743013
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7646077006759241808}
+ 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: 2721705888471023913}
+ 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: 94, y: -81.1001}
+ m_SizeDelta: {x: 157.13, y: 65.07}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1299252007534824681
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7646077006759241808}
+ m_CullTransparentMesh: 0
+--- !u!114 &940874928411970056
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7646077006759241808}
+ 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.7764706, g: 0.3882353, b: 0.4, a: 1}
+ m_RaycastTarget: 0
+ 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: 32
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: 50
+ LanguageIndex: 10123
--- !u!1 &7665553434706597261
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveReStar.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveReStar.lua
index dfd6ed1e93..4d4ee4a0cc 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveReStar.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveReStar.lua
@@ -14,6 +14,7 @@ local itemList = {}
local selectHeroData
local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
+local SpecialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,143)
local itemNum = nil
local heroUseCount = nil
local heroUseItemId = nil
@@ -24,6 +25,8 @@ function this:InitComponent(gameObject)
this.bodyText = Util.GetGameObject(gameObject, "BodyText"):GetComponent("Text")
this.cancelBtn = Util.GetGameObject(gameObject, "CancelBtn")
this.confirmBtn = Util.GetGameObject(gameObject, "ConfirmBtn")
+ this.itemImage = Util.GetGameObject(gameObject, "ConfirmBtn/itemImage"):GetComponent("Image")
+ this.itemImageText = Util.GetGameObject(gameObject, "ConfirmBtn/itemText"):GetComponent("Text")
--滚动条根节点
this.root = Util.GetGameObject(gameObject, "Root/Viewport/Content")
end
@@ -33,6 +36,10 @@ function this:BindEvent()
parent:ClosePanel()
end)
Util.AddClick(this.confirmBtn,function()
+ if itemNum < heroUseCount then
+ PopupTipPanel.ShowTip(string.format("%s不足",itemConfig[heroUseItemId].Name) )
+ return
+ end
if returnHeroSame + LengthOfTable(HeroManager.GetAllHeroList()) - 1 > 999 then
PopupTipPanel.ShowTip("神将数量即将超出上限,请整理后再进行回退操作!")
return
@@ -100,6 +107,17 @@ function this:OnShow(_parent,...)
end
end)
ResetItemView(this.root,this.root.transform,itemList,8,1,sortingOrder,false,_data)
+ local strs = string.split(SpecialConfig.Value,"#")
+ heroUseItemId = tonumber(strs[1])
+ heroUseCount = tonumber(strs[2])
+ itemNum = BagManager.GetItemCountById(heroUseItemId)
+-- LogBlue("heroUseItemId "..heroUseItemId.." itemNum "..itemNum.." heroUseCount "..heroUseCount)
+ if itemNum >= heroUseCount then
+ this.itemImageText.text = string.format("×%s", heroUseCount)
+ else
+ this.itemImageText.text = string.format("×%s", heroUseCount)
+ end
+ this.itemImage.sprite = this.spLoader:LoadSprite(GetResourcePath(itemConfig[heroUseItemId].ResourceID))
end
function this:OnClose()