From 69ba11ba8b81f25a3c2fd2e2f8ff0b057f63fce7 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 27 Nov 2024 14:32:40 +0800 Subject: [PATCH 01/10] 1 --- .../~Lua/Modules/DynamicActivity/DynamicActivityManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 613d47642c..428f905f13 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -906,7 +906,7 @@ function this.CreatSingleMissionData(missionData, havaBought) data.missionId = missionData.missionId data.shows = actRewardConfig[missionData.missionId].Reward data.itemName = GetLanguageStrById(itemConfig[data.shows[1][1]].Name) - data.content = Language[10567] .. actRewardConfig[data.missionId].Values[1][2] .. Language[10568] + data.content = Language[10567] .. actRewardConfig[data.missionId].Values[1][2] --.. Language[10568] data.isCanGetReward = PlayerManager.level >= actRewardConfig[data.missionId].Values[1][2] --0 未领取(等级已达到,未购买基金) 1 已领取 -1 未达到等级 2可领取 if missionData.state == 0 then From e8666398ffbb983406793cd94793483746284745 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 27 Nov 2024 14:46:27 +0800 Subject: [PATCH 02/10] 1 --- .../ArtFont_en/r_hero_dadi 1_en.png | Bin 15160 -> 15784 bytes .../ArtFont_en/r_hero_dadi_en.png | Bin 5587 -> 5733 bytes ...> z_icon_bianshenka_zhenyingtubiao_en.png} | Bin ...con_bianshenka_zhenyingtubiao_en.png.meta} | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename Assets/ManagedResources/ArtFont_en/{z_icon_bianshenka_enenyingtubiao_en.png => z_icon_bianshenka_zhenyingtubiao_en.png} (100%) rename Assets/ManagedResources/ArtFont_en/{z_icon_bianshenka_enenyingtubiao_en.png.meta => z_icon_bianshenka_zhenyingtubiao_en.png.meta} (96%) diff --git a/Assets/ManagedResources/ArtFont_en/r_hero_dadi 1_en.png b/Assets/ManagedResources/ArtFont_en/r_hero_dadi 1_en.png index e019fa946455449a02ddd13b34391e142ad9555c..58bb9a8be4cfab3bffdcbe0d4732bfc6f0a806de 100644 GIT binary patch literal 15784 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 KSe=Mr(EkJK6qE`8 literal 15160 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 QBNjwTOir{$*dXwK0H(4v=Kufz diff --git a/Assets/ManagedResources/ArtFont_en/r_hero_dadi_en.png b/Assets/ManagedResources/ArtFont_en/r_hero_dadi_en.png index 53d33d90b431594dde3ebca5947b0195a559d33a..5c8713262f8d67311c5b983331aa59ec79a3134b 100644 GIT binary patch literal 5733 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 X_SK(-a1$d400000NkvXXu0mjf*3LlO literal 5587 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 diff --git a/Assets/ManagedResources/ArtFont_en/z_icon_bianshenka_enenyingtubiao_en.png b/Assets/ManagedResources/ArtFont_en/z_icon_bianshenka_zhenyingtubiao_en.png similarity index 100% rename from Assets/ManagedResources/ArtFont_en/z_icon_bianshenka_enenyingtubiao_en.png rename to Assets/ManagedResources/ArtFont_en/z_icon_bianshenka_zhenyingtubiao_en.png diff --git a/Assets/ManagedResources/ArtFont_en/z_icon_bianshenka_enenyingtubiao_en.png.meta b/Assets/ManagedResources/ArtFont_en/z_icon_bianshenka_zhenyingtubiao_en.png.meta similarity index 96% rename from Assets/ManagedResources/ArtFont_en/z_icon_bianshenka_enenyingtubiao_en.png.meta rename to Assets/ManagedResources/ArtFont_en/z_icon_bianshenka_zhenyingtubiao_en.png.meta index 3a16fc6839..360946be20 100644 --- a/Assets/ManagedResources/ArtFont_en/z_icon_bianshenka_enenyingtubiao_en.png.meta +++ b/Assets/ManagedResources/ArtFont_en/z_icon_bianshenka_zhenyingtubiao_en.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 960dece3ca74d664caa8b951219e69f7 +guid: a73986dc70b67d14fb27de39268087ea TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 8ea3a4dc3b1c90847a733f9144728452 + spriteID: 5d64a9286b791584786cefe176ba9fbd vertices: [] indices: edges: [] From c9b90d9072eec786b6546eeaa2f20fb138239e54 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 27 Nov 2024 14:50:03 +0800 Subject: [PATCH 03/10] 1 --- .../~Lua/Modules/Incarnation/IncarnationPanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua index b304d300bf..4ecfbd99f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua @@ -355,11 +355,11 @@ function IncarnationPanel:SetSingleData(go, data, index) NetManager.UpOrDownTransformationRequest(data.id, 0, 1, function() data.state = 1 self:SetSingleData(go, data, index) - PopupTipPanel.ShowTip(string.format(Language[11623], data.name)) + PopupTipPanel.ShowTip(string.format(Language[11623], GetLanguageStrById(data.name))) CheckRedPointStatus(RedPointType.incarnation_force) end) else - PopupTipPanel.ShowTip(string.format(Language[11623], data.name)) + PopupTipPanel.ShowTip(string.format(Language[11623], GetLanguageStrById(data.name))) end end) Util.AddOnceClick(self.itemPreList[go].incarnationBtn, function() From 614ae4698488eff947dc926f3c99eea96d649092 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 27 Nov 2024 15:24:54 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Carbon/NewCarbon/CarbonsPanel.prefab | 36 +- .../Prefabs/UI/Gem/GemPanel.prefab | 18 +- .../UI/GodsWay/GodsWayTowerPanel.prefab | 346 +++++++++--------- .../Prefabs/UI/Guild/GuildFetePopup.prefab | 32 +- .../UI/Ranking/RankingListMainPanel.prefab | 8 +- .../ManagedResources/~Lua/Common/Language.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleGiftPanel.lua | 4 +- 7 files changed, 223 insertions(+), 223 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab index 018a134799..1e1f3a6570 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab @@ -1402,8 +1402,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 135.5, y: -18.5} - m_SizeDelta: {x: 271, y: 37} + m_AnchoredPosition: {x: 145, y: -18.5} + m_SizeDelta: {x: 290, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6495588927036638659 CanvasRenderer: @@ -1476,7 +1476,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: -127, y: 1} + m_AnchoredPosition: {x: -154.6001, y: 1} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4701192788520570845 @@ -2092,7 +2092,7 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 271, y: 37} + m_CellSize: {x: 290, y: 37} m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 1 @@ -2241,8 +2241,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: 1.3, y: 3} - m_SizeDelta: {x: 184, y: 39} + m_AnchoredPosition: {x: 13.39, y: 3} + m_SizeDelta: {x: 254.67, y: 39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6500783828367067171 CanvasRenderer: @@ -2279,7 +2279,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -2730,7 +2730,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: 100, y: 20} + m_AnchoredPosition: {x: 137.6, y: 31.1} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6697413273450810149 @@ -2952,7 +2952,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: -127.2, y: 2.4} + m_AnchoredPosition: {x: -154.8, y: 2.4} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7157460571225524541 @@ -3219,8 +3219,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: -1108, y: 173} - m_SizeDelta: {x: 325, y: 87} + m_AnchoredPosition: {x: -1080.01, y: 173} + m_SizeDelta: {x: 380.99, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1102756234027167001 CanvasRenderer: @@ -3251,7 +3251,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 4821f897b6fb6dc42b69932fb799ad06, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3822,8 +3822,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 135.5, y: -55.5} - m_SizeDelta: {x: 271, y: 37} + m_AnchoredPosition: {x: 145, y: -55.5} + m_SizeDelta: {x: 290, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5074906141544346636 CanvasRenderer: @@ -4157,8 +4157,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 135.5, y: -92.5} - m_SizeDelta: {x: 271, y: 37} + m_AnchoredPosition: {x: 145, y: -92.5} + m_SizeDelta: {x: 290, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3282577278308170168 CanvasRenderer: @@ -4838,8 +4838,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 135.5, y: -129.5} - m_SizeDelta: {x: 271, y: 37} + m_AnchoredPosition: {x: 145, y: -129.5} + m_SizeDelta: {x: 290, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3619866950882426101 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab index 6dd9d1c914..f9afae631e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab @@ -69,7 +69,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -263,7 +263,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -374,7 +374,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -485,7 +485,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -596,7 +596,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -681,7 +681,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: 0, y: -250} + m_AnchoredPosition: {x: 10, y: -223} m_SizeDelta: {x: 800, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1576026678 @@ -799,7 +799,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -910,7 +910,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -1021,7 +1021,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 diff --git a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab index d9e5938c9a..245fc76ce2 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab @@ -25861,7 +25861,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: 28.3, y: 0.0000069141} + m_AnchoredPosition: {x: 99, y: -5.2} m_SizeDelta: {x: 121.51, y: 40.58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4731455805283454071 @@ -68146,8 +68146,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 94.600006, y: -19.190002} - m_SizeDelta: {x: 213, y: 58} + m_AnchoredPosition: {x: 47.6, y: -19.190002} + m_SizeDelta: {x: 98, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1798275871522754023 CanvasRenderer: @@ -68177,7 +68177,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 54b159ca46c66ab4b88b0c543c385682, type: 3} + m_Sprite: {fileID: 21300000, guid: 0fdb11ebf0af8694cb08b9c264d3fa2a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -73777,61 +73777,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.75 objectReference: {fileID: 0} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 4239138255771575618} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 1478786657260596419} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 8145092030358069884} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 8834863461068896970} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 3934879465561439888} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 1298431382559632061} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 8215435202396873296} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 8345161809758301208} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 4109518020871527147} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 8630497023421281403} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 4239138255771575618} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -73887,6 +73832,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 6789526059838717039} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 4239138255771575618} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 1478786657260596419} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 8145092030358069884} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 8834863461068896970} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 3934879465561439888} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 1298431382559632061} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 8215435202396873296} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 8345161809758301208} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 4109518020871527147} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 8630497023421281403} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 4239138255771575618} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &6642769763838568755 stripped @@ -74124,61 +74124,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.75 objectReference: {fileID: 0} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 662747332772281235} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2838191739614327314} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 4823305674520378541} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 5295460731459003419} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 1085587704857244898} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 2441523354941633644} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 4748458885330304129} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 4623231488584757961} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 3704848856444800584} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 5642701455126167049} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 662747332772281235} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -74234,6 +74179,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 7917258885034123966} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 662747332772281235} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2838191739614327314} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 4823305674520378541} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 5295460731459003419} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 1085587704857244898} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 2441523354941633644} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 4748458885330304129} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 4623231488584757961} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 3704848856444800584} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 5642701455126167049} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 662747332772281235} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &1875746557491206881 stripped @@ -74465,11 +74465,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.75 objectReference: {fileID: 0} - - target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -74480,61 +74475,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 242976170226757424} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 3246810435530417841} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 5224851005951387662} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 4832632607405404344} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 1085587704857244898} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 3138934397645299919} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 5442704090709780514} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 5351595982620730986} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 4109518020871527147} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 5642701455126167049} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 242976170226757424} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -74590,6 +74535,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 7472164165561955869} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 242976170226757424} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 3246810435530417841} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 5224851005951387662} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 4832632607405404344} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 1085587704857244898} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 3138934397645299919} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 5442704090709780514} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 5351595982620730986} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 4109518020871527147} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 5642701455126167049} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 242976170226757424} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &4378795258779545256 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab index 456dd0cf9c..8d1be1b31c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab @@ -9701,7 +9701,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 6007162569723480479} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -30676,7 +30676,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: 0, y: -328.1} + m_AnchoredPosition: {x: 0, y: -353} m_SizeDelta: {x: 212.66, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1302051257419407867 @@ -41330,7 +41330,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: 0, y: -328.1} + m_AnchoredPosition: {x: 0, y: -353} m_SizeDelta: {x: 212.66, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4450733372872219073 @@ -52022,7 +52022,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.80000305, y: 0} + m_AnchoredPosition: {x: 0.80000305, y: 6} m_SizeDelta: {x: -54.51, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5716217659202862554 @@ -52055,15 +52055,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u796D \u7940" @@ -52661,7 +52661,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.80000305, y: 0} + m_AnchoredPosition: {x: 0.80000305, y: 6} m_SizeDelta: {x: -54.51, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8346433259537092315 @@ -52694,15 +52694,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u796D \u7940" @@ -63692,7 +63692,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: 0, y: -328.1} + m_AnchoredPosition: {x: 0, y: -353} m_SizeDelta: {x: 212.66, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4219218564692603740 @@ -64085,7 +64085,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.80000305, y: 0} + m_AnchoredPosition: {x: 0.80000305, y: 6} m_SizeDelta: {x: -54.51, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2992859326272719800 @@ -64118,15 +64118,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u796D \u7940" diff --git a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab index 04888b7641..0cf34f1255 100644 --- a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab @@ -1052,7 +1052,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.0007324219, y: 0.000061035156} + m_AnchoredPosition: {x: -0.0007324219, y: 5.4} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1368082059756365163 @@ -2166,7 +2166,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: 94.6, y: 19} + m_AnchoredPosition: {x: 124.1, y: 28.4} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7597702777668687824 @@ -2990,8 +2990,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: 268.5, y: -99.5} - m_SizeDelta: {x: 266, y: 80} + m_AnchoredPosition: {x: 268.5, y: -103.9} + m_SizeDelta: {x: 320, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8440013227534213861 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 95dee11b16..f988841bb8 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2181,7 +2181,7 @@ [12180] = GetLanguageStrById("不朽天赋"), [12181] = GetLanguageStrById("全体神将"), [12182] = GetLanguageStrById(" 主角礼物加成+%s (%s%%)"), - [12183] = GetLanguageStrById(" 修炼加成+%s (%s%%)"), + [12183] = GetLanguageStrById(" 修炼加成+ (%s%%)"), [12184] = GetLanguageStrById(" 潜能 +%s(%s%%)"), [12185] = GetLanguageStrById("全体神将潜能等级+"), [12186] = GetLanguageStrById("神将潜能等级+"), diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua index 28c623eb20..44fb6c22dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua @@ -293,9 +293,9 @@ function this.RefreshWindowData() this.proGrid.transform:GetChild(i - 1).gameObject:SetActive(true) LogError("originalList[i]======================" .. originalList[i]) this.proGrid.transform:GetChild(i - 1):GetComponent("Text").text = proList[i] .. - string.format(Language[12733], math.floor(originalList[i] * GiftManager.GetPlayerGiftAdd() / 100), + string.format(GetLanguageStrById(Language[12733]), math.floor(originalList[i] * GiftManager.GetPlayerGiftAdd() / 100), GiftManager.GetPlayerGiftAdd()) - .. string.format(Language[12183], math.floor(originalList[i] * HeroManager.ReturnGiftAtt()), + .. string.format(GetLanguageStrById(Language[12183]), math.floor(originalList[i] * HeroManager.ReturnGiftAtt()), HeroManager.ReturnGiftAtt()) elseif i == #proList then this.proGrid.transform:GetChild(i - 1).gameObject:SetActive(true) From 15d2f2d98fe393828afd9ead43a463ed836dda9c Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 27 Nov 2024 15:52:44 +0800 Subject: [PATCH 05/10] 1 --- .../Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab index bcd9cfb64a..b5f212d7e8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab @@ -1109,8 +1109,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: -14.6, y: 167} - m_SizeDelta: {x: 253, y: 310} + m_AnchoredPosition: {x: 6, y: 183} + m_SizeDelta: {x: 300, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7843520918456253060 CanvasRenderer: @@ -1140,7 +1140,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3e8ed147f86c3724b8d374c9ec937f97, type: 3} + m_Sprite: {fileID: 21300000, guid: 33251cd32c56ad74e92261dbae141514, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 From 2e80ac29a584162ef1d5231b857b1f37290a436e Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 27 Nov 2024 16:27:14 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FindTreasureDispatchPanel.prefab | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab index 963cd73fa9..906873da61 100644 --- a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab @@ -711,7 +711,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: -1.8, y: -401} + m_AnchoredPosition: {x: -1.8, y: -394} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &380322857252361036 @@ -3403,7 +3403,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: 0.099999994, y: -63} + m_AnchoredPosition: {x: 0.099999994, y: -45} m_SizeDelta: {x: 384.31, y: 64.410034} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1937419862058096008 @@ -4146,8 +4146,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: 204, y: -611} - m_SizeDelta: {x: 260, y: 74} + m_AnchoredPosition: {x: 204, y: -598} + m_SizeDelta: {x: 260, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1937221655816918808 CanvasRenderer: @@ -4179,7 +4179,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3} m_Type: 0 - m_PreserveAspect: 1 + m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -4237,7 +4237,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1869609160761531214} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -6483,7 +6483,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: -3.9, y: -472} + m_AnchoredPosition: {x: -3.9, y: -486} m_SizeDelta: {x: 923.7, y: 200.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1761273765767981667 @@ -10930,8 +10930,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: -203.8, y: -609.7} - m_SizeDelta: {x: 260, y: 74} + m_AnchoredPosition: {x: -203.8, y: -596.7} + m_SizeDelta: {x: 260, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7253453419435099524 CanvasRenderer: @@ -10963,7 +10963,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 899d77ec337556943b30b2365195276b, type: 3} m_Type: 0 - m_PreserveAspect: 1 + m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -11021,7 +11021,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7253453419435099529} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -13784,7 +13784,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: 4.830002, y: -296} + m_AnchoredPosition: {x: 4.830002, y: -258} m_SizeDelta: {x: 547.6, y: 200.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &314793541967843562 From f3cd268aefeaa46b0be4967dfb531eac8774b929 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 27 Nov 2024 16:39:26 +0800 Subject: [PATCH 07/10] 1 --- .../UI/MonthCardPageView/WeekCardPanel.prefab | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab index 239ad4f01b..6e9cd64dd1 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab @@ -2018,7 +2018,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -2830,8 +2830,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: 0, y: -420.6} - m_SizeDelta: {x: 348.3, y: 38.6} + m_AnchoredPosition: {x: 0, y: -419.14} + m_SizeDelta: {x: 348.3, y: 80.64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396217156366675 CanvasRenderer: @@ -5717,7 +5717,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -192, y: -250} - m_SizeDelta: {x: 256, y: 740} + m_SizeDelta: {x: 300, y: 740} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396217607456268 CanvasRenderer: @@ -6523,8 +6523,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: 3.75, y: -36.299892} - m_SizeDelta: {x: 152.5, y: 151.62} + m_AnchoredPosition: {x: 0, y: -36.299892} + m_SizeDelta: {x: 174, y: 151.62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396217779087859 CanvasRenderer: @@ -8406,8 +8406,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.5, y: -70} - m_SizeDelta: {x: 95.9, y: 230} + m_AnchoredPosition: {x: 0.7, y: -83.9} + m_SizeDelta: {x: 119.3, y: 271.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396218156213643 CanvasRenderer: @@ -8724,8 +8724,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.1, y: -70} - m_SizeDelta: {x: 94.3, y: 230} + m_AnchoredPosition: {x: 0.7, y: -83.9} + m_SizeDelta: {x: 119.3, y: 271.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396218194045670 CanvasRenderer: @@ -9112,8 +9112,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: 3.75, y: -36.3} - m_SizeDelta: {x: 152.5, y: 151.62} + m_AnchoredPosition: {x: 0, y: -36.3} + m_SizeDelta: {x: 174.2, y: 151.62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396218226334701 CanvasRenderer: @@ -10828,7 +10828,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 25 + m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -10981,7 +10981,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 133, y: -250} - m_SizeDelta: {x: 256, y: 740} + m_SizeDelta: {x: 300, y: 740} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396218678684763 CanvasRenderer: @@ -12392,8 +12392,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: 0, y: -420.6} - m_SizeDelta: {x: 348.3, y: 38.6} + m_AnchoredPosition: {x: 0, y: -419.14} + m_SizeDelta: {x: 348.3, y: 80.64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791396218904049445 CanvasRenderer: @@ -12546,8 +12546,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 5.7299995} - m_SizeDelta: {x: 0, y: -11.45} + m_AnchoredPosition: {x: 0, y: 12.7} + m_SizeDelta: {x: 0, y: 2.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8356029433809488682 CanvasRenderer: From 5967367f6cd89a7ff96345e0e9c8e9bc9bfd0ea7 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 27 Nov 2024 16:42:30 +0800 Subject: [PATCH 08/10] 1 --- .../Prefabs/UI/XunBaoMiZong/XunBaoMiZongMapPanel.prefab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongMapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongMapPanel.prefab index 6bc7977912..6efb923b3f 100644 --- a/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongMapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongMapPanel.prefab @@ -47795,8 +47795,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 219, y: -269} - m_SizeDelta: {x: 375, y: 99} + m_AnchoredPosition: {x: 258, y: -269} + m_SizeDelta: {x: 500, y: 99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7386729104791266632 CanvasRenderer: From 0d4e012a9e966ec79c35f972bfb561f4445fa04a Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 27 Nov 2024 16:44:48 +0800 Subject: [PATCH 09/10] 1 --- .../ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua index 72a628394c..bd25fb3ae8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua @@ -181,7 +181,7 @@ function MonthCardPage:SetMonthCardTimes(i) self.cardPres[i].time:SetActive(true) local residueTimeNum = monthCardData.endingTime - GetTimeStamp() local dayNum = math.floor(residueTimeNum / (24 * 3600)) - self.cardPres[i].time:GetComponent("Text").text = Language[10579] .. dayNum .. Language[10017] + self.cardPres[i].time:GetComponent("Text").text = Language[10579].." " .. dayNum.." " .. Language[10017] self.cardPres[i].time:SetActive(true) else self.cardPres[i].time:SetActive(false) From 4289169198460d6aecc4a76fbb8315be8ff75d18 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 27 Nov 2024 16:54:58 +0800 Subject: [PATCH 10/10] 11 --- .../Prefabs/UI/NewActivity/EveryDayGiftNew.prefab | 12 ++++++------ .../Prefabs/UI/NewActivity/GiftPre.prefab | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab index 8b08dd7b0c..a6335d47ad 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab @@ -16811,7 +16811,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: 3.5, y: 10} + m_AnchoredPosition: {x: 12.9, y: 0} m_SizeDelta: {x: 205.3, y: 58.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3691621985794044790 @@ -17061,7 +17061,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 40, y: 18} - m_SizeDelta: {x: 244.1, y: 110.4} + m_SizeDelta: {x: 270, y: 110.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8219552810004848678 CanvasRenderer: @@ -17720,8 +17720,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4312105230113760187} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027} - m_LocalPosition: {x: -15.5, y: 7, z: -10} - m_LocalScale: {x: 66.8435, y: 27.35551, z: 0} + m_LocalPosition: {x: -19.47, y: 7, z: -10} + m_LocalScale: {x: 74.356705, y: 27.35551, z: 0} m_Children: [] m_Father: {fileID: 2958699505434877776} m_RootOrder: 2 @@ -39053,8 +39053,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: 13.00006, y: -6} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 17.49, y: -6} + m_SizeDelta: {x: 152.4, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6917791081141586428 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab index c3be449539..8dadf06e11 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab @@ -944,7 +944,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 216, y: -31.92} + m_AnchoredPosition: {x: 158.9, y: -31.92} m_SizeDelta: {x: 289.79, y: 53.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5953798013439098580