未修改弹出框接口为实时请求
This commit is contained in:
parent
39870e7b64
commit
456890ad83
Binary file not shown.
|
|
@ -166474,7 +166474,7 @@ Material:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: mysimhei SDF Material
|
||||
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
|
||||
m_Shader: {fileID: 4800000, guid: dd89cf5b9246416f84610a006f916af7, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
|
|
@ -166506,6 +166506,10 @@ Material:
|
|||
m_Texture: {fileID: 465303493636647840}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MaskTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OutlineTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
|
|
@ -166523,7 +166527,9 @@ Material:
|
|||
- _ColorMask: 15
|
||||
- _CullMode: 0
|
||||
- _Diffuse: 0.5
|
||||
- _DiffusePower: 1
|
||||
- _FaceDilate: 0
|
||||
- _FaceShininess: 0
|
||||
- _FaceUVSpeedX: 0
|
||||
- _FaceUVSpeedY: 0
|
||||
- _GlowInner: 0
|
||||
|
|
@ -166532,12 +166538,17 @@ Material:
|
|||
- _GlowPower: 0.7
|
||||
- _GradientScale: 6
|
||||
- _LightAngle: 3.1416
|
||||
- _MaskEdgeSoftness: 0.01
|
||||
- _MaskInverse: 0
|
||||
- _MaskSoftnessX: 0
|
||||
- _MaskSoftnessY: 0
|
||||
- _MaskWipeControl: 0.5
|
||||
- _OutlineShininess: 0
|
||||
- _OutlineSoftness: 0
|
||||
- _OutlineUVSpeedX: 0
|
||||
- _OutlineUVSpeedY: 0
|
||||
- _OutlineWidth: 0
|
||||
- _Padding: 0
|
||||
- _PerspectiveFilter: 0.875
|
||||
- _Reflectivity: 10
|
||||
- _ScaleRatioA: 0.8333333
|
||||
|
|
@ -166565,13 +166576,16 @@ Material:
|
|||
- _WeightNormal: 0
|
||||
m_Colors:
|
||||
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _GlowColor: {r: 1, g: 0.9251674, b: 0, a: 0.77254903}
|
||||
- _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
|
||||
- _MaskEdgeColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
|
|||
|
|
@ -0,0 +1,64 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &-4875011776198486060
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CompanyPoint
|
||||
m_Shader: {fileID: -6465566751694194690, guid: 2ab35d93f4dd20740962fd01b6129924,
|
||||
type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 2
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _GradientTex:
|
||||
m_Texture: {fileID: 2800000, guid: 8f1b8f4c601c9d64eb282871ed003c81, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_Lightmaps:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_LightmapsInd:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_ShadowMasks:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _GradientInt: 1
|
||||
- _QueueControl: 0
|
||||
- _QueueOffset: 0
|
||||
- _offsetSpeed: 0.5
|
||||
m_Colors:
|
||||
- _BaseCol: {r: 10.035759, g: 0.17602772, b: 0, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1d33dcd565a223f4d8f7f8e233f092d8
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -8,7 +8,7 @@ Material:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: InstructPoint1
|
||||
m_Shader: {fileID: 4800000, guid: 989983fab75ea9240a9bf2ea6c938b6f, type: 3}
|
||||
m_Shader: {fileID: 4800000, guid: 47c5d4f19ca965241abf99ed7eb6ec2a, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
|
|
@ -18,7 +18,7 @@ Material:
|
|||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: 2450
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
|
|
@ -96,6 +96,8 @@ Material:
|
|||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _Ratio: 0.5
|
||||
- _ScrollXSpeed: 0
|
||||
- _ScrollYSpeed: 0
|
||||
- _Shininess: 0.2
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
|
|
|
|||
|
|
@ -3507,6 +3507,79 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1001 &78032454
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3189462245748133917, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -2.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3189462245748133917, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 4.11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3189462245748133917, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -5.85
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3189462245748133917, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3189462245748133917, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3189462245748133917, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3189462245748133917, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3189462245748133917, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3189462245748133917, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3189462245748133917, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4538573820757738473, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: DataDisplay
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4538573820757738473, guid: 3e500bc11262d07458f8235ca1b139dd,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3e500bc11262d07458f8235ca1b139dd, type: 3}
|
||||
--- !u!1 &78761315
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -13103,7 +13176,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 283865254}
|
||||
- component: {fileID: 283865253}
|
||||
- component: {fileID: 283865255}
|
||||
m_Layer: 0
|
||||
m_Name: CamareController
|
||||
m_TagString: Untagged
|
||||
|
|
@ -13170,20 +13242,6 @@ Transform:
|
|||
- {fileID: 1564124713}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &283865255
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 283865252}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3eb4821edfbe33540a04ab32d1cf7212, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
logicViewList:
|
||||
- {fileID: 550665371}
|
||||
--- !u!1 &284381272 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7241275530258863104, guid: b16821147ecd671449621c2d8bfef6ef,
|
||||
|
|
@ -15596,7 +15654,7 @@ Transform:
|
|||
m_GameObject: {fileID: 330585543}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.008012746, y: -0.923677, z: 0.38259947, w: 0.019344484}
|
||||
m_LocalPosition: {x: 9.5, y: 85, z: 95}
|
||||
m_LocalPosition: {x: 9.526089, y: 84.85287, z: 85.47382}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -26727,37 +26785,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1982757513}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &550665370
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 550665371}
|
||||
m_Layer: 0
|
||||
m_Name: "\u7701\u4F1A\u89C6\u89D2"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &550665371
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 550665370}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.000000026580254, y: 0.9526376, z: 0.000000008485142, w: -0.3041079}
|
||||
m_LocalPosition: {x: 26.562231, y: -0.000000388732, z: 18.96568}
|
||||
m_LocalScale: {x: 36.866, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1475039300}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &551216901
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -44076,6 +44103,89 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 899508615}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &904876523
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 904876527}
|
||||
- component: {fileID: 904876526}
|
||||
- component: {fileID: 904876525}
|
||||
m_Layer: 0
|
||||
m_Name: 2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!23 &904876525
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 904876523}
|
||||
m_Enabled: 0
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &904876526
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 904876523}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &904876527
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 904876523}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 4.03, y: 3.9, z: 37.31}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &909321079 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2477709072963796445, guid: b16821147ecd671449621c2d8bfef6ef,
|
||||
|
|
@ -51024,6 +51134,89 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1051509084}
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1 &1054410905
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1054410909}
|
||||
- component: {fileID: 1054410908}
|
||||
- component: {fileID: 1054410907}
|
||||
m_Layer: 0
|
||||
m_Name: 3
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!23 &1054410907
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1054410905}
|
||||
m_Enabled: 0
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &1054410908
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1054410905}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &1054410909
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1054410905}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 56.41, y: 3.9, z: -3.06}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1054805013 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8033253450106174698, guid: b16821147ecd671449621c2d8bfef6ef,
|
||||
|
|
@ -67595,7 +67788,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1352919384
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -74492,38 +74685,6 @@ MonoBehaviour:
|
|||
countInfo: {fileID: 1644635287}
|
||||
dataInfo: {fileID: 442155410}
|
||||
isHaveValue: 0
|
||||
--- !u!1 &1475039299
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1475039300}
|
||||
m_Layer: 0
|
||||
m_Name: CaeramView
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1475039300
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1475039299}
|
||||
serializedVersion: 2
|
||||
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: 550665371}
|
||||
m_Father: {fileID: 1621379512}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1475582996
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -79160,7 +79321,7 @@ Transform:
|
|||
m_GameObject: {fileID: 1564124712}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalPosition: {x: 5.9735193, y: 0, z: 0.6953052}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -81379,7 +81540,6 @@ Transform:
|
|||
- {fileID: 1143717408}
|
||||
- {fileID: 951896088}
|
||||
- {fileID: 1188533298}
|
||||
- {fileID: 1475039300}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1621379513
|
||||
|
|
@ -81396,8 +81556,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
landMarkAndInfoCotroller: {fileID: 2125774925}
|
||||
currentLevel: 2
|
||||
currentDisName:
|
||||
currentDistCode:
|
||||
currentDistCode: 0
|
||||
opacity:
|
||||
- {fileID: 2100000, guid: 1a6e1e07c16d2384782c39c6430dd84a, type: 2}
|
||||
- {fileID: 2100000, guid: e54d7143c0e410c4394113c88794a1c1, type: 2}
|
||||
|
|
@ -81435,7 +81594,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
head: Basicc2FiZXI6c2FiZXJfc2VjcmV0
|
||||
token: ' bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiI3OTEyMTQiLCJ1c2VyX25hbWUiOiJhZG1pbiIsInJlYWxfbmFtZSI6ImFkbWluIiwiYXZhdGFyIjoiIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iXSwiY2xpZW50X2lkIjoic2FiZXIiLCJyb2xlX25hbWUiOiJhZG1pbiIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJheW1heCIsInBvc3RfaWQiOiIxNzgwNDc5NzgwMTM5ODMxMjk3IiwidXNlcl9pZCI6IjE3ODA0Nzk3ODA2ODkyODUxMjIiLCJyb2xlX2lkIjoiMTc4MDQ3OTc3MjU5ODQ3MjcwNSIsInNjb3BlIjpbImFsbCJdLCJuaWNrX25hbWUiOiJhZG1pbiIsIm9hdXRoX2lkIjoiIiwiZGV0YWlsIjp7InR5cGUiOiJ3ZWIifSwiZXhwIjoxNzE5ODM3NDgxLCJkZXB0X2lkIjoiMTc4MDQ3OTc4MDAyNjU4NTA5MCIsImp0aSI6ImU1Y2Y1ZDRlLWMwY2MtNDIxOS1iMTA0LTZhNTlhMmE0Y2IyZSIsImFjY291bnQiOiJhZG1pbiJ9.iJ8K6f-_BU-7H2dKlpWr_Bta_ybAmk0MS2V_uq74HNY'
|
||||
token: ' bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiI3OTEyMTQiLCJ1c2VyX25hbWUiOiJhZG1pbiIsInJlYWxfbmFtZSI6ImFkbWluIiwiYXZhdGFyIjoiIiwiYXV0aG9yaXRpZXMiOlsiYWRtaW4iXSwiY2xpZW50X2lkIjoic2FiZXIiLCJyb2xlX25hbWUiOiJhZG1pbiIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJheW1heCIsInBvc3RfaWQiOiIxNzgwNDc5NzgwMTM5ODMxMjk3IiwidXNlcl9pZCI6IjE3ODA0Nzk3ODA2ODkyODUxMjIiLCJyb2xlX2lkIjoiMTEyMzU5ODgxNjczODY3NTIwMiIsInNjb3BlIjpbImFsbCJdLCJuaWNrX25hbWUiOiJhZG1pbiIsIm9hdXRoX2lkIjoiIiwiZGV0YWlsIjp7InR5cGUiOiJ3ZWIiLCJleHQiOiJ7XCJ1c2VyVHlwZVwiOlwiYWRtaW5cIixcInVzZXJJZFwiOjE3ODA0Nzk3ODA2ODkyODUxMjJ9In0sImV4cCI6MTcyMDA2OTc4OCwiZGVwdF9pZCI6IjE3ODA0Nzk3ODAwMjY1ODUwOTAiLCJqdGkiOiJjMDdjMGE1Yy1lMWMwLTQyOGYtYjlhOC1kMjFmOTQyYmY1MTMiLCJhY2NvdW50IjoiYWRtaW4ifQ.p28GV6tLIFngcww--GAA1SL8qhWkrpwQ1OEhwR4qr1c'
|
||||
onStation:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
|
@ -81468,13 +81627,16 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: c7d0dd96bcd307c449f211fc6ca2a673, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
distCode:
|
||||
areaStationData:
|
||||
companyInformationData:
|
||||
code: 0
|
||||
success:
|
||||
data: []
|
||||
msg:
|
||||
screenTopStatisticss: []
|
||||
companyPoint: {fileID: 1822207931}
|
||||
btns: {fileID: 1352919383}
|
||||
originLatitude: 37.7749
|
||||
originLongitude: -122.4194
|
||||
originAltitude: 0
|
||||
--- !u!114 &1621379517
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -92328,6 +92490,89 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1982757513}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1822207931
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1822207934}
|
||||
- component: {fileID: 1822207933}
|
||||
- component: {fileID: 1822207932}
|
||||
m_Layer: 0
|
||||
m_Name: "\u516C\u53F8\u4FE1\u606F\u70B9"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!23 &1822207932
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1822207931}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 1d33dcd565a223f4d8f7f8e233f092d8, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &1822207933
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1822207931}
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &1822207934
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1822207931}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 12.9, y: 4.3, z: 25.8}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
|
||||
--- !u!1 &1823405116 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7205862386091406243, guid: b16821147ecd671449621c2d8bfef6ef,
|
||||
|
|
@ -110953,6 +111198,89 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2128454439}
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1 &2129246559
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2129246563}
|
||||
- component: {fileID: 2129246562}
|
||||
- component: {fileID: 2129246561}
|
||||
m_Layer: 0
|
||||
m_Name: 1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!23 &2129246561
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2129246559}
|
||||
m_Enabled: 0
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &2129246562
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2129246559}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &2129246563
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2129246559}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -59.36, y: 3.9, z: -30.82}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2130909928 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4524496615819290359, guid: b16821147ecd671449621c2d8bfef6ef,
|
||||
|
|
@ -112304,3 +112632,8 @@ SceneRoots:
|
|||
- {fileID: 2080945030}
|
||||
- {fileID: 1905932999}
|
||||
- {fileID: 1406922794}
|
||||
- {fileID: 78032454}
|
||||
- {fileID: 1822207934}
|
||||
- {fileID: 2129246563}
|
||||
- {fileID: 904876527}
|
||||
- {fileID: 1054410909}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -21,8 +21,7 @@ public class Bootstrap : MonoSingleton<Bootstrap>
|
|||
/// 0 省会 1 城市 2 区县
|
||||
/// </summary>
|
||||
public int currentLevel = 0;
|
||||
public string currentDisName;
|
||||
public string currentDistCode;
|
||||
public int currentDistCode;
|
||||
|
||||
private List<string> landMarks = new List<string>();
|
||||
/// <summary>
|
||||
|
|
@ -95,8 +94,13 @@ public class Bootstrap : MonoSingleton<Bootstrap>
|
|||
{
|
||||
SwitchLand(s);
|
||||
webAdapter.OnLevelChange(s);
|
||||
webAdapter.OnDistCodeChange(currentDistCode);
|
||||
};
|
||||
cameraRt.onLeftMouseDown += () =>
|
||||
{
|
||||
OnLeftClick();
|
||||
//webAdapter.OnDistCodeChange(currentDistCode);
|
||||
};
|
||||
cameraRt.onLeftMouseDown += OnLeftClick;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -127,7 +131,7 @@ public class Bootstrap : MonoSingleton<Bootstrap>
|
|||
{
|
||||
if (hit.collider != null)
|
||||
{
|
||||
Debug.Log("clickCurrentLevel==" + clickCurrentLevel);
|
||||
//Debug.Log("clickCurrentLevel==" + clickCurrentLevel);
|
||||
if (cameraRt.currentLevelIndex == 0) return;
|
||||
clickCurrentLevel--;
|
||||
if (clickCurrentLevel <= 0)
|
||||
|
|
@ -155,8 +159,8 @@ public class Bootstrap : MonoSingleton<Bootstrap>
|
|||
lastLand = currentLand;
|
||||
SwitchLevel(-1);
|
||||
AreaData areaData = currentLand.GetComponent<CityInfo>().areaData;
|
||||
|
||||
if (areaData != null && !string.IsNullOrEmpty(areaData.success) && !bool.Parse(areaData.success)) return;
|
||||
if (areaData != null && !string.IsNullOrEmpty(areaData.success) && bool.Parse(areaData.success))
|
||||
{
|
||||
for (int i = 0; i < areaData.data.items.Count; i++)
|
||||
{
|
||||
string info = $"{areaData.data.items[i].label}:{areaData.data.items[i].value}{areaData.data.items[i].unit}";
|
||||
|
|
@ -167,6 +171,7 @@ public class Bootstrap : MonoSingleton<Bootstrap>
|
|||
if (currentLand != null)
|
||||
landMarkAndInfoCotroller.SetMarksInfo(currentLand.name, landMarks);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 关闭地标
|
||||
/// </summary>
|
||||
|
|
@ -203,6 +208,7 @@ public class Bootstrap : MonoSingleton<Bootstrap>
|
|||
lastCity = null;
|
||||
|
||||
SwitchMatShow(provincialCapital);
|
||||
currentDistCode = 37;
|
||||
break;
|
||||
case 1:
|
||||
//Debug.Log("城市");
|
||||
|
|
@ -210,6 +216,8 @@ public class Bootstrap : MonoSingleton<Bootstrap>
|
|||
{
|
||||
if (currentArea != null)
|
||||
currentArea.SetActive(false);
|
||||
string disCode = currentArea.GetComponent<CityInfo>().distCode;
|
||||
currentDistCode = int.Parse(disCode.Substring(0, 4));
|
||||
SwitchMatShow(lastCity);
|
||||
lastCity = null;
|
||||
}
|
||||
|
|
@ -220,6 +228,7 @@ public class Bootstrap : MonoSingleton<Bootstrap>
|
|||
var child = cityParents.GetChild(i).gameObject;
|
||||
child.SetActive(child.name == currentLand.name);
|
||||
}
|
||||
currentDistCode = int.Parse(currentLand.GetComponent<CityInfo>().distCode);
|
||||
SwitchMatHide(provincialCapital);
|
||||
}
|
||||
break;
|
||||
|
|
@ -235,7 +244,8 @@ public class Bootstrap : MonoSingleton<Bootstrap>
|
|||
currentArea = child;
|
||||
}
|
||||
}
|
||||
Debug.Log("ÇřĎŘ");
|
||||
currentDistCode = int.Parse(currentArea.GetComponent<CityInfo>().distCode);
|
||||
//Debug.Log("ÇřĎŘ");
|
||||
break;
|
||||
}
|
||||
for (int i = 0; i < dependencyLevel.Count; i++)
|
||||
|
|
|
|||
|
|
@ -196,19 +196,19 @@ public class CameraRT : MonoBehaviour
|
|||
if (!isDragging && Vector3.Distance(Input.mousePosition, startPosition) > 10)
|
||||
{
|
||||
isDragging = true;
|
||||
Debug.Log("Started dragging.");
|
||||
//Debug.Log("Started dragging.");
|
||||
}
|
||||
}
|
||||
else if (Input.GetMouseButtonUp(0))
|
||||
{
|
||||
if (isDragging)
|
||||
{
|
||||
Debug.Log("Ended dragging.");
|
||||
//Debug.Log("Ended dragging.");
|
||||
}
|
||||
else
|
||||
{
|
||||
onLeftMouseDown?.Invoke();
|
||||
Debug.Log("Clicked.");
|
||||
//Debug.Log("Clicked.");
|
||||
}
|
||||
isDragging = false;
|
||||
}
|
||||
|
|
@ -277,7 +277,7 @@ public class CameraRT : MonoBehaviour
|
|||
|
||||
if (currentLevelIndex != lastLevelIndex)
|
||||
{
|
||||
Debug.Log($"UnityLog=currentLevelIndex=={currentLevelIndex}");
|
||||
//Debug.Log($"UnityLog=currentLevelIndex=={currentLevelIndex}");
|
||||
onLimitScroll?.Invoke(currentLevelIndex);
|
||||
lastLevelIndex = currentLevelIndex;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ public class CityInfo : MonoBehaviour
|
|||
{
|
||||
sts = DataController.Instance.GetProvincialLevelStationDataByDistCode(distCode);
|
||||
DataController.Instance.loadingScreenTopStatisticsTasks.Add(DataController.Instance.GetProvincialLevelStationData(distCode));
|
||||
Debug.Log(1);
|
||||
}
|
||||
|
||||
SetScreenTopStatistices(0);
|
||||
|
|
@ -72,9 +71,7 @@ public class CityInfo : MonoBehaviour
|
|||
|
||||
public void SetAreaData(AreaData a)
|
||||
{
|
||||
|
||||
areaData = a;
|
||||
|
||||
}
|
||||
|
||||
public void SetStationData(ScreenTopStatistics s)
|
||||
|
|
|
|||
|
|
@ -18,6 +18,12 @@ public class DistanceAdjuster : MonoBehaviour
|
|||
// Use this for initialization
|
||||
private void Start()
|
||||
{
|
||||
string distCode = GetComponentInParent<CityInfo>().distCode;
|
||||
if (distCode.Length == 6)
|
||||
{
|
||||
minScale = 0.1f;
|
||||
maxScale = 0.8f;
|
||||
}
|
||||
_camera = Camera.main;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,232 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
/// <summary>
|
||||
/// 县级视角得企业信息
|
||||
/// </summary>
|
||||
[Serializable]
|
||||
public class AreaCompanyInformationData
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int code;
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string success;
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public List<AreaCompany> data;
|
||||
/// <summary>
|
||||
/// 操作成功
|
||||
/// </summary>
|
||||
public string msg;
|
||||
}
|
||||
[Serializable]
|
||||
public class AreaCompany
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string consId;
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string consNo;
|
||||
/// <summary>
|
||||
/// 莱芜供电公司大楼
|
||||
/// </summary>
|
||||
public string consName;
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public double longitude;
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public double latitude;
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string resourceType;
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public struct Coordinate
|
||||
{
|
||||
//经度
|
||||
public double lon;
|
||||
|
||||
//纬度
|
||||
public double lat;
|
||||
|
||||
//高度
|
||||
public double alt;
|
||||
}
|
||||
public struct Vector2D
|
||||
{
|
||||
public double x;
|
||||
public double y;
|
||||
|
||||
public Vector2D(double x, double y)
|
||||
{
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
}
|
||||
|
||||
//距离
|
||||
public double DistanceTo(Vector2D v)
|
||||
{
|
||||
var dx = x - v.x;
|
||||
var dy = y - v.y;
|
||||
return Math.Sqrt(dx * dx + dy * dy);
|
||||
}
|
||||
|
||||
//加法
|
||||
public Vector2D Plus(Vector2D v)
|
||||
{
|
||||
return new Vector2D(x + v.x, y + v.y);
|
||||
}
|
||||
|
||||
//减法
|
||||
public Vector2D Minus(Vector2D v)
|
||||
{
|
||||
return new Vector2D(x - v.x, y - v.y);
|
||||
}
|
||||
|
||||
//乘法，除相当于乘1/v
|
||||
public Vector2D Multiply(double v)
|
||||
{
|
||||
return new Vector2D(x * v, y * v);
|
||||
}
|
||||
|
||||
//叉乘
|
||||
public double Cross(Vector2D v)
|
||||
{
|
||||
return x * v.y - y * v.x;
|
||||
}
|
||||
|
||||
//点在直线ab的右侧
|
||||
public bool IsOnRight(Vector2D a, Vector2D b)
|
||||
{
|
||||
return Cross(b.Minus(a)) >= 0;
|
||||
}
|
||||
|
||||
public Vector3 ToVector3(float height)
|
||||
{
|
||||
return new Vector3((float)x, height, (float)y);
|
||||
}
|
||||
|
||||
public Coordinate ToCoord(double alt)
|
||||
{
|
||||
return new Coordinate { lon = x, lat = y, alt = alt };
|
||||
}
|
||||
}
|
||||
|
||||
public static class WebApiExtension
|
||||
{
|
||||
public static Vector3 AsVector3(this Coordinate target)
|
||||
{
|
||||
//return new Vector3(Lon2X(target.lon), (float)target.alt - 1982, Lat2Z(target.lat));
|
||||
return L2V(new Vector2D(target.lon, target.lat)).ToVector3((float)target.alt - 1982);
|
||||
}
|
||||
|
||||
public static Coordinate AsCoord(this Vector3 target)
|
||||
{
|
||||
//return new Coordinate {lon = X2Lon(target.x), alt = target.y + 1982f, lat = Z2Lat(target.z)};
|
||||
return V2L(new Vector2D(target.x, target.z)).ToCoord(target.y + 1982);
|
||||
}
|
||||
|
||||
public static Vector3[] AsVector3S(this Coordinate[] target)
|
||||
{
|
||||
return target.Select(c => c.AsVector3()).ToArray();
|
||||
}
|
||||
|
||||
public static Coordinate[] AsCoords(this IEnumerable<Vector3> target)
|
||||
{
|
||||
return target.Select(v => v.AsCoord()).ToArray();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="x"></param>
|
||||
/// <param name="t1"></param>
|
||||
/// <param name="t2"></param>
|
||||
/// <param name="s1"></param>
|
||||
/// <param name="s2"></param>
|
||||
/// <returns></returns>
|
||||
public static double Remap(double x, double t1, double t2, double s1, double s2)
|
||||
{
|
||||
//return (s2 - s1) / (t2 - t1) * (x - t1) + s1;
|
||||
return (x - t1) / (t2 - t1) * (s2 - s1) + s1;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 经度转X 东西经 南北纬
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
// public static float Lon2X(double x)
|
||||
// {
|
||||
// //return (float)Remap(x, 103.75417182054126, 103.757260683307, -164.08, 141.841);
|
||||
// return (float)Remap(x, 103.7573234, 103.7542207, 141.5, -163.9);
|
||||
// }
|
||||
// public static double X2Lon(double x)
|
||||
// {
|
||||
// //return Remap(x, -164.08, 141.841, 103.75417182054126, 103.757260683307);
|
||||
// return Remap(x, 141.5, -163.9, 103.7573234, 103.7542207);
|
||||
// }
|
||||
private static Vector2D _LA = new Vector2D(122.70258955842212, 37.40090039325806);
|
||||
private static Vector2D _LB = new Vector2D(118.2260388213308, 34.39627721967489);
|
||||
private static Vector2D _LC = new Vector2D(115.29544950948309, 36.50134572113451);
|
||||
|
||||
private static Vector2D _VA = new Vector2D(-59.36, -30.82);
|
||||
private static Vector2D _VB = new Vector2D(4.03, 37.31);
|
||||
private static Vector2D _VC = new Vector2D(56.41, -3.06);
|
||||
|
||||
//由经纬度转米。根据三点转化
|
||||
private static Vector2D L2V(Vector2D p)
|
||||
{
|
||||
var abc = Square(_LA, _LB, _LC);
|
||||
var bcp = Square(_LB, _LC, p);
|
||||
var acp = Square(_LC, _LA, p);
|
||||
var abp = Square(_LA, _LB, p);
|
||||
var k1 = bcp / abc;
|
||||
var k2 = acp / abc;
|
||||
var k3 = abp / abc;
|
||||
// Debug.Log($"square : {abc} ==> {bcp} == {acp} == {abp}");
|
||||
// Debug.Log($"{k1} == {k2} == {k3} ==> {k1+k2+k3}");
|
||||
return _VA.Multiply(k1).Plus(_VB.Multiply(k2)).Plus(_VC.Multiply(k3));
|
||||
}
|
||||
|
||||
//由米转经纬度。根据三点转化
|
||||
private static Vector2D V2L(Vector2D p)
|
||||
{
|
||||
var abc = Square(_VA, _VB, _VC);
|
||||
var bcp = Square(_VB, _VC, p);
|
||||
var acp = Square(_VC, _VA, p);
|
||||
var abp = Square(_VA, _VB, p);
|
||||
var k1 = bcp / abc;
|
||||
var k2 = acp / abc;
|
||||
var k3 = abp / abc;
|
||||
// Debug.Log($"square : {abc} ==> {bcp} == {acp} == {abp}");
|
||||
// Debug.Log($"{k1} == {k2} == {k3} ==> {k1+k2+k3}");
|
||||
return _LA.Multiply(k1).Plus(_LB.Multiply(k2)).Plus(_LC.Multiply(k3));
|
||||
}
|
||||
|
||||
private static double Square(Vector2D a, Vector2D b, Vector2D c)
|
||||
{
|
||||
//海伦－秦九韶公式
|
||||
var ab = a.DistanceTo(b);
|
||||
var ac = a.DistanceTo(c);
|
||||
var bc = b.DistanceTo(c);
|
||||
var p = (ab + bc + ac) / 2;
|
||||
var s = Math.Sqrt(p * (p - ab) * (p - bc) * (p - ac));
|
||||
if (!c.Minus(a).IsOnRight(a, b)) s *= -1;
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b190796930ee355459b1f85699cd4ba4
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
/// <summary>
|
||||
/// 区域信息
|
||||
/// 区域弹出框信息
|
||||
/// </summary>
|
||||
[Serializable]
|
||||
public class AreaData
|
||||
|
|
|
|||
|
|
@ -9,9 +9,7 @@ using UnityEngine;
|
|||
|
||||
public class DataController : MonoSingleton<DataController>
|
||||
{
|
||||
public Dictionary<string, string> urlDic = new Dictionary<string, string>();
|
||||
public string distCode;
|
||||
public AreaStationData areaStationData = new AreaStationData();
|
||||
|
||||
private CityInfo[] cityInfos;
|
||||
|
||||
[HideInInspector]
|
||||
|
|
@ -19,14 +17,30 @@ public class DataController : MonoSingleton<DataController>
|
|||
[HideInInspector]
|
||||
public List<UniTask<AreaStationData>> loadingScreenTopStatisticsTasks = new List<UniTask<AreaStationData>>();
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 省级视角下得区县信息
|
||||
/// </summary>
|
||||
private AreaStationData areaStationData = new AreaStationData();
|
||||
/// <summary>
|
||||
/// 弹出框信息
|
||||
/// </summary>
|
||||
private AreaData[] areaDatasTasksReturnValue;
|
||||
/// <summary>
|
||||
/// 所有市级里面的区县信息
|
||||
/// 市级视角中得区县信息
|
||||
/// </summary>
|
||||
private AreaStationData[] areaStationDatasTasksReturnValue;
|
||||
/// <summary>
|
||||
/// 区县站点信息
|
||||
/// </summary>
|
||||
private List<ScreenTopStatistics> screenTopStatisticss = new List<ScreenTopStatistics>();
|
||||
/// <summary>
|
||||
/// 企业信息
|
||||
/// </summary>
|
||||
public AreaCompanyInformationData companyInformationData = new AreaCompanyInformationData();
|
||||
private Dictionary<string, string> urlDic = new Dictionary<string, string>();
|
||||
|
||||
public List<ScreenTopStatistics> screenTopStatisticss = new List<ScreenTopStatistics>();
|
||||
public GameObject companyPoint;
|
||||
public GameObject btns;
|
||||
private void Awake()
|
||||
{
|
||||
var serverConfig = new System.Uri(Path.Combine(Application.streamingAssetsPath + @"/Config", "WebAddress.json"));
|
||||
|
|
@ -48,22 +62,75 @@ public class DataController : MonoSingleton<DataController>
|
|||
}
|
||||
private void Start()
|
||||
{
|
||||
#if UNITY_WEBGL && !UNITY_EDITOR
|
||||
btns.SetActive(false);
|
||||
#endif
|
||||
Bootstrap.Instance.webAdapter.onStation.AddListener(SwitchStation);
|
||||
Bootstrap.Instance.webAdapter.onStartRequest.AddListener(OnInit);
|
||||
}
|
||||
|
||||
public void TEstStation(int index)
|
||||
{
|
||||
SwitchStation(index);
|
||||
}
|
||||
public void OnTEstBtn()
|
||||
{
|
||||
OnInit();
|
||||
}
|
||||
|
||||
|
||||
public async void GetAllCompanyInfo()
|
||||
{
|
||||
companyInformationData = await GetAreaCompanyInformationData("37");
|
||||
for (int i = 0; i < companyInformationData.data.Count; i++)
|
||||
{
|
||||
Coordinate coords = new Coordinate();
|
||||
coords.lat = companyInformationData.data[i].latitude;
|
||||
coords.lon = companyInformationData.data[i].longitude;
|
||||
coords.alt = 1986;
|
||||
GameObject obj = Instantiate(companyPoint);
|
||||
obj.transform.position = coords.AsVector3();
|
||||
|
||||
//Vector3 temp = WebApiExtension.GPSToVector3(companyInformationData.data[i].latitude, companyInformationData.data[i].longitude);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public double originLatitude = 37.7749;
|
||||
public double originLongitude = -122.4194;
|
||||
public double originAltitude = 0.0;
|
||||
|
||||
// 转换后的Unity位置
|
||||
public Vector3 GPSToUnityWorld(double latitude, double longitude, double altitude)
|
||||
{
|
||||
// 地球半径（单位：米）
|
||||
double radius = 6378137;
|
||||
|
||||
// 计算相对位置
|
||||
double deltaLat = latitude - originLatitude;
|
||||
double deltaLon = longitude - originLongitude;
|
||||
|
||||
// 经度差转换为米
|
||||
double deltaX = deltaLon * Mathf.Deg2Rad * radius * Mathf.Cos((float)(originLatitude * Mathf.Deg2Rad));
|
||||
|
||||
// 纬度差转换为米
|
||||
double deltaZ = deltaLat * Mathf.Deg2Rad * radius;
|
||||
|
||||
// 高度差
|
||||
double deltaY = altitude - originAltitude;
|
||||
|
||||
// 返回转换后的Unity位置
|
||||
return new Vector3((float)deltaX, (float)deltaY, (float)deltaZ);
|
||||
}
|
||||
|
||||
private async void OnInit()
|
||||
{
|
||||
await UniTask.Delay(1);
|
||||
GetAllCompanyInfo();
|
||||
areaStationData = await GetProvincialLevelStationData("37");
|
||||
cityInfos = transform.GetComponentsInChildren<CityInfo>();
|
||||
for (int i = 0; i < cityInfos.Length; i++)
|
||||
{
|
||||
//cityInfos[i].gameObject.SetActive(false);
|
||||
cityInfos[i].Init();
|
||||
}
|
||||
areaDatasTasksReturnValue = await UniTask.WhenAll(loadingAreaDataTasks);
|
||||
|
|
@ -95,10 +162,7 @@ public class DataController : MonoSingleton<DataController>
|
|||
}
|
||||
|
||||
|
||||
public void TEstStation(int index)
|
||||
{
|
||||
SwitchStation(index);
|
||||
}
|
||||
|
||||
|
||||
public void SwitchStation(int stationIndex)
|
||||
{
|
||||
|
|
@ -109,22 +173,18 @@ public class DataController : MonoSingleton<DataController>
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 针对市级
|
||||
/// 获取所有企业信息
|
||||
/// </summary>
|
||||
/// <param name="_distCode"></param>
|
||||
/// <param name="_disName"></param>
|
||||
/// <returns></returns>
|
||||
public async UniTask<ScreenTopStatistics> GetProvincialLevelStationInfo(string _distCode, string _disName)
|
||||
public async UniTask<AreaCompanyInformationData> GetAreaCompanyInformationData(string _distCode)
|
||||
{
|
||||
string url = urlDic["地图信息汇总"];
|
||||
AreaStationData areaStationData = await AsyncWebReq.Get<AreaStationData>(url + _distCode, Bootstrap.Instance.webAdapter.head, Bootstrap.Instance.webAdapter.token);
|
||||
DataItem sts = areaStationData.data.Find(s => s.disName == _disName);
|
||||
if (sts == null)
|
||||
return null;
|
||||
return sts.screenTopStatistics;
|
||||
string url = urlDic["地图企业用户资源"];
|
||||
return await AsyncWebReq.Get<AreaCompanyInformationData>(url + _distCode, Bootstrap.Instance.webAdapter.head, Bootstrap.Instance.webAdapter.token);
|
||||
}
|
||||
/// <summary>
|
||||
/// 通过市级视角去获取数据 针对区县
|
||||
/// 通过市级视角去获取区县得资源站点数据
|
||||
/// </summary>
|
||||
/// <param name="_distCode"></param>
|
||||
/// <returns></returns>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ public class WebAdapter : MonoBehaviour
|
|||
public string token;
|
||||
[DllImport("__Internal")]
|
||||
private static extern void LevelChange(int _level);
|
||||
[DllImport("__Internal")]
|
||||
private static extern void DistCodeChange(int _distCode);
|
||||
#else
|
||||
public string head;
|
||||
public string token;
|
||||
|
|
@ -18,6 +20,10 @@ public class WebAdapter : MonoBehaviour
|
|||
{
|
||||
//Debug.Log(level);
|
||||
}
|
||||
public void DistCodeChange(int _distCode)
|
||||
{
|
||||
//Debug.Log(_distCode);
|
||||
}
|
||||
#endif
|
||||
public UnityEvent<int> onStation;
|
||||
public UnityEvent onStartRequest;
|
||||
|
|
@ -26,6 +32,11 @@ public class WebAdapter : MonoBehaviour
|
|||
LevelChange(_level);
|
||||
//Debug.Log("UnityLog==level==" + _level);
|
||||
}
|
||||
public void OnDistCodeChange(int _distCode)
|
||||
{
|
||||
DistCodeChange(_distCode);
|
||||
Debug.Log(_distCode);
|
||||
}
|
||||
|
||||
public void OnStation(int station)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
mergeInto(LibraryManager.library, {
|
||||
LevelChange: function(level){
|
||||
OnLevelChange(level);
|
||||
},
|
||||
DistCodeChange:function(distCode){
|
||||
OnDistCodeChange(distCode);
|
||||
}
|
||||
});
|
||||
|
|
@ -1,4 +1,6 @@
|
|||
{
|
||||
"地图弹出框": "http://vpp.shiyuancloud.com:1443/api/vpp-operation-service/screen/mapRegionSummary/",
|
||||
"地图信息汇总": "http://vpp.shiyuancloud.com:1443/api/vpp-operation-service/screen/mapRegionStatistics/"
|
||||
"地图信息汇总": "http://vpp.shiyuancloud.com:1443/api/vpp-operation-service/screen/mapRegionStatistics/",
|
||||
"地图企业用户资源": "http://vpp.shiyuancloud.com:1443/api/vpp-operation-service/screen/mapRegionCons/"
|
||||
|
||||
}
|
||||
Binary file not shown.
Loading…
Reference in New Issue