Compare commits

..

No commits in common. "6d28f0809dae23b4f9d92c7934c6539281acdc50" and "0eaddabba71355d834ff543b4652b66f98ab5aca" have entirely different histories.

5 changed files with 24 additions and 59 deletions

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
/// <summary>
/// 流程分类/阶段
/// </summary>
public enum E_ProcessType
public enum E_ProcessType
{
/// <summary>
/// 查看任务单
@ -90,15 +90,15 @@ public enum E_ModeType
}
/// <summary>
/// 工具材料设备
/// 工具材料
/// </summary>
public enum E_ToolOrDeviceOrMaterials
public enum E_ToolOrDevice
{
/// <summary>
/// 空
/// </summary>
None = 0,
/// <summary>
/// 工具
/// </summary>
@ -107,17 +107,13 @@ public enum E_ToolOrDeviceOrMaterials
/// <summary>
/// 材质
/// </summary>
Materials,
/// <summary>
/// 设备
/// </summary>
Device
Device,
}
/// <summary>
/// 淡入淡出枚举
/// </summary>
public enum E_FadeInAndOut
public enum E_FadeInAndOut
{
/// <summary>
/// 淡入
@ -132,7 +128,7 @@ public enum E_FadeInAndOut
/// <summary>
/// 消息类型
/// </summary>
public enum E_MessageType
public enum E_MessageType
{
/// <summary>
/// 普通/正常消息
@ -150,7 +146,7 @@ public enum E_MessageType
Error,
}
public enum E_SceneType
public enum E_SceneType
{
/// <summary>
/// 办公室

View File

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

View File

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

View File

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