diff --git a/Assets/Resources/Prefabs/DoublePlay.prefab b/Assets/Resources/Prefabs/DoublePlay.prefab index 0a937317..0563e750 100644 --- a/Assets/Resources/Prefabs/DoublePlay.prefab +++ b/Assets/Resources/Prefabs/DoublePlay.prefab @@ -6288,7 +6288,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 2208927} + m_AnchoredPosition: {x: 0, y: 2208642.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &7554510022850465655 diff --git a/Assets/Resources/Prefabs/EvaluatePanel.prefab b/Assets/Resources/Prefabs/EvaluatePanel.prefab index 0ff783e2..2c9ec8fe 100644 --- a/Assets/Resources/Prefabs/EvaluatePanel.prefab +++ b/Assets/Resources/Prefabs/EvaluatePanel.prefab @@ -582,7 +582,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 397.93872} + m_AnchoredPosition: {x: 0, y: 379.4992} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &7621630000060616885 @@ -1727,7 +1727,7 @@ MonoBehaviour: m_HandleRect: {fileID: 3698306822714026186} m_Direction: 2 m_Value: 1 - m_Size: 0.95320725 + m_Size: 0.8681914 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Resources/Prefabs/IntroducePanel.prefab b/Assets/Resources/Prefabs/IntroducePanel.prefab index c10abae3..9be01372 100644 --- a/Assets/Resources/Prefabs/IntroducePanel.prefab +++ b/Assets/Resources/Prefabs/IntroducePanel.prefab @@ -207,8 +207,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2041327556} m_HandleRect: {fileID: 2041327555} m_Direction: 2 - m_Value: 0 - m_Size: 0.99995255 + m_Value: 1 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Resources/UIPanel/View_Panel2.prefab b/Assets/Resources/UIPanel/View_Panel2.prefab index 45894f88..850dca3e 100644 --- a/Assets/Resources/UIPanel/View_Panel2.prefab +++ b/Assets/Resources/UIPanel/View_Panel2.prefab @@ -13838,8 +13838,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 179.55, y: 0} - m_SizeDelta: {x: 349.68298, y: 120} + m_AnchoredPosition: {x: 164.21, y: 0} + m_SizeDelta: {x: 451.98218, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5528630206416109667 CanvasRenderer: @@ -14131,8 +14131,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 181.1, y: 0} - m_SizeDelta: {x: 300, y: 120} + m_AnchoredPosition: {x: 168.38, y: 0} + m_SizeDelta: {x: 424.11676, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5592217797208583881 CanvasRenderer: diff --git a/Assets/Temp/Scripts/View_Panel2.cs b/Assets/Temp/Scripts/View_Panel2.cs index bfc79160..e539dfb8 100644 --- a/Assets/Temp/Scripts/View_Panel2.cs +++ b/Assets/Temp/Scripts/View_Panel2.cs @@ -741,11 +741,11 @@ public class View_Panel2 : XUIPanel item.transform.GetChild(2).GetComponent().isOn = true; item.transform.GetChild(2).GetComponent().interactable = false; item.transform.GetChild(2).GetComponent().enabled = false; + item.transform.GetChild(3).GetComponent().text = sdi[index].UserAccount; if (sdi[index].UserAccount == GlobalFlag.currentUser.login_name) { item.transform.GetChild(2).GetComponent().graphic.color = Color.green; GlobalFlag.practiceSeatId = item.name; - item.transform.GetChild(3).GetComponent().text = GlobalFlag.currentUser.login_name; isAssigned = true; } } @@ -785,11 +785,12 @@ public class View_Panel2 : XUIPanel item.transform.GetChild(2).GetComponent().isOn = true; item.transform.GetChild(2).GetComponent().interactable = false; item.transform.GetChild(2).GetComponent().enabled = false; + item.transform.GetChild(3).GetComponent().text = sdi[index].UserAccount; if (sdi[index].UserAccount == GlobalFlag.currentUser.login_name) { item.transform.GetChild(2).GetComponent().graphic.color = Color.green; GlobalFlag.practiceSeatId = item.name; - item.transform.GetChild(3).GetComponent().text = GlobalFlag.currentUser.login_name; + Debug.Log($"sdi[index].UserAccount=={sdi[index].UserAccount}"); isAssigned = true; } }