diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index d4ee55c0aa..684e75445a 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -8262,14 +8262,14 @@ RectTransform: m_GameObject: {fileID: 5208191871158868198} 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_LocalScale: {x: 0.7, y: 0.7, z: 0.8} m_Children: [] m_Father: {fileID: 4250835300878011901} 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: 417, y: 0} + m_AnchoredPosition: {x: 405.6, y: 2.7} m_SizeDelta: {x: 72, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4742467671142405772 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab index 768cc510cd..ff88ee0dbb 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab @@ -873,7 +873,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: 54.5, y: -39.799927} + m_AnchoredPosition: {x: 316, y: -39.799927} m_SizeDelta: {x: 398.7, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222390358621317692 @@ -1162,7 +1162,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: 90, y: -38.4} + m_AnchoredPosition: {x: 338, y: -38.4} m_SizeDelta: {x: 48, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222828081197013252 @@ -1750,7 +1750,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2510,7 +2510,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2760,7 +2760,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2987,8 +2987,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: -138, y: -39} - m_SizeDelta: {x: 70, y: 76} + m_AnchoredPosition: {x: 112, y: -39} + m_SizeDelta: {x: 138, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6760419458894981537 CanvasRenderer: @@ -3018,7 +3018,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: 48323a0121f515044a999ca5bfe2f6c3, type: 3} + m_Sprite: {fileID: 21300000, guid: 2afbd36bb3abea245896431bcb14b30c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3556,7 +3556,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4138,7 +4138,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5131,7 +5131,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: 54.5, y: -39.799927} + m_AnchoredPosition: {x: 316, y: -39.799927} m_SizeDelta: {x: 398.7, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3360534592408092687 @@ -5479,8 +5479,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: -138, y: -39} - m_SizeDelta: {x: 70, y: 76} + m_AnchoredPosition: {x: 112, y: -39} + m_SizeDelta: {x: 138, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6004770650672765777 CanvasRenderer: @@ -5510,7 +5510,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: 48323a0121f515044a999ca5bfe2f6c3, type: 3} + m_Sprite: {fileID: 21300000, guid: 2afbd36bb3abea245896431bcb14b30c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6379,7 +6379,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6472,7 +6472,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6632,7 +6632,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -7620,7 +7620,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -7769,7 +7769,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: 90, y: -38.4} + m_AnchoredPosition: {x: 338, y: -38.4} m_SizeDelta: {x: 48, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1728879338439505814 @@ -7946,7 +7946,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -8078,7 +8078,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: 398, y: -545.19995} + m_AnchoredPosition: {x: 398, y: -930.9} m_SizeDelta: {x: 300, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &430177342777519911 @@ -8102,7 +8102,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9716981, g: 0.768542, b: 0.34376112, a: 1} + m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -8625,7 +8625,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -8704,7 +8704,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua index d51166efa5..93f1c7f1f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua @@ -337,7 +337,7 @@ function this.ShowEquipData(i) end this.treasurePanel[i].qualityText.text = GetStringByEquipQua(equipConfigData.Level,GetQuaStringByEquipQua(equipConfigData.Level)) - this.treasurePanel[i].EquipName.text = GetLanguageStrById(itemConfigData.Name) + this.treasurePanel[i].EquipName.text=GetStringByEquipQua(itemConfigData.Quantity,GetLanguageStrById(itemConfigData.Name)) this.treasurePanel[i].EquipTypeText.text = string.format(Language[11803],EquipTreasureTypeStr[equipConfigData.Location]) this.treasurePanel[i].EquipFrame.sprite = Util.LoadSprite(equipData[i].frame) this.treasurePanel[i].EquipIcon.sprite = Util.LoadSprite(equipData[i].icon)