This commit is contained in:
yzx 2024-06-26 16:37:45 +08:00
parent c1b3326030
commit 260a04d25c
18 changed files with 2766 additions and 1425 deletions

File diff suppressed because one or more lines are too long

View File

@ -114,12 +114,12 @@ Material:
- _UVSec: 0
- _ZWrite: 1
- __dirty: 0
- _step_p1: 1
- _step_p2: 1
- _step_p3: 1
- _step_p4: 1
- _step_p5: 1
- _step_p6: 1
- _step_p1: 0
- _step_p2: 0
- _step_p3: 0
- _step_p4: 0
- _step_p5: 0
- _step_p6: 0
m_Colors:
- _BaseCol: {r: 0.23429155, g: 0.28497556, b: 0.3679245, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}

View File

@ -263,10 +263,22 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 195
objectReference: {fileID: 0}
- target: {fileID: 3592094085120368532, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_text
value: "\u200B"
objectReference: {fileID: 0}
- target: {fileID: 3592094085120368532, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_enableWordWrapping
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3598037006673712039, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: sceneName
value: "\u5DE5\u5177\u95F4"
objectReference: {fileID: 0}
- target: {fileID: 3749027150314622874, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3762193856401640109, guid: fa12b84946083d14cb4447029910be28, type: 3}
propertyPath: m_Enabled
value: 1

View File

@ -7367,7 +7367,7 @@ Transform:
m_GameObject: {fileID: 394728312}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 302.8486, y: 2.8827, z: 163.1745}
m_LocalPosition: {x: 302.8486, y: 2.8909, z: 163.1745}
m_LocalScale: {x: 0.04598833, y: 0.18731342, z: 0.13387865}
m_ConstrainProportionsScale: 0
m_Children: []
@ -10460,6 +10460,108 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 542570390}
m_CullTransparentMesh: 1
--- !u!1 &543759606
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 543759607}
- component: {fileID: 543759610}
- component: {fileID: 543759609}
- component: {fileID: 543759608}
m_Layer: 0
m_Name: ElectricEnergyMeterCanvasCanvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &543759607
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 543759606}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1275625747}
m_Father: {fileID: 1354120633}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &543759608
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 543759606}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &543759609
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 543759606}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
--- !u!223 &543759610
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 543759606}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 1
m_TargetDisplay: 0
--- !u!1 &544719190
GameObject:
m_ObjectHideFlags: 0
@ -11354,6 +11456,10 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1947174972790471703, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1956453164925617863, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_IsActive
value: 1
@ -11414,6 +11520,14 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4797010211365978347, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2cc1158dacf4188439f871079ec30ef1, type: 3}
- target: {fileID: 4797010211365978347, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5424038881333046194, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Enabled
value: 0
@ -11486,10 +11600,114 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7831804727752754663, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Name
value: "JZQ_\u87BA\u4E1D001"
objectReference: {fileID: 0}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.size
value: 20
objectReference: {fileID: 0}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[1]
value:
objectReference: {fileID: 21300000, guid: ffa5fef008e78f6469e9a103886d9abc, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[2]
value:
objectReference: {fileID: 21300000, guid: e47a14287d4f78f42892cf161092e3da, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[3]
value:
objectReference: {fileID: 21300000, guid: 70151b92e4bdf44458d9c2962781bac3, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[4]
value:
objectReference: {fileID: 21300000, guid: 4bb2e45c9feb39946904d631a44d35c9, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[5]
value:
objectReference: {fileID: 21300000, guid: 4607df0c6d0eb4f4fa983ec0995e0cd1, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[6]
value:
objectReference: {fileID: 21300000, guid: 598012a979056a742bd5d9dc03576390, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[7]
value:
objectReference: {fileID: 21300000, guid: 3b9bcd25989cd884e81fe09f4928e324, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[8]
value:
objectReference: {fileID: 21300000, guid: d80f734b730657b40a0e06c333496a95, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[9]
value:
objectReference: {fileID: 21300000, guid: 16961d3b6dd95c2449dbb235fec3c663, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[10]
value:
objectReference: {fileID: 21300000, guid: 9f2a43a8273750646983e3fc3282f76d, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[11]
value:
objectReference: {fileID: 21300000, guid: b1a2cc1b032c55d43b8f5181ec45bb4f, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[12]
value:
objectReference: {fileID: 21300000, guid: 1ea169a73f0255a45a7ab3fbf0040e4a, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[13]
value:
objectReference: {fileID: 21300000, guid: bcf30d516ae939e4a867731028976cce, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[14]
value:
objectReference: {fileID: 21300000, guid: abeff76727423e14c9c196dd0cca9850, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[15]
value:
objectReference: {fileID: 21300000, guid: 1aa5bf59efd74134ca95d18ee9339eb8, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[16]
value:
objectReference: {fileID: 21300000, guid: 51d2ad5223c8a6048a08f53f53d80f3b, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[17]
value:
objectReference: {fileID: 21300000, guid: 61a79eb053d6a4f4094ee67b4e77a981, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[18]
value:
objectReference: {fileID: 21300000, guid: c5fa4b65c19c1db499e481f148ceef05, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: sprites.Array.data[19]
value:
objectReference: {fileID: 21300000, guid: 2acc388130074704782d22d537f356c4, type: 3}
- target: {fileID: 7844241224194632159, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: ElectricEnergyMeterData
value:
objectReference: {fileID: 1509134563}
- target: {fileID: 7850784194196611404, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_BlendShapeWeights.Array.data[0]
value: 0
@ -11668,6 +11886,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 7745216743049305763, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
insertIndex: 1
addedObject: {fileID: 420255424}
- targetCorrespondingSourceObject: {fileID: 2516041744970207817, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
insertIndex: -1
addedObject: {fileID: 543759607}
- targetCorrespondingSourceObject: {fileID: 2440675452353367651, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
insertIndex: 2
addedObject: {fileID: 2008679882}
@ -11678,6 +11899,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 974051541301588327, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
insertIndex: -1
addedObject: {fileID: 1973164607}
- targetCorrespondingSourceObject: {fileID: 2999703077997545715, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
insertIndex: -1
addedObject: {fileID: 1509134563}
m_SourcePrefab: {fileID: 100100000, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
--- !u!4 &601364441 stripped
Transform:
@ -22526,6 +22750,140 @@ Transform:
m_Children: []
m_Father: {fileID: 1863232719}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1275625746
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1275625747}
- component: {fileID: 1275625749}
- component: {fileID: 1275625748}
m_Layer: 0
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1275625747
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1275625746}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.0759}
m_LocalScale: {x: 0.000099485485, y: 0.000099485485, z: 0.000099485485}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 543759607}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.0052, y: 0.0707}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1275625748
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1275625746}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 630732.86
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 2361fd5060ae7ad43972c979629d0e74, type: 2}
m_sharedMaterial: {fileID: 6042853323096251954, guid: 2361fd5060ae7ad43972c979629d0e74, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4285152824
m_fontColor: {r: 0.21960786, g: 0.24313727, b: 0.4156863, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 49.63
m_fontSizeBase: 49.63
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 4
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: -146.62782, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1275625749
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1275625746}
m_CullTransparentMesh: 1
--- !u!1 &1278583460
GameObject:
m_ObjectHideFlags: 0
@ -24411,6 +24769,11 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
--- !u!4 &1354120633 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2516041744970207817, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
m_PrefabInstance: {fileID: 601364440}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1360176586
GameObject:
m_ObjectHideFlags: 0
@ -25051,12 +25414,12 @@ GameObject:
- component: {fileID: 1393670470}
- component: {fileID: 1393670469}
m_Layer: 5
m_Name: "\u6D41\u7A0B\u7ED3\u675F"
m_Name: "\u5206\u6570"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &1393670469
MonoBehaviour:
m_ObjectHideFlags: 0
@ -25135,7 +25498,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1405778779
Transform:
m_ObjectHideFlags: 0
@ -27859,6 +28222,25 @@ MonoBehaviour:
- {fileID: 2018635915}
PlayercameraTrans: {fileID: 6121626523118833240}
Fieldobservation: {fileID: 6121626523908351180}
--- !u!1 &1509134562 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2999703077997545715, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
m_PrefabInstance: {fileID: 601364440}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1509134563
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1509134562}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0d3b1a9715a34aa8ab0530af2056aaf9, type: 3}
m_Name:
m_EditorClassIdentifier:
valueNumber: []
te: {fileID: 1275625748}
--- !u!1 &1511629609
GameObject:
m_ObjectHideFlags: 0
@ -28076,6 +28458,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mersh: {fileID: 1147434138}
ConcentratorMeter: {fileID: 1405778778}
ElectricEnergyMeter: {fileID: 2042080037}
ElectricEnergyMeterCanvas: {fileID: 543759606}
--- !u!1 &1521115505
GameObject:
m_ObjectHideFlags: 0
@ -36438,7 +36823,31 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1961907593}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 1438674220}
m_TargetAssemblyTypeName: UnityEngine.Collider, UnityEngine
m_MethodName: set_enabled
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 314679704}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1961907593
MonoBehaviour:
m_ObjectHideFlags: 0
@ -37993,6 +38402,11 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2035513181}
m_CullTransparentMesh: 1
--- !u!1 &2042080037 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1947174972790471703, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
m_PrefabInstance: {fileID: 601364440}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2046490261
GameObject:
m_ObjectHideFlags: 0
@ -38282,7 +38696,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2075953333
RectTransform:
m_ObjectHideFlags: 0

View File

@ -12,6 +12,7 @@ public class ConsumePowerManager : MonoBehaviour
public static ConsumePowerManager Instance;
public delegate void OpenLight();
public event OpenLight OnOpenLight;
private void Awake()
{
Instance = this;

View File

@ -14,7 +14,7 @@ namespace DefaultNamespace.Dto
public List<EnergyWorkList> worklist { get; set; }
}
public class SceneData
public class ElectricEnergyData
{
public string scenename { get; set; }
public string questbooks { get; set; }

View File

@ -33,7 +33,7 @@ public class InfoDataManager : ModuleSingleton<InfoDataManager>, IModule
// 第一部分 sxfz://
string prefix = dataSections[0];
Debug.Log("Prefix: " + prefix);
// Debug.Log("Prefix: " + prefix);
// 第二部分 lyht,0,18,userId,username,token,90
string dataSection = dataSections[1];

View File

@ -5,7 +5,7 @@ using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
public class NewBehaviourScript : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler
public class MenuBtOnClick : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler
{
[SerializeField] private Sprite defaultSprite;
[SerializeField] private Sprite clickSprite;

View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using DefaultNamespace.Dto;
using HighlightPlus;
using MotionFramework;
@ -131,8 +132,9 @@ namespace DefaultNamespace.ProcessMode
{
Debug.Log($"正确点击了:{clickedObject}");
currentAction.ClickedObjects.Add(clickedObject); // 添加到已点击对象集合
currentAction.CurrentObjectIndex++;
HandleModeFeedback(_currentMode, currentAction); // 处理模式特定的反馈
if (currentAction.ClickedObjects.Count >= currentAction.TargetObjects.Count)
{
CompleteAction(step, currentAction); // 完成当前动作
@ -525,8 +527,11 @@ namespace DefaultNamespace.ProcessMode
/// <summary>
/// 初始化步骤
/// </summary>
public void InitializeFirstStep()
public async void InitializeFirstStep()
{
await Task.Delay(TimeSpan.FromSeconds(2));
_currentMode = MotionEngine.GetModule<DataConfigManager>().GetProcessMode();
AddProcess(_currentMode.ToString());

View File

@ -2,15 +2,16 @@ using System;
using System.Collections.Generic;
using DefaultNamespace.Dto;
using Newtonsoft.Json;
using TMPro;
using UnityEngine;
namespace ToolsPack
{
public class ToolsSceneData : MonoBehaviour
public class ElectricEnergyMeterData : MonoBehaviour
{
public List<string> valueNumber = new List<string>();
public TMP_Text te;
private void Start()
{
string json = @"
@ -64,23 +65,28 @@ namespace ToolsPack
}";
// 解析JSON字符串
SceneData sceneData = JsonConvert.DeserializeObject<SceneData>(json);
ElectricEnergyData electricEnergyData = JsonConvert.DeserializeObject<ElectricEnergyData>(json);
// // 输出一些数据来验证解析
// Debug.Log("场景名称: " + sceneData.scenename);
// Debug.Log("任务描述: " + sceneData.questbooks);
// Debug.Log("用户信息: " + sceneData.userinformation);
// Debug.Log("电能表信息: " + sceneData.energyinformation);
//
foreach (var energy in sceneData.energylist)
foreach (var energy in electricEnergyData.energylist)
{
Debug.Log("Work: " + energy.work);
// Debug.Log("Work: " + energy.work);
foreach (var worklist in energy.worklist)
{
valueNumber.Add(worklist.valuework);
Debug.Log($"Key: {worklist.keywork}, Value: {worklist.valuework}");
// Debug.Log($"Key: {worklist.keywork}, Value: {worklist.valuework}");
}
}
}
public void SetValue(int index)
{
te.text = valueNumber[index];
}
}
}

View File

@ -303,7 +303,13 @@
"透明盖子封印碰撞R",
"透明盖子封印碰撞L"
]
},
}
]
},
{
"stepDescription": "加装封印",
"score": 0,
"actions": [
{
"description": "加装封印",
"score": 0,
@ -311,8 +317,13 @@
"targetObjects": [
"盖_透明外壳"
]
},
}
]
},
{
"stepDescription": "加装封印",
"score": 0,
"actions": [
{
"description": "加装封印",
"score": 0,
@ -320,7 +331,12 @@
"targetObjects": [
"变电箱_门"
]
},
}
]
},{
"stepDescription": "加装封印",
"score": 0,
"actions": [
{
"description": "加装封印",
"score": 0,
@ -328,7 +344,12 @@
"targetObjects": [
"柜门卡栓"
]
},
}
]
},{
"stepDescription": "加装封印",
"score": 0,
"actions": [
{
"description": "加装封印",
"score": 0,

View File

@ -61,7 +61,280 @@
"score": 0,
"isSequential": false,
"targetObjects": [
"null"
"前往现场"
]
}
]
},
{
"stepDescription": "前往现场",
"score": 0,
"actions": [
{
"description": "前往现场",
"score": 0,
"isSequential": true,
"targetObjects": [
"Man_stand"
]
}
]
},
{
"stepDescription": "验电",
"score": 0,
"actions": [
{
"description": "验电",
"score": 0,
"isSequential": true,
"targetObjects": [
"插座",
"箱体",
"插座"
]
}
]
},
{
"stepDescription": "柜门封印",
"score": 0,
"actions": [
{
"description": "柜门封印",
"score": 0,
"isSequential": true,
"targetObjects": [
"柜门_封印"
]
}
]
},
{
"stepDescription": "更换集中器",
"score": 0,
"actions": [
{
"description": "更换集中器",
"score": 0,
"isSequential": false,
"targetObjects": [
"接线盒_封印R",
"接线盒_封印L"
]
}
]
},
{
"stepDescription": "更换集中器",
"score": 0,
"actions": [
{
"description": "更换集中器",
"score": 0,
"isSequential": false,
"targetObjects": [
"盖_固定螺丝_Rup",
"固定螺丝_Ldown"
]
}
]
},
{
"stepDescription": "更换集中器",
"score": 0,
"actions": [
{
"description": ",更换集中器",
"score": 0,
"isSequential": false,
"targetObjects": [
"接线盒纵向滑块001",
"接线盒纵向滑块002",
"接线盒纵向滑块003",
"接线盒纵向滑块004"
]
}
]
},
{
"stepDescription": "更换集中器",
"score": 0,
"actions": [
{
"description": "更换集中器",
"score": 0,
"isSequential": false,
"targetObjects": [
"集中器_封印R",
"集中器_封印_L",
"壳固定螺丝_R",
"壳固定螺丝_L"
]
}
]
},
{
"stepDescription": "更换集中器",
"score": 0,
"actions": [
{
"description": "更换集中器",
"score": 0,
"isSequential": false,
"targetObjects": [
"JZQ_螺丝001",
"JZQ_螺丝0011",
"JZQ_螺丝002",
"JZQ_螺丝0022",
"JZQ_螺丝003",
"JZQ_螺丝0033",
"JZQ_螺丝004",
"JZQ_螺丝0044",
"JZQ_螺丝006",
"JZQ_螺丝007"
]
}
]
},
{
"stepDescription": "更换集中器",
"score": 0,
"actions": [
{
"description": "更换集中器",
"score": 0,
"isSequential": true,
"targetObjects": [
"pCylinder170"
]
}
]
},
{
"stepDescription": "更换集中器",
"score": 0,
"actions": [
{
"description": "更换集中器",
"score": 0,
"isSequential": false,
"targetObjects": [
"固定螺丝_Rdown",
"集电器固定螺丝_Ldown"
]
}
]
},
{
"stepDescription": "更换集中器",
"score": 0,
"actions": [
{
"description": "更换集中器",
"score": 0,
"isSequential": false,
"targetObjects": [
"新的集中器碰撞"
]
}
]
},
{
"stepDescription": "更换集中器",
"score": 0,
"actions": [
{
"description": "更换集中器",
"score": 0,
"isSequential": false,
"targetObjects": [
"JZQ_螺丝001",
"JZQ_螺丝0011",
"JZQ_螺丝002",
"JZQ_螺丝0022",
"JZQ_螺丝003",
"JZQ_螺丝0033",
"JZQ_螺丝004",
"JZQ_螺丝0044",
"JZQ_螺丝005",
"JZQ_螺丝006"
]
}
]
},
{
"stepDescription": "临时用电",
"score": 0,
"actions": [
{
"description": "现场调试",
"score": 0,
"isSequential": false,
"targetObjects": [
"临时用电"
]
}
]
},
{
"stepDescription": "现场调试",
"score": 0,
"actions": [
{
"description": "现场调试",
"score": 0,
"isSequential": false,
"targetObjects": [
"现场调试"
]
}
]
},
{
"stepDescription": "加装封印",
"score": 0,
"actions": [
{
"description": "加装封印",
"score": 0,
"isSequential": false,
"targetObjects": [
"透明盖子封印碰撞R",
"透明盖子封印碰撞L"
]
},
{
"description": "加装封印",
"score": 0,
"isSequential": false,
"targetObjects": [
"盖_透明外壳"
]
},
{
"description": "加装封印",
"score": 0,
"isSequential": false,
"targetObjects": [
"变电箱_门"
]
},
{
"description": "加装封印",
"score": 0,
"isSequential": false,
"targetObjects": [
"柜门卡栓"
]
},
{
"description": "加装封印",
"score": 0,
"isSequential": false,
"targetObjects": [
"电柜门封印box碰撞"
]
}
]

View File

@ -1 +1 @@
2024-06-14 15:04:12#'sxfz://;lyht,3,18,userId,username,token,90;/'|
2024-06-14 15:04:12#'sxfz://;lyht,2,18,userId,username,token,90;/'|

View File

@ -7,6 +7,10 @@ public class OpenLightManager : MonoBehaviour
{
public MeshRenderer mersh;
public GameObject ConcentratorMeter;
public GameObject ElectricEnergyMeter;
public GameObject ElectricEnergyMeterCanvas;
void Start()
{
ConsumePowerManager.Instance.OnOpenLight += OpenLightFun;
@ -18,6 +22,9 @@ public class OpenLightManager : MonoBehaviour
private void OpenLightFun()
{
mersh.material.SetFloat("_LightSwitch", 1);
ConcentratorMeter.SetActive(true);
ElectricEnergyMeter.SetActive(true);
ElectricEnergyMeterCanvas.SetActive(true);
}

View File

@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using ToolsPack;
using UnityEngine;
namespace Views
@ -8,10 +9,13 @@ namespace Views
public class ThreeTransformerPhotovoltaicView : MonoBehaviour
{
public SpriteRenderer spriteRenderer;
public TextMesh textMesh;
//public string isFD;
public Sprite[] sprites;
public List<string> infos = new List<string>();
public ElectricEnergyMeterData ElectricEnergyMeterData;
/// <summary>
/// 表计信息
@ -37,11 +41,9 @@ namespace Views
// infos.Add(energylist[index].worklist[j].valuework);
// }
// }
// textMesh.text = infos[0];
//}
public int index = 0;
public void Update()
@ -58,16 +60,19 @@ namespace Views
Debug.Log(hit.collider.name);
OnUp();
}
if (hit.collider.gameObject.name == "DNB_下")
{
Debug.Log(hit.collider.name);
OnDown();
}
if (hit.collider.gameObject.name == "上")
{
Debug.Log(hit.collider.name);
OnUp();
}
if (hit.collider.gameObject.name == "下")
{
Debug.Log(hit.collider.name);
@ -76,6 +81,7 @@ namespace Views
}
}
}
public void OnUp()
{
index--;
@ -83,6 +89,7 @@ namespace Views
{
index = 0;
}
SetValue(index);
}
@ -93,15 +100,17 @@ namespace Views
{
index = sprites.Length - 1;
}
SetValue(index);
}
private void SetValue(int index)
{
// if (infos == null || infos.Count == 0) return;
// if (infos == null || infos.Count == 0) return;
spriteRenderer.sprite = sprites[index];
//textMesh.text = infos[index];
ElectricEnergyMeterData.SetValue(index);
}
}
}
}

View File

@ -22,9 +22,13 @@ public class TooslManager : MonoBehaviour
[HideInInspector]
public Quaternion originalRotation;
}
public List<Tool> tools;
/// <summary>
/// 在梯子上使用的工具
/// </summary>