diff --git a/Assets/GameAssets/Prefebs/Models/WRJ/RadioAngleView.prefab b/Assets/GameAssets/Prefebs/Models/WRJ/RadioAngleView.prefab index ee0fb30d..9275e3ff 100644 --- a/Assets/GameAssets/Prefebs/Models/WRJ/RadioAngleView.prefab +++ b/Assets/GameAssets/Prefebs/Models/WRJ/RadioAngleView.prefab @@ -281,10 +281,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: deviceID: - textNmme: {fileID: 0} - btnAmplification: {fileID: 0} - btnClose: {fileID: 0} - rawShow: {fileID: 0} + textNmme: {fileID: 5661051786674650806} + btnAmplification: {fileID: 5661051786863276579} + btnClose: {fileID: 5661051786339230469} + rawShow: {fileID: 5661051785896792235} --- !u!1 &5661051786674650808 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index 19fb2211..213e411f 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -324,8 +324,8 @@ Camera: m_GameObject: {fileID: 2040130835863971667} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -742,7 +742,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/Assets/Resources/DeviceBtn/DeviceBtn.prefab b/Assets/Resources/DeviceBtn/DeviceBtn.prefab index 7f0dc6f7..8c6e14e5 100644 --- a/Assets/Resources/DeviceBtn/DeviceBtn.prefab +++ b/Assets/Resources/DeviceBtn/DeviceBtn.prefab @@ -170,6 +170,7 @@ MonoBehaviour: selfBtn: {fileID: 8125462804241330245} id: selfName: + selfText: {fileID: 3870983289451212411} --- !u!114 &8125462804241330245 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs b/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs index ff051b86..a83bb98e 100644 --- a/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs +++ b/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs @@ -8,11 +8,13 @@ public class DeviceBtnItem : MonoBehaviour public Button selfBtn; public string id; public string selfName; + public Text selfText; // Start is called before the first frame update void Start() { - + selfBtn = GetComponent