wulongxiao/_xiaofang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
huyulong 2024-12-28 19:42:00 +08:00
commit 49e2d8f06d
6 changed files with 286 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab
View File

@ -6870,7 +6870,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
m_PresetInfoIsWorld: 0
--- !u!114 &1986279549173157408
MonoBehaviour:
m_ObjectHideFlags: 0
@ -6900,7 +6900,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f09f97107d8fe4b4caf814aaa73212a8, type: 3}
m_Name:
m_EditorClassIdentifier:
Right_Box: {fileID: 0}
Warn_Tip: {fileID: 1986279549438857641}
Right_Situation: {fileID: 1986279549107877099}
DiaLogBox: {fileID: 1986279548675747996}
@ -6927,7 +6926,6 @@ MonoBehaviour:
TP_2: {fileID: 1986279548919470389}
TP_3: {fileID: 1986279548399004370}
TP_4: {fileID: 1986279547719244043}
Intercom: {fileID: 0}
DialogboxSure: {fileID: 1986279548770340787}
Dialogbox2A: {fileID: 1986279549002270256}
Dialogbox2B: {fileID: 1986279548425159737}
@ -6937,7 +6935,6 @@ MonoBehaviour:
Sumbit: {fileID: 1986279548878941220}
Sumbit2: {fileID: 1986279547836566314}
FireButton: {fileID: 3172627824258540492}
Right_BoxButton: {fileID: 0}
Close1: {fileID: 1986279548665939568}
Close2: {fileID: 1986279548236674887}
Close1Panel: {fileID: 1986279548236674885}
@ -6967,13 +6964,6 @@ MonoBehaviour:
NO_Right_MessageText: {fileID: 4400246811722738874}
NO_Student: {fileID: 1986279548664679642}
TimeText: {fileID: 0}
PropText1: {fileID: 0}
PropText2: {fileID: 0}
PropText3: {fileID: 0}
PropText4: {fileID: 0}
PropText5: {fileID: 0}
PropText6: {fileID: 0}
WLYC: {fileID: 0}
TileText: {fileID: 1986279548998433691}
FireText: {fileID: 2761091764751671859}
TipText: {fileID: 219625523}

4
xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
View File

@ -18,6 +18,7 @@ public class ReadRoom : MonoBehaviour
private bool isStartRoom = false;//主持人是否已经点击演练开始
public bool iszongzhihui = false;
public int RoleId;
public loginData playerdetail;
// Start is called before the first frame update
void Start()
{
@ -58,7 +59,8 @@ public class ReadRoom : MonoBehaviour
{
if(GlobalData.ServerData.data.userId==item1.UserId)
{
RoleId= item1.RoleId;
playerdetail = GlobalData.ServerData.data;
RoleId = item1.RoleId;
if(item1.RoleId==8000)//主持人
{
isenter=true;

224
xiaofang/Assets/Scenes/Tmap 1.unity
View File

@ -8385,11 +8385,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2548037664796047208, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3}
m_PrefabInstance: {fileID: 359102599}
m_PrefabAsset: {fileID: 0}
--- !u!1 &368403110 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6187326699852508386, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_PrefabInstance: {fileID: 2044803814}
m_PrefabAsset: {fileID: 0}
--- !u!64 &368610314
MeshCollider:
m_ObjectHideFlags: 0
@ -13800,7 +13795,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3077635299444999931, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3649662722171167503, guid: 940be89243a038b4090a77556e45a06d, type: 3}
propertyPath: m_SizeDelta.y
@ -15215,6 +15210,52 @@ Transform:
m_CorrespondingSourceObject: {fileID: 450550, guid: b4851c0c46e990441a43cf6ae8bd02cf, type: 3}
m_PrefabInstance: {fileID: 785615460}
m_PrefabAsset: {fileID: 0}
--- !u!1 &788190908
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 788190910}
- component: {fileID: 788190909}
m_Layer: 0
m_Name: BurstCollisionWorld
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &788190909
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 788190908}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
m_Name:
m_EditorClassIdentifier:
cellSpans:
m_AlignBytes: 16
--- !u!4 &788190910
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 788190908}
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!1 &790279502
GameObject:
m_ObjectHideFlags: 0
@ -16126,6 +16167,17 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &856100555 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1293464009, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_PrefabInstance: {fileID: 2044803814}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &860755619
PrefabInstance:
m_ObjectHideFlags: 0
@ -18708,6 +18760,7 @@ GameObject:
- component: {fileID: 1039624184}
- component: {fileID: 1039624183}
- component: {fileID: 1039624182}
- component: {fileID: 1039624186}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@ -18813,6 +18866,30 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1039624186
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1039624181}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 13fa0701c49727a4c84282a40243e52d, type: 3}
m_Name:
m_EditorClassIdentifier:
npcJsonFile: {fileID: 4900000, guid: a854e20393334f04a8fc75e06404fe4f, type: 3}
locationJsonFile: {fileID: 4900000, guid: 4d6cd655327e27c4b88c2033169c8fed, type: 3}
eventJsonFile: {fileID: 4900000, guid: 2ef075e4830019a42b84d8d05d13d81c, type: 3}
matialJsonFile: {fileID: 4900000, guid: d98cb351d1a87dc4887a37106b9745d4, type: 3}
sceneJsonFile: {fileID: 4900000, guid: 06c09fd1c8b0a0a45951a1065189d922, type: 3}
incidentSiteJosnFile: {fileID: 4900000, guid: 1efa4372b10d4294199638c49173ff4c, type: 3}
NPCJosnFile: {fileID: 4900000, guid: 41009f009f0718647a782c7e1aec97dd, type: 3}
LanguageJsonFile: {fileID: 4900000, guid: 62a41129c4663ee41a06274114d28feb, type: 3}
SelectJsonFile: {fileID: 4900000, guid: 3efd15f4195557144a45659d2baa1ba3, type: 3}
TaskJsonFile: {fileID: 4900000, guid: 4dec25769ed4ed3469693b1c881248af, type: 3}
GlobalJsonFile: {fileID: 4900000, guid: 27ecc4e37cb448e45a2611c086cdfb90, type: 3}
SelectsJsonFile: {fileID: 4900000, guid: 3efd15f4195557144a45659d2baa1ba3, type: 3}
--- !u!1001 &1039752000
PrefabInstance:
m_ObjectHideFlags: 0
@ -34057,8 +34134,28 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 676728424, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: Bg
value:
objectReference: {fileID: 856100555}
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: Tip_1
value:
objectReference: {fileID: 2044803823}
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: Tip_2
value:
objectReference: {fileID: 2044803822}
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: Tip_3
value:
objectReference: {fileID: 2044803821}
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: Tip_4
value:
objectReference: {fileID: 2044803820}
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: Tip123
value:
@ -34066,11 +34163,27 @@ PrefabInstance:
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: content
value:
objectReference: {fileID: 368403110}
objectReference: {fileID: 2044803818}
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: TimeText
value:
objectReference: {fileID: 2044803819}
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: LeftText1
value:
objectReference: {fileID: 2044803816}
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: RightText1
value:
objectReference: {fileID: 2044803815}
- target: {fileID: 919949400, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: DiaLogBoxTitle
value:
objectReference: {fileID: 2044803817}
- target: {fileID: 948396698034575733, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -34145,7 +34258,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1986279548675747996, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1986279548795827112, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
propertyPath: m_IsActive
@ -34408,6 +34521,99 @@ PrefabInstance:
- {fileID: 1986279549173157408, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
- {fileID: 1986279549173157410, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
--- !u!114 &2044803815 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1986279548187429867, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_PrefabInstance: {fileID: 2044803814}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2044803816 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1986279549557071729, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_PrefabInstance: {fileID: 2044803814}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2044803817 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1986279548242059622, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_PrefabInstance: {fileID: 2044803814}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2044803818 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 915210169, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_PrefabInstance: {fileID: 2044803814}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2044803819 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 219625523, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_PrefabInstance: {fileID: 2044803814}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2044803820 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1986279548508686091, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_PrefabInstance: {fileID: 2044803814}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2044803821 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1986279548059942951, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_PrefabInstance: {fileID: 2044803814}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2044803822 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1986279549135873188, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_PrefabInstance: {fileID: 2044803814}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2044803823 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1986279548902953524, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
m_PrefabInstance: {fileID: 2044803814}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &2047118982
PrefabInstance:
m_ObjectHideFlags: 0

118
xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs
View File

@ -13,10 +13,10 @@ using UnityEngine.UI;
public class ZZUIManager : MonoBehaviour
{
[Header("面板")]
/// <summary>
/// 点击可以弹出右边框
/// </summary>
public GameObject Right_Box;
///// <summary>
///// 点击可以弹出右边框
///// </summary>
//public GameObject Right_Box;
/// <summary>
/// 总指挥框
/// </summary>
@ -106,10 +106,10 @@ public class ZZUIManager : MonoBehaviour
public Button TP_2;
public Button TP_3;
public Button TP_4;
/// <summary>
/// 对讲机
/// </summary>
public Button Intercom;
///// <summary>
///// 对讲机
///// </summary>
//public Button Intercom;
/// <summary>
/// 撤离方案确定
/// </summary>
@ -140,7 +140,7 @@ public class ZZUIManager : MonoBehaviour
/// <summary>
/// 右边的框
/// </summary>
public Button Right_BoxButton;
//public Button Right_BoxButton;
//两个叉叉
public Button Close1;
public Button Close2;
@ -218,19 +218,19 @@ public class ZZUIManager : MonoBehaviour
/// 时间文本
/// </summary>
public Text TimeText;
/// <summary>
/// 道具数量左->右
/// </summary>
public Text PropText1;
public Text PropText2;
public Text PropText3;
public Text PropText4;
public Text PropText5;
public Text PropText6;
///// <summary>
///// 道具数量左->右
///// </summary>
//public Text PropText1;
//public Text PropText2;
//public Text PropText3;
//public Text PropText4;
//public Text PropText5;
//public Text PropText6;
/// <summary>
/// 网络延迟
/// </summary>
public Text WLYC;
//public Text WLYC;
/// <summary>
/// 标题文本
/// </summary>
@ -318,14 +318,14 @@ public class ZZUIManager : MonoBehaviour
public RectTransform panelA;
public float panelAMoveDistance;
public float moveDuration = 0.5f; // 动画持续时间
public RectTransform buttonRect; // 你的按钮 RectTransform
//public RectTransform buttonRect; // 你的按钮 RectTransform
public bool isHidden = true;
public float showPositionX;
public float hidePositionX;
#endregion
//记录
int num = 0;
public Image bg;
// public Image bg;
public bool isFrist=false;
@ -361,16 +361,16 @@ public class ZZUIManager : MonoBehaviour
showPositionX = 1.159973f;
panelAMoveDistance = 382f;
//传呼机
Intercom.onClick.AddListener(() =>
{
// //传呼机
// Intercom.onClick.AddListener(() =>
//{
});
//});
//右边框框弹出来
Right_BoxButton.onClick.AddListener(() =>
{
OnClickHideButton();
});
//Right_BoxButton.onClick.AddListener(() =>
//{
// OnClickHideButton();
//});
#region 地标点击事件(地图那四个点)
TP_1.onClick.AddListener(() =>
@ -606,28 +606,28 @@ public class ZZUIManager : MonoBehaviour
#endregion
//动画部分
public void OnClickHideButton()
{
// 如果按钮已隐藏，点击后显示
if (isHidden)
{
// 恢复按钮到原位置
buttonRect.DOAnchorPosX(showPositionX, moveDuration).SetEase(Ease.InOutCubic);
// 让面板B滑动到显示位置，同时面板A向左移动
panelA.DOAnchorPosX(-panelAMoveDistance, moveDuration).SetEase(Ease.InOutCubic); // 面板A同时移动
bg.transform.Rotate(0, 0, 180f);
isHidden = false; // 更新状态为未隐藏
}
else
{
// 隐藏按钮
// 让面板B滑动到隐藏位置，同时面板A恢复原位
buttonRect.DOAnchorPosX(hidePositionX, moveDuration).SetEase(Ease.InOutCubic);
panelA.DOAnchorPosX(-45f, moveDuration).SetEase(Ease.InOutCubic); // 面板A恢复原位
bg.transform.Rotate(0, 0, 180f);
isHidden = true; // 更新状态为隐藏
}
}
//public void OnClickHideButton()
//{
// // 如果按钮已隐藏，点击后显示
// if (isHidden)
// {
// // 恢复按钮到原位置
// buttonRect.DOAnchorPosX(showPositionX, moveDuration).SetEase(Ease.InOutCubic);
// // 让面板B滑动到显示位置，同时面板A向左移动
// panelA.DOAnchorPosX(-panelAMoveDistance, moveDuration).SetEase(Ease.InOutCubic); // 面板A同时移动
// bg.transform.Rotate(0, 0, 180f);
// isHidden = false; // 更新状态为未隐藏
// }
// else
// {
// // 隐藏按钮
// // 让面板B滑动到隐藏位置，同时面板A恢复原位
// buttonRect.DOAnchorPosX(hidePositionX, moveDuration).SetEase(Ease.InOutCubic);
// panelA.DOAnchorPosX(-45f, moveDuration).SetEase(Ease.InOutCubic); // 面板A恢复原位
// bg.transform.Rotate(0, 0, 180f);
// isHidden = true; // 更新状态为隐藏
// }
//}
/// <summary>
/// 道具需要执行的
/// </summary>
@ -1090,14 +1090,14 @@ public class ZZUIManager : MonoBehaviour
break;
}
}
/// <summary>
/// 修改网络延迟
/// </summary>
/// <param name="str">网络延迟的数字部分</param>
public void FixDelay(string str)
{
WLYC.text = "网络延迟：" + str;
}
///// <summary>
///// 修改网络延迟
///// </summary>
///// <param name="str">网络延迟的数字部分</param>
//public void FixDelay(string str)
//{
// WLYC.text = "网络延迟：" + str;
//}
/// <summary>
/// 修改疏散班级情况
/// </summary>

7
xiaofang/Assets/Script/login/login.cs
View File

@ -9,13 +9,14 @@ public class auth_login
{
//public string clientId = "e5cd7e4891bf95d1d19206ce24a7b32e";
//public string grantType = "password";
public string grantType;
public string clientId;
public string grantType;
public string userType;
public string username;
public string password;
public string phonenumber;
public string smsCode;
//public string phonenumber;
//public string smsCode;
}
//public class auth_createTemplate
//{

10
xiaofang/Assets/Script/loginScripts/LoginPanel.cs
View File

@ -45,10 +45,8 @@ public class LoginPanel : Base
grantType = "password",
clientId = "e5cd7e4891bf95d1d19206ce24a7b32e",
userType = "company_user",
username = " ZF16c788632 ",
password = "YYL5371!",
phonenumber = "",
smsCode = ""
username = "ZF16c788632",
password = "YYL5371!"
};
image.gameObject.SetActive (true);
// ·¢ËÍÇëÇó
@ -71,9 +69,9 @@ public class LoginPanel : Base
{
Debug.LogError(11);
ReadRoom.instance.isadministrator=true;
SceneManager.LoadScene(1);
SceneManager.LoadScene("yhj");
}
else if(id.text == "13699802230" && pwd.text == "ZF16c788632")
else if(id.text == "13699802230" && pwd.text == "YYL5371!")
{
//SceneManager.LoadScene("yhj");