This commit is contained in:
parent
deb33107a6
commit
50e6d6665d
|
|
@ -448,7 +448,7 @@ MonoBehaviour:
|
||||||
m_PressedTrigger: Pressed
|
m_PressedTrigger: Pressed
|
||||||
m_SelectedTrigger: Selected
|
m_SelectedTrigger: Selected
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 0
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 555986447467515265}
|
m_TargetGraphic: {fileID: 555986447467515265}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|
@ -1205,8 +1205,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: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 40, y: 48}
|
||||||
m_SizeDelta: {x: 83.8573, y: 393.4985}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0, y: 0}
|
m_Pivot: {x: 0, y: 0}
|
||||||
--- !u!114 &5429741907741161556
|
--- !u!114 &5429741907741161556
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|
@ -1221,12 +1221,12 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Padding:
|
m_Padding:
|
||||||
m_Left: 48
|
m_Left: 0
|
||||||
m_Right: 0
|
m_Right: 0
|
||||||
m_Top: 0
|
m_Top: 0
|
||||||
m_Bottom: 0
|
m_Bottom: 0
|
||||||
m_ChildAlignment: 8
|
m_ChildAlignment: 6
|
||||||
m_Spacing: 0
|
m_Spacing: 32
|
||||||
m_ChildForceExpandWidth: 1
|
m_ChildForceExpandWidth: 1
|
||||||
m_ChildForceExpandHeight: 1
|
m_ChildForceExpandHeight: 1
|
||||||
m_ChildControlWidth: 0
|
m_ChildControlWidth: 0
|
||||||
|
|
@ -1246,8 +1246,8 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_HorizontalFit: 0
|
m_HorizontalFit: 2
|
||||||
m_VerticalFit: 0
|
m_VerticalFit: 2
|
||||||
--- !u!1 &7388906993091369069
|
--- !u!1 &7388906993091369069
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ public class ReportUploadManager : SingletonMono<LoginManager>
|
||||||
/// 上传报告
|
/// 上传报告
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public IEnumerator ReportUpload()
|
public IEnumerator ReportUpload(string content)
|
||||||
{
|
{
|
||||||
// 1. 初始化表单
|
// 1. 初始化表单
|
||||||
WWWForm form = new WWWForm();
|
WWWForm form = new WWWForm();
|
||||||
|
|
@ -73,7 +73,7 @@ public class ReportUploadManager : SingletonMono<LoginManager>
|
||||||
yield break;
|
yield break;
|
||||||
}
|
}
|
||||||
form.AddField("user_id", LoginManager.Instance.loginRespons.data.user_id);
|
form.AddField("user_id", LoginManager.Instance.loginRespons.data.user_id);
|
||||||
form.AddField("rep_name", "实验报告");
|
form.AddField("rep_name", content);
|
||||||
bool hasSelectedToggle = false;
|
bool hasSelectedToggle = false;
|
||||||
foreach (Toggle toggle in UI_ExperimentChooesPanel.instance?.SubjectTog)
|
foreach (Toggle toggle in UI_ExperimentChooesPanel.instance?.SubjectTog)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
|
||||||
Bootstrap.Instance.uiManager.ShowPanel<UI_LoadingPanel>(this, E_UI_Layer.System, (panel) =>
|
Bootstrap.Instance.uiManager.ShowPanel<UI_LoadingPanel>(this, E_UI_Layer.System, (panel) =>
|
||||||
{
|
{
|
||||||
Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.5f);
|
Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.5f);
|
||||||
Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "xianchang_BF 1", () =>
|
Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "xianchang", () =>
|
||||||
{
|
{
|
||||||
Bootstrap.Instance.uiManager.ShowPanel<UI_TopTitlePanel>(this, E_UI_Layer.Top, (panel) =>
|
Bootstrap.Instance.uiManager.ShowPanel<UI_TopTitlePanel>(this, E_UI_Layer.Top, (panel) =>
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -111,7 +111,13 @@ public class UI_ReportUploadPanel : BasePanel
|
||||||
FadeOut(0.5f);
|
FadeOut(0.5f);
|
||||||
break;
|
break;
|
||||||
case "Ìá½»Btn":
|
case "Ìá½»Btn":
|
||||||
StartCoroutine(ReportUploadManager.instance.ReportUpload());
|
string content = ReportUpload_Input.text;
|
||||||
|
if (string.IsNullOrEmpty(content))
|
||||||
|
{
|
||||||
|
Debug.Log("请输入内容!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
StartCoroutine(ReportUploadManager.instance.ReportUpload(content));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ public class UI_TopTitlePanel : BasePanel
|
||||||
{
|
{
|
||||||
base.ShowMe();
|
base.ShowMe();
|
||||||
Scene currentScene = SceneManager.GetActiveScene();
|
Scene currentScene = SceneManager.GetActiveScene();
|
||||||
if (currentScene.name == "xianchang_BF 1")
|
if (currentScene.name == "xianchang")
|
||||||
{
|
{
|
||||||
AskBtn.gameObject.SetActive(true);
|
AskBtn.gameObject.SetActive(true);
|
||||||
ReturnBtn.gameObject.SetActive(true);
|
ReturnBtn.gameObject.SetActive(true);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue