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

View File

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

View File

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

View File

@ -734,7 +734,7 @@ PlayerSettings:
PS4: DOTWEEN PS4: DOTWEEN
PS5: DOTWEEN PS5: DOTWEEN
Stadia: 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 WebGL: DOTWEEN
Windows Store Apps: DOTWEEN Windows Store Apps: DOTWEEN
XboxOne: DOTWEEN XboxOne: DOTWEEN