gaoguozheng
/
GQ_Communicate
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tb

This commit is contained in:
高国正 2023-09-13 17:02:26 +08:00
parent 936b9c9a94
commit ed542fd3fc
29 changed files with 5282 additions and 675 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GQ_TongXin/Assets/Adam/Scripts/DragController.cs
View File

@ -87,6 +87,10 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
{ {
GameManager.Inst.MoveParentAndChildren(targetObject.transform, new Vector3(-0.25f, 0, 0)); GameManager.Inst.MoveParentAndChildren(targetObject.transform, new Vector3(-0.25f, 0, 0));
} }
else if (oriObjectPrefab.name == "18")
{
GameManager.Inst.MoveParentAndChildren(targetObject.transform, new Vector3(0, 0f, -0.02f));
}
targetObject.GetComponent<TransparentGlow>().F2(); targetObject.GetComponent<TransparentGlow>().F2();
currentUPosItem = null; currentUPosItem = null;
targetObject = null; targetObject = null;

BIN
GQ_TongXin/Assets/Model/9.13/蓄电池房间柜子.FBX Normal file
View File

Binary file not shown.

BIN
GQ_TongXin/Assets/Model/9.13/降低高度的两个房间.FBX Normal file
View File

Binary file not shown.

2
GQ_TongXin/Assets/Prefabs/Prefabs/告警图标/报警.prefab
View File

@ -1193,6 +1193,8 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
targetCamera: {fileID: 0} targetCamera: {fileID: 0}
distanceMultiplier: 0.04 distanceMultiplier: 0.04
button: {fileID: 0}
text: {fileID: 0}
--- !u!1 &6020242228979647709 --- !u!1 &6020242228979647709
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

89
GQ_TongXin/Assets/Prefabs/Prefabs/摄像头/摄像头_web.prefab
View File

@ -276,7 +276,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 2100000, guid: 3a3b5242babc65a4c898f644975a9f50, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@ -367,7 +367,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 7036184066493150729}
m_Father: {fileID: 5099096164770772711} m_Father: {fileID: 5099096164770772711}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -391,7 +392,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4568529563820045235} m_GameObject: {fileID: 4568529563820045235}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name: m_Name:
@ -473,6 +474,86 @@ MonoBehaviour:
m_hasFontAssetChanged: 1 m_hasFontAssetChanged: 1
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &4981678722631788491
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7036184066493150729}
- component: {fileID: 5166129179365329052}
- component: {fileID: 5390959122517887407}
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 &7036184066493150729
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4981678722631788491}
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: 7909258536741902972}
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 &5166129179365329052
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4981678722631788491}
m_CullTransparentMesh: 1
--- !u!114 &5390959122517887407
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4981678722631788491}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 3a3b5242babc65a4c898f644975a9f50, type: 2}
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: 20
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6444\u50CF01"
--- !u!1 &6206996799658441977 --- !u!1 &6206996799658441977
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -732,6 +813,8 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
button: {fileID: 4332229852258479005} button: {fileID: 4332229852258479005}
text: {fileID: 2224874554742167492} text: {fileID: 2224874554742167492}
text1: {fileID: 5390959122517887407}
maodian: {fileID: 6206996800505932346}
--- !u!114 &7186680284490958309 --- !u!114 &7186680284490958309
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

12
GQ_TongXin/Assets/Prefabs/Prefabs/温湿度图标/温湿度.prefab
View File

@ -311,13 +311,13 @@ MonoBehaviour:
shidu_selected: {fileID: 21300000, guid: cf0029eed200f6741a2d40138edbe8cf, type: 3} shidu_selected: {fileID: 21300000, guid: cf0029eed200f6741a2d40138edbe8cf, type: 3}
yangan_normal: {fileID: 21300000, guid: 0357a829ccc2daa4e9aee2af4d522ae9, type: 3} yangan_normal: {fileID: 21300000, guid: 0357a829ccc2daa4e9aee2af4d522ae9, type: 3}
yangan_selected: {fileID: 21300000, guid: f007671b4f6062646a0382930e2cecfa, type: 3} yangan_selected: {fileID: 21300000, guid: f007671b4f6062646a0382930e2cecfa, type: 3}
shuijin_normal: {fileID: 0} shuijin_normal: {fileID: 21300000, guid: 43a3ab16332d7074aa7ddd1a63d31e0c, type: 3}
shuijin_selected: {fileID: 0} shuijin_selected: {fileID: 21300000, guid: b99a3945cbef73d4989260d0b0d760c4, type: 3}
expand_image: {fileID: 6206996800221561048} expand_image: {fileID: 6206996800221561048}
wendu_expand: {fileID: 21300000, guid: 5b1b5e55f3cd87f4886d3bb9c4f68651, type: 3} wendu_expand: {fileID: 21300000, guid: 5b1b5e55f3cd87f4886d3bb9c4f68651, type: 3}
shidu_expand: {fileID: 21300000, guid: 103d978a53ab87c48b69a1bd50d86390, type: 3} shidu_expand: {fileID: 21300000, guid: 103d978a53ab87c48b69a1bd50d86390, type: 3}
yangan_expand: {fileID: 21300000, guid: 484e09e8d24e4d94391ed0b9f6b1880f, type: 3} yangan_expand: {fileID: 21300000, guid: 484e09e8d24e4d94391ed0b9f6b1880f, type: 3}
shuijin_expand: {fileID: 0} shuijin_expand: {fileID: 21300000, guid: 6e4faef47cd2cbc40b4d6dcb95220d37, type: 3}
textMeshPro: {fileID: 6206996799658441959} textMeshPro: {fileID: 6206996799658441959}
text: {fileID: 3083355702494639820} text: {fileID: 3083355702494639820}
hightC: {r: 0.99215686, g: 0.34117648, b: 0.34117648, a: 1} hightC: {r: 0.99215686, g: 0.34117648, b: 0.34117648, a: 1}
@ -487,13 +487,13 @@ MonoBehaviour:
shidu_selected: {fileID: 21300000, guid: cf0029eed200f6741a2d40138edbe8cf, type: 3} shidu_selected: {fileID: 21300000, guid: cf0029eed200f6741a2d40138edbe8cf, type: 3}
yangan_normal: {fileID: 21300000, guid: 0357a829ccc2daa4e9aee2af4d522ae9, type: 3} yangan_normal: {fileID: 21300000, guid: 0357a829ccc2daa4e9aee2af4d522ae9, type: 3}
yangan_selected: {fileID: 21300000, guid: f007671b4f6062646a0382930e2cecfa, type: 3} yangan_selected: {fileID: 21300000, guid: f007671b4f6062646a0382930e2cecfa, type: 3}
shuijin_normal: {fileID: 0} shuijin_normal: {fileID: 21300000, guid: 43a3ab16332d7074aa7ddd1a63d31e0c, type: 3}
shuijin_selected: {fileID: 0} shuijin_selected: {fileID: 21300000, guid: b99a3945cbef73d4989260d0b0d760c4, type: 3}
expand_image: {fileID: 6206996800221561048} expand_image: {fileID: 6206996800221561048}
wendu_expand: {fileID: 21300000, guid: 5b1b5e55f3cd87f4886d3bb9c4f68651, type: 3} wendu_expand: {fileID: 21300000, guid: 5b1b5e55f3cd87f4886d3bb9c4f68651, type: 3}
shidu_expand: {fileID: 21300000, guid: 103d978a53ab87c48b69a1bd50d86390, type: 3} shidu_expand: {fileID: 21300000, guid: 103d978a53ab87c48b69a1bd50d86390, type: 3}
yangan_expand: {fileID: 21300000, guid: 484e09e8d24e4d94391ed0b9f6b1880f, type: 3} yangan_expand: {fileID: 21300000, guid: 484e09e8d24e4d94391ed0b9f6b1880f, type: 3}
shuijin_expand: {fileID: 0} shuijin_expand: {fileID: 21300000, guid: 6e4faef47cd2cbc40b4d6dcb95220d37, type: 3}
textMeshPro: {fileID: 6206996799658441959} textMeshPro: {fileID: 6206996799658441959}
text: {fileID: 3083355702494639820} text: {fileID: 3083355702494639820}
hightC: {r: 0.99215686, g: 0.34117648, b: 0.34117648, a: 1} hightC: {r: 0.99215686, g: 0.34117648, b: 0.34117648, a: 1}

4442
GQ_TongXin/Assets/Scenes/SampleSceneG.unity
View File

File diff suppressed because it is too large Load Diff

10
GQ_TongXin/Assets/Scripts/WJ/LineGroup/LineItem.cs
View File

@ -27,7 +27,15 @@ public class LineItem : MonoBehaviour
{ {
if (delete) if (delete)
{ {
LineObjectPool.Instance.PushItemToPool(this); LineGroupItem lineGroup = transform.parent.parent.GetComponent<LineGroupItem>();
LineQuery.Inst.deleteCableName(lineGroup.info_text.text, info_text.text, (x) =>
{
if (!string.IsNullOrEmpty(x))
{
LineObjectPool.Instance.PushItemToPool(this);
}
});
} }
}); });
}); });

10
GQ_TongXin/Assets/Scripts/WJ/RoomDoor.cs
View File

@ -7,7 +7,7 @@ using UnityEngine.EventSystems;
public class RoomDoor : MonoBehaviour public class RoomDoor : MonoBehaviour
{ {
public bool is_open; public bool is_open;
private bool is_rotating; [SerializeField]private bool is_rotating;
public Vector3 close_angle = new Vector3(-90, 0, 0); public Vector3 close_angle = new Vector3(-90, 0, 0);
public Vector3 open_angle = new Vector3(-90, 0, 90); public Vector3 open_angle = new Vector3(-90, 0, 90);
@ -26,7 +26,7 @@ public class RoomDoor : MonoBehaviour
private void OnMouseDown() private void OnMouseDown()
{ {
if (is_open) if (!EventSystem.current.IsPointerOverGameObject() && is_open)
{ {
DoorClose(); DoorClose();
} }
@ -38,8 +38,9 @@ public class RoomDoor : MonoBehaviour
public void DoorOpen() public void DoorOpen()
{ {
if (!EventSystem.current.IsPointerOverGameObject() && !is_rotating) if (!is_rotating)
{ {
//DOTween.Kill(transform, false);
is_rotating = true; is_rotating = true;
//DOTween.To(() => transform.localEulerAngles, v => transform.localEulerAngles = v, open_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = true; }); //DOTween.To(() => transform.localEulerAngles, v => transform.localEulerAngles = v, open_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = true; });
transform.DOLocalRotate(open_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = true; }); transform.DOLocalRotate(open_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = true; });
@ -50,8 +51,9 @@ public class RoomDoor : MonoBehaviour
public void DoorClose() public void DoorClose()
{ {
if (!EventSystem.current.IsPointerOverGameObject() && !is_rotating) if (!is_rotating)
{ {
//DOTween.Kill(transform, false);
is_rotating = true; is_rotating = true;
//DOTween.To(() => transform.localEulerAngles, v => transform.localEulerAngles = v, close_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = false; }); //DOTween.To(() => transform.localEulerAngles, v => transform.localEulerAngles = v, close_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = false; });
transform.DOLocalRotate(close_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = false; }); transform.DOLocalRotate(close_angle, 0.5f).OnComplete(() => { is_rotating = false; is_open = false; });

1
GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs
View File

@ -326,6 +326,7 @@ public class UIToCabinet : MonoBehaviour
PatternChoose.Inst.xunJianImg.gameObject.SetActive(false); PatternChoose.Inst.xunJianImg.gameObject.SetActive(false);
WebInteraction.Inst.CloseVideo(WebInteraction.Inst.current_videoNumber); WebInteraction.Inst.CloseVideo(WebInteraction.Inst.current_videoNumber);
GameManager.Inst.power_close(); GameManager.Inst.power_close();
GameManager.Inst.CloseHighlight();
if (GameManager.Inst.objectToShow_add.activeSelf) if (GameManager.Inst.objectToShow_add.activeSelf)
{ {

2
GQ_TongXin/Assets/StreamingAssets/dz.txt
View File

@ -1 +1 @@
http://192.168.137.166:8081/ http://127.0.0.1:8081/

BIN
GQ_TongXin/Assets/UI/切图/.DS_Store vendored Normal file
View File

Binary file not shown.

BIN
GQ_TongXin/Assets/UI/切图/未选中.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
GQ_TongXin/Assets/UI/切图/框.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
GQ_TongXin/Assets/UI/切图/水浸.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
GQ_TongXin/Assets/UI/切图/组2556拷贝12.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
GQ_TongXin/Assets/UI/切图/组2556拷贝16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
GQ_TongXin/Assets/UI/切图/选中.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

756
GQ_TongXin/Assets/prefab/摄像头.prefab
View File

@ -1112,6 +1112,184 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6689823790935228980, guid: 8e86fc71817b170489773fa9e18553d9, type: 3} m_CorrespondingSourceObject: {fileID: 6689823790935228980, guid: 8e86fc71817b170489773fa9e18553d9, type: 3}
m_PrefabInstance: {fileID: 1793187679} m_PrefabInstance: {fileID: 1793187679}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &424655601997907713
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8657939655263598690}
m_Modifications:
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_text
value: "\u6444\u50CF12"
objectReference: {fileID: 0}
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083355702494639820, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.x
value: -1.27
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.y
value: -0.73
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.z
value: 1.93
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_Name
value: "\u6444\u50CF\u5934_web"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3}
--- !u!1001 &2596296864961810313
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 173050369263777980}
m_Modifications:
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_text
value: "\u6444\u50CF12"
objectReference: {fileID: 0}
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083355702494639820, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.x
value: -1.143
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.244
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.z
value: 1.526
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_Name
value: "\u6444\u50CF\u5934_web"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3}
--- !u!1001 &3367761129340664206 --- !u!1001 &3367761129340664206
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1267,6 +1445,184 @@ MeshCollider:
m_Convex: 1 m_Convex: 1
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: 9207495791938643184, guid: a2233f757f686834b88d986912a293ee, type: 3} m_Mesh: {fileID: 9207495791938643184, guid: a2233f757f686834b88d986912a293ee, type: 3}
--- !u!1001 &6734446852074973112
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3741181618873507920}
m_Modifications:
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_text
value: "\u6444\u50CF12"
objectReference: {fileID: 0}
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083355702494639820, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.x
value: 0.61528623
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.19890103
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.z
value: 0.10944438
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.w
value: 0.70710784
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.z
value: -0.7071058
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_Name
value: "\u6444\u50CF\u5934_web"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3}
--- !u!1001 &7083323377068605111
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 173050369227692116}
m_Modifications:
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_text
value: "\u6444\u50CF12"
objectReference: {fileID: 0}
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 2224874554742167492, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083355702494639820, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 3922853924956275001, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 6206996799658441959, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.x
value: -0.741
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.048
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalPosition.z
value: 2.083
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.w
value: -0.060180303
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.x
value: -0.24874742
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.y
value: 0.9397107
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalRotation.z
value: 0.22681917
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 59f86a54182532440915db2862571a8f, type: 3}
propertyPath: m_Name
value: "\u6444\u50CF\u5934_web"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3}
--- !u!1001 &7143516271824379822 --- !u!1001 &7143516271824379822
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1445,103 +1801,6 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3}
--- !u!1001 &7143516271922553439
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 173050369263777980}
m_Modifications:
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_text
value: "\u7EA2\u591604"
objectReference: {fileID: 0}
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083355702494639820, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.x
value: -1.143
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.y
value: 0.244
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.z
value: 1.526
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_Name
value: "\u7EA2\u5916\u7EBF"
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
--- !u!1001 &7143516271934228640 --- !u!1001 &7143516271934228640
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1631,103 +1890,6 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3}
--- !u!1001 &7143516272077141006
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 173050369227692116}
m_Modifications:
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_text
value: "\u7EA2\u591603"
objectReference: {fileID: 0}
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083355702494639820, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.x
value: -0.741
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.y
value: 0.048
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.z
value: 2.083
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.w
value: -0.060180303
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.x
value: -0.24874742
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.y
value: 0.9397107
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.z
value: 0.22681917
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_Name
value: "\u7EA2\u5916\u7EBF"
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
--- !u!1001 &7143516272100156227 --- !u!1001 &7143516272100156227
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1995,115 +2157,6 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3}
--- !u!1001 &7143516272620611097
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3741181618873507920}
m_Modifications:
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_text
value: "\u7EA2\u591601"
objectReference: {fileID: 0}
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083355702494639820, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799779127824, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.z
value: -99.4
objectReference: {fileID: 0}
- target: {fileID: 6206996799779127824, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_AnchoredPosition.x
value: -33.5
objectReference: {fileID: 0}
- target: {fileID: 6206996799779127824, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 44.3
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.x
value: 0.61528623
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.y
value: 0.19890103
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.z
value: 0.10944438
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.w
value: 0.70710784
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.z
value: -0.7071058
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_Name
value: "\u7EA2\u5916\u7EBF"
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
--- !u!1001 &7143516273060950351 --- !u!1001 &7143516273060950351
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2460,103 +2513,6 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 59f86a54182532440915db2862571a8f, type: 3}
--- !u!1001 &7143516273340804082
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8657939655263598690}
m_Modifications:
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_text
value: "\u7EA2\u591602"
objectReference: {fileID: 0}
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 2224874554742167492, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083355702494639820, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
- target: {fileID: 6206996799658441959, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_hasFontAssetChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.x
value: -1.27
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.y
value: -0.73
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalPosition.z
value: 1.93
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426826, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_Name
value: "\u7EA2\u5916\u7EBF"
objectReference: {fileID: 0}
- target: {fileID: 6206996799886426827, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0b6ba4cea5fa2c44e9a6d7121987f50e, type: 3}
--- !u!1001 &7143516273802697975 --- !u!1001 &7143516273802697975
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

393
GQ_TongXin/Assets/script/GameManager.cs
View File

@ -131,6 +131,9 @@ public class GameManager : MonoBehaviour
public GameObject objectToShow_add; public GameObject objectToShow_add;
[Header("-------------- 所有机柜门------------------")]
public List<RoomDoor> roomDoors;
private void Awake() private void Awake()
{ {
if (Inst != this && Inst != null) if (Inst != this && Inst != null)
@ -147,6 +150,7 @@ public class GameManager : MonoBehaviour
private void Start() private void Start()
{ {
roomDoors = CabinetUIManager.Instance.transform.GetChild(0).GetComponentsInChildren<RoomDoor>(true).ToList();
Debug.Log("版本号 1.1.1"); Debug.Log("版本号 1.1.1");
editorMenu.editorBtn.onClick.AddListener(() => editorMenu.editorBtn.onClick.AddListener(() =>
{ {
@ -703,6 +707,10 @@ public class GameManager : MonoBehaviour
{ {
MoveParentAndChildren(go.transform, new Vector3(-0.25f, 0, 0)); MoveParentAndChildren(go.transform, new Vector3(-0.25f, 0, 0));
} }
else if (modelNum == "18")
{
MoveParentAndChildren(go.transform, new Vector3(0, 0f, -0.02f));
}
} }
catch (Exception e) catch (Exception e)
{ {
@ -1390,6 +1398,10 @@ public class GameManager : MonoBehaviour
} }
else if (D.openFlag == "1") else if (D.openFlag == "1")
{ {
power_open(Cabinets_go[i], "前门");
hight.SetActive(true);
hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/3Tou");
continue;
//开 //开
GameObject go = null; GameObject go = null;
try try
@ -1420,6 +1432,8 @@ public class GameManager : MonoBehaviour
{ {
if (D.backDoorFlag == "0") if (D.backDoorFlag == "0")
{ {
power_close(Cabinets_go[i], "后门");
continue;
//模型原因微调 //模型原因微调
if (Cabinets_go[i].name == "R72") return; if (Cabinets_go[i].name == "R72") return;
//关 //关
@ -1427,6 +1441,10 @@ public class GameManager : MonoBehaviour
} }
else if (D.backDoorFlag == "1") else if (D.backDoorFlag == "1")
{ {
power_open(Cabinets_go[i], "后门");
hight.SetActive(true);
hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/3Tou");
continue;
//模型原因微调 //模型原因微调
if (Cabinets_go[i].name == "R72") return; if (Cabinets_go[i].name == "R72") return;
//开 //开
@ -1460,38 +1478,44 @@ public class GameManager : MonoBehaviour
/// </summary> /// </summary>
public void power_close() public void power_close()
{ {
for (int i = 0; i < Cabinets_go.Count; i++) #region old
//for (int i = 0; i < Cabinets_go.Count; i++)
//{
// //var door = Array.FindAll(Cabinets_go[i].transform.GetComponentsInChildren<Renderer>(), item =>
// //{
// // return item.name.Contains("Object");
// //});
// if (/*door.Length == 4 && */Cabinets_go[i].name == "R71")
// {
// //Cabinets_go[i].transform.GetChild(0).localRotation = Quaternion.Euler(Vector3.zero);
// //Cabinets_go[i].transform.GetChild(1).localRotation = Quaternion.Euler(Vector3.zero);
// Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
// Cabinets_go[i].transform.GetChild(1).DOLocalRotate(Vector3.zero, 2);
// Cabinets_go[i].transform.GetChild(2).DOLocalRotate(Vector3.zero, 2);
// Cabinets_go[i].transform.GetChild(3).DOLocalRotate(Vector3.zero, 2);
// }
// //模型原因微调
// else if (Cabinets_go[i].name == "R72")
// {
// Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
// Cabinets_go[i].transform.GetChild(1).DOLocalRotate(Vector3.forward * -180, 2);
// }
// else /*if (door.Length == 2)*/
// {
// //door.transform.localRotation = Quaternion.Euler(Vector3.zero);
// Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
// Cabinets_go[i].transform.GetChild(1).DOLocalRotate(Vector3.zero, 2);
// }
//}
////CloseHighlight();
#endregion
for (int i = 0; i < roomDoors.Count; i++)
{ {
//var door = Array.FindAll(Cabinets_go[i].transform.GetComponentsInChildren<Renderer>(), item => roomDoors[i].DoorClose();
//{
// return item.name.Contains("Object");
//});
if (/*door.Length == 4 && */Cabinets_go[i].name == "R71")
{
//Cabinets_go[i].transform.GetChild(0).localRotation = Quaternion.Euler(Vector3.zero);
//Cabinets_go[i].transform.GetChild(1).localRotation = Quaternion.Euler(Vector3.zero);
Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
Cabinets_go[i].transform.GetChild(1).DOLocalRotate(Vector3.zero, 2);
Cabinets_go[i].transform.GetChild(2).DOLocalRotate(Vector3.zero, 2);
Cabinets_go[i].transform.GetChild(3).DOLocalRotate(Vector3.zero, 2);
}
//模型原因微调
else if (Cabinets_go[i].name == "R72")
{
Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
Cabinets_go[i].transform.GetChild(1).DOLocalRotate(Vector3.forward * -180, 2);
}
else /*if (door.Length == 2)*/
{
//door.transform.localRotation = Quaternion.Euler(Vector3.zero);
Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
Cabinets_go[i].transform.GetChild(1).DOLocalRotate(Vector3.zero, 2);
}
} }
CloseHighlight();
} }
/// <summary> /// <summary>
@ -1499,36 +1523,43 @@ public class GameManager : MonoBehaviour
/// </summary> /// </summary>
public void power_open() public void power_open()
{ {
for (int i = 0; i < Cabinets_go.Count; i++) #region old
//for (int i = 0; i < Cabinets_go.Count; i++)
//{
// //var door = Array.FindAll(Cabinets_go[i].transform.GetComponentsInChildren<Renderer>(), item =>
// //{
// // return item.name.Contains("Object");
// //});
// if (/*door.Length == 4 && */Cabinets_go[i].name == "R71")
// {
// //Cabinets_go[i].transform.GetChild(0).localRotation = Quaternion.Euler(Vector3.forward * -90);
// //Cabinets_go[i].transform.GetChild(1).localRotation = Quaternion.Euler(Vector3.forward * 90);
// Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
// Cabinets_go[i].transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f);
// }
// //模型原因微调
// else if (Cabinets_go[i].name == "R72")
// {
// Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
// Cabinets_go[i].transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f);
// }
// else /*if (door.Length == 2)*/
// {
// //door.transform.localRotation = Quaternion.Euler(Vector3.forward * -90);
// //door.transform.DOLocalRotate(Vector3.forward * -90, 2f);
// Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
// }
//}
//CloseHighlight();
#endregion
for (int i = 0; i < roomDoors.Count; i++)
{ {
//var door = Array.FindAll(Cabinets_go[i].transform.GetComponentsInChildren<Renderer>(), item => roomDoors[i].DoorOpen();
//{
// return item.name.Contains("Object");
//});
if (/*door.Length == 4 && */Cabinets_go[i].name == "R71")
{
//Cabinets_go[i].transform.GetChild(0).localRotation = Quaternion.Euler(Vector3.forward * -90);
//Cabinets_go[i].transform.GetChild(1).localRotation = Quaternion.Euler(Vector3.forward * 90);
Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
Cabinets_go[i].transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f);
}
//模型原因微调
else if (Cabinets_go[i].name == "R72")
{
Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
Cabinets_go[i].transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f);
}
else /*if (door.Length == 2)*/
{
//door.transform.localRotation = Quaternion.Euler(Vector3.forward * -90);
//door.transform.DOLocalRotate(Vector3.forward * -90, 2f);
Cabinets_go[i].transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
}
} }
CloseHighlight();
} }
/// <summary> /// <summary>
@ -1537,57 +1568,91 @@ public class GameManager : MonoBehaviour
/// <param name="cabinet"></param> /// <param name="cabinet"></param>
public void power_open(GameObject cabinet, string type) public void power_open(GameObject cabinet, string type)
{ {
#region old
//if (type == "前门")
//{
// if (/*door.Length == 4 && */cabinet.name == "R71")
// {
// cabinet.transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f);
// }
// else /*if (door.Length == 2)*/
// //door.transform.localRotation = Quaternion.Euler(Vector3.forward * -90);
// cabinet.transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
//}
//else if (type == "后门")
//{
// if (/*door.Length == 4 && */cabinet.name == "R71")
// {
// cabinet.transform.GetChild(2).DOLocalRotate(Vector3.forward * -90, 2f);
// cabinet.transform.GetChild(3).DOLocalRotate(Vector3.forward * 90, 2f);
// }
// //模型原因微调
// else if (cabinet.name == "R72")
// {
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f);
// }
// else /*if (door.Length == 2)*/
// //door.transform.localRotation = Quaternion.Euler(Vector3.forward * -90);
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * -90, 2f);
//}
//else if (type == "全开")
//{
// if (/*door.Length == 4 && */cabinet.name == "R71")
// {
// cabinet.transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f);
// cabinet.transform.GetChild(2).DOLocalRotate(Vector3.forward * -90, 2f);
// cabinet.transform.GetChild(3).DOLocalRotate(Vector3.forward * 90, 2f);
// }
// //模型原因微调
// else if (cabinet.name == "R72")
// {
// cabinet.transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f);
// }
// else /*if (door.Length == 2)*/
// {
// cabinet.transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * -90, 2f);
// }
//}
#endregion
var doors = cabinet.GetComponentsInChildren<RoomDoor>(true);
if (doors.Length <= 0) return;
if (type == "前门") if (type == "前门")
{ {
if (/*door.Length == 4 && */cabinet.name == "R71") if (doors.Length > 2)
{ {
cabinet.transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f); cabinet.transform.GetChild(0).GetComponent<RoomDoor>().DoorOpen();
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f); cabinet.transform.GetChild(1).GetComponent<RoomDoor>().DoorOpen();
}
else
{
cabinet.transform.GetChild(0).GetComponent<RoomDoor>().DoorOpen();
} }
else /*if (door.Length == 2)*/
//door.transform.localRotation = Quaternion.Euler(Vector3.forward * -90);
cabinet.transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
} }
else if (type == "后门") else if (type == "后门")
{ {
if (/*door.Length == 4 && */cabinet.name == "R71") if (doors.Length > 2)
{ {
cabinet.transform.GetChild(2).DOLocalRotate(Vector3.forward * -90, 2f); cabinet.transform.GetChild(2).GetComponent<RoomDoor>().DoorOpen();
cabinet.transform.GetChild(3).DOLocalRotate(Vector3.forward * 90, 2f); cabinet.transform.GetChild(3).GetComponent<RoomDoor>().DoorOpen();
} }
//模型原因微调 else
else if (cabinet.name == "R72")
{ {
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f); cabinet.transform.GetChild(1).GetComponent<RoomDoor>().DoorOpen();
} }
else /*if (door.Length == 2)*/
//door.transform.localRotation = Quaternion.Euler(Vector3.forward * -90);
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * -90, 2f);
} }
else if (type == "全开") else if (type == "全开")
{ {
if (/*door.Length == 4 && */cabinet.name == "R71") for (int i = 0; i < doors.Length; i++)
{ {
cabinet.transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f); doors[i].DoorOpen();
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f);
cabinet.transform.GetChild(2).DOLocalRotate(Vector3.forward * -90, 2f);
cabinet.transform.GetChild(3).DOLocalRotate(Vector3.forward * 90, 2f);
}
//模型原因微调
else if (cabinet.name == "R72")
{
cabinet.transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * 90, 2f);
}
else /*if (door.Length == 2)*/
{
cabinet.transform.GetChild(0).DOLocalRotate(Vector3.forward * -90, 2f);
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * -90, 2f);
} }
} }
} }
/// <summary> /// <summary>
@ -1596,58 +1661,93 @@ public class GameManager : MonoBehaviour
/// <param name="cabinet"></param> /// <param name="cabinet"></param>
public void power_close(GameObject cabinet, string type) public void power_close(GameObject cabinet, string type)
{ {
//var door = Array.FindAll(cabinet.GetComponentsInChildren<Renderer>(), item => #region old
////var door = Array.FindAll(cabinet.GetComponentsInChildren<Renderer>(), item =>
////{
//// return item.name.Contains("Object");
////});
//if (type == "前门")
//{ //{
// return item.name.Contains("Object"); // if (/*door.Length == 4 && */cabinet.name == "R71")
//}); // {
// //cabinet.transform.GetChild(0).localRotation = Quaternion.Euler(Vector3.zero);
// //cabinet.transform.GetChild(1).localRotation = Quaternion.Euler(Vector3.zero);
// cabinet.transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.zero, 2);
// }
// else/* (door.Length == 2)*/
// //door.transform.localRotation = Quaternion.Euler(Vector3.zero);
// cabinet.transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
//}
//else if (type == "后门")
//{
// if (/*door.Length == 4 && */cabinet.name == "R71")
// {
// cabinet.transform.GetChild(2).DOLocalRotate(Vector3.zero, 2);
// cabinet.transform.GetChild(3).DOLocalRotate(Vector3.zero, 2);
// }
// //模型原因微调
// else if (cabinet.name == "R72")
// {
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * -180, 2);
// }
// else /*if (door.Length == 2)*/
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.zero, 2);
//}
//else if (type == "全关")
//{
// if (cabinet.name == "R71")
// {
// cabinet.transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.zero, 2);
// cabinet.transform.GetChild(2).DOLocalRotate(Vector3.zero, 2);
// cabinet.transform.GetChild(3).DOLocalRotate(Vector3.zero, 2);
// }
// //模型原因微调
// else if (cabinet.name == "R72")
// {
// cabinet.transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * -180, 2);
// }
// else
// {
// cabinet.transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
// cabinet.transform.GetChild(1).DOLocalRotate(Vector3.zero, 2);
// }
//}
#endregion
var doors = cabinet.GetComponentsInChildren<RoomDoor>(true);
if (doors.Length <= 0) return;
if (type == "前门") if (type == "前门")
{ {
if (/*door.Length == 4 && */cabinet.name == "R71") if (doors.Length > 2)
{ {
//cabinet.transform.GetChild(0).localRotation = Quaternion.Euler(Vector3.zero); cabinet.transform.GetChild(0).GetComponent<RoomDoor>().DoorClose();
//cabinet.transform.GetChild(1).localRotation = Quaternion.Euler(Vector3.zero); cabinet.transform.GetChild(1).GetComponent<RoomDoor>().DoorClose();
cabinet.transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.zero, 2);
}
else/* (door.Length == 2)*/
//door.transform.localRotation = Quaternion.Euler(Vector3.zero);
cabinet.transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
}
else if (type == "后门")
{
if (/*door.Length == 4 && */cabinet.name == "R71")
{
cabinet.transform.GetChild(2).DOLocalRotate(Vector3.zero, 2);
cabinet.transform.GetChild(3).DOLocalRotate(Vector3.zero, 2);
}
//模型原因微调
else if (cabinet.name == "R72")
{
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * -180, 2);
}
else /*if (door.Length == 2)*/
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.zero, 2);
}
else if (type == "全关")
{
if (cabinet.name == "R71")
{
cabinet.transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.zero, 2);
cabinet.transform.GetChild(2).DOLocalRotate(Vector3.zero, 2);
cabinet.transform.GetChild(3).DOLocalRotate(Vector3.zero, 2);
}
//模型原因微调
else if (cabinet.name == "R72")
{
cabinet.transform.GetChild(0).DOLocalRotate(Vector3.zero, 2);
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.forward * -180, 2);
} }
else else
{ {
cabinet.transform.GetChild(0).DOLocalRotate(Vector3.zero, 2); cabinet.transform.GetChild(0).GetComponent<RoomDoor>().DoorClose();
cabinet.transform.GetChild(1).DOLocalRotate(Vector3.zero, 2); }
}
else if (type == "后门")
{
if (doors.Length > 2)
{
cabinet.transform.GetChild(2).GetComponent<RoomDoor>().DoorClose();
cabinet.transform.GetChild(3).GetComponent<RoomDoor>().DoorClose();
}
else
{
cabinet.transform.GetChild(1).GetComponent<RoomDoor>().DoorClose();
}
}
else if (type == " 全开")
{
for (int i = 0; i < doors.Length; i++)
{
doors[i].DoorClose();
} }
} }
} }
@ -1872,17 +1972,28 @@ public class GameManager : MonoBehaviour
if (z != null) if (z != null)
{ {
Debug.Log("@@5"); Debug.Log("@@5");
StartCoroutine(PatternChoose.Inst.xianlan.getByCode((x)=> StartCoroutine(PatternChoose.Inst.xianlan.getByCode((x) =>
{ {
Debug.Log("@@5.1"); Debug.Log("@@5.1");
LoadScene(); if (!string.IsNullOrEmpty(x))
callback?.Invoke("1"); {
})); LoadScene();
callback?.Invoke("1");
}
else
callback.Invoke(null);
}));
} }
else
callback.Invoke(null);
})); }));
} }
else
callback.Invoke(null);
})); }));
} }
else
callback.Invoke(null);
})); }));
//Debug.Log("@@13");//??? //Debug.Log("@@13");//???

16
GQ_TongXin/Assets/script/JSON/CombineJSON.cs
View File

@ -166,12 +166,13 @@ public static class CombineJSON
} }
else else
{ {
Debug.Log("request.downloadHandler为null"); Debug.Log(apiUrl + " request.downloadHandler为null");
callback.Invoke(null);
} }
} }
else else
{ {
Debug.Log("请求POST接口失败: " + request.error); Debug.Log(apiUrl + " 请求POST接口失败: " + request.error);
callback.Invoke(null); callback.Invoke(null);
} }
} }
@ -206,11 +207,14 @@ public static class CombineJSON
callback?.Invoke(responseText); callback?.Invoke(responseText);
} }
else else
Debug.Log("request.downloadHandler为空"); {
Debug.Log(apiUrl + " request.downloadHandler为空");
callback.Invoke(null);
}
} }
else else
{ {
Debug.Log("请求POST接口失败: " + request.error); Debug.Log(apiUrl + " 请求POST接口失败: " + request.error);
callback.Invoke(null); callback.Invoke(null);
} }
} }
@ -267,13 +271,13 @@ public static class CombineJSON
} }
else else
{ {
Debug.Log("request.downloadHandler为空"); Debug.Log(apiUrl + " request.downloadHandler为空");
callback.Invoke(null); callback.Invoke(null);
} }
} }
else else
{ {
Debug.Log("请求POST接口失败: " + request.error); Debug.Log(apiUrl + " 请求POST接口失败: " + request.error);
callback.Invoke(null); callback.Invoke(null);
} }
} }

2
GQ_TongXin/Assets/script/接口/修改/DeleteDevice.cs
View File

@ -108,8 +108,8 @@ public class DeleteDevice : MonoBehaviour
} }
catch (System.Exception e) catch (System.Exception e)
{ {
callback.Invoke(null);
Debug.Log("删除设备错误：" + e.Message); Debug.Log("删除设备错误：" + e.Message);
callback.Invoke(null);
} }
}) })
); );

17
GQ_TongXin/Assets/script/接口/修改/RedactPort.cs
View File

@ -83,7 +83,7 @@ public class RedactPort : MonoBehaviour
List<string> conCabinetname = new List<string>(); List<string> conCabinetname = new List<string>();
for (int i = 0; i < GameManager.Inst.Cabinets_go.Count; i++) for (int i = 0; i < GameManager.Inst.Cabinets_go.Count; i++)
conCabinetname.Add(GameManager.Inst.Cabinets_go[i].name); conCabinetname.Add(GameManager.Inst.Cabinets_go[i].name);
conCabinetname.Add(""); conCabinetname.Add(null);
conCabinet.AddOptions(conCabinetname); conCabinet.AddOptions(conCabinetname);
} }
@ -131,7 +131,17 @@ public class RedactPort : MonoBehaviour
//deviceId.text = mybody.deviceId; //deviceId.text = mybody.deviceId;
//portModel.text = mybody.portModel; //portModel.text = mybody.portModel;
portType.captionText.text = mybody.portType; portType.captionText.text = mybody.portType;
//portType.value = portType.options.FindIndex(option => option.text == portType.captionText.text);
int index = portType.options.FindIndex(option => option.text == mybody.portType);
if (index != -1)
{
portType.captionText.text = mybody.portType;
portType.value = index;
}
else
{
Debug.LogError("端口类型不存在于下拉菜单选项中！");
}
findconCabinet(); findconCabinet();
conDevice.captionText.text = mybody.conDevice; conDevice.captionText.text = mybody.conDevice;
@ -198,6 +208,7 @@ public class RedactPort : MonoBehaviour
else else
{ {
conCabinet.captionText.text = null; conCabinet.captionText.text = null;
conCabinet.value = 99;
} }
} }
@ -364,7 +375,7 @@ public class RedactPort : MonoBehaviour
portType_list.Add(item); portType_list.Add(item);
} }
portType.AddOptions(portType_list); portType.AddOptions(portType_list);
portType.captionText.text = ""; portType.captionText.text = null;
} }

6
GQ_TongXin/Assets/script/接口/查询/ByCode.cs
View File

@ -35,8 +35,8 @@ public class ByCode : MonoBehaviour
lineCode_dic.Clear(); lineCode_dic.Clear();
for (int i = 0; i < myroot.data.Count; i++) for (int i = 0; i < myroot.data.Count; i++)
{ {
//if (!lineCode_dic.ContainsKey(myroot.data[i].name)) //if (!lineCode_dic.ContainsKey(myroot.data[i].name))
lineCode_dic.Add(myroot.data[i].name, myroot.data[i].value); lineCode_dic.Add(myroot.data[i].name, myroot.data[i].value);
} }
callback.Invoke("1"); callback.Invoke("1");
} }
@ -49,6 +49,8 @@ public class ByCode : MonoBehaviour
callback.Invoke(null); callback.Invoke(null);
} }
} }
else
callback.Invoke(null);
})); }));
} }

42
GQ_TongXin/Assets/script/接口/查询/LineQuery.cs
View File

@ -232,17 +232,17 @@ public class LineQuery : MonoBehaviour
} }
// 删除线缆 // 删除线缆
public IEnumerable deleteCableName(string cableGroupName, string CableName, Action<string> callback = null) public void deleteCableName(string cableGroupName, string CableName, Action<string> callback)
{ {
var xianlan = PatternChoose.Inst.xianlan.gameObject.GetComponentsInChildren<LineInfor>(); var xianlan = PatternChoose.Inst.xianlan.gameObject.GetComponentsInChildren<LineInfor>(true);
var info = Array.Find(xianlan, (item) => var info = Array.Find(xianlan, (item) =>
{ {
return (item.cableGroupName == cableGroupName && item.cableName == CableName); return (item.cableGroupName == cableGroupName && item.cableName == CableName);
}); });
RedactPort redact = PatternChoose.Inst.transform.Find("¶Ë¿ÚÀà/¶Ë¿ÚÅäÖÃ").GetComponent<RedactPort>(); RedactPort redact = PatternChoose.Inst.dk_bj_page.GetComponent<RedactPort>();
GameManager.Inst.nowDeviceID = info.lines[0].GetComponent<PortQuery>().portList.id;
redact.syncInfo(info.lines[0].GetComponent<PortQuery>().portList.id); redact.syncInfo(GameManager.Inst.nowDeviceID);
redact.mybody.conDevice = null; redact.mybody.conDevice = null;
@ -252,7 +252,7 @@ public class LineQuery : MonoBehaviour
redact.mybody.cableName = null; redact.mybody.cableName = null;
string newData = JsonConvert.SerializeObject(redact.mybody); string newData = JsonConvert.SerializeObject(redact.mybody);
yield return StartCoroutine( StartCoroutine(
CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.dk_bj, GameManager.Inst.arguments.token, newData, (jsonResult) => CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.dk_bj, GameManager.Inst.arguments.token, newData, (jsonResult) =>
{ {
try try
@ -262,12 +262,19 @@ public class LineQuery : MonoBehaviour
catch (Exception e) catch (Exception e)
{ {
Debug.Log("删除端口线缆名接口错误：" + e.Message); Debug.Log("删除端口线缆名接口错误：" + e.Message);
callback.Invoke(null);
} }
if (redact.URlreturn != null && redact.URlreturn.message == "操作成功") if (redact.URlreturn != null && redact.URlreturn.message == "操作成功")
{ {
StartCoroutine(redact.Succeed((x) => StartCoroutine(Succeed((x) =>
{ {
if (x)
callback.Invoke("1");
else
{
SecondConfirmPanel.DeleteConform(null, "更新场景失败");
callback.Invoke(null);
}
})); }));
Array.ForEach(GameManager.Inst.pop_ups.ToArray(), (itme) => Array.ForEach(GameManager.Inst.pop_ups.ToArray(), (itme) =>
@ -275,12 +282,29 @@ public class LineQuery : MonoBehaviour
itme.gameObject.SetActive(false); itme.gameObject.SetActive(false);
}); });
} }
else
{
SecondConfirmPanel.DeleteConform(null, "删除端口线缆名失败");
callback.Invoke(null);
}
} }
)); ));
} }
public IEnumerator Succeed(Action<bool> callback)
{
GameManager.Inst.isLoading = false;
yield return null;
StartCoroutine(GameManager.Inst.Initialize((x) =>
{
if (!string.IsNullOrEmpty(x))
callback.Invoke(true);
else
callback.Invoke(false);
}));
}

6
GQ_TongXin/Assets/script/摄像头/LensUI.cs
View File

@ -9,9 +9,11 @@ public class LensUI : CabinetUIBase
{ {
public Button button; public Button button;
public TextMeshProUGUI text; public TextMeshProUGUI text;
public Text text1;
public static Transform Camera; public static Transform Camera;
public Transform maodian;
private void Awake() private void Awake()
{ {
@ -39,7 +41,7 @@ public class LensUI : CabinetUIBase
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
transform.eulerAngles = Camera.eulerAngles; maodian.transform.eulerAngles = Camera.eulerAngles;
} }
public override void OnMenuChanged(Menu menu) public override void OnMenuChanged(Menu menu)
@ -47,7 +49,7 @@ public class LensUI : CabinetUIBase
base.OnMenuChanged(menu); base.OnMenuChanged(menu);
if (menu == Menu.M_全景监控_摄像头) if (menu == Menu.M_全景监控_摄像头)
{ {
gameObject.SetActive(true); //gameObject.SetActive(true);
} }
else else
{ {

31
GQ_TongXin/Assets/script/点击/ClickEvent.cs
View File

@ -94,7 +94,7 @@ public class ClickEvent : MonoBehaviour
if (Menu.M_数字孪生_场景管理 == CabinetUIManager.Instance.current_menu && GameManager.Inst.magnifyState) if (Menu.M_数字孪生_场景管理 == CabinetUIManager.Instance.current_menu && GameManager.Inst.magnifyState)
{ {
if (Physics.Raycast(ray, out hit, 100, 1 << 8 | 1 << 14))//模型（设备）-8 门-14 if (Physics.Raycast(ray, out hit, 100, 1 << 8))//模型（设备）-8 门-14
{ {
if (hit.collider.gameObject == gameObject) if (hit.collider.gameObject == gameObject)
{ {
@ -157,7 +157,7 @@ public class ClickEvent : MonoBehaviour
else if (Menu.M_数字孪生_线缆连接_配置 == CabinetUIManager.Instance.current_menu && GameManager.Inst.magnifyState) else if (Menu.M_数字孪生_线缆连接_配置 == CabinetUIManager.Instance.current_menu && GameManager.Inst.magnifyState)
{ {
if (Physics.Raycast(ray, out hit, 100, 1 << 11 | 1 << 14)) if (Physics.Raycast(ray, out hit, 100, 1 << 11))
{ {
if (hit.collider.gameObject == gameObject) if (hit.collider.gameObject == gameObject)
{ {
@ -251,7 +251,7 @@ public class ClickEvent : MonoBehaviour
} }
} }
} }
else if (Physics.Raycast(ray, out hit, 100, 1 << 14 | 1 << 6)) else if (Physics.Raycast(ray, out hit, 100, 1 << 6))
{ {
if (hit.collider.gameObject.GetComponent<DeviceQuery>().deviceList.type == "1" && if (hit.collider.gameObject.GetComponent<DeviceQuery>().deviceList.type == "1" &&
hit.collider.gameObject.GetComponent<TransparentGlow>().isTransparentGlow) hit.collider.gameObject.GetComponent<TransparentGlow>().isTransparentGlow)
@ -263,7 +263,7 @@ public class ClickEvent : MonoBehaviour
} }
} }
} }
} }
#region MyRegion #region MyRegion
@ -327,7 +327,7 @@ public class ClickEvent : MonoBehaviour
//不虚化 //不虚化
else if (Physics.Raycast(ray, out hit, 100, 1 << 6 | 1 << 14 | 1 << 15))//机柜-6 门-14 蓄电池-15 else if (Physics.Raycast(ray, out hit, 100, 1 << 6 | 1 << 15))//机柜-6 门-14 蓄电池-15
{ {
//放大 //放大
if (hit.collider.gameObject == gameObject && !My_magnifyState) if (hit.collider.gameObject == gameObject && !My_magnifyState)
@ -590,6 +590,12 @@ public class ClickEvent : MonoBehaviour
public void Change_hide(GameObject cabine, bool isHide, bool isZoomin) public void Change_hide(GameObject cabine, bool isHide, bool isZoomin)
{ {
GameManager.Inst.nowCabine = cabine; GameManager.Inst.nowCabine = cabine;
//放大
if (isZoomin)
Zoomin(cabine);
//缩小
else
Zoomout(cabine);
if (isZoomin) if (isZoomin)
{ {
if (CabinetUIManager.Instance.cabine_hights_now.Count == 0) if (CabinetUIManager.Instance.cabine_hights_now.Count == 0)
@ -612,12 +618,7 @@ public class ClickEvent : MonoBehaviour
} }
CabinetUIManager.Instance.cabine_hights_now.Clear(); CabinetUIManager.Instance.cabine_hights_now.Clear();
} }
//放大
if (isZoomin)
Zoomin(cabine);
//缩小
else
Zoomout(cabine);
if (gameObject.layer == 15) return; if (gameObject.layer == 15) return;
string s1 = gameObject.GetComponent<DeviceQuery>().deviceList.devicePosition.Split('-')[0]; string s1 = gameObject.GetComponent<DeviceQuery>().deviceList.devicePosition.Split('-')[0];
@ -625,7 +626,7 @@ public class ClickEvent : MonoBehaviour
{ {
} }
else if (Menu.M_数字孪生_接地网 != CabinetUIManager.Instance.current_menu) if (Menu.M_数字孪生_接地网 != CabinetUIManager.Instance.current_menu)
{ {
if (isHide) if (isHide)
{ {
@ -727,7 +728,7 @@ public class ClickEvent : MonoBehaviour
{ {
ExtendedFlycam.Inst.QieHuan(CabinetUIManager.Instance.current_menu); ExtendedFlycam.Inst.QieHuan(CabinetUIManager.Instance.current_menu);
GameManager.Inst.magnifyState = true; GameManager.Inst.magnifyState = true;
TransparentGlowManage.Inst.is_magnify = true; TransparentGlowManage.Inst.is_magnify = true;
if (Menu.M_数字孪生_线缆连接_配置 == CabinetUIManager.Instance.current_menu) if (Menu.M_数字孪生_线缆连接_配置 == CabinetUIManager.Instance.current_menu)
{ {
@ -751,13 +752,13 @@ public class ClickEvent : MonoBehaviour
} }
} }
if(Menu.M_数字孪生_线缆连接_配置 != CabinetUIManager.Instance.current_menu) if (Menu.M_数字孪生_线缆连接_配置 != CabinetUIManager.Instance.current_menu)
{ {
Array.ForEach(cabine.GetComponentsInChildren<PortQuery>(), (itme) => Array.ForEach(cabine.GetComponentsInChildren<PortQuery>(), (itme) =>
{ {
itme.hight.SetActive(false); itme.hight.SetActive(false);
}); });
} }
if (cabine.transform.Find("U位")) if (cabine.transform.Find("U位"))
GameManager.Inst.gameObject.GetComponent<DeviceManager>().dragController.uPosManger = cabine.transform.Find("U位").GetComponent<UPosManger>(); GameManager.Inst.gameObject.GetComponent<DeviceManager>().dragController.uPosManger = cabine.transform.Find("U位").GetComponent<UPosManger>();

113
GQ_TongXin/Assets/script/画线/CreateLine.cs
View File

@ -85,13 +85,14 @@ public class CreateLine : CabinetUIBase
} }
} }
public void init() public void init(Color color)
{ {
go = new GameObject("EmptyObject");
lineRenderer = go.GetComponent<LineRenderer>(); lineRenderer = go.GetComponent<LineRenderer>();
if (!lineRenderer) lineRenderer = go.AddComponent<LineRenderer>(); if (!lineRenderer) lineRenderer = go.AddComponent<LineRenderer>();
//lineRenderer.material = new Material(Shader.Find("Sprites/Default")); //lineRenderer.material = new Material(Shader.Find("Sprites/Default"));
lineRenderer.material = Resources.Load<Material>("emission"); lineRenderer.material = Resources.Load<Material>("emission");
lineRenderer.material.color = color;
lineRenderer.startWidth = lineWidth; lineRenderer.startWidth = lineWidth;
lineRenderer.endWidth = lineWidth; lineRenderer.endWidth = lineWidth;
lineRenderer.startColor = lineColor; lineRenderer.startColor = lineColor;
@ -133,7 +134,34 @@ public class CreateLine : CabinetUIBase
/// <param name="hierarchy">区</param> /// <param name="hierarchy">区</param>
public void Creat5(Transform A, Transform B, int hierarchy = 0) public void Creat5(Transform A, Transform B, int hierarchy = 0)
{ {
init(); var p = A.GetComponent<PortQuery>().portList;
go = new GameObject("EmptyObject");
go.transform.SetParent(xianLan);
go.name = p.cableGroupName;
go.SetActive(false);
var l = go.AddComponent<LineInfor>();
l.lines.Add(A);
l.lines.Add(B);
l.cableGroupName = p.cableGroupName;
l.cableName = p.cableName;
l.portType = p.portType;
try
{
HexToColor(PatternChoose.Inst.xianlan.lineCode_dic[p.portType], (x) =>
{
init(x);
});
//HexToColor(PatternChoose.Inst.xianlan.lineCode_dic[p.portType], (x) =>
//{
// lineRenderer.endColor = x;
//});
}
catch (Exception e)
{
Debug.Log("匹配线缆颜色错误 " + e.Message + "\n" + e.StackTrace);
return;
}
List<Vector3> vector3s = new List<Vector3>(); List<Vector3> vector3s = new List<Vector3>();
Vector3 v1 = A.position; Vector3 v1 = A.position;
Vector3 v2 = A.position + new Vector3(edge_Distance, 0, 0); Vector3 v2 = A.position + new Vector3(edge_Distance, 0, 0);
@ -152,33 +180,6 @@ public class CreateLine : CabinetUIBase
lineRenderer.SetPositions(vector3s.ToArray()); lineRenderer.SetPositions(vector3s.ToArray());
var p = A.GetComponent<PortQuery>().portList;
go.transform.SetParent(xianLan);
go.name = p.cableGroupName;
go.SetActive(false);
var l = go.AddComponent<LineInfor>();
l.lines.Add(A);
l.lines.Add(B);
l.cableGroupName = p.cableGroupName;
l.cableName = p.cableName;
l.portType = p.portType;
try
{
HexToColor(PatternChoose.Inst.xianlan.lineCode_dic[p.portType], (x) =>
{
lineRenderer.startColor = x;
});
HexToColor(PatternChoose.Inst.xianlan.lineCode_dic[p.portType], (x) =>
{
lineRenderer.endColor = x;
});
}
catch (Exception e)
{
Debug.Log("匹配线缆颜色错误 " + e.Message + "\n" + e.StackTrace);
}
} }
private void HexToColor(string hex, Action<Color> callback) private void HexToColor(string hex, Action<Color> callback)
@ -201,7 +202,7 @@ public class CreateLine : CabinetUIBase
/// <param name="hierarchy">高度层级</param> /// <param name="hierarchy">高度层级</param>
public void Creat6(Transform A, Transform B, int hierarchy) public void Creat6(Transform A, Transform B, int hierarchy)
{ {
init(); init(Color.white);
List<Vector3> vector3s = new List<Vector3>(); List<Vector3> vector3s = new List<Vector3>();
Vector3 v1 = A.position; Vector3 v1 = A.position;
Vector3 v2 = A.position + new Vector3(edge_Distance, 0, 0); Vector3 v2 = A.position + new Vector3(edge_Distance, 0, 0);
@ -231,7 +232,34 @@ public class CreateLine : CabinetUIBase
/// <param name="hierarchy">区</param> /// <param name="hierarchy">区</param>
public void Creat7(Transform A, Transform B, int hierarchy) public void Creat7(Transform A, Transform B, int hierarchy)
{ {
init(); var p = A.GetComponent<PortQuery>().portList;
go = new GameObject("EmptyObject");
go.transform.SetParent(xianLan);
go.name = p.cableGroupName;
go.SetActive(false);
var l = go.AddComponent<LineInfor>();
l.lines.Add(A);
l.lines.Add(B);
l.cableGroupName = p.cableGroupName;
l.cableName = p.cableName;
l.portType = p.portType;
try
{
HexToColor(PatternChoose.Inst.xianlan.lineCode_dic[p.portType], (x) =>
{
init(x);
});
//HexToColor(PatternChoose.Inst.xianlan.lineCode_dic[p.portType], (x) =>
//{
// lineRenderer.endColor = x;
//});
}
catch (Exception e)
{
Debug.Log("匹配线缆颜色错误 " + e.Message + "\n" + e.StackTrace);
return;
}
List<Vector3> vector3s = new List<Vector3>(); List<Vector3> vector3s = new List<Vector3>();
Vector3 v1 = A.position; Vector3 v1 = A.position;
Vector3 v2 = A.position + new Vector3(edge_Distance, 0, 0); Vector3 v2 = A.position + new Vector3(edge_Distance, 0, 0);
@ -252,18 +280,7 @@ public class CreateLine : CabinetUIBase
lineRenderer.positionCount = vector3s.Count; lineRenderer.positionCount = vector3s.Count;
lineRenderer.SetPositions(vector3s.ToArray()); lineRenderer.SetPositions(vector3s.ToArray());
var p = A.GetComponent<PortQuery>().portList;
go.transform.SetParent(xianLan);
go.name = p.cableGroupName;
go.SetActive(false);
var l = go.AddComponent<LineInfor>();
l.lines.Add(A);
l.lines.Add(B);
l.cableGroupName = p.cableGroupName;
l.cableName = p.cableName;
l.portType = p.portType;
} }
[ContextMenu("同行")] [ContextMenu("同行")]
@ -318,7 +335,9 @@ public class CreateLine : CabinetUIBase
public override void OnMenuChanged(Menu menu) public override void OnMenuChanged(Menu menu)
{ {
base.OnMenuChanged(menu); base.OnMenuChanged(menu);
if (menu == Menu.M_数字孪生_线缆连接_展示) if (menu == Menu.M_数字孪生_线缆连接_展示||
menu == Menu.M_数字孪生_线缆连接_配置||
menu == Menu.M_数字孪生_线缆组配置)
{ {
GameManager.Inst.FindPortPos(); GameManager.Inst.FindPortPos();
@ -334,7 +353,9 @@ public class CreateLine : CabinetUIBase
public void deletxianLan(Menu menu) public void deletxianLan(Menu menu)
{ {
if ((menu == Menu.M_数字孪生_线缆连接_展示)) if (menu == Menu.M_数字孪生_线缆连接_展示 ||
menu == Menu.M_数字孪生_线缆连接_配置 ||
menu == Menu.M_数字孪生_线缆组配置)
return; return;
for (int i = xianLan.childCount - 1; i >= 0; i--) for (int i = xianLan.childCount - 1; i >= 0; i--)
{ {

3
GQ_TongXin/Assets/script/红外监测/InfraredUI.cs
View File

@ -10,6 +10,7 @@ using UnityEngine.UI;
public class InfraredUI : CabinetUIBase public class InfraredUI : CabinetUIBase
{ {
public static Transform Camera; public static Transform Camera;
public Transform maodian;
void Start() void Start()
{ {
@ -19,7 +20,7 @@ public class InfraredUI : CabinetUIBase
void Update() void Update()
{ {
transform.eulerAngles = Camera.eulerAngles; maodian.transform.eulerAngles = Camera.eulerAngles;
} }