提交修改
This commit is contained in:
parent
1368b51a80
commit
205ca15420
|
@ -6246,7 +6246,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &465806889
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -16678,6 +16678,9 @@ MonoBehaviour:
|
|||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
recoverBtn: {fileID: 1876085501}
|
||||
recoverEvent:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
bottomToolToggle: {fileID: 754664720}
|
||||
currentTool: {fileID: 0}
|
||||
ServerRecorderPanel: {fileID: 1102537591}
|
||||
|
@ -16786,6 +16789,8 @@ MonoBehaviour:
|
|||
- {fileID: 1470071477}
|
||||
- {fileID: 1973380977}
|
||||
- {fileID: 602624092}
|
||||
aqcss: []
|
||||
fxdfx: []
|
||||
jobCardPanel: {fileID: 2087751350}
|
||||
jobChoiceQuestionPanel: {fileID: 1528062685}
|
||||
optionItemPrefab: {fileID: 7841566712123838783, guid: 93344dcdc8d5a4847a7aa731e5635769, type: 3}
|
||||
|
@ -22595,7 +22600,7 @@ MonoBehaviour:
|
|||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
m_TargetGraphic: {fileID: 1447165520}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -11,7 +11,6 @@ Material:
|
|||
m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ValidKeywords:
|
||||
- _EMISSION
|
||||
- _METALLICGLOSSMAP
|
||||
- _NORMALMAP
|
||||
- _SPECGLOSSMAP
|
||||
m_InvalidKeywords: []
|
||||
|
@ -49,7 +48,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 2800000, guid: d0b7d05edaefa614e8929df8517a966f, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OcclusionMap:
|
||||
|
@ -73,7 +72,7 @@ Material:
|
|||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _Metallic: 0
|
||||
- _Metallic: 0.533
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
|
@ -83,6 +82,6 @@ Material:
|
|||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 0.9528302, g: 0.9528302, b: 0.9528302, a: 1}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
|
@ -406,7 +406,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 183119646645465955}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
|
||||
m_Name:
|
||||
|
@ -1012,10 +1012,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
electricity: 0
|
||||
activation: 0
|
||||
electricity: 1
|
||||
activation: 5
|
||||
name: "\u7528\u7535_CV2"
|
||||
isBlack: 0
|
||||
VV: V
|
||||
--- !u!1 &763471463664476292
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1624,10 +1625,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
electricity: 0
|
||||
activation: 0
|
||||
electricity: 1
|
||||
activation: 5
|
||||
name: "\u7528\u7535_CV3"
|
||||
isBlack: 0
|
||||
VV: V
|
||||
--- !u!1 &1241165713762030815
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1987,10 +1989,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
electricity: 0
|
||||
activation: 0
|
||||
electricity: 1
|
||||
activation: 10
|
||||
name: "\u7528\u7535_CV3"
|
||||
isBlack: 0
|
||||
VV: ' V'
|
||||
--- !u!1 &1918222522557054203
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2674,7 +2677,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2848851287756016752}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
|
||||
m_Name:
|
||||
|
@ -2692,6 +2695,8 @@ GameObject:
|
|||
- component: {fileID: 3313878054425819741}
|
||||
- component: {fileID: 999037576174543312}
|
||||
- component: {fileID: 5490236489971416305}
|
||||
- component: {fileID: 2923343074421989141}
|
||||
- component: {fileID: 7441753607890645216}
|
||||
m_Layer: 0
|
||||
m_Name: Object428
|
||||
m_TagString: Untagged
|
||||
|
@ -2764,6 +2769,32 @@ MeshRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!65 &2923343074421989141
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3186866297575896574}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 0.0457753, y: 0.043387014, z: 0.033180986}
|
||||
m_Center: {x: -0.0011986911, y: -0.007815547, z: 0.012166697}
|
||||
--- !u!114 &7441753607890645216
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3186866297575896574}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7c87fecd3e21b334ba6ebe2ad40d106c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
mesh: {fileID: 7518181732797652832}
|
||||
--- !u!1 &3257671273237242133
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3079,10 +3110,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
electricity: 0
|
||||
activation: 0
|
||||
electricity: 1
|
||||
activation: 7
|
||||
name: "\u7528\u7535_CV3"
|
||||
isBlack: 0
|
||||
VV: V
|
||||
--- !u!1 &3780776059789330294
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -4013,10 +4045,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
electricity: 0
|
||||
activation: 0
|
||||
electricity: 1
|
||||
activation: 2
|
||||
name: "\u7528\u7535_CV2"
|
||||
isBlack: 0
|
||||
VV: V
|
||||
--- !u!1 &5317200332185298439
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5227,10 +5260,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
electricity: 0
|
||||
electricity: 1
|
||||
activation: 0
|
||||
name: N
|
||||
isBlack: 1
|
||||
VV:
|
||||
--- !u!1 &8644223648774417466
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5424,10 +5458,11 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
electricity: 0
|
||||
activation: 0
|
||||
electricity: 1
|
||||
activation: 9
|
||||
name: "\u7528\u7535_CV2"
|
||||
isBlack: 0
|
||||
VV: V
|
||||
--- !u!1 &8686247563076990760
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -6017,7 +6052,7 @@ MeshCollider:
|
|||
m_GameObject: {fileID: 4728026782583967234}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
serializedVersion: 4
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
|
@ -6050,7 +6085,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4728026782583967234}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 79f17ac2192e9a74f84269fd2ddb5b32, type: 3}
|
||||
m_Name:
|
||||
|
|
|
@ -12980,7 +12980,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 28
|
||||
m_RootOrder: 29
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &388288287
|
||||
GameObject:
|
||||
|
@ -23147,6 +23147,8 @@ MonoBehaviour:
|
|||
trans: {fileID: 2401820165377604994}
|
||||
Redpos: {x: -0.038, y: 0.223, z: 0.111}
|
||||
Blackpos: {x: -0.1, y: 0.223, z: 0.111}
|
||||
Multimeter: 0
|
||||
MultimeterV:
|
||||
--- !u!1001 &618341781
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -34575,6 +34577,64 @@ GameObject:
|
|||
m_CorrespondingSourceObject: {fileID: 322936463316669892, guid: e6024f57cedac6a40be3574b2630b881, type: 3}
|
||||
m_PrefabInstance: {fileID: 901287841}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &905697361
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 905697365}
|
||||
- component: {fileID: 905697362}
|
||||
- component: {fileID: 905697366}
|
||||
m_Layer: 0
|
||||
m_Name: Cube
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!65 &905697362
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 905697361}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 1
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &905697365
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 905697361}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 108.991, y: 0.557, z: 322.2779}
|
||||
m_LocalScale: {x: 1, y: 1, z: 3.4345794}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 28
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &905697366
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 905697361}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0b0614c3ab559a47b4d270033167a8a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &909244698
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -38180,6 +38240,103 @@ Transform:
|
|||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 77700b2d8a115444388efd2653c78d35, type: 3}
|
||||
m_PrefabInstance: {fileID: 976563958}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &976792123
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 976792127}
|
||||
- component: {fileID: 976792126}
|
||||
- component: {fileID: 976792125}
|
||||
- component: {fileID: 976792124}
|
||||
m_Layer: 0
|
||||
m_Name: Cube
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!65 &976792124
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 976792123}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!23 &976792125
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 976792123}
|
||||
m_Enabled: 0
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &976792126
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 976792123}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &976792127
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 976792123}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 110.523, y: 0.5003009, z: 322.256}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 30
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &977773623
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -74974,6 +75131,7 @@ MonoBehaviour:
|
|||
MultimeterIm: {fileID: 607572847}
|
||||
DianFuIm: {fileID: 2132026559}
|
||||
DianFuTex: {fileID: 1874428843}
|
||||
FirstPersonController: {fileID: 2401820165377604996}
|
||||
--- !u!4 &1965873574
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -8,9 +8,10 @@ public class Multimeter : MonoBehaviour
|
|||
[Header("ÊÇ·ñ´øµç")]
|
||||
public bool electricity = false;
|
||||
[Header("µçÁ÷")]
|
||||
public int activation;
|
||||
public float activation;
|
||||
public string name;
|
||||
public bool isBlack;
|
||||
public string VV;
|
||||
|
||||
private void OnMouseDown()
|
||||
{
|
||||
|
@ -22,6 +23,7 @@ public class Multimeter : MonoBehaviour
|
|||
GameManager.ins.BlackWanYon.transform.DOLocalMove(new Vector3(0,0,-2), 0.25f);
|
||||
GameManager.ins.BlackWanYon.layer = 0;
|
||||
GameManager.ins.MultimeterIm.gameObject.SetActive(true);
|
||||
|
||||
}
|
||||
if (GameManager.ins.RedWanYon != null&&!isBlack)
|
||||
{
|
||||
|
@ -31,6 +33,11 @@ public class Multimeter : MonoBehaviour
|
|||
GameManager.ins.RedWanYon.transform.DOLocalMove(new Vector3(0,0, -2f), 0.25f);
|
||||
GameManager.ins.RedWanYon.layer = 0;
|
||||
GameManager.ins.MultimeterIm.gameObject.SetActive(true);
|
||||
if (electricity)
|
||||
{
|
||||
GameManager.ins.DianFuIm.gameObject.SetActive(true);
|
||||
GameManager.ins.DianFuTex.text = activation + VV;
|
||||
}
|
||||
}
|
||||
Debug.Log("³É¹¦");
|
||||
}
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class DoolsPlayer : MonoBehaviour
|
||||
{
|
||||
[SerializeField] MeshCollider mesh;
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void OnMouseDown()
|
||||
{
|
||||
mesh.enabled = true;
|
||||
gameObject.SetActive(false);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7c87fecd3e21b334ba6ebe2ad40d106c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -29,7 +29,7 @@ public class GameManager : MonoBehaviour
|
|||
[SerializeField] GameObject NiBianQi;
|
||||
[SerializeField] Image XiangWeiUI;//相位UI
|
||||
public GameObject temp;
|
||||
[SerializeField] List<GameObject> interactive;
|
||||
public List<GameObject> interactive;
|
||||
public GameObject RedWanYon;
|
||||
public GameObject BlackWanYon;
|
||||
public GameObject FuAnBiao;
|
||||
|
@ -39,6 +39,7 @@ public class GameManager : MonoBehaviour
|
|||
public Image MultimeterIm;
|
||||
public Image DianFuIm;
|
||||
public Text DianFuTex;
|
||||
[SerializeField] FirstPersonController FirstPersonController;
|
||||
public void Awake()
|
||||
{
|
||||
if (ins != null)
|
||||
|
@ -52,7 +53,16 @@ public class GameManager : MonoBehaviour
|
|||
// Start is called before the first frame update
|
||||
private void Start()
|
||||
{
|
||||
|
||||
UIManager.Instance.ToolsItemManager.ItemClick.AddListener(ToolsShow);
|
||||
UIManager.Instance.ToolsItemManager.recoverEvent.AddListener(() =>
|
||||
{
|
||||
WanStopValve.gameObject.SetActive(false);
|
||||
QianStopValve.gameObject.SetActive(false);
|
||||
DianFuIm.gameObject.SetActive(false);
|
||||
interactiveEnum = Interactive.none;
|
||||
FirstPersonController.enabled = true;
|
||||
});
|
||||
string sceneInfo = "三相_无互感器_无光伏";
|
||||
var tempStr = sceneInfo.Split('_');
|
||||
int pvwCount = (GlobalFlag.pvw * 1000) / 295;
|
||||
|
@ -74,6 +84,7 @@ public class GameManager : MonoBehaviour
|
|||
GameObject obj = Instantiate(Inverter[i]);
|
||||
obj.transform.localPosition = biaojiPos.localPosition;
|
||||
obj.transform.localEulerAngles = biaojiPos.localEulerAngles;
|
||||
interactive.Add(obj.GetComponentInChildren<door_control>().gameObject) ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -113,6 +124,7 @@ public class GameManager : MonoBehaviour
|
|||
/// </summary>
|
||||
public void ToolsShow(GameObject tools)
|
||||
{
|
||||
FirstPersonController.enabled = false;
|
||||
if (temp != null)
|
||||
{
|
||||
Destroy(temp.gameObject);
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class BoxDools : MonoBehaviour
|
||||
{
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
if (other != null)
|
||||
{
|
||||
for (int i = 0; i < GameManager.ins.interactive.Count; i++)
|
||||
{
|
||||
GameManager.ins.interactive[i].GetComponent<door_control>().enabled = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d0b0614c3ab559a47b4d270033167a8a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -20,7 +20,10 @@ public class BoxPengZhuang : MonoBehaviour
|
|||
{
|
||||
g1.gameObject.SetActive(true);
|
||||
g1.init(dialogue);
|
||||
fraction.CompletedorNot = true;
|
||||
if (fraction)
|
||||
{
|
||||
fraction.CompletedorNot = true;
|
||||
}
|
||||
GetComponent<Fraction>().CompletedorNot = true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 023baaaa61e282345ba2be5458315696
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 25d70fabd09336447aa2c510e9eb5081
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,96 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: New Material
|
||||
m_Shader: {fileID: -6465566751694194690, guid: 25d70fabd09336447aa2c510e9eb5081, type: 3}
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailAlbedoMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailMask:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailNormalMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Emission:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Main:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Metallic:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Normal:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OcclusionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ParallaxMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_BuildTextureStacks: []
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9bb3e1ce8ad122e46a84c2eec2b26aa8
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -7,7 +7,6 @@
|
|||
"com.unity.ide.visualstudio": "2.0.16",
|
||||
"com.unity.ide.vscode": "1.2.5",
|
||||
"com.unity.postprocessing": "3.2.2",
|
||||
"com.unity.shadergraph": "12.1.8",
|
||||
"com.unity.test-framework": "1.1.31",
|
||||
"com.unity.textmeshpro": "3.0.6",
|
||||
"com.unity.timeline": "1.6.4",
|
||||
|
|
|
@ -91,23 +91,6 @@
|
|||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
},
|
||||
"com.unity.render-pipelines.core": {
|
||||
"version": "12.1.8",
|
||||
"depth": 1,
|
||||
"source": "builtin",
|
||||
"dependencies": {
|
||||
"com.unity.ugui": "1.0.0",
|
||||
"com.unity.modules.physics": "1.0.0",
|
||||
"com.unity.modules.jsonserialize": "1.0.0"
|
||||
}
|
||||
},
|
||||
"com.unity.searcher": {
|
||||
"version": "4.9.1",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.cn"
|
||||
},
|
||||
"com.unity.services.core": {
|
||||
"version": "1.6.0",
|
||||
"depth": 1,
|
||||
|
@ -126,15 +109,6 @@
|
|||
"dependencies": {},
|
||||
"url": "https://packages.unity.cn"
|
||||
},
|
||||
"com.unity.shadergraph": {
|
||||
"version": "12.1.8",
|
||||
"depth": 0,
|
||||
"source": "builtin",
|
||||
"dependencies": {
|
||||
"com.unity.render-pipelines.core": "12.1.8",
|
||||
"com.unity.searcher": "4.9.1"
|
||||
}
|
||||
},
|
||||
"com.unity.test-framework": {
|
||||
"version": "1.1.31",
|
||||
"depth": 0,
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &1
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 61
|
||||
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: de02f9e1d18f588468e474319d09a723, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
customInterpolatorErrorThreshold: 32
|
||||
customInterpolatorWarningThreshold: 16
|
Loading…
Reference in New Issue