Browse Source

增加小地图全局同步,修复设置按钮丢失

蓝色星空 1 year ago
parent
commit
cba253a48c

File diff suppressed because it is too large
+ 0 - 35
Assets/NavigatorPro.unity


+ 124 - 0
Assets/Prefabs/BluePrefabs/BlueRoot.prefab

@@ -1,5 +1,128 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &954920001505172515
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6691652729900491483}
+  - component: {fileID: 6507344721341592048}
+  m_Layer: 0
+  m_Name: SetBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6691652729900491483
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 954920001505172515}
+  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: 6958383372992226145}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6507344721341592048
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 954920001505172515}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30e8b20aeb6e2a44bb2e448bda9402e6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SetBtn: {fileID: 0}
+--- !u!1 &1478648305362936417
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4327196192327954180}
+  - component: {fileID: 9176261057700123599}
+  m_Layer: 0
+  m_Name: MinMap
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4327196192327954180
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1478648305362936417}
+  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: 6958383372992226145}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9176261057700123599
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1478648305362936417}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc39bee1c56269a44ba130f280593686, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  MinMapCanvas: {fileID: 0}
+--- !u!1 &4411520925763209400
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6958383372992226145}
+  m_Layer: 0
+  m_Name: MovePos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6958383372992226145
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4411520925763209400}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -6.8286867, y: 3.4165711, z: -8.256353}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4327196192327954180}
+  - {fileID: 6691652729900491483}
+  m_Father: {fileID: 8671475187487430762}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4520612451748474568
 GameObject:
   m_ObjectHideFlags: 0
@@ -33,6 +156,7 @@ Transform:
   m_Children:
   - {fileID: 3852353237422719028}
   - {fileID: 8313308714142303026}
+  - {fileID: 6958383372992226145}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 523 - 8
Assets/Resources/SetBtn.prefab

@@ -1,5 +1,357 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4760126589813696931
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7152999615209362750}
+  - component: {fileID: 5717229721302136795}
+  - component: {fileID: 3061704082282929520}
+  - component: {fileID: 6161708377852532315}
+  m_Layer: 0
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7152999615209362750
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4760126589813696931}
+  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: 6335723834755056744}
+  m_Father: {fileID: 9187974619997017355}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 904, y: 419}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &5717229721302136795
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4760126589813696931}
+  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 &3061704082282929520
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4760126589813696931}
+  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 &6161708377852532315
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4760126589813696931}
+  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 &5063562585878512754
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8805834437560675311}
+  - component: {fileID: 7784004809965535748}
+  - component: {fileID: 5033282784388903041}
+  m_Layer: 0
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8805834437560675311
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5063562585878512754}
+  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: 6335723834755056744}
+  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 &7784004809965535748
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5063562585878512754}
+  m_CullTransparentMesh: 1
+--- !u!114 &5033282784388903041
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5063562585878512754}
+  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.19607843, g: 0.19607843, b: 0.19607843, 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: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u91CD\u7F6E"
+--- !u!1 &8864427349173619404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6335723834755056744}
+  - component: {fileID: 2952476799037732856}
+  - component: {fileID: 4715581547309362796}
+  - component: {fileID: 4515204644298722473}
+  - component: {fileID: 7695493718713904468}
+  - component: {fileID: 1955112851253794527}
+  m_Layer: 0
+  m_Name: Button (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6335723834755056744
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8864427349173619404}
+  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: 8805834437560675311}
+  m_Father: {fileID: 7152999615209362750}
+  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: -16.5, y: -116.8}
+  m_SizeDelta: {x: 64.02, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2952476799037732856
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8864427349173619404}
+  m_CullTransparentMesh: 1
+--- !u!114 &4715581547309362796
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8864427349173619404}
+  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: 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!114 &4515204644298722473
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8864427349173619404}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 4715581547309362796}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!65 &7695493718713904468
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8864427349173619404}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1955112851253794527
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8864427349173619404}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b3ba789618d29764280b4afcd4513b22, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scaleType: 0
+  duration: 0.3
+  scaleRatio: 0.2
+  PositionAnimation: 0
+  forwardRatio: 0.05
+  onClick:
+    m_PersistentCalls:
+      m_Calls: []
+  onEnter:
+    m_PersistentCalls:
+      m_Calls: []
+  onDown:
+    m_PersistentCalls:
+      m_Calls: []
+  onUp:
+    m_PersistentCalls:
+      m_Calls: []
+  onExit:
+    m_PersistentCalls:
+      m_Calls: []
+  initScale: {x: 0, y: 0, z: 0}
+  initPosition: {x: 0, y: 0, z: 0}
 --- !u!1 &9187974619997017352
 GameObject:
   m_ObjectHideFlags: 0
@@ -24,14 +376,177 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9187974619997017352}
   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_LocalPosition: {x: -1, y: 0, z: 0}
+  m_LocalScale: {x: 3, y: 3, z: 3}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4178407616398969778}
   - {fileID: 4178407616263197487}
+  - {fileID: 7000147385138551629}
+  - {fileID: 7152999615209362750}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2835883888536186161
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 9187974619997017355}
+    m_Modifications:
+    - target: {fileID: 596560961469809390, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_IsOn
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: OnSettingBtnValueChanged
+      objectReference: {fileID: 0}
+    - target: {fileID: 1604522696401356376, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
+    - target: {fileID: 2469059223013094684, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2530963273550262053, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_Text
+      value: "\u8BBE\u7F6E\u9762\u677F"
+      objectReference: {fileID: 0}
+    - target: {fileID: 3175354672573086742, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.042
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.015
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.0615
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6969180618085736679, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8030973376965847205, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221249705219883143, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_Name
+      value: SetBtn
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221249705219883143, guid: 7e724082e3f166747b1152780155e212,
+        type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7e724082e3f166747b1152780155e212, type: 3}
+--- !u!4 &7000147385138551629 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
+    type: 3}
+  m_PrefabInstance: {fileID: 2835883888536186161}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &9187974619437252046
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -117,12 +632,12 @@ PrefabInstance:
     - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: 0.015
       objectReference: {fileID: 0}
     - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: 0.0602
       objectReference: {fileID: 0}
     - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
@@ -247,7 +762,7 @@ PrefabInstance:
     - target: {fileID: 2530963273550262053, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
       propertyPath: m_Text
-      value: "\u8BBE\u7F6E\u9762\u677F"
+      value: "\u951A\u70B9\u9762\u677F"
       objectReference: {fileID: 0}
     - target: {fileID: 3175354672573086742, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
@@ -277,12 +792,12 @@ PrefabInstance:
     - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: 0.015
       objectReference: {fileID: 0}
     - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.0615
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5079657590173202044, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
@@ -337,7 +852,7 @@ PrefabInstance:
     - target: {fileID: 8221249705219883143, guid: 7e724082e3f166747b1152780155e212,
         type: 3}
       propertyPath: m_Name
-      value: SetBtn
+      value: AnchorBtn
       objectReference: {fileID: 0}
     - target: {fileID: 8221249705219883143, guid: 7e724082e3f166747b1152780155e212,
         type: 3}

+ 24 - 0
Assets/Scripts/Blue/Command/MinMapGetSetCommand.cs

@@ -0,0 +1,24 @@
+using Blue;
+
+/// <summary>
+/// 小地图开关设置命令
+/// </summary>
+public class MinMapGetSetCommand : ICommand
+{
+    private int minMap =2;
+    public MinMapGetSetCommand()
+    {
+
+    }
+    public MinMapGetSetCommand(int minMap)
+    {
+        this.minMap = minMap;
+    }
+    public void OnExcute()
+    {
+        if(minMap == 2)
+            this.GetService<IMinMapService>().Get();
+        else
+            this.GetService<IMinMapService>().setMinMap.Value =minMap;
+    }
+}

+ 11 - 0
Assets/Scripts/Blue/Command/MinMapGetSetCommand.cs.meta

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

+ 8 - 0
Assets/Scripts/Blue/Controller/MovePos.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 26d5f044ea460904baa0cbc918b2a087
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 49 - 0
Assets/Scripts/Blue/Controller/MovePos/MinMapPos.cs

@@ -0,0 +1,49 @@
+using Blue;
+using UnityEngine;
+
+public class MinMapPos : AbstractController
+{
+    [SerializeField] private GameObject MinMapCanvas;
+    private bool first = true;
+    private IMinMapService minMapService;
+    private int value;
+    void Start()
+    {
+        minMapService = this.GetService<IMinMapService>();
+        if (MinMapCanvas != null)
+        {
+            minMapService.setMinMap.Subscribe(
+                newValue =>
+                {
+                    //Debug.LogError("新的值:" + newValue);
+                    value = newValue;
+                    if (newValue == 0)
+                        MinMapCanvas.SetActive(false);
+                    else
+                        MinMapCanvas.SetActive(true);
+                    if (first)
+                    {
+                        first = false;
+                        return;
+                    }
+                    minMapService.Set();
+                }
+            ).UnSubScribeWhenGameObjectDestroyed(gameObject);
+            MinMapCanvas.transform.parent = OpenXRCamera.Instance.head;
+        }
+    }
+    private bool patch = true;
+
+    private void Update()
+    {
+        //其他地方有引用小地图,控制了开关;统一由IMinMapService控制
+        if (value == 0 && patch)
+        {
+            if (MinMapCanvas.activeSelf == true)
+            {
+                MinMapCanvas.SetActive(false);
+                patch = false;
+            }
+        }
+    }
+}

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

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

+ 13 - 0
Assets/Scripts/Blue/Controller/MovePos/SetBtnPos.cs

@@ -0,0 +1,13 @@
+using UnityEngine;
+
+public class SetBtnPos : MonoBehaviour
+{
+    [SerializeField] private GameObject SetBtn;
+    void Start()
+    {
+        if (SetBtn != null)
+        {
+           SetBtn.transform.parent = OpenXRCamera.Instance.head;
+        }
+    }
+}

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

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

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

@@ -17,6 +17,7 @@ public class MRNavigatorPro : AbstractArchitecture<MRNavigatorPro>
     private void RegisterService()
     {
         this.RegisterService<ISendLogService>(new SendLogService());
+        this.RegisterService<IMinMapService>(new MinMapService());
     }
 
     private void RegisterUtility()

+ 4 - 0
Assets/Scripts/Blue/Other/GetUserInfo.cs

@@ -0,0 +1,4 @@
+public class GetUserInfo
+{
+    public int minMap { get; set; }
+}

+ 11 - 0
Assets/Scripts/Blue/Other/GetUserInfo.cs.meta

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

+ 106 - 0
Assets/Scripts/Blue/Service/IMinMapService.cs

@@ -0,0 +1,106 @@
+using System.Collections;
+using System.Text;
+using Blue;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+using UnityEngine.Networking;
+
+public interface IMinMapService : IService
+{
+    void Get();
+    void Set();
+    /// <summary>
+    /// 设置是否显示 0 = 不显示; 1 = 显示
+    /// </summary>
+    BindableProperty<int> setMinMap{ get; set; }
+}
+
+public class MinMapService : IMinMapService
+{
+    private string userInfoGetUrl;
+    private string userInfoSetUrl;
+    private string message;
+
+    public BindableProperty<int> setMinMap { get; set; } = new BindableProperty<int>(2);
+
+    public void OnInit()
+    {
+        userInfoGetUrl = "https://api-fat3.ghz-tech.com/mr-navigator/v1/user/getUserInfo";
+        userInfoSetUrl = "https://api-fat3.ghz-tech.com/mr-navigator/v1/user/settings";
+    }
+    public void Get()
+    {
+        RootSystem.Instance.StartCoroutine(GetRequest());
+    }
+
+    public void Set()
+    {
+        RootSystem.Instance.StartCoroutine(SetRequest(setMinMap.Value));
+    }
+
+    private IEnumerator GetRequest()
+    {
+        using (UnityWebRequest webRequest = new UnityWebRequest(userInfoGetUrl))
+        {
+            webRequest.downloadHandler = new DownloadHandlerBuffer();
+            webRequest.SetRequestHeader("Content-Type", "application/json;charset=utf-8");
+            webRequest.SetRequestHeader("authorization", HttpTool.Instance.Token);
+
+            yield return webRequest.SendWebRequest();
+
+            if (webRequest.result== UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)
+            {
+                //Debug.LogError(webRequest.error);
+                //Debug.LogError("UnityWebRequest Error:"+webRequest.downloadHandler.text);
+            }
+            else
+            {
+                //Debug.LogError(webRequest.downloadHandler.text);
+                if (!string.IsNullOrWhiteSpace(webRequest.downloadHandler.text))
+                {
+                    message = webRequest.downloadHandler.text;
+                    JObject jobject = JObject.Parse(message);
+                    if (jobject["code"].ToString() == "200")
+                    {
+                        message = jobject["data"].ToString();
+                        //Debug.LogError(message);
+                        if (!string.IsNullOrWhiteSpace(message))
+                        {
+                            GetUserInfo getUserInfo =  JsonConvert.DeserializeObject<GetUserInfo>(message);
+                            //Debug.LogError("值:"+getUserInfo.minMap);
+                            setMinMap.Value = getUserInfo.minMap;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private IEnumerator SetRequest(int isOpen)
+    {
+        using (UnityWebRequest webRequest = new UnityWebRequest(userInfoSetUrl, "POST"))
+        {
+            GetUserInfo getUserInfo = new GetUserInfo();
+            getUserInfo.minMap = isOpen;
+            string jsonData = JsonConvert.SerializeObject(getUserInfo);
+            Debug.LogError("JsonData"+jsonData);
+            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonData);
+
+            webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
+            webRequest.downloadHandler = new DownloadHandlerBuffer();
+
+            webRequest.SetRequestHeader("Content-Type", "application/json;charset=utf-8");
+            webRequest.SetRequestHeader("authorization", HttpTool.Instance.Token);
+
+            yield return webRequest.SendWebRequest();
+
+            if (webRequest.result== UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)
+                Debug.LogError("UnityWebRequest Error:"+webRequest.downloadHandler.text);
+            else
+            {
+                //Debug.LogError("上传:"+webRequest.downloadHandler.text);
+            }
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/Blue/Service/IMinMapService.cs.meta

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

+ 1 - 1
Assets/Scripts/CalMap.cs

@@ -25,7 +25,7 @@ public class CalMap : MonoBehaviour
 
     private void LateUpdate()
     {
-        if (API_GSXR_Slam.GSXR_Get_Head() != null)
+        if (OpenXRCamera.Instance.head != null)
         {
             if (player != null && GameManager.Instance.isStart)
             {

+ 4 - 1
Assets/Scripts/Net/HttpGetValue.cs

@@ -12,7 +12,10 @@ public class HttpGetValue : MonoBehaviour
         HttpTool.Instance.Get("https://fat1.qulivr.com/mr-navigator/v1/", "", (string getInterval) => {
             Debug.Log(getInterval);
             if (getInterval == null)
-                Debug.LogError(" HttpTool  Get Interval Error!!! ");
+            {
+                Debug.Log(" HttpTool  Get Interval Error!!! ");
+                return;
+            }
             JsonData data = JsonMapper.ToObject(getInterval);
             Debug.Log(data["code"]);
             if ((int)data["code"] == 200)

+ 8 - 3
Assets/Scripts/SettingPanel.cs

@@ -4,8 +4,9 @@ using UnityEngine;
 using UnityEngine.UI;
 using System;
 using SC.XR.Unity;
+using Blue;
 
-public class SettingPanel : MonoBehaviour
+public class SettingPanel : AbstractController
 {
     public Toggle MinMap;
     public Toggle LuJIng;
@@ -28,12 +29,15 @@ public class SettingPanel : MonoBehaviour
         MinMap.onValueChanged.AddListener(OnMinMapValueChange);
         LuJIng.onValueChanged.AddListener(OnLuJIngValueChange);
     }
-
+    private void OnEnable()
+    {
+        MinMap.isOn = this.GetService<IMinMapService>().setMinMap == 1 ? true : false;
+    }
     public void Init()
     {
         CreateLines();
         MinMap.isOn = true;
-        m_MinMap.gameObject.SetActive(true);
+        //m_MinMap.gameObject.SetActive(true);
         LuJIng.isOn = true;
 
         if (Lines.Count > 0)
@@ -80,6 +84,7 @@ public class SettingPanel : MonoBehaviour
 
     private void OnClickSaveData()
     {
+        this.SendCommand(new MinMapGetSetCommand(m_MinMap.gameObject.activeSelf ? 1 : 0));
         DataManager.Instance.SaveSpoits();
         DataManager.Instance.IsSavedData = true;
     }

+ 3 - 3
Assets/Scripts/UI/GameManager.cs

@@ -252,12 +252,12 @@ public class GameManager : MonoSingleton<GameManager>
 
     private void LateUpdate()
     {
-        if (API_GSXR_Slam.GSXR_Get_Head() != null && m_IsRuning)
+        if (OpenXRCamera.Instance.head != null && m_IsRuning)
         {
-            m_SetBtn.transform.localEulerAngles = new Vector3(0, API_GSXR_Slam.GSXR_Get_Head().localEulerAngles.y, 0);
+            m_SetBtn.transform.localEulerAngles = new Vector3(0, OpenXRCamera.Instance.head.localEulerAngles.y, 0);
             //m_SetBtn.transform.position = API_GSXR_Slam.GSXR_Get_Head().localPosition + Player.transform.forward * 1.3f+ new Vector3(0, 1f, 0);
             //m_SetBtn.transform.localPosition = API_GSXR_Slam.GSXR_Get_Head().localPosition + Player.transform.forward * 1.3f + new Vector3(0, 1f, 0);
-            m_SetBtn.transform.position = API_GSXR_Slam.GSXR_Get_Head().position + Player.transform.forward * 1.3f + new Vector3(-0.2f, 1f, 0);
+            m_SetBtn.transform.position = OpenXRCamera.Instance.head.position + Player.transform.forward * 1.3f + new Vector3(-0.2f, 1f, 0);
         }
     }
 

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

@@ -71,6 +71,7 @@ public class SceneChoose : BaseUI
         if (m_CurrentData != null)
         {
             this.SendCommand(new SelectEnterSceneCommand());
+            this.SendCommand(new MinMapGetSetCommand());
             //根据场景数据,下载资源
             Debug.Log("选择的场景为:" + m_CurrentData.name);
 

Some files were not shown because too many files changed in this diff