2022 11 30

Assets/Resources/Template/Prefab/Text.prefab

@@ -215,18 +215,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
+    m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 0
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u8BF7\u8F93\u5165\u8981\u5C55\u793A\u7684\u6587\u5B57\u5185\u5BB9\uFF0C\u82E5\u4E3A\u7A7A\u5219\u666F\u70B9\u4E2D\u4E0D\u5C55\u793A\u6587\u5B57\u5185\u5BB9"
+  m_Text: 
 --- !u!114 &2828833021312147512
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -391,8 +391,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   text: {fileID: 2828833021312147515}
   bj: {fileID: 2828833021118674281}
-  bjRect: {fileID: 0}
-  selectbjRect: {fileID: 0}
+  textRect: {fileID: 2828833021312147513}
+  canvas: {fileID: 2828833022409846366}
 --- !u!114 &-5996465442881103538
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/Template/Prefab/Text1.prefab

@@ -391,8 +391,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   text: {fileID: 2828833021312147515}
   bj: {fileID: 2828833021118674281}
-  bjRect: {fileID: 2828833021118674286}
-  selectbjRect: {fileID: 8943774930832616042}
+  textRect: {fileID: 2828833021312147513}
+  canvas: {fileID: 2828833022409846366}
 --- !u!114 &-5996465442881103538
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/Template/Prefab/Text2.prefab

@@ -391,8 +391,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   text: {fileID: 2828833021312147515}
   bj: {fileID: 2828833021118674281}
-  bjRect: {fileID: 8943774930832616042}
-  selectbjRect: {fileID: 2828833021118674286}
+  textRect: {fileID: 2828833021312147513}
+  canvas: {fileID: 2828833022409846366}
 --- !u!114 &-5996465442881103538
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/Template/Prefab/Text3.prefab

@@ -391,8 +391,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   text: {fileID: 2828833021312147515}
   bj: {fileID: 2828833021118674281}
-  bjRect: {fileID: 2828833021118674286}
-  selectbjRect: {fileID: 8943774930832616042}
+  textRect: {fileID: 2828833021312147513}
+  canvas: {fileID: 2828833022409846366}
 --- !u!114 &-5996465442881103538
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/UI/SandTable.prefab

@@ -0,0 +1,46 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3237478958531956772
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3237478958531956773}
+  - component: {fileID: 3237478958531956770}
+  m_Layer: 0
+  m_Name: SandTable
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3237478958531956773
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3237478958531956772}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.000016853213, y: 0.00029920042, z: -0.007802152}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3237478958531956770
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3237478958531956772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 51844204dc2d8724fbae180a678cb9f7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  updateTime: 0

Assets/StreamingAssets/AssetBundles/Android/mrhall.manifest.meta → Assets/Resources/UI/SandTable.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 219f192a24ea05e438c7a9e9fb709b5e
-DefaultImporter:
+guid: f6f4b96c828d66040bbfb609076f1e00
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Resources/VuforiaConfiguration.asset

@@ -21,7 +21,7 @@ MonoBehaviour:
     maxSimultaneousObjectTargets: 1
     useDelayedLoadingObjectTargets: 0
     version: 8.1.12
-    eulaAcceptedVersions: '{"Values":["8.5","7.5","8.3","7.2","7.1","8.0","7.7","8.1","0.0","9.2","9.4","9.8","10.3","10.2"]}'
+    eulaAcceptedVersions: '{"Values":["8.5","7.5","8.3","7.2","7.1","8.0","7.7","8.1","0.0","9.2","9.4","9.8","10.3","10.2","9.1"]}'
   digitalEyewear:
     cameraOffset: 0.06
     distortionRenderingLayer: 31

Assets/Scenes/QFrameWorkNewUI.unity

@@ -478,9 +478,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   list_Target: []
-  text1: {fileID: 0}
-  text2: {fileID: 0}
-  text3: {fileID: 0}
   state: 0
 --- !u!4 &226612939
 Transform:
@@ -668,7 +665,7 @@ RectTransform:
   m_Children:
   - {fileID: 1436441430}
   m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1019,7 +1016,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 57588f0f976bb154280c5874ea0a4802, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  MaxDownLoad: 2
+  MaxDownLoad: 1
   NowDownLoad: 0
   AllDownLoad: 0
 --- !u!4 &362256831
@@ -1032,10 +1029,9 @@ Transform:
   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_Children:
-  - {fileID: 2024936661}
+  m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &420733138
 GameObject:
@@ -1130,6 +1126,7 @@ GameObject:
   - component: {fileID: 432641764}
   - component: {fileID: 432641769}
   - component: {fileID: 432641770}
+  - component: {fileID: 432641771}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -1222,6 +1219,7 @@ RectTransform:
   m_Children:
   - {fileID: 1613259495}
   - {fileID: 1698784425}
+  - {fileID: 1231802014}
   m_Father: {fileID: 905216933}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1258,6 +1256,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   hintPanel: {fileID: 1698784424}
   hintLog: {fileID: 1834118782}
+--- !u!114 &432641771
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 432641763}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c992c8dcd5d86524cb5c680b5ab6c7f2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  vuforiaHint: {fileID: 1231802013}
+  text: {fileID: 1750345006}
 --- !u!1 &437338764
 GameObject:
   m_ObjectHideFlags: 0
@@ -2199,7 +2211,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &727300134
 MonoBehaviour:
@@ -2796,50 +2808,6 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
---- !u!1 &1086250258
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1086250259}
-  - component: {fileID: 1086250260}
-  m_Layer: 0
-  m_Name: SandTable
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1086250259
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1086250258}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.000016853213, y: 0.00029920042, z: -0.007802152}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 16
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1086250260
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1086250258}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 51844204dc2d8724fbae180a678cb9f7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  updateTime: 0
 --- !u!1 &1096139908
 GameObject:
   m_ObjectHideFlags: 0
@@ -3198,8 +3166,83 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1231802013
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1231802014}
+  - component: {fileID: 1231802016}
+  - component: {fileID: 1231802015}
+  m_Layer: 5
+  m_Name: VuforiaHintPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1231802014
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1231802013}
+  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_Children:
+  - {fileID: 1750345005}
+  m_Father: {fileID: 432641768}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -446.86267, y: -236.47528}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1231802015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1231802013}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 0.50980395}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1231802016
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1231802013}
+  m_CullTransparentMesh: 0
 --- !u!1 &1270514297
 GameObject:
   m_ObjectHideFlags: 0
@@ -3436,7 +3479,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1395943710
 MonoBehaviour:
@@ -3583,7 +3626,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1484638027
 GameObject:
@@ -4441,6 +4484,84 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1698784424}
   m_CullTransparentMesh: 0
+--- !u!1 &1750345004
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1750345005}
+  - component: {fileID: 1750345007}
+  - component: {fileID: 1750345006}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1750345005
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1750345004}
+  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_Children: []
+  m_Father: {fileID: 1231802014}
+  m_RootOrder: 0
+  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.0021515, y: 6.8}
+  m_SizeDelta: {x: 762.133, y: 288.8976}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1750345006
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1750345004}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 79
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 79
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7B49\u5F85\u626B\u63CF\u56FE\u7247..."
+--- !u!222 &1750345007
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1750345004}
+  m_CullTransparentMesh: 0
 --- !u!1 &1793973424
 GameObject:
   m_ObjectHideFlags: 0
@@ -5300,7 +5421,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2017418898
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5445,8 +5566,8 @@ Transform:
   m_LocalPosition: {x: 0.29668966, y: -0.22105885, z: 1.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 362256831}
-  m_RootOrder: 0
+  m_Father: {fileID: 0}
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2024936662
 MonoBehaviour:
@@ -6070,6 +6191,75 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1001 &3237478959615020342
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3237478958531956772, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_Name
+      value: SandTable
+      objectReference: {fileID: 0}
+    - target: {fileID: 3237478958531956773, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 3237478958531956773, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.000016853213
+      objectReference: {fileID: 0}
+    - target: {fileID: 3237478958531956773, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.00029920042
+      objectReference: {fileID: 0}
+    - target: {fileID: 3237478958531956773, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.007802152
+      objectReference: {fileID: 0}
+    - target: {fileID: 3237478958531956773, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3237478958531956773, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3237478958531956773, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3237478958531956773, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3237478958531956773, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3237478958531956773, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3237478958531956773, guid: f6f4b96c828d66040bbfb609076f1e00,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f6f4b96c828d66040bbfb609076f1e00, type: 3}
 --- !u!222 &3623668476630247565
 CanvasRenderer:
   m_ObjectHideFlags: 0

Assets/Scripts/GameManager.cs

@@ -500,6 +500,7 @@ public class GameManager : MonoSingleton<GameManager>
             try
             {
                 UIKit.OpenPanel<EditorPanel>(new EditorPanelData() { SceneValue = scene, listLocalMaterials = listLocalCMVs, listUpLoadMaterials = listCMValue });
+                VuforialHint.Instance.Show();
             }
             catch (Exception e)
             {
@@ -558,12 +559,13 @@ public class GameManager : MonoSingleton<GameManager>
         {
             for (int i = 0; i < scene.listSpoit.Count; i++)
             {
-                Debug.Log("上传 " + scene.listSpoit[i].spoitTf);
+                Debug.Log("上传 " + scene.listSpoit[i].spoitTf.nowPos);
                 GameManager.Instance.text2.text = " 上传  " + scene.listSpoit[i].spoitTf;
                 //  string spoittf = JsonMapper.ToJson(scene.listSpoit[i].spoitTf);
                 //  string spoittf = JsonConvert.SerializeObject(scene.listSpoit[i].spoitTf);
                 
                 SendEditorData data = new SendEditorData();
+                data.spoittf = new ObjectTransform();
                 data.material = scene.listSpoit[i].material;
                 data.spoittf = scene.listSpoit[i].spoitTf;
                 data.id = scene.listSpoit[i].id;
@@ -576,6 +578,7 @@ public class GameManager : MonoSingleton<GameManager>
         {
 
             GameManager.Instance.text4.text = "上传   "+ e.Message;
+            
         }
         // 上传
        
@@ -595,6 +598,7 @@ public class GameManager : MonoSingleton<GameManager>
         catch (Exception e)
         {
             GameManager.Instance.text2.text =  e.Message;
+            ErrorLogPanel.Instance.Show(" 上传失败 ");
             Debug.LogError(e);
         }
        
@@ -734,6 +738,8 @@ public class GameManager : MonoSingleton<GameManager>
             SandTable.Instance.updateTime = 0;
         }
 
+       
+
         
         listDownLoad.Insert(0, new DownLoadMaterial(datFile, scene.updateTime));
         listDownLoad.Insert(1, new DownLoadMaterial(xmlFile, scene.updateTime));
@@ -785,7 +791,7 @@ public class GameManager : MonoSingleton<GameManager>
             if (listCMV[i].objectTransform == null)
                 SetObjectTransform(listCMV[i].objectTransform);
                // listCMV[i].objectTransform = startObjTransform;
-
+               
 
             Debug.Log(listCMV[i].name);
             if(listCMV[i].materialList!=null)
@@ -1310,12 +1316,7 @@ public class GameManager : MonoSingleton<GameManager>
     {
         
         obj = new ObjectTransform();
-        obj.startPos = Vector3.zero;
-        obj.startRot = Vector3.zero;
-        obj.startScale = Vector3.one;
-        obj.nowPos = Vector3.zero;
-        obj.nowRot = Vector3.zero;
-        obj.nowScale = Vector3.zero;
+        obj.Initialize();
     }
 
 
@@ -1458,6 +1459,52 @@ public class ObjectTransform
     public Vector3 nowRot { get; set; }
     public Vector3 nowScale { get; set; }
 
+    public void Initialize()
+    {
+        startPos = Vector3.zero;
+        startRot = Vector3.zero;
+        startScale = Vector3.one;
+        InitializeNow();
+    }
+    public void InitializeNow()
+    {
+        nowPos = Vector3.zero;
+        nowRot = Vector3.zero;
+        nowScale = Vector3.zero;
+    }
+    public void InitializeObject(Transform objTransform)
+    {
+        InitializeNow();
+        SetObjectTransform(objTransform);
+    }
+    public void SetValue( Transform objTransform)
+    {
+        this.nowPos = objTransform.localPosition;
+        this.nowRot = objTransform.localEulerAngles;
+
+        if (objTransform.localScale == Vector3.zero)
+            nowScale = Vector3.one;
+        else
+            nowScale = objTransform.localScale;
+    }
+    public void SetObjectTransform( Transform objTransform)
+    {
+        if(nowScale == Vector3.zero)
+        {
+            if (startScale == Vector3.zero)
+                Initialize();
+            objTransform.localPosition = startPos;
+            objTransform.localEulerAngles = startRot;
+            objTransform.localScale = startScale;
+        }else
+        {
+            objTransform.localPosition = nowPos;
+            objTransform.localEulerAngles = nowRot;
+            objTransform.localScale = nowScale;
+        }
+    }
+  
+    
 }
 
 public class ScenesPage

Assets/Scripts/Http/HttpTool.cs

@@ -21,9 +21,10 @@ public class HttpTool : MonoBehaviour
     // private string baseUrl = "http://192.168.140.123:8080/guideSystem";
     //   private string baseUrl = "http://office.ghz-tech.com:3419/guideSystem";
 
-    private string baseUrl = "http://office.ghz-tech.com:3425/guideSystem";
-   
-  //  private string baseUrl = "http://office.ghz-tech.com:9903/guideSystem";
+   // private string baseUrl = "http://office.ghz-tech.com:3425/guideSystem";
+    private string baseUrl = "https://office.ghz-tech.com:3424/api";
+
+    //  private string baseUrl = "http://office.ghz-tech.com:9903/guideSystem";
 
     //  private string baseUrl = "http://ghz-tech.com:3419/guideSystem";
 
@@ -81,6 +82,7 @@ public class HttpTool : MonoBehaviour
                 if (callback != null)
                 {
                     callback(null);
+                   
                 }
             }
             else
@@ -859,7 +861,7 @@ public class HttpTool : MonoBehaviour
     private IEnumerator PostRequestLogin(string methodName, string jsonString, Action<string> CallBack)
     {
         string url = baseUrl + methodName;
-        Debug.Log(url);
+        Debug.Log(jsonString);
 
         using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
         {
@@ -979,31 +981,65 @@ public class HttpTool : MonoBehaviour
         return binary;
     }
 
-    public void GetLocalModel(DownLoadMaterial mObj)
+    public void GetLocalModel(DownLoadMaterial mObj, Action<DownLoadMaterial, object> CallBack)
     {
-        StartCoroutine(GetModelRequest(mObj));
+        StartCoroutine(GetModelRequest(mObj, CallBack));
     }
 
-    private IEnumerator GetModelRequest(DownLoadMaterial mObj)
+    private IEnumerator GetModelRequest(DownLoadMaterial mObj, Action<DownLoadMaterial, object> CallBack)
     {
-        UnityWebRequest request = UnityWebRequestAssetBundle.GetAssetBundle(mObj.mObj.DownloadPath);
-        yield return request.SendWebRequest();
-        if (request.isHttpError || request.isNetworkError)
+        //Debug.Log(" Load LocalModel");
+        //UnityWebRequest request = UnityWebRequestAssetBundle.GetAssetBundle(mObj.mObj.localSavePath);
+        //yield return request.SendWebRequest();
+        //if (request.isHttpError || request.isNetworkError)
+        //{
+        //    Debug.LogError(request.error + "\n" + request.downloadHandler.text);
+
+        //    ErrorLogPanel.Instance.Show(" 加载缓存模型出现错误 " + mObj.mObj.localSavePath);
+        //}
+        //else
+        //{
+        //    try
+        //    {
+        //        Debug.Log(" Load LocalModel2");
+        //        AssetBundle bundle = DownloadHandlerAssetBundle.GetContent(request);
+        //        GameObject obj = bundle.LoadAsset<GameObject>(bundle.GetAllAssetNames()[0]);
+        //        List<GameObject> listObjs = new List<GameObject>();
+        //        listObjs.Add(obj);
+        //        LoadManager.Instance.DownLoadEnd(mObj, listObjs);
+        //        bundle.Unload(false);
+        //        object value = listObjs;
+        //        CallBack(mObj, value);
+        //    }
+        //    catch (Exception)
+        //    {
+        //        ErrorLogPanel.Instance.Show(" 生成缓存模型出现错误 " + mObj.mObj.localSavePath);
+        //        throw;
+        //    }
+        //}
+
+        AssetBundleCreateRequest request1 = AssetBundle.LoadFromMemoryAsync(File.ReadAllBytes(mObj.mObj.localSavePath));
+        yield return request1;
+        if (false)
         {
-            Debug.LogError(request.error + "\n" + request.downloadHandler.text);
 
-            ErrorLogPanel.Instance.Show(" 加载缓存模型出现错误 " + mObj.mObj.localSavePath);
         }
         else
         {
             try
             {
-                AssetBundle bundle = DownloadHandlerAssetBundle.GetContent(request);
-                GameObject obj = bundle.LoadAsset<GameObject>("");
+                Debug.Log(" Load LocalModel2");
+                //AssetBundle bundle = DownloadHandlerAssetBundle.GetContent(request);
+
+                // AssetBundle bundle = request.downloadHandler.data;
+                AssetBundle bundle = request1.assetBundle;
+                GameObject obj = bundle.LoadAsset<GameObject>(bundle.GetAllAssetNames()[0]);
                 List<GameObject> listObjs = new List<GameObject>();
                 listObjs.Add(obj);
                 LoadManager.Instance.DownLoadEnd(mObj, listObjs);
                 bundle.Unload(false);
+                object value = listObjs;
+                CallBack(mObj, value);
             }
             catch (Exception)
             {
@@ -1011,11 +1047,10 @@ public class HttpTool : MonoBehaviour
                 throw;
             }
 
-
-
         }
     }
 
+
     public void HeadAddToken(string token)
     {
         requestHeader.Add("x-token", token);

Assets/Scripts/Loader/CMaterialValueShow.cs

@@ -18,6 +18,7 @@ public class CMaterialValueShow : MonoBehaviour
         listMaterialValue = new List<MaterialShow>();
 
         CreateMaterial();
+      
     }
 
     /// <summary>
@@ -44,22 +45,8 @@ public class CMaterialValueShow : MonoBehaviour
                 //UIKit.GetPanel<EditorPanel>().dicCMVOjbes[cMValue.name].Add(gameObject);
                 cMValue.materialList.ForEach(item =>
                 {
-
-                    GameObject obj = new GameObject(item.name);
-                    obj.transform.parent = transform;
-                    obj.transform.Identity();
-                 //   SetObjMaterial(obj, item.ObjectTransform);
-                    Debug.Log(obj.name + "  " + item.ObjectTransform);
-                    MaterialShow materialShow = obj.AddComponent<MaterialShow>();
-                    materialShow.value = item;
-                    materialShow.spoitName = spoitname;
-                    Debug.Log(item.name + "  "+ item.ObjectTransform.startPos.x);
-                    materialShow.type = cMValue.template;
-                    materialShow.updateTime = cMValue.updateTime;
-                    listMaterialValue.Add(materialShow);
-                    Debug.Log(item.name);
-                    UIKit.GetPanel<EditorPanel>().dicObjs[spoitname].Add(materialShow.gameObject);
-                   // UIKit.GetPanel<EditorPanel>().dicCMVOjbes[cMValue.name].Add(materialShow.gameObject);
+                    StartCoroutine(LoadMaterialObj(item));
+                  
                 });
                 break;
             default:
@@ -68,6 +55,27 @@ public class CMaterialValueShow : MonoBehaviour
 
     }
 
+    private IEnumerator LoadMaterialObj(MaterialObjValue item)
+    {
+        GameObject obj = new GameObject(item.name);
+        yield return new WaitForFixedUpdate();
+        obj.transform.parent = transform;
+        obj.transform.LocalIdentity();
+        //   SetObjMaterial(obj, item.ObjectTransform);
+        Debug.Log(obj.name + "  " + item.ObjectTransform);
+        MaterialShow materialShow = obj.AddComponent<MaterialShow>();
+        materialShow.value = item;
+        materialShow.spoitName = spoitname;
+        Debug.Log(item.name + "  " + item.ObjectTransform.startPos.x);
+        materialShow.type = cMValue.template;
+        materialShow.updateTime = cMValue.updateTime;
+        listMaterialValue.Add(materialShow);
+        Debug.Log(item.name);
+        UIKit.GetPanel<EditorPanel>().dicObjs[spoitname].Add(materialShow.gameObject);
+        // UIKit.GetPanel<EditorPanel>().dicCMVOjbes[cMValue.name].Add(materialShow.gameObject);
+    }
+
+
     /// <summary>
     /// 设置物体的初始位置
     /// </summary>

Assets/Scripts/Loader/DownLoadManage.cs

@@ -51,7 +51,7 @@ public class DownLoadManage : MonoSingleton<DownLoadManage>
         
         while (true)
         {
-            Debug.Log(NowDownLoad + "  Load     " + MaxDownLoad);
+          //  Debug.Log(NowDownLoad + "  Load     " + MaxDownLoad);
            if( NowDownLoad < MaxDownLoad)
             {
                 if (listMaterialData.Count > 0)
@@ -104,7 +104,9 @@ public class DownLoadManage : MonoSingleton<DownLoadManage>
                             {
                                 ErrorLogPanel.Instance.Show(" 上传的模型文件格式不正确  " + Path.GetFileName(listMaterialData[0].mObj.DownloadPath));
                             }
+                            Debug.Log(listMaterialData[0].mObj.cdnUrl);
 
+                            if(listMaterialData[0].mObj.cdnUrl.IsNotNullAndEmpty())
                             if(Path.GetFileName(listMaterialData[0].mObj.cdnUrl).Contains("."))
                             {
                                 ErrorLogPanel.Instance.Show(" 上传的模型文件格式不正确  " + Path.GetFileName(listMaterialData[0].mObj.DownloadPath));
@@ -135,8 +137,8 @@ public class DownLoadManage : MonoSingleton<DownLoadManage>
                 {
                     methodName = "/file/download";
 
-                    if (listMaterialData[0].mObj.cdnUrl.IsNotNullAndEmpty())
-                        methodName = "/cdn/download";
+                    //if (listMaterialData[0].mObj.cdnUrl.IsNotNullAndEmpty())
+                    //    methodName = "/cdn/download";
 
                     NowDownLoad++;
 
@@ -149,12 +151,13 @@ public class DownLoadManage : MonoSingleton<DownLoadManage>
                             HttpTool.Instance.GetLocalSprite(listLocalMaterialData[0], CallBack);
                             break;
                         case MaterialType.Model:
-                            SendMaterials sendModel = new SendMaterials();
-                            sendModel.url = listMaterialData[0].mObj.DownloadPath;
-                            if (listMaterialData[0].mObj.cdnUrl.IsNotNullAndEmpty())
-                                sendModel.url = listMaterialData[0].mObj.cdnUrl;
-                            string jsonModel = JsonMapper.ToJson(sendModel);
-                            HttpTool.Instance.PostBundle(listLocalMaterialData[0], methodName, listLocalMaterialData[0].updateTime, jsonModel, CallBack);
+                            //SendMaterials sendModel = new SendMaterials();
+                            //sendModel.url = listMaterialData[0].mObj.DownloadPath;
+                            //if (listMaterialData[0].mObj.cdnUrl.IsNotNullAndEmpty())
+                            //    sendModel.url = listMaterialData[0].mObj.cdnUrl;
+                            //string jsonModel = JsonMapper.ToJson(sendModel);
+                            //HttpTool.Instance.PostBundle(listLocalMaterialData[0], methodName, listLocalMaterialData[0].updateTime, jsonModel, CallBack);
+                            HttpTool.Instance.GetLocalModel(listLocalMaterialData[0], CallBack);
                             break;
                         default:
                             break;
@@ -199,7 +202,7 @@ public class DownLoadManage : MonoSingleton<DownLoadManage>
         listDownLoading.Remove(mObj);
         NowDownLoad--;
 
-
+      
         //  Debug.Log(AllDownLoad  + "       AllDownLoad");
         if (AllDownLoad < 1)
             LoadManager.Instance.DownLoadFinish();

Assets/Scripts/Loader/LoadManager.cs

@@ -153,7 +153,7 @@ public class LoadManager : MonoSingleton<LoadManager>
                             listMaterialData.Add(new MaterialData(value, value.localSavePath));
                             break;
                         case MaterialType.Model:
-                            DownLoadManage.Instance.AddDownLoadData(new DownLoadMaterial(value, updateTime));
+                            DownLoadManage.Instance.AddLocalData(new DownLoadMaterial(value, updateTime));
                             break;
                         case MaterialType.Image:
                             DownLoadManage.Instance.AddLocalData(new DownLoadMaterial(value, updateTime));
@@ -191,11 +191,12 @@ public class LoadManager : MonoSingleton<LoadManager>
     /// </summary>
     /// <param name="mObj"></param>
     /// <param name="value"></param>
-    public void DownLoadEnd( DownLoadMaterial mObj,object value)
+    public void DownLoadEnd( DownLoadMaterial mObj,object value )
     {
-      //  Debug.Log(listMaterialData.Count +"    ++++++++++++++");
-      
-        listDownLoad.Add(mObj);
+        //  Debug.Log(listMaterialData.Count +"    ++++++++++++++");
+
+       
+            listDownLoad.Add(mObj);
         //  SaveData();
         isSave = true;
         listMaterialData.Add(new MaterialData(mObj.mObj, value));

Assets/Scripts/Loader/MaterialShow.cs

@@ -105,7 +105,7 @@ public class MaterialShow : MonoBehaviour
                 objText.GetComponent<SetTextV>().SetText(loaderObj.ToString());
                 objText.transform.SetParent(transform);
                 objText.name = value.name;
-                objText.transform.Identity();
+                objText.transform.LocalIdentity();
                 if (value.ObjectTransform.nowScale == Vector3.zero)
                 {
                     if (value.textPosition == "bottom")
@@ -134,7 +134,7 @@ public class MaterialShow : MonoBehaviour
                 objImage.GetComponent<SetImageV>().SetImage((Sprite)loaderObj);
                 objImage.transform.SetParent(transform);
                 objImage.name = value.name;
-                objImage.transform.Identity();
+                objImage.transform.LocalIdentity();
                 UIKit.GetPanel<EditorPanel>().dicSelectBackImage.Add(spoitName + value.name, objImage.GetComponent<SelectBJImage>());
                 break;
 
@@ -144,7 +144,7 @@ public class MaterialShow : MonoBehaviour
                 objVideo.GetComponent<VideoControl>().VideoURL = loaderObj.ToString();
                 objVideo.transform.SetParent(transform);
                 objVideo.name = value.name;
-                objVideo.transform.Identity();
+                objVideo.transform.LocalIdentity();
                 UIKit.GetPanel<EditorPanel>().dicSelectBackImage.Add(spoitName + value.name, objVideo.GetComponent<SelectBJImage>());
                 break;
 
@@ -155,7 +155,7 @@ public class MaterialShow : MonoBehaviour
                 GameObject objModel = model.Instantiate();
                 objModel.transform.SetParent(transform);
                 objModel.name = value.name;
-                objModel.transform.Identity();
+                objModel.transform.LocalIdentity();
                 break;
 
             default:
@@ -216,7 +216,7 @@ public class MaterialShow : MonoBehaviour
                     objText.GetComponent<SetTextV>().SetText(value.textContent);
                     objText.transform.SetParent(transform);
                     objText.name = value.name;
-                    objText.transform.Identity();
+                    objText.transform.LocalIdentity();
                     if (value.ObjectTransform.nowScale == Vector3.zero)
                     {
                         if (value.textPosition == "bottom")
@@ -239,6 +239,7 @@ public class MaterialShow : MonoBehaviour
                     else
                     {
                            SettingTransform(value.ObjectTransform);
+                       // value.ObjectTransform.SetObjectTransform(transform);
                     }
                     UIKit.GetPanel<EditorPanel>().dicSelectBackImage.Add(spoitName + value.name, objText.GetComponent<SelectBJImage>());
                     break;
@@ -249,7 +250,7 @@ public class MaterialShow : MonoBehaviour
                     objImage.GetComponent<SetImageV>().SetImage(loader.LoadSync<Sprite>(value.DownloadPath));
                     objImage.transform.SetParent(transform);
                     objImage.name = value.name;
-                    objImage.transform.Identity();
+                    objImage.transform.LocalIdentity();
                     SettingTransform(value.ObjectTransform);
                     UIKit.GetPanel<EditorPanel>().dicSelectBackImage.Add(spoitName + value.name, objImage.GetComponent<SelectBJImage>());
                     break;
@@ -260,7 +261,7 @@ public class MaterialShow : MonoBehaviour
                     objVideo.GetComponent<VideoControl>().VideoURL = value.DownloadPath;
                     objVideo.transform.SetParent(transform);
                     objVideo.name = value.name;
-                    objVideo.transform.Identity();
+                    objVideo.transform.LocalIdentity();
                     SettingTransform(value.ObjectTransform);
                     UIKit.GetPanel<EditorPanel>().dicSelectBackImage.Add(spoitName + value.name, objVideo.GetComponent<SelectBJImage>());
                     break;
@@ -270,7 +271,7 @@ public class MaterialShow : MonoBehaviour
                     GameObject objModel = model.Instantiate();
                     objModel.transform.SetParent(transform);
                     objModel.name = value.name;
-                    objModel.transform.Identity();
+                    objModel.transform.LocalIdentity();
                     SettingTransform(value.ObjectTransform);
                     break;
 

Assets/Scripts/Loader/TestAB.cs

@@ -18,7 +18,7 @@ public class TestAB : MonoBehaviour
     }
     private IEnumerator DoLoadAssetBundle()
     {
-        string url = Application.streamingAssetsPath + "/AssetBundles/Android/mrhall";
+        string url = Application.streamingAssetsPath + "/AssetBundles/Android/saloonmain";
         Debug.Log(url);
         using (UnityWebRequest request = UnityWebRequestAssetBundle.GetAssetBundle(url))
         {

Assets/Scripts/SandTable.cs

@@ -26,7 +26,7 @@ public class SandTable : MonoSingleton<SandTable>
         }
     
     }
-
+    
     /// <summary>
     ///  返回素材
     /// </summary>

Assets/Scripts/UI/EditorPanel.cs

@@ -280,16 +280,15 @@ namespace QFramework.MREditor
             GameObject targetShow = new GameObject("TargetShowObj");
             GameObject spoitObj = new GameObject(spoit.name);
             spoitObj.transform.parent = target.transform;
-            spoitObj.transform.Identity();
+            spoitObj.transform.LocalIdentity();
             targetShow.transform.parent = target.transform;
-            targetShow.transform.Identity();
+            targetShow.transform.LocalIdentity();
             VuforialTargetMove vuforialTarget = target.AddComponent<VuforialTargetMove>();
             vuforialTarget.isClose = true;
             vuforialTarget.showObjs.Add(spoitObj.transform);
             vuforialTarget.listObjs.Add(targetShow.AddComponent<TargetShowObj>());
             VuforialControl.Instance.list_Target.Add(vuforialTarget);
-
-          
+               
             dicObjs[spoit.name].Add(spoitObj);
 
             List<CMaterialValueShow> allMaterial = new List<CMaterialValueShow>();
@@ -315,69 +314,19 @@ namespace QFramework.MREditor
           
             GameObject cMVObj = new GameObject(cMValue.name);
             cMVObj.transform.parent = spoitObj.transform;
-            cMVObj.transform.Identity();   
+            cMVObj.transform.LocalIdentity();   
             CMaterialValueShow cMVShow = cMVObj.AddComponent<CMaterialValueShow>();
             cMVShow.spoitname = spoitObj.name;
             cMVShow.cMValue = cMValue;
             Debug.Log(cMVShow.name);
             dicObjs[spoitObj.name].Add(cMVObj);
-            SetObjMaterial(cMVObj, cMValue.objectTransform);
-        }
-
-        //public void LoadMaterialObj(MaterialObjValue item, GameObject spoitObj)
-        //{
-        //    var loader = ResLoader.Allocate();  
-
-        //    switch (item.type)
-        //    {
-        //        case MaterialType.Text:
-        //            StreamReader streamReader = new StreamReader(Application.streamingAssetsPath + item.DownloadPath);
-        //            string str = streamReader.ReadToEnd();
-        //            var mText = loader.LoadSync<GameObject>("Resources/Template/Prefab/Text");
-        //            GameObject objText = mText.Instantiate();
-        //            objText.GetComponent<SetTextV>().SetText(str);
-        //            objText.transform.SetParent(spoitObj.transform);
-        //            objText.name = item.name;
-        //            dicObjs[spoitObj.name].Add(objText);
-        //            SetObjMaterial(objText, item.objectTransform);
-        //            break;
-
-        //        case MaterialType.Image:
-
-        //            Sprite sprite = loader.LoadSync<Sprite>(item.DownloadPath);
-        //            var image = loader.LoadSync<GameObject>("Resources/Template/Prefab/Image");
-        //            GameObject obj = image.Instantiate();
-        //            obj.GetComponent<SetImageV>().SetImage(sprite);
-        //            obj.transform.SetParent(spoitObj.transform);
-        //            obj.name = item.name;
-        //            dicObjs[spoitObj.name].Add(obj);
-        //            SetObjMaterial(obj, item.objectTransform);
-        //            break;
-
-        //        case MaterialType.Video:
-        //            var video = loader.LoadSync<GameObject>("Resources/Template/Prefab/Video");
-        //            GameObject objVideo = video.Instantiate();
-        //            objVideo.GetComponent<VideoControl>().VideoURL = item.DownloadPath;
-        //            objVideo.transform.SetParent(spoitObj.transform);
-        //            objVideo.name = item.name;
-        //            dicObjs[spoitObj.name].Add(objVideo);
-        //            SetObjMaterial(objVideo, item.objectTransform);
-        //            break;
-
-        //        case MaterialType.Model:
-        //            var model = loader.LoadSync<GameObject>(item.DownloadPath);
-        //            GameObject objModel = model.Instantiate();
-        //            objModel.transform.SetParent(spoitObj.transform);
-        //            objModel.name = item.name;
-        //            dicObjs[spoitObj.name].Add(objModel);
-        //            SetObjMaterial(objModel, item.objectTransform);
-        //            break;
-
-        //        default:
-        //            break;
-        //    }
-        //}
+             SetObjMaterial(cMVObj, cMValue.objectTransform);
 
+            //if (cMValue.objectTransform != null)
+            //    cMValue.objectTransform.SetObjectTransform(cMVObj.transform);
+            //else
+            //    Debug.LogError(cMValue.name +" ObjectTransform  is NULL ");
+        }
         public void SetObjMaterial(GameObject obj, ObjectTransform objectData)
         {
             if (objectData == null)

Assets/Scripts/UI/EditorPanel/UIAddMaterial.cs

@@ -86,7 +86,7 @@ namespace QFramework.MREditor
                         
 			});
 			
-			UpLoadContent.GetComponent<RectTransform>().sizeDelta += new Vector2(0, (localMaterials.Count / 3 + 1) * 140 + 25);
+			UpLoadContent.GetComponent<RectTransform>().sizeDelta += new Vector2(0, (upLocalMaterials.Count / 3 + 1) * 140 + 25);
 			upLocalMaterials.ForEach(item =>
 			{
 				material.Instantiate()

Assets/Scripts/ViewUI/LoginPanel.cs

@@ -65,12 +65,14 @@ public class LoginPanel : SingletonMono<LoginPanel>
 
     private void Start()
     {
-        WriteLog.ConsoleLog.LogStart();
+      //  WriteLog.ConsoleLog.LogStart();
         sn.text = DeviceSN.Instance.SendSerialBy16();
         version.text = "V"+Application.version;
-      //  PlayerPrefs.DeleteAll();
-       // OnClickLogin();
-       
+        //  PlayerPrefs.DeleteAll();
+
+
+        OnClickLogin();
+
         //SendInit send = new SendInit();
         //send.sn = "ABD123456";
         //send.projectId = 10;
@@ -133,6 +135,8 @@ public class LoginPanel : SingletonMono<LoginPanel>
         m_Logn.onClick.AddListener(OnClickLogin);
         m_RemenberPwd.onValueChanged.AddListener(OnRemPwdValueChange);
 
+       
+      
     }
     #region UI监听事件
 
@@ -302,10 +306,12 @@ public class LoginPanel : SingletonMono<LoginPanel>
         loaginError.SetActive(false);
 
         //m_AccountStr = "yifei.yang@ivglass.com";
-        //m_PasswordStr = "123456Aa";
 
-        //m_AccountStr = "test_basic@ghz-tech.com";
-        //m_PasswordStr = "123456789";
+
+        m_AccountStr = "test_basic@ghz-tech.com";
+        m_PasswordStr = "123456789";
+
+
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))
         {
@@ -331,6 +337,7 @@ public class LoginPanel : SingletonMono<LoginPanel>
             PlayerPrefs.SetString("Password", "");
             PlayerPrefs.SetString("IsremPwd", "0");
         }
+
         //向服务器发送账号和密码进行验证
         Debug.Log("向服务器发送账号和密码进行登录");
 
@@ -447,8 +454,6 @@ public class LoginPanel : SingletonMono<LoginPanel>
             //Debug.Log(test);
             //CompositeMaterialValueTest test111 = JsonMapper.ToObject<CompositeMaterialValueTest>(test);
 
-
-
             List<CompositeMaterialValue> singleMaterials = JsonMapper.ToObject<List<CompositeMaterialValue>>(single);
             List<CompositeMaterialValue> libraryMaterials = JsonMapper.ToObject<List<CompositeMaterialValue>>(library);
 
@@ -511,7 +516,6 @@ public class LoginPanel : SingletonMono<LoginPanel>
 
     private void InitSceneValueCallBack(string message)
     {
-
         try
         {
             GameManager.Instance.text2.text = " 获取场景信息";
@@ -533,366 +537,3 @@ public class LoginPanel : SingletonMono<LoginPanel>
     }
 
 }
-
-//{
-//	"single": [{
-//			"id": 23,
-//			"name": "001",
-//			"type": 1,
-//			"describe": null,
-//			"materialList": [{
-//				"DownloadPath": "/file/user3/material/01.jpg",
-//				"textContent": "",
-//				"TextBJ": "",
-//				"type": "1"
-//			}],
-//			"icon": "/file/user3/material/01.jpg",
-//			"updateTime": 1647340398,
-//			"userId": 3,
-//			"position": null,
-//			"typesetting": null
-//		},
-//		{
-//			"id": 21,
-//			"name": "單個素材1",
-//			"type": 1,
-//			"describe": "單個素材1",
-//			"materialList": [{
-//				"ObjectTransform": "",
-//				"textPosition": "",
-//				"name": "",
-//				"DownloadPath": "/file/user3/material/6377286388979102755252586.jpg",
-//				"textContent": "",
-//				"TextBJ": "",
-//				"type": "1",
-//				"localSavePath": ""
-//			}],
-//			"icon": "/file/user3/material/6377286388979102755252586.jpg",
-//			"updateTime": 1647336538,
-//			"userId": 3,
-//			"position": null,
-//			"typesetting": null
-//		}
-//	],
-//	"library": [],
-//	"combination": [{
-//		"id": 22,
-//		"name": "素材組合1",
-//		"type": 4,
-//		"describe": "素材組合1",
-//		"materialList": [{
-//				"ObjectTransform": "",
-//				"textPosition": "",
-//				"name": "",
-//				"DownloadPath": "/file/user3/material/6377286388979102755252586.jpg",
-//				"textContent": "",
-//				"TextBJ": "",
-//				"type": "1",
-//				"localSavePath": ""
-//			},
-//			{
-//				"ObjectTransform": "",
-//				"textPosition": "",
-//				"name": "",
-//				"DownloadPath": "/file/user3/material/6377286389005666854938789.jpg",
-//				"textContent": "",
-//				"TextBJ": "",
-//				"type": "1",
-//				"localSavePath": ""
-//			},
-//			{
-//				"ObjectTransform": "",
-//				"textPosition": "",
-//				"name": "",
-//				"DownloadPath": "/file/user3/material/WEIXINTUPIAN_20211220205940.jpg",
-//				"textContent": "",
-//				"TextBJ": "",
-//				"type": "1",
-//				"localSavePath": ""
-//			},
-//			{
-//				"ObjectTransform": "",
-//				"textPosition": "top",
-//				"name": "",
-//				"DownloadPath": "",
-//				"textContent": "素材組合1",
-//				"TextBJ": "1",
-//				"type": 4,
-//				"localSavePath": ""
-//			}
-//		],
-//		"icon": "/file/user3/material/6377286388979102755252586.jpg",
-//		"updateTime": 1647336667,
-//		"userId": 3,
-//		"position": null,
-//		"typesetting": "1"
-//	}]
-//}
-
-//    {
-//	"data": {
-//		"listSpoit": [{
-//			"material": [{
-//				"materialList": [{
-//					"ObjectTransform": "",
-//					"textPosition": "",
-//					"name": "",
-//					"DownloadPath": "/file/user3/material/6377286388979102755252586.jpg",
-//					"textContent": "",
-//					"TextBJ": "",
-//					"type": "1",
-//					"localSavePath": ""
-//				}, {
-//					"ObjectTransform": "",
-//					"textPosition": "",
-//					"name": "",
-//					"DownloadPath": "/file/user3/material/6377286389005666854938789.jpg",
-//					"textContent": "",
-//					"TextBJ": "",
-//					"type": "1",
-//					"localSavePath": ""
-//				}, {
-//					"ObjectTransform": "",
-//					"textPosition": "",
-//					"name": "",
-//					"DownloadPath": "/file/user3/material/WEIXINTUPIAN_20211220205940.jpg",
-//					"textContent": "",
-//					"TextBJ": "",
-//					"type": "1",
-//					"localSavePath": ""
-//				}, {
-//					"ObjectTransform": "",
-//					"textPosition": "top",
-//					"name": "",
-//					"DownloadPath": "",
-//					"textContent": "素材組合1",
-//					"TextBJ": "1",
-//					"type": 4,
-//					"localSavePath": ""
-//				}],
-//				"icon": "/file/user3/material/6377286388979102755252586.jpg",
-//				"name": "素材組合1",
-//				"updateTime": 1647336667,
-//				"describe": "素材組合1",
-//				"id": 22,
-//				"typesetting": "1",
-//				"type": 4,
-//				"userId": 3
-//			}],
-//			"name": "Gongye",
-//			"projectId ": 1,
-//			"SpoitTransform": [{
-//				"X": 2.94,
-//				"Y": 3.91,
-//				"Z": -1
-//			}],
-//			"updateTime": 1647336681
-//		}, {
-//			"material": [{
-//				"materialList": [{
-//					"ObjectTransform": "",
-//					"textPosition": "",
-//					"name": "",
-//					"DownloadPath": "/file/user3/material/6377286388979102755252586.jpg",
-//					"textContent": "",
-//					"TextBJ": "",
-//					"type": "1",
-//					"localSavePath": ""
-//				}],
-//				"icon": "/file/user3/material/6377286388979102755252586.jpg",
-//				"name": "單個素材1",
-//				"updateTime": 1647336538,
-//				"describe": "單個素材1",
-//				"id": 21,
-//				"type": 1,
-//				"userId": 3
-//			}],
-//			"name": "111",
-//			"projectId ": 1,
-//			"SpoitTransform": [{
-//				"X": 1.36,
-//				"Y": 1.76,
-//				"Z": -1
-//			}],
-//			"updateTime": 1647336552
-//		}, {
-//			"material": [],
-//			"name": "新建景点",
-//			"projectId ": 1,
-//			"SpoitTransform": [{
-//				"T": -1,
-//				"X": 2.69,
-//				"Y": 2.18
-//			}],
-//			"updateTime": 1647332966
-//		}, {
-//			"material": [],
-//			"name": "新建景点",
-//			"projectId ": 1,
-//			"SpoitTransform": [{
-//				"T": -1,
-//				"X": 2.22,
-//				"Y": 1.84
-//			}],
-//			"updateTime": 1647332955
-//		}, {
-//			"material": [],
-//			"name": "Subway",
-//			"projectId ": 1,
-//			"SpoitTransform": [{
-//				"X": 5.5401708984375,
-//				"Y": 1.4301705932617188,
-//				"Z": -1
-//			}],
-//			"updateTime": 1647332926
-//		}, {
-//			"material": null,
-//			"name": "111",
-//			"projectId ": 1,
-//			"SpoitTransform": [{
-//				"X": 1.36,
-//				"Y": 1.76,
-//				"Z": -1
-//			}],
-//			"updateTime": 1647252097
-//		}, {
-//			"material": null,
-//			"name": "Chemical",
-//			"projectId ": 1,
-//			"SpoitTransform": [{
-//				"X": 6.03,
-//				"Y": 4.31,
-//				"Z": -1
-//			}],
-//			"updateTime": 1646118402
-//		}, {
-//			"material": null,
-//			"name": "Museum",
-//			"projectId ": 1,
-//			"SpoitTransform": [{
-//				"X": 4.88,
-//				"Y": 4.22,
-//				"Z": -1
-//			}],
-//			"updateTime": 1646118402
-//		}, {
-//			"material": null,
-//			"name": "Party",
-//			"projectId ": 1,
-//			"SpoitTransform": [{
-//				"X": 2.8,
-//				"Y": 2.95,
-//				"Z": -1
-//			}],
-//			"updateTime": 1646118402
-//		}],
-//		"sentiment": "medium",
-//		"image": "/file/user3/project/ae30dc129582477a26159e64e7b803e6.jpg",
-//		"name": "影创大厅",
-//		"updateTime": 1647313618,
-//		"describe": "场景详情",
-//		"vuforiaXML": null,
-//		"vuforiaDat": null,
-//		"status": 1
-//	}
-//}
-
-
-//{
-//	"data": {
-//		"listSpoit": [{
-//			"material": [{
-//				"materialList": [],
-//				"icon": "/file/user3/material/6377286388979102755252586.jpg",
-//				"name": "素材组合1",
-//				"updateTime": 1647401431,
-//				"describe": "素材组合1",
-//				"id": 28,
-//				"typesetting": "1",
-//				"type": 4,
-//				"userId": 3
-//			}],
-//			"name": "新建景点",
-//			"projectId ": 6,
-//			"SpoitTransform": [{
-//				"T": -1,
-//				"X": 3.8599998474121096,
-//				"Y": 2.279333190917969
-//			}],
-//			"updateTime": 1647401519
-//		}, {
-//			"material": [{
-//				"materialList": [{
-//					"ObjectTransform": {
-//						"nowScale": "",
-//						"startScale": "",
-//						"nowPos": "",
-//						"startRot": "",
-//						"nowRot": "",
-//						"startPos": ""
-//					},
-//					"textPosition": "",
-//					"name": "",
-//					"DownloadPath": "/file/user3/material/6377286389005666854938789.jpg",
-//					"textContent": "",
-//					"TextBJ": "",
-//					"type": "1",
-//					"localSavePath": ""
-//				}],
-//				"icon": "/file/user3/material/6377286389005666854938789.jpg",
-//				"name": "單個素材1",
-//				"updateTime": 1647401370,
-//				"describe": "單個素材1",
-//				"id": 27,
-//				"type": 1,
-//				"userId": 3
-//			}],
-//			"name": "新建景点",
-//			"projectId ": 6,
-//			"SpoitTransform": [{
-//				"T": -1,
-//				"X": 3.2599998474121095,
-//				"Y": 2.779333190917969
-//			}],
-//			"updateTime": 1647401504
-//		}, {
-//			"material": null,
-//			"name": "景点2",
-//			"projectId ": 6,
-//			"SpoitTransform": [{
-//				"X": 1.36,
-//				"Y": 1.76,
-//				"Z": -1
-//			}],
-//			"updateTime": 1647398911
-//		}, {
-//			"material": null,
-//			"name": "景点1",
-//			"projectId ": 6,
-//			"SpoitTransform": [{
-//				"X": 2.7599998474121095,
-//				"Y": 1.6593331909179687,
-//				"Z": -1
-//			}],
-//			"updateTime": 1647398911
-//		}, {
-//			"material": null,
-//			"name": "新建景点",
-//			"projectId ": 6,
-//			"SpoitTransform": [{
-//				"T": -1,
-//				"X": 2.7999998474121095,
-//				"Y": 2.7893331909179686
-//			}],
-//			"updateTime": 1647398874
-//		}],
-//		"sentiment": null,
-//		"image": "/file/user3/project/6377286389005666854938789.jpg",
-//		"name": "新建场景2",
-//		"updateTime": 1647398911,
-//		"describe": "新建场景2",
-//		"vuforiaXML": null,
-//		"vuforiaDat": null,
-//		"status": 0
-//	}
-//}

Assets/Scripts/ViewUI/SetTextV.cs

@@ -7,13 +7,29 @@ public class SetTextV : MonoBehaviour
 {
     public Text text;
     public Image bj;
-    public void SetText(string text)
+    public RectTransform textRect;
+    public RectTransform canvas;
+    private Vector2 canvasSize;
+
+    private void Start()
+    {
+        canvasSize = new Vector2(canvas.rect.width, canvas.rect.height);
+    }
+    public void SetText(string str)
     {
-        this.text.text = text;
+        if (str.Length > 100)
+            text.fontSize = 20 - ((str.Length - 100) / 50 + 1) * 2;
+        this.text.text = str;
     }
 
     public void SetBackGround (Sprite bj)
     {
         this.bj.sprite = bj;
     }
+
+    private void FixedUpdate()
+    {
+        canvasSize.y = textRect.sizeDelta.y + 60;
+        canvas.sizeDelta = canvasSize;
+    }
 }

Assets/Scripts/ViewUI/VuforialHint.cs

@@ -0,0 +1,50 @@
+/****************************
+  summary：
+
+****************************/
+using QFramework;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class VuforialHint : MonoSingleton<VuforialHint>
+{
+    public GameObject vuforiaHint;
+    public Text text;
+    private int num = 0;
+    private float time;
+
+    private void FixedUpdate()
+    {
+        time += Time.deltaTime;
+        num = (int)time;
+        switch (num%4)
+        {
+            case 0:
+                text.text = "等待扫描图片";
+                break;
+            case 1:
+                text.text = "等待扫描图片.";
+                break;
+            case 2:
+                text.text = "等待扫描图片..";
+                break;
+            case 3:
+                text.text = "等待扫描图片...";
+                break;
+            default:
+                break;
+        }
+    }
+
+    public void Show()
+    {
+        vuforiaHint.SetActive(true);
+    }
+
+    public void Close()
+    {
+        vuforiaHint.SetActive(false);
+    }
+}

Assets/Scripts/ViewUI/VuforialHint.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c992c8dcd5d86524cb5c680b5ab6c7f2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Voice/TestGetVoice.cs

@@ -73,22 +73,22 @@ public class TestGetVoice : MonoBehaviour
            
             try
             {
-                Debug.unityLogger.logEnabled = true;
+             //   Debug.unityLogger.logEnabled = true;
                // Debug.LogError("正在Start");
-                text.text = "Start";
-                Debug.unityLogger.logEnabled = true;
+              //  text.text = "Start";
+              //  Debug.unityLogger.logEnabled = true;
                 //通过该API来实例化导入的arr中对应的类
                 _ajc = new AndroidJavaObject("com.iflytek.mscv5plusdemo.AsrDemo");
-                Debug.unityLogger.logEnabled = true;
-                text.text = "实例化成功";
+              //  Debug.unityLogger.logEnabled = true;
+              //  text.text = "实例化成功";
               //  Debug.LogError(" 实例化成功");
                 testVoice = transform.GetComponent<TestVoice>();
                 bool success1 = _ajc.Call<bool>("InitAsr");
                 if (true == success1)
                 {
-                    Debug.unityLogger.logEnabled = true;
-                    text.text = "InitAsr成功";
-                    GameManager.Instance.text.text = "InitAsr成功";
+                    //Debug.unityLogger.logEnabled = true;
+                    //text.text = "InitAsr成功";
+                 //   GameManager.Instance.text.text = "InitAsr成功";
                     Debug.LogError(" InitAsr成功");
                     //请求成功
                     //   log.text = "";
@@ -98,7 +98,7 @@ public class TestGetVoice : MonoBehaviour
                     {
                         Debug.unityLogger.logEnabled = true;
                         text.text = "Buildsyntax成功";
-                        GameManager.Instance.text2.text = "Buildsyntax成功";
+                       // GameManager.Instance.text2.text = "Buildsyntax成功";
                         Debug.LogError(" Buildsyntax成功");
                         //请求成功
                         // log.text = "";
@@ -106,13 +106,13 @@ public class TestGetVoice : MonoBehaviour
                         if (true == success3)
                         {
                             text.text = "Recongnize  等待返回值";
-                            GameManager.Instance.text3.text = "Recongnize  等待返回值";
+                        //    GameManager.Instance.text3.text = "Recongnize  等待返回值";
                             Debug.LogError(" Recongnize  等待返回值");
                         }
                         else
                         {
                             text.text = "Recongnize  调用失败";
-                            GameManager.Instance.text4.text = "Recongnize  调用失败";
+                          //  GameManager.Instance.text4.text = "Recongnize  调用失败";
                             Debug.LogError(" Recongnize  调用失败");
                             ErrorLogPanel.Instance.Show(" 语音识别系统调用失败 ");
                             
@@ -124,7 +124,7 @@ public class TestGetVoice : MonoBehaviour
             catch (System.Exception e)
             {
                 ErrorLogPanel.Instance.Show(" 语音识别系统初始化失败 ");
-                GameManager.Instance.text.text = "语音识别系统初始化失败";
+              //  GameManager.Instance.text.text = "语音识别系统初始化失败";
                 Debug.LogError($"Func Expection{e}");
             }
         }
@@ -173,7 +173,7 @@ public class TestGetVoice : MonoBehaviour
     /// <param name="content"></param>
     public void FromAndroid(string content)
     {
-        Debug.Log(content);
+        //Debug.Log(content);
         text.text = content;
 
         if(content.Contains("当前")||content.Contains("开始")||content.Contains("结束"))
@@ -182,7 +182,7 @@ public class TestGetVoice : MonoBehaviour
         }
         else
         {
-            GameManager.Instance.text2.text = content;
+         //   GameManager.Instance.text2.text = content;
         }
        
         try
@@ -195,7 +195,7 @@ public class TestGetVoice : MonoBehaviour
                     testVoice.SettingVoice(AnalyzeResult(content));
             }
            // testVoice.SettingVoice(AnalyzeResult(content));
-            Debug.Log(result);
+          //  Debug.Log(result);
         }
         catch (System.Exception)
         {
@@ -206,13 +206,13 @@ public class TestGetVoice : MonoBehaviour
         if (content.Contains("Error") || content.Contains("结果"))
         {
             bool success = _ajc.Call<bool>("StartRecognize");
-            GameManager.Instance.text4.text = success.ToString();
+          //  GameManager.Instance.text4.text = success.ToString();
         }
     }
 
     private int AnalyzeResult(string str)
     {
-        GameManager.Instance.text.text = str;
+     //   GameManager.Instance.text.text = str;
 
         if (str.Contains("进") || str.Contains("进入") || str.Contains("进入到") || str.Contains("打开"))
         {

Assets/Scripts/Voice/TestVoice.cs

@@ -49,7 +49,7 @@ public class TestVoice : MonoBehaviour
         // 首先要获取对应ImageTarget的cube位置
 
         // 判断当前是否为扫图模式 
-        GameManager.Instance.text3.text = voice.ToString();
+       // GameManager.Instance.text3.text = voice.ToString();
 
         switch (voice)
         {

Assets/Scripts/Vuforial/VuforialControl.cs

@@ -15,9 +15,9 @@ public class VuforialControl : MonoSingleton<VuforialControl>
 
     public List<VuforialTargetMove> list_Target = new List<VuforialTargetMove>();
 
-    public Text text1;
-    public Text text2;
-    public Text text3;
+    //public Text text1;
+    //public Text text2;
+    //public Text text3;
     private VuforialTargetMove oldTarget = null;
     private Transform oldTargetobj = null;
 
@@ -78,6 +78,7 @@ public class VuforialControl : MonoSingleton<VuforialControl>
 
     public void ReplaceSceneSpoit(Transform targetObj, int num, int pointnum)
     {
+       
         if (oldTarget == null)
         {
             oldTarget = list_Target[num];
@@ -86,16 +87,22 @@ public class VuforialControl : MonoSingleton<VuforialControl>
         else if (oldTarget == list_Target[num])
         {
             // oldTarget.DirectClose();
-            oldTarget.Show(targetObj, pointnum);
+            oldTarget.ReplaceShow(targetObj, pointnum);
         }
         else if (oldTarget != list_Target[num])
-        {
+        { 
             oldTarget.DirectClose();
             oldTarget = list_Target[num];
             oldTarget.Show(targetObj, pointnum);
         }
+        GameManager.Instance.text2.text = oldTarget.name;
     }
 
+    public void Close()
+    {
+        oldTarget = null;
+
+    }
     IEnumerator  LoadARCamera( float timer)
     {
        

Assets/Scripts/Vuforial/VuforialTargetMove.cs

@@ -31,7 +31,7 @@ public class VuforialTargetMove : MonoBehaviour
     public bool is6Dof = true;
     public float interval = 2;
 
-    public float closeInterval = 30;
+    public float closeInterval = 3600f;
     ///// <summary>
     ///// 每张图对应显示物体的 位置差
     ///// </summary>
@@ -184,11 +184,12 @@ public class VuforialTargetMove : MonoBehaviour
                         for (int i = 0; i < showObjs.Count; i++)
                         {
                             showObjs[i].gameObject.SetActive(true);
+                            GameManager.Instance.text.text = showObjs[i].name;
                         }
-                       // GameManager.Instance.text2.text = "Show";
+                        GameManager.Instance.text2.text = "Show";
                         SetShowObjRot();
 
-                      //  GameManager.Instance.text2.text = "OnlySet";
+                        GameManager.Instance.text2.text = "OnlySet";
 
                         //   GameManager.Instance.uiMove.OpenEditor(transform);
                         UIKit.GetPanel<EditorPanel>().SelectSpoitObj(showObjs[0].name);
@@ -218,10 +219,12 @@ public class VuforialTargetMove : MonoBehaviour
     public void Show(Transform targetObj, int num)
     {
         openT = 0;
+        onleyT = 0;
         ReplaceShow(targetObj, num);
     }
     public void ReplaceShow(Transform targetObj, int num)
     {
+        VuforialHint.Instance.Close();
         Debug.Log("@@@@" + transform.name);
         isClose = false;
         this.targetObj = targetObj;
@@ -229,7 +232,7 @@ public class VuforialTargetMove : MonoBehaviour
         state = true;
         closeT = 0;
         OnlySet = true;
-        onleyT = 0;
+       
 
         if (listPosZ == null)
         {
@@ -276,7 +279,7 @@ public class VuforialTargetMove : MonoBehaviour
     {
         //showObj.parent = transform;
         //showObj.localEulerAngles = new Vector3(0, -90, 0);
-
+        VuforialHint.Instance.Show();
         for (int i = 0; i < showObjs.Count; i++)
         {
             showObjs[i].gameObject.SetActive(false);
@@ -284,7 +287,7 @@ public class VuforialTargetMove : MonoBehaviour
         closeT = 0;
         state = false;
         isClose = true;
-
+        VuforialControl.Instance.Close();
         //   GameManager.Instance.uiMove.CloseEditor();
         // GameManager.Instance.SetIsEditor(true);
         //  gameObject.SetActive(false);

Assets/Scripts/WriteLog.cs

@@ -31,7 +31,10 @@ public class WriteLog : MonoBehaviour
             return consoleLog;
         }
     }
-
+    private void Start()  
+    {
+        LogStart();
+    }
     public void LogStart()
     {
         //Debug.LogError("开始写入日志");

Assets/StreamingAssets/Android.manifest

@@ -1,7 +0,0 @@
-ManifestFileVersion: 0
-CRC: 870957123
-AssetBundleManifest:
-  AssetBundleInfos:
-    Info_0:
-      Name: car
-      Dependencies: {}

Assets/StreamingAssets/Android.manifest.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 80b486c5a825f2e42bba5ff4df98a4cd
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Android.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 66406fd7dad296b45bed3187047b02fd
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/AssetBundles/Android/mrhall.manifest

@@ -1,71 +0,0 @@
-ManifestFileVersion: 0
-CRC: 3701939689
-Hashes:
-  AssetFileHash:
-    serializedVersion: 2
-    Hash: ebfe92337059929c0acbf39ec785c65f
-  TypeTreeHash:
-    serializedVersion: 2
-    Hash: 090b477a1ae94b11837c7bd6fe05abe6
-HashAppended: 0
-ClassTypes:
-- Class: 1
-  Script: {instanceID: 0}
-- Class: 4
-  Script: {instanceID: 0}
-- Class: 21
-  Script: {instanceID: 0}
-- Class: 23
-  Script: {instanceID: 0}
-- Class: 28
-  Script: {instanceID: 0}
-- Class: 33
-  Script: {instanceID: 0}
-- Class: 43
-  Script: {instanceID: 0}
-- Class: 48
-  Script: {instanceID: 0}
-- Class: 74
-  Script: {instanceID: 0}
-- Class: 82
-  Script: {instanceID: 0}
-- Class: 83
-  Script: {instanceID: 0}
-- Class: 90
-  Script: {instanceID: 0}
-- Class: 91
-  Script: {instanceID: 0}
-- Class: 95
-  Script: {instanceID: 0}
-- Class: 111
-  Script: {instanceID: 0}
-- Class: 114
-  Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
-- Class: 114
-  Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
-- Class: 114
-  Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
-- Class: 114
-  Script: {fileID: 11500000, guid: 2a16748d9461eae46a725db9776d5390, type: 3}
-- Class: 115
-  Script: {instanceID: 0}
-- Class: 137
-  Script: {instanceID: 0}
-- Class: 198
-  Script: {instanceID: 0}
-- Class: 199
-  Script: {instanceID: 0}
-- Class: 212
-  Script: {instanceID: 0}
-- Class: 213
-  Script: {instanceID: 0}
-- Class: 215
-  Script: {instanceID: 0}
-- Class: 221
-  Script: {instanceID: 0}
-- Class: 320
-  Script: {instanceID: 0}
-SerializeReferenceClassIdentifiers: []
-Assets:
-- Assets/Resources/Model/MRHall.prefab
-Dependencies: []

Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from SK-20211220VCWK at 2022/7/12 11:36:10
+Build from SK-20211220VCWK at 2022/11/21 18:12:58

Assets/StreamingAssets/mrzhanting.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ad8e3efe9383fdb4a8ca284546f8fd39
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ProjectSettings/EditorBuildSettings.asset

@@ -11,4 +11,7 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/SDK/Examples/CubeArray/Scene/Cube.unity
     guid: 95dc8bd29883d684399be748b472c869
+  - enabled: 0
+    path: Assets/Scenes/test.unity
+    guid: 77ba8f5cbbfed0149ac6e01fccd77446
   m_configObjects: {}

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: ghz
-  productName: MRNavigator
+  productName: "\u57FA\u7840\u7248MRNavigatorManager"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -131,7 +131,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.1.0
+  bundleVersion: 2.0.9
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -175,7 +175,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.ghz.navigatormhl
+    Android: com.ghz.navigatormanager
   buildNumber: {}
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 26
@@ -275,7 +275,7 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: d182e41a0380b2c40bf0bb1e74e80c55, type: 3}
+      m_Icon: {fileID: 2800000, guid: 4477ace904094f744b364de8cbc83a68, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0