Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang

2024-12-28 22:54:08 +08:00 · 2024-12-28 22:54:08 +08:00 · a9403974f0
commit a9403974f0
parent 49e2d8f06d 9eb0d79d8a
16 changed files with 136 additions and 52 deletions
--- a/xiaofang/Assets/Res/gsj/gameRoomList.cs
+++ b/xiaofang/Assets/Res/gsj/gameRoomList.cs
@ -84,7 +84,7 @@ public class GameRoomListPlayer
    public string UserId { get; set; }         // 用户ID
    public int RoleId { get; set; }            // 角色ID
    public string RoleName { get; set; }       // 角色名称
-    public int BirthAreaId { get; set; }       // 出生地ID
+    //public int BirthAreaId { get; set; }       // 出生地ID
    public string BirthAreaName { get; set; }  // 出生地名称
    public int ChargeAreaId { get; set; }      // 负责区域ID
    public string ChargeAreaName { get; set; } // 负责区域名称
--- a/xiaofang/Assets/Res/gsj/scripts/Alertwindow.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/Alertwindow.cs
@ -20,7 +20,7 @@ public class Alertwindow : MonoBehaviour
        cancel=transform.Find("bg/downbg/GameObject3/Cancel").GetComponent<Button>();
        sure.onClick.AddListener(OnSureBtn);
        cancel.onClick.AddListener(OnCancelBtn);
-        peopleposition = GameObject.Find("peopleposition").gameObject;
+        peopleposition = GameObject.Find("HostCanvas/peopleposition").gameObject;
        //获取所有子物体中的 Button 组件
        nameImage = new List<GameObject>();
        foreach (Transform child in peopleposition.transform)
--- a/xiaofang/Assets/Res/gsj/scripts/Game.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/Game.cs
@ -8,15 +8,15 @@ public class Game : MonoBehaviour
    public static bool isLoaded=false;
    private void Awake()
    {
-        if(isLoaded==true)
+        if (isLoaded == true)
        {
-            Destroy(gameObject);
+            //Destroy(gameObject);
        }
        else
        {
            isLoaded = true;
-            DontDestroyOnLoad(gameObject);
-            uiManager=new UIManager();
+            //DontDestroyOnLoad(gameObject);
+            uiManager = new UIManager();
            uiManager.Init();
        }
    }
--- a/xiaofang/Assets/Res/gsj/scripts/Panel2.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/Panel2.cs
@ -22,6 +22,8 @@ public class Panel2 : MonoBehaviour
    public int currentCameraIndex = -1;

    public List<GameObject> target;//Ä¿±ê
+    public GameObject panel1_22;
+    public GameObject panel1_33;
    
    // Start is called before the first frame update
    void Start()
@ -122,8 +124,10 @@ public class Panel2 : MonoBehaviour

        //godView.GetComponent<Camera>().orthographic = false;
        SwitchToCamera(selectedIndex);//×ªÈëÊÓ½Ç
-        Game.uiManager.CloseUI("Panel1_2");
-        Game.uiManager.ShowUI<Image>("Panel1_3");
+        panel1_22.gameObject.SetActive(false);
+        panel1_33.gameObject.SetActive(true);
+        //Game.uiManager.CloseUI("Panel1_2");
+        //Game.uiManager.ShowUI<Image>("Panel1_3");
    }
 
    void EndBtn()
--- a/xiaofang/Assets/Res/gsj/scripts/Panel3.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/Panel3.cs
@ -19,6 +19,8 @@ public class Panel3 : MonoBehaviour
    private GameObject[] players;
    private Vector3 startposition = new Vector3(6, 60, -25);
    private Vector3 startrotation = new Vector3(90, 0, -90);
+    public GameObject panel1_22;
+    public GameObject panel1_33;
    // Start is called before the first frame update
    void Start()
    {
@ -29,7 +31,7 @@ public class Panel3 : MonoBehaviour
        dropdown=transform.Find("left/Dropdown").GetComponent<Dropdown>();
        follow = transform.Find("left/Follow").GetComponent<Button>();
        follow.onClick.AddListener(FollowBtn);
-        peopleposition = GameObject.Find("peopleposition").gameObject;
+        peopleposition = GameObject.Find("HostCanvas/peopleposition").gameObject;
        peopleposition.SetActive(false);
        godView=GameObject.Find("TopCamera").GetComponent<Camera>();
        //godView.GetComponent<Camera>().orthographic = false;
@ -73,7 +75,7 @@ public class Panel3 : MonoBehaviour
    // 切换到上帝视角
    public void SwitchToGodView()
    {
-        godView.GetComponent<Camera>().orthographic = true;
+        godView.GetComponent<Camera>().orthographic = false ;
        isGodView = true;
        currentCameraIndex = -1;
        godView.transform.position = startposition;
@ -102,9 +104,12 @@ public class Panel3 : MonoBehaviour
        peopleposition.gameObject.SetActive(true);
        //返回上帝视角界面
        SwitchToGodView();
-       // Camera.main.enabled = true;
-        Game.uiManager.ShowUI<Image>("Panel1_2");
-        Game.uiManager.CloseUI("Panel1_3");
+        Debug.LogError(1111111111111);
+        // Camera.main.enabled = true;
+        panel1_22.gameObject.SetActive(true);
+        //Game.uiManager.ShowUI<Image>("Panel1_2");
+        panel1_33.gameObject.SetActive(false);
+        //Game.uiManager.CloseUI("Panel1_3");
    }
    void OnClickOnlineBtn()
    {
--- a/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
@ -51,7 +51,7 @@ public class ReadRoom : MonoBehaviour
                isadministrator=false;   
            }else
            {
-                isadministrator = true; ;
+                isadministrator = true; 
            }
            foreach(var item in response.Data)
            {
--- a/xiaofang/Assets/Res/gsj/scripts/RoomManager.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/RoomManager.cs
@ -24,7 +24,13 @@ public class RoomManager : MonoBehaviour
            FetchRoomList();
        }
    }
-    
+    private void Update()
+    {
+        if (!ReadRoom.instance.isadministrator)
+        {
+            FetchRoomList();
+        }
+    }
    // 异步获取房间数据
    private async void FetchRoomList()
    {
--- a/xiaofang/Assets/Res/gsj/scripts/Starthost.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/Starthost.cs
@ -18,7 +18,7 @@ public class Starthost : MonoBehaviour
    private bool isRotating = false; // 默认旋转状态
    private GameObject panel;
    private Button posiBtn;//人员到位情况按钮
-    private Button start;//¿ªÊ¼ÑÝÁ·°´Å¥
+    public Button start;//¿ªÊ¼ÑÝÁ·°´Å¥
    public bool isReady;//在线玩家是否准备
    public bool isSatisfy;//人员是否满足
    public bool isStart=false;//演习是否开始
@ -35,6 +35,7 @@ public class Starthost : MonoBehaviour
    public Alertwindow alertwindow;
    private bool isButtonClicked = false;  // 监听的变量
    private GameObject peopleposition;//人员的位置信息
+    public GameObject panel1_22;
    //非主持人的画面
    public bool ishost=false;
    public Button ready;
@ -53,7 +54,7 @@ public class Starthost : MonoBehaviour
    private GameObject right;//右边图标
    private void Awake()
    {
-        DontDestroyOnLoad(this.gameObject);
+
    }
    void Start()
    {
@ -266,12 +267,13 @@ public class Starthost : MonoBehaviour
        // 对话完成，清理界面
        walkieTalkieIcon.SetActive(false);
        dialogueText.text = ""; // 清空文字
-
+        Debug.LogError(1111111111111);

        peopleposition.SetActive(true);
        panel.SetActive(false);
        right.SetActive(true);
-        Game.uiManager.ShowUI<Image>("Panel1_2");
+        panel1_22.gameObject.SetActive(true);
+        //Game.uiManager.ShowUI<Image>("Panel1_2");
    }

    async Task DisplayTextAsync(string line)
--- a/xiaofang/Assets/Res/gsj/scripts/UIManager.cs
+++ b/xiaofang/Assets/Res/gsj/scripts/UIManager.cs
@ -19,15 +19,17 @@ public class UIManager
    //显示
    public T ShowUI<T>(string uiName) where T : Component
    {
+        Debug.LogError(1111111111111);
        T ui = Find<T>(uiName);
        if (ui == null)
        {
            //集合中没有 需要从Resources/UI文件夹中加载
            GameObject obj = Object.Instantiate(Resources.Load("gsjUI/" + uiName), canvasTf) as GameObject;
+            obj.transform.SetParent(canvasTf);

            //改名字
            obj.name = uiName;
-
+            Debug.LogError(1111111111111);
            //添加需要的脚本
            //ui = obj.AddComponent<T>();

@ -36,6 +38,7 @@ public class UIManager
        }
        else
        {
+            Debug.LogError(1111111111111);
            //显示
            ui.gameObject.SetActive(true);
        }
--- a/xiaofang/Assets/Scenes/Tmap
+++ b/xiaofang/Assets/Scenes/Tmap
@ -5651,7 +5651,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 27
+  m_RootOrder: 26
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &159663861
 PrefabInstance:
@ -7403,7 +7403,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 42
+  m_RootOrder: 41
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &295391225
 MeshCollider:
@ -8109,7 +8109,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 20
+  m_RootOrder: 42
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &339719735
 MeshCollider:
@ -8606,7 +8606,7 @@ Transform:
  - {fileID: 272025130}
  - {fileID: 1600741273}
  m_Father: {fileID: 0}
-  m_RootOrder: 36
+  m_RootOrder: 35
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &382802813
 BoxCollider:
@ -10506,7 +10506,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 33
+  m_RootOrder: 32
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &479940076
 MonoBehaviour:
@ -11197,7 +11197,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 41
+  m_RootOrder: 40
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &526829806
 GameObject:
@ -11228,7 +11228,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 21
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &530412951
 GameObject:
@ -11959,7 +11959,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 26
+  m_RootOrder: 25
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &583497863
 PrefabInstance:
@ -12855,6 +12855,52 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1 &639814359
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 639814361}
+  - component: {fileID: 639814360}
+  m_Layer: 0
+  m_Name: BurstCollisionWorld
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &639814360
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 639814359}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cellSpans:
+    m_AlignBytes: 16
+--- !u!4 &639814361
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 639814359}
+  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: 0}
+  m_RootOrder: 43
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &639843208
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -13067,7 +13113,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 30
+  m_RootOrder: 29
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &673038100
 PrefabInstance:
@ -14280,7 +14326,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 37
+  m_RootOrder: 36
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &702577176
 MonoBehaviour:
@ -14830,7 +14876,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3}
      propertyPath: m_RootOrder
-      value: 21
+      value: 20
      objectReference: {fileID: 0}
    - target: {fileID: 7104765112034956015, guid: 6815aad4cd6cb734a9d63a7210677333, type: 3}
      propertyPath: m_LocalPosition.x
@ -15740,7 +15786,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 32
+  m_RootOrder: 31
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &810501282
 MonoBehaviour:
@ -18236,7 +18282,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 24
+  m_RootOrder: 23
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &996888830
 MonoBehaviour:
@ -22675,7 +22721,7 @@ Transform:
  - {fileID: 496425325}
  - {fileID: 1670656697}
  m_Father: {fileID: 0}
-  m_RootOrder: 38
+  m_RootOrder: 37
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1298227765
 GameObject:
@ -25258,7 +25304,7 @@ Transform:
  - {fileID: 1882199187}
  - {fileID: 119116319}
  m_Father: {fileID: 0}
-  m_RootOrder: 34
+  m_RootOrder: 33
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1453694928
 MeshCollider:
@ -25666,7 +25712,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 31
+  m_RootOrder: 30
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1474431325
 GameObject:
@ -25847,7 +25893,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 29
+  m_RootOrder: 28
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1481704192
 PrefabInstance:
@ -27029,7 +27075,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 35
+  m_RootOrder: 34
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1526740604
 MonoBehaviour:
@ -28909,7 +28955,7 @@ Transform:
  - {fileID: 58543477}
  - {fileID: 712846463}
  m_Father: {fileID: 0}
-  m_RootOrder: 40
+  m_RootOrder: 39
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1670656696
 GameObject:
@ -32374,7 +32420,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 28
+  m_RootOrder: 27
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1912094932
 GameObject:
@ -34392,6 +34438,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: Command_End
      objectReference: {fileID: 0}
+    - target: {fileID: 1986279549173157415, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 1986279549232645831, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
      propertyPath: m_IsActive
      value: 0
@ -34829,7 +34879,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 25
+  m_RootOrder: 24
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &2069562217
 MeshCollider:
@ -41267,7 +41317,7 @@ Transform:
  m_Children:
  - {fileID: 2057924365034160257}
  m_Father: {fileID: 0}
-  m_RootOrder: 39
+  m_RootOrder: 38
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2057924365745864529
 MonoBehaviour:
@ -45147,7 +45197,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3}
      propertyPath: m_RootOrder
-      value: 23
+      value: 22
      objectReference: {fileID: 0}
    - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3}
      propertyPath: m_LocalPosition.x
@ -46590,7 +46640,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4163391439018457500}
-  m_Enabled: 0
+  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 898562fd62122f647a41732624825d58, type: 3}
  m_Name: 
@ -49661,10 +49711,12 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 4a817172e097c9b45abdfeebadcd984f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  godView: {fileID: 0}
+  godView: {fileID: 4163391439018457569}
  playerCameras: []
  currentCameraIndex: -1
  target: []
+  panel1_22: {fileID: 5640692781825168938}
+  panel1_33: {fileID: 5640692781859853966}
 --- !u!224 &5640692781825168937
 RectTransform:
  m_ObjectHideFlags: 0
@ -50108,6 +50160,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  playertarget: []
+  panel1_22: {fileID: 5640692781825168938}
+  panel1_33: {fileID: 5640692781859853966}
 --- !u!224 &5640692781859853965
 RectTransform:
  m_ObjectHideFlags: 0
@ -61092,12 +61146,14 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7408bdf5269d1784085e044facb8c695, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  start: {fileID: 5640692781816547268}
  isReady: 1
  isSatisfy: 1
  isStart: 1
  moveDuration: 2
  scaleDuration: 2
  alertwindow: {fileID: 0}
+  panel1_22: {fileID: 5640692781825168938}
  ishost: 1
  ready: {fileID: 0}
  walkieTalkieIcon: {fileID: 5640692782032870078}
@ -65454,12 +65510,14 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7408bdf5269d1784085e044facb8c695, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  start: {fileID: 0}
  isReady: 0
  isSatisfy: 0
  isStart: 0
  moveDuration: 2
  scaleDuration: 2
  alertwindow: {fileID: 0}
+  panel1_22: {fileID: 0}
  ishost: 0
  ready: {fileID: 0}
  walkieTalkieIcon: {fileID: 0}
--- a/xiaofang/Assets/Scenes/loginscene.unity
+++ b/xiaofang/Assets/Scenes/loginscene.unity
@ -865,6 +865,8 @@ MonoBehaviour:
  js: {fileID: 7695717545649794843}
  isenter: 0
  isadministrator: 0
+  iszongzhihui: 0
+  RoleId: 0
 --- !u!114 &252707977
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/xiaofang/Assets/Script/PlayerTask.cs
+++ b/xiaofang/Assets/Script/PlayerTask.cs
@ -24,8 +24,11 @@ public class PlayerTask : MonoBehaviour
            int id = collider.GetComponent<AreaID>().Id;
            Debug.Log(1111111111111111111);
            Debug.Log(id);
-            TaskPanel.instance.displaytask(id);
-            ZZZPlayer.CSZS.SetPlayerID(id.ToString());
+            //if(TaskPanel.instance.enabled)
+            //{
+            //    TaskPanel.instance.displaytask(id);
+            //}
+            //ZZZPlayer.CSZS.SetPlayerID(id.ToString());
        }
    }

--- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs
+++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
@ -631,11 +631,12 @@ public class Panel : Base
                        {
                            isDutySelected = true;  // Ñ¡ÔñÁËÖ°Ôð
                            isSceneSelected = true;
+                            selectedInfo.scene = "0";
                        }
                        else
                        {
                            isDutySelected = true;
-                            isSceneSelected = false;
+                            isSceneSelected = true;
                        }
                        dutyId = item.dutyId;
                        selectedInfo.duty = duty;
--- a/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs
+++ b/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs
@ -61,7 +61,7 @@ public class DatePanel : MonoBehaviour
        panel.UploadData();
        Debug.LogError("+++++++++");
        createTemplateInterface.createTemplate(dataText.text);
-        SceneManager.LoadScene(4);
+        SceneManager.LoadScene("yhj");
    }

    //ÄŁ°ĺĂć°ĺČˇś¨°´ĹĽ
--- a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs
+++ b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs
@ -45,7 +45,7 @@ public class LoginPanel : Base
            grantType = "password",
            clientId = "e5cd7e4891bf95d1d19206ce24a7b32e",
            userType = "company_user",
-            username = "ZF16c788632",
+            username = "13699802230",
            password = "YYL5371!"
        };
        image.gameObject.SetActive (true);
@ -65,7 +65,7 @@ public class LoginPanel : Base
        
        //如果是管理员账号就跳预定演练
        //if (loginBody.userType == "company_user")
-        if(loginBody.username == id.text && loginBody.password == pwd.text)
+        if(GlobalData.ServerData.data.isCreater=="Y")
        {
            Debug.LogError(11);
            ReadRoom.instance.isadministrator=true;
--- a/xiaofang/Assets/Script/scheduled_excercise/LoadScene.cs
+++ b/xiaofang/Assets/Script/scheduled_excercise/LoadScene.cs
@ -33,6 +33,6 @@ public class LoadScene : MonoBehaviour

    public void OnClickNextBtn()
    {
-        SceneManager.LoadScene(3);
+        SceneManager.LoadScene("Schedule_03");
    }
 }