11.27
This commit is contained in:
parent
687ffb59aa
commit
edac918888
|
|
@ -1356,7 +1356,7 @@ namespace BestHTTP.SecureProtocol.Org.BouncyCastle.Pkix
|
|||
{
|
||||
sub = sub.Substring(0, sub.LastIndexOf(':'));
|
||||
}
|
||||
// remove user and password, e.g. http://john:password@test.com
|
||||
|
||||
sub = sub.Substring(sub.IndexOf(':') + 1);
|
||||
sub = sub.Substring(sub.IndexOf('@') + 1);
|
||||
// remove local parts, e.g. http://test.com/bla
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 6d860ba439540ed498274fd5526763f1, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 87d99e7c062fc2a438b96a53caf125fc, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 51a94334c1e81ed46a9d5ab1109032de, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 6758dbbbdc308ec44982bdbda8bdc252, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 7afc144a7ae574a46907eba8649d0488, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: a2973e0e5e31b60479eb787fda447ee2, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 52d0be9c7d532b040a7ab0a651b1386d, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 0b72bdd2e3684584fbcf4442e658e3a7, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: b7e81c640f316814f82987d31e781b63, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 0c34992b397aa8645b4b8d3e1ec0c378, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class NewBehaviourScript : MonoBehaviour
|
||||
{
|
||||
public GameObject GameObject;
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
}
|
||||
[ContextMenu("1111111111111")]
|
||||
public void sad()
|
||||
{
|
||||
if (!GameObject)
|
||||
Debug.Log(1);
|
||||
if (GameObject == null)
|
||||
Debug.Log(1);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6e57a7ae6152eaa458098dd3735fe548
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c136ef48bb28ef74baee95cd94e56eb9
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d9a2f3223c92e8a46874bef9929ba135
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -3795,6 +3795,41 @@ LightProbeGroup:
|
|||
- {x: -1, y: -1, z: 1}
|
||||
- {x: -1, y: -1, z: -1}
|
||||
m_Dering: 1
|
||||
--- !u!1 &72267220 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 831053294471041189, guid: 23e8bd7687024594392e2d3e244e6b98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1598042673}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &72267221 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 55079201449773599, guid: 23e8bd7687024594392e2d3e244e6b98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1598042673}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &72267226
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 72267220}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 65c073f1f8dbbe64da03bf56cea22ae7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isTransparentGlow: 0
|
||||
meshRenderers: []
|
||||
materials: []
|
||||
empty: []
|
||||
TransparentGlow_Shader: {fileID: 4800000, guid: 132fbf2263a23854080e8a5c3cec824c,
|
||||
type: 3}
|
||||
TransparentGlow_Shader_half: {fileID: 0}
|
||||
original_jigui: []
|
||||
original_shebei: []
|
||||
search_u_wei: 0
|
||||
is_jigui: 0
|
||||
--- !u!1 &72666724
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -13046,6 +13081,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
conf: {fileID: 0}
|
||||
deviceList:
|
||||
id:
|
||||
deviceName:
|
||||
|
|
@ -20640,7 +20676,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.0036055238}
|
||||
m_AnchoredPosition: {x: 0, y: 0.0035983701}
|
||||
m_SizeDelta: {x: 318.95, y: 443.74}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &413199003
|
||||
|
|
@ -25533,6 +25569,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
conf: {fileID: 0}
|
||||
deviceList:
|
||||
id:
|
||||
deviceName:
|
||||
|
|
@ -29045,6 +29082,41 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 28}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!1 &616217976 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 831053294381967748, guid: 23e8bd7687024594392e2d3e244e6b98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1598042673}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &616217977 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 55079201429943102, guid: 23e8bd7687024594392e2d3e244e6b98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1598042673}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &616217982
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 616217976}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 65c073f1f8dbbe64da03bf56cea22ae7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isTransparentGlow: 0
|
||||
meshRenderers: []
|
||||
materials: []
|
||||
empty: []
|
||||
TransparentGlow_Shader: {fileID: 4800000, guid: 132fbf2263a23854080e8a5c3cec824c,
|
||||
type: 3}
|
||||
TransparentGlow_Shader_half: {fileID: 0}
|
||||
original_jigui: []
|
||||
original_shebei: []
|
||||
search_u_wei: 0
|
||||
is_jigui: 0
|
||||
--- !u!1001 &616333473
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -40196,6 +40268,41 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -20, y: -20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &833704023 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2869230100088922559, guid: 23e8bd7687024594392e2d3e244e6b98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1598042673}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &833704024 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3213983806630984453, guid: 23e8bd7687024594392e2d3e244e6b98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1598042673}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &833704029
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 833704023}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 65c073f1f8dbbe64da03bf56cea22ae7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isTransparentGlow: 0
|
||||
meshRenderers: []
|
||||
materials: []
|
||||
empty: []
|
||||
TransparentGlow_Shader: {fileID: 4800000, guid: 132fbf2263a23854080e8a5c3cec824c,
|
||||
type: 3}
|
||||
TransparentGlow_Shader_half: {fileID: 0}
|
||||
original_jigui: []
|
||||
original_shebei: []
|
||||
search_u_wei: 0
|
||||
is_jigui: 0
|
||||
--- !u!1 &835699405
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -64876,6 +64983,41 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1371016554}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1371170352 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 831053293647818444, guid: 23e8bd7687024594392e2d3e244e6b98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1598042673}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1371170353 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 55079201232630902, guid: 23e8bd7687024594392e2d3e244e6b98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1598042673}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1371170358
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1371170352}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 65c073f1f8dbbe64da03bf56cea22ae7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isTransparentGlow: 0
|
||||
meshRenderers: []
|
||||
materials: []
|
||||
empty: []
|
||||
TransparentGlow_Shader: {fileID: 4800000, guid: 132fbf2263a23854080e8a5c3cec824c,
|
||||
type: 3}
|
||||
TransparentGlow_Shader_half: {fileID: 0}
|
||||
original_jigui: []
|
||||
original_shebei: []
|
||||
search_u_wei: 0
|
||||
is_jigui: 0
|
||||
--- !u!1 &1374519689
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -77694,6 +77836,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
conf: {fileID: 0}
|
||||
deviceList:
|
||||
id:
|
||||
deviceName:
|
||||
|
|
@ -85706,7 +85849,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1769654719
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -87569,6 +87712,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
conf: {fileID: 0}
|
||||
deviceList:
|
||||
id:
|
||||
deviceName:
|
||||
|
|
@ -88107,7 +88251,7 @@ MonoBehaviour:
|
|||
jqr_bczb:
|
||||
jqr_xj_cx:
|
||||
arguments:
|
||||
token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MDA4NzUyMjksInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.jLune2ddNY2wONGKUBS4xlneKxOV_Zw9I0mJXSxmzxo
|
||||
token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MDExNTI5ODcsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.E4grU6DKc3p_1nLhbLqf_qlKTJ4ZQBQ3EKTN5x5nAvk
|
||||
heatThresholdValueMax:
|
||||
heatThresholdValueMin:
|
||||
humidityThresholdValueMax:
|
||||
|
|
@ -100672,6 +100816,41 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 28}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!1 &2046426767 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4574859954366159021, guid: 23e8bd7687024594392e2d3e244e6b98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1598042673}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2046426768 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3762469757393551895, guid: 23e8bd7687024594392e2d3e244e6b98,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1598042673}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2046426773
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2046426767}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 65c073f1f8dbbe64da03bf56cea22ae7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isTransparentGlow: 0
|
||||
meshRenderers: []
|
||||
materials: []
|
||||
empty: []
|
||||
TransparentGlow_Shader: {fileID: 4800000, guid: 132fbf2263a23854080e8a5c3cec824c,
|
||||
type: 3}
|
||||
TransparentGlow_Shader_half: {fileID: 0}
|
||||
original_jigui: []
|
||||
original_shebei: []
|
||||
search_u_wei: 0
|
||||
is_jigui: 0
|
||||
--- !u!114 &2047517869
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -149623,6 +149802,12 @@ MonoBehaviour:
|
|||
- {fileID: 3097173612095511551}
|
||||
- {fileID: 2887084679801241018}
|
||||
clickEvents: []
|
||||
points_battery:
|
||||
- {fileID: 2046426768}
|
||||
- {fileID: 72267221}
|
||||
- {fileID: 616217977}
|
||||
- {fileID: 1371170353}
|
||||
- {fileID: 833704024}
|
||||
is_transparency: 0
|
||||
is_magnify: 0
|
||||
MainCamera_pos: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -151181,7 +151366,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -52.998962, y: 445}
|
||||
m_AnchoredPosition: {x: -52.999023, y: 445}
|
||||
m_SizeDelta: {x: -1303.1125, y: -1040}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1332666221008315399
|
||||
|
|
@ -161281,7 +161466,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -63.999634, y: 487}
|
||||
m_AnchoredPosition: {x: -63.999756, y: 487}
|
||||
m_SizeDelta: {x: -1303.1125, y: -1040}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1332666221677478668
|
||||
|
|
@ -166747,7 +166932,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: -802.0001, y: -1.999939}
|
||||
m_AnchoredPosition: {x: -802.00024, y: -2}
|
||||
m_SizeDelta: {x: 216, y: 581}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1332666221965688364
|
||||
|
|
@ -172798,7 +172983,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 441.40015, y: -23.899841}
|
||||
m_AnchoredPosition: {x: 441.40015, y: -23.899902}
|
||||
m_SizeDelta: {x: 709, y: 664}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1332666222344351225
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
|
@ -197,7 +197,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1001 &115501049
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -474,6 +475,75 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||
--- !u!1001 &215970666
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 28c87801a9b55a346a619e0b82730f6f,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: 23 (1)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 28c87801a9b55a346a619e0b82730f6f, type: 3}
|
||||
--- !u!1 &253532134
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -548,7 +618,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1001 &324827138
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -826,7 +897,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1 &545000718
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1128,7 +1200,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1 &844788115
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1203,7 +1276,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1 &846575632
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1278,7 +1352,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1 &894843622
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1582,7 +1657,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1 &952819793
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1657,7 +1733,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1 &961739749
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1850,7 +1927,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1 &978196357
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2005,7 +2083,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1 &1048925383
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2086,6 +2165,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
conf: {fileID: 0}
|
||||
deviceList:
|
||||
id:
|
||||
deviceName:
|
||||
|
|
@ -3338,7 +3418,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1001 &1589627528
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3498,6 +3579,7 @@ MonoBehaviour:
|
|||
b: {fileID: 0}
|
||||
A: []
|
||||
B: []
|
||||
CardCount: 0
|
||||
--- !u!1 &1691103830
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3572,7 +3654,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1 &1736486647
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3710,6 +3793,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
conf: {fileID: 0}
|
||||
deviceList:
|
||||
id:
|
||||
deviceName:
|
||||
|
|
@ -3830,7 +3914,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!224 &1777632123 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4065166174645593779, guid: cdff6149826a44f4abc275995ec2d804,
|
||||
|
|
@ -3911,7 +3996,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1 &1963089205
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4142,7 +4228,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!1 &2120199654
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4153,6 +4240,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 2120199656}
|
||||
- component: {fileID: 2120199655}
|
||||
- component: {fileID: 2120199657}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
|
|
@ -4195,6 +4283,19 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2120199657
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2120199654}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6e57a7ae6152eaa458098dd3735fe548, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
GameObject: {fileID: 0}
|
||||
--- !u!1 &2134208519
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4269,7 +4370,8 @@ MonoBehaviour:
|
|||
uPosManager: {fileID: 0}
|
||||
conf2:
|
||||
isUse: 0
|
||||
type_Device: 0
|
||||
module_type: 0
|
||||
type_card: 0
|
||||
--- !u!33 &44537008730306141
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -73,11 +73,22 @@ public class BaseConf : ScriptableObject
|
|||
public class Conf2
|
||||
{
|
||||
public bool isUse;
|
||||
public Type_device type_Device;
|
||||
//模型类型
|
||||
public ModuleType module_type;
|
||||
//板卡类型
|
||||
public Type_Card type_card;
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
public enum Type_device
|
||||
public enum ModuleType
|
||||
{
|
||||
板卡,
|
||||
风扇,
|
||||
开关,
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
public enum Type_Card
|
||||
{
|
||||
板卡1,
|
||||
板卡2,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c16cd4a86c9e8b345878789c81a3390d
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 53391f5c6d6076a4f8966ade20711ea9
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1809515f24777b2479dcd189af4f21a6
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 49b4836b3b173eb4c8dad6f59d8a8d2f, type: 3}
|
||||
m_Name: BaseConf_0
|
||||
m_EditorClassIdentifier:
|
||||
conf1:
|
||||
isUse: 0
|
||||
isPicture: 0
|
||||
base64:
|
||||
LensID:
|
||||
LensName:
|
||||
conf2:
|
||||
isUse: 1
|
||||
type: 0
|
||||
type_card: 0
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e144f2a0983b9644da5e0f881ad35afa
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: be4f55f6bc325b84286d5be9830242d8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 49b4836b3b173eb4c8dad6f59d8a8d2f, type: 3}
|
||||
m_Name: BaseConf_0
|
||||
m_EditorClassIdentifier:
|
||||
conf1:
|
||||
isUse: 0
|
||||
isPicture: 0
|
||||
base64:
|
||||
LensID:
|
||||
LensName:
|
||||
conf2:
|
||||
isUse: 0
|
||||
type: 0
|
||||
type_card: 0
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 592c973d6c49ec64bbbef799739fbd42
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -886,7 +886,7 @@ public class GameManager : MonoBehaviour
|
|||
// DragController drag = gameObject.GetComponent<DeviceManager>().dragController.GetComponent<DragController>();
|
||||
// drag.oriObjectPrefab = go.GetComponent<DragTest1>();
|
||||
// drag.uPosManger = jk.transform.Find("U位").GetComponent<UPosManger>();
|
||||
// drag.CountUPos(drag.oriObjectPrefab, Convert.ToInt32(TmsCards[j].devicePosition) - 1);
|
||||
// drag.CountUPos(drag.oriObjectPrefab, Convert.ToInt32(U) - 1);
|
||||
// break;
|
||||
// }
|
||||
// catch (Exception e)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using DG.Tweening;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
|
@ -92,19 +93,37 @@ public class PatternChoose : MonoBehaviour
|
|||
{
|
||||
if (CabinetUIManager.Instance.current_menu == Menu.M_数字孪生_智能巡检)
|
||||
return;
|
||||
ExtendedFlycam.Inst.reminder((isgo) =>
|
||||
{
|
||||
if (isgo)
|
||||
{
|
||||
roomCut_fuc();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
quanJing.onValueChanged.AddListener((x) =>
|
||||
{
|
||||
if (!x)
|
||||
return;
|
||||
ExtendedFlycam.Inst.reminder((isgo) =>
|
||||
{
|
||||
if (isgo)
|
||||
{
|
||||
quanJing_fuc();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
niaoKan.onValueChanged.AddListener((x) =>
|
||||
{
|
||||
ExtendedFlycam.Inst.reminder((isgo) =>
|
||||
{
|
||||
if (isgo)
|
||||
{
|
||||
niaoKan_fuc();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
back_page.onClick.AddListener(() =>
|
||||
|
|
@ -189,7 +208,11 @@ public class PatternChoose : MonoBehaviour
|
|||
}
|
||||
else
|
||||
{
|
||||
var s = Array.FindAll(TransparentGlowManage.Inst.points.ToArray(), (item) =>
|
||||
List<Transform> transforms = new List<Transform>();
|
||||
transforms.AddRange(TransparentGlowManage.Inst.points);
|
||||
transforms.AddRange(TransparentGlowManage.Inst.points_battery);
|
||||
|
||||
var s = Array.FindAll(transforms.ToArray(), (item) =>
|
||||
{
|
||||
return (item.GetComponent<TransparentGlow>() != null &&
|
||||
item.name != "R08" && item.name != "R15" && item.name != "R65" &&
|
||||
|
|
|
|||
|
|
@ -25,17 +25,18 @@ public class DeleteDevice : MonoBehaviour
|
|||
{
|
||||
if (w != null && URlreturn != null && URlreturn.message == "操作成功")
|
||||
{
|
||||
callback?.Invoke(true);
|
||||
StartCoroutine(Succeed((x) =>
|
||||
{
|
||||
if (x)
|
||||
{
|
||||
refurbish();
|
||||
callback?.Invoke(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
SecondConfirmPanel.DeleteConform(null, "更新场景失败");
|
||||
Debug.Log("接口获取数据失败（删除设备-初始化失败）");
|
||||
callback?.Invoke(false);
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
|
@ -121,7 +122,7 @@ public class DeleteDevice : MonoBehaviour
|
|||
}
|
||||
catch (System.Exception e)
|
||||
{
|
||||
Debug.Log("删除设备错误：" + e.Message);
|
||||
Debug.Log("删除设备错误：" + e.Message + "\n" + e.StackTrace);
|
||||
callback.Invoke(null);
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using System.Collections.Generic;
|
|||
using System.Threading.Tasks;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
using static BaseConf;
|
||||
|
||||
/// <summary>
|
||||
/// 设备-查询
|
||||
|
|
@ -11,46 +12,48 @@ using UnityEngine;
|
|||
[AddComponentMenu("设备查询"), Serializable]
|
||||
public class DeviceQuery : MonoBehaviour
|
||||
{
|
||||
public BaseConf conf;
|
||||
|
||||
public DeviceList deviceList = new DeviceList();
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
//getRacksInfo();
|
||||
//return;
|
||||
//Debug.Log("版本号 1.1.1");
|
||||
if (deviceList.type == "2" &&
|
||||
deviceList.deviceType == "1" &&
|
||||
string.IsNullOrEmpty(deviceList.rackId))
|
||||
{
|
||||
var ParentGo = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsDesiredParent);
|
||||
if (!ParentGo)
|
||||
return;
|
||||
deviceList.rackId = ParentGo.GetComponent<DeviceQuery>().deviceList.id;
|
||||
if (!string.IsNullOrEmpty(deviceList.id))
|
||||
gameObject.name = deviceList.id;
|
||||
}
|
||||
#region new
|
||||
getRacksInfo();
|
||||
#endregion
|
||||
#region old
|
||||
//if (deviceList.type == "2" &&
|
||||
// deviceList.deviceType == "1" &&
|
||||
// string.IsNullOrEmpty(deviceList.rackId))
|
||||
//{
|
||||
// var ParentGo = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsDesiredParent);
|
||||
// if (!ParentGo)
|
||||
// return;
|
||||
// deviceList.rackId = ParentGo.GetComponent<DeviceQuery>().deviceList.id;
|
||||
// if (!string.IsNullOrEmpty(deviceList.id))
|
||||
// gameObject.name = deviceList.id;
|
||||
//}
|
||||
|
||||
else if (deviceList.type == "2" &&
|
||||
deviceList.deviceType == "3" &&
|
||||
string.IsNullOrEmpty(deviceList.shelfId))
|
||||
{
|
||||
//if (transform.parent.GetComponent<DeviceQuery>())
|
||||
var sb = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsFindRacks_goORTmsCards_go);
|
||||
if (sb && sb.GetComponent<DeviceQuery>())
|
||||
{
|
||||
//var d = transform.parent.GetComponent<DeviceQuery>();
|
||||
var d = sb.GetComponent<DeviceQuery>();
|
||||
if (d.deviceList.deviceType == "1" && !string.IsNullOrEmpty(d.deviceList.id))
|
||||
{
|
||||
//deviceList.shelfId = transform.parent.GetComponent<DeviceQuery>().deviceList.id;
|
||||
deviceList.shelfId = d.deviceList.id;
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(deviceList.id))
|
||||
gameObject.name = deviceList.id;
|
||||
}
|
||||
//Debug.Log("版本号 1.1.1");
|
||||
//else if (deviceList.type == "2" &&
|
||||
// deviceList.deviceType == "3" &&
|
||||
// string.IsNullOrEmpty(deviceList.shelfId))
|
||||
//{
|
||||
// //if (transform.parent.GetComponent<DeviceQuery>())
|
||||
// var sb = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsFindRacks_goORTmsCards_go);
|
||||
// if (sb && sb.GetComponent<DeviceQuery>())
|
||||
// {
|
||||
// //var d = transform.parent.GetComponent<DeviceQuery>();
|
||||
// var d = sb.GetComponent<DeviceQuery>();
|
||||
// if (d.deviceList.deviceType == "1" && !string.IsNullOrEmpty(d.deviceList.id))
|
||||
// {
|
||||
// //deviceList.shelfId = transform.parent.GetComponent<DeviceQuery>().deviceList.id;
|
||||
// deviceList.shelfId = d.deviceList.id;
|
||||
// }
|
||||
// }
|
||||
// if (!string.IsNullOrEmpty(deviceList.id))
|
||||
// gameObject.name = deviceList.id;
|
||||
//}
|
||||
#endregion
|
||||
}
|
||||
|
||||
private void Awake()
|
||||
|
|
@ -107,23 +110,46 @@ public class DeviceQuery : MonoBehaviour
|
|||
|
||||
public bool getRacksInfo()
|
||||
{
|
||||
if (conf && conf.conf2.module_type != ModuleType.板卡)
|
||||
return false;
|
||||
GameManager manager = new GameManager();
|
||||
//var sb = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsFindRacks_goORTmsCards_go);
|
||||
if (deviceList.type == "2" &&
|
||||
deviceList.deviceType == "3")
|
||||
{
|
||||
var sb = manager.FindParent(gameObject, manager.IsFindRacks_goORTmsCards_go);
|
||||
if (sb && sb.GetComponent<DeviceQuery>())
|
||||
{
|
||||
var d = sb.GetComponent<DeviceQuery>();
|
||||
if (d.deviceList.deviceType == "1")
|
||||
if (d.deviceList.deviceType == "1" && string.IsNullOrEmpty(deviceList.shelfId))
|
||||
{
|
||||
deviceList.shelfId = d.deviceList.id;
|
||||
}
|
||||
else if (d.deviceList.deviceType == "2")
|
||||
else if (d.deviceList.deviceType == "2" && string.IsNullOrEmpty(deviceList.slotId))
|
||||
{
|
||||
deviceList.slotId = d.deviceList.id;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else { return false; }
|
||||
return false;
|
||||
}
|
||||
else if (deviceList.type == "2" &&
|
||||
deviceList.deviceType == "1")
|
||||
{
|
||||
var sb = manager.FindParent(gameObject, manager.IsDesiredParent);
|
||||
if (sb && sb.GetComponent<DeviceQuery>())
|
||||
{
|
||||
var d = sb.GetComponent<DeviceQuery>();
|
||||
if (string.IsNullOrEmpty(deviceList.rackId))
|
||||
{
|
||||
deviceList.rackId = d.deviceList.id;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(deviceList.id))
|
||||
gameObject.name = deviceList.id;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||
using UnityEngine;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using UnityEngine.UIElements;
|
||||
|
||||
public class GroundingGrid : CabinetUIBase
|
||||
{
|
||||
|
|
@ -24,12 +25,16 @@ public class GroundingGrid : CabinetUIBase
|
|||
{
|
||||
gameObject.SetActive(true);
|
||||
|
||||
var s = Array.FindAll(TransparentGlowManage.Inst.points.ToArray(), (item) =>
|
||||
List<Transform> transforms = new List<Transform>();
|
||||
transforms.AddRange(TransparentGlowManage.Inst.points);
|
||||
transforms.AddRange(TransparentGlowManage.Inst.points_battery);
|
||||
|
||||
var s = Array.FindAll(transforms.ToArray(), (item) =>
|
||||
{
|
||||
return (item.GetComponent<TransparentGlow>() != null &&
|
||||
return (item.GetComponent<TransparentGlow>() != null /*&&
|
||||
item.name != "R08" && item.name != "R15" && item.name != "R65" &&
|
||||
item.name != "R57" && item.name != "R54" && item.name != "R45" &&
|
||||
item.name != "R37" && item.name != "R29" && item.name != "R22");
|
||||
item.name != "R37" && item.name != "R29" && item.name != "R22"*/);
|
||||
}).Select(item => item.GetComponent<TransparentGlow>()).ToArray();
|
||||
|
||||
TransparentGlowManage.Inst.transparencyALL(s);
|
||||
|
|
@ -42,7 +47,11 @@ public class GroundingGrid : CabinetUIBase
|
|||
{
|
||||
gameObject.SetActive(false);
|
||||
|
||||
var s = Array.FindAll(TransparentGlowManage.Inst.points.ToArray(), (item) =>
|
||||
List<Transform> transforms = new List<Transform>();
|
||||
transforms.AddRange(TransparentGlowManage.Inst.points);
|
||||
transforms.AddRange(TransparentGlowManage.Inst.points_battery);
|
||||
|
||||
var s = Array.FindAll(transforms.ToArray(), (item) =>
|
||||
{
|
||||
return (item.GetComponent<TransparentGlow>() != null);
|
||||
}).Select(item => item.GetComponent<TransparentGlow>()).ToArray();
|
||||
|
|
|
|||
|
|
@ -912,7 +912,7 @@ public class ClickEvent : MonoBehaviour
|
|||
{
|
||||
for (int i = 0; i < GameManager.Inst.Racks_go.Count; i++)
|
||||
{
|
||||
if (!GameManager.Inst.Racks_go[i].activeSelf)
|
||||
if (GameManager.Inst.Racks_go[i] == null && !GameManager.Inst.Racks_go[i].activeSelf)
|
||||
continue;
|
||||
if (GameManager.Inst.Racks_go[i].GetComponent<DeviceQuery>().deviceList.modelNum == "6" ||
|
||||
GameManager.Inst.Racks_go[i].GetComponent<DeviceQuery>().deviceList.modelNum == "7" ||
|
||||
|
|
@ -1226,7 +1226,7 @@ public class ClickEvent : MonoBehaviour
|
|||
float modelWidth = modelSize.x;
|
||||
float modelHeight = modelSize.y;
|
||||
float modelDepth = modelSize.z;
|
||||
//endPos = t.localPosition = new Vector3((float)modelWidth / 2, 0, 0);
|
||||
endPos = t.localPosition = new Vector3((float)modelWidth / 2, 0, 0);
|
||||
Debug.Log("################\n" + "modelWidth: " + modelWidth + "\nmodelHeight: " + modelHeight + "\nmodelDepth: " + modelDepth);
|
||||
|
||||
if (isLocal)
|
||||
|
|
|
|||
|
|
@ -723,13 +723,6 @@ public class ExtendedFlycam : MonoBehaviour
|
|||
Cable_ground_hide[i].gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = 0; i < Cable_ground_hide.Count; i++)
|
||||
{
|
||||
Cable_ground_hide[i].gameObject.SetActive(true);
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < jiFang_JDW_Cable_ground_show.Count; i++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -34,6 +34,10 @@ public class TransparentGlowManage : MonoBehaviour
|
|||
public List<Transform> points = new List<Transform>();
|
||||
public List<ClickEvent> clickEvents = new List<ClickEvent>();
|
||||
/// <summary>
|
||||
/// 可以透明的蓄电池
|
||||
/// </summary>
|
||||
public List<Transform> points_battery = new List<Transform>();
|
||||
/// <summary>
|
||||
/// 是否进入透明模式
|
||||
/// </summary>
|
||||
public bool is_transparency = false;
|
||||
|
|
@ -93,7 +97,7 @@ public class TransparentGlowManage : MonoBehaviour
|
|||
item.gameObject.AddComponent<ClickEvent>();
|
||||
}
|
||||
|
||||
Renderer renderer = null;
|
||||
//Renderer renderer = null;
|
||||
//if (!boxCollider)
|
||||
//{
|
||||
// try
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ public class tooltest : MonoBehaviour
|
|||
public Transform b;
|
||||
public List<Transform> A;
|
||||
public List<Transform> B;
|
||||
|
||||
public int CardCount = 0;
|
||||
|
||||
|
||||
void Start()
|
||||
|
|
@ -49,6 +49,8 @@ public class tooltest : MonoBehaviour
|
|||
UnityEditorInternal.ComponentUtility.PasteComponentValues(b5);
|
||||
|
||||
if (!b.GetComponent<MeshCollider>()) b.AddComponent<MeshCollider>();
|
||||
|
||||
b.gameObject.layer = 8;
|
||||
}
|
||||
|
||||
[ContextMenu("-----------------------------------------------------------------")]
|
||||
|
|
@ -83,6 +85,8 @@ public class tooltest : MonoBehaviour
|
|||
UnityEditorInternal.ComponentUtility.PasteComponentValues(b6);
|
||||
|
||||
if (!B[i].GetComponent<MeshCollider>()) B[i].AddComponent<MeshCollider>();
|
||||
|
||||
B[i].gameObject.layer = 13;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -111,4 +115,24 @@ public class tooltest : MonoBehaviour
|
|||
b1.portList.portPosition = (i + 1).ToString();
|
||||
}
|
||||
}
|
||||
|
||||
[ContextMenu("-----------------------------------------------------------------")]
|
||||
[ContextMenu("´´½¨Uλ")]
|
||||
public void Replace1()
|
||||
{
|
||||
GameObject emptyObject = new GameObject("Uλ");
|
||||
emptyObject.transform.parent = b;
|
||||
emptyObject.transform.localPosition = Vector3.zero;
|
||||
emptyObject.transform.localEulerAngles = Vector3.zero;
|
||||
emptyObject.AddComponent<UPosManger>();
|
||||
for (int i = 0; i < CardCount; i++)
|
||||
{
|
||||
GameObject g = new GameObject();
|
||||
g.transform.parent = emptyObject.transform;
|
||||
g.transform.localPosition = Vector3.zero;
|
||||
g.transform.localEulerAngles = Vector3.zero;
|
||||
g.name = (i + 1).ToString();
|
||||
g.AddComponent<UPosItem>();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -24,8 +24,8 @@ TagManager:
|
|||
- "\u6444\u50CF\u5934"
|
||||
- "\u5899"
|
||||
- PostVolume
|
||||
-
|
||||
-
|
||||
- "\u8BBE\u5907\u5F00\u5173"
|
||||
- "\u8BBE\u5907\u98CE\u6247"
|
||||
-
|
||||
-
|
||||
-
|
||||
|
|
|
|||
Loading…
Reference in New Issue