WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1212

This commit is contained in:
YangHua 2024-08-08 13:56:34 +08:00
parent fd73eacc89
commit c2f90de982
5 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold SDF.asset
View File

File diff suppressed because one or more lines are too long

10
Assets/Scripts/Project/Enum/Enums.cs
View File

@ -90,9 +90,9 @@ public enum E_ModeType
} }
/// <summary> /// <summary>
/// 工具材料 /// 工具材料设备
/// </summary> /// </summary>
public enum E_ToolOrDevice public enum E_ToolOrDeviceOrMaterials
{ {
/// <summary> /// <summary>
/// 空 /// 空
@ -107,7 +107,11 @@ public enum E_ToolOrDevice
/// <summary> /// <summary>
/// 材质 /// 材质
/// </summary> /// </summary>
Device, Materials,
/// <summary>
/// 设备
/// </summary>
Device
} }
/// <summary> /// <summary>

6
Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs
View File

@ -17,14 +17,14 @@ public abstract class BaseToolOrDevice : MonoBehaviour
public string toolName; public string toolName;
/// <summary> /// <summary>
/// 工器具类型 工具/设备 /// 工器具类型 工具/材质/设备
/// </summary> /// </summary>
public E_ToolOrDevice toolOrMaterial; public E_ToolOrDeviceOrMaterials toolOrDeviceOrMaterial;
[ContextMenu("GetInfo")] [ContextMenu("GetInfo")]
public void GetInfo() public void GetInfo()
{ {
//TODO:后续 根据英文名称去获取ID 中文名 和其它
} }
private void OnMouseEnter() private void OnMouseEnter()

6
Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs
View File

@ -55,10 +55,10 @@ public class UI_MenuBar : BasePanel
switch (btnName) switch (btnName)
{ {
case "CloseDefaultBtn": case "CloseDefaultBtn":
GetControl<Image>("UI_MenuBar").rectTransform.DOLocalMoveX(960, 0.5f); transform.GetComponent<RectTransform>().DOLocalMoveX(960, 0.5f);
if (GetControl<Image>("UI_MenuBar").rectTransform.localPosition.x == 960) if (transform.GetComponent<RectTransform>().localPosition.x == 960)
{ {
GetControl<Image>("UI_MenuBar").rectTransform.DOLocalMoveX(1070, 0.5f); transform.GetComponent<RectTransform>().DOLocalMoveX(1070, 0.5f);
} }
break; break;

2
ProjectSettings/ProjectSettings.asset
View File

@ -734,7 +734,7 @@ PlayerSettings:
PS4: DOTWEEN PS4: DOTWEEN
PS5: DOTWEEN PS5: DOTWEEN
Stadia: DOTWEEN Stadia: DOTWEEN
Standalone: DOTWEEN Standalone: DOTWEEN;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3
WebGL: DOTWEEN WebGL: DOTWEEN
Windows Store Apps: DOTWEEN Windows Store Apps: DOTWEEN
XboxOne: DOTWEEN XboxOne: DOTWEEN