diff --git a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab index 87975b335..807401b98 100644 --- a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab +++ b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab @@ -4325,7 +4325,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 165, y: -30} + m_AnchoredPosition: {x: 165, y: -25} m_SizeDelta: {x: 155, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7925542868766603261 @@ -7280,9 +7280,9 @@ RectTransform: - {fileID: 2264348959941013774} m_Father: {fileID: 7025420972156680222} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 572.5, y: -94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7123559852210247449 @@ -16328,9 +16328,9 @@ RectTransform: - {fileID: 9098074536275429445} m_Father: {fileID: 7025420972156680222} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 362.5, y: -94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7242641719228348083 @@ -17527,9 +17527,9 @@ RectTransform: - {fileID: 8960957652178141439} m_Father: {fileID: 7025420972156680222} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 992.5, y: -94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4863064043221393967 @@ -17740,9 +17740,9 @@ RectTransform: - {fileID: 2263461288545407719} m_Father: {fileID: 7025420972156680222} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 47.5, y: -94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6286738948952423829 @@ -19357,7 +19357,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -20644,7 +20644,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -25599,9 +25599,9 @@ RectTransform: - {fileID: 3252053939958040628} m_Father: {fileID: 7025420972156680222} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 677.5, y: -94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6847939996159611283 @@ -29529,9 +29529,9 @@ RectTransform: - {fileID: 4335789157840758689} m_Father: {fileID: 7025420972156680222} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 887.5, y: -94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7312909129957150248 @@ -33519,9 +33519,9 @@ RectTransform: - {fileID: 7507344249561322973} m_Father: {fileID: 7025420972156680222} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 152.5, y: -94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4373079736099867411 @@ -34987,9 +34987,9 @@ RectTransform: - {fileID: 3685485050247075530} m_Father: {fileID: 7025420972156680222} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 467.5, y: -94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7034374317899172211 @@ -35343,9 +35343,9 @@ RectTransform: - {fileID: 201288052656005517} m_Father: {fileID: 7025420972156680222} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 782.5, y: -94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3729285574982894415 @@ -41789,7 +41789,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 120, y: 27} + m_AnchoredPosition: {x: 120, y: 25} m_SizeDelta: {x: 180, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3762694675831197056 @@ -41820,7 +41820,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Freyja + m_text: "\u62BD\u5361\u76F4\u64AD\u95F41" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2} m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, @@ -41848,15 +41848,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 49.35 + m_fontSize: 33.6 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_fontSizeMin: 25 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -41866,7 +41866,7 @@ MonoBehaviour: m_charWidthMaxAdj: 0 m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 - m_overflowMode: 0 + m_overflowMode: 3 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 @@ -47250,7 +47250,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 120, y: -30} + m_AnchoredPosition: {x: 120, y: -25} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2867763060406993757 @@ -47607,9 +47607,9 @@ RectTransform: - {fileID: 1558870460956258642} m_Father: {fileID: 7025420972156680222} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 257.5, y: -94} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2896725619175466137 @@ -55235,7 +55235,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -57977,7 +57977,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} diff --git a/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua b/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua index 8b4d2dbe3..9ce5535c1 100644 --- a/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua +++ b/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua @@ -386,7 +386,7 @@ function UILiveRoomView:ConfigRoom(itemLua, roomType) local liveRoomCfg = ManagerContainer.CfgMgr:GetLiveRoomCfg() local roomCfg = liveRoomCfg[roomType] itemLua.roomTitleBar.roomName.text.text = roomCfg["RoomDesp"] - itemLua.roomTitleBar.streamerHead.nickname.text.text = roomCfg["Streamer"] + itemLua.roomTitleBar.streamerHead.nickname.text.text = roomCfg["RoomDesp"] --[[ CommonUtil.LoadIcon(self, "PlayerHeads/" .. roomCfg["StreamerHead"], function(sprite)