Merge remote-tracking branch 'origin/dev' into dev_lishuo
# Conflicts: # Assets/Cyp/Prefab.meta # Assets/Mapbox/Core/Plugins/Android.meta # Assets/Mapbox/Core/Plugins/Mapbox.meta # Assets/Mapbox/Core/Plugins/Mapbox/MapboxAccounts.meta # Assets/Plugins/Circle/ImageWithRoundedCorners.cs # Assets/Resources/Images/Devices.meta # Assets/Resources/UI/Prefab/Item.meta # Assets/Scripts/Devices/Ant/LegacyPages.meta # Assets/Scripts/UI/Prefab/Item.meta # Assets/StreamingAssets.meta # ProjectSettings/EditorBuildSettings.asset
This commit is contained in:
lishuo committed
commit
ae9cefc645
144 files changed
+32337
-8064
No files matched your search
+13223
-2791
File diff suppressed because it is too large.
Load diff
@@ -279,24 +279,6 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1198847121 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5779676823934981810, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5779676824892547619}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1410840726 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5779676824154970805, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5779676824892547619}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1678571397
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -349,7 +331,7 @@ MonoBehaviour:
|
||||
m_UiScaleMode: 1
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 1440, y: 1024}
|
||||
m_ReferenceResolution: {x: 1440, y: 900}
|
||||
m_ScreenMatchMode: 1
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
@@ -388,7 +370,7 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_Children:
|
||||
- {fileID: 1929504118}
|
||||
- {fileID: 5779676825325334626}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -410,18 +392,11 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
map: {fileID: 5262667172184159175, guid: fb5f2cc3db40bc44589a1d265794a77b, type: 3}
|
||||
content: {fileID: 1198847121}
|
||||
hardSelector: {fileID: 1410840726}
|
||||
content: {fileID: 0}
|
||||
scroll: {fileID: 0}
|
||||
pageIndex: 0
|
||||
pageSize: 20
|
||||
hard: "\u5168\u90E8"
|
||||
isEnd: 0
|
||||
--- !u!224 &1929504118 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5779676824892547619}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1944211662
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -505,127 +480,128 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &5779676824892547619
|
||||
--- !u!224 &5779676825325334626 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 8890016156753023452}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &8890016156753023452
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1678571401}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5779676823934981809, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229181, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
propertyPath: m_Name
|
||||
value: MapDetailPanel
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 1440
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 1024
|
||||
value: 900
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420565, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
- target: {fileID: 3128356753594229182, guid: d14642f8a6e2a79429065eba5837fe32,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5779676824674420566, guid: 23f9c63039087fb41b8f696afada9466,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MapList
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 23f9c63039087fb41b8f696afada9466, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d14642f8a6e2a79429065eba5837fe32, type: 3}
|
||||
@@ -173,7 +173,7 @@ MonoBehaviour:
|
||||
m_UiScaleMode: 1
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 1440, y: 1024}
|
||||
m_ReferenceResolution: {x: 1440, y: 900}
|
||||
m_ScreenMatchMode: 1
|
||||
m_MatchWidthOrHeight: 1
|
||||
m_PhysicalUnit: 3
|
||||
@@ -213,6 +213,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_Children:
|
||||
- {fileID: 730655536}
|
||||
- {fileID: 1985738406}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -417,7 +418,7 @@ RectTransform:
|
||||
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: 1440, y: 1024}
|
||||
m_SizeDelta: {x: 1440, y: 900}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &730655537
|
||||
MonoBehaviour:
|
||||
@@ -591,3 +592,38 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1985738405
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1985738406}
|
||||
m_Layer: 5
|
||||
m_Name: ModalPanel
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1985738406
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1985738405}
|
||||
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: 273807004}
|
||||
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: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
+619
-1069
File diff suppressed because it is too large.
Load diff
@@ -148,12 +148,13 @@ public class CyclingController : MonoBehaviour
|
||||
|
||||
//获取路书信息
|
||||
//MapApi mapApi = new MapApi();
|
||||
//var result = mapApi.GetData(5942);
|
||||
RouteId = 5942;
|
||||
var result = GetTestData();
|
||||
mapApi = new MapApi();
|
||||
RouteId = App.RouteIdParam;
|
||||
//var result = GetTestData();
|
||||
var result = mapApi.GetData(RouteId);
|
||||
//StartCoroutine(requset());
|
||||
//获取UDP信息 TODO
|
||||
mapApi = new MapApi();
|
||||
|
||||
//var param = mapApi.GetById(RouteId);
|
||||
//Route mapRoute = GetNewInstace(RouteId);//获取一个路书所有的数据
|
||||
|
||||
|
||||
Reference in new issue
Block a user