diff --git a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomChatItem.prefab b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomChatItem.prefab index 1641261f3..e25d85da4 100644 --- a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomChatItem.prefab +++ b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomChatItem.prefab @@ -218,8 +218,7 @@ MonoBehaviour: m_text: 99 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2} - m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -818,8 +817,7 @@ MonoBehaviour: m_text: "\u521D\u5FC3\u8005.Lv100" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2} - m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab index 9ed7665d0..5f429eea6 100644 --- a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab +++ b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab @@ -4514,8 +4514,7 @@ MonoBehaviour: m_text: 10000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2} - m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6884,7 +6883,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 85, y: 79} + m_SizeDelta: {x: 0, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3129009886261300543 CanvasRenderer: @@ -10980,9 +10979,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 38694642532451514} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 42.5, y: -39.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 85, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1341082580946622763 @@ -15482,7 +15481,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 85, y: 79} + m_SizeDelta: {x: 0, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4506452253585706885 CanvasRenderer: @@ -20312,9 +20311,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5218114742797615967} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 42.5, y: -39.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 85, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &112925853949052184 @@ -20757,7 +20756,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 85, y: 79} + m_SizeDelta: {x: 0, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2813928295018565229 CanvasRenderer: @@ -20879,7 +20878,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -120, y: 0} - m_SizeDelta: {x: 70, y: 70} + m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 1, y: 0.5} --- !u!222 &4105309082070868002 CanvasRenderer: @@ -21501,9 +21500,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 3384277692870386955} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 42.5, y: -39.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 85, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &998508481571870095 @@ -22958,8 +22957,7 @@ MonoBehaviour: m_text: 30 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2} - m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -25544,9 +25542,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5100400502523209080} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 42.5, y: -39.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 85, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8260349535331975377 @@ -28408,7 +28406,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -678, y: 1690} - m_SizeDelta: {x: 85, y: 79} + m_SizeDelta: {x: 0, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2365016995822016506 CanvasRenderer: @@ -29426,7 +29424,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 85, y: 79} + m_SizeDelta: {x: 0, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7573674462093631279 CanvasRenderer: @@ -43373,8 +43371,7 @@ MonoBehaviour: m_text: "\u62BD\u5361\u76F4\u64AD\u95F41" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2} - m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -45954,8 +45951,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2} - m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -45979,8 +45975,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -47364,7 +47360,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7074419440563985891 RectTransform: m_ObjectHideFlags: 0 @@ -48949,9 +48945,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 8858013728297381393} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 42.5, y: -39.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 85, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3245378405971656561 @@ -49186,7 +49182,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -202.7, y: 0} + m_AnchoredPosition: {x: -225, y: 0} m_SizeDelta: {x: 235.1, y: 90} m_Pivot: {x: 1, y: 0.5} --- !u!222 &7820100484142582951 @@ -55296,7 +55292,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2894279414903819294 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomReceiveGiftItem.prefab b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomReceiveGiftItem.prefab index bfbd92ae9..de69a6fd3 100644 --- a/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomReceiveGiftItem.prefab +++ b/Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomReceiveGiftItem.prefab @@ -407,8 +407,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2} - m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua b/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua index ed55fe2bb..df689acbc 100644 --- a/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua +++ b/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua @@ -221,7 +221,7 @@ function UILiveRoomView:AddEventListener() function(data) local heart = data.heart local itemlua = self:GetCurrPageLua() - self:RefreshHeart(itemlua) + --self:RefreshHeart(itemlua) end) end @@ -796,7 +796,7 @@ function UILiveRoomView:GenChatItem(loopview, index, room_id) if data.player_info.uid == 1000 then itemlua.rect1:SetActive(false) - content = "【系统】"..content + content = "【系统】"..content else itemlua.rect1:SetActive(true) --name = string.format("%s.Lv%s", name, level)