zhuyayu
/
E_ElecCompetition
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: zhuyayu:60f99262f5e0a7adf6f03e202378a63c7c0f6f27
Branches Tags
zhuyayu:master
zhuyayu:3d_latest
zhuyayu:E_vue
zhuyayu:后端
..
compare: zhuyayu:113ac5bcdac05700d545ef70620f5042b43cb049
Branches Tags
zhuyayu:3d_latest
zhuyayu:master
zhuyayu:E_vue
zhuyayu:后端

No commits in common. "60f99262f5e0a7adf6f03e202378a63c7c0f6f27" and "113ac5bcdac05700d545ef70620f5042b43cb049" have entirely different histories.
60f99262f5 ... 113ac5bcda

4 changed files with 22 additions and 52 deletions
Show Stats Expand all files Collapse all files

43
Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
View File

@ -22582,7 +22582,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0.000005722046, y: 0.000015258789}
m_SizeDelta: {x: 0, y: -0.000015259}
m_Pivot: {x: 0.5, y: 0.5}
@ -47824,7 +47824,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &465806889
RectTransform:
m_ObjectHideFlags: 0
@ -98799,7 +98799,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &925169282
RectTransform:
m_ObjectHideFlags: 0
@ -106391,7 +106391,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.34117648, g: 0.34117648, b: 0.34117648, a: 0.42745098}
m_Color: {r: 0.2, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -109303,7 +109303,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -19, y: 46}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1021690654
MonoBehaviour:
@ -112174,9 +112174,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -2.6999998, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1056303075
MonoBehaviour:
@ -113623,7 +113623,6 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
recoverBtn: {fileID: 1876085501}
bottomToolToggle: {fileID: 754664720}
currentTool: {fileID: 0}
--- !u!114 &1067605744
MonoBehaviour:
@ -179677,18 +179676,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 754664720}
m_TargetAssemblyTypeName: UnityEngine.UI.Toggle, UnityEngine.UI
m_MethodName: set_isOn
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &1708713656
GameObject:
m_ObjectHideFlags: 0
@ -224425,10 +224412,10 @@ RectTransform:
m_Father: {fileID: 1021690653}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 84, y: -26}
m_SizeDelta: {x: 40, y: 40}
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.5, y: 0.5}
--- !u!114 &5799929949178873663
MonoBehaviour:
@ -224595,10 +224582,10 @@ RectTransform:
m_Father: {fileID: 1021690653}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 39, y: -26}
m_SizeDelta: {x: 40, y: 40}
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.5, y: 0.5}
--- !u!114 &5799929950087749826
MonoBehaviour:

1
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/PermanentToolItem.cs
View File

@ -50,7 +50,6 @@ namespace Components
{
SetWorkCardPos();
UIManager.Instance.ToolsItemManager.recoverBtn.gameObject.SetActive(true);
UIManager.Instance.ToolsItemManager.bottomToolToggle.interactable = false;
}
private void SetWorkCardPos()

22
Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolsItemManager.cs
View File

@ -21,7 +21,7 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
public Button closeBtn;
public UnityEvent<GameObject> ItemClick;
public Button recoverBtn;
public Toggle bottomToolToggle;
public GameObject currentTool;
private void Start()
@ -29,7 +29,7 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
closeBtn.onClick.AddListener(() => { SwictchToolPanel(false); });
recoverBtn.onClick.AddListener(() =>
{
RecoverCurrentInstantiateTool(currentTool);
SetCurrentInstantiateTool(currentTool);
});
recoverBtn.gameObject.SetActive(false);
}
@ -55,8 +55,6 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
tTemp.selfButton.onClick.AddListener(() =>
{
UIManager.Instance.jobCardController.jobCardPanel.SetActive(true);
SetToggleState();
});
}
else
@ -65,8 +63,6 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
{
ItemClick?.Invoke(tTemp.prefab);
recoverBtn.gameObject.SetActive(true);
bottomToolToggle.interactable = false;
SetToggleState();
});
}
toolItems.Add(tTemp);
@ -81,22 +77,10 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
}
}
public void SetToggleState()
{
bottomToolToggle.isOn = false;
SwictchToolPanel(false);
}
/// <summary>
///
/// </summary>
/// <param name="tool"></param>
public void RecoverCurrentInstantiateTool(GameObject tool)
public void SetCurrentInstantiateTool(GameObject tool)
{
if (tool != null)
Destroy(tool);
bottomToolToggle.interactable = true;
recoverBtn.gameObject.SetActive(false);
}

8
Electrical_inspectionCompetitionSystem/Packages/packages-lock.json
View File

@ -35,12 +35,12 @@
"source": "builtin",
"dependencies": {
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.rider": "3.0.15",
"com.unity.ide.rider": "3.0.16",
"com.unity.ide.vscode": "1.2.5",
"com.unity.editorcoroutines": "1.0.0",
"com.unity.performance.profile-analyzer": "1.1.1",
"com.unity.test-framework": "1.1.31",
"com.unity.testtools.codecoverage": "1.0.1"
"com.unity.testtools.codecoverage": "1.2.2"
}
},
"com.unity.ide.rider": {
@ -92,7 +92,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.services.core": {
"version": "1.4.2",
"version": "1.6.0",
"depth": 1,
"source": "registry",
"dependencies": {
@ -121,7 +121,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.testtools.codecoverage": {
"version": "1.0.1",
"version": "1.2.2",
"depth": 1,
"source": "registry",
"dependencies": {