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
@@ -0,0 +1,421 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &9117978368590671179
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9117978368590671176}
|
||||
- component: {fileID: 9117978368590671178}
|
||||
- component: {fileID: 9117978368590671177}
|
||||
m_Layer: 0
|
||||
m_Name: Map
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &9117978368590671176
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9117978368590671179}
|
||||
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: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &9117978368590671178
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9117978368590671179}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: cd961b1c9541a4cee99686069ecce852, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_options:
|
||||
locationOptions:
|
||||
latitudeLongitude: 37.784179, -122.401583
|
||||
zoom: 16
|
||||
extentOptions:
|
||||
extentType: 0
|
||||
defaultExtents:
|
||||
cameraBoundsOptions:
|
||||
camera: {fileID: 0}
|
||||
visibleBuffer: 0
|
||||
disposeBuffer: 0
|
||||
rangeAroundCenterOptions:
|
||||
west: 1
|
||||
north: 1
|
||||
east: 1
|
||||
south: 1
|
||||
rangeAroundTransformOptions:
|
||||
targetTransform: {fileID: 0}
|
||||
visibleBuffer: 0
|
||||
disposeBuffer: 0
|
||||
placementOptions:
|
||||
placementType: 1
|
||||
snapMapToZero: 0
|
||||
scalingOptions:
|
||||
scalingType: 1
|
||||
unityTileSize: 100
|
||||
loadingTexture: {fileID: 2800000, guid: e2896a92727704803a9c422b043eae89, type: 3}
|
||||
tileMaterial: {fileID: 2100000, guid: b9f23e9bce724fa4daac57ecded470b8, type: 2}
|
||||
_initializeOnStart: 0
|
||||
_imagery:
|
||||
_layerProperty:
|
||||
sourceType: 2
|
||||
sourceOptions:
|
||||
isActive: 1
|
||||
layerSource:
|
||||
Name: Dark
|
||||
Id: mapbox://styles/mapbox/dark-v9
|
||||
Modified:
|
||||
UserName:
|
||||
rasterOptions:
|
||||
useRetina: 0
|
||||
useCompression: 0
|
||||
useMipMap: 0
|
||||
_terrain:
|
||||
_layerProperty:
|
||||
sourceType: 0
|
||||
sourceOptions:
|
||||
isActive: 1
|
||||
layerSource:
|
||||
Name:
|
||||
Id: mapbox.terrain-rgb
|
||||
Modified:
|
||||
UserName:
|
||||
elevationLayerType: 0
|
||||
requiredOptions:
|
||||
exaggerationFactor: 1
|
||||
colliderOptions:
|
||||
addCollider: 0
|
||||
modificationOptions:
|
||||
sampleCount: 10
|
||||
useRelativeHeight: 1
|
||||
earthRadius: 1000
|
||||
unityLayerOptions:
|
||||
addToLayer: 0
|
||||
layerId: 0
|
||||
sideWallOptions:
|
||||
isActive: 0
|
||||
wallHeight: 10
|
||||
wallMaterial: {fileID: 0}
|
||||
_vectorData:
|
||||
_layerProperty:
|
||||
tileJsonData:
|
||||
tileJSONLoaded: 0
|
||||
LayerDisplayNames:
|
||||
- admin
|
||||
- aeroway
|
||||
- airport_label
|
||||
- barrier_line
|
||||
- building
|
||||
- contour
|
||||
- country_label
|
||||
- hillshade
|
||||
- housenum_label
|
||||
- landcover
|
||||
- landuse
|
||||
- landuse_overlay
|
||||
- marine_label
|
||||
- motorway_junction
|
||||
- mountain_peak_label
|
||||
- place_label
|
||||
- poi_label
|
||||
- rail_station_label
|
||||
- road
|
||||
- road_label
|
||||
- state_label
|
||||
- traffic
|
||||
- water
|
||||
- water_label
|
||||
- waterway
|
||||
- waterway_label
|
||||
_sourceType: 2
|
||||
sourceOptions:
|
||||
isActive: 1
|
||||
layerSource:
|
||||
Name: Mapbox Terrain
|
||||
Id: mapbox.3d-buildings,mapbox.mapbox-streets-v7,mapbox.mapbox-traffic-v1,mapbox.mapbox-terrain-v2
|
||||
Modified:
|
||||
UserName:
|
||||
useOptimizedStyle: 0
|
||||
optimizedStyle:
|
||||
Name:
|
||||
Id:
|
||||
Modified:
|
||||
UserName:
|
||||
performanceOptions:
|
||||
isEnabled: 1
|
||||
entityPerCoroutine: 20
|
||||
vectorSubLayers:
|
||||
- coreOptions:
|
||||
sourceId:
|
||||
isActive: 1
|
||||
sublayerName: Park
|
||||
geometryType: 2
|
||||
layerName: landuse
|
||||
snapToTerrain: 1
|
||||
combineMeshes: 0
|
||||
lineGeometryOptions:
|
||||
Width: 1
|
||||
MiterLimit: 0.2
|
||||
RoundLimit: 1.05
|
||||
JoinType: 1
|
||||
CapType: 1
|
||||
filterOptions:
|
||||
_selectedLayerName: landuse
|
||||
filters: []
|
||||
combinerType: 0
|
||||
extrusionOptions:
|
||||
_selectedLayerName: landuse
|
||||
extrusionType: 5
|
||||
extrusionGeometryType: 1
|
||||
propertyName: height
|
||||
propertyDescription: Number. Height of building or part of building.
|
||||
minimumHeight: 3
|
||||
maximumHeight: 0.5
|
||||
extrusionScaleFactor: 1
|
||||
colliderOptions:
|
||||
colliderType: 2
|
||||
materialOptions:
|
||||
style: 0
|
||||
texturingType: 2
|
||||
materials:
|
||||
- Materials:
|
||||
- {fileID: 2100000, guid: dd22d0eb52da4594e90fbb4dd7ae0baf, type: 2}
|
||||
- Materials:
|
||||
- {fileID: 0}
|
||||
atlasInfo: {fileID: 0}
|
||||
lightStyleOpacity: 1
|
||||
darkStyleOpacity: 1
|
||||
colorStyleColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
samplePalettes: 0
|
||||
colorPalette: {fileID: 0}
|
||||
customStyleOptions:
|
||||
texturingType: 0
|
||||
materials:
|
||||
- Materials:
|
||||
- {fileID: 2100000, guid: dd22d0eb52da4594e90fbb4dd7ae0baf, type: 2}
|
||||
- Materials:
|
||||
- {fileID: 2100000, guid: dd22d0eb52da4594e90fbb4dd7ae0baf, type: 2}
|
||||
atlasInfo: {fileID: 0}
|
||||
colorPalette: {fileID: 0}
|
||||
performanceOptions:
|
||||
isEnabled: 1
|
||||
entityPerCoroutine: 20
|
||||
honorBuildingIdSetting: 1
|
||||
buildingsWithUniqueIds: 0
|
||||
moveFeaturePositionTo: 0
|
||||
MeshModifiers: []
|
||||
GoModifiers:
|
||||
- {fileID: 11400000, guid: 3505ec4e61e3f4c4d88fc3c5548e7144, type: 2}
|
||||
- {fileID: 11400000, guid: e425dc440a40d9a4080794105e9f66ef, type: 2}
|
||||
presetFeatureType: 2
|
||||
_maskValue: 0
|
||||
selectedTypes:
|
||||
- coreOptions:
|
||||
sourceId:
|
||||
isActive: 1
|
||||
sublayerName: Traffic
|
||||
geometryType: 3
|
||||
layerName: road
|
||||
snapToTerrain: 0
|
||||
combineMeshes: 0
|
||||
lineGeometryOptions:
|
||||
Width: 1
|
||||
MiterLimit: 0.2
|
||||
RoundLimit: 1.05
|
||||
JoinType: 1
|
||||
CapType: 1
|
||||
filterOptions:
|
||||
_selectedLayerName: road
|
||||
filters:
|
||||
- Key: class
|
||||
KeyDescription: 'One of: ''motorway'', ''motorway_link'', ''trunk'',
|
||||
''primary'', ''secondary'', ''tertiary'', ''link'', ''street'', ''street_limited'',
|
||||
''pedestrian'', ''construction'', ''track'', ''service'', ''ferry'',
|
||||
''path'', ''golf'''
|
||||
PropertyValue: major
|
||||
Min: 0
|
||||
Max: 0
|
||||
filterOperator: 0
|
||||
- Key: class
|
||||
KeyDescription: 'One of: ''motorway'', ''motorway_link'', ''trunk'',
|
||||
''primary'', ''secondary'', ''tertiary'', ''link'', ''street'', ''street_limited'',
|
||||
''pedestrian'', ''construction'', ''track'', ''service'', ''ferry'',
|
||||
''path'', ''golf'''
|
||||
PropertyValue: street
|
||||
Min: 0
|
||||
Max: 0
|
||||
filterOperator: 0
|
||||
- Key: class
|
||||
KeyDescription: 'One of: ''motorway'', ''motorway_link'', ''trunk'',
|
||||
''primary'', ''secondary'', ''tertiary'', ''link'', ''street'', ''street_limited'',
|
||||
''pedestrian'', ''construction'', ''track'', ''service'', ''ferry'',
|
||||
''path'', ''golf'''
|
||||
PropertyValue: tertiary
|
||||
Min: 0
|
||||
Max: 0
|
||||
filterOperator: 0
|
||||
- Key: class
|
||||
KeyDescription: 'One of: ''motorway'', ''motorway_link'', ''trunk'',
|
||||
''primary'', ''secondary'', ''tertiary'', ''link'', ''street'', ''street_limited'',
|
||||
''pedestrian'', ''construction'', ''track'', ''service'', ''ferry'',
|
||||
''path'', ''golf'''
|
||||
PropertyValue: primary
|
||||
Min: 0
|
||||
Max: 0
|
||||
filterOperator: 0
|
||||
- Key: class
|
||||
KeyDescription: 'One of: ''motorway'', ''motorway_link'', ''trunk'',
|
||||
''primary'', ''secondary'', ''tertiary'', ''link'', ''street'', ''street_limited'',
|
||||
''pedestrian'', ''construction'', ''track'', ''service'', ''ferry'',
|
||||
''path'', ''golf'''
|
||||
PropertyValue: secondary
|
||||
Min: 0
|
||||
Max: 0
|
||||
filterOperator: 0
|
||||
combinerType: 0
|
||||
extrusionOptions:
|
||||
_selectedLayerName: road
|
||||
extrusionType: 0
|
||||
extrusionGeometryType: 0
|
||||
propertyName: height
|
||||
propertyDescription: Number. Height of building or part of building.
|
||||
minimumHeight: 3
|
||||
maximumHeight: 0.2
|
||||
extrusionScaleFactor: 1
|
||||
colliderOptions:
|
||||
colliderType: 0
|
||||
materialOptions:
|
||||
style: 0
|
||||
texturingType: 2
|
||||
materials:
|
||||
- Materials:
|
||||
- {fileID: 0}
|
||||
- Materials:
|
||||
- {fileID: 0}
|
||||
atlasInfo: {fileID: 0}
|
||||
lightStyleOpacity: 1
|
||||
darkStyleOpacity: 1
|
||||
colorStyleColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
samplePalettes: 0
|
||||
colorPalette: {fileID: 0}
|
||||
customStyleOptions:
|
||||
texturingType: 0
|
||||
materials:
|
||||
- Materials:
|
||||
- {fileID: 0}
|
||||
- Materials:
|
||||
- {fileID: 0}
|
||||
atlasInfo: {fileID: 0}
|
||||
colorPalette: {fileID: 0}
|
||||
performanceOptions:
|
||||
isEnabled: 1
|
||||
entityPerCoroutine: 20
|
||||
honorBuildingIdSetting: 1
|
||||
buildingsWithUniqueIds: 0
|
||||
moveFeaturePositionTo: 0
|
||||
MeshModifiers:
|
||||
- {fileID: 11400000, guid: ed4da4864f7b7394399b675a217cd637, type: 2}
|
||||
GoModifiers:
|
||||
- {fileID: 11400000, guid: 5ad7c36a7a62f8b4cbcbcea8139a12a5, type: 2}
|
||||
presetFeatureType: 1
|
||||
_maskValue: 0
|
||||
selectedTypes:
|
||||
- coreOptions:
|
||||
sourceId:
|
||||
isActive: 1
|
||||
sublayerName: Buildings
|
||||
geometryType: 2
|
||||
layerName: building
|
||||
snapToTerrain: 1
|
||||
combineMeshes: 0
|
||||
lineGeometryOptions:
|
||||
Width: 1
|
||||
MiterLimit: 0.2
|
||||
RoundLimit: 1.05
|
||||
JoinType: 1
|
||||
CapType: 1
|
||||
filterOptions:
|
||||
_selectedLayerName: building
|
||||
filters: []
|
||||
combinerType: 0
|
||||
extrusionOptions:
|
||||
_selectedLayerName: building
|
||||
extrusionType: 1
|
||||
extrusionGeometryType: 0
|
||||
propertyName: height
|
||||
propertyDescription: Number. Height of building or part of building.
|
||||
minimumHeight: 3
|
||||
maximumHeight: 1
|
||||
extrusionScaleFactor: 1
|
||||
colliderOptions:
|
||||
colliderType: 0
|
||||
materialOptions:
|
||||
style: 0
|
||||
texturingType: 2
|
||||
materials:
|
||||
- Materials:
|
||||
- {fileID: 0}
|
||||
- Materials:
|
||||
- {fileID: 0}
|
||||
atlasInfo: {fileID: 11400000, guid: c422f39ca8fe566479230c87805b3301, type: 2}
|
||||
lightStyleOpacity: 1
|
||||
darkStyleOpacity: 1
|
||||
colorStyleColor: {r: 0.1764706, g: 0.8509805, b: 1, a: 1}
|
||||
samplePalettes: 0
|
||||
colorPalette: {fileID: 0}
|
||||
customStyleOptions:
|
||||
texturingType: 0
|
||||
materials:
|
||||
- Materials:
|
||||
- {fileID: 2100000, guid: 0f9e3de68a3085e469bd62c8b40e9487, type: 2}
|
||||
- Materials:
|
||||
- {fileID: 2100000, guid: 6ec7317f2ac57e2448326cdc68816797, type: 2}
|
||||
atlasInfo: {fileID: 11400000, guid: 414754d7155df47beb52ca117a774f21,
|
||||
type: 2}
|
||||
colorPalette: {fileID: 11400000, guid: 57bdfa37edf7a4f7f999d19443497554,
|
||||
type: 2}
|
||||
performanceOptions:
|
||||
isEnabled: 1
|
||||
entityPerCoroutine: 20
|
||||
honorBuildingIdSetting: 1
|
||||
buildingsWithUniqueIds: 1
|
||||
moveFeaturePositionTo: 0
|
||||
MeshModifiers: []
|
||||
GoModifiers: []
|
||||
presetFeatureType: 0
|
||||
_maskValue: 0
|
||||
selectedTypes:
|
||||
locationPrefabList: []
|
||||
_tileProvider: {fileID: 0}
|
||||
_previewOptions:
|
||||
isPreviewEnabled: 0
|
||||
--- !u!114 &9117978368590671177
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9117978368590671179}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 96f0fa82f89d64bb9a6524c72d538179, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_map: {fileID: 9117978368590671178}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 23bf2ae018bddfe4c8268726483adfbc
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in new issue
Block a user