From 12e091408d11c4934a122e1e53095a827a32c66a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 27 Nov 2021 15:37:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=82=E7=BA=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 26 +++++++++---------- .../TailsManSoul/TailsmanSoulChipLottery.lua | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 7a426345f4..7f6b26c14c 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -4645,8 +4645,8 @@ RectTransform: m_LocalScale: {x: 1.121, y: 1.121, z: 1.2} m_Children: - {fileID: 7820664161829032137} - - {fileID: 1918539805506993827} - {fileID: 3576822251131750030} + - {fileID: 1918539805506993827} m_Father: {fileID: 1570819029236701394} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7194,7 +7194,7 @@ RectTransform: m_Children: - {fileID: 3647066211733455541} m_Father: {fileID: 8614302680793752992} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -9311,8 +9311,8 @@ RectTransform: m_LocalScale: {x: 1.121, y: 1.121, z: 1.2} m_Children: - {fileID: 8122240164478478706} - - {fileID: 1870300530701557260} - {fileID: 6069402865800005301} + - {fileID: 1870300530701557260} m_Father: {fileID: 1570819029236701394} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -14002,7 +14002,7 @@ RectTransform: m_Children: - {fileID: 5558357353845668213} m_Father: {fileID: 8246325377464232763} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -17906,7 +17906,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5837765501628571760} - m_RootOrder: 2 + 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} @@ -18223,7 +18223,7 @@ RectTransform: m_Children: - {fileID: 5003439387145888498} m_Father: {fileID: 1204154185889673860} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -22521,8 +22521,8 @@ RectTransform: m_LocalScale: {x: 1.121, y: 1.121, z: 1.2} m_Children: - {fileID: 3303746076602247238} - - {fileID: 3667843503506730412} - {fileID: 7447038135754174901} + - {fileID: 3667843503506730412} m_Father: {fileID: 1570819029236701394} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -22573,7 +22573,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -453.95, y: 0} + m_AnchoredPosition: {x: -453.95, y: 0.000047771675} m_SizeDelta: {x: 907.9, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &4260212251028292622 @@ -23103,7 +23103,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8246325377464232763} - m_RootOrder: 2 + 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} @@ -25521,7 +25521,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1204154185889673860} - m_RootOrder: 2 + 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} @@ -30063,7 +30063,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8614302680793752992} - m_RootOrder: 2 + 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} @@ -32980,8 +32980,8 @@ RectTransform: m_LocalScale: {x: 1.121, y: 1.121, z: 1.2} m_Children: - {fileID: 727465291898238319} - - {fileID: 583723140753549156} - {fileID: 1230547632573238286} + - {fileID: 583723140753549156} m_Father: {fileID: 1570819029236701394} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -33891,7 +33891,7 @@ RectTransform: m_Children: - {fileID: 4842428901316839392} m_Father: {fileID: 5837765501628571760} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua index 9ef74b1063..073a9ed20c 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua @@ -175,7 +175,7 @@ end function TailsmanSoulChipLottery:refreshBtnShow() local curTimes = PrivilegeManager.GetPrivilegeUsedTimes(self.maxtimesId) self.limit.text ="今日召唤上限:"..curTimes.."/"..privilegeConfig[self.maxtimesId].Condition[1][2] - self.btnTime.gameObject:SetActive(true) + self.btnTime.gameObject:SetActive(false) local freeTime = 0 if self.freeTimesId and self.freeTimesId > 0 then freeTime = PrivilegeManager.GetPrivilegeRemainValue(self.freeTimesId)