整合第一版 完成 旧通讯

Assets/2.0/GameScene.cs

@@ -1,13 +1,16 @@
+using LitJson;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using XRTool.Util;
 
 public class GameScene : MonoSingleton<GameScene>
 {
+    public GameObject o20;
+    public GameObject o21;
     public GameObject Canvas;
     private void Start()
     {
-        
     }
 
     public List<GameObject> UIList = new List<GameObject>();
@@ -17,7 +20,9 @@ public class GameScene : MonoSingleton<GameScene>
         (UserSceneUI.Instance).show();
         UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
         UIManager.Instance.HideUI(UINameConfig.LoginPanel);
-
+        o20.SetActive(true);
+        o21.SetActive(false);
+        o20.transform.parent.gameObject.SetActive(true);
     }
 
     public void gotoScenes(string id)

Assets/2.0/Resources/Template/Prefab/Tip.prefab

@@ -0,0 +1,292 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2828833021118674287
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2828833021118674286}
+  - component: {fileID: 2828833021118674280}
+  - component: {fileID: 2828833021118674281}
+  m_Layer: 0
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2828833021118674286
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021118674287}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2828833022409846366}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2828833021118674280
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021118674287}
+  m_CullTransparentMesh: 0
+--- !u!114 &2828833021118674281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021118674287}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 669f8168965942c4ba600ec149dbcbdf, type: 3}
+  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!1 &2828833021312147518
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2828833021312147513}
+  - component: {fileID: 2828833021312147514}
+  - component: {fileID: 2828833021312147515}
+  m_Layer: 0
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2828833021312147513
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021312147518}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2828833022409846366}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 51.1, y: -52.8}
+  m_SizeDelta: {x: -99.9, y: 395.3}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &2828833021312147514
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021312147518}
+  m_CullTransparentMesh: 0
+--- !u!114 &2828833021312147515
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021312147518}
+  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: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 64
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 64
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u70B9\u51FB\u6B64\u533A\u57DF\u8FDB\u884C\u79FB\u52A8\u7269\u4F53\u7EC4"
+--- !u!1 &2828833022409846367
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2828833022409846366}
+  - component: {fileID: 2828833022409846363}
+  - component: {fileID: 2828833022409846360}
+  - component: {fileID: 2828833022409846361}
+  m_Layer: 0
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2828833022409846366
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833022409846367}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2828833021118674286}
+  - {fileID: 2828833021312147513}
+  m_Father: {fileID: 2828833022510646942}
+  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.2321, y: 0.246}
+  m_SizeDelta: {x: 459.0534, y: 501.747}
+  m_Pivot: {x: 0, y: 1}
+--- !u!223 &2828833022409846363
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833022409846367}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &2828833022409846360
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833022409846367}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 1
+--- !u!114 &2828833022409846361
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833022409846367}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!1 &2828833022510646943
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2828833022510646942}
+  m_Layer: 0
+  m_Name: Tip
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2828833022510646942
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833022510646943}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2828833022409846366}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/2.0/Resources/Template/Prefab/Tip.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8b1901770475e604a94a507a00c2e1a2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/2.0/Resources/Template/Prefab/TipJD.prefab

@@ -0,0 +1,292 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2828833021118674287
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2828833021118674286}
+  - component: {fileID: 2828833021118674280}
+  - component: {fileID: 2828833021118674281}
+  m_Layer: 0
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2828833021118674286
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021118674287}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2828833022409846366}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2828833021118674280
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021118674287}
+  m_CullTransparentMesh: 0
+--- !u!114 &2828833021118674281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021118674287}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 669f8168965942c4ba600ec149dbcbdf, type: 3}
+  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!1 &2828833021312147518
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2828833021312147513}
+  - component: {fileID: 2828833021312147514}
+  - component: {fileID: 2828833021312147515}
+  m_Layer: 0
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2828833021312147513
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021312147518}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2828833022409846366}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 51.1, y: -52.8}
+  m_SizeDelta: {x: -99.9, y: 395.3}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &2828833021312147514
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021312147518}
+  m_CullTransparentMesh: 0
+--- !u!114 &2828833021312147515
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833021312147518}
+  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: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 64
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 64
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u70B9\u51FB\u6B64\u533A\u57DF\u8FDB\u884C\u79FB\u52A8\u666F\u70B9"
+--- !u!1 &2828833022409846367
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2828833022409846366}
+  - component: {fileID: 2828833022409846363}
+  - component: {fileID: 2828833022409846360}
+  - component: {fileID: 2828833022409846361}
+  m_Layer: 0
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2828833022409846366
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833022409846367}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2828833021118674286}
+  - {fileID: 2828833021312147513}
+  m_Father: {fileID: 2828833022510646942}
+  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.2321, y: 0.246}
+  m_SizeDelta: {x: 459.0534, y: 501.747}
+  m_Pivot: {x: 0, y: 1}
+--- !u!223 &2828833022409846363
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833022409846367}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &2828833022409846360
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833022409846367}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 1
+--- !u!114 &2828833022409846361
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833022409846367}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!1 &2828833022510646943
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2828833022510646942}
+  m_Layer: 0
+  m_Name: TipJD
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2828833022510646942
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2828833022510646943}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2828833022409846366}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/2.0/Resources/Template/Prefab/TipJD.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9a86aed37d3ea4e4d8eaabdc3bb91419
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/2.0/Tools/HttpAction.cs

@@ -12,17 +12,30 @@ public class HttpAction :Singleton<HttpAction>
     public const string baseurl = "http://office.ghz-tech.com:9904/api";
     public const string baseurl20 = "https://office.ghz-tech.com:3424/api";
     public const string baseurvideo = "https://office.ghz-tech.com:3424/";
+
+    //初始化场景
     public const string client_snInfo = "/client/snInfo";
 
-    public const string project_detail = "/project/detail";
+    //public const string project_detail = "/project/detail";
+    //初始化景点 
     public const string sn_init = "/sn/init";
-
+    //下载
     public const string file_download = "/file/download";
 
+    //获取资源 
     public const string material_init = "/material/init";
 
+    //获取账号下场景id 
     public const string project_init = "/project/index";
-    public const string viewpoint_init = "/viewpoint/init";
 
-    
+    //保存景点位
+    public const string viewpoint_update = "/viewpoint/update";
+
+    //电量
+    public const string sn_electricity = "/sn/electricity";
+
+    //识别的景点
+    public const string sn_viewpoint = "/sn/viewpoint";
+
+
 }

Assets/2.0/Tools/LoadManager.cs

@@ -82,6 +82,7 @@ public class LoadManager : Singleton<LoadManager>
                     }
                     Debug.Log(" LoadManager  "+ dName + "  Length :  "+ downList[dName].downLoadData.Length);
                     model.SetData(downList[dName].downLoadData);
+                    callback.Invoke(model.prefabModel);
                 }
 
             }

Assets/2.0/User/Model/ModelItem.cs

@@ -31,8 +31,8 @@ public class ModelItem
             {
                 _model = new GameObject(name);
                 _model.transform.parent = modelList.transform;
-                _model.transform.localPosition = getInfoPos();
-                _model.transform.localEulerAngles = getInfoEul();
+               // _model.transform.localPosition = getInfoPos();
+              //  _model.transform.localEulerAngles = getInfoEul();
 
                 Debug.Log(" ModelName>>>>  " + name + "   Type    " + type);
 
@@ -43,6 +43,7 @@ public class ModelItem
 
     public void init()
     {
+
         if (modelType != ModelType.Video)
             LoadManager.Instance.load(this, (float f) =>
             {
@@ -52,12 +53,11 @@ public class ModelItem
 
             }, (GameObject obj) =>
             {
-
-
-                obj.transform.transform.parent = _model.transform;
-
-                obj.transform.localPosition = Vector3.zero;
-                obj.transform.localEulerAngles = Vector3.zero;
+                _model = prefabModel;
+                obj.name ="加载出来的模型-----"+ obj.name;
+               // obj.transform.parent = _model.transform;
+             //   obj.transform.localPosition = getInfoPos(); 
+              //  obj.transform.localEulerAngles = getInfoEul(); 
 
             });
         else
@@ -79,15 +79,16 @@ public class ModelItem
 
     Vector3 getInfoPos()
     {
+        Debug.Log("获取modelItem坐标==》"+prefabModel.name+ objectTransform.nowPos);
         //return Vector3.zero;
-        if (objectTransform.nowPos == Vector3.zero)
+        if (objectTransform.nowPos == Vector3.zero&& prefabModel.transform.localPosition!=Vector3.zero)
             return objectTransform.startPos;
         else
             return objectTransform.nowPos;
     }
     Vector3 getInfoEul()
     {
-        if (objectTransform.nowRot == Vector3.zero)
+        if (objectTransform.nowRot == Vector3.zero && prefabModel.transform.localEulerAngles != Vector3.zero)
             return objectTransform.startRot;
         else
             return objectTransform.nowRot;
@@ -162,8 +163,8 @@ public class ModelItem
         if (Version == null)
             Version = Application.version.ToString();
 
-        if (Model != null)
-            Debug.Log(" 添加模型 " + name);
+       // if (Model != null)
+      //      Debug.Log(" 添加模型 " + name);
     }
 
     public void SetData(byte[] data)
@@ -204,7 +205,15 @@ public class ModelItem
 
     public void initModelObj()
     {
-        _model.transform.localPosition = getInfoPos();
-        _model.transform.localEulerAngles = getInfoEul();
+        if (getInfoPos() != Vector3.zero)
+        {
+            prefabModel.transform.localPosition = getInfoPos();
+        }
+        if (getInfoEul() != Vector3.zero)
+        {
+            prefabModel.transform.localEulerAngles = getInfoPos();
+        }
+        // prefabModel.transform.localPosition = getInfoPos();
+        //  prefabModel.transform.localEulerAngles = getInfoEul();
     }
 }

Assets/2.0/User/Model/ModelList.cs

@@ -1,6 +1,8 @@
+using SC.XR.Unity.Module_InputSystem;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using XRTool.Util;
 
 public class ModelList: System.ICloneable
 {
@@ -41,24 +43,30 @@ public class ModelList: System.ICloneable
 
     public void init(bool isAdd)
     {
-        if(_model==null)
+        if (_model==null)
         {
             _model = new GameObject(name);
             _model.transform.parent = materalLibrary;
-            
-        }else
+
+            InitObjectTransform();
+            initModelObj();
+        }
+
+        if (!isAdd&& spotsItem!=null)
         {
-            _model = new GameObject(name);
+            //_model = new GameObject("进入场景----" + name);
             _model.transform.parent = spotsItem.SpotsObj.transform;
+
+            //InitObjectTransform();
+            initModelObj();
         }
         _model.SetActive(isAdd);
-        InitObjectTransform();
-        initModelObj();
+
         if(isAdd)
         {
             for (int i = 0; i < materialList.Count; i++)
             {
-                materialList[i].init();
+               materialList[i].init();
             }
         }
     }
@@ -409,7 +417,36 @@ public class ModelList: System.ICloneable
 
     public void initModelObj()
     {
-        _model.transform.localPosition = getInfoPos();
-        _model.transform.localEulerAngles = getInfoEul();
+        if (getInfoPos() != Vector3.zero)
+        {
+            _model.transform.localPosition = getInfoPos();
+        }
+        if (getInfoEul() != Vector3.zero)
+        {
+            _model.transform.localEulerAngles = getInfoPos();
+        }
+        if (!_model.GetComponent<BoxCollider>())
+        {
+            BoxCollider box = _model.AddComponent<BoxCollider>();
+            box.center = new Vector3(0, -0.3f, 0);
+            box.size = new Vector3(0.5f, 0.5f, 0.01f);
+            BoundingBox bb = _model.AddComponent<BoundingBox>();
+            bb.ActiveHandle = BoundingBox.HandleType.None;
+            _model.AddComponent<NearInterationGrabbable>();
+            _model.AddComponent<ManipulationHandler>();
+            GameObject ob =GameObject.Instantiate( Resources.Load<GameObject>("Template/Prefab/Tip"),_model.transform);
+            ob.transform.localPosition = new Vector3(0, -0.3f, 0);// Vector3.zero;
+            ob.transform.localEulerAngles = Vector3.zero;
+            ob.transform.localScale = Vector3.one;
+            ob.SetActive(false);
+            TimerMgr.Instance.CreateTimer(()=> { 
+                    ob.SetActive(GameManager.m_IsStartEditorzu);
+                    box.enabled = GameManager.m_IsStartEditorzu;
+                bb.enabled = GameManager.m_IsStartEditorzu;
+            },1,-1);
+        }
+        // _model.transform.localPosition = getInfoPos();
+        //  _model.transform.localEulerAngles = getInfoEul();
     }
+
 }

Assets/2.0/User/Spots/SpotsItem.cs

@@ -1,4 +1,5 @@
 using LitJson;
+using SC.XR.Unity.Module_InputSystem;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -22,7 +23,7 @@ public class SpotsItem
     public UserSceneItem usi;
     //景点中的模型
     public Dictionary<string, ModelList> modelList = new Dictionary<string, ModelList>();
-
+    public GameObject VuforiaItem;
     GameObject _spotsObj;
     public GameObject SpotsObj
     {
@@ -30,10 +31,35 @@ public class SpotsItem
         {
             if (_spotsObj == null)
             {
-                _spotsObj = new GameObject(name);
-                _spotsObj.transform.parent = usi.SceneModel.transform;
-                _spotsObj.transform.localPosition = Vector3.zero;
-                _spotsObj.transform.localEulerAngles = Vector3.zero;
+                VuforiaItem = new GameObject("Vufroia--"+name);
+                VuforiaItem.transform.parent = usi.SceneModel.transform;
+                VuforiaItem.transform.localPosition = Vector3.zero;
+                VuforiaItem.transform.localEulerAngles = Vector3.zero;
+                VuforiaItem.SetActive(false);
+                _spotsObj = new GameObject("景点--"+name);
+                _spotsObj.transform.parent = VuforiaItem.transform;
+
+
+                if (!_spotsObj.GetComponent<BoxCollider>())
+                {
+                    BoxCollider box = _spotsObj.AddComponent<BoxCollider>();
+                    box.center = new Vector3(0, -0.3f, 0);
+                    box.size = new Vector3(0.5f, 0.5f, 0.01f);
+                    BoundingBox bb = _spotsObj.AddComponent<BoundingBox>();
+                    bb.ActiveHandle = BoundingBox.HandleType.None;
+                    _spotsObj.AddComponent<NearInterationGrabbable>();
+                    _spotsObj.AddComponent<ManipulationHandler>();
+                    GameObject ob = GameObject.Instantiate(Resources.Load<GameObject>("Template/Prefab/TipJD"), _spotsObj.transform);
+                    ob.transform.localPosition = new Vector3(0, -0.3f, 0);// Vector3.zero;
+                    ob.transform.localEulerAngles = Vector3.zero;
+                    ob.transform.localScale = Vector3.one;
+                    ob.SetActive(false);
+                    TimerMgr.Instance.CreateTimer(() => {
+                        ob.SetActive(GameManager.m_IsStartEditorJD);
+                        box.enabled = GameManager.m_IsStartEditorJD;
+                        bb.enabled = GameManager.m_IsStartEditorJD;
+                    }, 1, -1);
+                }
             }
             return _spotsObj;
         }
@@ -70,16 +96,28 @@ public class SpotsItem
             Debug.Log("OnTargetStatusChanged 发现 " + behaviour.TargetName + "status ==>" + status.Status.ToString());
             if(obVuforia.TargetName == behaviour.TargetName)
             {
-                SpotsObj.SetActive(true);
+                VuforiaItem.SetActive(true);
 
                 TimerMgr.Instance.CreateTimer(()=> {
-                    SpotsObj.transform.position = obj.transform.position;
-                    SpotsObj.transform.eulerAngles = obj.transform.eulerAngles;
+                    VuforiaItem.transform.position = obj.transform.position;
+                    VuforiaItem.transform.eulerAngles = obj.transform.eulerAngles;
                     Debug.Log("OnTargetStatusChanged 发现 " + obj.transform.position + "status ==>" + obj.transform.eulerAngles);
                 }, 0.1f,10);
             }
 
             UserSceneUI.Instance.obj.GetComponent<UserChooseScene>().st.SetActive(false);
+
+            SendNetConnectPointTrigger sendNet = new SendNetConnectPointTrigger();
+
+            sendNet.sn = SendSN.GetSN();
+            //sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+
+            sendNet.projectId = int.Parse(usi.id);
+            sendNet.name = name;
+            string jsonData = JsonMapper.ToJson(sendNet);
+
+            Debug.Log(jsonData);
+            HttpTool.Instance.Post("/sn/viewpoint", jsonData, (string msg)=> { });
         }
         else
         {
@@ -97,7 +135,7 @@ public class SpotsItem
         if (data["nowScale"] != null && (data["nowScale"]["x"].ToString() != "0" || data["nowScale"]["y"].ToString() != "0" || data["nowScale"]["z"].ToString() != "0"))
         {
 
-            SpotsObj.transform.localScale = new Vector3(float.Parse(data["spoitTf"]["nowScale"]["x"].ToString()), float.Parse(data["nowScale"]["y"].ToString()), float.Parse(data["spoitTf"]["nowScale"]["z"].ToString()));
+            SpotsObj.transform.localScale = new Vector3(float.Parse(data["nowScale"]["x"].ToString()), float.Parse(data["nowScale"]["y"].ToString()), float.Parse(data["nowScale"]["z"].ToString()));
 
         }
         else
@@ -131,10 +169,10 @@ public class SpotsItem
 
     public void init()
     {
-        _spotsObj.transform.parent = usi.SceneModel.transform;
-        _spotsObj.transform.localPosition = Vector3.zero;
-        _spotsObj.transform.localEulerAngles = Vector3.zero;
-        SpotsObj.SetActive(false);
+          VuforiaItem.transform.parent = usi.SceneModel.transform;
+          VuforiaItem.transform.localPosition = Vector3.zero;
+          VuforiaItem.transform.localEulerAngles = Vector3.zero;
+        VuforiaItem.SetActive(false);
     }
 
     public void show()

Assets/2.0/User/UserScene/UserSceneItem.cs

@@ -39,7 +39,7 @@ public class UserSceneItem
         vufroiaTrigger.init();
         foreach (var v in SpotsList.Values)
         {
-            v.SpotsObj.SetActive(false);
+            v.VuforiaItem.SetActive(false);
             v.show();
         }
     }

Assets/2.0/User/UserScene/UserSceneManager.cs

@@ -116,8 +116,13 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
                             {
                                 ModelList modellist = ModelManager.Instance.GetModelList(int.Parse(msg["listSpoit"][i]["material"][j]["id"].ToString()));
                                 modellist.objectTransform = JsonConvert.DeserializeObject<ObjectTransform>(msg["listSpoit"][i]["material"][j]["objectTransform"].ToJson());
+                           
                                 modellist.spotsItem = si;
-                                modellist.init(false);
+                                modellist.init(false); 
+                                for (int l = 0; l < modellist.materialList.Count; l++)
+                                {
+                                    modellist.materialList[l].modelList = modellist.Model;
+                                }
                                 si.modelList.Add(msg["listSpoit"][i]["material"][j]["id"].ToString(), modellist);
                                
                                 if (msg["listSpoit"][i]["material"][j]["materialList"]!=null&& msg["listSpoit"][i]["material"][j]["materialList"].IsArray)
@@ -151,11 +156,13 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
             callback?.Invoke(true);
         }
     }
-
+    public string nowId;
     public void gotoScene(string id)
     {
+        nowId = id;
         if (SceneList.ContainsKey(id))
         SceneList[id].load();
+        DataManager.Instance.ProjectID = int.Parse(id);
     }
 
     public Dictionary<string, UserSceneItem> GetScenes()

Assets/Resources/UI/LoginPanel.prefab

@@ -1,5 +1,81 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1981620923785946332
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2326767386283024329}
+  - component: {fileID: 3767945261218407633}
+  - component: {fileID: 2163523849094923812}
+  m_Layer: 5
+  m_Name: Checkmark
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2326767386283024329
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1981620923785946332}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 639620756319199898}
+  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, y: 0}
+  m_SizeDelta: {x: 90, y: 90}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3767945261218407633
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1981620923785946332}
+  m_CullTransparentMesh: 0
+--- !u!114 &2163523849094923812
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1981620923785946332}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 0c7a9fefb8aa54843948b2501705e354, type: 3}
+  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!1 &2731406766155477846
 GameObject:
   m_ObjectHideFlags: 0
@@ -8,78 +84,479 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 195160224872353742}
-  - component: {fileID: 6849887845183846663}
-  - component: {fileID: 6568010226039706901}
+  - component: {fileID: 195160224872353742}
+  - component: {fileID: 6849887845183846663}
+  - component: {fileID: 6568010226039706901}
+  m_Layer: 5
+  m_Name: Placeholder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &195160224872353742
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2731406766155477846}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.37248, y: 0.37248, z: 0.37248}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 494014861522998579}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -155, y: 2}
+  m_SizeDelta: {x: -73.7822, y: 19.680033}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6849887845183846663
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2731406766155477846}
+  m_CullTransparentMesh: 0
+--- !u!114 &6568010226039706901
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2731406766155477846}
+  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: 0.43529412, g: 0.43529412, b: 0.43529412, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 61
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 120
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u8BF7\u8F93\u5165\u5BC6\u7801"
+--- !u!1 &2738037709405574357
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 639620756319199898}
+  - component: {fileID: 4451809457685983885}
+  - component: {fileID: 9110468124439544984}
+  m_Layer: 5
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &639620756319199898
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2738037709405574357}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2326767386283024329}
+  m_Father: {fileID: 251745105086036184}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 45.15503, y: -72}
+  m_SizeDelta: {x: 90, y: 90}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4451809457685983885
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2738037709405574357}
+  m_CullTransparentMesh: 0
+--- !u!114 &9110468124439544984
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2738037709405574357}
+  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.13725491, g: 0.13725491, b: 0.13725491, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  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!1 &3447183503046799720
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 324766431993203869}
+  - component: {fileID: 8970005880377002372}
+  m_Layer: 5
+  m_Name: Choose2.0
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &324766431993203869
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3447183503046799720}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.87184495, y: 0.87184495, z: 2.9709}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1212326118269989593}
+  - {fileID: 4451923321106693096}
+  m_Father: {fileID: 6791783665993114135}
+  m_RootOrder: 9
+  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: 145, y: -137}
+  m_SizeDelta: {x: 364.1, y: 143.1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8970005880377002372
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3447183503046799720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5309147082344688946}
+  toggleTransition: 1
+  graphic: {fileID: 7983928280166694802}
+  m_Group: {fileID: 5293653666296219414}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_IsOn: 0
+--- !u!1 &4389335891008359781
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4451923321106693096}
+  - component: {fileID: 3835970136496750436}
+  - component: {fileID: 1447528620699190989}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4451923321106693096
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4389335891008359781}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 324766431993203869}
+  m_RootOrder: 1
+  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: 50.43, y: 0}
+  m_SizeDelta: {x: 345.4, y: 127.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3835970136496750436
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4389335891008359781}
+  m_CullTransparentMesh: 0
+--- !u!114 &1447528620699190989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4389335891008359781}
+  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: 0.70980394, g: 0.70980394, b: 0.70980394, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 61
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 110
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 2.0
+--- !u!1 &4592786541019745420
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3390612464190820721}
+  - component: {fileID: 3613738478095265819}
+  - component: {fileID: 1894351028026412184}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3390612464190820721
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4592786541019745420}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 251745105086036184}
+  m_RootOrder: 1
+  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: 50.43, y: 0}
+  m_SizeDelta: {x: 345.4, y: 127.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3613738478095265819
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4592786541019745420}
+  m_CullTransparentMesh: 0
+--- !u!114 &1894351028026412184
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4592786541019745420}
+  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: 0.70980394, g: 0.70980394, b: 0.70980394, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 61
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 110
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 2.1
+--- !u!1 &4605125755228965885
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1212326118269989593}
+  - component: {fileID: 1580804375567607636}
+  - component: {fileID: 5309147082344688946}
   m_Layer: 5
-  m_Name: Placeholder
+  m_Name: Background
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &195160224872353742
+--- !u!224 &1212326118269989593
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2731406766155477846}
+  m_GameObject: {fileID: 4605125755228965885}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.37248, y: 0.37248, z: 0.37248}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 494014861522998579}
+  m_Children:
+  - {fileID: 2733241052121733299}
+  m_Father: {fileID: 324766431993203869}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -155, y: 2}
-  m_SizeDelta: {x: -73.7822, y: 19.680033}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 45.15503, y: -72}
+  m_SizeDelta: {x: 90, y: 90}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6849887845183846663
+--- !u!222 &1580804375567607636
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2731406766155477846}
+  m_GameObject: {fileID: 4605125755228965885}
   m_CullTransparentMesh: 0
---- !u!114 &6568010226039706901
+--- !u!114 &5309147082344688946
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2731406766155477846}
+  m_GameObject: {fileID: 4605125755228965885}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.43529412, g: 0.43529412, b: 0.43529412, a: 1}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.13725491, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 61
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 120
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
-    m_LineSpacing: 1
-  m_Text: "\u8BF7\u8F93\u5165\u5BC6\u7801"
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  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!1 &5731132790281404085
 GameObject:
   m_ObjectHideFlags: 0
@@ -240,6 +717,93 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: 
+--- !u!1 &6299490571637019598
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 251745105086036184}
+  - component: {fileID: 8037708099617281138}
+  m_Layer: 5
+  m_Name: Choose2.1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &251745105086036184
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6299490571637019598}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.87184495, y: 0.87184495, z: 2.9709}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 639620756319199898}
+  - {fileID: 3390612464190820721}
+  m_Father: {fileID: 6791783665993114135}
+  m_RootOrder: 8
+  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: -161, y: -137}
+  m_SizeDelta: {x: 364.1, y: 143.1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8037708099617281138
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6299490571637019598}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 9110468124439544984}
+  toggleTransition: 1
+  graphic: {fileID: 2163523849094923812}
+  m_Group: {fileID: 5293653666296219414}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_IsOn: 1
 --- !u!1 &6791783665993113620
 GameObject:
   m_ObjectHideFlags: 0
@@ -249,7 +813,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6791783665993114156}
-  - component: {fileID: 6791783665993114798}
   m_Layer: 5
   m_Name: CaptchaError
   m_TagString: Untagged
@@ -279,22 +842,6 @@ RectTransform:
   m_AnchoredPosition: {x: -787, y: -535}
   m_SizeDelta: {x: 568, y: 48.1}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &6791783665993114798
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6791783665993113620}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0514a6c4d89d6b640921a7947268f32c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  errorInfo: {fileID: 6791783665993114446}
-  m_SCInput: {fileID: 0}
-  m_FormsHideEnum: 0
-  m_HidingTime: 3
 --- !u!1 &6791783665993113625
 GameObject:
   m_ObjectHideFlags: 0
@@ -456,7 +1003,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6791783665993114189}
-  - component: {fileID: 6791783665993114840}
   m_Layer: 5
   m_Name: PasswordError
   m_TagString: Untagged
@@ -486,22 +1032,6 @@ RectTransform:
   m_AnchoredPosition: {x: -787, y: -183}
   m_SizeDelta: {x: 568, y: 48.1}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &6791783665993114840
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6791783665993113648}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0514a6c4d89d6b640921a7947268f32c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  errorInfo: {fileID: 6791783665993114782}
-  m_SCInput: {fileID: 0}
-  m_FormsHideEnum: 0
-  m_HidingTime: 3
 --- !u!1 &6791783665993113650
 GameObject:
   m_ObjectHideFlags: 0
@@ -2067,7 +2597,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6791783665993114313}
-  - component: {fileID: 6791783665993114579}
   m_Layer: 5
   m_Name: AccountError
   m_TagString: Untagged
@@ -2097,22 +2626,6 @@ RectTransform:
   m_AnchoredPosition: {x: -787, y: 164.3}
   m_SizeDelta: {x: 568, y: 48.1}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &6791783665993114579
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6791783665993113783}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0514a6c4d89d6b640921a7947268f32c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  errorInfo: {fileID: 6791783665993114393}
-  m_SCInput: {fileID: 0}
-  m_FormsHideEnum: 0
-  m_HidingTime: 3
 --- !u!1 &6791783665993113785
 GameObject:
   m_ObjectHideFlags: 0
@@ -2430,7 +2943,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6791783665993114358}
-  - component: {fileID: 6791783665993114589}
   m_Layer: 5
   m_Name: RegisterError
   m_TagString: Untagged
@@ -2460,22 +2972,6 @@ RectTransform:
   m_AnchoredPosition: {x: -787, y: -183}
   m_SizeDelta: {x: 568, y: 48.1}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &6791783665993114589
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6791783665993113853}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0514a6c4d89d6b640921a7947268f32c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  errorInfo: {fileID: 6791783665993114587}
-  m_SCInput: {fileID: 0}
-  m_FormsHideEnum: 0
-  m_HidingTime: 3
 --- !u!1 &6791783665993113854
 GameObject:
   m_ObjectHideFlags: 0
@@ -2719,6 +3215,7 @@ GameObject:
   - component: {fileID: 6791783665993114135}
   - component: {fileID: 6791783665993113903}
   - component: {fileID: 6791783665993114806}
+  - component: {fileID: 5293653666296219414}
   m_Layer: 5
   m_Name: LoginPanel
   m_TagString: Untagged
@@ -2746,6 +3243,8 @@ RectTransform:
   - {fileID: 6791783665993114215}
   - {fileID: 6791783665993114229}
   - {fileID: 8148660293221383212}
+  - {fileID: 251745105086036184}
+  - {fileID: 324766431993203869}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2792,6 +3291,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5293653666296219414
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6791783665993114108}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_AllowSwitchOff: 1
 --- !u!1 &6791783665993114111
 GameObject:
   m_ObjectHideFlags: 0
@@ -3022,7 +3534,6 @@ MonoBehaviour:
   m_CustomPosition: {x: 0, y: 0, z: 0}
   m_CustomRotation: {x: 0, y: 0, z: 0}
   m_CustomLocalScale: {x: 200, y: 200, z: 200}
-  m_ShouldActivateOnSelect: 0
 --- !u!82 &6874961733583508626
 AudioSource:
   m_ObjectHideFlags: 0
@@ -3325,7 +3836,6 @@ MonoBehaviour:
   m_CustomPosition: {x: 0, y: 0, z: 0}
   m_CustomRotation: {x: 0, y: 0, z: 0}
   m_CustomLocalScale: {x: 200, y: 200, z: 200}
-  m_ShouldActivateOnSelect: 0
 --- !u!82 &1593490155698249785
 AudioSource:
   m_ObjectHideFlags: 0
@@ -3558,6 +4068,82 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u90AE\u7BB1/\u624B\u673A"
+--- !u!1 &8915364115898964425
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2733241052121733299}
+  - component: {fileID: 6617929345725264719}
+  - component: {fileID: 7983928280166694802}
+  m_Layer: 5
+  m_Name: Checkmark
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2733241052121733299
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8915364115898964425}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1212326118269989593}
+  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, y: 0}
+  m_SizeDelta: {x: 90, y: 90}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6617929345725264719
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8915364115898964425}
+  m_CullTransparentMesh: 0
+--- !u!114 &7983928280166694802
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8915364115898964425}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 0c7a9fefb8aa54843948b2501705e354, type: 3}
+  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!1001 &7463882274651298999
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scripts/Config/DataConfig.cs

@@ -55,14 +55,18 @@ public class ObjectTransform
 
     public void SetStartValue(Vector3 _startPos, Vector3 _StartRot, Vector3 _startScale)
     {
+        Debug.Log("设置初始值");
         startPos = _startPos;
+        if(nowPos !=Vector3.zero)
         nowPos = _startPos;
 
         startRot = _StartRot;
-        nowRot = _StartRot;
+        if (nowPos != Vector3.zero)
+            nowRot = _StartRot;
 
         startScale = _startScale;
-        nowScale = _startScale;
+        if (nowPos != Vector3.one)
+            nowScale = _startScale;
     }
 
     public void SavePos(Vector3 _startPos, Vector3 _StartRot, Vector3 _startScale)

Assets/Scripts/Net/HttpSocket.cs

@@ -83,7 +83,7 @@ public class HttpSocket : MonoSingleton<HttpSocket>
         //sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
 
         sendNet.projectId = DataManager.Instance.ProjectID;
-        electricity = 100;
+        electricity =  (int)SystemInfo.batteryLevel*100;
         sendNet.electricity = electricity;
         sendNet.status = state;
         string jsonData = JsonMapper.ToJson(sendNet);

Assets/Scripts/UI/GameManager.cs

@@ -1,4 +1,5 @@
 using LitJson;
+using Newtonsoft.Json;
 using SC.XR.Unity;
 using System;
 using System.Collections;
@@ -107,6 +108,9 @@ public class GameManager : MonoSingleton<GameManager>
     /// <summary>
     /// 是否在触发区域内
     /// </summary>
+    /// 
+    public GameObject arcamre;
+    public GameObject immser;
     public bool IsTriggerExiting
     {
         get { return m_IsTriggerExiting; }
@@ -444,7 +448,111 @@ public class GameManager : MonoSingleton<GameManager>
         }
 
     }
+    public static bool m_IsStartEditorJD;
+    public void open20zuJD(bool ison)
+    {
+        m_IsStartEditorJD = ison;
+        if (!ison)
+        {
+            save20All();
+        }
+
+    }
+    public static bool m_IsStartEditorzu;
+    public void open20zu(bool ison)
+    {
+        m_IsStartEditorzu = ison;
+        if (!ison)
+        {
+            save20All();
+        }
+
+    }
+    //2.0编辑模式 保存
+    public void open20Editor(bool ison)
+    {
+
+        m_IsStartEditor = ison;
+        if(!ison)
+        {
+            save20All();
+        }
+
+    }
+    public void save20All()
+    {
+
+        if (!m_IsStartEditor)
+        {
+            List<SendSaveData> saveData = new List<SendSaveData>();
+            foreach (var i in UserSceneManager.Instance.SceneList[UserSceneManager.Instance.nowId].SpotsList.Keys)
+            {
+                SpotsItem sp = UserSceneManager.Instance.SceneList[UserSceneManager.Instance.nowId].SpotsList[i.ToString()];
+                SendSaveData data = new SendSaveData();
+
+
+                data.id = int.Parse(sp.id);
+                data.name = sp.name;
+                data.projectId = int.Parse(UserSceneManager.Instance.SceneList[UserSceneManager.Instance.nowId].id);
+
+                List<MaterialObl> MaterialObllsit = new List<MaterialObl>();
+                foreach (var z in sp.modelList.Keys)
+                {
+                    ObjectTransform objt2 = new ObjectTransform();
+                    objt2.nowPos = sp.modelList[z].Model.transform.localPosition;
+                    objt2.nowRot = sp.modelList[z].Model.transform.localEulerAngles;
+                    objt2.nowScale = sp.modelList[z].Model.transform.localScale;
+                    sp.modelList[z].objectTransform = objt2;
+
+
+                    List<MaterialObjValue> materialList = new List<MaterialObjValue>();
+                    for (int j = 0; j < sp.modelList[z].materialList.Count; j++)
+                    {
+                        ObjectTransform objt3 = new ObjectTransform();
+                        objt3.nowPos = sp.modelList[z].materialList[j].prefabModel.transform.localPosition;
+                        objt3.nowRot = sp.modelList[z].materialList[j].prefabModel.transform.localEulerAngles;
+                        objt3.nowScale = sp.modelList[z].materialList[j].prefabModel.transform.localScale;
+                        sp.modelList[z].materialList[j].objectTransform = objt3;
+
+                        MaterialObjValue mov = new MaterialObjValue();
+                        mov.name = sp.modelList[z].materialList[j].name;
+                        mov.ObjectTransform = sp.modelList[z].materialList[j].objectTransform;
+                        materialList.Add(mov);
+                    }
+                    MaterialObl obj = new MaterialObl();
+                    obj.id = sp.modelList[z].id;
+                    obj.name = sp.modelList[z].name;
+                    obj.objectTransform = sp.modelList[z].objectTransform;
+                    obj.describe = sp.modelList[z].describe;
+                    obj.select = sp.modelList[z].select;
+                    obj.type = sp.modelList[z].type;
+                    obj.materialList = materialList;
+                    MaterialObllsit.Add(obj);
+                }
+                data.material = MaterialObllsit;
+                ObjectTransform objt = new ObjectTransform();
+                objt.nowPos = sp.SpotsObj.transform.localPosition;
+                objt.nowRot = sp.SpotsObj.transform.localEulerAngles;
+                objt.nowScale = sp.SpotsObj.transform.localScale;
+                data.spoittf = objt;
+                //data.triggerRange = spoit.SpoitTransform[0];
+                saveData.Add(data);
+            }
+
+
+
 
+            string sendData = JsonConvert.SerializeObject(saveData);
+            //string sendData = JsonMapper.ToJson(saveData);
+            Debug.Log("更新景点数据:  " + sendData);
+            HttpTool.Instance.PostTest(HttpAction.viewpoint_update, sendData, (string str) => {
+
+
+                Debug.Log("保存回调===》" + str);
+            });
+
+        }
+    }
     public void OnSettingBtnValueChanged(bool ison)
     {
         m_SettingPanel.gameObject.SetActive(ison);

Assets/Scripts/UI/LoginPanel.cs

@@ -35,11 +35,21 @@ public class LoginPanel : BaseUI
 
     private Text m_SN;
 
-
+    Toggle Choose21;
+    Toggle Choose20;
     protected override void OnAwake()
     {
         base.OnAwake();
+        Choose21 = CacheTransform.Find("Choose2.1").GetComponent<Toggle>();
+        Choose21.onValueChanged.AddListener((bool b) => {
 
+            UserInfo.Instance.is20 = !b;
+        });
+        Choose20 = CacheTransform.Find("Choose2.0").GetComponent<Toggle>();
+        Choose20.onValueChanged.AddListener((bool b) => {
+            UserInfo.Instance.is20 = b;
+        });
+        UserInfo.Instance.is20 = Choose20.isOn;
         m_Account = CacheTransform.Find("Account/SCInputField").GetComponent<SCInputField>();
         m_EmptyAccountBtn = CacheTransform.Find("Account/EmptyAccount").GetComponent<Button>();
         m_AccountErrorStr = CacheTransform.Find("Error/AccountError/Text").GetComponent<Text>();
@@ -82,7 +92,7 @@ public class LoginPanel : BaseUI
 
         //m_SNBtn.onClick.AddListener(OnClickSnBtn);
 
-        OnClickLogin();
+        // OnClickLogin();
     }
 
     #region UI监听事件
@@ -250,13 +260,6 @@ public class LoginPanel : BaseUI
     private void OnClickLogin()
     {
 
-#if UNITY_EDITOR
-        // m_AccountStr = "ghztest2@ghz-tech.com";
-        // m_PasswordStr = "123456Aa";
-        // m_AccountStr = "1768147286@qq.com";
-#endif
-        m_AccountStr = "yhb_adv10@1.com";
-        m_PasswordStr = "123456Aa";
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))
         {
@@ -294,7 +297,6 @@ public class LoginPanel : BaseUI
         string jsonLogin = JsonMapper.ToJson(sendLogin);
         UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.login);
 
-        UserInfo.Instance.is20 = true;
         if(UserInfo.Instance.is20)
         {
             HttpTool.Instance.PostLogin("/user/login", jsonLogin, LoginCallBack2);
@@ -329,6 +331,9 @@ public class LoginPanel : BaseUI
             //  UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.getMaterialValue);
             //   StartCoroutine(GetAllMaterials(UserInfo.Instance.Token));
             UserManager.Instance.loginBack(true);
+
+            GameManager.Instance.arcamre.SetActive(true);
+            GameManager.Instance.immser.SetActive(false);
         }
     }
     /// <summary>
@@ -353,6 +358,8 @@ public class LoginPanel : BaseUI
             UserInfo.Instance.Token = obj["data"]["token"].ToString();
             UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.getMaterialValue);
             StartCoroutine(GetAllMaterials(UserInfo.Instance.Token));
+            GameManager.Instance.arcamre.SetActive(false);
+            GameManager.Instance.immser.SetActive(true);
         }
     }
 
@@ -570,6 +577,13 @@ public class LoginPanel : BaseUI
 
         m_RemenberPwd.isOn = m_IsRemberPwd;
 
+#if UNITY_EDITOR
+        // m_AccountStr = "ghztest2@ghz-tech.com";
+        // m_PasswordStr = "123456Aa";
+        m_AccountStr = "1768147286@qq.com";
+        // m_AccountStr = "yhb_adv10@1.com";
+        m_PasswordStr = "123456Aa";
+#endif
         if (!string.IsNullOrWhiteSpace(m_AccountStr) && !string.IsNullOrWhiteSpace(m_PasswordStr))
         {
             m_Account.text = m_AccountStr;