修改线缆连接逻辑
This commit is contained in:
parent
019048dcfa
commit
9f37eefdee
|
|
@ -51,7 +51,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
|
|||
|
||||
}
|
||||
public void OnBeginDrag(PointerEventData eventData)
|
||||
{
|
||||
{
|
||||
if (!isSaveMode)
|
||||
targetObject = Instantiate(oriObjectPrefab);
|
||||
else
|
||||
|
|
@ -59,6 +59,8 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
|
|||
targetObject = oriObjectPrefab;
|
||||
targetObject.gameObject.SetActive(true);
|
||||
}
|
||||
if (targetObject.GetComponentInChildren<UPosManger>(true))
|
||||
targetObject.GetComponentInChildren<UPosManger>(true).gameObject.SetActive(false);
|
||||
if (targetObject.GetComponent<TransparentGlow>())
|
||||
targetObject.GetComponent<TransparentGlow>().F1();
|
||||
//currentDevice = targetObject.GetComponent<DragTest1>();
|
||||
|
|
@ -135,6 +137,8 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
|
|||
click.insertion(targetObject.transform, Vector3.zero);
|
||||
}
|
||||
|
||||
if (targetObject.GetComponentInChildren<UPosManger>(true))
|
||||
targetObject.GetComponentInChildren<UPosManger>(true).gameObject.SetActive(true);
|
||||
|
||||
RecoverSet();
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2,7 +2,10 @@ fileFormatVersion: 2
|
|||
guid: 6b2057fc317b56e4a8cad749fe5739d7
|
||||
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: 43f8d49550c29344fb0158620afc612b
|
||||
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: 472cf6e9441ce16488dde73e024b9fd7
|
||||
ModelImporter:
|
||||
serializedVersion: 21202
|
||||
internalIDToNameTable: []
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
74: 1827226128182048838
|
||||
second: Take 001
|
||||
externalObjects:
|
||||
- first:
|
||||
type: UnityEngine:Material
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1490454640683957070
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -155,7 +155,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 10, y: -9.5}
|
||||
m_SizeDelta: {x: 0, y: 19}
|
||||
m_SizeDelta: {x: 129, y: 19}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &1490454640683957068
|
||||
CanvasRenderer:
|
||||
|
|
@ -198,4 +198,4 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1.25
|
||||
m_Text:
|
||||
m_Text: sadasdasdasdasdsa
|
||||
|
|
|
|||
|
|
@ -1,5 +1,127 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1432916579318585938
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2236999083066815830}
|
||||
- component: {fileID: 6559099280534308083}
|
||||
- component: {fileID: 206386105563170521}
|
||||
- component: {fileID: 2527165378758680584}
|
||||
m_Layer: 5
|
||||
m_Name: LineGroupEditButton
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2236999083066815830
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1432916579318585938}
|
||||
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: 939320380630646945}
|
||||
m_Father: {fileID: 1599509669367794698}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -120, y: -1}
|
||||
m_SizeDelta: {x: 66, y: 31}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6559099280534308083
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1432916579318585938}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &206386105563170521
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1432916579318585938}
|
||||
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: a6fdbd8bf8891b3479c9b5a9dfd3b9f0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &2527165378758680584
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1432916579318585938}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 206386105563170521}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &1599509668874627678
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -65,6 +187,7 @@ MonoBehaviour:
|
|||
id:
|
||||
info_text: {fileID: 1599509669124742425}
|
||||
delete_button: {fileID: 1599509669367048339}
|
||||
edit_button: {fileID: 2527165378758680584}
|
||||
expand_button: {fileID: 8760029163542445447}
|
||||
line_item_content: {fileID: 1599509669335632704}
|
||||
child_line_items: []
|
||||
|
|
@ -421,6 +544,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 1599509669124742424}
|
||||
- {fileID: 1599509669367048338}
|
||||
- {fileID: 2236999083066815830}
|
||||
m_Father: {fileID: 1599509668874627679}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -591,3 +715,83 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5220\u9664"
|
||||
--- !u!1 &3061619370841479296
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 939320380630646945}
|
||||
- component: {fileID: 1372926974333498678}
|
||||
- component: {fileID: 6586877612638460622}
|
||||
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 &939320380630646945
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3061619370841479296}
|
||||
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: 2236999083066815830}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1372926974333498678
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3061619370841479296}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &6586877612638460622
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3061619370841479296}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_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: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u4FEE\u6539"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,126 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1474825848535286259
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 520170154516651132}
|
||||
- component: {fileID: 5437286874768704030}
|
||||
- component: {fileID: 1124570688048292070}
|
||||
- component: {fileID: 4793275375293178802}
|
||||
m_Layer: 5
|
||||
m_Name: LineEditButton
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &520170154516651132
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1474825848535286259}
|
||||
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: 2667098230181378332}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -50, y: 0}
|
||||
m_SizeDelta: {x: 24, y: 21}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5437286874768704030
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1474825848535286259}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1124570688048292070
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1474825848535286259}
|
||||
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: a7ec4b04b77a42e4c8758425faaaed87, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &4793275375293178802
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1474825848535286259}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 1124570688048292070}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &2667098229716931966
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -18,7 +139,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2667098229716931967
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -36,7 +157,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -50, y: 0}
|
||||
m_AnchoredPosition: {x: -17.7, y: 0}
|
||||
m_SizeDelta: {x: 24, y: 21}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2667098229716931962
|
||||
|
|
@ -133,6 +254,7 @@ GameObject:
|
|||
- component: {fileID: 2667098230181378330}
|
||||
- component: {fileID: 2667098230181378333}
|
||||
- component: {fileID: 6884019964645103951}
|
||||
- component: {fileID: 6838280647164711761}
|
||||
m_Layer: 5
|
||||
m_Name: LineItem
|
||||
m_TagString: Untagged
|
||||
|
|
@ -154,6 +276,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2667098230408268612}
|
||||
- {fileID: 2667098229716931967}
|
||||
- {fileID: 520170154516651132}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -212,9 +335,24 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: cbdc578a7eb422846b66e3b977742eff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
lineGroupItem: {fileID: 0}
|
||||
id:
|
||||
info_text: {fileID: 2667098230408268613}
|
||||
delete_button: {fileID: 2667098229716931964}
|
||||
set_button: {fileID: 4793275375293178802}
|
||||
--- !u!114 &6838280647164711761
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2667098230181378335}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 64467102d675a0d489eed16df3d00485, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
lines: []
|
||||
--- !u!1 &2667098230408268615
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5977727790842883243}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -80,6 +80,409 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u7EBF\u7F06\u7EC4"
|
||||
--- !u!1 &1015418939993141530
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8389859679296189216}
|
||||
- component: {fileID: 9115789400027054722}
|
||||
- component: {fileID: 7613804385335418841}
|
||||
m_Layer: 0
|
||||
m_Name: "\u4FEE\u6539\u7EBF\u7F06\u7EC4\u5F39\u6846"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &8389859679296189216
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1015418939993141530}
|
||||
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: 5977727791705923583}
|
||||
- {fileID: 5977727791436101996}
|
||||
- {fileID: 5697161400541773459}
|
||||
m_Father: {fileID: 5977727790842883243}
|
||||
m_RootOrder: 3
|
||||
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: 660, y: 10}
|
||||
m_SizeDelta: {x: 459.9053, y: 112.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9115789400027054722
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1015418939993141530}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &7613804385335418841
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1015418939993141530}
|
||||
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: 0.003921569}
|
||||
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: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &3028185674313517051
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7151763776902780413}
|
||||
- component: {fileID: 8602779126606850689}
|
||||
- component: {fileID: 2338436522025846382}
|
||||
- component: {fileID: 9158977203002215357}
|
||||
m_Layer: 5
|
||||
m_Name: "\u65B0\u589E"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7151763776902780413
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3028185674313517051}
|
||||
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: 6849155140971363056}
|
||||
m_Father: {fileID: 5977727790842883243}
|
||||
m_RootOrder: 2
|
||||
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: -138, y: 156.7}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8602779126606850689
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3028185674313517051}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2338436522025846382
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3028185674313517051}
|
||||
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: 1e2a8a944d6e53a409336c31414c9e00, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &9158977203002215357
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3028185674313517051}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 2338436522025846382}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &5088871980303575414
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5697161400541773459}
|
||||
- component: {fileID: 6847885396584424626}
|
||||
- component: {fileID: 4698186438538202751}
|
||||
- component: {fileID: 7361241085722543047}
|
||||
m_Layer: 5
|
||||
m_Name: CancelGroupBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5697161400541773459
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5088871980303575414}
|
||||
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: 1422131899428510246}
|
||||
m_Father: {fileID: 8389859679296189216}
|
||||
m_RootOrder: 2
|
||||
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: 80.3, y: -28.800026}
|
||||
m_SizeDelta: {x: 145, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6847885396584424626
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5088871980303575414}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &4698186438538202751
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5088871980303575414}
|
||||
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: 1e2a8a944d6e53a409336c31414c9e00, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &7361241085722543047
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5088871980303575414}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 4698186438538202751}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &5698637738966719551
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1422131899428510246}
|
||||
- component: {fileID: 7152026084472635239}
|
||||
- component: {fileID: 6770731743555528727}
|
||||
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 &1422131899428510246
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5698637738966719551}
|
||||
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: 5697161400541773459}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7152026084472635239
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5698637738966719551}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &6770731743555528727
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5698637738966719551}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_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: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u53D6\u6D88"
|
||||
--- !u!1 &5977727790324167057
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -112,7 +515,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 5977727790908149270}
|
||||
m_Father: {fileID: 5977727790842883243}
|
||||
m_RootOrder: 3
|
||||
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}
|
||||
|
|
@ -282,7 +685,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5977727790842883243
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -295,19 +698,19 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1789168725}
|
||||
- {fileID: 5977727791705923583}
|
||||
- {fileID: 5977727791436101996}
|
||||
- {fileID: 5977727790324167058}
|
||||
- {fileID: 1789168725}
|
||||
- {fileID: 7151763776902780413}
|
||||
- {fileID: 8389859679296189216}
|
||||
- {fileID: 5977727790386224057}
|
||||
m_Father: {fileID: 5977727791788803777}
|
||||
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_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 477, y: 464}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &5977727790842883253
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -505,7 +908,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u65B0\u589E"
|
||||
m_Text: "\u4FDD\u5B58"
|
||||
--- !u!1 &5977727791436101987
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -532,18 +935,18 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5977727791436101987}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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: 5977727791117286455}
|
||||
m_Father: {fileID: 5977727790842883243}
|
||||
m_RootOrder: 2
|
||||
m_Father: {fileID: 8389859679296189216}
|
||||
m_RootOrder: 1
|
||||
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: 142, y: -192}
|
||||
m_AnchoredPosition: {x: -70, y: -28.800026}
|
||||
m_SizeDelta: {x: 145, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5977727791436101999
|
||||
|
|
@ -731,6 +1134,7 @@ GameObject:
|
|||
- component: {fileID: 5977727791705923578}
|
||||
- component: {fileID: 5977727791705923577}
|
||||
- component: {fileID: 5977727791705923576}
|
||||
- component: {fileID: 1577567299}
|
||||
m_Layer: 5
|
||||
m_Name: InputField (Legacy)
|
||||
m_TagString: Untagged
|
||||
|
|
@ -745,19 +1149,19 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5977727791705923582}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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: 5977727791812832095}
|
||||
- {fileID: 5977727791749398742}
|
||||
m_Father: {fileID: 5977727790842883243}
|
||||
m_RootOrder: 1
|
||||
m_Father: {fileID: 8389859679296189216}
|
||||
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: -86, y: -192}
|
||||
m_AnchoredPosition: {x: 0, y: 22}
|
||||
m_SizeDelta: {x: 253, y: 39}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5977727791705923578
|
||||
|
|
@ -866,6 +1270,19 @@ MonoBehaviour:
|
|||
m_CaretWidth: 1
|
||||
m_ReadOnly: 0
|
||||
m_ShouldActivateOnSelect: 1
|
||||
--- !u!114 &1577567299
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5977727791705923582}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: cc33a39070010f94fb1c2dd721c1286d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
showHtmlElement: 0
|
||||
--- !u!1 &5977727791711232712
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1075,8 +1492,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: db8fc221c0fb7f2419a024b16723ae93, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
line_item_prefab: {fileID: 2667098230181378335, guid: 12df7b9b3c264e64aad9a33884f50ca5, type: 3}
|
||||
line_group_item_prefab: {fileID: 1599509668874627678, guid: fc36c10d4cd90194d831cc2dc36d6283, type: 3}
|
||||
line_item_prefab: {fileID: 2667098230181378335, guid: 12df7b9b3c264e64aad9a33884f50ca5,
|
||||
type: 3}
|
||||
line_group_item_prefab: {fileID: 1599509668874627678, guid: fc36c10d4cd90194d831cc2dc36d6283,
|
||||
type: 3}
|
||||
line_item_prefab_right: {fileID: 0}
|
||||
--- !u!114 &168195687
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1091,8 +1511,12 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
panel_object: {fileID: 5977727790842883242}
|
||||
line_group_name_inputfield: {fileID: 5977727791705923576}
|
||||
add_group_pop: {fileID: 1015418939993141530}
|
||||
add_group: {fileID: 9158977203002215357}
|
||||
add_line_group_button: {fileID: 5977727791436101997}
|
||||
cancel_line_group_button: {fileID: 7361241085722543047}
|
||||
line_group_content: {fileID: 5977727791711232712}
|
||||
line_content_right: {fileID: 0}
|
||||
child_line_group_items: []
|
||||
--- !u!1 &5977727791812832094
|
||||
GameObject:
|
||||
|
|
@ -1173,4 +1597,84 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Enter text...
|
||||
m_Text: "\u8BF7\u8F93\u5165\u8981\u6DFB\u52A0\u7684\u7EBF\u7F06\u7EC4"
|
||||
--- !u!1 &6686124221211937420
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6849155140971363056}
|
||||
- component: {fileID: 7416640596547299432}
|
||||
- component: {fileID: 6951767506438828466}
|
||||
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 &6849155140971363056
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6686124221211937420}
|
||||
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: 7151763776902780413}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7416640596547299432
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6686124221211937420}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &6951767506438828466
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6686124221211937420}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_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: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u65B0\u589E"
|
||||
|
|
|
|||
|
|
@ -635,6 +635,7 @@ Transform:
|
|||
- {fileID: 1216044468945674796}
|
||||
- {fileID: 3380113087612428462}
|
||||
- {fileID: 9145392569281217604}
|
||||
- {fileID: 6507021456934501556}
|
||||
- {fileID: 4606227941564826465}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
|
|
@ -3188,6 +3189,37 @@ MeshRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1 &7819569547687209623
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6507021456934501556}
|
||||
m_Layer: 8
|
||||
m_Name: "\u951A\u70B9"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &6507021456934501556
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7819569547687209623}
|
||||
m_LocalRotation: {x: 0.49999994, y: 0.49999994, z: 0.50000006, w: 0.50000006}
|
||||
m_LocalPosition: {x: 0.36010325, y: -0.0001450181, z: -0.7670001}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1482443928654217531}
|
||||
m_RootOrder: 22
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &7866227169619916445
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3493,7 +3525,7 @@ Transform:
|
|||
- {fileID: 3215141979336489926}
|
||||
- {fileID: 6577668458311560984}
|
||||
m_Father: {fileID: 1482443928654217531}
|
||||
m_RootOrder: 22
|
||||
m_RootOrder: 23
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &8103112712727533512
|
||||
MonoBehaviour:
|
||||
|
|
|
|||
|
|
@ -822,7 +822,7 @@ MeshCollider:
|
|||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 0
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -2628482395200241503, guid: 731c1953c34cccd4a8d49efd69dd6c38, type: 3}
|
||||
--- !u!1 &3768844296918734960
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ GameObject:
|
|||
- component: {fileID: 8705409318886409223}
|
||||
- component: {fileID: 6551912623838791407}
|
||||
- component: {fileID: 6420932691466826459}
|
||||
m_Layer: 13
|
||||
m_Layer: 0
|
||||
m_Name: Box007
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -1014,7 +1014,7 @@ GameObject:
|
|||
- component: {fileID: 18230950002480723}
|
||||
- component: {fileID: 1082453920981657461}
|
||||
- component: {fileID: 2537242244809760795}
|
||||
m_Layer: 13
|
||||
m_Layer: 0
|
||||
m_Name: Box015
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -1763,7 +1763,7 @@ GameObject:
|
|||
- component: {fileID: 5879843012903838384}
|
||||
- component: {fileID: -8610721817527210958}
|
||||
- component: {fileID: 7828976265506502286}
|
||||
- component: {fileID: 2530296630123795869}
|
||||
- component: {fileID: 6130277221473589664}
|
||||
m_Layer: 8
|
||||
m_Name: 87
|
||||
m_TagString: Untagged
|
||||
|
|
@ -2007,7 +2007,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
volume: 1
|
||||
selfIcon: {fileID: 21300000, guid: c044f1d15334dd94993b692a99422c22, type: 3}
|
||||
--- !u!64 &2530296630123795869
|
||||
--- !u!64 &6130277221473589664
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -2020,7 +2020,7 @@ MeshCollider:
|
|||
serializedVersion: 4
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 1147982090210902297, guid: 83eefee6678da1843a0dc34ed703a784, type: 3}
|
||||
m_Mesh: {fileID: 1147982090210902297, guid: 866bcdd263e291946b2c28e285dd68c0, type: 3}
|
||||
--- !u!1 &7468411469322519117
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -237,8 +237,10 @@ public class CameraRT : MonoBehaviour
|
|||
//PatternChoose.Inst.sb_xz_page.SetActive(false);
|
||||
//PatternChoose.Inst.dk_bj_page.SetActive(false);
|
||||
//PatternChoose.Inst.dk_xz_page.SetActive(false);
|
||||
PatternChoose.Inst.clspup();
|
||||
|
||||
GameManager.Inst.magnifyState = false;
|
||||
PatternChoose.Inst.clspup(CabinetUIManager.Instance.current_menu);
|
||||
//GameManager.Inst.magnifyState = false;
|
||||
|
||||
//if (cam.transform.position == pos && cam.transform.eulerAngles == rot)
|
||||
// return;
|
||||
|
|
@ -328,8 +330,10 @@ public class CameraRT : MonoBehaviour
|
|||
//PatternChoose.Inst.sb_xz_page.SetActive(false);
|
||||
//PatternChoose.Inst.dk_bj_page.SetActive(false);
|
||||
//PatternChoose.Inst.dk_xz_page.SetActive(false);
|
||||
PatternChoose.Inst.clspup();
|
||||
|
||||
GameManager.Inst.magnifyState = true;
|
||||
PatternChoose.Inst.clspup(CabinetUIManager.Instance.current_menu);
|
||||
//GameManager.Inst.magnifyState = true;
|
||||
|
||||
DOTween.To(() => x, (v) => x = v, _x, dotween_duration);
|
||||
DOTween.To(() => y, (v) => y = v, _y, dotween_duration);
|
||||
|
|
|
|||
|
|
@ -428,6 +428,65 @@ public class SearchName : MonoBehaviour
|
|||
TransparentGlowManage.Inst.renewALL(transparentGlows.ToArray());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 展示线缆组
|
||||
/// </summary>
|
||||
public void showXianLan(string co)
|
||||
{
|
||||
bool isFind = false;
|
||||
List<TransparentGlow> transparentGlows = new List<TransparentGlow>();
|
||||
|
||||
var s = PatternChoose.Inst.xianlan.gameObject.GetComponentsInChildren<LineInfor>(true);
|
||||
Array.ForEach(s, (item) =>
|
||||
{
|
||||
if (item.cableName == co)
|
||||
{
|
||||
isFind = true;
|
||||
if (ExtendedFlycam.Room.配电室 != ExtendedFlycam.Inst.room)
|
||||
{
|
||||
for (int i = 0; i < GameManager.Inst.Cabinets_go.Count; i++)
|
||||
{
|
||||
GameManager.Inst.Cabinets_go[i].GetComponent<TransparentGlow>().F1();
|
||||
}
|
||||
;
|
||||
GameObject go1 = GameManager.Inst.FindParent(item.lines[0].gameObject, GameManager.Inst.IsDesiredParent);
|
||||
GameObject go2 = GameManager.Inst.FindParent(item.lines[1].gameObject, GameManager.Inst.IsDesiredParent);
|
||||
transparentGlows.Add(go1.GetComponent<TransparentGlow>());
|
||||
transparentGlows.Add(go2.GetComponent<TransparentGlow>());
|
||||
item.gameObject.SetActive(true);
|
||||
item.transform.parent.gameObject.SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
PatternChoose.Inst.quanJing_fuc();
|
||||
for (int i = 0; i < GameManager.Inst.Cabinets_go.Count; i++)
|
||||
{
|
||||
GameManager.Inst.Cabinets_go[i].GetComponent<TransparentGlow>().F1();
|
||||
}
|
||||
GameObject go1 = GameManager.Inst.FindParent(item.lines[0].gameObject, GameManager.Inst.IsDesiredParent);
|
||||
GameObject go2 = GameManager.Inst.FindParent(item.lines[1].gameObject, GameManager.Inst.IsDesiredParent);
|
||||
transparentGlows.Add(go1.GetComponent<TransparentGlow>());
|
||||
transparentGlows.Add(go2.GetComponent<TransparentGlow>());
|
||||
item.gameObject.SetActive(true);
|
||||
item.transform.parent.gameObject.SetActive(true);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
item.gameObject.SetActive(false);
|
||||
}
|
||||
});
|
||||
|
||||
if (!isFind)
|
||||
{
|
||||
//弹出提示——该线缆组不包含线缆
|
||||
SecondConfirmPanel.DeleteConform(null, "该线缆组不包含线缆");
|
||||
//关闭多余线缆机柜
|
||||
//item.gameObject.SetActive(false);
|
||||
}
|
||||
TransparentGlowManage.Inst.renewALL(transparentGlows.ToArray());
|
||||
}
|
||||
|
||||
Predicate<Transform> findCabinet = (Transform go) =>
|
||||
{
|
||||
//端口-设备 go.parent
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
|
|
@ -15,6 +16,10 @@ public class LineGroupItem : MonoBehaviour
|
|||
/// </summary>
|
||||
public Button delete_button;
|
||||
/// <summary>
|
||||
/// 修改
|
||||
/// </summary>
|
||||
public Button edit_button;
|
||||
/// <summary>
|
||||
/// 展开
|
||||
/// </summary>
|
||||
public Button expand_button;
|
||||
|
|
@ -41,7 +46,19 @@ public class LineGroupItem : MonoBehaviour
|
|||
do_init = true;
|
||||
expand_button.onClick.AddListener(() =>
|
||||
{
|
||||
line_item_content.SetActive(!line_item_content.activeSelf);
|
||||
LineGroupManager.Instance.selected_group_name = info_text.text;
|
||||
LineGroupManager.Instance.Empty_line_content_right();
|
||||
for (int i = 0; i < child_line_items.Count; i++)
|
||||
{
|
||||
LineItem item = LineObjectPool.Instance.GetItemFromPool<LineItem>();
|
||||
item.transform.SetParent(LineGroupManager.Instance.line_content_right.transform);
|
||||
item.info_text.text = child_line_items[i].info_text.text;
|
||||
item.lineGroupItem = child_line_items[i].transform.parent.parent.GetComponent<LineGroupItem>();
|
||||
item.gameObject.GetComponent<LocatingCable>().lines = child_line_items[i].GetComponent<LocatingCable>().lines;
|
||||
|
||||
}
|
||||
//return;
|
||||
//line_item_content.SetActive(!line_item_content.activeSelf);
|
||||
});
|
||||
delete_button.onClick.AddListener(() =>
|
||||
{
|
||||
|
|
@ -51,14 +68,15 @@ public class LineGroupItem : MonoBehaviour
|
|||
if (delete)
|
||||
{
|
||||
var id = "";
|
||||
foreach (var item in LineQuery.Inst.keyValues)
|
||||
{
|
||||
if (item.Key == info_text.text)
|
||||
{
|
||||
id = item.Value;
|
||||
break;
|
||||
}
|
||||
}
|
||||
//foreach (var item in LineQuery.Inst.keyValues)
|
||||
//{
|
||||
// if (item.Key == info_text.text)
|
||||
// {
|
||||
// id = item.Value;
|
||||
// break;
|
||||
// }
|
||||
//}
|
||||
id = this.id;
|
||||
if (!string.IsNullOrEmpty(id))
|
||||
{
|
||||
LineQuery.Inst.StartCoroutine(LineQuery.Inst.deleteJsonCoroutine(id, (x) =>
|
||||
|
|
@ -84,19 +102,48 @@ public class LineGroupItem : MonoBehaviour
|
|||
}
|
||||
});
|
||||
});
|
||||
edit_button.onClick.AddListener(() =>
|
||||
{
|
||||
LineQuery.Inst.editJsonCoroutine(id, "", (x, y) =>
|
||||
{
|
||||
if (x)
|
||||
{
|
||||
StartCoroutine(LineQuery.Inst.Succeed((z) =>
|
||||
{
|
||||
if (z)
|
||||
{ }
|
||||
else
|
||||
{
|
||||
SecondConfirmPanel.DeleteConform(null, "更新场景失败");
|
||||
Debug.Log("接口获取数据失败（线缆组修改-初始化失败）");
|
||||
|
||||
}
|
||||
}));
|
||||
}
|
||||
else
|
||||
{
|
||||
string v = "修改线缆组失败";
|
||||
if (y != null)
|
||||
v = y.message;
|
||||
SecondConfirmPanel.DeleteConform(null, v);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加线缆
|
||||
/// </summary>
|
||||
[ContextMenu("添加")]
|
||||
public void AddLineItem(string info)
|
||||
public void AddLineItem(string info, List<Transform> lines)
|
||||
{
|
||||
var item = LineObjectPool.Instance.GetItemFromPool<LineItem>();
|
||||
item.transform.SetParent(line_item_content.transform);
|
||||
child_line_items.Add(item);
|
||||
//传递数据
|
||||
item.info_text.text = info;
|
||||
item.gameObject.GetComponent<LocatingCable>().lines = lines;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -11,19 +11,46 @@ public class LineGroupManager : MonoBehaviour
|
|||
Instance = this;
|
||||
}
|
||||
public GameObject panel_object;
|
||||
|
||||
/// <summary>
|
||||
/// 当前选中的线缆组名
|
||||
/// </summary>
|
||||
public string selected_group_name;
|
||||
public InputField line_group_name_inputfield;
|
||||
/// <summary>
|
||||
/// 新增线缆组弹窗
|
||||
/// </summary>
|
||||
public GameObject add_group_pop;
|
||||
/// <summary>
|
||||
/// 新增按钮
|
||||
/// </summary>
|
||||
public Button add_group;
|
||||
/// <summary>
|
||||
/// 保存新增线缆组
|
||||
/// </summary>
|
||||
public Button add_line_group_button;
|
||||
/// <summary>
|
||||
/// 取消新增线缆组
|
||||
/// </summary>
|
||||
public Button cancel_line_group_button;
|
||||
/// <summary>
|
||||
/// 线缆组容器
|
||||
/// </summary>
|
||||
public GameObject line_group_content;
|
||||
|
||||
/// <summary>
|
||||
/// 线缆容器（右）
|
||||
/// </summary>
|
||||
public GameObject line_content_right;
|
||||
|
||||
public List<LineGroupItem> child_line_group_items = new List<LineGroupItem>();
|
||||
|
||||
private void Start()
|
||||
{
|
||||
|
||||
add_group.onClick.AddListener(() =>
|
||||
{
|
||||
add_group_pop.SetActive(true);
|
||||
line_group_name_inputfield.text = string.Empty;
|
||||
});
|
||||
add_line_group_button.onClick.AddListener(() =>
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(line_group_name_inputfield.text))
|
||||
|
|
@ -32,6 +59,11 @@ public class LineGroupManager : MonoBehaviour
|
|||
LineQuery.Inst.StartCoroutine(LineQuery.Inst.SaveJsonCoroutine(line_group_name_inputfield.text));
|
||||
}
|
||||
});
|
||||
cancel_line_group_button.onClick.AddListener(() =>
|
||||
{
|
||||
add_group_pop.SetActive(false);
|
||||
line_group_name_inputfield.text = string.Empty;
|
||||
});
|
||||
}
|
||||
|
||||
public void addxianlan()
|
||||
|
|
@ -53,7 +85,7 @@ public class LineGroupManager : MonoBehaviour
|
|||
//lineGroupItem.AddLineItem(xianlan.transform.GetChild(j).GetComponent<LineInfor>().cableName);
|
||||
foreach (var item in xianlan.transform.GetChild(j).GetComponentsInChildren<LineInfor>(true))
|
||||
{
|
||||
lineGroupItem.AddLineItem(item.name);
|
||||
lineGroupItem.AddLineItem(item.name, item.lines);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -66,7 +98,7 @@ public class LineGroupManager : MonoBehaviour
|
|||
{
|
||||
if (!string.IsNullOrWhiteSpace(item.Key))
|
||||
{
|
||||
AddLineGroup(item.Key);
|
||||
AddLineGroup(item.Key, item.Value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -77,6 +109,7 @@ public class LineGroupManager : MonoBehaviour
|
|||
/// </summary>
|
||||
public void ShowPanel()
|
||||
{
|
||||
selected_group_name = string.Empty;
|
||||
panel_object.SetActive(true);
|
||||
AddLineGroupInit();
|
||||
}
|
||||
|
|
@ -86,6 +119,7 @@ public class LineGroupManager : MonoBehaviour
|
|||
/// </summary>
|
||||
public void HidePanel()
|
||||
{
|
||||
selected_group_name = string.Empty;
|
||||
panel_object.SetActive(false);
|
||||
}
|
||||
|
||||
|
|
@ -93,7 +127,7 @@ public class LineGroupManager : MonoBehaviour
|
|||
/// 添加线缆组
|
||||
/// </summary>
|
||||
/// <param name="name"></param>
|
||||
public void AddLineGroup(string name, bool success = true)
|
||||
public void AddLineGroup(string name, string id, bool success = true)
|
||||
{
|
||||
if (!success)
|
||||
{
|
||||
|
|
@ -112,8 +146,21 @@ public class LineGroupManager : MonoBehaviour
|
|||
child_line_group_items.Add(item);
|
||||
//传递数据
|
||||
item.info_text.text = name;
|
||||
item.id = id;
|
||||
|
||||
//处理完毕后清空输入框
|
||||
line_group_name_inputfield.SetTextWithoutNotify("");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 回收右侧对象
|
||||
/// </summary>
|
||||
public void Empty_line_content_right()
|
||||
{
|
||||
var l = line_content_right.GetComponentsInChildren<LineItem>();
|
||||
for (int i = l.Length - 1; i >= 0; i--)
|
||||
{
|
||||
LineObjectPool.Instance.PushItemToPool<LineItem>(l[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,32 @@ using UnityEngine.UI;
|
|||
|
||||
public class LineItem : MonoBehaviour
|
||||
{
|
||||
public LineGroupItem lineGroupItem;
|
||||
public string id;
|
||||
public Text info_text;
|
||||
public Button delete_button;
|
||||
public Button set_button;
|
||||
|
||||
bool do_init = false;
|
||||
|
||||
|
||||
public LineItem(string _id, Text _info_text, Button _delete_button, Button _set_button, bool isgo = false)
|
||||
{
|
||||
if (isgo)
|
||||
{
|
||||
id = _id;
|
||||
info_text = _info_text;
|
||||
delete_button = _delete_button;
|
||||
set_button = _set_button;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
var g = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsFindLineGroupItem);
|
||||
if (g != null && !lineGroupItem)
|
||||
lineGroupItem = g.GetComponent<LineGroupItem>();
|
||||
}
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
|
@ -20,6 +41,11 @@ public class LineItem : MonoBehaviour
|
|||
public void Init()
|
||||
{
|
||||
do_init = true;
|
||||
if (set_button)
|
||||
set_button.onClick.AddListener(() =>
|
||||
{
|
||||
Debug.Log("ÐÞ¸Ä");
|
||||
});
|
||||
delete_button.onClick.AddListener(() =>
|
||||
{
|
||||
//ɾ³ýÈ·ÈÏ
|
||||
|
|
@ -27,14 +53,15 @@ public class LineItem : MonoBehaviour
|
|||
{
|
||||
if (delete)
|
||||
{
|
||||
LineGroupItem lineGroup = transform.parent.parent.GetComponent<LineGroupItem>();
|
||||
LineQuery.Inst.deleteCableName(lineGroup.info_text.text, info_text.text, (x) =>
|
||||
//LineGroupItem lineGroup = transform.parent.parent.GetComponent<LineGroupItem>();
|
||||
//LineQuery.Inst.deleteCableName(lineGroup.info_text.text, info_text.text, (x) =>
|
||||
LineQuery.Inst.deleteCableName(lineGroupItem.info_text.text, info_text.text, (x) =>
|
||||
{
|
||||
if (!string.IsNullOrEmpty(x))
|
||||
{
|
||||
LineObjectPool.Instance.PushItemToPool(this);
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -48,5 +75,6 @@ public class LineItem : MonoBehaviour
|
|||
{
|
||||
id = string.Empty;
|
||||
info_text.text = string.Empty;
|
||||
lineGroupItem = null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,10 @@ public class LineObjectPool : MonoBehaviour
|
|||
/// 线缆组UI预制体
|
||||
/// </summary>
|
||||
public GameObject line_group_item_prefab;
|
||||
|
||||
/// <summary>
|
||||
/// 线缆预UI制体（右）
|
||||
/// </summary>
|
||||
public GameObject line_item_prefab_right;
|
||||
//-------池对象-------
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -38,7 +41,10 @@ public class LineObjectPool : MonoBehaviour
|
|||
/// 线缆组池对象
|
||||
/// </summary>
|
||||
public Queue<LineGroupItem> line_group_item_pool = new Queue<LineGroupItem>();
|
||||
|
||||
/// <summary>
|
||||
/// 线缆池对象（右）
|
||||
/// </summary>
|
||||
public Queue<LineItem> line_item_pool_right = new Queue<LineItem>();
|
||||
//-------池操作-------
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using UnityEngine;
|
||||
using System.Net.WebSockets;
|
||||
using static InterfaceManager;
|
||||
using System.Threading;
|
||||
using System;
|
||||
using System.Text;
|
||||
using Unity.VisualScripting;
|
||||
using System.Threading;
|
||||
using UnityEngine;
|
||||
using static InterfaceManager;
|
||||
|
||||
public class RobotDataManager : MonoBehaviour
|
||||
{
|
||||
|
|
|
|||
|
|
@ -510,6 +510,9 @@ public class UIToCabinet : MonoBehaviour
|
|||
CabinetUIManager.ChangeMenu(Menu.M_数字孪生_线缆连接_配置);
|
||||
|
||||
isContinue_menu = true;
|
||||
|
||||
LineGroupManager.Instance.ShowPanel();
|
||||
SecondConfirmPanel.Instance.panel_object.SetActive(false);
|
||||
}
|
||||
break;
|
||||
case "Toggle_线缆组配置":
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 568 B |
|
|
@ -901,6 +901,8 @@ public class GameManager : MonoBehaviour
|
|||
{
|
||||
if (TmsCards[j].shelfId == jk.deviceList.id)
|
||||
{
|
||||
if (jk.deviceList.id == "1691457954939693354" && TmsCards[j].id == "1691457954939693370")
|
||||
Debug.Log(1);
|
||||
//获取模型编号
|
||||
string modelNum = TmsCards[j].modelNum;
|
||||
if (string.IsNullOrEmpty(modelNum))
|
||||
|
|
@ -922,12 +924,14 @@ public class GameManager : MonoBehaviour
|
|||
drag.oriObjectPrefab = go.GetComponent<DragTest1>();
|
||||
drag.uPosManger = jk.transform.Find("U位").GetComponent<UPosManger>();
|
||||
drag.CountUPos(drag.oriObjectPrefab, Convert.ToInt32(U) - 1);
|
||||
break;
|
||||
//break;
|
||||
continue;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError("板卡模型生成错误，设备：" + jk.name + "，模型编号：" + modelNum + "，U位：" + U + "\n" + e.Message + "\n" + e.StackTrace);
|
||||
break;
|
||||
//break;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2152,6 +2156,18 @@ public class GameManager : MonoBehaviour
|
|||
return (uPosItem != null);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 条件--LineGroupItem
|
||||
/// </summary>
|
||||
/// <param name="go"></param>
|
||||
/// <returns></returns>
|
||||
public bool IsFindLineGroupItem(GameObject go)
|
||||
{
|
||||
LineGroupItem lineGroupItem = go.GetComponent<LineGroupItem>();
|
||||
return (lineGroupItem != null);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 读取地址
|
||||
public IEnumerator LoadAddress(Action<string> callback)
|
||||
|
|
@ -2346,6 +2362,7 @@ public class GameManager : MonoBehaviour
|
|||
Load_Port();
|
||||
//Load_TmsAlarm();
|
||||
//Load_ENV();
|
||||
LineGroupManager.Instance.Empty_line_content_right();
|
||||
Debug.Log("@@6");
|
||||
TransparentGlowManage.Inst.addScript();
|
||||
Debug.Log("@@7");
|
||||
|
|
@ -2424,7 +2441,9 @@ public class GameManager : MonoBehaviour
|
|||
}
|
||||
else if (modelNum == "19")
|
||||
{
|
||||
MoveParentAndChildren(go.transform, new Vector3(-0.27f, 0f, -0), false);
|
||||
//MoveParentAndChildren(go.transform, new Vector3(-0.27f, 0f, -0), false);
|
||||
go.transform.localPosition = Vector3.zero;
|
||||
MoveParentAndChildren(go.transform, new Vector3(0, 0.022f, 0), false);
|
||||
}
|
||||
else if (modelNum == "24" || modelNum == "34")
|
||||
{
|
||||
|
|
@ -2440,7 +2459,8 @@ public class GameManager : MonoBehaviour
|
|||
}
|
||||
else if (modelNum == "37" || modelNum == "41")
|
||||
{
|
||||
MoveParentAndChildren(go.transform, new Vector3(0, 0.0685f, 0), false);
|
||||
//MoveParentAndChildren(go.transform, new Vector3(0, 0.0685f, 0), false);
|
||||
//MoveParentAndChildren(go.transform, new Vector3(0, 0f, -0), false);
|
||||
}
|
||||
else if (modelNum == "55")
|
||||
{
|
||||
|
|
@ -2466,6 +2486,14 @@ public class GameManager : MonoBehaviour
|
|||
{
|
||||
MoveParentAndChildren(go.transform, new Vector3(-0.258f, 0, 0), false);
|
||||
}
|
||||
else if (modelNum == "99")
|
||||
{
|
||||
MoveParentAndChildren(go.transform, new Vector3(0, 0, 0), false);
|
||||
}
|
||||
else if (modelNum == "100" || modelNum == "101")
|
||||
{
|
||||
MoveParentAndChildren(go.transform, new Vector3(-0.233f, 0, 0), false);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -2485,7 +2513,24 @@ public class GameManager : MonoBehaviour
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 滑动UI自适应高度
|
||||
/// </summary>
|
||||
/// <param name="popup"></param>
|
||||
/// <param name="content"></param>
|
||||
/// <param name="content_ret"></param>
|
||||
/// <param name="content_grid"></param>
|
||||
public void AdaptiveHight(GameObject popup, Transform content, RectTransform content_ret, GridLayoutGroup content_grid)
|
||||
{
|
||||
//var content_ret= content.GetComponent<RectTransform>();
|
||||
//var content_grid = content.GetComponent<GridLayoutGroup>();
|
||||
if (popup.activeSelf)
|
||||
{
|
||||
float x = content_ret.sizeDelta.x;
|
||||
float y = content_grid.padding.top + content.childCount * content_grid.cellSize.y + (content.childCount - 1) * content_grid.spacing.y;
|
||||
content_ret.sizeDelta = new Vector2(x, y);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -2551,11 +2596,15 @@ public class GameManager : MonoBehaviour
|
|||
/// <summary>
|
||||
/// 线缆组-新增URL
|
||||
/// </summary>
|
||||
[Header("线缆组-查询URL")] public string xlz_xz;
|
||||
[Header("线缆组-新增URL")] public string xlz_xz;
|
||||
/// <summary>
|
||||
/// 线缆组-删除URL
|
||||
/// </summary>
|
||||
[Header("线缆组-查询URL")] public string xlz_sc;
|
||||
[Header("线缆组-删除URL")] public string xlz_sc;
|
||||
/// <summary>
|
||||
/// 线缆组-编辑URL
|
||||
/// </summary>
|
||||
[Header("线缆组-编辑URL")] public string xlz_bj;
|
||||
|
||||
/// <summary>
|
||||
/// 线路类型-查询URL
|
||||
|
|
@ -2609,6 +2658,7 @@ public class GameManager : MonoBehaviour
|
|||
xlz_cx = ct + "deviceLine/queryList";
|
||||
xlz_xz = ct + "deviceLine/save";
|
||||
xlz_sc = ct + "deviceLine/delete";
|
||||
xlz_bj = ct + "deviceLine/updateById";
|
||||
|
||||
xllx_cx = ct + "sysParam/getByCode?code=line";
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ MonoImporter:
|
|||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
executionOrder: -20
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ public static class CombineJSON
|
|||
|
||||
public static string Decrypt(string cipherText, string key = "1234567890adbcde", string iv = "1234567890hjlkew")
|
||||
{
|
||||
//return cipherText;
|
||||
return cipherText;
|
||||
try
|
||||
{
|
||||
byte[] keyBytes = Encoding.UTF8.GetBytes(key);
|
||||
|
|
@ -444,7 +444,7 @@ public static class CombineJSON
|
|||
|
||||
public static string Encrypt(string plainText, string key = "1234567890adbcde", string iv = "1234567890hjlkew")
|
||||
{
|
||||
//return plainText;
|
||||
return plainText;
|
||||
using (AesManaged aesAlg = new AesManaged())
|
||||
{
|
||||
aesAlg.Key = Encoding.UTF8.GetBytes(key);
|
||||
|
|
|
|||
|
|
@ -102,7 +102,8 @@ namespace Toolset.UI
|
|||
}
|
||||
else
|
||||
{
|
||||
maxValue = startValue + (rect.childCount - 1) * addValue;
|
||||
//maxValue = startValue + (rect.childCount - 1) * addValue;
|
||||
maxValue = startValue + (num - 1) * addValue;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ public class PatternChoose : MonoBehaviour
|
|||
|
||||
niaoKan.onValueChanged.AddListener((x) =>
|
||||
{
|
||||
ExtendedFlycam.Inst.reminder((isgo) =>
|
||||
ExtendedFlycam.Inst.reminder((isgo) =>
|
||||
{
|
||||
if (isgo)
|
||||
{
|
||||
|
|
@ -281,11 +281,12 @@ public class PatternChoose : MonoBehaviour
|
|||
/// <summary>
|
||||
/// 关闭所有弹窗
|
||||
/// </summary>
|
||||
public void clspup()
|
||||
public void clspup(Menu menu = Menu.None)
|
||||
{
|
||||
sb_bj_page.SetActive(false);
|
||||
sb_xz_page.SetActive(false);
|
||||
dk_bj_page.SetActive(false);
|
||||
if (Menu.M_数字孪生_线缆连接_配置 != menu || !GameManager.Inst.magnifyState)
|
||||
dk_bj_page.SetActive(false);
|
||||
dk_xz_page.SetActive(false);
|
||||
sb_ck_page.SetActive(false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
using DG.Tweening;
|
||||
using Newtonsoft.Json;
|
||||
using SimpleJSON;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Networking;
|
||||
using UnityEngine.UI;
|
||||
using SimpleJSON;
|
||||
using static GameManager;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
public class WebInteraction : MonoBehaviour
|
||||
{
|
||||
|
|
@ -46,7 +45,7 @@ public class WebInteraction : MonoBehaviour
|
|||
/// <summary>
|
||||
/// Toggle³õʼisOn
|
||||
/// </summary>
|
||||
[Tooltip("Toggle³õʼisOn")]public bool _ison;
|
||||
[Tooltip("Toggle³õʼisOn")] public bool _ison;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,10 +1,15 @@
|
|||
using Newtonsoft.Json;
|
||||
using SimpleJSON;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 线缆组
|
||||
/// </summary>
|
||||
[AddComponentMenu("LineQuery/线缆组")]
|
||||
public class LineQuery : MonoBehaviour
|
||||
{
|
||||
public static LineQuery Inst;
|
||||
|
|
@ -25,7 +30,7 @@ public class LineQuery : MonoBehaviour
|
|||
|
||||
private void Awake()
|
||||
{
|
||||
|
||||
|
||||
if (Inst != this && Inst != null)
|
||||
{
|
||||
Destroy(this.gameObject);
|
||||
|
|
@ -73,7 +78,7 @@ public class LineQuery : MonoBehaviour
|
|||
d.id = root.data[i].id;
|
||||
d.lineContentJson = root.data[i].lineContentJson;
|
||||
dic.Add(d);
|
||||
LineGroupManager.Instance.AddLineGroup(d.lineContentJson);
|
||||
LineGroupManager.Instance.AddLineGroup(d.lineContentJson, root.data[i].id);
|
||||
}
|
||||
}
|
||||
callback?.Invoke("1");
|
||||
|
|
@ -149,7 +154,7 @@ public class LineQuery : MonoBehaviour
|
|||
if (x != null && root != null && root.message == "²Ù×÷³É¹¦")
|
||||
{
|
||||
|
||||
LineGroupManager.Instance.AddLineGroup(lineContentJson);
|
||||
LineGroupManager.Instance.AddLineGroup(lineContentJson, root.data);
|
||||
keyValues.Add(lineContentJson, root.data);
|
||||
}
|
||||
else
|
||||
|
|
@ -240,6 +245,39 @@ public class LineQuery : MonoBehaviour
|
|||
);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 编辑线缆组
|
||||
/// </summary>
|
||||
public void editJsonCoroutine(string _id, string _lineContentJson, Action<bool, Root> callback)
|
||||
{
|
||||
Root_edit root_Edit = new Root_edit
|
||||
{
|
||||
id = _id,
|
||||
lineContentJson = _lineContentJson
|
||||
};
|
||||
string newData = JsonConvert.SerializeObject(root_Edit);
|
||||
StartCoroutine(CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.xlz_bj, GameManager.Inst.arguments.token, newData, (jsonResult) =>
|
||||
{
|
||||
try
|
||||
{
|
||||
var root = JsonConvert.DeserializeObject<Root>(jsonResult);
|
||||
if (root.message == "操作成功")
|
||||
{
|
||||
callback.Invoke(true, root);
|
||||
}
|
||||
else
|
||||
{
|
||||
callback.Invoke(false, root);
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
callback.Invoke(false, null);
|
||||
}
|
||||
|
||||
}));
|
||||
}
|
||||
|
||||
// ɾ³ýÏßÀÂ
|
||||
public void deleteCableName(string cableGroupName, string CableName, Action<string> callback)
|
||||
{
|
||||
|
|
@ -351,6 +389,7 @@ public class LineQuery : MonoBehaviour
|
|||
/// </summary>
|
||||
public string createTime;
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
public class Root
|
||||
{
|
||||
|
|
@ -407,5 +446,11 @@ public class LineQuery : MonoBehaviour
|
|||
/// </summary>
|
||||
public string id;
|
||||
}
|
||||
|
||||
public class Root_edit
|
||||
{
|
||||
public string id;
|
||||
public string lineContentJson;
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -118,9 +118,9 @@ public class PortQuery : MonoBehaviour
|
|||
/// </summary>
|
||||
[Tooltip("端口位置")] public string portPosition;
|
||||
/// <summary>
|
||||
/// 所属设备
|
||||
/// 所属设备（ID）
|
||||
/// </summary>
|
||||
[Tooltip("所属设备")] public string deviceId;
|
||||
[Tooltip("所属设备（ID）")] public string deviceId;
|
||||
/// <summary>
|
||||
/// 所属设备名称
|
||||
/// </summary>
|
||||
|
|
@ -134,9 +134,9 @@ public class PortQuery : MonoBehaviour
|
|||
/// </summary>
|
||||
[Tooltip("是否启用：1-正常；0-禁用")] public string status;
|
||||
/// <summary>
|
||||
/// 对联设备
|
||||
/// 对联设备（ID）
|
||||
/// </summary>
|
||||
[Tooltip("对联设备")] public string conDevice;
|
||||
[Tooltip("对联设备（ID）")] public string conDevice;
|
||||
/// <summary>
|
||||
/// 对联设备名称
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ public class ClickEvent : MonoBehaviour
|
|||
//PatternChoose.Inst.dk_bj_page.SetActive(false);
|
||||
//PatternChoose.Inst.dk_xz_page.SetActive(false);
|
||||
//PatternChoose.Inst.sb_ck_page.SetActive(false);
|
||||
PatternChoose.Inst.clspup();
|
||||
PatternChoose.Inst.clspup(CabinetUIManager.Instance.current_menu);
|
||||
GameManager.Inst.now_CK_Device = null;
|
||||
|
||||
GameManager.Inst.search_box.SetActive(false);
|
||||
|
|
@ -205,7 +205,7 @@ public class ClickEvent : MonoBehaviour
|
|||
//drag.oriObjectPrefab = gameObject.GetComponent<DragTest1>();
|
||||
gameObject.GetComponent<DeviceItem>().OnselfClick();
|
||||
GameManager.Inst.objectToShow_add.SetActive(true);
|
||||
if (CarouselMenuALL.Inst.gameObject.activeSelf)
|
||||
if (CarouselMenuALL.Inst.gameObject.activeSelf)
|
||||
{
|
||||
CarouselMenuALL.Inst.Filter_Type();
|
||||
}
|
||||
|
|
@ -243,7 +243,7 @@ public class ClickEvent : MonoBehaviour
|
|||
//PatternChoose.Inst.dk_bj_page.SetActive(false);
|
||||
//PatternChoose.Inst.dk_xz_page.SetActive(false);
|
||||
//PatternChoose.Inst.sb_ck_page.SetActive(false);
|
||||
PatternChoose.Inst.clspup();
|
||||
PatternChoose.Inst.clspup(Menu.M_数字孪生_线缆连接_配置);
|
||||
GameManager.Inst.now_CK_Device = null;
|
||||
|
||||
|
||||
|
|
@ -334,6 +334,19 @@ public class ClickEvent : MonoBehaviour
|
|||
//GameManager.Inst.lastDevice.GetComponent<PortQuery>().hight.GetComponent<Renderer>().materials[0] = Resources.Load<Material>("Materials/4Tou");
|
||||
}
|
||||
|
||||
if (RedactPort.Inst.toggle.isOn)//当前选择的为起始端口
|
||||
{
|
||||
RedactPort.Inst.PortList1 = p.portList;
|
||||
RedactPort.Inst.PortList1_game = gameObject;
|
||||
RedactPort.Inst.AutoShowInfo(RedactPort.Inst.PortList1);
|
||||
}
|
||||
else
|
||||
{
|
||||
RedactPort.Inst.PortList2 = p.portList;
|
||||
RedactPort.Inst.PortList2_game = gameObject;
|
||||
RedactPort.Inst.AutoShowInfo(RedactPort.Inst.PortList2);
|
||||
}
|
||||
|
||||
GameManager.Inst.lastDevice = gameObject;
|
||||
GameManager.Inst.lastDeviceID = p.portList.id;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue