合并主线

2025-04-02 16:55:08 +08:00 · 2025-04-02 16:55:08 +08:00 · 5f4c7e4347
commit 5f4c7e4347
parent 503ef14be7 bb39ba82b5
32 changed files with 2007 additions and 406 deletions
--- a/Assets/Art/Fonts/PingFang
+++ b/Assets/Art/Fonts/PingFang
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
-  assetBundleName: 
+  assetBundleName: pingfang medium sdf_asset
  assetBundleVariant: 
--- a/Assets/Art/Fonts/pingfangSc/PingFangSC-Medium
+++ b/Assets/Art/Fonts/pingfangSc/PingFangSC-Medium
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
-  assetBundleName: 
+  assetBundleName: pingfangsc-medium sdf_asset
  assetBundleVariant: 
--- a/Assets/Art/UIPrefab/UI3DObjShow.prefab
+++ b/Assets/Art/UIPrefab/UI3DObjShow.prefab
@ -457,7 +457,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: Right
  CustomComment: 
  mComponentName: UnityEngine.UI.Image
 --- !u!1 &3408871029033640143
@ -581,7 +581,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: Scroll
  CustomComment: 
  mComponentName: UnityEngine.UI.ScrollRect
 --- !u!1 &4561816282390826745
@ -835,7 +835,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: ObjBg
  CustomComment: 
  mComponentName: UnityEngine.UI.RawImage
 --- !u!1 &6831573971870136393
--- a/Assets/Art/UIPrefab/UIInstruction.prefab
+++ b/Assets/Art/UIPrefab/UIInstruction.prefab
@ -100,7 +100,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: Training
  CustomComment: 
  mComponentName: UnityEngine.UI.Toggle
 --- !u!1 &511604240533759376
@ -439,7 +439,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: TrainContent
  CustomComment: 
  mComponentName: RectTransform
 --- !u!1 &1854468325030962358
@ -782,7 +782,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: Operation
  CustomComment: 
  mComponentName: UnityEngine.UI.Toggle
 --- !u!1 &2570030987872014484
@ -1018,8 +1018,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u5B9E\u8BAD\u8BF4\u660E"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
-  m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
+  m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -1473,7 +1473,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: OperationContent
  CustomComment: 
  mComponentName: UnityEngine.UI.Image
 --- !u!1 &4068472154838936528
@ -1611,7 +1611,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: ConfirmBtn
  CustomComment: 
  mComponentName: UnityEngine.UI.Button
 --- !u!1 &4098278228048021229
@ -1750,7 +1750,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: NoToggle
  CustomComment: 
  mComponentName: UnityEngine.UI.Toggle
 --- !u!1 &5793951295459804211
@ -2097,8 +2097,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u64CD\u4F5C\u8BF4\u660E"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
-  m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
+  m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -2387,7 +2387,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: ContentText
  CustomComment: 
  mComponentName: TMPro.TextMeshProUGUI
 --- !u!1 &8662634946358023954
--- a/Assets/Art/UIPrefab/UIOperationList.prefab
+++ b/Assets/Art/UIPrefab/UIOperationList.prefab
@ -972,7 +972,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: StepContent
  CustomComment: 
  mComponentName: RectTransform
 --- !u!1 &5682155547481945418
--- a/Assets/Art/UIPrefab/UISetting.prefab
+++ b/Assets/Art/UIPrefab/UISetting.prefab
@ -134,7 +134,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: VoiceAdd
  CustomComment: 
  mComponentName: UnityEngine.UI.Button
 --- !u!1 &340564367494795038
@ -355,8 +355,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u97F3\u91CF\u8C03\u8282"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
-  m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
+  m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -489,8 +489,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u9F20\u6807\u7075\u654F\u5EA6"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
-  m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
+  m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -566,7 +566,7 @@ GameObject:
  m_Component:
  - component: {fileID: 4603449952944263616}
  - component: {fileID: 2111290541918366963}
-  - component: {fileID: 8794892031925789476}
+  - component: {fileID: 1909886951280785919}
  m_Layer: 5
  m_Name: Text
  m_TagString: Untagged
@ -601,7 +601,7 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1275590828871288331}
  m_CullTransparentMesh: 1
--- !u!114 &8794892031925789476
+--- !u!114 &1909886951280785919
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -610,7 +610,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 1275590828871288331}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
@ -621,20 +621,75 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: 20ebdb412ee9aec4a9d3005965d9c962, type: 3}
-    m_FontSize: 16
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u786E\u5B9A"
+  m_text: "\u786E\u5B9A"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
+  m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, 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: 16
+  m_fontSizeBase: 16
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  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: 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 &1291984167039376258
 GameObject:
  m_ObjectHideFlags: 0
@ -782,7 +837,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: ConfirmBtn
  CustomComment: 
  mComponentName: UnityEngine.UI.Button
 --- !u!1 &1336234533568578533
@ -958,7 +1013,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: MouseSub
  CustomComment: 
  mComponentName: UnityEngine.UI.Button
 --- !u!1 &2445174993273300670
@ -1298,7 +1353,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: MouseAdd
  CustomComment: 
  mComponentName: UnityEngine.UI.Button
 --- !u!1 &4566101257233310026
@ -1710,7 +1765,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: MouseSlider
  CustomComment: 
  mComponentName: UnityEngine.UI.Slider
 --- !u!1 &6857310105801723508
@ -1723,7 +1778,7 @@ GameObject:
  m_Component:
  - component: {fileID: 8694246342311846549}
  - component: {fileID: 8710041809518762022}
-  - component: {fileID: 8821581120829563032}
+  - component: {fileID: 3366047067339770762}
  m_Layer: 5
  m_Name: TitleTxt
  m_TagString: Untagged
@ -1758,7 +1813,7 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6857310105801723508}
  m_CullTransparentMesh: 1
--- !u!114 &8821581120829563032
+--- !u!114 &3366047067339770762
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -1767,7 +1822,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 6857310105801723508}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
@ -1778,20 +1833,75 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: bf708833e50b7a746aa577360930b6ed, type: 3}
-    m_FontSize: 20
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u8BBE\u7F6E"
+  m_text: "\u8BBE\u7F6E"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2}
+  m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, 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: 20
+  m_fontSizeBase: 20
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  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: 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 &7344084794051543825
 GameObject:
  m_ObjectHideFlags: 0
@ -1926,7 +2036,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: VoiceSub
  CustomComment: 
  mComponentName: UnityEngine.UI.Button
 --- !u!1 &7441298961810434495
@ -2105,7 +2215,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: VoiceSlider
  CustomComment: 
  mComponentName: UnityEngine.UI.Slider
 --- !u!1 &8015440409360597658
--- a/Assets/Art/UIPrefab/UITipWindow.prefab
+++ b/Assets/Art/UIPrefab/UITipWindow.prefab
@ -136,7 +136,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@ -495,7 +495,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: Label
  CustomComment: 
  mComponentName: TMPro.TextMeshProUGUI
 --- !u!1 &8134342667276409362
@ -834,6 +834,6 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  MarkType: 0
-  CustomComponentName: 
+  CustomComponentName: BtnPrefab
  CustomComment: 
  mComponentName: UnityEngine.UI.Button
--- a/Assets/QFramework/Toolkits/UIKit/Scripts/Resources/VRUIRoot.prefab
+++ b/Assets/QFramework/Toolkits/UIKit/Scripts/Resources/VRUIRoot.prefab
@ -1007,7 +1007,6 @@ RectTransform:
  - {fileID: 4067008720307835646}
  - {fileID: 5346698416423119099}
  - {fileID: 6454445510295011543}
-  - {fileID: 2655199300068705655}
  m_Father: {fileID: 4955625632054724442}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -1033,7 +1032,7 @@ Canvas:
  m_OverridePixelPerfect: 0
  m_SortingBucketNormalizedSize: 0
  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 0
+  m_AdditionalShaderChannelsFlag: 25
  m_UpdateRectTransformForStandalone: 0
  m_SortingLayerID: 0
  m_SortingOrder: 0
@ -1678,316 +1677,3 @@ MonoBehaviour:
  OnButtonReleased:
    m_PersistentCalls:
      m_Calls: []
--- !u!1001 &2655199300079889975
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 7801786202371978394}
-    m_Modifications:
-    - target: {fileID: 132536, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_Name
-      value: Debug
-      objectReference: {fileID: 0}
-    - target: {fileID: 11414302, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_Size
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 11414302, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_Value
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 11440770, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_PresetInfoIsWorld
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22400762, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -0.000030517578
-      objectReference: {fileID: 0}
-    - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents:
-    - {fileID: 11490438, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-    - {fileID: 11440770, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-    - {fileID: 22331464, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
--- !u!224 &2655199300068705655 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
-  m_PrefabInstance: {fileID: 2655199300079889975}
-  m_PrefabAsset: {fileID: 0}
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
--- a/Assets/Scripts/Conditions/ObjClickCondition.cs
+++ b/Assets/Scripts/Conditions/ObjClickCondition.cs
@ -19,6 +19,7 @@ namespace QFramework
        string deviceName;
        bool isRight;

+        bool isClick = false;
        public static ObjClickCondition Allocate(string path, Dictionary<string, string> datas)
        {
            var conditionAction = mSimpleObjectPool.Allocate();
@ -32,6 +33,7 @@ namespace QFramework
            {
                bool.TryParse(datas["isRight"], out conditionAction.isRight);
            }
+            conditionAction.isClick = false;
            return conditionAction;
        }
        public bool Check()
@ -73,7 +75,7 @@ namespace QFramework
            }
 #endif

-            return false;
+            return isClick;
        }
        public bool Paused { get; set; }
        public bool Deinited { get; set; }
@ -89,12 +91,25 @@ namespace QFramework
 #if VR
        public void OnClick(ZPointer pointer, int index, GameObject obj)
        {
-            if (this.obj != null && obj == this.obj)
+            if (isRight)
            {
-                this.Finish();
-                UIRoot.Instance.transform.Find("ZMouse").GetComponent<ZPointer>().OnClick.RemoveListener(OnClick);
-                UIRoot.Instance.transform.Find("ZStylus").GetComponent<ZPointer>().OnClick.RemoveListener(OnClick);
+                if (this.obj != null && obj == this.obj)
+                {
+                    isClick = true;
+                }
            }
+            else
+            {
+                if (this.obj != null)
+                {
+                    var item = obj.GetComponent<DeviceItem>();
+                    if (item != null && obj != this.obj)
+                    {
+                        isClick = true;
+                    }
+                }
+            }
+
        }
 #endif

@ -118,6 +133,10 @@ namespace QFramework
                obj = null;
                path = null;
                mSimpleObjectPool.Recycle(this);
+#if VR
+                UIRoot.Instance.transform.Find("ZMouse").GetComponent<ZPointer>().OnClick.RemoveListener(OnClick);
+                UIRoot.Instance.transform.Find("ZStylus").GetComponent<ZPointer>().OnClick.RemoveListener(OnClick);
+#endif
            }
        }

--- a/Assets/Scripts/Extension/DeviceDraggable.cs
+++ b/Assets/Scripts/Extension/DeviceDraggable.cs
@ -0,0 +1,24 @@
+using GCSeries.Core.Samples;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class DeviceDraggable : Draggable
+{
+    Vector3 pos;
+    Vector3 rot;
+    private void Awake()
+    {
+        pos = transform.position;
+        rot = transform.localEulerAngles;
+    }
+
+    public override void OnEndDrag(PointerEventData eventData)
+    {
+        base.OnEndDrag(eventData);
+        transform.position = pos;
+        transform.localEulerAngles = rot;
+    }
+
+}
--- a/Assets/Scripts/Extension/DeviceDraggable.cs.meta
+++ b/Assets/Scripts/Extension/DeviceDraggable.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c2b2028d0dec50841b6e5477b275f265
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Item/DeviceItem.cs
+++ b/Assets/Scripts/Item/DeviceItem.cs
@ -16,6 +16,7 @@ public class DeviceItem : MonoBehaviour
    public void Init(XMLTool.Device device)
    {
        this.device = device;
+        TypeEventSystem.Global.Register<OnModuleQuit>(OnModuleQuitEvent);
        if (string.IsNullOrEmpty(device.HighColor) == false)
        {
            var effect = gameObject.GetOrAddComponent<HighlightEffect>();
@ -54,10 +55,15 @@ public class DeviceItem : MonoBehaviour
        UIRoot.Instance.transform.Find("ZStylus").GetComponent<ZPointer>().OnObjectExited.AddListener(OnObjExit);
        UIRoot.Instance.transform.Find("ZMouse").GetComponent<ZPointer>().OnClick.AddListener(OnClick);
        UIRoot.Instance.transform.Find("ZStylus").GetComponent<ZPointer>().OnClick.AddListener(OnClick);
+
+        //gameObject.GetOrAddComponent<DeviceDraggable>();
+        gameObject.GetOrAddComponent<StylusVibration>();
 #endif
    }


+
+
 #if VR

    private void OnClick(ZPointer arg0, int arg1, GameObject arg2)
@ -108,6 +114,14 @@ public class DeviceItem : MonoBehaviour
 #endif

    private void OnStepChanged(StepStatusOnChange change)
+    {
+        CloseHighLight();
+    }
+    private void OnModuleQuitEvent(OnModuleQuit quit)
+    {
+        CloseHighLight();
+    }
+    public void CloseHighLight()
    {
        var effect = gameObject.GetComponent<HighlightEffect>();
        if (effect != null)
@ -122,6 +136,7 @@ public class DeviceItem : MonoBehaviour
        tipItem = null;
        StringEventSystem.Global.UnRegister<string[]>(Global.HighLightTrigger, OnHighLightTriggerEvent);
        TypeEventSystem.Global.UnRegister<StepStatusOnChange>(OnStepChanged);
+        TypeEventSystem.Global.UnRegister<OnModuleQuit>(OnModuleQuitEvent);
    }

    private void OnHighLightTriggerEvent(string[] obj)
--- a/Assets/Scripts/Item/Point3DItem.cs
+++ b/Assets/Scripts/Item/Point3DItem.cs
@ -1,3 +1,4 @@
+using GCSeries.Core.Input;
 using QFramework;
 using System;
 using System.Collections;
@ -40,8 +41,54 @@ public class Point3DItem : MonoBehaviour
        TypeEventSystem.Global.Register<OnPoint3DQuestionDestroy>(OnObjDestroy);
        TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);

+
+#if VR
+        UIRoot.Instance.transform.Find("ZStylus").GetComponent<ZPointer>().OnObjectEntered.AddListener(OnObjEnter);
+        UIRoot.Instance.transform.Find("ZStylus").GetComponent<ZPointer>().OnObjectExited.AddListener(OnObjExit);
+        UIRoot.Instance.transform.Find("ZStylus").GetComponent<ZPointer>().OnClick.AddListener(OnClick);
+#endif
    }

+#if VR
+    private void OnClick(ZPointer arg0, int arg1, GameObject arg2)
+    {
+        if (gameObject == arg2)
+        {
+            if (string.IsNullOrEmpty(data.clickEvent) == false)
+            {
+                StringEventSystem.Global.Send(data.clickEvent);
+            }
+            TypeEventSystem.Global.Send<OnPoint3DQuestionDestroy>();
+        }
+    }
+
+    private void OnObjExit(ZPointer arg0, GameObject arg1)
+    {
+        if (gameObject == arg1)
+        {
+            isEnter = false;
+        }
+
+    }
+
+    private void OnObjEnter(ZPointer arg0, GameObject arg1)
+    {
+        if (gameObject == arg1)
+        {
+            isEnter = true;
+        }
+    }
+
+    bool isEnter = false;
+    private void Update()
+    {
+        if (isEnter)
+        {
+            transform.Rotate(Vector3.forward * Time.deltaTime * rotSpeed);
+        }
+    }
+#endif
+
    private void OnStepChanged(StepStatusOnChange change)
    {
        OnObjDestroy(default);
--- a/Assets/Scripts/UI/UIRightTop.cs
+++ b/Assets/Scripts/UI/UIRightTop.cs
@ -2,6 +2,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using QFramework;
 using System.Data.Common;
+using UnityEngine.SceneManagement;

 namespace QFramework.Example
 {
@ -46,7 +47,7 @@ namespace QFramework.Example

            UITipWindowData data = new UITipWindowData();
            data.txt = "是否关闭软件？";
-            data.btns.Add(new UITipWindowData.ItemData() { txt = "ÊÇ", OnClick = () => Application.Quit() });
+            data.btns.Add(new UITipWindowData.ItemData() { txt = "ÊÇ", OnClick = () => { Application.Quit(); } });
            data.btns.Add(new UITipWindowData.ItemData() { txt = "否" });
            UIKit.OpenPanelAsync<UITipWindow>(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
        }
--- a/Assets/Scripts/VR.meta
+++ b/Assets/Scripts/VR.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a7c1e718f16cc7e41a8325205bafa695
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/VR/StylusVibration.cs
+++ b/Assets/Scripts/VR/StylusVibration.cs
@ -0,0 +1,111 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2007-2020 , Inc.  All Rights Reserved.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+using GCSeries.Core.Sdk;
+using GCSeries.Core;
+
+/// <summary>
+/// 未来立体 笔震动脚本
+/// </summary>
+public class StylusVibration : MonoBehaviour,
+    IPointerEnterHandler, IPointerExitHandler
+{
+    ////////////////////////////////////////////////////////////////////////
+    // Inspector Fields
+    ////////////////////////////////////////////////////////////////////////
+
+    public VibrationTypeEnum VibrationType;
+    public float VibrationIntensity;
+
+    ////////////////////////////////////////////////////////////////////////
+    // Enumerators
+    ////////////////////////////////////////////////////////////////////////
+
+    public enum VibrationTypeEnum
+    {
+        Constant,
+        FastPulse,
+        MediumPulse,
+        SlowPulse
+    }
+
+    ////////////////////////////////////////////////////////////////////////
+    // MonoBehaviour Callbacks
+    ////////////////////////////////////////////////////////////////////////
+
+    private void Start()
+    {
+        if (ZProvider.IsInitialized)
+        {
+            this._stylusTarget = ZProvider.StylusTarget;
+            this._stylusTarget.IsVibrationEnabled = true;
+        }
+        else
+        {
+            Debug.LogWarning("ZProvider can not initialize.\n Stylus" +
+                "vibration and LED light feedback will not be experienced.");
+
+            Destroy(this);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////
+    // Public Methods
+    ////////////////////////////////////////////////////////////////////////
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        this.Vibrate();
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        this._stylusTarget.StopVibration();
+    }
+
+    ////////////////////////////////////////////////////////////////////////
+    // Private Methods
+    ////////////////////////////////////////////////////////////////////////
+
+    private void Vibrate()
+    {
+        switch (this.VibrationType)
+        {
+            case VibrationTypeEnum.Constant:
+                this._stylusTarget.StartVibration(
+                    1.0f, 0.0f, 100, this.VibrationIntensity);
+                break;
+
+            case VibrationTypeEnum.FastPulse:
+                this._stylusTarget.StartVibration(
+                    0.1f, 0.1f, 100, this.VibrationIntensity);
+                break;
+
+            case VibrationTypeEnum.MediumPulse:
+                this._stylusTarget.StartVibration(
+                    0.3f, 0.3f, 100, this.VibrationIntensity);
+                break;
+
+            case VibrationTypeEnum.SlowPulse:
+                this._stylusTarget.StartVibration(
+                    0.6f, 0.6f, 100, this.VibrationIntensity);
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////
+    // Private Members
+    ////////////////////////////////////////////////////////////////////////
+
+    private ZTarget _stylusTarget;
+}
+
--- a/Assets/Scripts/VR/StylusVibration.cs.meta
+++ b/Assets/Scripts/VR/StylusVibration.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 096518624f225c648a0cf58d85666b9c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/WebPlatform.meta
+++ b/Assets/WebPlatform.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8daec37f39bdca34e922be7644ef97c1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/WebPlatform/LaiYiTe.meta
+++ b/Assets/WebPlatform/LaiYiTe.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8f4e4f808ac25d946affe317d1b81545
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/WebPlatform/LaiYiTe/Resrouces.meta
+++ b/Assets/WebPlatform/LaiYiTe/Resrouces.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5da36794a84f2e24aa0626b1466f6360
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/WebPlatform/LaiYiTe/Resrouces/RSA.Private
+++ b/Assets/WebPlatform/LaiYiTe/Resrouces/RSA.Private
@ -0,0 +1,10 @@
+ <RSAKeyValue>
+  <Modulus>vsWZ0Eu/pLeJblZfeAQ7p+KWQHqiJnp9UNwfHLW8Ev2EI9Kg2aPiB/DGmhPab8yCfuQuZIqJSwcCX1XzVvtIOoeeKy53VHOity0oxADtoY+TZSbJraG0+kEwE+S8HZ8u8xAoVg1xcI1a/wnS2CmZSvoqwpOFKufcosyZZeWTyQXhTipLIudmmA+KFWxRjXzcigE/46fA76MzSoH9WUaIq+d8DPJMQwURZcxmMRwIkSmzz6rss10uSdTGqM7VmewDkqeWugIjS0wzSMBKQYgv1rxbMO38hd58J0mygKtjMRdm38MUaPfm2fYCFhqRBuUXnLZ992NHpUNsXesSzlLlyw==</Modulus>
+  <Exponent>AQAB</Exponent>
+  <P>+JTwTuuxi9suxLj+qVfpWwYQ7VIpG5EubZoZrFeHNynysgTbJuSvuujN7rgpT3uejxBbUMjxaOlikECKpTdGs6gyNaAKce6SA+4xobbWmFUS4uE7RBbIXefq/jof0V/etBW4eXwG2IiB2IKhVbPyq3lVmbZcQr3Matm9oEu+H6E=</P>
+  <Q>xHcEu0QIDKgxNYLgsmq7i+P+vLGCTXs+8EVNkBKMoyRpLpP+TPCcKnHRK7+j0Od4tD1yYNk/IGPOojjdwzouSDGpIpHNNHOwUOr/n0DVwTWIs8kTRDDVa8al+ptaD8cfssbfbdgs8QkvloX09YLZpZ5dfeKrBH3ZpEtqtjwyves=</Q>
+  <DP>buhEr3GJLZUFMNA5DuUiQHJcawYVQS9tP4lZmwMSWRJmLfbssFWn8gScnL2d8NB+1eW+WDTPQLegOiwRr9URvmZ0wGg/QMXob8h+bGBfLmgGnSNQhfiEPSGUPwk/2PKlMkPeopUrmMCO7kKaKNq4krj38DTkxQJZifLMIBCrKwE=</DP>
+  <DQ>gSyIDeCTMk8726Uru+N1YGsNyF8l/2+zWCMY9ktb8MA18AwaPdhNtZKUJyGfwfEPaeKk24y7dr5o1DxzgrM0Tv9n53TZ6UzPdsSsQbdNU/Ww5hSk+EbrbCt2YinWs10HOHKN4Rkro2eYxG1bPDlGhSB09Boeu5tLiDyV8y/tZPU=</DQ>
+  <InverseQ>FZzsXZ8ReLoBF9hYAaxP4/41uvReXoYVi3AcJrTwtC3a3fBKGAfXB+6oMbVtU9iPOWD1C7I0ZZh3A8xhQp730bLvbbdZWrpR4eY2RnefAW9EJESHfdDCxnsAIiH7+V/gAieF7bN0G5uifx/OxQl5pogovrLWLmZ+cw3QnMLX1kY=</InverseQ>
+  <D>trGx7eK881e5S2t4Hg2fu9WpIrLOmp7vaAKF4Q7BwEX8x/mshQEHM6eH6oJczHhD+JU5QJvTg4CA6x/63C/lKfg6pwvmx3++MkITKjHhYLmI5HPS7G9SS98l1cdVx+BsK+YrWs2g97LHlDqqKs0busv9Kz3vZ/mIOHhL52OGthk7SBSL0Nbq5rCCyErQEKPk3HmVmF2nJTam3d1PK0OT7I4IH5Szn9CXt1R3kk1Y2NZb3GIrcPUaQ7+75/DlVL05Leabc/eMi/ghhyCqOotHnLw8uNf3kK6QvD/bv3C4Ikdy1ZYBpENz74OMeINWAEXZyARLgs4EryA+6F7Fw3magQ==</D>
+</RSAKeyValue>
--- a/Assets/WebPlatform/LaiYiTe/Resrouces/RSA.Private.meta
+++ b/Assets/WebPlatform/LaiYiTe/Resrouces/RSA.Private.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 72fe0ae24cde45946914fa10b54896b0
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/WebPlatform/Plugins.meta
+++ b/Assets/WebPlatform/Plugins.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4a5ff23952c587c48ab012049e07df51
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/WebPlatform/Plugins/WebGL.meta
+++ b/Assets/WebPlatform/Plugins/WebGL.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 23a14a5f29ce27c4dab61a5fe698a2e9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/WebPlatform/Plugins/WebGL/GetParameters.jslib
+++ b/Assets/WebPlatform/Plugins/WebGL/GetParameters.jslib
@ -0,0 +1,9 @@
+// 名为 "URLParameters.jslib" 的插件文件
+mergeInto(LibraryManager.library, {
+    GetURLParameter: function (name) {
+        var search = window.location.search.substring(1);
+        var params = new URLSearchParams(search);
+        var value = params.get(name);
+        return value ? Pointer_stringify(value) : null;
+    }
+});
--- a/Assets/WebPlatform/Plugins/WebGL/GetParameters.jslib.meta
+++ b/Assets/WebPlatform/Plugins/WebGL/GetParameters.jslib.meta
@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: af1b30451ed743d4f81b3f9c8c15baeb
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      WebGL: WebGL
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/WebPlatform/Scripts.meta
+++ b/Assets/WebPlatform/Scripts.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b8dbba4c57255fc4495c422b41445cbe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/WebPlatform/Scripts/WebGLHelper.cs
+++ b/Assets/WebPlatform/Scripts/WebGLHelper.cs
@ -0,0 +1,189 @@
+using Newtonsoft.Json;
+using QFramework;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Text;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.Networking;
+
+public class WebGLHelper : Singleton<WebGLHelper>
+{
+    private WebGLHelper() { }
+    public class LabData
+    {
+        public string GUID;
+        public string ExpID;
+        public string HOST;
+        public string PARA1;
+        public string PARA;
+        public string PARA2;
+    }
+    [DllImport("__Internal")]
+    private static extern string GetURLParameter(string name);
+
+    string token = string.Empty;
+
+    LabData labData = new LabData();
+    [SerializeField]
+    private TextAsset RSA;
+    private const int RsaKeySize = 2048;
+
+    public string uploadUrl;
+
+    public void Init()
+    {
+        token = GetURLParameter("token").Replace("%2B", "+");
+        RSA = Resources.Load<TextAsset>("RSA");
+        string urlData = Decrypt(token);
+        var datas = urlData.Split("&");
+        labData.GUID = datas[0];
+        labData.ExpID = datas[1];
+        labData.HOST = datas[2];
+        labData.PARA1 = datas[3];
+        labData.PARA = datas[4];
+        labData.PARA2 = datas[5];
+
+        uploadUrl = Path.Combine(labData.HOST, "host/public/Exp/AddScore/");
+    }
+    /// <summary>
+    /// Decrypts encrypted text given a RSA private key file path.给定路径的 RSA 私钥文件解
+
+    /// </summary>
+    /// <param name="encryptedText">加密的密文</param>
+    /// <param name="pathToPrivateKey">用于加密的私钥路径.</param>
+    /// <returns>未加密数据的字符串</returns>
+    public string Decrypt(string encryptedText)
+    {
+        using (var rsa = new RSACryptoServiceProvider(RsaKeySize))
+        {
+            try
+            {
+                string privateXmlKey = RSA.text;
+                rsa.FromXmlString(privateXmlKey);
+                Debug.Log("encryptedText " + encryptedText);
+                var bytesEncrypted = Convert.FromBase64String(encryptedText);
+                string b = Encoding.UTF8.GetString(bytesEncrypted);
+                Debug.Log("byte " + b);
+                //var bytesPlainText = rsa.Decrypt(bytesEncrypted, false);
+                var bytesPlainText = rsa.Decrypt(bytesEncrypted, false);
+                Debug.Log("bytesPlainText " + bytesPlainText);
+                return System.Text.Encoding.UTF8.GetString(bytesPlainText);
+            }
+            finally
+            {
+                rsa.PersistKeyInCsp = false;
+            }
+        }
+    }
+
+
+
+    public void UpLoadData(int totalScore, List<string> stepNames, List<int> maxScore, List<int> score)
+    {
+        var data = new UploadData();
+        data.GUID = labData.GUID;
+        data.ExpID = int.Parse(labData.ExpID);
+        data.score = totalScore;
+        data.flag = true;
+
+        var list = new List<Expstepvtwolist>();
+        for (int i = 0; i < stepNames.Count; i++)
+        {
+            var step = new Expstepvtwolist();
+            step.ExpStepName = stepNames[i];
+            step.maxScore = maxScore[i];
+            step.score = score[i];
+        }
+        data.ExpStepVTwoList = list.ToArray();
+
+
+    }
+
+    IEnumerator SendScore(string json, UnityAction<string> action)
+    {
+        if (string.IsNullOrEmpty(uploadUrl))
+        {
+            Debug.LogError("上传接口地址错误:" + uploadUrl);
+            yield break;
+        }
+
+        using (UnityWebRequest request = new UnityWebRequest(uploadUrl, "POST"))
+        {
+            request.SetRequestHeader("Content-Type", "application/json");
+            request.uploadHandler = new UploadHandlerRaw(System.Text.Encoding.UTF8.GetBytes(json));
+            request.downloadHandler = new DownloadHandlerBuffer();
+            yield return request.SendWebRequest();
+            // 处理响应
+            if (request.result == UnityWebRequest.Result.ConnectionError ||
+                request.result == UnityWebRequest.Result.ProtocolError)
+            {
+                Debug.LogError($"Upload failed: {request.error}");
+                Debug.LogError($"Response Code: {request.responseCode}");
+            }
+            else
+            {
+                Debug.Log("Upload complete!");
+                Debug.Log($"Response Code: {request.responseCode}");
+                Debug.Log($"Server Response: {request.downloadHandler.text}");
+                Response response = JsonConvert.DeserializeObject<Response>(request.downloadHandler.text);
+                Debug.LogError(response.msg);
+            }
+        }
+
+    }
+}
+
+
+
+
+public class UploadData
+{
+    public string GUID { get; set; }
+    // 实验 ID
+    public int ExpID { get; set; }
+    // 成绩
+    public int score { get; set; }
+    // 标志位：默认值 true
+    public bool flag { get; set; }
+    // 实验步骤列表
+    public Expstepvtwolist[] ExpStepVTwoList { get; set; }
+}
+
+public class Expstepvtwolist
+{
+    // 实验步骤序号
+    public int seq { get; set; }
+    // 实验步骤名称
+    public string ExpStepName = "";
+    // 实验步骤状态
+    public string StepState = "";
+    // 实验步骤开始时间
+    public DateTime startTime = default;
+    // 实验步骤结束时间
+    public DateTime endTime = default;
+    // 实验步骤合理用时：单位秒
+    public int expectTime = 0;
+    // 实验步骤满分：0 ~100，百分制
+    public int maxScore = 100;
+    // 实验步骤得分：0 ~100，百分制
+    public int score = 0;
+    // 实验步骤操作次数
+    public int repeatCount = 1;
+    // 步骤评价：200 字以内
+    public string evaluation = "";
+    // 赋分模型：200 字以内
+    public string scoringModel = "";
+    // 备注
+    public string remarks { get; set; }
+}
+
+public class Response
+{
+    public string msg;
+    public bool success;
+}
--- a/Assets/WebPlatform/Scripts/WebGLHelper.cs.meta
+++ b/Assets/WebPlatform/Scripts/WebGLHelper.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c1b108973e2a6cd43bf6b1943d979a23
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@ -45,6 +45,7 @@
    "com.unity.modules.video": "1.0.0",
    "com.unity.modules.vr": "1.0.0",
    "com.unity.modules.wind": "1.0.0",
-    "com.unity.modules.xr": "1.0.0"
+    "com.unity.modules.xr": "1.0.0",
+    "com.unity.assetbundlebrowser": "1.7.0"
  }
 }
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@ -22,6 +22,13 @@
        "com.unity.modules.uielements": "1.0.0"
      }
    },
+    "com.unity.assetbundlebrowser": {
+      "version": "1.7.0",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.cn"
+    },
    "com.unity.burst": {
      "version": "1.8.11",
      "depth": 1,