WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: WangWeiZhi:ffca0cd8e3343a8ea0e4783e02e3f82aa0680d46
Branches Tags
WangWeiZhi:main
WangWeiZhi:HQB_workspace
..
compare: WangWeiZhi:1db6d2f90ada4a1706e0da1caafc2475502e3d85
Branches Tags
WangWeiZhi:HQB_workspace
WangWeiZhi:main

No commits in common. "ffca0cd8e3343a8ea0e4783e02e3f82aa0680d46" and "1db6d2f90ada4a1706e0da1caafc2475502e3d85" have entirely different histories.
ffca0cd8e3 ... 1db6d2f90a

37 changed files with 351937 additions and 328 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -74,4 +74,3 @@ crashlytics-build.properties
/[Aa]ssets/[Ss]treamingAssets/aa/*
/*.vsconfig
/Assets/ArtRes/Fonts

2542
Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold SDF.asset Normal file
View File

File diff suppressed because one or more lines are too long

8
Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold SDF.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9ea913af302bbdf42a9f003451c70e02
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold.otf Normal file
View File

Binary file not shown.

21
Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold.otf.meta Normal file
View File

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 4eae2d3f036a9f34e8b72ef95695be9d
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- Alimama ShuHeiTi
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

165345
Assets/ArtRes/Fonts/SourceHanSansCN-Bold SDF.asset Normal file
View File

File diff suppressed because one or more lines are too long

8
Assets/ArtRes/Fonts/SourceHanSansCN-Bold SDF.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f8ef5cb2ab4d4da4093d3fe60f978c99
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/ArtRes/Fonts/SourceHanSansCN-Bold.otf Normal file
View File

Binary file not shown.

21
Assets/ArtRes/Fonts/SourceHanSansCN-Bold.otf.meta Normal file
View File

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 60b5d8dde4f509a4185ee4a54a236416
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- Source Han Sans CN
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

174414
Assets/ArtRes/Fonts/SourceHanSansCN-Medium SDF.asset Normal file
View File

File diff suppressed because one or more lines are too long

8
Assets/ArtRes/Fonts/SourceHanSansCN-Medium SDF.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1c4004df1d65ff944b6e23e3af757df7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/ArtRes/Fonts/SourceHanSansCN-Medium.otf Normal file
View File

Binary file not shown.

21
Assets/ArtRes/Fonts/SourceHanSansCN-Medium.otf.meta Normal file
View File

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 8af3ad854ddf42d4bad8563aff10a985
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- Source Han Sans CN
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

9447
Assets/ArtRes/Fonts/SourceHanSansCN-Regular SDF.asset Normal file
View File

File diff suppressed because one or more lines are too long

8
Assets/ArtRes/Fonts/SourceHanSansCN-Regular SDF.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f23cde0c3d86dad49bedc202ad993d21
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/ArtRes/Fonts/SourceHanSansCN-Regular.otf Normal file
View File

Binary file not shown.

21
Assets/ArtRes/Fonts/SourceHanSansCN-Regular.otf.meta Normal file
View File

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 21e520e9f4216d64e86ecdad0d82df46
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- Source Han Sans CN
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

2
Assets/ArtRes/Fonts/chinese.txt Normal file
View File

File diff suppressed because one or more lines are too long

7
Assets/ArtRes/Fonts/chinese.txt.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 79e309f1e0c36e849a1766c6c66545ed
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

20
Assets/Plugins/HighlightPlus/Runtime/Resources/HighlightPlus/HighlightOutline.mat
View File

@ -15,15 +15,14 @@ MonoBehaviour:
version: 1
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: HighlightOutline
m_Shader: {fileID: 4800000, guid: cbbf740e9c8644e8492d08b1a3fd0203, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
@ -46,7 +45,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 1e193a79841ea4b4b8dddf797b7fba7d, type: 3}
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@ -57,22 +56,16 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OutlineGradientTex:
m_Texture: {fileID: 2800000, guid: 1e193a79841ea4b4b8dddf797b7fba7d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ConstantWidth: 0.28
- _Cull: 2.17
- _CutOff: -0.32
- _ConstantWidth: 1
- _Cull: 2
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
@ -82,7 +75,7 @@ Material:
- _Metallic: 0
- _OcclusionStrength: 1
- _OutlineWidth: 0.01
- _OutlineZTest: 3.44
- _OutlineZTest: 4
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
@ -99,4 +92,3 @@ Material:
- _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _OutlineDirection: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []

2
Assets/Resources/Prefabs/Objects/Tools/绝缘螺丝刀.prefab
View File

@ -65,7 +65,7 @@ BoxCollider:
m_GameObject: {fileID: 7175692158753146328}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 2
m_Size: {x: 0.05094013, y: 0.05094013, z: 0.30404854}
m_Center: {x: 0, y: 0.00000011920929, z: -0.15774488}

34
Assets/Resources/UI/UI_Panel/UI_SessionPanel.prefab
View File

@ -172,11 +172,11 @@ RectTransform:
m_Father: {fileID: 2593408648689179035}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -1124, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 56, y: 0}
m_SizeDelta: {x: 740, y: 92}
m_Pivot: {x: 1, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!222 &6808126078078298486
CanvasRenderer:
m_ObjectHideFlags: 0
@ -595,7 +595,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -729,7 +729,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.3137255}
m_Color: {r: 0.3962264, g: 0.3962264, b: 0.3962264, a: 0.5372549}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -883,7 +883,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -993,8 +993,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 160, y: 24}
m_SizeDelta: {x: 480, y: 54}
m_AnchoredPosition: {x: 132.09, y: 24}
m_SizeDelta: {x: 549, y: 54}
m_Pivot: {x: 0, y: 0}
--- !u!222 &5021900504341359756
CanvasRenderer:
@ -1018,7 +1018,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@ -1192,11 +1192,11 @@ RectTransform:
m_Father: {fileID: 2593408648689179035}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -52.66, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 56, y: 0}
m_SizeDelta: {x: 740, y: 92}
m_Pivot: {x: 1, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!222 &5298249789619151875
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1558,8 +1558,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 102, y: 24}
m_SizeDelta: {x: 466.9986, y: 54}
m_AnchoredPosition: {x: 132.09, y: 24}
m_SizeDelta: {x: 549, y: 54}
m_Pivot: {x: 0, y: 0}
--- !u!222 &5988554802588913644
CanvasRenderer:
@ -1583,7 +1583,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:

199
Assets/Scenes/04_ToolMaterialScene.unity
View File

@ -144,11 +144,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalPosition.x
value: -0.795
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalPosition.y
value: 1.143
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalPosition.z
@ -156,19 +156,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalRotation.w
value: 0.1539439
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalRotation.y
value: 0.9880796
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -176,7 +176,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 162.289
value: 180
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@ -1209,10 +1209,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9063172993125021920, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f8a9676618f065446b3926269089375e, type: 3}
--- !u!4 &1585685579 stripped
@ -1235,10 +1231,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4524593902786536362, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_RootOrder
value: 13
@ -2114,7 +2106,6 @@ GameObject:
- component: {fileID: 1711813855422086855}
- component: {fileID: 3469287837270444558}
- component: {fileID: 3469287837270444559}
- component: {fileID: 3469287837270444560}
m_Layer: 0
m_Name: "\u68B3\u5986\u955C"
m_TagString: Untagged
@ -2565,10 +2556,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9063172993125021920, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f8a9676618f065446b3926269089375e, type: 3}
--- !u!114 &2557768359599646897 stripped
@ -2894,178 +2881,6 @@ MonoBehaviour:
triggerID: 5012
triggerName: "\u955C\u5B50"
_highlight: {fileID: 0}
--- !u!114 &3469287837270444560
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 919132149367037714}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
m_Name:
m_EditorClassIdentifier:
profile: {fileID: 0}
profileSync: 0
camerasLayerMask:
serializedVersion: 2
m_Bits: 4294967295
effectGroup: 0
effectGroupLayer:
serializedVersion: 2
m_Bits: 4294967295
effectNameFilter:
combineMeshes: 0
alphaCutOff: 0
cullBackFaces: 1
ignoreObjectVisibility: 0
reflectionProbes: 0
GPUInstancing: 1
optimizeSkinnedMesh: 1
depthClip: 0
cameraDistanceFade: 0
cameraDistanceFadeNear: 0
cameraDistanceFadeFar: 1000
normalsOption: 0
ignore: 0
_highlighted: 0
fadeInDuration: 0
fadeOutDuration: 0
flipY: 0
constantWidth: 1
subMeshMask: -1
overlay: 0
overlayMode: 0
overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
overlayAnimationSpeed: 1
overlayMinIntensity: 0.5
overlayBlending: 1
overlayTexture: {fileID: 0}
overlayTextureUVSpace: 0
overlayTextureScale: 1
overlayVisibility: 0
outline: 1
outlineColor: {r: 0.8080046, g: 1.6417967, b: 0.36961916, a: 1}
outlineColorStyle: 0
outlineGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
outlineGradientInLocalSpace: 0
outlineWidth: 0.45
outlineBlurPasses: 2
outlineQuality: 3
outlineEdgeMode: 0
outlineEdgeThreshold: 0.995
outlineDownsampling: 2
outlineVisibility: 0
glowBlendMode: 0
outlineBlitDebug: 0
outlineIndependent: 0
outlineContourStyle: 0
glow: 0.48
glowWidth: 0.4
glowQuality: 3
glowBlurMethod: 0
glowDownsampling: 2
glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
glowDithering: 1
glowMagicNumber1: 0.75
glowMagicNumber2: 0.5
glowAnimationSpeed: 1
glowVisibility: 0
glowBlitDebug: 0
glowBlendPasses: 1
glowPasses:
- offset: 4
alpha: 0.1
color: {r: 0.64, g: 1, b: 0, a: 1}
- offset: 3
alpha: 0.2
color: {r: 0.64, g: 1, b: 0, a: 1}
- offset: 2
alpha: 0.3
color: {r: 0.64, g: 1, b: 0, a: 1}
- offset: 1
alpha: 0.4
color: {r: 0.64, g: 1, b: 0, a: 1}
glowIgnoreMask: 0
innerGlow: 0
innerGlowWidth: 1
innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
innerGlowBlendMode: 0
innerGlowVisibility: 0
targetFX: 0
targetFXTexture: {fileID: 0}
targetFXColor: {r: 1, g: 1, b: 1, a: 1}
targetFXCenter: {fileID: 0}
targetFXRotationSpeed: 50
targetFXInitialScale: 4
targetFXEndScale: 1.5
targetFXScaleToRenderBounds: 1
targetFXAlignToGround: 0
targetFXFadePower: 32
targetFXGroundMaxDistance: 10
targetFXGroundLayerMask:
serializedVersion: 2
m_Bits: 4294967295
targetFXTransitionDuration: 0.5
targetFXStayDuration: 1.5
targetFXVisibility: 1
seeThrough: 2
seeThroughOccluderMask:
serializedVersion: 2
m_Bits: 4294967295
seeThroughOccluderThreshold: 0.3
seeThroughOccluderMaskAccurate: 0
seeThroughOccluderCheckInterval: 1
seeThroughOccluderCheckIndividualObjects: 0
seeThroughDepthOffset: 0
seeThroughMaxDepth: 0
seeThroughIntensity: 0.8
seeThroughTintAlpha: 0.5
seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
seeThroughNoise: 1
seeThroughBorder: 0
seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
seeThroughBorderOnly: 0
seeThroughBorderWidth: 0.45
seeThroughOrdered: 0
seeThroughTexture: {fileID: 0}
seeThroughTextureUVSpace: 0
seeThroughTextureScale: 1
rmsCount: 2
hitFxInitialIntensity: 0
hitFxMode: 0
hitFxFadeOutDuration: 0.25
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
hitFxRadius: 0.5
--- !u!4 &3498687524961745019
Transform:
m_ObjectHideFlags: 0

2
Assets/Scenes/05_LiveScene.unity
View File

@ -5610,7 +5610,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -7572541995124411918, guid: 3022de55b8046f04485b93331386de5f, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7515113890240633245, guid: 3022de55b8046f04485b93331386de5f, type: 3}
propertyPath: m_Name

18
Assets/Scripts/CXX/Devices/Device_Base.cs
View File

@ -9,28 +9,14 @@ public class Device_Base : PermanentTriggerBase
/// </summary>
public DeviceType deviceType;
protected override void OnStart()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
{
base.OnStart();
}
}
protected override void OnMEnter()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
{
base.OnMEnter();
_highlight.SetHighlighted(true);
}
_highlight.highlighted = true;
}
protected override void OnMExit()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
{
base.OnMExit();
_highlight.SetHighlighted(false);
}
_highlight.highlighted = false;
}
}

1
Assets/Scripts/CXX/StepState/StepState.cs
View File

@ -74,7 +74,6 @@ public class StepState : MonoBehaviour
GameManager.UIMgr.HidePanel<UI_LoadingPanel>();
GameManager.RunModelMgr.SceneType = initSceneType;
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, initSceneType);
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
});
}
}

19
Assets/Scripts/CXX/Tools/Tool_Base.cs
View File

@ -12,28 +12,15 @@ public class Tool_Base : PermanentTriggerBase
/// </summary>
public ToolType toolType;
protected override void OnStart()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
{
base.OnStart();
}
}
protected override void OnMEnter()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
{
base.OnMEnter();
_highlight.SetHighlighted(true);
}
Debug.Log(gameObject.name);
_highlight.highlighted = true;
}
protected override void OnMExit()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
{
base.OnMExit();
_highlight.SetHighlighted(false);
}
_highlight.highlighted = false;
}
}

3
Assets/Scripts/Project/Manager/OfficeManager.cs
View File

@ -8,6 +8,7 @@ using UnityEngine;
/// </summary>
public class OfficeManager : MonoBehaviour
{
public HighlightEffect[] _highlight;
public int currentProcessID;
public int currentSubProcessID;
public int currentSubProcessStepID;
@ -17,7 +18,6 @@ public class OfficeManager : MonoBehaviour
{
GameManager.EventMgr.AddEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI);
}
@ -47,7 +47,6 @@ public class OfficeManager : MonoBehaviour
panel.Init();
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
});
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
}

4
Assets/Scripts/Project/Manager/ProcessManager.cs
View File

@ -205,10 +205,6 @@ public class ProcessManager : BaseManager<ProcessManager>
CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
Debug.Log($"<color=red>triggersId空了</color>");
}
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count != 0)
{
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
}
return 0;
}
else

1
Assets/Scripts/Project/Manager/TooRoomlMannger.cs
View File

@ -24,7 +24,6 @@ public class TooRoomlMannger : SingletonMono<TooRoomlMannger>
{
tmd.GetInfo();
}
}

4
Assets/Scripts/Project/Objects/Other/MirrorController.cs
View File

@ -4,10 +4,6 @@ using UnityEngine;
public class MirrorController : PermanentTriggerBase
{
protected override void OnStart()
{
base.OnStart();
}
protected override void OnMDown()
{
base.OnMDown();

4
Assets/Scripts/Project/Objects/Other/MobileController.cs
View File

@ -25,7 +25,7 @@ public class MobileController : PermanentTriggerBase
switch (downIndex)
{
case 0:
_highlight.SetHighlighted(false);
_highlight.highlighted = false;
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerID, false) == 0)
{
GameManager.UIMgr.ShowPanel<UI_ReceiveTaskPanel>(E_UI_Layer.Mid, (panel) =>
@ -43,7 +43,7 @@ public class MobileController : PermanentTriggerBase
panel.Init(triggerID);
});
//GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
_highlight.SetHighlighted(false);
_highlight.highlighted = false;
downIndex ++;
}
break;

18
Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
View File

@ -11,26 +11,28 @@ public class PermanentTriggerBase : MonoBehaviour
{
public int triggerID;
public string triggerName;
//[HideInInspector]
public HighlightEffect _highlight;
private void Awake()
{
_highlight = GetComponent<HighlightEffect>();
OnAwake();
}
private void Start()
{
if (GameManager.EventMgr != null)
{
GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
}
OnStart();
}
private void SwitchSubProcessStepTriggerID(int arg0)
{
if (triggerID == arg0)
{
_highlight.SetHighlighted(true);
Debug.Log("PermanentTriggerBaseÎÒÓ¦¸ÃÌáʾ");
}
else
{
_highlight.SetHighlighted(false);
_highlight.highlighted = true;
Debug.Log("ÎÒÓ¦¸ÃÌáʾ");
}
}
/// <summary>
@ -38,14 +40,14 @@ public class PermanentTriggerBase : MonoBehaviour
/// </summary>
protected virtual void OnAwake()
{
_highlight = GetComponent<HighlightEffect>();
}
/// <summary>
/// Start
/// </summary>
protected virtual void OnStart()
{
GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
}
private void OnMouseEnter()
{

32
Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs
View File

@ -29,24 +29,13 @@ public abstract class BaseToolOrDevice : MonoBehaviour
private void Start()
{
GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
}
private void SwitchSubProcessStepTriggerID(int arg0)
{
if (itemInfo.triggerID == arg0)
{
_highlight.SetHighlighted(true);
Debug.Log("BaseToolOrDevice我应该提示");
}
else
{
_highlight.SetHighlighted(false);
}
_highlight = GetComponent<HighlightEffect>();
//GetInfo();
}
public void GetInfo()
{
_highlight = GetComponent<HighlightEffect>();
D_ToolAndMaterialData dTMD = GameManager.ToolAndmaterialMgr.GetToolOrMaterialOrDeviceInfoByObjName(gameObject.name);
if (dTMD != null)
{
@ -89,25 +78,16 @@ public abstract class BaseToolOrDevice : MonoBehaviour
public virtual void OnEnter()
{
//Debug.Log("进入");
Debug.Log("进入");
}
public virtual void OnDown()
{
//Debug.Log("点击");
Debug.Log("点击");
}
public virtual void OnExit()
{
//Debug.Log("离开");
}
private void OnDestroy()
{
GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
}
private void OnDisable()
{
GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
Debug.Log("离开");
}
}

11
Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs
View File

@ -14,10 +14,7 @@ public class Tool_SelectComponent : BaseToolOrDevice
// panel.Init(gameObject.name, pos);
//});
///高亮
if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
{
_highlight.SetHighlighted(true);
}
_highlight.highlighted = true;
}
public override void OnDown()
{
@ -33,10 +30,8 @@ public class Tool_SelectComponent : BaseToolOrDevice
public override void OnExit()
{
///关闭高亮
//if (GameManager.UIMgr.GetPanel<ItemTips>())
// GameManager.UIMgr.HidePanel<ItemTips>();//ÌáʾÃæ°å
GameManager.UIMgr.HidePanel<ItemTips>();//ÌáʾÃæ°å
base.OnExit();
if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
_highlight.SetHighlighted(false);
_highlight.highlighted = false;
}
}

1
Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
View File

@ -52,7 +52,6 @@ public class UI_SubProcessItem : BaseItem
//ÖØÖÃÎïÌå
StepStateControl.instance.InvokeInitStepState(GameManager.Instance.systemId, GameManager.ProcessMgr.d_Scheme.id, subProcessID);
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID);
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
break;
}
}

8
Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs
View File

@ -118,10 +118,6 @@ public class UI_MenuBar : BasePanel
{
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
if (GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count > 0)
{
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
}
});
});
break;
@ -134,10 +130,6 @@ public class UI_MenuBar : BasePanel
{
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
if (GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count > 0)
{
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0]);
}
});
});
break;