Merge branch 'game' of http://127.0.0.1:3000/fatiao/ro-webgl into game

Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomChatItem.prefab

@@ -20,7 +20,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

Assets/Content/Prefabs/UI/UILiveRoom/LiveRoomItem.prefab

@@ -418,8 +418,7 @@ MonoBehaviour:
   m_text: "\u4E94\u4EBA\u7EC4\u961F\u62BD\u5361\uFF0C\u62BD\u4E2DMVP\u5361\u7247\u6982\u7387\u4E3A1.8%\uFF0C\u62BD\u4E2DMINI\u5361\u7247\u6982\u7387\u4E3A30%"
   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: []
@@ -7870,9 +7869,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
@@ -9696,10 +9695,10 @@ RectTransform:
   - {fileID: 8317714432452095997}
   m_Father: {fileID: 4254207596734884629}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 540, y: -277.5}
-  m_SizeDelta: {x: 1080, y: 75}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1080, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &994507179122743829
 CanvasRenderer:
@@ -16670,9 +16669,9 @@ RectTransform:
   - {fileID: 9213351548852728544}
   m_Father: {fileID: 4254207596734884629}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 540, y: -320}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 329, y: 100}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6890580478276637355
@@ -17119,9 +17118,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
@@ -18318,9 +18317,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
@@ -18531,9 +18530,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
@@ -22071,7 +22070,6 @@ GameObject:
   m_Component:
   - component: {fileID: 903115546714470270}
   - component: {fileID: 7019320910625426721}
-  - component: {fileID: 7681651488967858430}
   - component: {fileID: 3579569843204405582}
   m_Layer: 5
   m_Name: ReadyPad
@@ -22079,7 +22077,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &903115546714470270
 RectTransform:
   m_ObjectHideFlags: 0
@@ -22098,8 +22096,8 @@ 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: 500}
-  m_SizeDelta: {x: 0, y: 400}
+  m_AnchoredPosition: {x: 0, y: 613.53}
+  m_SizeDelta: {x: 0, y: 286.47}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &7019320910625426721
 CanvasRenderer:
@@ -22109,36 +22107,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3190950603450985637}
   m_CullTransparentMesh: 1
---- !u!114 &7681651488967858430
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3190950603450985637}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.7735849, g: 0.6020826, b: 0.6020826, a: 0}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &3579569843204405582
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -22155,9 +22123,8 @@ MonoBehaviour:
   keys:
   - UnityEngine.RectTransform
   - UnityEngine.CanvasRenderer
-  - UnityEngine.UI.Image
   - UINode
-  values: 01000000
+  values: 010000
   depObjs: []
   activeType: 0
 --- !u!1 &3196356142918742587
@@ -24065,7 +24032,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8773585, g: 0.8520458, b: 0.120016046, a: 1}
+  m_Color: {r: 0.8867924, g: 0.69685614, b: 0.30535775, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -26895,9 +26862,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
@@ -31077,9 +31044,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
@@ -35067,9 +35034,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
@@ -36534,9 +36501,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
@@ -36890,9 +36857,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
@@ -37293,10 +37260,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 4254207596734884629}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 540, y: -317.5}
-  m_SizeDelta: {x: 100, y: 5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 10}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1796809333254120660
 CanvasRenderer:
@@ -40488,6 +40455,50 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6234666123005069253
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6228192995245624071}
+  - component: {fileID: 1951121887629550732}
+  m_Layer: 5
+  m_Name: space
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6228192995245624071
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6234666123005069253}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4254207596734884629}
+  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: 100, y: 15}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1951121887629550732
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6234666123005069253}
+  m_CullTransparentMesh: 1
 --- !u!1 &6235151584768214403
 GameObject:
   m_ObjectHideFlags: 0
@@ -41190,7 +41201,6 @@ GameObject:
   m_Component:
   - component: {fileID: 2789724624891662781}
   - component: {fileID: 8666541955988551275}
-  - component: {fileID: 4836957460502101198}
   m_Layer: 5
   m_Name: rect_head
   m_TagString: Untagged
@@ -41214,10 +41224,10 @@ RectTransform:
   - {fileID: 7025420972156680222}
   m_Father: {fileID: 4254207596734884629}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 540, y: 0}
-  m_SizeDelta: {x: 1080, y: 240}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1080, y: 200}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8666541955988551275
 CanvasRenderer:
@@ -41227,36 +41237,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6378501971100035997}
   m_CullTransparentMesh: 1
---- !u!114 &4836957460502101198
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6378501971100035997}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.9019608}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 00e6404e54b3e39439dc972fca8271ed, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6416431184280945054
 GameObject:
   m_ObjectHideFlags: 0
@@ -49249,9 +49229,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
@@ -49340,6 +49320,7 @@ GameObject:
   - component: {fileID: 5278942819024730963}
   - component: {fileID: 5717147446015443069}
   - component: {fileID: 3767127506595916824}
+  - component: {fileID: 2149155093383779832}
   m_Layer: 5
   m_Name: rect
   m_TagString: Untagged
@@ -49363,12 +49344,13 @@ RectTransform:
   - {fileID: 7014873417162760031}
   - {fileID: 6811599971540083438}
   - {fileID: 6479219587311969676}
+  - {fileID: 6228192995245624071}
   m_Father: {fileID: 903115546714470270}
   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: 150}
-  m_SizeDelta: {x: 1080, y: 420}
+  m_SizeDelta: {x: 1080, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5278942819024730963
 CanvasRenderer:
@@ -49397,7 +49379,7 @@ MonoBehaviour:
     m_Bottom: 0
   m_ChildAlignment: 4
   m_Spacing: 0
-  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
@@ -49418,6 +49400,36 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!114 &2149155093383779832
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7415870992691357514}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 00e6404e54b3e39439dc972fca8271ed, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7449820986233130581
 GameObject:
   m_ObjectHideFlags: 0
@@ -49758,14 +49770,14 @@ MonoBehaviour:
   m_text: "\u6B22\u8FCE\u8FDB\u5165\u76F4\u64AD\u95F4\uFF01"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
-  m_sharedMaterial: {fileID: 2100000, guid: 15bf829c0cc809940b11f84c70265374, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294638079
-  m_fontColor: {r: 1, g: 0.97647065, b: 0.9803922, a: 1}
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:

Assets/Content/Raw_Art/UI/UILiveRoom/ready_bg.png.meta

@@ -49,7 +49,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 390, y: 5, z: 390, w: 50}
+  spriteBorder: {x: 390, y: 8, z: 390, w: 50}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1

Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua

@@ -1719,7 +1719,7 @@ function UILiveRoomView:Result_Card(itemlua, data)
 	local r_card = itemlua.resultPad.rect_card
 	r_card:SetActive(true)
 	local title = r_card.text_title
-	title.text.text = "测试抽卡结算信息"
+	title.text.text = I18N.T("抽卡结果")
 
 	local items = {
 		[1] = r_card.carditem1,
@@ -2096,13 +2096,13 @@ function UILiveRoomView:RefreshStageTimer(timerVal)
 	local itemLua = self:GetCurrPageLua()
 	local name
 	if stage == LIVEROOM_STAGE_IDLE then
-		name = "等待中"
+		name = I18N.T("等待中")
 	elseif stage == LIVEROOM_STAGE_READY then
-		name = "准备中"
+		name = I18N.T("准备中")
 	elseif stage == LIVEROOM_STAGE_SHOW then
-		name = "进行中"
+		name = I18N.T("进行中")
 	elseif stage == LIVEROOM_STAGE_RESULT then
-		name = "结算中"
+		name = I18N.T("结算中")
 	end
 	itemLua.timer.text_name.text.text = name
 	itemLua.timer.text_time.text.text = tostring(timerVal)