修复上报逻辑bug

Assets/FrameWork/ProjectManager/Demo.prefab

@@ -480,7 +480,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 0KW/h
+  m_text: 004547.58 KW/h
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
   m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
@@ -1606,7 +1606,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 0KW/h
+  m_text: 004615.58 KW/h
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
   m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}

Assets/FrameWork/ProjectManager/Main.prefab

@@ -20164,6 +20164,7 @@ Transform:
   - {fileID: 7951612727357420196}
   - {fileID: 3655074887312105648}
   - {fileID: 2588445273123202110}
+  - {fileID: 8073691820182985455}
   m_Father: {fileID: 4259667480389853181}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0}
@@ -20385,7 +20386,8 @@ Transform:
   m_LocalPosition: {x: -9.17, y: -4, z: -0.79}
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 7934154192801502692}
   m_Father: {fileID: 1351349470932465109}
   m_RootOrder: 39
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -20401,8 +20403,278 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 83a974878403542ac885cb0f0c3fc4af, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  bz1: 0.2
+  bz1: 0.15
   url: https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/MREdustry_100/map_pointer_3d_icon.glb
+--- !u!1 &3344185758659668461
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1523333043119684125}
+  - component: {fileID: 304918351466779595}
+  - component: {fileID: 161879851229945109}
+  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 &1523333043119684125
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3344185758659668461}
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 3.01}
+  m_LocalScale: {x: 0.04307734, y: 0.04307734, z: 0.04307734}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6493603782616137432}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 2.4299998}
+  m_SizeDelta: {x: 200, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &304918351466779595
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3344185758659668461}
+  m_CullTransparentMesh: 1
+--- !u!114 &161879851229945109
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3344185758659668461}
+  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: "\u5DE1\u68C01\u53F7\u70B9"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, 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: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 256
+  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: 0, 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!1 &3617671688755434664
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7934154192801502692}
+  - component: {fileID: 1861970619305557999}
+  - component: {fileID: 8176736739816444480}
+  m_Layer: 0
+  m_Name: Text (TMP) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7934154192801502692
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3617671688755434664}
+  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 3.1}
+  m_LocalScale: {x: 0.04307734, y: 0.04307734, z: 0.04307734}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6025837465551413762}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 2.43}
+  m_SizeDelta: {x: 200, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1861970619305557999
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3617671688755434664}
+  m_CullTransparentMesh: 1
+--- !u!114 &8176736739816444480
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3617671688755434664}
+  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: "\u5DE1\u68C02\u53F7\u70B9"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, 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: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 256
+  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: 0, 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!1 &3832946153937975639
 GameObject:
   m_ObjectHideFlags: 0
@@ -20805,7 +21077,8 @@ Transform:
   m_LocalPosition: {x: 3.16, y: -4, z: -3.4}
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1523333043119684125}
   m_Father: {fileID: 1351349470932465109}
   m_RootOrder: 38
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -20821,7 +21094,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 83a974878403542ac885cb0f0c3fc4af, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  bz1: 0.2
+  bz1: 0.15
   url: https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/MREdustry_100/map_pointer_3d_icon.glb
 --- !u!1 &5891262030794062655
 GameObject:
@@ -22402,3 +22675,85 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
   m_PrefabInstance: {fileID: 7950946313808606952}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8071895022706204323
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1351349470932465109}
+    m_Modifications:
+    - target: {fileID: 1404734935338200, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_Name
+      value: FX_Direction_Arrows_03 (4)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_RootOrder
+      value: 46
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 4.8599987
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -180
+      objectReference: {fileID: 0}
+    - target: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 198367504036919758, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: simulationSpeed
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 199079739478439532, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+--- !u!4 &8073691820182985455 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4118970330137676, guid: 162d349d1974cff47b0c8fb20111891b, type: 3}
+  m_PrefabInstance: {fileID: 8071895022706204323}
+  m_PrefabAsset: {fileID: 0}

Assets/FrameWork/SaoMiao.prefab

@@ -457,7 +457,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
+  m_PresetInfoIsWorld: 0
 --- !u!114 &1620164308813382644
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1330,10 +1330,38 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1734752791485398805, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1820598777092635662, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
       propertyPath: m_Name
       value: "\u62CD\u7167"
       objectReference: {fileID: 0}
+    - target: {fileID: 1999924489088392074, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1999924489088392074, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1999924489088392074, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 222.06
+      objectReference: {fileID: 0}
+    - target: {fileID: 1999924489088392074, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 252.06
+      objectReference: {fileID: 0}
+    - target: {fileID: 1999924489088392074, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5003365842088991639, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 252.06
+      objectReference: {fileID: 0}
     - target: {fileID: 5016533565466159247, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -1382,6 +1410,22 @@ PrefabInstance:
       propertyPath: m_RaycastTarget
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7136807388324949667, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7136807388324949667, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7136807388324949667, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 7136807388324949667, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -25
+      objectReference: {fileID: 0}
     - target: {fileID: 7851867678479278875, guid: d97716edb4c1ae74ab76e3a2dadb928c, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/HotUpdate/Scripts/Scripts/JinRuRenwu.cs

@@ -678,6 +678,10 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
                 rwitem = XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex - 1];
                 TasksReport tasks = new TasksReport();
                 tasks.projectInspectionTaskId = rwitem.id;
+                if(rwitem.status==0)
+                {
+                    rwitem.status = 1;
+                }
                 tasks.status = rwitem.status;
                 long nowtime = GetHttpTimer.Instance.Getlongtime();
                 tasks.consumingTime = (int)(nowtime - rwitem.startTime);

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/XunJianDataManager.cs

@@ -637,10 +637,13 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
                 PlayerPrefs.SetString("project_" + data[i].id, notime.ToString());
 
             }
+            string minstr = dateTimes.Minute.ToString();
+            if (dateTimes.Minute<10)
+            {
+                minstr = "0" + minstr;
+            }
 
-
-
-            xj.projectTime = dateTimes.Year.ToString() + "/" + dateTimes.Month.ToString() + "/" + dateTimes.Day.ToString() + " " + dateTimes.Hour.ToString() + ":" + dateTimes.Minute.ToString();
+            xj.projectTime = dateTimes.Year.ToString() + "/" + dateTimes.Month.ToString() + "/" + dateTimes.Day.ToString() + " " + dateTimes.Hour.ToString() + ":" + minstr;
             
             xj.listWall = data[i].listWall;
             xj.status = data[i].status;

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ChangeCameraSaoMiao.cs

@@ -44,6 +44,7 @@ public class ChangeCameraSaoMiao : MonoSingleton<ChangeCameraSaoMiao>
     }
     public void showluxiang()
     {
+
         if (!XRRGBCamera.Instance.RGBCamTexture || !XRRGBCamera.Instance.RGBCamTexture.isPlaying)
             XRRGBCamera.Instance.playCamera(640, 480);
         JinRuRenwu.Instance.paizhaoanniu.SetActive(true);
@@ -53,6 +54,7 @@ public class ChangeCameraSaoMiao : MonoSingleton<ChangeCameraSaoMiao>
         saomiao.SetActive(false);
         saomiaoDemo.SetActive(false);
 
+        luxiang.GetComponent<RawImage>().color = Color.white;
     }
 
     public void showDemoSaoMiao()
@@ -347,6 +349,7 @@ public class ChangeCameraSaoMiao : MonoSingleton<ChangeCameraSaoMiao>
         if (isLuXiang)
         {
             checkLuXiang();
+            luxiang.GetComponent<RawImage>().color = Color.white;
         }
         else
         {
@@ -370,10 +373,11 @@ public class ChangeCameraSaoMiao : MonoSingleton<ChangeCameraSaoMiao>
             },1f,-1);
 
 
+            luxiang.GetComponent<RawImage>().color = Color.red;
+
 
 
-        
-    }    
+        }    
     }
 
     private void OnCompletedFileWritingAction(FileWritingHandler obj)

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ShowModelManager.cs

@@ -22,8 +22,8 @@ public class ShowModelManager : MonoBehaviour
             Destroy(root);
             root = null;
         }
-        info.gameObject.SetActive(true);
-        info.text = "模型努力加载中";
+        //info.gameObject.SetActive(true);
+        //info.text = "模型努力加载中";
 
         TriLibModelLoad.Load(url, (AssetLoaderContext ac) => {
             ac.RootGameObject.SetActive(false);

Packages/manifest.json

@@ -17,11 +17,12 @@
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.7.8",
     "com.unity.webrtc": "https://gogs.ghz-tech.com:8843/GHzGlass/WebRtcXR.git",
+    "com.unity.xr.arcore": "4.2.10",
     "com.unity.xr.arfoundation": "4.2.9",
-    "com.ximmerse.xr": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/GHZSDKXR.git#XRSDK_Rhinox",
     "jh.immersalsdk.engine": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/ImmersalSDK.git#ImmersalSDK_RhionX",
     "jh.opencvforunity.engine": "file:/Users/hujiajun/ghz/OpenCVForUnity",
     "jh.trilib.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",
+    "jh.xr.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Phone",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

Packages/packages-lock.json

@@ -176,6 +176,18 @@
       },
       "hash": "34e62101b53a32adbd5c5a86b84c73a7153c566b"
     },
+    "com.unity.xr.arcore": {
+      "version": "4.2.10",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.xr.arsubsystems": "4.2.10",
+        "com.unity.xr.management": "4.0.1",
+        "com.unity.modules.androidjni": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.xr.arfoundation": {
       "version": "4.2.9",
       "depth": 0,
@@ -188,7 +200,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.arsubsystems": {
-      "version": "4.2.9",
+      "version": "4.2.10",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -197,30 +209,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.xr.core-utils": {
-      "version": "2.0.0",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.xr": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.xr.interaction.toolkit": {
-      "version": "2.0.4",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.inputsystem": "1.3.0",
-        "com.unity.ugui": "1.0.0",
-        "com.unity.xr.core-utils": "2.0.0",
-        "com.unity.xr.legacyinputhelpers": "2.1.8",
-        "com.unity.modules.audio": "1.0.0",
-        "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.physics": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.xr.legacyinputhelpers": {
       "version": "2.1.10",
       "depth": 1,
@@ -255,20 +243,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.ximmerse.xr": {
-      "version": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/GHZSDKXR.git#XRSDK_Rhinox",
-      "depth": 0,
-      "source": "git",
-      "dependencies": {
-        "com.unity.xr.management": "3.2.9",
-        "com.unity.xr.legacyinputhelpers": "2.1.4",
-        "com.unity.xr.arsubsystems": "4.1.9",
-        "com.unity.xr.interaction.toolkit": "2.0.0",
-        "com.unity.inputsystem": "1.3.0",
-        "com.unity.xr.openxr": "1.5.3"
-      },
-      "hash": "6b1955bc528687a98f4eeb079f35dbe68effe1b2"
-    },
     "jh.immersalsdk.engine": {
       "version": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/ImmersalSDK.git#ImmersalSDK_RhionX",
       "depth": 0,
@@ -295,7 +269,21 @@
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "b391f88344aaa70b4f191a0bc71e03461f48202d"
+      "hash": "0124fefeb16d355c5f4affd25cfad240e7ef0f2d"
+    },
+    "jh.xr.engine": {
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Phone",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {
+        "com.unity.xr.management": "4.0.1",
+        "com.unity.xr.legacyinputhelpers": "2.1.2",
+        "com.unity.inputsystem": "1.4.2",
+        "com.unity.xr.arcore": "4.2.8",
+        "com.unity.xr.arfoundation": "4.2.8",
+        "com.unity.xr.openxr": "1.5.3"
+      },
+      "hash": "d7246fad9d037258757b6a804f3ab12dffb8c6f1"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

ProjectSettings/ProjectSettings.asset

@@ -134,17 +134,8 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.5.1
-  preloadedAssets:
-  - {fileID: 2720162604194769745, guid: 6f45d16099e3af24c9d1814902f6c1cd, type: 2}
-  - {fileID: -1976151159784538485, guid: 2fc93d2ce72dd364f968f3400a68213b, type: 2}
-  - {fileID: 4800000, guid: ea9a295053a0dc440b9698a7f41d9741, type: 3}
-  - {fileID: 4800000, guid: 1499e61b3897c4a4b9318a56ca931b8a, type: 3}
-  - {fileID: 4800000, guid: 798d6e253a35a144d94205b80c8fd48b, type: 3}
-  - {fileID: 4800000, guid: ae539cb2b258bd047a57837fd579cc80, type: 3}
-  - {fileID: 4800000, guid: 58841e6e22debfc43ba09a0cf58cd92d, type: 3}
-  - {fileID: 4800000, guid: a336f422ffebbec4c89b4dac26022d5f, type: 3}
-  - {fileID: 11400000, guid: 852e6bd112d2b174996470390b08d3a7, type: 2}
+  bundleVersion: 1.0.0
+  preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1