Compare commits
2 Commits
04e2bf603d
...
76b15edf58
| Author | SHA1 | Date | |
|---|---|---|---|
| 76b15edf58 | |||
| d42e80302e |
@ -20,7 +20,7 @@ GameObject:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &3135625391757224365
|
--- !u!224 &3135625391757224365
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -41,7 +41,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: -17.400024, y: 162.5}
|
m_AnchoredPosition: {x: -17.399902, y: 162.5}
|
||||||
m_SizeDelta: {x: 1020, y: 85}
|
m_SizeDelta: {x: 1020, y: 85}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &36790126361215641
|
--- !u!222 &36790126361215641
|
||||||
@ -162,8 +162,8 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 35, y: -0.000061035156}
|
m_AnchoredPosition: {x: 41.36, y: -2.61}
|
||||||
m_SizeDelta: {x: -35, y: 0}
|
m_SizeDelta: {x: -48.63, y: -2.61}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &1391754363728036614
|
--- !u!222 &1391754363728036614
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -215,7 +215,7 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: 29
|
m_text: 99
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
|
||||||
m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
|
m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
|
||||||
@ -243,15 +243,15 @@ MonoBehaviour:
|
|||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 33.7
|
m_fontSize: 32
|
||||||
m_fontSizeBase: 36
|
m_fontSizeBase: 32
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 1
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
m_fontSizeMax: 36
|
m_fontSizeMax: 36
|
||||||
m_fontStyle: 0
|
m_fontStyle: 0
|
||||||
m_HorizontalAlignment: 2
|
m_HorizontalAlignment: 2
|
||||||
m_VerticalAlignment: 256
|
m_VerticalAlignment: 512
|
||||||
m_textAlignment: 65535
|
m_textAlignment: 65535
|
||||||
m_characterSpacing: 0
|
m_characterSpacing: 0
|
||||||
m_wordSpacing: 0
|
m_wordSpacing: 0
|
||||||
@ -687,7 +687,7 @@ RectTransform:
|
|||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 112, y: 41}
|
m_SizeDelta: {x: 100, y: 41}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &8041438320916840939
|
--- !u!222 &8041438320916840939
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -718,7 +718,7 @@ MonoBehaviour:
|
|||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 21300000, guid: e91c1311bfcd97e4595c7089565751db, type: 3}
|
m_Sprite: {fileID: 21300000, guid: e91c1311bfcd97e4595c7089565751db, type: 3}
|
||||||
m_Type: 0
|
m_Type: 1
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
m_FillMethod: 4
|
m_FillMethod: 4
|
||||||
|
|||||||
@ -49,7 +49,7 @@ TextureImporter:
|
|||||||
alignment: 0
|
alignment: 0
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
spritePixelsToUnits: 100
|
spritePixelsToUnits: 100
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
spriteBorder: {x: 45, y: 14, z: 18, w: 15}
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
alphaUsage: 1
|
alphaUsage: 1
|
||||||
alphaIsTransparency: 1
|
alphaIsTransparency: 1
|
||||||
@ -139,7 +139,7 @@ TextureImporter:
|
|||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
internalID: 0
|
internalID: 1537655665
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
Íõ
|
êõ
|
||||||
|
|
||||||
user.protoserverproto"¸
|
user.protoserverproto"¸
|
||||||
AccountRole
|
AccountRole
|
||||||
@ -1670,15 +1670,16 @@ fightPower"
|
|||||||
level (Rlevel
|
level (Rlevel
|
||||||
head_id ( RheadId$
|
head_id ( RheadId$
|
||||||
award_chip_num (RawardChipNum
|
award_chip_num (RawardChipNum
|
||||||
rank (Rrank"¤
|
rank (Rrank"Á
|
||||||
LiveRoomPlayerInfo
|
LiveRoomPlayerInfo
|
||||||
uid (Ruid
|
uid (Ruid
|
||||||
nickname ( Rnickname
|
nickname ( Rnickname
|
||||||
level (
Rlevel
|
level (
Rlevel
|
||||||
head_id ( RheadId
|
vip_level (
RvipLevel
|
||||||
|
head_id ( RheadId
|
||||||
|
|
||||||
head_title (
R headTitle
|
head_title (
R headTitle
|
||||||
data ( Rdata"‡
|
data ( Rdata"‡
|
||||||
LiveRoomChatData
|
LiveRoomChatData
|
||||||
SN (RSN@
|
SN (RSN@
|
||||||
player_info (2.serverproto.LiveRoomPlayerInfoR
|
player_info (2.serverproto.LiveRoomPlayerInfoR
|
||||||
|
|||||||
@ -783,8 +783,8 @@ function UILiveRoomView:GenChatItem(loopview, index, room_id)
|
|||||||
|
|
||||||
|
|
||||||
local name = tostring(data.player_info.nickname)
|
local name = tostring(data.player_info.nickname)
|
||||||
local vip = tostring(data.player_info.vip_level)
|
local vip = tostring(data.player_info.vip_level or 0)
|
||||||
if name == "" then name = "初心者" end
|
if name == "" then name = "穿越者" end
|
||||||
local level = tostring(data.player_info.level)
|
local level = tostring(data.player_info.level)
|
||||||
local content = data.chat_content
|
local content = data.chat_content
|
||||||
|
|
||||||
@ -831,9 +831,10 @@ end
|
|||||||
|
|
||||||
function UILiveRoomView:Btn_Send_Chat(itemlua, room_id)
|
function UILiveRoomView:Btn_Send_Chat(itemlua, room_id)
|
||||||
local idx = room_id
|
local idx = room_id
|
||||||
LogWarning("Btn_SendChat: " .. tostring(itemlua.gameObject.name) .. " " .. idx)
|
|
||||||
local text = itemlua.inputBar.inputfield_chat.tMP_InputField.text
|
local text = itemlua.inputBar.inputfield_chat.tMP_InputField.text
|
||||||
ManagerContainer.DataMgr.LiveRoomData:ChatReq(idx, text)
|
if text ~= "" then
|
||||||
|
ManagerContainer.DataMgr.LiveRoomData:ChatReq(idx, text)
|
||||||
|
end
|
||||||
|
|
||||||
itemlua.inputBar.inputfield_chat.tMP_InputField.text = ""
|
itemlua.inputBar.inputfield_chat.tMP_InputField.text = ""
|
||||||
end
|
end
|
||||||
|
|||||||
@ -2051,9 +2051,10 @@ message LiveRoomPlayerInfo {
|
|||||||
uint64 uid = 1;
|
uint64 uid = 1;
|
||||||
string nickname = 2;
|
string nickname = 2;
|
||||||
uint32 level = 3;
|
uint32 level = 3;
|
||||||
string head_id = 4;
|
uint32 vip_level = 4;
|
||||||
uint32 head_title = 5;
|
string head_id = 5;
|
||||||
string data = 6;
|
uint32 head_title = 6;
|
||||||
|
string data = 7;
|
||||||
}
|
}
|
||||||
|
|
||||||
message LiveRoomChatData {
|
message LiveRoomChatData {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user