替换验电笔交互方式
|
|
@ -19685,6 +19685,7 @@ RectTransform:
|
||||||
- {fileID: 277472811}
|
- {fileID: 277472811}
|
||||||
- {fileID: 449920028}
|
- {fileID: 449920028}
|
||||||
- {fileID: 380589294}
|
- {fileID: 380589294}
|
||||||
|
- {fileID: 2080988330}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -19799,6 +19800,7 @@ MonoBehaviour:
|
||||||
currentTool: {fileID: 0}
|
currentTool: {fileID: 0}
|
||||||
ServerRecorderPanel: {fileID: 1102537591}
|
ServerRecorderPanel: {fileID: 1102537591}
|
||||||
toolParentItemPrefab: {fileID: 4415812133440552264, guid: 1af794b749529df41969870b82801ed8, type: 3}
|
toolParentItemPrefab: {fileID: 4415812133440552264, guid: 1af794b749529df41969870b82801ed8, type: 3}
|
||||||
|
ladderTips: {fileID: 2080988329}
|
||||||
toolParentItems: []
|
toolParentItems: []
|
||||||
smallToolBarParent: {fileID: 38503289}
|
smallToolBarParent: {fileID: 38503289}
|
||||||
--- !u!114 &1067605744
|
--- !u!114 &1067605744
|
||||||
|
|
@ -20184,6 +20186,86 @@ MonoBehaviour:
|
||||||
index: 0
|
index: 0
|
||||||
imageCount: 0
|
imageCount: 0
|
||||||
texturesTips: []
|
texturesTips: []
|
||||||
|
--- !u!1 &1087231020
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1087231021}
|
||||||
|
- component: {fileID: 1087231023}
|
||||||
|
- component: {fileID: 1087231022}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text (Legacy)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1087231021
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1087231020}
|
||||||
|
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: 2080988330}
|
||||||
|
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 &1087231022
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1087231020}
|
||||||
|
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: 0.06666667, g: 0.31764707, b: 0.6, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: 35c12ded57fcce948a60630957cccd15, type: 3}
|
||||||
|
m_FontSize: 20
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 2
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: "\u8BE5\u573A\u666F\u4E0D\u9700\u8981\u4F7F\u7528\u68AF\u5B50"
|
||||||
|
--- !u!222 &1087231023
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1087231020}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &1091536119
|
--- !u!1 &1091536119
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -39772,6 +39854,105 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2078711470}
|
m_GameObject: {fileID: 2078711470}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!1 &2080988329
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2080988330}
|
||||||
|
- component: {fileID: 2080988333}
|
||||||
|
- component: {fileID: 2080988332}
|
||||||
|
- component: {fileID: 2080988331}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: NoLadder
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2080988330
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2080988329}
|
||||||
|
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:
|
||||||
|
- {fileID: 1087231021}
|
||||||
|
m_Father: {fileID: 1067605740}
|
||||||
|
m_RootOrder: 13
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: -100}
|
||||||
|
m_SizeDelta: {x: 300, y: 52}
|
||||||
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
|
--- !u!114 &2080988331
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2080988329}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 0cf490905ba794f4c942e7582a646ac4, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
id: 2
|
||||||
|
CompletedorNot: 0
|
||||||
|
Erroritem: 0
|
||||||
|
scorercontinuer: 3
|
||||||
|
name:
|
||||||
|
orderName: "\u670D\u52A1\u8BB0\u5F55\u4EEA"
|
||||||
|
Enable: 0
|
||||||
|
stepName:
|
||||||
|
isOnce: 1
|
||||||
|
--- !u!114 &2080988332
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2080988329}
|
||||||
|
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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 283728f865ba6a24995bdbf79bc7b6d6, 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 &2080988333
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2080988329}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &2086496746
|
--- !u!1 &2086496746
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -113,4 +113,5 @@ public class GlobalFlag
|
||||||
/// 当前加载进入的场景
|
/// 当前加载进入的场景
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string currentLoadSceneName;
|
public static string currentLoadSceneName;
|
||||||
|
public static string ipAdress;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ namespace Adam
|
||||||
SceneLoad.Instance.MaskLoadInfoPanel();
|
SceneLoad.Instance.MaskLoadInfoPanel();
|
||||||
//ExamusersController.Instance.Init();
|
//ExamusersController.Instance.Init();
|
||||||
string sceneInfo = userID.text;
|
string sceneInfo = userID.text;
|
||||||
|
UIManager.Instance.toolsItemManager.ResetState(false);
|
||||||
SwitchPanel();
|
SwitchPanel();
|
||||||
UIManager.Instance.backToToolBtn.gameObject.SetActive(true);
|
UIManager.Instance.backToToolBtn.gameObject.SetActive(true);
|
||||||
UIManager.Instance.threeDTip.transform.parent.gameObject.SetActive(false);
|
UIManager.Instance.threeDTip.transform.parent.gameObject.SetActive(false);
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ public class LoginController : MonoBehaviour
|
||||||
// Use this for initialization
|
// Use this for initialization
|
||||||
public void Start()
|
public void Start()
|
||||||
{
|
{
|
||||||
|
WebIPAdress.Instance.OnInit();
|
||||||
UIManager.Instance.Init(GlobalFlag.examId, GlobalFlag.currentSceneName);
|
UIManager.Instance.Init(GlobalFlag.examId, GlobalFlag.currentSceneName);
|
||||||
FileUtil.WriteToLocal("1", "start.ini");
|
FileUtil.WriteToLocal("1", "start.ini");
|
||||||
//var res = await AsyncWebReq.Get<LineLossData>(url);
|
//var res = await AsyncWebReq.Get<LineLossData>(url);
|
||||||
|
|
@ -76,6 +77,7 @@ public class LoginController : MonoBehaviour
|
||||||
GlobalFlag.classId = int.Parse(data[7]);
|
GlobalFlag.classId = int.Parse(data[7]);
|
||||||
GlobalFlag.examinationRoom = int.Parse(data[8]);
|
GlobalFlag.examinationRoom = int.Parse(data[8]);
|
||||||
UIManager.Instance.timers.SetTime(int.Parse(data[6]));
|
UIManager.Instance.timers.SetTime(int.Parse(data[6]));
|
||||||
|
GlobalFlag.ipAdress = data[9];
|
||||||
//foreach (var item in data)
|
//foreach (var item in data)
|
||||||
//{
|
//{
|
||||||
// Debug.Log(item);
|
// Debug.Log(item);
|
||||||
|
|
@ -152,7 +154,7 @@ public class LoginController : MonoBehaviour
|
||||||
errorInfo.text = "";
|
errorInfo.text = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
|
||||||
public GameObject currentTool;
|
public GameObject currentTool;
|
||||||
public GameObject ServerRecorderPanel;
|
public GameObject ServerRecorderPanel;
|
||||||
public ToolParentItem toolParentItemPrefab;
|
public ToolParentItem toolParentItemPrefab;
|
||||||
|
public GameObject ladderTips;
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -40,6 +41,7 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
|
||||||
});
|
});
|
||||||
recoverBtn.gameObject.SetActive(false);
|
recoverBtn.gameObject.SetActive(false);
|
||||||
ServerRecorderPanel.SetActive(false);
|
ServerRecorderPanel.SetActive(false);
|
||||||
|
ladderTips.SetActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SwictchToolPanel(bool isActive)
|
public void SwictchToolPanel(bool isActive)
|
||||||
|
|
@ -55,29 +57,6 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
|
||||||
public void CreatToolItem(GameObject currentModel, Vector3 pos, Vector3 RotPos)
|
public void CreatToolItem(GameObject currentModel, Vector3 pos, Vector3 RotPos)
|
||||||
{
|
{
|
||||||
|
|
||||||
//bool isHave = false;
|
|
||||||
//if (!currentModel.name.Contains("钳形电流表"))
|
|
||||||
//{
|
|
||||||
// for (int i = 0; i < toolItems.Count; i++)
|
|
||||||
// {
|
|
||||||
// string nameTemp;
|
|
||||||
// if (currentModel.name.Contains("_"))
|
|
||||||
// {
|
|
||||||
// nameTemp = currentModel.name.Split("_")[0];
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// {
|
|
||||||
// nameTemp = currentModel.name;
|
|
||||||
// }
|
|
||||||
// if (toolItems[i] != null && toolItems[i].toolName.Contains(nameTemp))
|
|
||||||
// {
|
|
||||||
// toolItems[i].SetCount();
|
|
||||||
// isHave = true;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
|
|
||||||
//if (isHave) return;
|
|
||||||
ToolItem tTemp = Instantiate(toolItemPrefab, toolsContent);
|
ToolItem tTemp = Instantiate(toolItemPrefab, toolsContent);
|
||||||
tTemp.SetValue(currentModel.name, currentModel.transform, pos, RotPos);
|
tTemp.SetValue(currentModel.name, currentModel.transform, pos, RotPos);
|
||||||
tTemp.SetState(true);
|
tTemp.SetState(true);
|
||||||
|
|
@ -86,6 +65,7 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
|
||||||
tTemp.selfButton.interactable = true;
|
tTemp.selfButton.interactable = true;
|
||||||
tTemp.selfButton.onClick.AddListener(() =>
|
tTemp.selfButton.onClick.AddListener(() =>
|
||||||
{
|
{
|
||||||
|
|
||||||
UIManager.Instance.jobCardController.jobCardPanel.SetActive(true);
|
UIManager.Instance.jobCardController.jobCardPanel.SetActive(true);
|
||||||
SetToggleState();
|
SetToggleState();
|
||||||
UIManager.Instance.bottomCotroller.SwitchFirstPerson(false);
|
UIManager.Instance.bottomCotroller.SwitchFirstPerson(false);
|
||||||
|
|
@ -109,6 +89,12 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
|
||||||
GameManager.Instance.ladderCtr.SwitchLadder(tTemp.toolName);
|
GameManager.Instance.ladderCtr.SwitchLadder(tTemp.toolName);
|
||||||
UIManager.Instance.bottomCotroller.updownLadder.gameObject.SetActive(true);
|
UIManager.Instance.bottomCotroller.updownLadder.gameObject.SetActive(true);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
StopCoroutine(WaitShowLadderTips());
|
||||||
|
StartCoroutine(WaitShowLadderTips());
|
||||||
|
}
|
||||||
|
CloseAllSmallToolBar();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -119,6 +105,7 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
|
||||||
recoverBtn.gameObject.SetActive(true);
|
recoverBtn.gameObject.SetActive(true);
|
||||||
bottomToolToggle.interactable = false;
|
bottomToolToggle.interactable = false;
|
||||||
SetToggleState();
|
SetToggleState();
|
||||||
|
CloseAllSmallToolBar();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
toolItems.Add(tTemp);
|
toolItems.Add(tTemp);
|
||||||
|
|
@ -219,7 +206,7 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
|
||||||
mergedItemsHave[tempName].Remove(value);
|
mergedItemsHave[tempName].Remove(value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mergedItemsHave[tempName].Count < 1)
|
if (mergedItemsHave[tempName].Count < 1)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < toolParentItems.Count; i++)
|
for (int i = 0; i < toolParentItems.Count; i++)
|
||||||
|
|
@ -304,12 +291,27 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
|
||||||
toolParentItems[i].gameObject.SetActive(false);
|
toolParentItems[i].gameObject.SetActive(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
public void ResetState()
|
/// 关闭所有合并文件夹中得smallToolbar
|
||||||
|
/// </summary>
|
||||||
|
public void CloseAllSmallToolBar()
|
||||||
|
{
|
||||||
|
for (int i = 0; i < toolParentItems.Count; i++)
|
||||||
|
{
|
||||||
|
if (toolParentItems[i] != null)
|
||||||
|
toolParentItems[i].smallToolBar.gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 在工具间- true,不在工具间 - false
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="isNotInToolRoom"></param>
|
||||||
|
public void ResetState(bool isNotInToolRoom)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < toolItems.Count; i++)
|
for (int i = 0; i < toolItems.Count; i++)
|
||||||
{
|
{
|
||||||
toolItems[i].SetState(true);
|
if (toolItems[i] != null)
|
||||||
|
toolItems[i].SetState(isNotInToolRoom);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -321,4 +323,11 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
|
||||||
FractionManager.Instance.CheckCallCustomOpenServer(true);
|
FractionManager.Instance.CheckCallCustomOpenServer(true);
|
||||||
ServerRecorderPanel.gameObject.SetActive(false);
|
ServerRecorderPanel.gameObject.SetActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public IEnumerator WaitShowLadderTips()
|
||||||
|
{
|
||||||
|
ladderTips.gameObject.SetActive(true);
|
||||||
|
yield return new WaitForSeconds(2f);
|
||||||
|
ladderTips.gameObject.SetActive(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ public class UIManager : MonoSingleton<UIManager>
|
||||||
bottomCotroller.functionBtn.isOn = false;
|
bottomCotroller.functionBtn.isOn = false;
|
||||||
bottomCotroller.systemBtn.isOn = false;
|
bottomCotroller.systemBtn.isOn = false;
|
||||||
toolsItemManager.recoverEvent.RemoveAllListeners();
|
toolsItemManager.recoverEvent.RemoveAllListeners();
|
||||||
toolsItemManager.ResetState();
|
toolsItemManager.ResetState(true);
|
||||||
if (toolsItemManager.recoverBtn.gameObject.activeSelf)
|
if (toolsItemManager.recoverBtn.gameObject.activeSelf)
|
||||||
{
|
{
|
||||||
toolsItemManager.recoverBtn.onClick?.Invoke();
|
toolsItemManager.recoverBtn.onClick?.Invoke();
|
||||||
|
|
|
||||||
|
|
@ -20,14 +20,14 @@ namespace Adam
|
||||||
public string[] _allLine;
|
public string[] _allLine;
|
||||||
|
|
||||||
// Use this for initialization
|
// Use this for initialization
|
||||||
private void Awake()
|
public void OnInit()
|
||||||
{
|
{
|
||||||
_allLine = FileUtil.ReadAllLineFromLocal("端口配置.txt");
|
_allLine = FileUtil.ReadAllLineFromLocal("端口配置.txt");
|
||||||
|
|
||||||
for (int i = 0; i < _allLine.Length; i++)
|
for (int i = 0; i < _allLine.Length; i++)
|
||||||
{
|
{
|
||||||
string[] info = ToolUtility.GetInfos(_allLine[i], ',');
|
string[] info = ToolUtility.GetInfos(_allLine[i], ',');
|
||||||
dicAdresses.Add(info[0], info[1]);
|
dicAdresses.Add(info[0], GlobalFlag.ipAdress + info[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -77,5 +77,5 @@ Material:
|
||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 1.5215687, b: 1.7411765, a: 1}
|
- _EmissionColor: {r: 2.3246074, g: 0.05263255, b: 0.05263255, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,8 @@ public class TestPenInteractive : MonoBehaviour
|
||||||
public GameObject g1;
|
public GameObject g1;
|
||||||
public bool isDian;
|
public bool isDian;
|
||||||
List<door_control> list = new List<door_control>();
|
List<door_control> list = new List<door_control>();
|
||||||
|
public bool isOver = false;
|
||||||
|
public bool isDown = true;
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
if (transform.GetComponent<ToolModelClick>())
|
if (transform.GetComponent<ToolModelClick>())
|
||||||
|
|
@ -19,53 +21,80 @@ public class TestPenInteractive : MonoBehaviour
|
||||||
}
|
}
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
if (Input.GetMouseButton(0))
|
if (Input.GetMouseButtonDown(0))
|
||||||
{
|
{
|
||||||
//1.参数ray 为射线碰撞检测的光线(返回一个从相机到屏幕鼠标位置的光线)
|
if (isDown)
|
||||||
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
|
|
||||||
RaycastHit hit;
|
|
||||||
if (Physics.Raycast(ray, out hit, 100)) //如果碰撞检测到物体
|
|
||||||
{
|
{
|
||||||
if (hit.collider.transform.tag.Equals("YanDian"))
|
//1.参数ray 为射线碰撞检测的光线(返回一个从相机到屏幕鼠标位置的光线)
|
||||||
|
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
|
||||||
|
RaycastHit hit;
|
||||||
|
if (Physics.Raycast(ray, out hit, 100)) //如果碰撞检测到物体
|
||||||
{
|
{
|
||||||
transform.parent = hit.collider.transform;
|
if (hit.collider.transform.tag.Equals("YanDian"))
|
||||||
transform.position = hit.point;
|
|
||||||
if (hit.transform.GetComponent<door_control>())
|
|
||||||
{
|
{
|
||||||
list.Add(hit.transform.GetComponent<door_control>());
|
//transform.parent = hit.collider.transform;
|
||||||
FractionManager.Instance.isYanDian = true;
|
PenMove(hit.point);
|
||||||
hit.transform.GetComponent<door_control>().启用交互 = false;
|
isOver = false;
|
||||||
}
|
//transform.position = hit.point;
|
||||||
if (hit.transform.GetComponent<TestPenInteractiveSon>())
|
if (hit.transform.GetComponent<door_control>())
|
||||||
{
|
|
||||||
if (hit.transform.GetComponent<TestPenInteractiveSon>().isDian)
|
|
||||||
{
|
{
|
||||||
g1.SetActive(true);
|
list.Add(hit.transform.GetComponent<door_control>());
|
||||||
|
FractionManager.Instance.isYanDian = true;
|
||||||
|
hit.transform.GetComponent<door_control>().启用交互 = false;
|
||||||
}
|
}
|
||||||
else
|
if (hit.transform.GetComponent<TestPenInteractiveSon>())
|
||||||
{
|
{
|
||||||
g1.SetActive(false);
|
if (hit.transform.GetComponent<TestPenInteractiveSon>().isDian)
|
||||||
|
{
|
||||||
|
g1.SetActive(true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
g1.SetActive(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
isDown = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
g1.SetActive(false);
|
if (isOver)
|
||||||
transform.parent = GameManager.Instance.Player.transform;
|
{
|
||||||
transform.localPosition = new Vector3(0.307f, 0.504f, 0.654f);
|
g1.SetActive(false);
|
||||||
transform.localEulerAngles = new Vector3(-180, -180, 180);
|
transform.parent = GameManager.Instance.Player.transform;
|
||||||
|
transform.localPosition = new Vector3(0.307f, 0.504f, 0.654f);
|
||||||
|
transform.localEulerAngles = new Vector3(-180, -180, 180);
|
||||||
|
isDown = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void PenMove(Vector3 hitPoint)
|
||||||
|
{
|
||||||
|
DG.Tweening.Sequence sequence = DOTween.Sequence();
|
||||||
|
sequence.Append(transform.DOMove(hitPoint, 1f))
|
||||||
|
.AppendInterval(1.5f)
|
||||||
|
.AppendCallback(() =>
|
||||||
|
{
|
||||||
|
isOver = true;
|
||||||
|
});
|
||||||
|
sequence.Play();
|
||||||
|
|
||||||
|
//transform.DOMove(hitPoint, 1f).OnComplete(() =>
|
||||||
|
// {
|
||||||
|
// isOver = true;
|
||||||
|
// }).SetDelay(1f);
|
||||||
|
}
|
||||||
|
|
||||||
private void OnDisable()
|
private void OnDisable()
|
||||||
{
|
{
|
||||||
for (int i = 0; i < list.Count; i++)
|
for (int i = 0; i < list.Count; i++)
|
||||||
{
|
{
|
||||||
list[i].ÆôÓý»»¥ = true;
|
list[i].ÆôÓý»»¥ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
private void OnDestroy()
|
private void OnDestroy()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
{"userName":"username","userId":"1","examId":41,"classId":1,"useTime":"5236","examClassId":622,"stepList":[{"stepName":"联系客户","testPoint":"打开服务记录仪、全程记录","setScore":10.0,"score":0.0},{"stepName":"检查工器具","testPoint":"在工具间选择需要带到现场的工器具(验电笔、安全帽、绝缘鞋(设置日期)、钳形表、万用表、螺丝刀(绝缘包裹)、钢丝钳、服务记录仪、绝缘手套、钳形电流表_大、工作卡(背包默认存在工作证、移动作业终端)迷惑项:金属梯子、螺丝刀金属部分未绝缘包裹,日期超期)","setScore":10.0,"score":2.5},{"stepName":"联系客户","testPoint":"出示工作证、告知用户来进行用电检查","setScore":10.0,"score":10.0},{"stepName":"柜门验电","testPoint":"拿出验电笔在有电的地方测试验电笔是否好坏。如果验电笔是好的验过并网柜门之后再次在有电的地方测试验电笔好坏。确保并网柜外壳确无电压。验电流程经过第一个三步之后,后续开门只需要一步","setScore":30.0,"score":30.0},{"stepName":"现场检查","testPoint":"使用万用表对表计电压进行检查是否正常,无断相现象。(电压检测出0V,为异常)","setScore":10.0,"score":10.0},{"stepName":"现场检查","testPoint":"选择钳形电流表合适的量程对一次回路及二次回路电流进行检查。(在配电箱测出的数值无法与计量箱测出数值对应,则为异常,需打开电缆沟寻找窃电位置)","setScore":10.0,"score":10.0},{"stepName":"填写工作单","testPoint":"填写现场工作卡(通过下拉菜单来填写)","setScore":10.0,"score":0.0},{"stepName":"填写异常记录","testPoint":"随时可填写相关现场检查出的问题","setScore":10.0,"score":0.0}]}
|
{"userName":"username","userId":"1","examId":41,"classId":1,"useTime":"4749","examClassId":622,"stepList":[{"stepName":"现场检查","testPoint":"使用万用表对表计电压进行检查是否正常,无断相现象。(电压检测出0V,为异常)","setScore":10.0,"score":0.0},{"stepName":"联系客户","testPoint":"打开服务记录仪、全程记录","setScore":10.0,"score":0.0},{"stepName":"检查工器具","testPoint":"在工具间选择需要带到现场的工器具(验电笔、安全帽、绝缘鞋(设置日期)、钳形表、万用表、螺丝刀(绝缘包裹)、钢丝钳、服务记录仪、绝缘手套、钳形电流表_大、工作卡(背包默认存在工作证、移动作业终端)迷惑项:金属梯子、螺丝刀金属部分未绝缘包裹,日期超期)","setScore":10.0,"score":3.33},{"stepName":"联系客户","testPoint":"出示工作证、告知用户来进行用电检查","setScore":10.0,"score":10.0},{"stepName":"柜门验电","testPoint":"拿出验电笔在有电的地方测试验电笔是否好坏。如果验电笔是好的验过并网柜门之后再次在有电的地方测试验电笔好坏。确保并网柜外壳确无电压。验电流程经过第一个三步之后,后续开门只需要一步","setScore":30.0,"score":30.0},{"stepName":"现场检查","testPoint":"选择钳形电流表合适的量程对一次回路及二次回路电流进行检查。(在配电箱测出的数值无法与计量箱测出数值对应,则为异常,需打开电缆沟寻找窃电位置)","setScore":10.0,"score":10.0},{"stepName":"填写工作单","testPoint":"填写现场工作卡(通过下拉菜单来填写)","setScore":10.0,"score":0.0},{"stepName":"填写异常记录","testPoint":"随时可填写相关现场检查出的问题","setScore":10.0,"score":0.0}]}
|
||||||
|
Before Width: | Height: | Size: 204 KiB |
|
After Width: | Height: | Size: 1.0 MiB |
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 215a210b0d93b4346869b3b6787d906e
|
guid: dd876a915e7a220449b2c92193c4302e
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
Before Width: | Height: | Size: 227 KiB |
|
After Width: | Height: | Size: 1.0 MiB |
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 0bfa7a6832e7e4d43a2e0bd4d864d1be
|
guid: 538b48b6d5a60294a952beec7f5e63cf
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
Before Width: | Height: | Size: 233 KiB |
|
After Width: | Height: | Size: 905 KiB |
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: d345cced1b74a5142b27eb68836ac678
|
guid: d1302ec14a85e7d42815f27500d34924
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
Before Width: | Height: | Size: 220 KiB |
|
After Width: | Height: | Size: 899 KiB |
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 29c532ebd3ca3ab479ea692f365241db
|
guid: 6598baeee266e73438b0c1c20824ab58
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
Before Width: | Height: | Size: 260 KiB |
|
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 9a4d1a51adb4ab342b087ffb7cc8330d
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
After Width: | Height: | Size: 1.1 MiB |
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2d07a204c3123fa49928d8d7cd655234
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
Before Width: | Height: | Size: 258 KiB |
|
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: ca8e0d0c113cc1a4b94231081194a617
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
After Width: | Height: | Size: 1.1 MiB |
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 00d085cef74512548a1ffde65264ec86
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
Before Width: | Height: | Size: 260 KiB |
|
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 4839ecef7646b364b8a6d72b1b07371a
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
After Width: | Height: | Size: 1.1 MiB |
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 639eb725d16c06c499da902fa7e5ae4d
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
Before Width: | Height: | Size: 276 KiB |
|
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: ba7996123f612224e83363c787e24560
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
After Width: | Height: | Size: 1.1 MiB |
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fded8f5c15c1c0a47a644cedb3a98f7c
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
Before Width: | Height: | Size: 293 KiB |
|
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 572dfe1dc8853c34e85f6fd74cebb981
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
After Width: | Height: | Size: 1.1 MiB |
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a551fb2e829e4a844bc1ce821c19f2bb
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -1 +1 @@
|
||||||
Build from ADAM at 2024/7/18 17:00:09
|
Build from ADAM at 2024/7/23 18:28:57
|
||||||
|
|
@ -1 +1 @@
|
||||||
2024-06-13 09:04:45#'sxfz://;snxggdj,0,41,1,username,token,90,1,622;/'|
|
2024-06-13 09:04:45#'sxfz://;swxdygpb,0,41,1,username,token,90,1,622,http://21e78de3.r27.cpolar.top;/'|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
考试提交分数,http://68ff3a39.r27.cpolar.top/pro/score/simulationScore
|
考试提交分数,/pro/score/simulationScore
|
||||||
试卷信息,http://68ff3a39.r27.cpolar.top/proSimulationExamination/queryById?id=
|
试卷信息,/proSimulationExamination/queryById?id=
|
||||||
场景信息,http://68ff3a39.r27.cpolar.top/proSimulationScript/quertById?id=
|
场景信息,/proSimulationScript/quertById?id=
|
||||||
用采界面,http://127.0.0.1:3633/#/
|
用采界面,http://127.0.0.1:3633/#/
|
||||||
分数接口,http://127.0.0.1:10013/Handler/ResultDetail.ashx?action=saveitem&real_name=
|
分数接口,http://127.0.0.1:10013/Handler/ResultDetail.ashx?action=saveitem&real_name=
|
||||||
断电续存,http://127.0.0.1:10013/Handler/ResultDetail.ashx
|
断电续存,http://127.0.0.1:10013/Handler/ResultDetail.ashx
|
||||||