From f8bc3616054fe413a51e18ce5aad4abed6176ea5 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 24 Feb 2021 18:17:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= =?UTF-8?q?=E9=A6=96=E5=85=85=20=E5=9B=9B=E5=85=83=E9=98=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FirstRecharge/FirstRechargePanel.prefab | 8 +- .../Prefabs/UI/Popup/RoleGetInfoPopup.prefab | 8 +- .../UI/Recruit/ElementDrawCardPanel.prefab | 26 +- .../UI/SecretBox/SecretBoxBuyOnePanel.prefab | 395 +++++++++++------- .../~Lua/Modules/Popup/RoleGetInfoPopup.lua | 4 +- .../Modules/Recruit/ElementDrawCardPanel.lua | 4 + .../SecretBox/SecretBoxBuyOnePanel.lua | 4 +- 7 files changed, 269 insertions(+), 180 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab index ad4a3f2cb1..43d1287379 100644 --- a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab @@ -35835,7 +35835,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1.9999971, y: -0.0000032484531} - m_SizeDelta: {x: 240, y: 60} + m_SizeDelta: {x: 200, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6846372967051224326 CanvasRenderer: @@ -35877,7 +35877,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u7D2F\u5145\u6EE1$1" LanguageIndex: 0 --- !u!1 &4075015836899280644 @@ -38300,7 +38300,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -2.0000112, y: -0.0000032484531} - m_SizeDelta: {x: 240, y: 60} + m_SizeDelta: {x: 200, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7755346295663995697 CanvasRenderer: @@ -38342,7 +38342,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u7D2F\u5145\u503C$15" LanguageIndex: 0 --- !u!1001 &6359050367270521292 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab index 8e10f120e7..3176a41d8a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab @@ -4221,8 +4221,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.5999999, y: -80.600006} - m_SizeDelta: {x: 81.99, y: 31.18} + m_AnchoredPosition: {x: 1.5999999, y: -93.7} + m_SizeDelta: {x: 170, y: 31.18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1891371567561976640 CanvasRenderer: @@ -4262,9 +4262,9 @@ MonoBehaviour: m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: lv 1 --- !u!1 &5411619244285305896 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab index e611971c0b..0d93aff912 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab @@ -5000,7 +5000,7 @@ ParticleSystem: --- !u!199 &199737128564699664 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9685,7 +9685,7 @@ ParticleSystem: --- !u!199 &199374924954381556 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14388,7 +14388,7 @@ ParticleSystem: --- !u!199 &199968943646283500 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16879,8 +16879,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: -77.59999, y: 2.6} - m_SizeDelta: {x: 379.73, y: 104.9} + m_AnchoredPosition: {x: -80.1, y: 6.7} + m_SizeDelta: {x: 160.1, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5797247309571771215 CanvasRenderer: @@ -22928,8 +22928,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: -77.59999, y: 2.6} - m_SizeDelta: {x: 379.73, y: 104.9} + m_AnchoredPosition: {x: -80.1, y: 6.7} + m_SizeDelta: {x: 160.1, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &907908410712469705 CanvasRenderer: @@ -26715,8 +26715,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: -77.59999, y: 2.6} - m_SizeDelta: {x: 379.73, y: 104.9} + m_AnchoredPosition: {x: -80.1, y: 6.7} + m_SizeDelta: {x: 160.1, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8620002759934521137 CanvasRenderer: @@ -27388,8 +27388,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: -77.59999, y: 2.6} - m_SizeDelta: {x: 379.73, y: 104.9} + m_AnchoredPosition: {x: -80.1, y: 6.7} + m_SizeDelta: {x: 160.1, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2991320532458692651 CanvasRenderer: @@ -30935,8 +30935,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: -77.59999, y: 2.6} - m_SizeDelta: {x: 379.73, y: 104.9} + m_AnchoredPosition: {x: -80.1, y: 6.7} + m_SizeDelta: {x: 160.1, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6748797757951509587 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab b/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab index 621f575511..d8edb4d515 100644 --- a/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab @@ -5298,80 +5298,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &1283128537326878 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224659400319415462} - - component: {fileID: 222186566149293910} - - component: {fileID: 114442461379642620} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224659400319415462 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283128537326878} - 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: 8131768283132569870} - 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: 55.5, y: 5.3999996} - m_SizeDelta: {x: 68, y: 68} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222186566149293910 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283128537326878} - m_CullTransparentMesh: 0 ---- !u!114 &114442461379642620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283128537326878} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 736a9af00badfd1499b4e4fa4a93ef05, 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 &1339596615135728 GameObject: m_ObjectHideFlags: 0 @@ -24721,7 +24647,7 @@ RectTransform: m_Children: - {fileID: 224810340878879106} m_Father: {fileID: 8131768283132569870} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -29770,86 +29696,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u989D\u5916\u8D60\u90011\u4E2A\u5996\u7075\u7389" LanguageIndex: 0 ---- !u!1 &749258213117522402 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 683517865593153188} - - component: {fileID: 681913820260382484} - - component: {fileID: 4357745421625173798} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &683517865593153188 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749258213117522402} - m_LocalRotation: {x: -0, y: -0, z: 0.0031373338, w: 0.9999951} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8131768283132569870} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -1.4, y: 5} - m_SizeDelta: {x: 356.8, y: 79.6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &681913820260382484 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749258213117522402} - m_CullTransparentMesh: 0 ---- !u!114 &4357745421625173798 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749258213117522402} - 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.09803922, g: 0.14901961, b: 0.18431373, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 44 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 45 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u518D\u67651\u6B21 \xD71" - LanguageIndex: 0 --- !u!1 &749260879090325082 GameObject: m_ObjectHideFlags: 0 @@ -35205,6 +35051,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1733223175432507482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1295238748015786696} + - component: {fileID: 1666239671043939678} + - component: {fileID: 5403867493643869303} + m_Layer: 0 + m_Name: info (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1295238748015786696 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1733223175432507482} + 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: 8131768283132569870} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120.800026, y: 9.700012} + m_SizeDelta: {x: 64.06, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1666239671043939678 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1733223175432507482} + m_CullTransparentMesh: 0 +--- !u!114 &5403867493643869303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1733223175432507482} + 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, g: 0, b: 0, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: x1 + LanguageIndex: 0 --- !u!1 &1739328929843491676 GameObject: m_ObjectHideFlags: 0 @@ -35359,6 +35285,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u518D\u67651\u6B21" LanguageIndex: 0 +--- !u!1 &2708619057977907122 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5791637287280870273} + - component: {fileID: 8852123741072181898} + - component: {fileID: 496508963993107347} + m_Layer: 0 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5791637287280870273 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2708619057977907122} + 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: 8131768283132569870} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 56.6, y: 9.7} + m_SizeDelta: {x: 65, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8852123741072181898 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2708619057977907122} + m_CullTransparentMesh: 0 +--- !u!114 &496508963993107347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2708619057977907122} + 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: 736a9af00badfd1499b4e4fa4a93ef05, 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 &4729556061335116426 GameObject: m_ObjectHideFlags: 0 @@ -35593,6 +35593,86 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 100000 +--- !u!1 &6522070391476934065 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5795391394632348489} + - component: {fileID: 7046149791823727794} + - component: {fileID: 8458177848105467630} + m_Layer: 0 + m_Name: info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5795391394632348489 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6522070391476934065} + 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: 8131768283132569870} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -64.449974, y: 6.7} + m_SizeDelta: {x: 177.1, y: 70.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7046149791823727794 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6522070391476934065} + m_CullTransparentMesh: 0 +--- !u!114 &8458177848105467630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6522070391476934065} + 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, g: 0, b: 0, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u518D\u67651\u6B21" + LanguageIndex: 0 --- !u!1 &6974725393944192383 GameObject: m_ObjectHideFlags: 0 @@ -35683,8 +35763,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 683517865593153188} - - {fileID: 224659400319415462} + - {fileID: 5795391394632348489} + - {fileID: 5791637287280870273} + - {fileID: 1295238748015786696} - {fileID: 224227489829804688} m_Father: {fileID: 224969362660561018} m_RootOrder: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua index 3ccb467d06..1e3ef0d0b1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua @@ -191,7 +191,9 @@ function RoleGetInfoPopup:OnShow() local go = this.skillGrid.transform:GetChild(i-1).gameObject go:SetActive(true) Util.GetGameObject(go.transform,"s"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(skillList[i].skillConfig.Icon)) - Util.GetGameObject(go.transform,"s/Text"):GetComponent("Text").text=GetLanguageStrById(skillList[i].skillConfig.Name)--Language[10453].. 1(skillList[i].skillConfig.Id % 10) + local sText = Util.GetGameObject(go.transform,"s/Text"):GetComponent("Text") + sText.text=GetLanguageStrById(skillList[i].skillConfig.Name) + sText.fontSize = GetCurLanguage() ~= 2 and 30 or 25 Util.GetGameObject(go.transform,"SkillTypeImage"):GetComponent("Image").sprite=Util.LoadSprite(GetSkillType(allSkillDatas[i])) Util.AddOnceClick(Util.GetGameObject(go.transform,"s"), function() if Game.GlobalEvent:HasEvent(GameEvent.UI.OnClose, triggerCallBack) then diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua index db8722e101..fba9bb2c80 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua @@ -273,6 +273,10 @@ function ElementDrawCardPanel:OnShow() --this.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.ElementDrawCardPanel }) --this.BtView.transform:SetSiblingIndex(2) this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.ElementDrawCard }) + Util.GetGameObject(this.getCardPanel1, "content2/btn1/Text"):GetComponent("Text").fontSize = GetCurLanguage() ~= 2 and 38 or 30 + Util.GetGameObject(this.getCardPanel2, "content2/btn1/Text"):GetComponent("Text").fontSize = GetCurLanguage() ~= 2 and 38 or 30 + Util.GetGameObject(this.getCardPanel3, "content2/btn1/Text"):GetComponent("Text").fontSize = GetCurLanguage() ~= 2 and 38 or 30 + Util.GetGameObject(this.getCardPanel4, "content2/btn1/Text"):GetComponent("Text").fontSize = GetCurLanguage() ~= 2 and 38 or 30 end diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua index 668b61b780..5baef6cef7 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua @@ -26,7 +26,8 @@ function SecretBoxBuyOnePanel:InitComponent() this.detailText = Util.GetGameObject(this.detailImage, "Text"):GetComponent("Text") this.content1=Util.GetGameObject(self.gameObject,"bottom/openOneAgainButton/Content1") - this.itemIcon1=Util.GetGameObject(this.content1, "Icon"):GetComponent("Image") + this.info=Util.GetGameObject(this.content1, "info"):GetComponent("Text") + this.itemIcon1=Util.GetGameObject(this.content1, "icon"):GetComponent("Image") this.detailImage1=Util.GetGameObject(this.content1, "Tip") this.detailText1 = Util.GetGameObject(this.detailImage1, "contentDetailText"):GetComponent("Text") @@ -106,6 +107,7 @@ function SecretBoxBuyOnePanel:OnOpen(...) local args = { ... } this.drop=args[1] this.recruitType=args[2] + this.info.fontSize = GetCurLanguage() ~=2 and 50 or 45 --面板特殊处理 if this.recruitType then --如果有类型