diff --git a/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab index cdf793b70c..b60e2cbd35 100644 --- a/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab @@ -7065,10 +7065,10 @@ RectTransform: m_Father: {fileID: 171074039262863253} 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: 125.26001, y: -50} - m_SizeDelta: {x: 75.26, y: 80} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!1 &307177627435663910 GameObject: @@ -40305,7 +40305,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: 19.1, y: 75} + m_AnchoredPosition: {x: -9, y: 75} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2787298712582756978 @@ -40315,7 +40315,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 784966791457372485} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -87715,7 +87715,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: -540.00006, y: -0.1000061} + m_AnchoredPosition: {x: -540, y: -0.1000061} m_SizeDelta: {x: 0, y: 259} m_Pivot: {x: 0, y: 0.5} --- !u!114 &5410240456582252039 @@ -97548,7 +97548,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8611810924034366427 RectTransform: m_ObjectHideFlags: 0 @@ -233397,9 +233397,9 @@ RectTransform: m_Father: {fileID: 3130661447196470419} 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: 811.8849, y: -86.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 258.3, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6661840425909430412 @@ -394747,10 +394747,10 @@ RectTransform: m_Father: {fileID: 171074039262863253} 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: 50, y: -50} - m_SizeDelta: {x: 75.26, y: 80} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6077531277036128984 GameObject: @@ -462176,9 +462176,9 @@ RectTransform: m_Father: {fileID: 3130661447196470419} 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: 235.76498, y: -86.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 258.2, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1011221392547718121 diff --git a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab index 605c1f705c..55670c7a05 100644 --- a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab @@ -2298,10 +2298,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 625.8, y: -4} - m_SizeDelta: {x: 60, y: 88} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4713829247308178245 CanvasRenderer: @@ -2649,10 +2649,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 792.4, y: -4} - m_SizeDelta: {x: 60, y: 88} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3043128608018388249 CanvasRenderer: @@ -3111,7 +3111,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6278967579989796505 RectTransform: m_ObjectHideFlags: 0 @@ -3202,7 +3202,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6489381859193902079 RectTransform: m_ObjectHideFlags: 0 @@ -3822,7 +3822,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 297} + m_AnchoredPosition: {x: 0, y: 223} m_SizeDelta: {x: 1080, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2358043622030078495 @@ -4659,10 +4659,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} 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: 126, y: -4} - m_SizeDelta: {x: 60, y: 88} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2026494486082166274 CanvasRenderer: @@ -5797,7 +5797,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1441774295091081370 RectTransform: m_ObjectHideFlags: 0 @@ -8080,10 +8080,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} 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: 459.2, y: -4} - m_SizeDelta: {x: 60, y: 88} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3428141315978654585 CanvasRenderer: @@ -9023,10 +9023,10 @@ RectTransform: m_Father: {fileID: 7228394621503452503} m_RootOrder: 0 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 126, y: -4} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7535896274311294446 CanvasRenderer: @@ -9124,7 +9124,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6611610727433120338 RectTransform: m_ObjectHideFlags: 0 @@ -9142,7 +9142,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 329, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6856743343572947494 MonoBehaviour: @@ -9531,10 +9531,10 @@ RectTransform: m_Father: {fileID: 7228394621503452503} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 459.2, y: -4} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8507259430024982400 CanvasRenderer: @@ -9924,10 +9924,10 @@ RectTransform: m_Father: {fileID: 7228394621503452503} m_RootOrder: 3 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 625.8, y: -4} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2045056171852562037 CanvasRenderer: @@ -10374,10 +10374,10 @@ RectTransform: m_Father: {fileID: 7228394621503452503} m_RootOrder: 1 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 292.6, y: -4} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5865728381354671469 CanvasRenderer: @@ -12126,10 +12126,10 @@ RectTransform: m_Father: {fileID: 7228394621503452503} m_RootOrder: 4 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 792.4, y: -4} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &73488597085675311 CanvasRenderer: @@ -15681,10 +15681,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} 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: 292.6, y: -4} - m_SizeDelta: {x: 60, y: 88} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5713593700809359769 CanvasRenderer: @@ -16161,10 +16161,10 @@ RectTransform: m_Father: {fileID: 7228394621503452503} m_RootOrder: 5 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 959, y: -4} + m_SizeDelta: {x: 60, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &260437457164160599 CanvasRenderer: @@ -17462,6 +17462,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.x + value: 350 + objectReference: {fileID: 0} + - target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 570 + objectReference: {fileID: 0} - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x diff --git a/Assets/ManagedResources/Prefabs/UI/PlayerHeadView/PlayerHead.prefab b/Assets/ManagedResources/Prefabs/UI/PlayerHeadView/PlayerHead.prefab index 742c70800c..8afb27141d 100644 --- a/Assets/ManagedResources/Prefabs/UI/PlayerHeadView/PlayerHead.prefab +++ b/Assets/ManagedResources/Prefabs/UI/PlayerHeadView/PlayerHead.prefab @@ -140,7 +140,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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 @@ -301,7 +301,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -57.4, y: 55.5} - m_SizeDelta: {x: 60, y: 40} + m_SizeDelta: {x: 70, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5182294842058479684 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab index c218b30798..1c3195ccbe 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab @@ -6679,6 +6679,7 @@ GameObject: - component: {fileID: 2932693287766199764} - component: {fileID: 2710351898821371771} - component: {fileID: 1892610204430623350} + - component: {fileID: 1649757393560235097} m_Layer: 5 m_Name: heroName m_TagString: Untagged @@ -6762,6 +6763,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8D64\u708E\u836F\u5E08" LanguageIndex: 10898 +--- !u!114 &1649757393560235097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6288946680040710395} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6357489003231204908 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua index cb2edbbc1f..5c5b33227c 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua @@ -4,7 +4,7 @@ local this = CompoundHeroPanel local TabBoxRedPoints = {} local TabBox = require("Modules/Common/TabBox") local _TabData={ [1] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82", name = Language[10404],redPointType = RedPointType.Huaxutan_CompoundHero }, - [2] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82", name = Language[10405] }, + --[2] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82", name = Language[10405] }, } local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua index 33da6f0248..ff138158fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua @@ -275,7 +275,7 @@ function RoleGetInfoPopup:OnShow() end function this.ShowHeroLive(_heroSConfigData) this.testLiveGO = poolManager:LoadLive(GetResourcePath(_heroSConfigData.Painting), this.liveRoot.transform, - Vector3.one * _heroSConfigData.Scale*0.7, Vector3.New(_heroSConfigData.Position[1], _heroSConfigData.Position[2], 0)) + Vector3.one * _heroSConfigData.Scale*0.7, Vector3.New(_heroSConfigData.Position[1], _heroSConfigData.Position[2]+100, 0)) local SkeletonGraphic = this.testLiveGO:GetComponent("SkeletonGraphic") --local position=_heroSConfigData.Position --position[2]=_heroSConfigData.Position[2]-250