diff --git a/Assets/ManagedResources/Prefabs/UI/Compound/CompoundSelectListPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Compound/CompoundSelectListPopup.prefab index d3d900fe7f..a13562db38 100644 --- a/Assets/ManagedResources/Prefabs/UI/Compound/CompoundSelectListPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Compound/CompoundSelectListPopup.prefab @@ -13,7 +13,6 @@ GameObject: - component: {fileID: 7877933586310554123} - component: {fileID: 3806713242549078602} - component: {fileID: 4190059311433089355} - - component: {fileID: 8345547417658654548} m_Layer: 5 m_Name: btnSelect m_TagString: Untagged @@ -140,20 +139,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &8345547417658654548 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 815030254972688558} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &1052604574332626847 GameObject: m_ObjectHideFlags: 0 @@ -293,7 +278,7 @@ MonoBehaviour: m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 0 --- !u!1 &1557497547346106746 GameObject: @@ -1493,7 +1478,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: 493.1, y: 0} m_SizeDelta: {x: 0, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6930457928578917211 @@ -1531,7 +1516,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab index 6e5d834da7..5aca81aec5 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab @@ -5555,7 +5555,7 @@ ParticleSystem: --- !u!199 &1397471074226472267 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10839,7 +10839,7 @@ ParticleSystem: --- !u!199 &4134560543265343287 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15932,7 +15932,7 @@ ParticleSystem: --- !u!199 &497846283403455051 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20965,7 +20965,7 @@ ParticleSystem: --- !u!199 &1755391511871408359 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25801,7 +25801,7 @@ ParticleSystem: --- !u!199 &8187472554774414778 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28404,10 +28404,10 @@ RectTransform: m_Father: {fileID: 6997640854457639571} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -2.4000015} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 253.8, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5194486742549530632 CanvasRenderer: @@ -28441,8 +28441,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 61 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 + m_BestFit: 1 + m_MinSize: 20 m_MaxSize: 61 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeSuccessPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeSuccessPanel.prefab index 865399584d..5f84aa48cb 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeSuccessPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeSuccessPanel.prefab @@ -19498,7 +19498,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: 327c46db7a51a3a4682240c8d53fb7da, type: 3} + m_Sprite: {fileID: 21300000, guid: 3c754eb16274e504386e4797974d7dba, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -38758,8 +38758,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: 53.06, y: -20} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 53.79, y: -20} + m_SizeDelta: {x: 108, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1734632983288119862 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeTalentPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeTalentPopup.prefab index b4d92b341d..a824f4ef0e 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeTalentPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeTalentPopup.prefab @@ -340,7 +340,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 417.8, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &622859783849659190 CanvasRenderer: @@ -534,7 +534,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 416, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5548951530219399633 CanvasRenderer: @@ -725,8 +725,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: 45.5, y: -14.5} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 42.37, y: -14.5} + m_SizeDelta: {x: 84.74, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2213428538621384854 CanvasRenderer: @@ -760,14 +760,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 14 + m_MaxSize: 30 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "[\u7279\u6027]" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Setting/HeadChangePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Setting/HeadChangePopup.prefab index c04dabd9c6..100350c170 100644 --- a/Assets/ManagedResources/Prefabs/UI/Setting/HeadChangePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Setting/HeadChangePopup.prefab @@ -321,8 +321,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.4, y: -110.6} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 0.000005722, y: -118.7} + m_SizeDelta: {x: 200, y: 66.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4069746539837020074 CanvasRenderer: @@ -356,13 +356,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u96EA\u5BD2\u5F71 \u76F8\u4F34" diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua index 7f452a8cd8..a18a07022a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua @@ -57,12 +57,12 @@ function this.GetOldTalentDataShow() local upStarSkillDataList = {} if heroConfig.OpenPassiveSkillRules then for i = 1, #heroConfig.OpenPassiveSkillRules do - local Desc = passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc + local Desc = GetLanguageStrById(passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc) if heroConfig.OpenPassiveSkillRules[i][1] == 1 then--突破 local titleStr = NumToSimplenessFont[heroRankupConfig[heroConfig.OpenPassiveSkillRules[i][2]].Phase[2]] .. Language[11795] local curBreakId = heroConfig.OpenPassiveSkillRules[i][2] if breakSkillDataList[curBreakId] then - breakSkillDataList[curBreakId] = {index = curBreakId,type = 1,str = breakSkillDataList[curBreakId].str .. "  "..Desc..""} + breakSkillDataList[curBreakId] = {index = curBreakId,type = 1,str = GetLanguageStrById(breakSkillDataList[curBreakId].str) .. "  "..Desc..""} else breakSkillDataList[curBreakId] = {index = curBreakId,type = 1,str =""..titleStr..Desc..""} end @@ -71,7 +71,7 @@ function this.GetOldTalentDataShow() local titleStr = NumToSimplenessFont[heroRankupConfig[curUpStarId].Phase[2]] .. Language[11792] local _passiveSkillId = passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Id if upStarSkillDataList[curUpStarId] then - upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str = upStarSkillDataList[curUpStarId].str .. "  "..Desc..""} + upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str = GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. "  "..Desc..""} else upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str =""..titleStr..Desc..""} end @@ -99,12 +99,12 @@ function this.GetNewTalentDataShow() local upStarSkillDataList = {} if heroConfig.Awaken then for i = 1, #heroConfig.Awaken do - local Desc = passiveSkillConfig[heroConfig.Awaken[i][3]].Desc + local Desc = GetLanguageStrById(passiveSkillConfig[heroConfig.Awaken[i][3]].Desc) if heroConfig.Awaken[i][1] == 1 then--突破 local titleStr = NumToSimplenessFont[heroRankupConfig[heroConfig.Awaken[i][2]].Phase[2]] .. Language[11795] local curBreakId = heroConfig.Awaken[i][2] if breakSkillDataList[curBreakId] then - breakSkillDataList[curBreakId] = {index = curBreakId,type = 1,str = breakSkillDataList[curBreakId].str .. "  "..Desc..""} + breakSkillDataList[curBreakId] = {index = curBreakId,type = 1,str = GetLanguageStrById(breakSkillDataList[curBreakId].str) .. "  "..Desc..""} else breakSkillDataList[curBreakId] = {index = curBreakId,type = 1,str =""..titleStr..Desc..""} end @@ -113,7 +113,7 @@ function this.GetNewTalentDataShow() local titleStr = NumToSimplenessFont[heroRankupConfig[curUpStarId].Phase[2]] .. Language[11792] local _passiveSkillId = passiveSkillConfig[heroConfig.Awaken[i][3]].Id if upStarSkillDataList[curUpStarId] then - upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str = upStarSkillDataList[curUpStarId].str .. "  "..Desc..""} + upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str = GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. "  "..Desc..""} else upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str =""..titleStr..Desc..""} end