/. (54b924c6) · Commits · 聂雨荷 / hololens2

Assets/Resources/Prefabs/GeographyBoard.prefab

+208 −228

Original line number	Diff line number	Diff line
		@@ -1322,8 +1322,8 @@ RectTransform:
		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: 2.9, y: -24.1}
		m_SizeDelta: {x: 278.7, y: 164.8}
		m_AnchoredPosition: {x: 2.9, y: -22.69}
		m_SizeDelta: {x: 259.78, y: 167.64}
		m_Pivot: {x: 0.5, y: 0.5}
		--- !u!222 &5227360340676735458
		CanvasRenderer:
		@@ -2650,6 +2650,7 @@ MonoBehaviour:
		m_hasFontAssetChanged: 0
		m_renderer: {fileID: 3219813250296201337}
		m_maskType: 0
		_SortingLayer: 0
		_SortingLayerID: 0
		_SortingOrder: 0
		--- !u!1 &868469386854793142
		@@ -3546,6 +3547,7 @@ MonoBehaviour:
		m_hasFontAssetChanged: 0
		m_renderer: {fileID: 1899039299258735227}
		m_maskType: 0
		_SortingLayer: 0
		_SortingLayerID: 0
		_SortingOrder: 0
		--- !u!1 &1148835636331920460
		@@ -8112,6 +8114,81 @@ MonoBehaviour:
		m_VerticalOverflow: 1
		m_LineSpacing: 1
		m_Text: Text
		--- !u!1 &2240257947796288269
		GameObject:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		serializedVersion: 6
		m_Component:
		- component: {fileID: 3198072773260686507}
		- component: {fileID: 7513967043514729449}
		- component: {fileID: 18843048725394792}
		m_Layer: 0
		m_Name: "\u5730\u56FE"
		m_TagString: Untagged
		m_Icon: {fileID: 0}
		m_NavMeshLayer: 0
		m_StaticEditorFlags: 0
		m_IsActive: 1
		--- !u!224 &3198072773260686507
		RectTransform:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 2240257947796288269}
		m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
		m_LocalPosition: {x: 0, y: 0, z: 0}
		m_LocalScale: {x: 1, y: 1, z: 1}
		m_Children: []
		m_Father: {fileID: 5982526599657424485}
		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: 200, y: 200}
		m_Pivot: {x: 0.5, y: 0.5}
		--- !u!222 &7513967043514729449
		CanvasRenderer:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 2240257947796288269}
		m_CullTransparentMesh: 1
		--- !u!114 &18843048725394792
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 2240257947796288269}
		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: 0}
		m_Type: 0
		m_PreserveAspect: 0
		m_FillCenter: 1
		m_FillMethod: 4
		m_FillAmount: 1
		m_FillClockwise: 1
		m_FillOrigin: 0
		m_UseSpriteMesh: 0
		m_PixelsPerUnitMultiplier: 1
		--- !u!1 &2242739691685823962
		GameObject:
		m_ObjectHideFlags: 0
		@@ -8442,8 +8519,8 @@ RectTransform:
		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.000013828278, y: -273.4}
		m_SizeDelta: {x: 278.7, y: 711.6}
		m_AnchoredPosition: {x: 0.000023842, y: 0}
		m_SizeDelta: {x: 259.78, y: 164.8}
		m_Pivot: {x: 0.5, y: 0.5}
		--- !u!222 &4000430479071943663
		CanvasRenderer:
		@@ -8475,7 +8552,7 @@ MonoBehaviour:
		m_Calls: []
		m_FontData:
		m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
		m_FontSize: 16
		m_FontSize: 12
		m_FontStyle: 0
		m_BestFit: 0
		m_MinSize: 1
		@@ -8868,7 +8945,7 @@ RectTransform:
		m_Children:
		- {fileID: 6404733112936108844}
		- {fileID: 9067298869350399236}
		- {fileID: 1914025255032359112}
		- {fileID: 1113101104334238429}
		- {fileID: 5982526599657424485}
		- {fileID: 478360584461200342}
		- {fileID: 4711799077525980069}
		@@ -16683,8 +16760,8 @@ RectTransform:
		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: 390.9, y: -74}
		m_SizeDelta: {x: 272.9, y: 277.9}
		m_AnchoredPosition: {x: 425.79, y: -90.1}
		m_SizeDelta: {x: 228.42, y: 261.65}
		m_Pivot: {x: 0.5, y: 0.5}
		--- !u!222 &2143956300116929949
		CanvasRenderer:
		@@ -18667,85 +18744,6 @@ MonoBehaviour:
		m_VerticalOverflow: 1
		m_LineSpacing: 1
		m_Text: Text
		--- !u!1 &3926403289869498246
		GameObject:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		serializedVersion: 6
		m_Component:
		- component: {fileID: 2683787476104573375}
		- component: {fileID: 2336557262500637055}
		- component: {fileID: 866975667310641905}
		m_Layer: 0
		m_Name: Text
		m_TagString: Untagged
		m_Icon: {fileID: 0}
		m_NavMeshLayer: 0
		m_StaticEditorFlags: 0
		m_IsActive: 1
		--- !u!224 &2683787476104573375
		RectTransform:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 3926403289869498246}
		m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
		m_LocalPosition: {x: 0, y: 0, z: 0}
		m_LocalScale: {x: 1, y: 1, z: 1}
		m_Children: []
		m_Father: {fileID: 1914025255032359112}
		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 &2336557262500637055
		CanvasRenderer:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 3926403289869498246}
		m_CullTransparentMesh: 1
		--- !u!114 &866975667310641905
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 3926403289869498246}
		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: 30
		m_FontStyle: 0
		m_BestFit: 0
		m_MinSize: 0
		m_MaxSize: 40
		m_Alignment: 4
		m_AlignByGeometry: 0
		m_RichText: 1
		m_HorizontalOverflow: 0
		m_VerticalOverflow: 0
		m_LineSpacing: 1
		m_Text: "\u62CD\u7167"
		--- !u!1 &3968777032231695543
		GameObject:
		m_ObjectHideFlags: 0
		@@ -18931,6 +18929,7 @@ MonoBehaviour:
		m_hasFontAssetChanged: 0
		m_renderer: {fileID: 627665040336041002}
		m_maskType: 0
		_SortingLayer: 0
		_SortingLayerID: 0
		_SortingOrder: 0
		--- !u!1 &4089207435231081022
		@@ -20679,7 +20678,7 @@ RectTransform:
		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: -52.9, y: 90}
		m_AnchoredPosition: {x: -43.34001, y: 90}
		m_SizeDelta: {x: 167.3, y: 27.1}
		m_Pivot: {x: 0.5, y: 0.5}
		--- !u!222 &3910689052537673541
		@@ -21077,6 +21076,7 @@ MonoBehaviour:
		m_hasFontAssetChanged: 0
		m_renderer: {fileID: 1103927635379923828}
		m_maskType: 0
		_SortingLayer: 0
		_SortingLayerID: 0
		_SortingOrder: 0
		--- !u!1 &4769662228628033262
		@@ -21687,6 +21687,7 @@ MonoBehaviour:
		m_hasFontAssetChanged: 0
		m_renderer: {fileID: 1317935261445158403}
		m_maskType: 0
		_SortingLayer: 0
		_SortingLayerID: 0
		_SortingOrder: 0
		--- !u!1 &4902162456807110972
		@@ -23416,8 +23417,8 @@ RectTransform:
		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: -368.71, y: -181.05}
		m_SizeDelta: {x: 328.4, y: 277.89}
		m_AnchoredPosition: {x: -384.32, y: -181.05}
		m_SizeDelta: {x: 297.19, y: 277.89}
		m_Pivot: {x: 0.5, y: 0.5}
		--- !u!222 &1570486971978722207
		CanvasRenderer:
		@@ -25952,139 +25953,6 @@ RectTransform:
		m_AnchoredPosition: {x: 42, y: 99.899994}
		m_SizeDelta: {x: 50, y: 20}
		m_Pivot: {x: 1, y: 0.5}
		--- !u!1 &6614629219217152669
		GameObject:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		serializedVersion: 6
		m_Component:
		- component: {fileID: 1914025255032359112}
		- component: {fileID: 2128623632262208948}
		- component: {fileID: 56747531306422669}
		- component: {fileID: 8340087037107655430}
		m_Layer: 0
		m_Name: "\u62CD\u7167"
		m_TagString: Untagged
		m_Icon: {fileID: 0}
		m_NavMeshLayer: 0
		m_StaticEditorFlags: 0
		m_IsActive: 1
		--- !u!224 &1914025255032359112
		RectTransform:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 6614629219217152669}
		m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
		m_LocalPosition: {x: 0, y: 0, z: 0}
		m_LocalScale: {x: 1, y: 1, z: 1}
		m_Children:
		- {fileID: 2683787476104573375}
		m_Father: {fileID: 7825953982499464284}
		m_RootOrder: 2
		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: 390.9, y: -264.69}
		m_SizeDelta: {x: 272.91, y: 78.6}
		m_Pivot: {x: 0.5, y: 0.5}
		--- !u!222 &2128623632262208948
		CanvasRenderer:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 6614629219217152669}
		m_CullTransparentMesh: 1
		--- !u!114 &56747531306422669
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 6614629219217152669}
		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 &8340087037107655430
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 6614629219217152669}
		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: 0, g: 0.627451, b: 0.91372555, a: 0.38431373}
		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: 56747531306422669}
		m_OnClick:
		m_PersistentCalls:
		m_Calls:
		- m_Target: {fileID: 8765985035443848586}
		m_TargetAssemblyTypeName: PhotoManager, Assembly-CSharp
		m_MethodName: StartCapture
		m_Mode: 1
		m_Arguments:
		m_ObjectArgument: {fileID: 0}
		m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
		m_IntArgument: 0
		m_FloatArgument: 0
		m_StringArgument:
		m_BoolArgument: 0
		m_CallState: 2
		--- !u!1 &6615462499879555563
		GameObject:
		m_ObjectHideFlags: 0
		@@ -26640,6 +26508,7 @@ MonoBehaviour:
		roadTraffic: {fileID: 6797482586269445440}
		covid19News: {fileID: 6285115207229887494}
		covid19CNStatistic: {fileID: 5284661190892024666}
		locImage: {fileID: 18843048725394792}
		--- !u!1 &6678022008794379022
		GameObject:
		m_ObjectHideFlags: 0
		@@ -29677,14 +29546,15 @@ RectTransform:
		m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
		m_LocalPosition: {x: 0, y: 0, z: 0}
		m_LocalScale: {x: 1, y: 1, z: 1}
		m_Children: []
		m_Children:
		- {fileID: 3198072773260686507}
		m_Father: {fileID: 7825953982499464284}
		m_RootOrder: 3
		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: 419.1, y: 205}
		m_SizeDelta: {x: 241.8, y: 230}
		m_AnchoredPosition: {x: 413, y: 186}
		m_SizeDelta: {x: 250, y: 250}
		m_Pivot: {x: 0.5, y: 0.5}
		--- !u!222 &3119119721224233593
		CanvasRenderer:
		@@ -30075,8 +29945,8 @@ RectTransform:
		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: 2, y: -28.4}
		m_SizeDelta: {x: 197.3, y: 162.8}
		m_AnchoredPosition: {x: 1, y: -32.9}
		m_SizeDelta: {x: 195.3, y: 162.8}
		m_Pivot: {x: 0.5, y: 0.5}
		--- !u!222 &4943134037113457526
		CanvasRenderer:
		@@ -34684,3 +34554,113 @@ RectTransform:
		m_AnchoredPosition: {x: -5, y: 0}
		m_SizeDelta: {x: -20, y: 0}
		m_Pivot: {x: 0.5, y: 0.5}
		--- !u!1001 &1108993769065087763
		PrefabInstance:
		m_ObjectHideFlags: 0
		serializedVersion: 2
		m_Modification:
		m_TransformParent: {fileID: 7825953982499464284}
		m_Modifications:
		- target: {fileID: 1129523842154474, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_Name
		value: "\u62CD\u7167"
		objectReference: {fileID: 0}
		- target: {fileID: 4457593704773214, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalScale.x
		value: 1
		objectReference: {fileID: 0}
		- target: {fileID: 4457593704773214, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalScale.y
		value: 1
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_RootOrder
		value: 2
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalScale.x
		value: 1000
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalScale.y
		value: 1000
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalPosition.x
		value: 422
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalPosition.y
		value: -265
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalPosition.z
		value: 0
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalRotation.w
		value: 1
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalRotation.x
		value: 0
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalRotation.y
		value: 0
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalRotation.z
		value: 0
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalEulerAnglesHint.x
		value: 0
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalEulerAnglesHint.y
		value: 0
		objectReference: {fileID: 0}
		- target: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_LocalEulerAnglesHint.z
		value: 0
		objectReference: {fileID: 0}
		- target: {fileID: 102556874199586456, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: m_Text
		value: "\u62CD\u7167"
		objectReference: {fileID: 0}
		- target: {fileID: 114818926546564510, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.size
		value: 1
		objectReference: {fileID: 0}
		- target: {fileID: 114818926546564510, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
		value: 1
		objectReference: {fileID: 0}
		- target: {fileID: 114818926546564510, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
		value:
		objectReference: {fileID: 8765985035443848586}
		- target: {fileID: 114818926546564510, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
		value: 2
		objectReference: {fileID: 0}
		- target: {fileID: 114818926546564510, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
		value: StartCapture
		objectReference: {fileID: 0}
		- target: {fileID: 114818926546564510, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
		value: PhotoManager, Assembly-CSharp
		objectReference: {fileID: 0}
		- target: {fileID: 114818926546564510, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
		value: UnityEngine.Object, UnityEngine
		objectReference: {fileID: 0}
		m_RemovedComponents: []
		m_SourcePrefab: {fileID: 100100000, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		--- !u!4 &1113101104334238429 stripped
		Transform:
		m_CorrespondingSourceObject: {fileID: 4899954742063566, guid: 02c524b22137b5449904f5395141cc73, type: 3}
		m_PrefabInstance: {fileID: 1108993769065087763}
		m_PrefabAsset: {fileID: 0}

Assets/Script/GeographyManager.cs

+33 −12

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ using LitJson;
		using Microsoft.MixedReality.Toolkit.Utilities.Gltf.Serialization;
		using Script;
		using UnityEngine;
		using UnityEngine.Networking;
		using UnityEngine.UI;
		using XCharts;

		@@ -20,6 +21,7 @@ public class GeographyManager : MonoBehaviour
		public Text roadTraffic;
		public Text covid19News;
		public Text covid19CNStatistic;
		public Image locImage;

		private float longitudeValue;
		private float latitudeValue;
		@@ -46,7 +48,6 @@ public class GeographyManager : MonoBehaviour
		// #endif



		void Awake()
		{
		fpsChart = transform.Find("Geographic_Canvas/FPS/FpsChart").gameObject.GetComponent<LineChart>();
		@@ -87,7 +88,6 @@ public class GeographyManager : MonoBehaviour
		}



		// Update is called once per frame
		void Update()
		{
		@@ -143,7 +143,6 @@ public class GeographyManager : MonoBehaviour
		message += "重症病例：" + data["severe"] + "\n";
		message += "死亡病例：" + data["death"] + "\n";
		covid19CNStatistic.text = message;

		}

		IEnumerator GetCovid19ProvinceStatistic()
		@@ -198,6 +197,7 @@ public class GeographyManager : MonoBehaviour
		newsText += item["title"] + "\n";
		newsText += "\n";
		}

		covid19News.text = newsText;
		}

		@@ -231,6 +231,27 @@ public class GeographyManager : MonoBehaviour
		roadTraffic.text = "路况：" + roadRequest.value["evaluation"]["status_desc"];
		}

		Debug.Log("555");

		// 静态图
		string imageUrl = Config.GetBaiduUrl() + "/staticimage/v2?";
		imageUrl += "ak=" + Config.BaiduKey + "&";
		imageUrl += "copyright=1&zoom=14&scale=2&";
		imageUrl += "width=200&height=200&";
		imageUrl += "center=" + User.GetInstance().Longitude + "," + User.GetInstance().Latitude;
		imageUrl += "&marker=" + User.GetInstance().Longitude + "," + User.GetInstance().Latitude;
		Debug.Log(imageUrl);
		using (UnityWebRequest webRequest = UnityWebRequest.Get(imageUrl))
		{
		yield return webRequest.SendWebRequest();
		var res = webRequest.downloadHandler.data;
		Texture2D texture = new Texture2D(200, 200);
		Debug.Log("666");
		texture.LoadImage(res);
		Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height),
		new Vector2(0.5f, 0.5f));
		locImage.sprite = sprite;
		}
		// 天气
		string weatherUrl =
		"http://api.k780.com/?app=weather.today&appkey=62989&sign=7f56d749e9a3daabdf428041093b8076&";
		@@ -253,7 +274,7 @@ public class GeographyManager : MonoBehaviour
		"，空气质量：" + weatherRequest.value["result"]["aqi"];
		}

		yield return new WaitForSeconds(5);
		yield return new WaitForSeconds(10);
		}
		// ReSharper disable once IteratorNeverReturns
		}

Assets/XR/Settings/OpenXR Package Settings.asset

+13 −13

Original line number	Diff line number	Diff line
		@@ -576,23 +576,23 @@ MonoBehaviour:
		m_Name: Standalone
		m_EditorClassIdentifier:
		features:
		- {fileID: 7043102652005233253}
		- {fileID: 112831883837961002}
		- {fileID: 4638232705140945460}
		- {fileID: -5623942128019531847}
		- {fileID: -5963857468294596464}
		- {fileID: -1242324163370829451}
		- {fileID: -9147146335095352416}
		- {fileID: -4330604788367655959}
		- {fileID: 5873550958796627032}
		- {fileID: -613213927022108923}
		- {fileID: 2701831414873701736}
		- {fileID: -5963857468294596464}
		- {fileID: -5623942128019531847}
		- {fileID: 301638599806002992}
		- {fileID: -2382503822862084095}
		- {fileID: 4512656189636402379}
		- {fileID: 4790288554916284514}
		- {fileID: 7043102652005233253}
		- {fileID: -613213927022108923}
		- {fileID: 5441653911826862604}
		- {fileID: 4512656189636402379}
		- {fileID: -2382503822862084095}
		- {fileID: -308087878078707025}
		- {fileID: 2701831414873701736}
		m_renderMode: 1
		m_depthSubmissionMode: 2
		--- !u!114 &-3456661136633388546
		@@ -1117,8 +1117,8 @@ MonoBehaviour:
		- {fileID: -2167587169140802582}
		- {fileID: 2642260060965064186}
		- {fileID: -5453402968246830744}
		- {fileID: 5323760025415263377}
		- {fileID: 8591437173560396057}
		- {fileID: 5323760025415263377}
		- {fileID: 4072758183505995000}
		m_renderMode: 1
		m_depthSubmissionMode: 0
		@@ -1832,19 +1832,19 @@ MonoBehaviour:
		m_Name: WSA
		m_EditorClassIdentifier:
		features:
		- {fileID: -4826278581707760444}
		- {fileID: -8023194016920474009}
		- {fileID: 5111920694304143682}
		- {fileID: 8653613282057183868}
		- {fileID: 8194737713150798771}
		- {fileID: -6907784582482280312}
		- {fileID: 5412131156055509969}
		- {fileID: 7174885751759236216}
		- {fileID: -3330554251803973482}
		- {fileID: -6239283959558621379}
		- {fileID: 2851647574581494549}
		- {fileID: 8194737713150798771}
		- {fileID: 8653613282057183868}
		- {fileID: -6473881752634035066}
		- {fileID: -8736031796935440820}
		- {fileID: -4826278581707760444}
		- {fileID: -6239283959558621379}
		- {fileID: 5191902328064754016}
		- {fileID: 2851647574581494549}
		m_renderMode: 1
		m_depthSubmissionMode: 1

Packages/manifest.json

+7 −7

Original line number	Diff line number	Diff line
		@@ -3,15 +3,16 @@
		"com.microsoft.mixedreality.openxr": "file:MixedReality/com.microsoft.mixedreality.openxr-1.0.2.tgz",
		"com.microsoft.mixedreality.toolkit.foundation": "file:MixedReality/com.microsoft.mixedreality.toolkit.foundation-2.7.2.tgz",
		"com.microsoft.mixedreality.toolkit.standardassets": "file:MixedReality/com.microsoft.mixedreality.toolkit.standardassets-2.7.2.tgz",
		"com.unity.collab-proxy": "1.3.9",
		"com.monitor1394.xcharts": "https://github.com/monitor1394/unity-ugui-XCharts.git#2.0-upm",
		"com.unity.collab-proxy": "1.7.1",
		"com.unity.ide.rider": "2.0.7",
		"com.unity.ide.visualstudio": "2.0.7",
		"com.unity.ide.visualstudio": "2.0.11",
		"com.unity.ide.vscode": "1.2.3",
		"com.unity.test-framework": "1.1.22",
		"com.unity.textmeshpro": "3.0.1",
		"com.unity.timeline": "1.4.6",
		"com.unity.test-framework": "1.1.27",
		"com.unity.textmeshpro": "3.0.6",
		"com.unity.timeline": "1.4.8",
		"com.unity.ugui": "1.0.0",
		"com.unity.xr.openxr": "1.0.3",
		"com.unity.xr.openxr": "1.2.3",
		"com.unity.modules.ai": "1.0.0",
		"com.unity.modules.androidjni": "1.0.0",
		"com.unity.modules.animation": "1.0.0",
		@@ -21,7 +22,6 @@
		"com.unity.modules.director": "1.0.0",
		"com.unity.modules.imageconversion": "1.0.0",
		"com.unity.modules.imgui": "1.0.0",
		"com.monitor1394.xcharts": "https://github.com/monitor1394/unity-ugui-XCharts.git#2.0-upm",
		"com.unity.modules.jsonserialize": "1.0.0",
		"com.unity.modules.particlesystem": "1.0.0",
		"com.unity.modules.physics": "1.0.0",

Packages/packages-lock.json

+17 −8

File changed.

Preview size limit exceeded, changes collapsed.

Admin message