yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1

This commit is contained in:
YangHua 2024-03-12 16:38:42 +08:00
parent bb1dc8f2da
commit 9b90252c37
10 changed files with 976 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Assets/Zion/Scripts/cxx/MyNetMQClient.cs → Assets/MyNetMQClient.cs
View File

0
Assets/Zion/Scripts/cxx/MyNetMQClient.cs.meta → Assets/MyNetMQClient.cs.meta
View File

10
Assets/Resources/UIPanel/View_Panel2.prefab
View File

@ -8532,7 +8532,7 @@ GameObject:
- component: {fileID: 4190038652081818080}
- component: {fileID: 4190038652081818081}
m_Layer: 5
m_Name: Text
m_Name: Title
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -8554,8 +8554,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 70, y: -20}
m_SizeDelta: {x: 360, y: 120}
m_AnchoredPosition: {x: 290.0002, y: -20}
m_SizeDelta: {x: 1826.6891, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4190038652081818080
CanvasRenderer:
@ -8591,7 +8591,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 90
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@ -11192,7 +11192,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4190038652633744906
RectTransform:
m_ObjectHideFlags: 0

76
Assets/Temp/Scripts/View_Panel2.cs
View File

@ -90,7 +90,12 @@ public class View_Panel2 : XUIPanel
public Button entering_key_btn;//进入导调按钮
public Button scenario_btn;//想定编辑
public Button refresh_btn;//刷新房间按钮
/// <summary>
/// 房间科目标题
/// </summary>
public Text roomSubjectTitle;
public View_Panel2() : base(UIType.Normal, UIMode.HideOther, UICollider.Normal)
{
uiPath = "UIPanel/View_Panel2";
@ -100,7 +105,6 @@ public class View_Panel2 : XUIPanel
roomModelDropdown = this.transform.Find("append_room_panl/roomModelDropdown").GetComponent<Dropdown>();
thinkingDropdown = this.transform.Find("append_room_panl/thinkingDropdown").GetComponent<Dropdown>();
refresh_btn = this.transform.Find("UPBG/Refresh_btn").GetComponent<Button>();
append_room_panl = GameObject.Find("View_Panel2(Clone)").transform.GetChild(2).GetComponent<Image>();
Fork_off_btn = GameObject.Find("View_Panel2(Clone)").transform.GetChild(2).transform.GetChild(1).GetComponent<Button>();
room_input = GameObject.Find("View_Panel2(Clone)").transform.GetChild(2).transform.GetChild(3).GetComponent<InputField>();
@ -116,6 +120,7 @@ public class View_Panel2 : XUIPanel
//Storm_and_capture_panl
Storm_and_capture_panl = this.transform.Find("Storm_and_capture_panl").gameObject;
roomSubjectTitle = Storm_and_capture_panl.transform.Find("red_green_iamg/Title").GetComponent<Text>();
submitView = Storm_and_capture_panl.transform.Find("SubmitView").gameObject;
submitInstruct = submitView.transform.Find("Bg/Instruct").GetComponent<Text>();
svSubmitBtn = submitView.transform.Find("SubmitBtn").GetComponent<Button>();
@ -157,7 +162,7 @@ public class View_Panel2 : XUIPanel
userItem = userConent.GetChild(0).gameObject;
thinkingDropdown.options.Clear();
tijiao_btn.onClick.AddListener(() =>
{
if (!string.IsNullOrEmpty(currentAccount))
@ -265,17 +270,20 @@ public class View_Panel2 : XUIPanel
MyNetMQClient.instance._netMqListener.SubTopic(GlobalFlag.roomID);
if (GlobalFlag.field_Char1 == "学校")
{
SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 1");
SceneLoad.Instance.SceneChange("AdamTraining_pilot_terminal_panl 1");
//SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 1");
//CoroutineHandler.StartCoroutine(Loadscene());
//View_Panel2Attatch.view_Panel2Attatch.StartCoroutine(View_Panel2Attatch.view_Panel2Attatch.Loadscene("AdamTraining_pilot_terminal_panl 1"));
}
else if(GlobalFlag.field_Char1 == "山地")
else if (GlobalFlag.field_Char1 == "山地")
{
SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 3");
SceneLoad.Instance.SceneChange("AdamTraining_pilot_terminal_panl 3");
//SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 3");
//View_Panel2Attatch.view_Panel2Attatch.StartCoroutine(View_Panel2Attatch.view_Panel2Attatch.Loadscene("AdamTraining_pilot_terminal_panl 3"));
}
}
public async void GetAllRoomData()
{
@ -299,6 +307,7 @@ public class View_Panel2 : XUIPanel
public List<GameObject> currentAllAccount = new List<GameObject>();
public void CreateAllUser(List<DataItem> userInfo)
{
currentAccount = "";
if (userConent.childCount > 1)
{
for (int i = 1; i < userConent.childCount; i++)
@ -333,6 +342,10 @@ public class View_Panel2 : XUIPanel
currentAllAccount.Add(obj);
}
}
/// <summary>
/// 移除已经被分配的账号信息，在选择页面不显示已经被分配过的学员
/// </summary>
public void EliminateAccount()
{
if (currentEditorAccounts.Count > 0 && currentAllAccount.Count > 0)
@ -349,12 +362,26 @@ public class View_Panel2 : XUIPanel
}
}
}
/// <summary>
/// 取消分配
/// </summary>
public void DeleteAssignedAccount(string subjectID,string seatID)
{
for (int i = 0; i < currentEditorAccounts.Count; i++)
{
if(currentEditorAccounts[i].subjectID.Equals(subjectID)&& currentEditorAccounts[i].SeatID.Equals(seatID))
{
currentEditorAccounts.Remove(currentEditorAccounts[i]);
}
}
}
/// <summary>
/// 席位分配提交按钮
/// 选择人员界面提交按钮
/// </summary>
public void TiJiaoBtn()
{
if (string.IsNullOrEmpty(currentAccount) || currentAccount == "") return;
CurrentEditorAccount ced = new CurrentEditorAccount();
if (currentEditorAccounts.Count > 0)
{
@ -452,7 +479,7 @@ public class View_Panel2 : XUIPanel
}
}
/// <summary>
/// 新建房间 想定编辑里的科目信息
/// 新建房间 想定编辑里的科目信息 席位分配界面
/// </summary>
/// <param name="indexI"></param>
/// <param name="indexJ"></param>
@ -477,6 +504,13 @@ public class View_Panel2 : XUIPanel
EliminateAccount();
//Debug.Log($"currentSubjectID+currentSeatID={ currentSubjectID }={currentSeatID}");
});
seatTemp.transform.GetChild(4).GetComponent<Button>().onClick.AddListener(() =>
{
if (seatTemp.transform.GetChild(2).GetComponent<Text>().text == "xxxx") return;
DeleteAssignedAccount(subjectName, seatTemp.name);
seatTemp.transform.GetChild(2).GetComponent<Text>().text = "xxxx";
Debug.Log("删除分配信息");
});
if (GlobalFlag.currentUser.role_code.Equals("04") || GlobalFlag.currentUser.role_code.Equals("05") || GlobalFlag.currentUser.role_code.Equals("02"))
{
seatTemp.transform.GetChild(3).GetComponent<Button>().interactable = false;
@ -571,7 +605,7 @@ public class View_Panel2 : XUIPanel
//Debug.Log(" roomItem.nameID==" + roomItem.name);
CreateSubjectItem(currentRoomData.data);
});
roomItem.transform.Find("close_btn").GetComponent<Button>().onClick.AddListener(async () =>
{
string url = Url_Practice + roomItem.name;
@ -604,9 +638,11 @@ public class View_Panel2 : XUIPanel
GameObject subjectTemp = GameObject.Instantiate(currentRoomSubjectItem, currentRoomSubjectItemConnect);
subjectTemp.SetActive(true);
subjectTemp.name = di[index].Id;
subjectTemp.transform.GetChild(0).GetComponent<Text>().text = di[index].Name;
string roomSubjectTitleTemp = di[index].Name;
subjectTemp.transform.GetChild(0).GetComponent<Text>().text = roomSubjectTitleTemp;
subjectTemp.GetComponent<Button>().onClick.AddListener(async () =>
{
roomSubjectTitle.text = roomSubjectTitleTemp;
currentDIPracticeID = di[index].PracticeId;
currentDISubjectID = subjectTemp.name;
GlobalFlag.practiceSubjectID = subjectTemp.name;
@ -614,11 +650,19 @@ public class View_Panel2 : XUIPanel
CreateSubjectInfo(currentSubjectInfo.data);
});
}
UIBootstrap.Instance.WaitForT(WaitSubjectItemClick);
}
/// <summary>
/// 刷新科目列表里面的席位信息
/// </summary>
private void WaitSubjectItemClick()
{
if (currentRoomSubjectItemConnect.childCount > 1)
{
currentRoomSubjectItemConnect.GetChild(1).GetComponent<Button>().onClick.Invoke();
}
}
/// <summary>
/// 删除科目席位信息
/// </summary>
@ -776,14 +820,14 @@ public class View_Panel2 : XUIPanel
/// <summary>
/// 分配面板提交按钮和取消人员选择按钮
/// 席位分配面板提交按钮和取消人员选择按钮
/// </summary>
private void Submit()
{
seatSubmit_btn.onClick.AddListener(() =>
{
//UIBootstrap.Instance.CheckShowLoad(WaitShow);
WaitShow();
//UIBootstrap.Instance.CheckShowLoad(WaitShow);
WaitShow();
});
@ -793,7 +837,7 @@ public class View_Panel2 : XUIPanel
});
quxiao_btn.onClick.AddListener(() =>
{
selector_panl.gameObject.SetActive(false);
selector_panl.gameObject.SetActive(false);
});
}
@ -802,6 +846,7 @@ public class View_Panel2 : XUIPanel
append_room_panl.gameObject.SetActive(false);
distribution_panl.gameObject.SetActive(false);
selector_panl.gameObject.SetActive(false);
string accountInfo = AccountsInfo();
ReturnRoomID returnRoomId = await AsyncWebReq.Post<ReturnRoomID>(Url_GetRoomID + currentRoomName + "&MissionModel=" + currentMissionModel + "&ThinkingId=" + currentThinkingId + "&AccountsInfo=" + accountInfo, null);
if (returnRoomId.state)
@ -841,7 +886,6 @@ public class View_Panel2 : XUIPanel
/// </summary>
private void Verify()
{
verify_btn.onClick.AddListener(() =>
{
if (room_input.text.Length >= 1)

798
Assets/Zion/Scenes/InitConnect.unity
View File

@ -121,6 +121,709 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &85974794
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 85974795}
- component: {fileID: 85974798}
- component: {fileID: 85974797}
- component: {fileID: 85974796}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &85974795
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 85974794}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 149301707}
m_Father: {fileID: 2132962759}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &85974796
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 85974794}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &85974797
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 85974794}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!223 &85974798
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 85974794}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 1
m_TargetDisplay: 0
--- !u!1 &116028118
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 116028121}
- component: {fileID: 116028120}
- component: {fileID: 116028119}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &116028119
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 116028118}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &116028120
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 116028118}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &116028121
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 116028118}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &149301706
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 149301707}
- component: {fileID: 149301709}
- component: {fileID: 149301708}
m_Layer: 5
m_Name: Loading
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &149301707
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 149301706}
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_Children:
- {fileID: 465747419}
- {fileID: 410444153}
- {fileID: 1964622720}
m_Father: {fileID: 85974795}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &149301708
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 149301706}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &149301709
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 149301706}
m_CullTransparentMesh: 0
--- !u!1 &167638289
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 167638290}
m_Layer: 5
m_Name: Handle Slide Area
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &167638290
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 167638289}
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_Children:
- {fileID: 646515539}
m_Father: {fileID: 410444153}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &290447744
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 290447745}
- component: {fileID: 290447747}
- component: {fileID: 290447746}
m_Layer: 5
m_Name: Fill
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &290447745
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 290447744}
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_Children: []
m_Father: {fileID: 1677491652}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &290447746
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 290447744}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 861567dd56208804eb21fbb68e50e1e1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &290447747
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 290447744}
m_CullTransparentMesh: 0
--- !u!1 &410444152
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 410444153}
- component: {fileID: 410444154}
m_Layer: 5
m_Name: Slider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &410444153
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410444152}
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_Children:
- {fileID: 1736219615}
- {fileID: 1677491652}
- {fileID: 167638290}
m_Father: {fileID: 149301707}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 40}
m_SizeDelta: {x: 0, y: 41}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &410444154
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410444152}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 646515540}
m_FillRect: {fileID: 290447745}
m_HandleRect: {fileID: 646515539}
m_Direction: 0
m_MinValue: 0
m_MaxValue: 1
m_WholeNumbers: 0
m_Value: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &465747418
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 465747419}
- component: {fileID: 465747421}
- component: {fileID: 465747420}
m_Layer: 5
m_Name: loadinfo
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &465747419
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 465747418}
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_Children: []
m_Father: {fileID: 149301707}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 70}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &465747420
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 465747418}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: New Text
--- !u!222 &465747421
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 465747418}
m_CullTransparentMesh: 0
--- !u!1 &646515538
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 646515539}
- component: {fileID: 646515541}
- component: {fileID: 646515540}
m_Layer: 5
m_Name: Handle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &646515539
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 646515538}
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_Children: []
m_Father: {fileID: 167638290}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &646515540
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 646515538}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &646515541
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 646515538}
m_CullTransparentMesh: 0
--- !u!1 &1677491651
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1677491652}
m_Layer: 5
m_Name: Fill Area
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1677491652
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1677491651}
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_Children:
- {fileID: 290447745}
m_Father: {fileID: 410444153}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75}
m_AnchoredPosition: {x: -5, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1736219614
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1736219615}
- component: {fileID: 1736219617}
- component: {fileID: 1736219616}
m_Layer: 5
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1736219615
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1736219614}
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_Children: []
m_Father: {fileID: 410444153}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1736219616
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1736219614}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 63fe8d95300f3b44c94f2227dba6121a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1736219617
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1736219614}
m_CullTransparentMesh: 0
--- !u!1 &1939994037
GameObject:
m_ObjectHideFlags: 0
@ -131,6 +834,7 @@ GameObject:
m_Component:
- component: {fileID: 1939994038}
- component: {fileID: 1939994039}
- component: {fileID: 1939994040}
m_Layer: 0
m_Name: UIBootstrap
m_TagString: Untagged
@ -214,6 +918,99 @@ MonoBehaviour:
type: 3}
go: {fileID: 0}
loadTem: {fileID: 0}
--- !u!114 &1939994040
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1939994037}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 665b7e661b53d5443a1cebf90fe0af13, type: 3}
m_Name:
m_EditorClassIdentifier:
loadingPanel: {fileID: 85974794}
loadSlider: {fileID: 410444154}
loadingInfoText: {fileID: 465747420}
--- !u!1 &1964622719
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1964622720}
- component: {fileID: 1964622722}
- component: {fileID: 1964622721}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1964622720
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1964622719}
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_Children: []
m_Father: {fileID: 149301707}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1964622721
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1964622719}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u52A0\u8F7D\u4E2D"
--- !u!222 &1964622722
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1964622719}
m_CullTransparentMesh: 0
--- !u!1 &2132962757
GameObject:
m_ObjectHideFlags: 0
@ -260,6 +1057,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1939994038}
- {fileID: 85974795}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

27
Assets/Zion/Scripts/Adam/Components/RawImageMoveAttach.cs Normal file
View File

@ -0,0 +1,27 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.EventSystems;
public class RawImageMoveAttach : MonoBehaviour, IBeginDragHandler,IDragHandler
{
public UnityAction<float> onMoveX;
public UnityAction<float> onMoveY;
public void OnBeginDrag(PointerEventData eventData)
{
}
public void OnDrag(PointerEventData eventData)
{
Vector3 mousePosition = Input.mousePosition;
Vector2 pos2 = Camera.main.WorldToViewportPoint(eventData.position);
onMoveX.Invoke(eventData.position.x);
onMoveY.Invoke(eventData.position.y);
}
}

11
Assets/Zion/Scripts/Adam/Components/RawImageMoveAttach.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d91c671d9cfde7240a1903e5bfb1d797
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

49
Assets/Zion/Scripts/Adam/Components/SceneLoad.cs Normal file
View File

@ -0,0 +1,49 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class SceneLoad : MonoSingleton<SceneLoad>
{
public GameObject loadingPanel;
public Slider loadSlider;
public Text loadingInfoText;
private void Start()
{
loadingPanel.SetActive(false);
}
public void SceneChange(string Scenename)
{
Debug.Log("Scenename---" + Scenename);
StartCoroutine(LoadScene(Scenename));
}
private IEnumerator LoadScene(string loadSceneName)
//ÉèÖÃЭ³ÌÀàÐÍ·½·¨loadlevel
{
loadingInfoText.text = "0%";
loadSlider.value = 0;
loadingPanel.SetActive(true);
AsyncOperation operation = SceneManager.LoadSceneAsync(loadSceneName);
operation.allowSceneActivation = false;
while (!operation.isDone)
{
loadSlider.value = operation.progress;
loadingInfoText.text = operation.progress + "%";
Debug.Log(operation.progress);
if (operation.progress >= 0.9f)
{
loadSlider.value = 1;
loadingInfoText.text = "100%";
operation.allowSceneActivation = true;
}
yield return null;
}
loadingPanel.SetActive(false);
}
}

11
Assets/Zion/Scripts/Adam/Components/SceneLoad.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 665b7e661b53d5443a1cebf90fe0af13
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

16
Assets/Zion/Scripts/Adam/UIBootstrap.cs
View File

@ -128,7 +128,8 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
public void OnLeaveRoomInfo(string msg)
{
_ = AdamSync.SyncCreateRoom.SendMessageAsync($"send2world {GlobalFlag.currentUser.user_id}");
SceneManager.LoadScene("SampleScene");
SceneLoad.Instance.SceneChange("SampleScene");
//SceneManager.LoadScene("SampleScene");
}
/// <summary>
@ -166,6 +167,19 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
AdamSync.SyncCreateRoom.leaveRoomRequset -= OnLeaveRoomInfo;
}
public void WaitForT(UnityAction callback)
{
StopCoroutine(WaitExecution(callback));
StartCoroutine(WaitExecution(callback));
}
private IEnumerator WaitExecution(UnityAction callback)
{
yield return new WaitForSeconds(0.1f);
callback?.Invoke();
}
public void OnLogout()
{
Dictionary<string, string> replaceInfoDic = new Dictionary<string, string>();