12-8tb
This commit is contained in:
parent
2eb8d48738
commit
3b74025756
|
|
@ -17,7 +17,8 @@ public class ExtractMaterials : EditorWindow
|
|||
{
|
||||
string assetPath = AssetDatabase.GUIDToAssetPath(strs[i]);
|
||||
//Debug.Log(assetPath); //具体到fbx的路径
|
||||
string materialFolder = Path.GetDirectoryName(assetPath) + "/Materials";
|
||||
//string materialFolder = Path.GetDirectoryName(assetPath) + "/Materials";
|
||||
string materialFolder = AssetDatabase.GUIDToAssetPath("GameAssets/Materials/") + "/Materials";
|
||||
// 如果不存在该文件夹则创建一个新的
|
||||
if (!AssetDatabase.IsValidFolder(materialFolder))
|
||||
{
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2,7 +2,10 @@ fileFormatVersion: 2
|
|||
guid: 3bc0e6348d2b7a6419354e65ab594d12
|
||||
ModelImporter:
|
||||
serializedVersion: 21202
|
||||
internalIDToNameTable: []
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
74: 1827226128182048838
|
||||
second: Take 001
|
||||
externalObjects:
|
||||
- first:
|
||||
type: UnityEngine:Material
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2,7 +2,10 @@ fileFormatVersion: 2
|
|||
guid: 88345a86a0f524143804a09655169c76
|
||||
ModelImporter:
|
||||
serializedVersion: 21202
|
||||
internalIDToNameTable: []
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
74: 1827226128182048838
|
||||
second: Take 001
|
||||
externalObjects:
|
||||
- first:
|
||||
type: UnityEngine:Material
|
||||
|
|
|
|||
|
|
@ -0,0 +1,192 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &3100925403309917854
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3100925403309917853}
|
||||
- component: {fileID: 3100925403309917850}
|
||||
- component: {fileID: 3100925403309917851}
|
||||
- component: {fileID: 3100925403309917852}
|
||||
- component: {fileID: 4772196613182482582}
|
||||
m_Layer: 5
|
||||
m_Name: "\u5B50\u83DC\u5355"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3100925403309917853
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3100925403309917854}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 3100925403459685178}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -400, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3100925403309917850
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3100925403309917854}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &3100925403309917851
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3100925403309917854}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 36421a2cd235a114288fb3802883d7be, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &3100925403309917852
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3100925403309917854}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 77bb95bda1a925949b76b55024fe65ef, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
v: 0
|
||||
--- !u!114 &4772196613182482582
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3100925403309917854}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8124e469eb4c87f46ad8cb8a995694a6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
oriObjectPrefab: {fileID: 0}
|
||||
currentUPosItem: {fileID: 0}
|
||||
uPosManger: {fileID: 0}
|
||||
deviceManager: {fileID: 0}
|
||||
isSaveMode: 0
|
||||
_icon: {fileID: 0}
|
||||
--- !u!1 &3100925403459685179
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3100925403459685178}
|
||||
- component: {fileID: 3100925403459685176}
|
||||
- component: {fileID: 3100925403459685177}
|
||||
m_Layer: 5
|
||||
m_Name: Text (Legacy)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3100925403459685178
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3100925403459685179}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3100925403309917853}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3100925403459685176
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3100925403459685179}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &3100925403459685177
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3100925403459685179}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
|
||||
m_FontSize: 14
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: New Text
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 98e8f0952a702c242a86c4f6de273731
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,6 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &4574067116216714928
|
||||
--- !u!1 &792349241343872101
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -8,14 +8,14 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3760938219212168202}
|
||||
- component: {fileID: 260737049586029487}
|
||||
- component: {fileID: 2628595572252813157}
|
||||
- component: {fileID: 5394716235643100164}
|
||||
- component: {fileID: 5407429360951112114}
|
||||
- component: {fileID: 4248223612470290872}
|
||||
- component: {fileID: 21777236785684562}
|
||||
- component: {fileID: 1252452721269103264}
|
||||
- component: {fileID: 123054881554192095}
|
||||
- component: {fileID: 3898699276685236602}
|
||||
- component: {fileID: 1296474979326864816}
|
||||
- component: {fileID: 8605518333312584491}
|
||||
- component: {fileID: 2253276045803488087}
|
||||
- component: {fileID: 285193740534303092}
|
||||
- component: {fileID: 1887222082054841174}
|
||||
- component: {fileID: 4595927156917993474}
|
||||
m_Layer: 13
|
||||
m_Name: 1019
|
||||
m_TagString: Untagged
|
||||
|
|
@ -23,36 +23,36 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3760938219212168202
|
||||
--- !u!4 &123054881554192095
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4574067116216714928}
|
||||
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_GameObject: {fileID: 792349241343872101}
|
||||
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
|
||||
m_LocalPosition: {x: -0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &260737049586029487
|
||||
--- !u!33 &3898699276685236602
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4574067116216714928}
|
||||
m_Mesh: {fileID: -8319805796033406473, guid: 3bc0e6348d2b7a6419354e65ab594d12, type: 3}
|
||||
--- !u!23 &2628595572252813157
|
||||
m_GameObject: {fileID: 792349241343872101}
|
||||
m_Mesh: {fileID: 3304094240565004552, guid: 3bc0e6348d2b7a6419354e65ab594d12, type: 3}
|
||||
--- !u!23 &1296474979326864816
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4574067116216714928}
|
||||
m_GameObject: {fileID: 792349241343872101}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
|
|
@ -72,14 +72,12 @@ MeshRenderer:
|
|||
- {fileID: 2100000, guid: 722bf212f2e508f448346cf72aba269e, type: 2}
|
||||
- {fileID: 2100000, guid: 5c1a90a20a054e840aa965ea456f15a1, type: 2}
|
||||
- {fileID: 2100000, guid: 5b0d38b1a0aa3cb4782fba4b9a528774, type: 2}
|
||||
- {fileID: 2100000, guid: 110f0332242bb784f814d4dabd757cbd, type: 2}
|
||||
- {fileID: 1164559979738526386, guid: 3bc0e6348d2b7a6419354e65ab594d12, type: 3}
|
||||
- {fileID: 2100000, guid: 6bd5a697ce567bb4080e3a29e0bb7c12, type: 2}
|
||||
- {fileID: 2100000, guid: e80af0b9c8a34ae40bc754f326280e80, type: 2}
|
||||
- {fileID: 2100000, guid: 110f0332242bb784f814d4dabd757cbd, type: 2}
|
||||
- {fileID: 2100000, guid: c9835d295a8e1d541a7ec1ecc198862a, type: 2}
|
||||
- {fileID: 2100000, guid: 79954833d22021f4ab8c0f18f98524db, type: 2}
|
||||
- {fileID: 2100000, guid: f8a551a1d94be73489f3eed096741494, type: 2}
|
||||
- {fileID: 2100000, guid: bb6b0a258ed601f43a9635d79db9cfc2, type: 2}
|
||||
- {fileID: 2100000, guid: 30ca888413a7c4740ba241d515503112, type: 2}
|
||||
- {fileID: 2100000, guid: a10515959f03151428db98328f946fd8, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
|
|
@ -102,13 +100,13 @@ MeshRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!114 &5394716235643100164
|
||||
--- !u!114 &8605518333312584491
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4574067116216714928}
|
||||
m_GameObject: {fileID: 792349241343872101}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3}
|
||||
|
|
@ -117,7 +115,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 6
|
||||
type_card: 4
|
||||
isUseUPostItem: 0
|
||||
deviceList:
|
||||
id:
|
||||
|
|
@ -137,7 +135,7 @@ MonoBehaviour:
|
|||
rackType:
|
||||
openFlag:
|
||||
backDoorFlag:
|
||||
modelNum: 1019
|
||||
modelNum: 1009
|
||||
occupyNum: 1
|
||||
residueNum:
|
||||
operationTime:
|
||||
|
|
@ -166,26 +164,26 @@ MonoBehaviour:
|
|||
createTime:
|
||||
createName:
|
||||
hight: {fileID: 0}
|
||||
--- !u!114 &5407429360951112114
|
||||
--- !u!114 &2253276045803488087
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4574067116216714928}
|
||||
m_GameObject: {fileID: 792349241343872101}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6bdd6e5953a48524db661ab7d81d57d0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tmsAlarmLists: []
|
||||
--- !u!114 &4248223612470290872
|
||||
--- !u!114 &285193740534303092
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4574067116216714928}
|
||||
m_GameObject: {fileID: 792349241343872101}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 116065a4ce5d3ea40810a9d682afd2cb, type: 3}
|
||||
|
|
@ -197,27 +195,27 @@ MonoBehaviour:
|
|||
TransparentGlow_Shader: {fileID: 0}
|
||||
yiDong_pos: {x: 2.1, y: 1.1, z: 0}
|
||||
fangDa_rot: {x: 0, y: -90, z: 0}
|
||||
--- !u!64 &21777236785684562
|
||||
--- !u!64 &1887222082054841174
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4574067116216714928}
|
||||
m_GameObject: {fileID: 792349241343872101}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -8319805796033406473, guid: 3bc0e6348d2b7a6419354e65ab594d12, type: 3}
|
||||
--- !u!114 &1252452721269103264
|
||||
m_Mesh: {fileID: 3304094240565004552, guid: 3bc0e6348d2b7a6419354e65ab594d12, type: 3}
|
||||
--- !u!114 &4595927156917993474
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4574067116216714928}
|
||||
m_GameObject: {fileID: 792349241343872101}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6bc0a67b27552c54e893bf2db7023587, type: 3}
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 9
|
||||
type_card: 100
|
||||
isUseUPostItem: 0
|
||||
deviceList:
|
||||
id:
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &7892959760009572331
|
||||
MeshFilter:
|
||||
|
|
@ -503,7 +503,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &7454621316236359811
|
||||
MeshFilter:
|
||||
|
|
@ -677,7 +677,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &2669152393385047732
|
||||
MeshFilter:
|
||||
|
|
@ -936,7 +936,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &5872396362025673116
|
||||
MeshFilter:
|
||||
|
|
@ -1013,7 +1013,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &4290681962461628457
|
||||
MeshFilter:
|
||||
|
|
@ -1209,7 +1209,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &1923280901533992639
|
||||
MeshFilter:
|
||||
|
|
@ -1383,7 +1383,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 2
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &5325351794154765143
|
||||
MeshFilter:
|
||||
|
|
@ -1632,7 +1632,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &5984399875458335091
|
||||
MeshFilter:
|
||||
|
|
@ -1709,7 +1709,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &8528935154355417707
|
||||
MeshFilter:
|
||||
|
|
@ -1980,7 +1980,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &854659970417182943
|
||||
MeshFilter:
|
||||
|
|
@ -2347,7 +2347,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &7831000894158955200
|
||||
MeshFilter:
|
||||
|
|
@ -2424,7 +2424,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &7256075180289773067
|
||||
MeshFilter:
|
||||
|
|
@ -2501,7 +2501,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &4268792368366168812
|
||||
MeshFilter:
|
||||
|
|
@ -2770,7 +2770,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 2
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &135386846721986999
|
||||
MeshFilter:
|
||||
|
|
@ -2847,7 +2847,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &1035402602115265089
|
||||
MeshFilter:
|
||||
|
|
@ -3021,7 +3021,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &5392221891216412795
|
||||
MeshFilter:
|
||||
|
|
@ -3477,7 +3477,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &6728683489141731885
|
||||
MeshFilter:
|
||||
|
|
@ -4012,7 +4012,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 3
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &7307925786936540176
|
||||
MeshFilter:
|
||||
|
|
@ -4089,7 +4089,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 4
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &2749904389904239869
|
||||
MeshFilter:
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -348,7 +348,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 8
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &8519178432359115605
|
||||
MeshFilter:
|
||||
|
|
@ -425,7 +425,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 9
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &7314341726634076530
|
||||
MeshFilter:
|
||||
|
|
@ -773,7 +773,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 9
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &1229961536045757522
|
||||
MeshFilter:
|
||||
|
|
@ -850,7 +850,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 100
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &2013043686874525211
|
||||
MeshFilter:
|
||||
|
|
@ -927,7 +927,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 8
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &6819537102869779350
|
||||
MeshFilter:
|
||||
|
|
@ -1004,7 +1004,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 9
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &8096986473014584161
|
||||
MeshFilter:
|
||||
|
|
@ -1169,7 +1169,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 8
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &8406902266996014679
|
||||
MeshFilter:
|
||||
|
|
@ -1691,7 +1691,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 9
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &5695490580745949028
|
||||
MeshFilter:
|
||||
|
|
@ -2036,7 +2036,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 8
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &1787846133109431758
|
||||
MeshFilter:
|
||||
|
|
@ -2289,7 +2289,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 9
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &3355209295250653810
|
||||
MeshFilter:
|
||||
|
|
@ -2640,7 +2640,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 9
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &400820718544696390
|
||||
MeshFilter:
|
||||
|
|
@ -2982,7 +2982,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 8
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &412615972212592444
|
||||
MeshFilter:
|
||||
|
|
@ -3059,7 +3059,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 9
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &8244741253550856972
|
||||
MeshFilter:
|
||||
|
|
@ -3136,7 +3136,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 8
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &8466293700350430753
|
||||
MeshFilter:
|
||||
|
|
@ -3308,7 +3308,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 8
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &3168369351403074105
|
||||
MeshFilter:
|
||||
|
|
@ -3385,7 +3385,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 8
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &5929542697539163818
|
||||
MeshFilter:
|
||||
|
|
@ -3649,7 +3649,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 100
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &8463233571831270898
|
||||
MeshFilter:
|
||||
|
|
@ -3812,7 +3812,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 9
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &3596058311288707727
|
||||
MeshFilter:
|
||||
|
|
|
|||
|
|
@ -302,7 +302,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &7853370457513511039
|
||||
MeshFilter:
|
||||
|
|
@ -462,7 +462,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &426062968269610098
|
||||
MeshFilter:
|
||||
|
|
@ -2890,7 +2890,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &6735539805474088764
|
||||
MeshFilter:
|
||||
|
|
@ -3542,7 +3542,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &4485899492697055405
|
||||
MeshFilter:
|
||||
|
|
@ -3702,7 +3702,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &2376656979182805973
|
||||
MeshFilter:
|
||||
|
|
@ -4032,7 +4032,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &3174983012118517688
|
||||
MeshFilter:
|
||||
|
|
@ -4642,7 +4642,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &3042231082462184344
|
||||
MeshFilter:
|
||||
|
|
@ -4802,7 +4802,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &6755984716413796189
|
||||
MeshFilter:
|
||||
|
|
@ -4962,7 +4962,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &1529620580248906688
|
||||
MeshFilter:
|
||||
|
|
@ -5389,7 +5389,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &3580622331430152659
|
||||
MeshFilter:
|
||||
|
|
@ -5555,7 +5555,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &3038359055771441128
|
||||
MeshFilter:
|
||||
|
|
@ -5632,7 +5632,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &8631256934525515265
|
||||
MeshFilter:
|
||||
|
|
@ -6088,7 +6088,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 11
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &6973406602503134230
|
||||
MeshFilter:
|
||||
|
|
@ -6325,7 +6325,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 11
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &2044427279384886112
|
||||
MeshFilter:
|
||||
|
|
@ -7077,7 +7077,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &3985469263179398625
|
||||
MeshFilter:
|
||||
|
|
@ -7330,7 +7330,7 @@ MonoBehaviour:
|
|||
conf2:
|
||||
isUse: 1
|
||||
module_type: 2
|
||||
type_card: 0
|
||||
type_card: 10
|
||||
isUseUPostItem: 1
|
||||
--- !u!33 &8519137724955444515
|
||||
MeshFilter:
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -756,7 +756,14 @@ public class GameManager : MonoBehaviour
|
|||
//获取U位
|
||||
var U = Racks[i].devicePosition;
|
||||
GameObject go;
|
||||
//if (nowDevice && Racks_go.Contains(nowDevice))
|
||||
//{
|
||||
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
|
||||
//}
|
||||
try
|
||||
{
|
||||
go = Instantiate(Resources.Load<GameObject>("古泉站机房模型90个型号/" + modelNum));
|
||||
|
|
@ -873,7 +880,7 @@ public class GameManager : MonoBehaviour
|
|||
{
|
||||
//机框下所有设备
|
||||
var jk = Racks_go[i].GetComponent<DeviceQuery>();
|
||||
if (!jk.conf2.isUseUPostItem)
|
||||
if (!jk.conf2.isUseUPostItem)
|
||||
{
|
||||
var bk = Racks_go[i].transform.GetComponentsInChildren<DeviceQuery>().ToList();
|
||||
for (int j = 0; j < bk.Count; j++)
|
||||
|
|
@ -967,23 +974,25 @@ public class GameManager : MonoBehaviour
|
|||
/// <returns></returns>
|
||||
public IEnumerator init_Device(Action<string> callback, bool isClear = true)
|
||||
{
|
||||
for (int i = Racks_go.Count - 1; i >= 0; i--)
|
||||
if (isClear)
|
||||
{
|
||||
DestroyImmediate(Racks_go[i]);
|
||||
for (int i = Racks_go.Count - 1; i >= 0; i--)
|
||||
{
|
||||
DestroyImmediate(Racks_go[i]);
|
||||
}
|
||||
//Debug.Log("@@12-1");
|
||||
for (int i = MachineSlots_go.Count - 1; i >= 0; i--)
|
||||
{
|
||||
DestroyImmediate(MachineSlots_go[i]);
|
||||
}
|
||||
//Debug.Log("@@12-2");
|
||||
for (int i = TmsCards_go.Count - 1; i >= 0; i--)
|
||||
{
|
||||
DestroyImmediate(TmsCards_go[i]);
|
||||
}
|
||||
//Debug.Log("@@12-3");
|
||||
Cabinets.Clear();
|
||||
}
|
||||
//Debug.Log("@@12-1");
|
||||
for (int i = MachineSlots_go.Count - 1; i >= 0; i--)
|
||||
{
|
||||
DestroyImmediate(MachineSlots_go[i]);
|
||||
}
|
||||
//Debug.Log("@@12-2");
|
||||
for (int i = TmsCards_go.Count - 1; i >= 0; i--)
|
||||
{
|
||||
DestroyImmediate(TmsCards_go[i]);
|
||||
}
|
||||
//Debug.Log("@@12-3");
|
||||
Cabinets.Clear();
|
||||
|
||||
if (isClear)
|
||||
Racks_go.Clear();
|
||||
Racks.Clear();
|
||||
|
|
@ -2199,34 +2208,61 @@ public class GameManager : MonoBehaviour
|
|||
//Debug.Log("@@12");
|
||||
/*yield return */
|
||||
|
||||
if (isInFo)
|
||||
{
|
||||
StartCoroutine(init_Device((x) =>
|
||||
{
|
||||
if (!string.IsNullOrEmpty(x))
|
||||
{
|
||||
StartCoroutine(init_Port((y) =>
|
||||
{
|
||||
if (!string.IsNullOrEmpty(y))
|
||||
{
|
||||
callback?.Invoke("1");
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("查询端口错误");
|
||||
callback.Invoke(null);
|
||||
}
|
||||
}, false));
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("查询设备错误");
|
||||
callback.Invoke(null);
|
||||
}
|
||||
}, false));
|
||||
}
|
||||
else
|
||||
StartCoroutine(init_Device((x) =>
|
||||
#region 保留
|
||||
//if (isInFo)
|
||||
//{
|
||||
// StartCoroutine(init_Device((x) =>
|
||||
// {
|
||||
// if (!string.IsNullOrEmpty(x))
|
||||
// {
|
||||
// StartCoroutine(init_Port((y) =>
|
||||
// {
|
||||
// if (!string.IsNullOrEmpty(y))
|
||||
// {
|
||||
// //callback?.Invoke("1");
|
||||
// StartCoroutine(LineQuery.Inst.getJsonCoroutine((z) =>
|
||||
// {
|
||||
// if (z != null)
|
||||
// {
|
||||
// StartCoroutine(PatternChoose.Inst.xianlan.getByCode((v) =>
|
||||
// {
|
||||
// if (!string.IsNullOrEmpty(v))
|
||||
// {
|
||||
// callback?.Invoke("1");
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Debug.Log("查询线路类型错误 @@");
|
||||
// callback.Invoke(null);
|
||||
// }
|
||||
// }));
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Debug.Log("查询线缆组错误 @@");
|
||||
// callback.Invoke(null);
|
||||
// }
|
||||
// }));
|
||||
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Debug.Log("查询端口错误 @@");
|
||||
// callback.Invoke(null);
|
||||
// }
|
||||
// }, false));
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Debug.Log("查询设备错误 @@");
|
||||
// callback.Invoke(null);
|
||||
// }
|
||||
// }, false));
|
||||
//}
|
||||
//else
|
||||
#endregion
|
||||
|
||||
StartCoroutine(init_Device((x) =>
|
||||
{
|
||||
Debug.Log("@@1");
|
||||
if (!string.IsNullOrEmpty(x))
|
||||
|
|
|
|||
|
|
@ -196,5 +196,6 @@ public class BaseConf : ScriptableObject
|
|||
类型编号98,
|
||||
类型编号99,
|
||||
类型编号100,
|
||||
类型编号10_1,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@ using Newtonsoft.Json;
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using static UnityEditor.PlayerSettings;
|
||||
/// <summary>
|
||||
/// 设备-新增
|
||||
/// </summary>
|
||||
|
|
@ -128,8 +130,11 @@ public class AddDevice : MonoBehaviour
|
|||
}
|
||||
else if (GameManager.Inst.nowDevice.GetComponent<DeviceQuery>().deviceList.deviceType == "3")
|
||||
{
|
||||
var cabinet = GameManager.Inst.FindParent(GameManager.Inst.nowDevice, GameManager.Inst.IsDesiredParent);
|
||||
var cabinet = GameManager.Inst.FindParent(GameManager.Inst.nowDevice, GameManager.Inst.IsFindRacks_go);
|
||||
mybody.shelfId = cabinet.GetComponent<DeviceQuery>().deviceList.id;
|
||||
var upostItem = transform.parent.GetComponent<UPosItem>();
|
||||
if (upostItem)
|
||||
mybody.devicePosition = upostItem.gameObject.name;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -247,6 +252,7 @@ public class AddDevice : MonoBehaviour
|
|||
var d = GameManager.Inst.nowDevice.GetComponent<DeviceQuery>();
|
||||
if (d)
|
||||
{
|
||||
d.deviceList.id = URlreturn.data;
|
||||
if (d.deviceList.type == "2" && d.deviceList.deviceType == "1")
|
||||
{
|
||||
GameManager.Inst.Racks_go.Add(GameManager.Inst.nowDevice);
|
||||
|
|
@ -276,6 +282,38 @@ public class AddDevice : MonoBehaviour
|
|||
GameManager.Inst.objectToShow_add.gameObject.SetActive(true);
|
||||
var SN1 = GameManager.Inst.objectToShow_add.GetComponent<SearchName1>();
|
||||
SN1.hide_menu();
|
||||
|
||||
//var d = GameManager.Inst.nowDevice.GetComponent<DeviceQuery>();
|
||||
//if (d)
|
||||
//{
|
||||
// foreach (var item in GameManager.Inst.root_AllDevice.data)
|
||||
// {
|
||||
// //（机柜）
|
||||
// if (item.type == "1")
|
||||
// GameManager.Inst.Cabinets.Add(item);
|
||||
// //（机框）
|
||||
// if (item.type == "2" && item.deviceType == "1")
|
||||
// GameManager.Inst.Racks.Add(item);
|
||||
// //（机槽）
|
||||
// else if (item.type == "2" && item.deviceType == "2")
|
||||
// GameManager.Inst.MachineSlots.Add(item);
|
||||
// //（板卡）
|
||||
// else if (item.type == "2" && item.deviceType == "3")
|
||||
// GameManager.Inst.TmsCards.Add(item);
|
||||
// }
|
||||
// if (d.deviceList.type == "2" && d.deviceList.deviceType == "1")
|
||||
// {
|
||||
|
||||
// }
|
||||
// else if (d.deviceList.type == "2" && d.deviceList.deviceType == "2")
|
||||
// {
|
||||
|
||||
// }
|
||||
// else if (d.deviceList.type == "2" && d.deviceList.deviceType == "3")
|
||||
// {
|
||||
|
||||
// }
|
||||
//}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -136,25 +136,25 @@ public class DeleteDevice : MonoBehaviour
|
|||
/// </summary>
|
||||
public void DeleteAssign()
|
||||
{
|
||||
if (GameManager.Inst.nowDevice)
|
||||
{
|
||||
var d = GameManager.Inst.nowDevice.GetComponent<DeviceQuery>();
|
||||
if (d)
|
||||
{
|
||||
if (d.deviceList.type == "2" && d.deviceList.deviceType == "1")
|
||||
{
|
||||
GameManager.Inst.Racks_go.Remove(GameManager.Inst.nowDevice);
|
||||
}
|
||||
else if (d.deviceList.type == "2" && d.deviceList.deviceType == "2")
|
||||
{
|
||||
GameManager.Inst.MachineSlots_go.Remove(GameManager.Inst.nowDevice);
|
||||
}
|
||||
else if (d.deviceList.type == "2" && d.deviceList.deviceType == "3")
|
||||
{
|
||||
GameManager.Inst.TmsCards_go.Remove(GameManager.Inst.nowDevice);
|
||||
}
|
||||
}
|
||||
}
|
||||
//if (GameManager.Inst.nowDevice)
|
||||
//{
|
||||
// var d = GameManager.Inst.nowDevice.GetComponent<DeviceQuery>();
|
||||
// if (d)
|
||||
// {
|
||||
// if (d.deviceList.type == "2" && d.deviceList.deviceType == "1")
|
||||
// {
|
||||
// GameManager.Inst.Racks_go.Remove(GameManager.Inst.nowDevice);
|
||||
// }
|
||||
// else if (d.deviceList.type == "2" && d.deviceList.deviceType == "2")
|
||||
// {
|
||||
// GameManager.Inst.MachineSlots_go.Remove(GameManager.Inst.nowDevice);
|
||||
// }
|
||||
// else if (d.deviceList.type == "2" && d.deviceList.deviceType == "3")
|
||||
// {
|
||||
// GameManager.Inst.TmsCards_go.Remove(GameManager.Inst.nowDevice);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
}
|
||||
|
||||
#region JSON
|
||||
|
|
|
|||
|
|
@ -137,6 +137,9 @@ public class CreateLine : CabinetUIBase
|
|||
/// <param name="hierarchy">区</param>
|
||||
public void Creat5(Transform A, Transform B, int hierarchy = 0)//端口是否在模型16上
|
||||
{
|
||||
var a = GameManager.Inst.FindParent(A.gameObject, GameManager.Inst.IsDesiredParent);
|
||||
var b = GameManager.Inst.FindParent(B.gameObject, GameManager.Inst.IsDesiredParent);
|
||||
|
||||
var _A16 = GameManager.Inst.FindParent(A.gameObject, GameManager.Inst.IsFindRacks_go).GetComponent<DeviceQuery>().deviceList.modelNum;
|
||||
var _B16 = GameManager.Inst.FindParent(B.gameObject, GameManager.Inst.IsFindRacks_go).GetComponent<DeviceQuery>().deviceList.modelNum;
|
||||
|
||||
|
|
|
|||
|
|
@ -266,4 +266,42 @@ public class tooltest : MonoBehaviour
|
|||
A[i].gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
//[ContextMenu("赋值位置")]
|
||||
//public void dasdsadsa()
|
||||
//{
|
||||
// for (int i = 0; i < A.Count; i++)
|
||||
// {
|
||||
// //UnityEditorInternal.ComponentUtility.CopyComponent(A[i].GetComponent<RectTransform>());
|
||||
// //UnityEditorInternal.ComponentUtility.PasteComponentValues(B[i].GetComponent<RectTransform>());
|
||||
// //B[i].name = A[i].name;
|
||||
// A[i].transform.localPosition = new Vector3(-400 + i * 200, 0, 0);
|
||||
// }
|
||||
//}
|
||||
|
||||
[ContextMenu("生成机柜走线左右小球")]
|
||||
public void createlin()
|
||||
{
|
||||
//for (int i = 0; i < A.Count; i++)
|
||||
//{
|
||||
// if (A[i].Find("U位"))
|
||||
// {
|
||||
// GameObject emptyObject1 = GameObject.CreatePrimitive(PrimitiveType.Sphere);
|
||||
// GameObject emptyObject2 = GameObject.CreatePrimitive(PrimitiveType.Sphere);
|
||||
// emptyObject1.transform.SetParent(A[i]);
|
||||
// emptyObject2.transform.SetParent(A[i]);
|
||||
// emptyObject1.name = "左";
|
||||
// emptyObject2.name = "右";
|
||||
// emptyObject1.transform.localPosition = new Vector3(0.391f, 0.31f, 1.1585f);
|
||||
// emptyObject2.transform.localPosition = new Vector3(0.391f, -0.31f, 1.1585f);
|
||||
|
||||
// emptyObject1.transform.localScale = 0.01f * Vector3.one;
|
||||
// emptyObject2.transform.localScale = 0.01f * Vector3.one;
|
||||
|
||||
// B.Add(emptyObject1.transform);
|
||||
// B.Add(emptyObject2.transform);
|
||||
// }
|
||||
//}
|
||||
for (int i = 0; i < B.Count; i++) { B[i].gameObject.SetActive(false); }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue