From 4732f007ce28c5bf1a8b44a21850e47bd67c4f40 Mon Sep 17 00:00:00 2001
From: xiejun <467745540@qq.com>
Date: Mon, 4 Dec 2023 18:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=92=E5=85=83=E5=AD=97=E4=BD=93=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Prefabs/UI/Popup/GeneralPopup.prefab | 36 +++++++++----------
.../Popup/View/GeneralPopup_ResolveRecall.lua | 4 +--
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
index cf911c6aad..73b04bcb84 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
@@ -730,8 +730,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: -2, y: 145}
- m_SizeDelta: {x: 866.2, y: 202.7}
+ m_AnchoredPosition: {x: 7.2, y: 131.22}
+ m_SizeDelta: {x: 836, y: 175.14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &431991883
CanvasRenderer:
@@ -30496,10 +30496,10 @@ RectTransform:
m_Father: {fileID: 1514742784526019917}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 30}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 89.5, y: -39.665}
+ m_SizeDelta: {x: 71, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &719194494920943748
CanvasRenderer:
@@ -46874,9 +46874,9 @@ RectTransform:
m_Father: {fileID: 1514742784526019917}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 27, y: -39.665}
m_SizeDelta: {x: 54, y: 54}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6198227662777375596
@@ -51231,7 +51231,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 237.3, y: -95.34}
- m_SizeDelta: {x: 0, y: 79.33}
+ m_SizeDelta: {x: 125, y: 79.33}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8047649643578717371
CanvasRenderer:
@@ -56275,9 +56275,9 @@ RectTransform:
m_Father: {fileID: 7843831536758449798}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 706.275, y: -37}
m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7841663904524152744
@@ -56414,9 +56414,9 @@ RectTransform:
m_Father: {fileID: 7843831536758449798}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 235.425, y: -37}
m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7841404854095346338
@@ -56720,7 +56720,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &7843436345893266768
RectTransform:
m_ObjectHideFlags: 0
@@ -65527,7 +65527,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &8315664656186209665
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua
index 3cff75bcf6..598025a660 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua
@@ -134,9 +134,9 @@ function this:OnShow(_parent,...)
itemNum = BagManager.GetItemCountById(heroUseItemId)
-- LogBlue("heroUseItemId "..heroUseItemId.." itemNum "..itemNum.." heroUseCount "..heroUseCount)
if itemNum >= heroUseCount then
- this.itemImageText.text = string.format("×%s", heroUseCount)
+ this.itemImageText.text = string.format("×%s", heroUseCount)
else
- this.itemImageText.text = string.format("×%s", heroUseCount)
+ this.itemImageText.text = string.format("×%s", heroUseCount)
end
this.itemImage.sprite = this.spLoader:LoadSprite(GetResourcePath(itemConfig[heroUseItemId].ResourceID))
end