From e151f6af76f9769a2afe4c67f7629257c2d943e7 Mon Sep 17 00:00:00 2001 From: fatiao <515948292@qq.com> Date: Fri, 23 Jan 2026 11:12:08 +0800 Subject: [PATCH] =?UTF-8?q?UILiveRoom=EF=BC=9AUI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/UILiveRoom/LiveRoomEmojiItem.prefab | 4 +- .../UI/UILiveRoom/LiveRoomGiftItem.prefab | 12 +- .../Prefabs/UI/UILiveRoom/LiveRoomItem.prefab | 201 +++++++++--------- .../UILiveRoom/LiveRoomReceiveGiftItem.prefab | 2 +- Assets/Lua/Logic/LiveRoomData.lua | 2 + Assets/Lua/Pb/login.txt | 8 +- .../UI/GridViewItem/LiveRoomItem_Generate.lua | 92 ++++---- Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua | 32 ++- 8 files changed, 187 insertions(+), 166 deletions(-) diff --git a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomEmojiItem.prefab b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomEmojiItem.prefab index 30b7027ba..9201aa9f9 100644 --- a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomEmojiItem.prefab +++ b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomEmojiItem.prefab @@ -177,7 +177,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3135625391757224365 RectTransform: m_ObjectHideFlags: 0 @@ -196,7 +196,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 70, y: 70} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0, y: 1} --- !u!222 &36790126361215641 CanvasRenderer: diff --git a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomGiftItem.prefab b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomGiftItem.prefab index 613141101..65e005eeb 100644 --- a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomGiftItem.prefab +++ b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomGiftItem.prefab @@ -35,7 +35,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 70} + m_AnchoredPosition: {x: 0, y: 56} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0} --- !u!222 &7353684547968561087 @@ -201,7 +201,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 255} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0, y: 1} --- !u!222 &36790126361215641 CanvasRenderer: @@ -483,7 +483,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -25} + m_AnchoredPosition: {x: 0, y: 10} m_SizeDelta: {x: 130, y: 130} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7036475025096231157 @@ -580,7 +580,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 15} + m_AnchoredPosition: {x: 0, y: 10} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4100503900459226674 @@ -737,7 +737,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 55} + m_AnchoredPosition: {x: 0, y: 45} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0} --- !u!222 &2984521722597805549 @@ -1037,7 +1037,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -7.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6542315322597585617 diff --git a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab index 94a44cd16..13866fcee 100644 --- a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab +++ b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab @@ -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 @@ -18892,8 +18892,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -15} + m_SizeDelta: {x: 0, y: -15} m_Pivot: {x: 0, y: 1} --- !u!222 &4895826740627811866 CanvasRenderer: @@ -22957,7 +22957,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6742067643074399280 RectTransform: m_ObjectHideFlags: 0 @@ -22971,11 +22971,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2123993377470589547} - m_Father: {fileID: 2662489945147460395} + m_Father: {fileID: 5774044318534779506} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 250} + m_AnchoredPosition: {x: 0, y: -580} m_SizeDelta: {x: 910, y: 193} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7733000973708576024 @@ -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 @@ -26687,7 +26687,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 mItemPadding: {x: 15, y: 15} - mItemSize: {x: 70, y: 70} + mItemSize: {x: 80, y: 80} mItemRecycleDistance: {x: 50, y: 50} mItemSnapEnable: 0 mGridFixedType: 0 @@ -26789,7 +26789,7 @@ GameObject: - component: {fileID: 1993556326662730853} - component: {fileID: 3848572391099379769} m_Layer: 5 - m_Name: audiencehead1 + m_Name: audiencehead3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -29528,9 +29528,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 @@ -33518,9 +33518,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 @@ -34986,9 +34986,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 @@ -35342,9 +35342,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 @@ -42211,7 +42211,7 @@ GameObject: - component: {fileID: 3368550834820136955} - component: {fileID: 4779398924576499328} m_Layer: 5 - m_Name: audiencehead3 + m_Name: audiencehead1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -47477,9 +47477,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3546730362492774380} - - {fileID: 5058743462349519916} - {fileID: 4089347109719483839} + - {fileID: 5058743462349519916} + - {fileID: 3546730362492774380} m_Father: {fileID: 7428115698804564096} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} @@ -47531,9 +47531,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 @@ -48069,8 +48069,8 @@ MonoBehaviour: m_fontSizeBase: 45 m_fontWeight: 400 m_enableAutoSizing: 1 - m_fontSizeMin: 38 - m_fontSizeMax: 45 + m_fontSizeMin: 32 + m_fontSizeMax: 38 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -48508,6 +48508,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7428115698804564096} + - {fileID: 6742067643074399280} - {fileID: 1423466744975753172} m_Father: {fileID: 7074419440563985891} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -50994,10 +50995,10 @@ RectTransform: - {fileID: 9222399829390991974} m_Father: {fileID: 1423466744975753172} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 0, y: -100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 190, y: -220} + m_SizeDelta: {x: 380, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3016207642671836231 CanvasRenderer: @@ -51106,7 +51107,7 @@ MonoBehaviour: mItemPrefabDataList: - mItemPrefab: {fileID: 3644884608125155436, guid: 71828ce09d906d34aa0f1780934d28eb, type: 3} - mPadding: 20 + mPadding: 5 mInitCreateCount: 0 mStartPosOffset: 0 mArrangeType: 0 @@ -51606,7 +51607,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6742067643074399280} - {fileID: 7344605125539058028} - {fileID: 5852537551659690471} - {fileID: 903115546714470270} @@ -51666,8 +51666,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -20, y: -276} - m_SizeDelta: {x: 380, y: 480} + m_AnchoredPosition: {x: -20, y: -150} + m_SizeDelta: {x: 380, y: 379.57} m_Pivot: {x: 0, y: 1} --- !u!222 &3316531859456601597 CanvasRenderer: @@ -52892,10 +52892,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28.55 - m_fontSizeBase: 24 + m_fontSize: 28 + m_fontSizeBase: 28 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 @@ -53553,10 +53553,10 @@ RectTransform: - {fileID: 2335371237857533351} m_Father: {fileID: 5852537551659690471} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1000, y: 400} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 130} + m_SizeDelta: {x: -60, y: 460} m_Pivot: {x: 0.5, y: 0} --- !u!222 &1949126602672661469 CanvasRenderer: @@ -55453,8 +55453,8 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - mItemPadding: {x: 40, y: 30} - mItemSize: {x: 200, y: 255} + mItemPadding: {x: 40, y: 10} + mItemSize: {x: 200, y: 200} mItemRecycleDistance: {x: 50, y: 50} mItemSnapEnable: 0 mGridFixedType: 0 @@ -60253,92 +60253,92 @@ PrefabInstance: - target: {fileID: 255037437807012344, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 255037437807012344, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 255037437807012344, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 310 objectReference: {fileID: 0} - target: {fileID: 255037437807012344, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 155 objectReference: {fileID: 0} - target: {fileID: 255037437807012344, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -316 objectReference: {fileID: 0} - target: {fileID: 921877353139759557, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 921877353139759557, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 921877353139759557, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 175 objectReference: {fileID: 0} - target: {fileID: 921877353139759557, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 1106699212839708851, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1106699212839708851, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1106699212839708851, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 175 objectReference: {fileID: 0} - target: {fileID: 1106699212839708851, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -382 objectReference: {fileID: 0} - target: {fileID: 3372545944258045775, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3372545944258045775, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3372545944258045775, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 310 objectReference: {fileID: 0} - target: {fileID: 3372545944258045775, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 155 objectReference: {fileID: 0} - target: {fileID: 3372545944258045775, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -94.5 objectReference: {fileID: 0} - target: {fileID: 3555701628800234743, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} @@ -60353,87 +60353,87 @@ PrefabInstance: - target: {fileID: 3780728880406701146, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3780728880406701146, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3780728880406701146, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 155 objectReference: {fileID: 0} - target: {fileID: 3780728880406701146, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 5035513865269336836, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5035513865269336836, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5035513865269336836, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 310 objectReference: {fileID: 0} - target: {fileID: 5035513865269336836, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 155 objectReference: {fileID: 0} - target: {fileID: 5035513865269336836, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -234 objectReference: {fileID: 0} - target: {fileID: 6637907905193628439, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6637907905193628439, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6637907905193628439, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 53 objectReference: {fileID: 0} - target: {fileID: 6637907905193628439, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 6875710164747257226, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6875710164747257226, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6875710164747257226, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 175 objectReference: {fileID: 0} - target: {fileID: 6875710164747257226, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -449 objectReference: {fileID: 0} - target: {fileID: 7403682278865615684, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} @@ -60540,25 +60540,30 @@ PrefabInstance: propertyPath: m_Name value: readyitem objectReference: {fileID: 0} + - target: {fileID: 7403682278865615687, guid: f703449f1d95d1c4596a35c1d7c27f39, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9167552268865036563, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9167552268865036563, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9167552268865036563, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 257 objectReference: {fileID: 0} - target: {fileID: 9167552268865036563, guid: f703449f1d95d1c4596a35c1d7c27f39, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomReceiveGiftItem.prefab b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomReceiveGiftItem.prefab index 97dfb5bfc..bfbd92ae9 100644 --- a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomReceiveGiftItem.prefab +++ b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomReceiveGiftItem.prefab @@ -532,7 +532,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.35952243, g: 0.7830189, b: 0.12927197, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Lua/Logic/LiveRoomData.lua b/Assets/Lua/Logic/LiveRoomData.lua index 71991bf74..d6a02fc53 100644 --- a/Assets/Lua/Logic/LiveRoomData.lua +++ b/Assets/Lua/Logic/LiveRoomData.lua @@ -17,6 +17,8 @@ function LiveRoomData:RegisterNetEvents() self.data["rank"] = data.rank self.data["gift_records"] = data.gift_records self.data["chat_records"]=data.chat_datas + self.data["room_user_num"] = data.room_user_num + self.data["room_user_heads"] = data.room_user_heads LogWarning("tzy_join_ack: " .. Inspect(data)) ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.SC_LIVE_ROOM_JOIN_ACK,data) LogError("SC_LIVE_ROOM_JOIN_ACK: join room_id=" .. data.room_id) diff --git a/Assets/Lua/Pb/login.txt b/Assets/Lua/Pb/login.txt index 00d4828ea..bd2052ae9 100644 --- a/Assets/Lua/Pb/login.txt +++ b/Assets/Lua/Pb/login.txt @@ -1,5 +1,5 @@ -ãü +¯ý login.proto serverproto user.proto"0 @@ -2778,7 +2778,7 @@ award_type (R awardTypeM coin_num ( RcoinNum" game_chip_num ( R gameChipNum@ player_info ( 2.serverproto.LiveRoomPlayerInfoR -playerInfo"ô +playerInfo"À SCLiveRoomJoinAck uid (Ruid error (Rerror @@ -2795,7 +2795,9 @@ room_state gift_records ( 2.serverproto.LiveRoomPlayerInfoR giftRecords< chat_datas ( 2.serverproto.LiveRoomChatDataR chatDatasT -ready_player_info_list ( 2.serverproto.LiveRoomPlayerInfoRreadyPlayerInfoList"? +ready_player_info_list ( 2.serverproto.LiveRoomPlayerInfoRreadyPlayerInfoList" + room_user_num (R roomUserNum& +room_user_heads ( R roomUserHeads"? CSLiveRoomLeaveReq uid (Ruid room_id ( RroomId"U diff --git a/Assets/Lua/UI/GridViewItem/LiveRoomItem_Generate.lua b/Assets/Lua/UI/GridViewItem/LiveRoomItem_Generate.lua index ccaf7120d..d34441ef0 100644 --- a/Assets/Lua/UI/GridViewItem/LiveRoomItem_Generate.lua +++ b/Assets/Lua/UI/GridViewItem/LiveRoomItem_Generate.lua @@ -1321,14 +1321,6 @@ ---@field public gameObject UnityEngine.GameObject ---@field public loopListView SuperScrollView.LoopListView ----@class LiveRoomItem__Generate_bg_talk_text_talk ----@field public gameObject UnityEngine.GameObject ----@field public text TMPro.TextMeshProUGUI - ----@class LiveRoomItem__Generate_bg_talk ----@field public gameObject UnityEngine.GameObject ----@field public text_talk LiveRoomItem__Generate_bg_talk_text_talk - ---@class LiveRoomItem__Generate_giftRank_sv_r_gift ---@field public gameObject UnityEngine.GameObject ---@field public scrollRect UnityEngine.UI.ScrollRect @@ -1353,6 +1345,14 @@ ---@field public btn_month LiveRoomItem__Generate_giftRank_btn_month ---@field public sv_r_gift LiveRoomItem__Generate_giftRank_sv_r_gift +---@class LiveRoomItem__Generate_bg_talk_text_talk +---@field public gameObject UnityEngine.GameObject +---@field public text TMPro.TextMeshProUGUI + +---@class LiveRoomItem__Generate_bg_talk +---@field public gameObject UnityEngine.GameObject +---@field public text_talk LiveRoomItem__Generate_bg_talk_text_talk + ---@class LiveRoomItem__Generate_roomTitleBar_text_notice ---@field public gameObject UnityEngine.GameObject ---@field public text TMPro.TextMeshProUGUI @@ -1436,8 +1436,8 @@ ---@field private roomBg LiveRoomItem__Generate_roomBg ---@field private liveStreamer UnityEngine.GameObject ---@field private roomTitleBar LiveRoomItem__Generate_roomTitleBar ----@field private giftRank LiveRoomItem__Generate_giftRank ---@field private bg_talk LiveRoomItem__Generate_bg_talk +---@field private giftRank LiveRoomItem__Generate_giftRank ---@field private sv_chat LiveRoomItem__Generate_sv_chat ---@field private inputBar LiveRoomItem__Generate_inputBar ---@field private readyPad LiveRoomItem__Generate_readyPad @@ -2059,6 +2059,32 @@ end ---@private function LiveRoomItemView:InitGenerate__20(Root, data) +--[[ + UpSafe/bg_talk +--]] + local tmp = Root:Find("UpSafe/bg_talk").gameObject + if tolua.getpeer(tmp) == nil then + tolua.setpeer(tmp, {}) + end + self.bg_talk = tmp +end + +---@private +function LiveRoomItemView:InitGenerate__21(Root, data) +--[[ + UpSafe/bg_talk/text_talk +--]] + local tmp = Root:Find("UpSafe/bg_talk/text_talk").gameObject + if tolua.getpeer(tmp) == nil then + tolua.setpeer(tmp, {}) + end + self.bg_talk.text_talk = tmp + + tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI) +end + +---@private +function LiveRoomItemView:InitGenerate__22(Root, data) --[[ UpSafe/GiftRank --]] @@ -2070,7 +2096,7 @@ function LiveRoomItemView:InitGenerate__20(Root, data) end ---@private -function LiveRoomItemView:InitGenerate__21(Root, data) +function LiveRoomItemView:InitGenerate__23(Root, data) --[[ UpSafe/GiftRank/rect_btn/btn_hour --]] @@ -2084,7 +2110,7 @@ function LiveRoomItemView:InitGenerate__21(Root, data) end ---@private -function LiveRoomItemView:InitGenerate__22(Root, data) +function LiveRoomItemView:InitGenerate__24(Root, data) --[[ UpSafe/GiftRank/rect_btn/btn_day --]] @@ -2098,7 +2124,7 @@ function LiveRoomItemView:InitGenerate__22(Root, data) end ---@private -function LiveRoomItemView:InitGenerate__23(Root, data) +function LiveRoomItemView:InitGenerate__25(Root, data) --[[ UpSafe/GiftRank/rect_btn/btn_month --]] @@ -2112,7 +2138,7 @@ function LiveRoomItemView:InitGenerate__23(Root, data) end ---@private -function LiveRoomItemView:InitGenerate__24(Root, data) +function LiveRoomItemView:InitGenerate__26(Root, data) --[[ UpSafe/GiftRank/sv_r_gift --]] @@ -2127,32 +2153,6 @@ function LiveRoomItemView:InitGenerate__24(Root, data) tmp.loopListView = tmp:GetComponent(Enum.TypeInfo.LoopListView) end ----@private -function LiveRoomItemView:InitGenerate__25(Root, data) ---[[ - BottomSafe/bg_talk ---]] - local tmp = Root:Find("BottomSafe/bg_talk").gameObject - if tolua.getpeer(tmp) == nil then - tolua.setpeer(tmp, {}) - end - self.bg_talk = tmp -end - ----@private -function LiveRoomItemView:InitGenerate__26(Root, data) ---[[ - BottomSafe/bg_talk/text_talk ---]] - local tmp = Root:Find("BottomSafe/bg_talk/text_talk").gameObject - if tolua.getpeer(tmp) == nil then - tolua.setpeer(tmp, {}) - end - self.bg_talk.text_talk = tmp - - tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI) -end - ---@private function LiveRoomItemView:InitGenerate__27(Root, data) --[[ @@ -7385,9 +7385,6 @@ function LiveRoomItemView:GenerateDestroy() if tolua.getpeer(self.inputBar.inputfield_chat) ~= nil then tolua.setpeer(self.inputBar.inputfield_chat, nil) end - if tolua.getpeer(self.bg_talk.text_talk) ~= nil then - tolua.setpeer(self.bg_talk.text_talk, nil) - end if tolua.getpeer(self.giftRank.sv_r_gift) ~= nil then tolua.setpeer(self.giftRank.sv_r_gift, nil) end @@ -7400,6 +7397,9 @@ function LiveRoomItemView:GenerateDestroy() if tolua.getpeer(self.giftRank.btn_hour) ~= nil then tolua.setpeer(self.giftRank.btn_hour, nil) end + if tolua.getpeer(self.bg_talk.text_talk) ~= nil then + tolua.setpeer(self.bg_talk.text_talk, nil) + end if tolua.getpeer(self.roomTitleBar.text_notice) ~= nil then tolua.setpeer(self.roomTitleBar.text_notice, nil) end @@ -7457,14 +7457,14 @@ function LiveRoomItemView:GenerateDestroy() tolua.setpeer(self.roomTitleBar, nil) end self.roomTitleBar = nil - if tolua.getpeer(self.giftRank) ~= nil then - tolua.setpeer(self.giftRank, nil) - end - self.giftRank = nil if tolua.getpeer(self.bg_talk) ~= nil then tolua.setpeer(self.bg_talk, nil) end self.bg_talk = nil + if tolua.getpeer(self.giftRank) ~= nil then + tolua.setpeer(self.giftRank, nil) + end + self.giftRank = nil if tolua.getpeer(self.sv_chat) ~= nil then tolua.setpeer(self.sv_chat, nil) end diff --git a/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua b/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua index 7e2a2c268..ad6625199 100644 --- a/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua +++ b/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua @@ -529,6 +529,7 @@ function UILiveRoomView:RefreshRoom() local stage_sec = data["stage_sec"] or 0 local ready_player_info_list = data["ready_player_info_list"] or {} + self:InitTopBar(itemLua, room_id) self:LoadStreamer(itemLua, room_type) self:ResetStageTimer(stage_sec) @@ -632,18 +633,29 @@ end --region 房间 顶部 function UILiveRoomView:InitTopBar(itemlua, room_id) + local liveRoomData = ManagerContainer.DataMgr.LiveRoomData:GetData() local roomname, name, sign, head, audhead1, audhead2, audhead3, audcount, notice - roomname = itemlua.roomTitleBar.roomName.text.terxt + roomname = itemlua.roomTitleBar.roomName.text - name = itemlua.roomTitleBar.streamerHead.nickname.text.text - sign = itemlua.roomTitleBar.text_sign.text.text - head = itemlua.roomTitleBar.streamerHead.headImg.image.sprite - - audhead1 = itemlua.roomTitleBar.audiencehead1.img_Head.image.sprite - audhead2 = itemlua.roomTitleBar.audiencehead2.img_Head.image.sprite - audhead3 = itemlua.roomTitleBar.audiencehead3.img_Head.image.sprite - audcount = itemlua.roomTitleBar.text_audiencecount.text.text + name = itemlua.roomTitleBar.streamerHead.nickname.text + sign = itemlua.roomTitleBar.text_sign.text + head = itemlua.roomTitleBar.streamerHead.headImg.image + itemlua.roomTitleBar.audiencehead1:SetActive(false) + itemlua.roomTitleBar.audiencehead2:SetActive(false) + itemlua.roomTitleBar.audiencehead3:SetActive(false) + audhead1 = itemlua.roomTitleBar.audiencehead1.head_img.image + audhead2 = itemlua.roomTitleBar.audiencehead2.head_img.image + audhead3 = itemlua.roomTitleBar.audiencehead3.head_img.image + audcount = itemlua.roomTitleBar.text_audiencecount.text + audcount.text = ""..liveRoomData["room_user_num"] + for i=1, #liveRoomData["room_user_heads"] do + local headId = liveRoomData["room_user_heads"][i] + itemlua.roomTitleBar["audiencehead"..i]:SetActive(true) + CommonUtil.LoadIcon(self, "PlayerHeads/player_head_"..headId, function(sprite) + itemlua.roomTitleBar["audiencehead"..i].head_img.image.sprite = sprite + end) + end notice = itemlua.roomTitleBar.text_notice.text.text end @@ -758,7 +770,7 @@ function UILiveRoomView:GenChatItem(loopview, index, room_id) local content = data.chat_content - itemlua.text_vip.text.text = vip + itemlua.text_vip.text.text = vip or "0" itemlua.text_name.text.text = name .. ":" --.. ".Lv" .. level .. ":" --设置大å°