From 5044a7978981621c37f0ad083f23c4708da041cc Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 1 Nov 2021 18:59:11 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"=E3=80=90=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E5=BF=83=E9=AD=94=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E3=80=81=E6=88=98=E6=96=97=E7=BB=9F=E8=AE=A1=E3=80=81=E6=B3=95?= =?UTF-8?q?=E5=AE=9D=E8=BF=9B=E9=98=B6""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2901a60489f1beecf51058b406506c6e13fa9ebb. --- .../Prefabs/UI/Battle/DamageResult.prefab | 12 +- .../HandBook/HandBookTalismanInfoPanel.prefab | 54 ++--- .../UI/MonsterCamp/MonsterCampNewPanel.prefab | 20 +- .../Prefabs/UI/Popup/GeneralPopup.prefab | 6 +- .../Popup/RewardEquipSingleShowPopup2.prefab | 54 ++++- .../QuickPurchase/QuickPurchasePanel.prefab | 2 +- .../UI/RoleInfo/TalismanInfoPanel.prefab | 50 ++-- .../TalismanUpStarSuccessPanel.prefab | 216 +++++++++++++++--- .../RoleInfo/TalismanUpStarSuccessPanel.lua | 2 +- .../~Lua/View/MonsterCampSingleWave.lua | 2 +- 10 files changed, 305 insertions(+), 113 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index 7d5c7c7b83..75fbbc2250 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -1178,11 +1178,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 48 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 - m_MaxSize: 40 + m_MaxSize: 48 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1530,11 +1530,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 48 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 - m_MaxSize: 40 + m_MaxSize: 48 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -1642,7 +1642,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 @@ -1918,7 +1918,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookTalismanInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookTalismanInfoPanel.prefab index 74a4f0d756..220bc2f7aa 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookTalismanInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookTalismanInfoPanel.prefab @@ -4965,7 +4965,7 @@ ParticleSystem: --- !u!199 &8101033491554182413 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10102,7 +10102,7 @@ ParticleSystem: --- !u!199 &8695322842749208707 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15161,7 +15161,7 @@ ParticleSystem: --- !u!199 &5549411539781103123 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16344,7 +16344,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: 77, y: 1.2} + m_AnchoredPosition: {x: 87, y: 1.2} m_SizeDelta: {x: 146.08, y: 41.45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8872117573066844141 @@ -16377,7 +16377,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -16530,8 +16530,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -21453,7 +21453,7 @@ ParticleSystem: --- !u!199 &3975784963450675321 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26362,7 +26362,7 @@ ParticleSystem: --- !u!199 &5617174518599624049 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26639,8 +26639,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -27101,7 +27101,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: 77, y: 1.2} + m_AnchoredPosition: {x: 87, y: 1.2} m_SizeDelta: {x: 146.08, y: 41.45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8446743121254750104 @@ -27134,7 +27134,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -27213,7 +27213,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -32050,7 +32050,7 @@ ParticleSystem: --- !u!199 &857181516875890071 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36945,7 +36945,7 @@ ParticleSystem: --- !u!199 &7310089047208726606 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41947,7 +41947,7 @@ ParticleSystem: --- !u!199 &2257792418677130947 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -42164,7 +42164,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5B9D\u83B2\u4F60\u4E2A\u5927\u706F" + m_Text: LanguageIndex: 0 --- !u!1 &7565460308718073731 GameObject: @@ -47354,7 +47354,7 @@ ParticleSystem: --- !u!199 &735507970959462827 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -47527,7 +47527,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -52238,7 +52238,7 @@ ParticleSystem: --- !u!199 &6271729593246226409 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -56994,7 +56994,7 @@ ParticleSystem: --- !u!199 &3214831588584176066 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -57119,8 +57119,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -57200,7 +57200,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -57278,8 +57278,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab index 3b2c99b439..4ca3ebc51c 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab @@ -5047,8 +5047,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -205.54001, y: 81.83} - m_SizeDelta: {x: 399.92004, y: 160.64} + m_AnchoredPosition: {x: -205.54001, y: 102.9} + m_SizeDelta: {x: 399.9, y: 202.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3260027998505512388 MonoBehaviour: @@ -5255,11 +5255,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 42 + m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 4 - m_MaxSize: 55 + m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -11273,11 +11273,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 0 - m_Right: -38 - m_Top: 14 + m_Right: -20 + m_Top: 15 m_Bottom: 0 m_ChildAlignment: 2 - m_Spacing: -37.26 + m_Spacing: -20 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -12249,8 +12249,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 190.05998, y: 82.9} - m_SizeDelta: {x: 419.7, y: 140.5} + m_AnchoredPosition: {x: 190.05998, y: 93.424965} + m_SizeDelta: {x: 419.7, y: 161.55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6277365425455971988 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 08f8d9cdaf..28779ff2fb 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -49476,8 +49476,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: -26.89} - m_SizeDelta: {x: 821.5, y: 141.08} + m_AnchoredPosition: {x: 0, y: -70} + m_SizeDelta: {x: 300, y: 141.08} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9195391274472877335 CanvasRenderer: @@ -51134,7 +51134,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: 0.000061872866, y: 0} + m_AnchoredPosition: {x: 0.0000012231656, y: 0} m_SizeDelta: {x: 0, y: 141.1} m_Pivot: {x: 0, y: 1} --- !u!114 &9195391275781883359 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab index 7d399631bc..2a646558b6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardEquipSingleShowPopup2.prefab @@ -3215,6 +3215,7 @@ GameObject: - component: {fileID: 5910622177605777387} - component: {fileID: 6744055517912544592} - component: {fileID: 8479576915186299062} + - component: {fileID: 2595525391100102769} m_Layer: 5 m_Name: line m_TagString: Untagged @@ -3236,9 +3237,9 @@ RectTransform: m_Father: {fileID: 7691181773687293707} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 4} m_SizeDelta: {x: 900, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6744055517912544592 @@ -3278,6 +3279,26 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2595525391100102769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7973159340113284165} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8007485394779687899 GameObject: m_ObjectHideFlags: 0 @@ -3429,6 +3450,7 @@ GameObject: - component: {fileID: 4769235708667615956} - component: {fileID: 6573378233760763815} - component: {fileID: 1899625059225452552} + - component: {fileID: 9025593793034868403} m_Layer: 5 m_Name: line m_TagString: Untagged @@ -3450,9 +3472,9 @@ RectTransform: m_Father: {fileID: 4139601617807381921} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 4} m_SizeDelta: {x: 900, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6573378233760763815 @@ -3492,6 +3514,26 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &9025593793034868403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8456908388459274146} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8538458282216049613 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab b/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab index 398117840c..986ae19cd7 100644 --- a/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QuickPurchase/QuickPurchasePanel.prefab @@ -5369,7 +5369,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanInfoPanel.prefab index 8c67844f17..c2abdbb881 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanInfoPanel.prefab @@ -4750,7 +4750,7 @@ ParticleSystem: --- !u!199 &6669014743480899638 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -4912,19 +4912,19 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 32 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u53D7\u5230\u9B54\u6CD5\u4F24\u5BB3\u53D7\u5230\u53D7\u5230\u9B54\u6CD5\u4F24\u5BB3\u53D7\u5230\u53D7\u5230\u9B54\u6CD5\u4F24\u5BB3\u53D7\u5230\u53D7\u5230\u9B54\u6CD5\u4F24\u5BB3\u53D7\u5230\u53D7\u5230\u9B54\u6CD5\u4F24\u5BB3\u53D7\u5230\u53D7\u5230\u9B54\u6CD5\u4F24\u5BB3\u53D7\u5230\u53D7\u5230\u9B54\u6CD5\u4F24\u5BB3\u53D7\u5230\u53D7\u5230\u9B54\u6CD5\u4F24\u5BB3\u53D7\u5230" + m_Text: LanguageIndex: 0 --- !u!1 &529000493873538322 GameObject: @@ -4993,7 +4993,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -10171,7 +10171,7 @@ ParticleSystem: --- !u!199 &5377048469126551862 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16171,7 +16171,7 @@ ParticleSystem: --- !u!199 &2904171498131268754 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -21001,7 +21001,7 @@ ParticleSystem: --- !u!199 &2903776728267333782 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25811,7 +25811,7 @@ ParticleSystem: --- !u!199 &2903753865931827964 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30706,7 +30706,7 @@ ParticleSystem: --- !u!199 &2903803424919293438 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35536,7 +35536,7 @@ ParticleSystem: --- !u!199 &2903330266854082572 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -40292,7 +40292,7 @@ ParticleSystem: --- !u!199 &2903239034725923108 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45048,7 +45048,7 @@ ParticleSystem: --- !u!199 &2903890739391294258 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -49878,7 +49878,7 @@ ParticleSystem: --- !u!199 &2904188221253461520 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54634,7 +54634,7 @@ ParticleSystem: --- !u!199 &2904186397203731334 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59612,7 +59612,7 @@ ParticleSystem: --- !u!199 &5367736312985844779 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -60761,7 +60761,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5B9D\u83B2\u4F60\u4E2A\u5927\u706F" + m_Text: LanguageIndex: 0 --- !u!1 &5937105318724935408 GameObject: @@ -65416,7 +65416,7 @@ ParticleSystem: --- !u!199 &5024465741769132471 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -70177,7 +70177,7 @@ ParticleSystem: --- !u!199 &428258539903647149 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -71323,8 +71323,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -71575,7 +71575,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5B9D\u83B2\u4F60\u4E2A\u5927\u706F" + m_Text: LanguageIndex: 0 --- !u!1 &7551024654165170081 GameObject: @@ -77128,7 +77128,7 @@ ParticleSystem: --- !u!199 &2801199756321309762 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -77423,7 +77423,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab index 5879ec94d2..3c22708b6b 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/TalismanUpStarSuccessPanel.prefab @@ -289,11 +289,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 34 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -335,7 +335,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: 361.00003, y: -3.0999417} + m_AnchoredPosition: {x: 276, y: -3.0999417} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6940184557700791321 @@ -359,7 +359,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1} + m_Color: {r: 0, g: 1, b: 0.4, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -368,11 +368,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 34 + m_FontSize: 48 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 48 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -433,7 +433,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: 50 m_Bottom: 0 m_ChildAlignment: 4 m_Spacing: 35.3 @@ -558,12 +558,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4680589426326965704} - m_RootOrder: 2 + m_Father: {fileID: 2565362219894359095} + m_RootOrder: 5 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.7, y: 15.1} + m_AnchoredPosition: {x: 203, y: -3} m_SizeDelta: {x: 50, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &377326219517159075 @@ -677,6 +677,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2670955062683009120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8982201631689377852} + - component: {fileID: 8782436044513261521} + - component: {fileID: 5956288182122649738} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8982201631689377852 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2670955062683009120} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.6, z: 0} + m_Children: [] + m_Father: {fileID: 7117605566439973675} + m_RootOrder: 0 + 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: 167} + m_SizeDelta: {x: 866, y: 131} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8782436044513261521 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2670955062683009120} + m_CullTransparentMesh: 0 +--- !u!114 &5956288182122649738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2670955062683009120} + 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: 1 + 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: 72d6d7d0d400cbb4fa13b6f8c76f2f43, 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 &3249753631992289485 GameObject: m_ObjectHideFlags: 0 @@ -10215,12 +10289,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7117605566439973675} - m_RootOrder: 1 + m_RootOrder: 2 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: -0.000011444} - m_SizeDelta: {x: 379.2, y: 165} + m_AnchoredPosition: {x: 0, y: -2.9} + m_SizeDelta: {x: 379.2, y: 256.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8848353536387314704 CanvasRenderer: @@ -10252,7 +10326,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 32 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -10366,11 +10440,11 @@ RectTransform: m_Children: - {fileID: 2565362219894359095} m_Father: {fileID: 4680589426326965704} - m_RootOrder: 1 + m_RootOrder: 2 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: 0} + m_AnchoredPosition: {x: 85, y: 0} m_SizeDelta: {x: 540, y: 256.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8818103960626031399 @@ -20097,6 +20171,7 @@ RectTransform: - {fileID: 1110738932611489579} - {fileID: 8171705719576228223} - {fileID: 5830950998971458440} + - {fileID: 8767679665877571477} m_Father: {fileID: 7147830722700737238} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -20183,7 +20258,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u751F\u547D" + m_Text: LanguageIndex: 0 --- !u!1 &5712866070808867097 GameObject: @@ -20252,18 +20327,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 34 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 45 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u751F\u547D(\u6B66\u536B)" + m_Text: "\u751F\u547D" LanguageIndex: 0 --- !u!1 &6464625782309956489 GameObject: @@ -20293,9 +20368,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5099620525190574899} - {fileID: 3931347411970840334} - {fileID: 7147830722700737238} - - {fileID: 8767679665877571477} m_Father: {fileID: 4147245335766002681} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -20312,6 +20387,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6464625782309956489} m_CullTransparentMesh: 0 +--- !u!1 &6727489773581207174 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5099620525190574899} + - component: {fileID: 9143236869278048657} + - component: {fileID: 3986869499608241821} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5099620525190574899 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6727489773581207174} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.6, z: 0} + m_Children: [] + m_Father: {fileID: 4680589426326965704} + m_RootOrder: 0 + 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: 167} + m_SizeDelta: {x: 866, y: 131} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9143236869278048657 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6727489773581207174} + m_CullTransparentMesh: 0 +--- !u!114 &3986869499608241821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6727489773581207174} + 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: 1 + 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: 72d6d7d0d400cbb4fa13b6f8c76f2f43, 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 &7236595892424496309 GameObject: m_ObjectHideFlags: 0 @@ -20342,7 +20491,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4680589426326965704} - m_RootOrder: 0 + 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} @@ -20370,7 +20519,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6039216, g: 0.52156866, b: 0.39215687, a: 1} + m_Color: {r: 0.6037736, g: 0.3684011, b: 0.08259169, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -20379,11 +20528,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 42 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -20422,7 +20571,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7117605566439973675} - m_RootOrder: 0 + 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} @@ -20450,7 +20599,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6039216, g: 0.52156866, b: 0.39215687, a: 1} + m_Color: {r: 0.6039216, g: 0.36862746, b: 0.08627451, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -20459,11 +20608,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 42 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -20500,6 +20649,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 8982201631689377852} - {fileID: 1358314236051475038} - {fileID: 4492416899189015336} m_Father: {fileID: 4147245335766002681} @@ -58892,7 +59042,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 90, y: 0} m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8127154594001898220 @@ -58939,7 +59089,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -58947,10 +59097,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: + m_Text: "\u83E9\u63D0\u591C" LanguageIndex: 0 --- !u!1 &8348793177209857894 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarSuccessPanel.lua index 4121fa9341..173afb7af3 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarSuccessPanel.lua @@ -113,7 +113,7 @@ function TalismanUpStarSuccessPanel:ShowProAndSkillData() curName.text=GetLanguageStrById(propertyConfig[curTalismanData.Property[i][1]].Info) curValue.text=curTalismanData.Property[i][2] if not isMaxStar then - nextName.text=GetLanguageStrById(propertyConfig[nextTalismanConFig.Property[i][1]].Info) + nextName.text=""--GetLanguageStrById(propertyConfig[nextTalismanConFig.Property[i][1]].Info) nextValue.text=nextTalismanConFig.Property[i][2] end end diff --git a/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua b/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua index 9b603b2241..e36dc1274e 100644 --- a/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua +++ b/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua @@ -155,7 +155,7 @@ function MonsterCampSingleWave:InitShowReward() self.rewardList[i] = SubUIManager.Open(SubUIConfig.ItemView, self.rewardGrid.transform) self.rewardList[i].gameObject:SetActive(false) end - self.rewardList[i]:OnOpen(false, {self.rewardData[i][1],self.rewardData[i][2]}, 0.65,false,false,false) + self.rewardList[i]:OnOpen(false, {self.rewardData[i][1],self.rewardData[i][2]}, 0.8,false,false,false) self.rewardList[i].gameObject:SetActive(true) end end