Browse Source

调整pos、rot按钮大小

蓝色星空 1 year ago
parent
commit
5f6cdf9404

+ 170 - 172
Assets/MRNavigatorPro.unity

@@ -1953,7 +1953,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 1137340581}
+  m_Mesh: {fileID: 1386370417}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4257,170 +4257,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 948b9ab040508dc48a294230f85b39e2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!43 &1137340581
-Mesh:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 10
-  m_SubMeshes:
-  - serializedVersion: 2
-    firstByte: 0
-    indexCount: 0
-    topology: 5
-    baseVertex: 0
-    firstVertex: 0
-    vertexCount: 0
-    localAABB:
-      m_Center: {x: 0, y: 0, z: 0}
-      m_Extent: {x: 0, y: 0, z: 0}
-  m_Shapes:
-    vertices: []
-    shapes: []
-    channels: []
-    fullWeights: []
-  m_BindPose: []
-  m_BoneNameHashes: 
-  m_RootBoneNameHash: 0
-  m_BonesAABB: []
-  m_VariableBoneCountWeights:
-    m_Data: 
-  m_MeshCompression: 0
-  m_IsReadable: 1
-  m_KeepVertices: 0
-  m_KeepIndices: 0
-  m_IndexFormat: 1
-  m_IndexBuffer: 
-  m_VertexData:
-    serializedVersion: 3
-    m_VertexCount: 0
-    m_Channels:
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    m_DataSize: 0
-    _typelessdata: 
-  m_CompressedMesh:
-    m_Vertices:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UV:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Normals:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Tangents:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Weights:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_NormalSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_TangentSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_FloatColors:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_BoneIndices:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Triangles:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UVInfo: 0
-  m_LocalAABB:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
-  m_MeshUsageFlags: 0
-  m_BakedConvexCollisionMesh: 
-  m_BakedTriangleCollisionMesh: 
-  m_MeshMetrics[0]: 1
-  m_MeshMetrics[1]: 1
-  m_MeshOptimizationFlags: 1
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &1142769239
 GameObject:
   m_ObjectHideFlags: 0
@@ -5174,6 +5010,170 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: aca09677629b3fe4f96c3fb720d34f82, type: 3}
+--- !u!43 &1386370417
+Mesh:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 10
+  m_SubMeshes:
+  - serializedVersion: 2
+    firstByte: 0
+    indexCount: 0
+    topology: 5
+    baseVertex: 0
+    firstVertex: 0
+    vertexCount: 0
+    localAABB:
+      m_Center: {x: 0, y: 0, z: 0}
+      m_Extent: {x: 0, y: 0, z: 0}
+  m_Shapes:
+    vertices: []
+    shapes: []
+    channels: []
+    fullWeights: []
+  m_BindPose: []
+  m_BoneNameHashes: 
+  m_RootBoneNameHash: 0
+  m_BonesAABB: []
+  m_VariableBoneCountWeights:
+    m_Data: 
+  m_MeshCompression: 0
+  m_IsReadable: 1
+  m_KeepVertices: 0
+  m_KeepIndices: 0
+  m_IndexFormat: 1
+  m_IndexBuffer: 
+  m_VertexData:
+    serializedVersion: 3
+    m_VertexCount: 0
+    m_Channels:
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 3
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    m_DataSize: 0
+    _typelessdata: 
+  m_CompressedMesh:
+    m_Vertices:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UV:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Normals:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Tangents:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Weights:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_NormalSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_TangentSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_FloatColors:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_BoneIndices:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Triangles:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UVInfo: 0
+  m_LocalAABB:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
+  m_MeshUsageFlags: 0
+  m_BakedConvexCollisionMesh: 
+  m_BakedTriangleCollisionMesh: 
+  m_MeshMetrics[0]: 1
+  m_MeshMetrics[1]: 1
+  m_MeshOptimizationFlags: 1
+  m_StreamData:
+    serializedVersion: 2
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &1412262481
 GameObject:
   m_ObjectHideFlags: 0
@@ -5490,7 +5490,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0056583458
+      value: -0.0035911896
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -5620,7 +5620,7 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.003624697
+      value: -0.0023607772
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -8315,7 +8315,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.0025608626
+      value: -0.0018467323
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -12161,7 +12161,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.0058029396}
+  m_AnchoredPosition: {x: 0, y: -0.0036448203}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118
@@ -13477,7 +13477,7 @@ RectTransform:
   m_GameObject: {fileID: 2425856538158077807}
   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_LocalScale: {x: 0.666, y: 0.666, z: 0.666}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1662148596}
@@ -14805,8 +14805,6 @@ MonoBehaviour:
   txtTip: {fileID: 666528072}
   saveBtn: {fileID: 9059506358718814602}
   cancleBtn: {fileID: 9059506358958805089}
-  meshTest: {fileID: 0}
-  parent: {fileID: 0}
   parentObj: {fileID: 1354446210}
   parentToggle: {fileID: 6101810}
   LoadReferenceController: {fileID: 1065976460}

+ 49 - 8
Assets/Prefab/BluePrefabs/BlueRoot.prefab

@@ -121,10 +121,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 17ee6c5630c36954aa04b75d7a903889, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  moveGame: {fileID: 0}
-  parent: {fileID: 0}
+  ControllerTracker: {fileID: 0}
   RotToggle: {fileID: 0}
-  go: {fileID: 0}
+  txtTip: {fileID: 0}
 --- !u!1 &811614693913846086
 GameObject:
   m_ObjectHideFlags: 0
@@ -205,8 +204,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3e5a86f83b8582144a4929f62a385b91, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  meshTest: {fileID: 0}
-  meshTestParent: {fileID: 0}
 --- !u!114 &7931960824797962037
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -220,9 +217,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   goRefrence: {fileID: 0}
-  meshTest: {fileID: 0}
-  meshTestParent: {fileID: 0}
-  MoveChange: {fileID: 0}
 --- !u!1 &3827978887888892621
 GameObject:
   m_ObjectHideFlags: 0
@@ -292,6 +286,7 @@ Transform:
   - {fileID: 3490034733957922214}
   - {fileID: 8294022177412783077}
   - {fileID: 3420359310440475008}
+  - {fileID: 381987406448428764}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -344,6 +339,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 757e290c9613bc04d82fb42d0291b70c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  mesh_test: {fileID: 0}
+  ARSpaceForAll: {fileID: 0}
 --- !u!1 &5121041051266488258
 GameObject:
   m_ObjectHideFlags: 0
@@ -420,6 +417,50 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   MinMapCanvas: {fileID: 0}
+--- !u!1 &7307777014064094198
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 381987406448428764}
+  - component: {fileID: 7297556321924348335}
+  m_Layer: 0
+  m_Name: MQTT
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &381987406448428764
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7307777014064094198}
+  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: 5886227751517987777}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7297556321924348335
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7307777014064094198}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8bbfd53e6654ed64d87de36e6e591752, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7412898482642897146
 GameObject:
   m_ObjectHideFlags: 0

+ 16 - 0
Assets/Scripts/Blue/Controller/BlueMQTT.cs

@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BlueMQTT : AbstractController
+{
+    void Start()
+    {
+        
+    }
+
+    void Update()
+    {
+        
+    }
+}

+ 11 - 0
Assets/Scripts/Blue/Controller/BlueMQTT.cs.meta

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

+ 1 - 1
Assets/Scripts/Blue/MRNavigatorPro.cs

@@ -11,7 +11,7 @@ public class MRNavigatorPro : AbstractArchitecture<MRNavigatorPro>
 
     private void RegisterModel()
     {
-
+        this.RegisterModel<ISceneModel>(new SceneModel());
     }
 
     private void RegisterService()

+ 15 - 0
Assets/Scripts/Blue/Model/ISceneModel.cs

@@ -0,0 +1,15 @@
+using Blue;
+
+public interface ISceneModel : IModel
+{
+    int sceneID { get; set; }
+}
+public class SceneModel : ISceneModel
+{
+    public int sceneID { get; set; }
+
+    public void OnInit()
+    {
+
+    }
+}

+ 11 - 0
Assets/Scripts/Blue/Model/ISceneModel.cs.meta

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

+ 3 - 18
Assets/Scripts/Blue/Test/BlueTest.cs

@@ -1,28 +1,13 @@
-using System.Collections.Generic;
 using Blue;
-using Newtonsoft.Json;
 using UnityEngine;
 
 public class BlueTest : AbstractController
 {
     void Update()
     {
-        if(Input.GetKeyDown(KeyCode.L))
+        if(Input.GetKeyDown(KeyCode.M))
         {
-            List<ScenePosRotInfo> list = new List<ScenePosRotInfo>();
-            ScenePosRotInfo pos = new ScenePosRotInfo();
-            ScenePosRotInfo rot = new ScenePosRotInfo();
-            pos.x = 1;pos.y = 1;pos.z = 1;
-            rot.x = 2;rot.y = 2;;rot.z = 2;
-            list.Add(pos);list.Add(rot);
-            string jsonString = JsonConvert.SerializeObject(list);
-            string url = "https://api-fat1.ghz-tech.com/mr-navigator/v1/project/position/396";
-            //HttpTool.Instance.UploadScenePosRot(url,jsonString,CallBack);
-            //this.SendCommand(new PointPosRotUploadCommand(url, HttpTool.Instance.RequestHeader, HttpTool.Instance.Token, jsonString));
+            this.SendCommand(new PointPosRotDownloadCommand(this.GetModel<ISceneModel>().sceneID));
         }
     }
-    private void CallBack(string e)
-    {
-        Debug.LogError(e);
-    }
-}
+}

+ 1 - 0
Assets/Scripts/UI/SceneChoose.cs

@@ -78,6 +78,7 @@ public class SceneChoose : BaseUI
             detail.id = m_CurrentData.id;
             string str = JsonConvert.SerializeObject(detail);
 
+            this.GetModel<ISceneModel>().sceneID = m_CurrentData.id;
             this.SendCommand(new PointFileGetUrlCommand(detail.id, PointFileType.json));
             this.SendCommand(new PointFileGetUrlCommand(detail.id, PointFileType.bytes));
             this.SendCommand(new PointPosRotDownloadCommand(detail.id));