From e79b46200a7ae3825a37f728d7667ed2f6619c8c Mon Sep 17 00:00:00 2001
From: "DESKTOP-MMO982B\\User" <752966621@qq.com>
Date: Thu, 14 Aug 2025 11:23:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=AF=8F=E5=88=86=E9=92=9F=E6=94=B9?=
=?UTF-8?q?=E6=88=90=E6=AF=8F=E5=8D=8A=E5=B0=8F=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua
index 155513fd0a..7e8279f0e9 100644
--- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua
@@ -294,6 +294,7 @@ function this.IntiReward()
go.item = newObjToParent(this.rewardItemPre, this.rewardGrid)
go.icon = Util.GetGameObject(go.item, "iconBg/icon"):GetComponent("Image")
go.text = Util.GetGameObject(go.item, "rewardbg/context"):GetComponent("Text")
+ Util.GetGameObject(go.item, "rewardbg/rate"):SetActive(false)
this.rewardList[i] = go
end
@@ -302,10 +303,10 @@ function this.IntiReward()
local addValue = FightPointPassManager.GetItemVipValue(rewardData[i][1])
local baseValue = rewardData[i][2]
if addValue - 1 <= 0 then
- this.rewardList[i].text.text = "+" .. rewardData[i][2]
+ this.rewardList[i].text.text = "+" .. rewardData[i][2] .."/30分钟"
else
local valueShow = math.round((addValue - 1) * baseValue)
- this.rewardList[i].text.text = string.format("+%s\n(+%s)", baseValue, valueShow)
+ this.rewardList[i].text.text = string.format("+%s\n(+%s)", baseValue, valueShow).."/30分钟"
end
end
end
From 235f4bb07c73a41b431b25bfede818919758689a Mon Sep 17 00:00:00 2001
From: "DESKTOP-MMO982B\\User" <752966621@qq.com>
Date: Thu, 14 Aug 2025 11:23:48 +0800
Subject: [PATCH 2/2] 1
---
.../UI/GodsWay/GodsWayTowerPanel.prefab | 362 +++++++++---------
1 file changed, 181 insertions(+), 181 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
index bc4f78f743..aeafc09db5 100644
--- a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
@@ -46263,7 +46263,7 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\xD79999\n(+100%)"
@@ -61979,7 +61979,7 @@ MonoBehaviour:
m_Top: 134
m_Bottom: 0
m_ChildAlignment: 4
- m_Spacing: 62.91
+ m_Spacing: 150
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
@@ -68498,10 +68498,10 @@ MonoBehaviour:
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "/\u5206\u949F"
+ m_Text: "/30\u5206\u949F"
LanguageIndex: 10525
--- !u!114 &414612287
MonoBehaviour:
@@ -75265,71 +75265,16 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 478.1
objectReference: {fileID: 0}
- - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 39.475
- objectReference: {fileID: 0}
- target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -50
objectReference: {fileID: 0}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
- propertyPath: m_Bones.Array.data[0]
- value:
- objectReference: {fileID: 6789526059838717039}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[1]
- value:
- objectReference: {fileID: 3847535138429139909}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[2]
- value:
- objectReference: {fileID: 3458715491590983735}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[3]
- value:
- objectReference: {fileID: 3017694835917112368}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[4]
- value:
- objectReference: {fileID: 6642769763838568755}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[5]
- value:
- objectReference: {fileID: 382756852119676122}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[6]
- value:
- objectReference: {fileID: 1158195459222167083}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[7]
- value:
- objectReference: {fileID: 2874966427381289844}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[8]
- value:
- objectReference: {fileID: 8697078770617743630}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[9]
- value:
- objectReference: {fileID: 7324771491079276774}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_RootBone
- value:
- objectReference: {fileID: 6789526059838717039}
+ propertyPath: m_AnchoredPosition.x
+ value: 39.475
+ objectReference: {fileID: 0}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@@ -75385,6 +75330,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 4239138255771575618}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[0]
+ value:
+ objectReference: {fileID: 6789526059838717039}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[1]
+ value:
+ objectReference: {fileID: 3847535138429139909}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[2]
+ value:
+ objectReference: {fileID: 3458715491590983735}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[3]
+ value:
+ objectReference: {fileID: 3017694835917112368}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[4]
+ value:
+ objectReference: {fileID: 6642769763838568755}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[5]
+ value:
+ objectReference: {fileID: 382756852119676122}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[6]
+ value:
+ objectReference: {fileID: 1158195459222167083}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[7]
+ value:
+ objectReference: {fileID: 2874966427381289844}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[8]
+ value:
+ objectReference: {fileID: 8697078770617743630}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[9]
+ value:
+ objectReference: {fileID: 7324771491079276774}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_RootBone
+ value:
+ objectReference: {fileID: 6789526059838717039}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &2874966427381289844 stripped
@@ -75660,71 +75660,16 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 478.1
objectReference: {fileID: 0}
- - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 39.475
- objectReference: {fileID: 0}
- target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -50
objectReference: {fileID: 0}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
- propertyPath: m_Bones.Array.data[0]
- value:
- objectReference: {fileID: 7917258885034123966}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[1]
- value:
- objectReference: {fileID: 469443268855522580}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[2]
- value:
- objectReference: {fileID: 2024701814541766374}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[3]
- value:
- objectReference: {fileID: 1875746557491206881}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[4]
- value:
- objectReference: {fileID: 8055012424555673570}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[5]
- value:
- objectReference: {fileID: 3938731767263050251}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[6]
- value:
- objectReference: {fileID: 2590766443349557498}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[7]
- value:
- objectReference: {fileID: 1442016386633059749}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[8]
- value:
- objectReference: {fileID: 5428183252868327391}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[9]
- value:
- objectReference: {fileID: 6215016020277614135}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_RootBone
- value:
- objectReference: {fileID: 7917258885034123966}
+ propertyPath: m_AnchoredPosition.x
+ value: 39.475
+ objectReference: {fileID: 0}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@@ -75780,6 +75725,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 662747332772281235}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[0]
+ value:
+ objectReference: {fileID: 7917258885034123966}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[1]
+ value:
+ objectReference: {fileID: 469443268855522580}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[2]
+ value:
+ objectReference: {fileID: 2024701814541766374}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[3]
+ value:
+ objectReference: {fileID: 1875746557491206881}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[4]
+ value:
+ objectReference: {fileID: 8055012424555673570}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[5]
+ value:
+ objectReference: {fileID: 3938731767263050251}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[6]
+ value:
+ objectReference: {fileID: 2590766443349557498}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[7]
+ value:
+ objectReference: {fileID: 1442016386633059749}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[8]
+ value:
+ objectReference: {fileID: 5428183252868327391}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[9]
+ value:
+ objectReference: {fileID: 6215016020277614135}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_RootBone
+ value:
+ objectReference: {fileID: 7917258885034123966}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &1442016386633059749 stripped
@@ -76055,71 +76055,16 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 478.1
objectReference: {fileID: 0}
- - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 39.475
- objectReference: {fileID: 0}
- target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -50
objectReference: {fileID: 0}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
- propertyPath: m_Bones.Array.data[0]
- value:
- objectReference: {fileID: 7472164165561955869}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[1]
- value:
- objectReference: {fileID: 931814734807593399}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[2]
- value:
- objectReference: {fileID: 1618088765004405317}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[3]
- value:
- objectReference: {fileID: 1182838340984393282}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[4]
- value:
- objectReference: {fileID: 7324141232903758657}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[5]
- value:
- objectReference: {fileID: 4378795258779545256}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[6]
- value:
- objectReference: {fileID: 2997696272135148633}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[7]
- value:
- objectReference: {fileID: 2192873659091441926}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[8]
- value:
- objectReference: {fileID: 4699914484981592956}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_Bones.Array.data[9]
- value:
- objectReference: {fileID: 6642132831306302100}
- - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_RootBone
- value:
- objectReference: {fileID: 7472164165561955869}
+ propertyPath: m_AnchoredPosition.x
+ value: 39.475
+ objectReference: {fileID: 0}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@@ -76175,6 +76120,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 242976170226757424}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[0]
+ value:
+ objectReference: {fileID: 7472164165561955869}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[1]
+ value:
+ objectReference: {fileID: 931814734807593399}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[2]
+ value:
+ objectReference: {fileID: 1618088765004405317}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[3]
+ value:
+ objectReference: {fileID: 1182838340984393282}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[4]
+ value:
+ objectReference: {fileID: 7324141232903758657}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[5]
+ value:
+ objectReference: {fileID: 4378795258779545256}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[6]
+ value:
+ objectReference: {fileID: 2997696272135148633}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[7]
+ value:
+ objectReference: {fileID: 2192873659091441926}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[8]
+ value:
+ objectReference: {fileID: 4699914484981592956}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_Bones.Array.data[9]
+ value:
+ objectReference: {fileID: 6642132831306302100}
+ - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_RootBone
+ value:
+ objectReference: {fileID: 7472164165561955869}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &4378795258779545256 stripped