diff --git a/Assets/GameAssets/Scenes/江宁应天大道营业厅.unity b/Assets/GameAssets/Scenes/江宁应天大道营业厅.unity index 50ffec25..ec9a993f 100644 --- a/Assets/GameAssets/Scenes/江宁应天大道营业厅.unity +++ b/Assets/GameAssets/Scenes/江宁应天大道营业厅.unity @@ -15757,6 +15757,82 @@ Transform: m_Father: {fileID: 235672223} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &82734591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 82734592} + - component: {fileID: 82734595} + - component: {fileID: 82734594} + - component: {fileID: 82734593} + m_Layer: 0 + m_Name: jiankong1 (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &82734592 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82734591} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 17.226, y: 2.942, z: 6.204} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1831430267} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &82734593 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82734591} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.118720055, y: 0.30851412, z: 0.29558945} + m_Center: {x: 0.06953013, y: -0.002929926, z: 0.12773323} +--- !u!114 &82734594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82734591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3f5e7843ec67d34c95500c27e90fed8, type: 3} + m_Name: + m_EditorClassIdentifier: + index: 0 + deviceType: 7 + isSingle: 0 +--- !u!114 &82734595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82734591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d58c4babb1b6d96419e632b4a01690f7, type: 3} + m_Name: + m_EditorClassIdentifier: + modelType: 0 + deviceType: 7 + expType: 0 --- !u!1 &83057495 GameObject: m_ObjectHideFlags: 0 @@ -83237,6 +83313,52 @@ Transform: m_Father: {fileID: 1601298084} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &390756234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 390756235} + - component: {fileID: 390756236} + m_Layer: 0 + m_Name: "\u4E1A\u52A1\u53D7\u7406\u673A\u5DF2\u79BB\u7EBF" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &390756235 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 390756234} + m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: 13.352, y: 0.436, z: 3.84} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1831430267} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!114 &390756236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 390756234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d58c4babb1b6d96419e632b4a01690f7, type: 3} + m_Name: + m_EditorClassIdentifier: + modelType: 3 + deviceType: 0 + expType: 5 --- !u!1 &391057473 GameObject: m_ObjectHideFlags: 0 @@ -94649,6 +94771,82 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &498270487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 498270488} + - component: {fileID: 498270491} + - component: {fileID: 498270490} + - component: {fileID: 498270489} + m_Layer: 0 + m_Name: jiankong1 (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &498270488 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498270487} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 17.226, y: 2.942, z: 6.204} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1831430267} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &498270489 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498270487} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.118720055, y: 0.30851412, z: 0.29558945} + m_Center: {x: 0.06953013, y: -0.002929926, z: 0.12773323} +--- !u!114 &498270490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498270487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3f5e7843ec67d34c95500c27e90fed8, type: 3} + m_Name: + m_EditorClassIdentifier: + index: 0 + deviceType: 7 + isSingle: 0 +--- !u!114 &498270491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498270487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d58c4babb1b6d96419e632b4a01690f7, type: 3} + m_Name: + m_EditorClassIdentifier: + modelType: 0 + deviceType: 7 + expType: 0 --- !u!1 &502515508 GameObject: m_ObjectHideFlags: 0 @@ -112327,7 +112525,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &641031000 Transform: m_ObjectHideFlags: 0 @@ -127700,7 +127898,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6171185904365341041, guid: 4c700d66edd83824c8399470b4409820, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6171185904393763577, guid: 4c700d66edd83824c8399470b4409820, type: 3} propertyPath: m_LocalPosition.y @@ -133269,6 +133467,52 @@ Transform: m_Father: {fileID: 1954846295} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &731441804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 731441805} + - component: {fileID: 731441806} + m_Layer: 0 + m_Name: "\u7591\u4F3C\u4EBA\u5458\u8DCC\u5012" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &731441805 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 731441804} + m_LocalRotation: {x: -0, y: -0.19166562, z: -0, w: 0.98146033} + m_LocalPosition: {x: 12.652, y: 0.44, z: 1.231} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1831430267} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: -22.1, z: 0} +--- !u!114 &731441806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 731441804} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d58c4babb1b6d96419e632b4a01690f7, type: 3} + m_Name: + m_EditorClassIdentifier: + modelType: 3 + deviceType: 0 + expType: 3 --- !u!1 &734116467 GameObject: m_ObjectHideFlags: 0 @@ -138465,6 +138709,52 @@ Transform: m_Father: {fileID: 1361080208} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &759409699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 759409700} + - component: {fileID: 759409701} + m_Layer: 0 + m_Name: "\u81EA\u52A9\u7F34\u8D39\u673A\u5DF2\u79BB\u7EBF" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &759409700 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759409699} + m_LocalRotation: {x: -0.07224549, y: 0.0065805614, z: -0.00048659742, w: -0.9973651} + m_LocalPosition: {x: 15.466, y: 1.072, z: 7.165} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1831430267} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!114 &759409701 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759409699} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d58c4babb1b6d96419e632b4a01690f7, type: 3} + m_Name: + m_EditorClassIdentifier: + modelType: 3 + deviceType: 0 + expType: 6 --- !u!1 &759602261 GameObject: m_ObjectHideFlags: 0 @@ -243826,6 +244116,82 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &1325275368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1325275369} + - component: {fileID: 1325275372} + - component: {fileID: 1325275371} + - component: {fileID: 1325275370} + m_Layer: 0 + m_Name: jiankong1 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &1325275369 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325275368} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.795, y: 3.079, z: 7.264} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1831430267} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1325275370 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325275368} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.118720055, y: 0.30851412, z: 0.29558945} + m_Center: {x: 0.06953013, y: -0.002929926, z: 0.12773323} +--- !u!114 &1325275371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325275368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3f5e7843ec67d34c95500c27e90fed8, type: 3} + m_Name: + m_EditorClassIdentifier: + index: 0 + deviceType: 7 + isSingle: 0 +--- !u!114 &1325275372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325275368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d58c4babb1b6d96419e632b4a01690f7, type: 3} + m_Name: + m_EditorClassIdentifier: + modelType: 0 + deviceType: 7 + expType: 0 --- !u!1 &1330569763 GameObject: m_ObjectHideFlags: 0 @@ -291106,6 +291472,52 @@ Transform: m_Father: {fileID: 2010762738} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1565606936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1565606937} + - component: {fileID: 1565606938} + m_Layer: 0 + m_Name: "\u79BB\u5C97\u5F02\u5E38" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1565606937 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565606936} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 2.891, y: 1.654, z: 5.382} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1831430267} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!114 &1565606938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565606936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d58c4babb1b6d96419e632b4a01690f7, type: 3} + m_Name: + m_EditorClassIdentifier: + modelType: 3 + deviceType: 0 + expType: 1 --- !u!1 &1565634430 GameObject: m_ObjectHideFlags: 0 @@ -334549,6 +334961,43 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823423007} m_Mesh: {fileID: -6902808245767620161, guid: b4b8f45821e421044920fd26a6ccfe46, type: 3} +--- !u!1 &1831430266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1831430267} + m_Layer: 0 + m_Name: ExpPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1831430267 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1831430266} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000058114523} + m_LocalPosition: {x: 19.71848, y: 0, z: 6.868688} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1565606937} + - {fileID: 731441805} + - {fileID: 390756235} + - {fileID: 759409700} + - {fileID: 1325275369} + - {fileID: 498270488} + - {fileID: 82734592} + m_Father: {fileID: 691289277} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1832361116 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Scenes/T_YH.unity b/Assets/Resources/Scenes/T_YH.unity index eff0683b..40232642 100644 --- a/Assets/Resources/Scenes/T_YH.unity +++ b/Assets/Resources/Scenes/T_YH.unity @@ -167375,7 +167375,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!108 &1102345161643030081 Light: m_ObjectHideFlags: 0 @@ -214868,7 +214868,7 @@ MonoBehaviour: camList: [] clients: [] counters: [] - _spaceArea: {fileID: 0} + _spaceArea: {fileID: 1293563867} iconPanel: {fileID: 0} heatPoints: [] m_Vector3s: [] diff --git a/Assets/Resources/Scripts/Manager/ModelManager.cs b/Assets/Resources/Scripts/Manager/ModelManager.cs index f5a6b395..90f4b403 100644 --- a/Assets/Resources/Scripts/Manager/ModelManager.cs +++ b/Assets/Resources/Scripts/Manager/ModelManager.cs @@ -224,7 +224,6 @@ public class ModelManager : MonoBehaviour icon.name = expPoints[i].name; icon.GetComponent().InitExpIcon(expPoints[i].GetComponent().expType,i); } - //测试，第一个摄像头警告 camList[2].GetComponent()._isCamWarm = true; }