修复dll发布报错
This commit is contained in:
parent
8140f15077
commit
0cd0c092da
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,5 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEditor.Experimental.GraphView;
|
||||
using UnityEngine;
|
||||
|
||||
public class MiniMapManager : MonoBehaviour
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,7 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 003132f6525b3f44aba808b4acdda1d2
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -117,11 +117,6 @@
|
|||
贝塞尔曲线颜色
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:W.Bezier.Editor.BezierDrawerEditor">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:W.UI.ManualAttribute">
|
||||
<summary>
|
||||
手动标签;请将标签置于首位
|
||||
|
|
|
@ -2981,6 +2981,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a946f432636a8b64d9594412dabd0cea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IpAddress:
|
||||
--- !u!1 &1237664139
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5625,6 +5626,9 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
RoamAnchorRoot: {fileID: 0}
|
||||
MainCamera: {fileID: 0}
|
||||
Canvas_3D: {fileID: 0}
|
||||
CameraIconPrefab: {fileID: 0}
|
||||
BeltScaleIconPrefab: {fileID: 0}
|
||||
--- !u!4 &2105364401
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -6039,7 +6043,7 @@ PrefabInstance:
|
|||
- target: {fileID: 3896793120727956042, guid: ed7444d8edc56e741ae55811aa53b43b,
|
||||
type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3896793120727956042, guid: ed7444d8edc56e741ae55811aa53b43b,
|
||||
type: 3}
|
||||
|
|
|
@ -38,7 +38,7 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.38771254, g: 0.46119627, b: 0.54483825, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.3877113, g: 0.461194, b: 0.5448504, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
@ -521,8 +521,9 @@ GameObject:
|
|||
- component: {fileID: 331910088}
|
||||
- component: {fileID: 331910087}
|
||||
- component: {fileID: 331910086}
|
||||
- component: {fileID: 331910089}
|
||||
m_Layer: 0
|
||||
m_Name: Plane
|
||||
m_Name: YardGameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
@ -606,6 +607,20 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 331910084}
|
||||
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!114 &331910089
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 331910084}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
DeviceType: 2
|
||||
DeviceIndex:
|
||||
--- !u!1 &339769765
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -618,8 +633,9 @@ GameObject:
|
|||
- component: {fileID: 339769769}
|
||||
- component: {fileID: 339769768}
|
||||
- component: {fileID: 339769767}
|
||||
- component: {fileID: 339769770}
|
||||
m_Layer: 0
|
||||
m_Name: Plane
|
||||
m_Name: YardGameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
@ -703,6 +719,20 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 339769765}
|
||||
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!114 &339769770
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 339769765}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
DeviceType: 2
|
||||
DeviceIndex:
|
||||
--- !u!1 &408960472
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2800,8 +2830,9 @@ GameObject:
|
|||
- component: {fileID: 1437214325}
|
||||
- component: {fileID: 1437214324}
|
||||
- component: {fileID: 1437214323}
|
||||
- component: {fileID: 1437214326}
|
||||
m_Layer: 0
|
||||
m_Name: Plane
|
||||
m_Name: YardGameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
@ -2885,6 +2916,20 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1437214321}
|
||||
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!114 &1437214326
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1437214321}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
DeviceType: 2
|
||||
DeviceIndex:
|
||||
--- !u!1 &1514896311
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3385,8 +3430,9 @@ GameObject:
|
|||
- component: {fileID: 1585271820}
|
||||
- component: {fileID: 1585271819}
|
||||
- component: {fileID: 1585271818}
|
||||
- component: {fileID: 1585271821}
|
||||
m_Layer: 0
|
||||
m_Name: Plane
|
||||
m_Name: YardGameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
@ -3470,6 +3516,20 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1585271816}
|
||||
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!114 &1585271821
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1585271816}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
DeviceType: 2
|
||||
DeviceIndex:
|
||||
--- !u!1 &1615162614
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3482,8 +3542,9 @@ GameObject:
|
|||
- component: {fileID: 1615162618}
|
||||
- component: {fileID: 1615162617}
|
||||
- component: {fileID: 1615162616}
|
||||
- component: {fileID: 1615162619}
|
||||
m_Layer: 0
|
||||
m_Name: Plane
|
||||
m_Name: YardGameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
@ -3567,6 +3628,20 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1615162614}
|
||||
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!114 &1615162619
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1615162614}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
DeviceType: 2
|
||||
DeviceIndex:
|
||||
--- !u!1 &1675976498
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -4811,8 +4886,9 @@ GameObject:
|
|||
- component: {fileID: 1979020809}
|
||||
- component: {fileID: 1979020808}
|
||||
- component: {fileID: 1979020807}
|
||||
- component: {fileID: 1979020810}
|
||||
m_Layer: 0
|
||||
m_Name: Plane
|
||||
m_Name: YardGameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
@ -4896,6 +4972,20 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1979020805}
|
||||
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!114 &1979020810
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1979020805}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
DeviceType: 2
|
||||
DeviceIndex:
|
||||
--- !u!1 &1984287784
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -12,4 +12,8 @@ public enum DeviceType
|
|||
/// Ƥ´ø³Ó
|
||||
/// </summary>
|
||||
BELT_SCALE = 1,
|
||||
/// <summary>
|
||||
/// 堆区
|
||||
/// </summary>
|
||||
YARD,
|
||||
}
|
|
@ -34,6 +34,21 @@ public class DeviceBase : MonoBehaviour
|
|||
DeviceIndex = transform.parent.name;
|
||||
}
|
||||
DeviceBaseList.Add(this);
|
||||
Debug.Log(transform.parent.name);
|
||||
//Debug.Log(transform.parent.name);
|
||||
|
||||
switch (DeviceType)
|
||||
{
|
||||
case DeviceType.CAMERA:
|
||||
transform.parent.GetComponent<Renderer>().enabled = false;
|
||||
break;
|
||||
case DeviceType.BELT_SCALE:
|
||||
transform.parent.GetComponent<Renderer>().enabled = false;
|
||||
break;
|
||||
case DeviceType.YARD:
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -21,6 +21,9 @@ public class DeviceUIBase : MonoBehaviour, IPointerClickHandler
|
|||
//´ňżŞĆ¤´řłÓ´°żÚ
|
||||
UIManager.Instance.ShowBeltScalePage(DeviceBase.DeviceIndex);
|
||||
break;
|
||||
case DeviceType.YARD:
|
||||
//打开堆区窗口
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -36,6 +39,9 @@ public class DeviceUIBase : MonoBehaviour, IPointerClickHandler
|
|||
transform.name = "Camera_UI_" + DeviceIndex;
|
||||
break;
|
||||
case DeviceType.BELT_SCALE:
|
||||
break;
|
||||
case DeviceType.YARD:
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
|
@ -45,6 +45,9 @@ public class MainScene : Singleton<MainScene>
|
|||
var _belt_scale_icon = Instantiate(ModelRoot.Instance.BeltScaleIconPrefab, ModelRoot.Instance.Canvas_3D);
|
||||
_belt_scale_icon.transform.position = DeviceBase.DeviceBaseList[i].transform.position;
|
||||
_belt_scale_icon.GetComponent<DeviceUIBase>().Init(DeviceBase.DeviceBaseList[i]);
|
||||
break;
|
||||
case DeviceType.YARD:
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
@ -72,6 +75,9 @@ public class MainScene : Singleton<MainScene>
|
|||
|
||||
break;
|
||||
case DeviceType.BELT_SCALE:
|
||||
break;
|
||||
case DeviceType.YARD:
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue