①自定义所有下拉菜单（重复勾选可以出发方法）
②添加机柜的金属封条 ③微调模型18的初始放置位置 ④添加巡检指令 ⑤添加与web交互方法（巡检画面显隐）
This commit is contained in:
parent
bed8b469af
commit
e6b0884ae7
|
|
@ -0,0 +1,24 @@
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
using UnityEditor;
|
||||||
|
using UnityEditor.UI;
|
||||||
|
[CustomEditor(typeof(DropdownEx), true)]
|
||||||
|
[CanEditMultipleObjects]
|
||||||
|
public class DropdowmExEditor : DropdownEditor
|
||||||
|
{
|
||||||
|
SerializedProperty m_AlwaysCallback;
|
||||||
|
protected override void OnEnable()
|
||||||
|
{
|
||||||
|
base.OnEnable();
|
||||||
|
m_AlwaysCallback = serializedObject.FindProperty("m_AlwaysCallback");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnInspectorGUI()
|
||||||
|
{
|
||||||
|
base.OnInspectorGUI();
|
||||||
|
EditorGUILayout.PropertyField(m_AlwaysCallback);
|
||||||
|
serializedObject.ApplyModifiedProperties();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 819f23ccf0edbda4aa5e2169827ce99c
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
|
@ -0,0 +1,105 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 23a7bcbe8f6a3784cbbd9ba50afeb37b
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 21202
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
materials:
|
||||||
|
materialImportMode: 2
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
materialLocation: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
resampleCurves: 1
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
removeConstantScaleCurves: 1
|
||||||
|
motionNodeName:
|
||||||
|
rigImportErrors:
|
||||||
|
rigImportWarnings:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
importAnimatedCustomProperties: 0
|
||||||
|
importConstraints: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: 0.5
|
||||||
|
animationPositionError: 0.5
|
||||||
|
animationScaleError: 0.5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
extraUserProperties: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 0
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
useSRGBMaterialColor: 1
|
||||||
|
sortHierarchyByName: 1
|
||||||
|
importVisibility: 1
|
||||||
|
importBlendShapes: 1
|
||||||
|
importCameras: 1
|
||||||
|
importLights: 1
|
||||||
|
nodeNameCollisionStrategy: 1
|
||||||
|
fileIdsGeneration: 2
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
bakeAxisConversion: 0
|
||||||
|
preserveHierarchy: 0
|
||||||
|
skinWeightsMode: 0
|
||||||
|
maxBonesPerVertex: 4
|
||||||
|
minBoneWeight: 0.001
|
||||||
|
optimizeBones: 1
|
||||||
|
meshOptimizationFlags: -1
|
||||||
|
indexFormat: 0
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVMarginMethod: 1
|
||||||
|
secondaryUVMinLightmapResolution: 40
|
||||||
|
secondaryUVMinObjectScale: 1
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 3
|
||||||
|
normalCalculationMode: 4
|
||||||
|
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||||
|
blendShapeNormalImportMode: 1
|
||||||
|
normalSmoothingSource: 0
|
||||||
|
referencedClips: []
|
||||||
|
importAnimation: 1
|
||||||
|
humanDescription:
|
||||||
|
serializedVersion: 3
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: 0.5
|
||||||
|
foreArmTwist: 0.5
|
||||||
|
upperLegTwist: 0.5
|
||||||
|
legTwist: 0.5
|
||||||
|
armStretch: 0.05
|
||||||
|
legStretch: 0.05
|
||||||
|
feetSpacing: 0
|
||||||
|
globalScale: 1
|
||||||
|
rootMotionBoneName:
|
||||||
|
hasTranslationDoF: 0
|
||||||
|
hasExtraRoot: 0
|
||||||
|
skeletonHasParents: 1
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
animationType: 2
|
||||||
|
humanoidOversampling: 1
|
||||||
|
avatarSetup: 0
|
||||||
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 640a75083c55701468c500b1e5b3e4b5
|
guid: 15bf6b6e6c9da824e8e0377a2a04df4c
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
Binary file not shown.
|
|
@ -0,0 +1,105 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e6c96015a3cd934408878fc6905a1c85
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 21202
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
materials:
|
||||||
|
materialImportMode: 2
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
materialLocation: 0
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
resampleCurves: 1
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
removeConstantScaleCurves: 1
|
||||||
|
motionNodeName:
|
||||||
|
rigImportErrors:
|
||||||
|
rigImportWarnings:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
importAnimatedCustomProperties: 0
|
||||||
|
importConstraints: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: 0.5
|
||||||
|
animationPositionError: 0.5
|
||||||
|
animationScaleError: 0.5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
extraUserProperties: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 0
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
useSRGBMaterialColor: 1
|
||||||
|
sortHierarchyByName: 1
|
||||||
|
importVisibility: 1
|
||||||
|
importBlendShapes: 1
|
||||||
|
importCameras: 1
|
||||||
|
importLights: 1
|
||||||
|
nodeNameCollisionStrategy: 1
|
||||||
|
fileIdsGeneration: 2
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
bakeAxisConversion: 0
|
||||||
|
preserveHierarchy: 0
|
||||||
|
skinWeightsMode: 0
|
||||||
|
maxBonesPerVertex: 4
|
||||||
|
minBoneWeight: 0.001
|
||||||
|
optimizeBones: 1
|
||||||
|
meshOptimizationFlags: -1
|
||||||
|
indexFormat: 0
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVMarginMethod: 1
|
||||||
|
secondaryUVMinLightmapResolution: 40
|
||||||
|
secondaryUVMinObjectScale: 1
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 3
|
||||||
|
normalCalculationMode: 4
|
||||||
|
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||||
|
blendShapeNormalImportMode: 1
|
||||||
|
normalSmoothingSource: 0
|
||||||
|
referencedClips: []
|
||||||
|
importAnimation: 1
|
||||||
|
humanDescription:
|
||||||
|
serializedVersion: 3
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: 0.5
|
||||||
|
foreArmTwist: 0.5
|
||||||
|
upperLegTwist: 0.5
|
||||||
|
legTwist: 0.5
|
||||||
|
armStretch: 0.05
|
||||||
|
legStretch: 0.05
|
||||||
|
feetSpacing: 0
|
||||||
|
globalScale: 1
|
||||||
|
rootMotionBoneName:
|
||||||
|
hasTranslationDoF: 0
|
||||||
|
hasExtraRoot: 0
|
||||||
|
skeletonHasParents: 1
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
animationType: 2
|
||||||
|
humanoidOversampling: 1
|
||||||
|
avatarSetup: 0
|
||||||
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: cbafbef12e92d5c48a2cabb10a765aa6
|
guid: 111718a212cd52347b708ec90dbdb377
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
|
|
@ -0,0 +1,98 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0649bf2d2bf492345bf335663e993134
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 183 KiB |
|
|
@ -0,0 +1,98 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 443dc53876247884787f7557679e7a8f
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
|
@ -0,0 +1,105 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: be3e2ad574dbb1e4988a88e2e952b39e
|
||||||
|
ModelImporter:
|
||||||
|
serializedVersion: 21202
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
materials:
|
||||||
|
materialImportMode: 2
|
||||||
|
materialName: 0
|
||||||
|
materialSearch: 1
|
||||||
|
materialLocation: 1
|
||||||
|
animations:
|
||||||
|
legacyGenerateAnimations: 4
|
||||||
|
bakeSimulation: 0
|
||||||
|
resampleCurves: 1
|
||||||
|
optimizeGameObjects: 0
|
||||||
|
removeConstantScaleCurves: 1
|
||||||
|
motionNodeName:
|
||||||
|
rigImportErrors:
|
||||||
|
rigImportWarnings:
|
||||||
|
animationImportErrors:
|
||||||
|
animationImportWarnings:
|
||||||
|
animationRetargetingWarnings:
|
||||||
|
animationDoRetargetingWarnings: 0
|
||||||
|
importAnimatedCustomProperties: 0
|
||||||
|
importConstraints: 0
|
||||||
|
animationCompression: 1
|
||||||
|
animationRotationError: 0.5
|
||||||
|
animationPositionError: 0.5
|
||||||
|
animationScaleError: 0.5
|
||||||
|
animationWrapMode: 0
|
||||||
|
extraExposedTransformPaths: []
|
||||||
|
extraUserProperties: []
|
||||||
|
clipAnimations: []
|
||||||
|
isReadable: 0
|
||||||
|
meshes:
|
||||||
|
lODScreenPercentages: []
|
||||||
|
globalScale: 1
|
||||||
|
meshCompression: 0
|
||||||
|
addColliders: 0
|
||||||
|
useSRGBMaterialColor: 1
|
||||||
|
sortHierarchyByName: 1
|
||||||
|
importVisibility: 1
|
||||||
|
importBlendShapes: 1
|
||||||
|
importCameras: 1
|
||||||
|
importLights: 1
|
||||||
|
nodeNameCollisionStrategy: 1
|
||||||
|
fileIdsGeneration: 2
|
||||||
|
swapUVChannels: 0
|
||||||
|
generateSecondaryUV: 0
|
||||||
|
useFileUnits: 1
|
||||||
|
keepQuads: 0
|
||||||
|
weldVertices: 1
|
||||||
|
bakeAxisConversion: 0
|
||||||
|
preserveHierarchy: 0
|
||||||
|
skinWeightsMode: 0
|
||||||
|
maxBonesPerVertex: 4
|
||||||
|
minBoneWeight: 0.001
|
||||||
|
optimizeBones: 1
|
||||||
|
meshOptimizationFlags: -1
|
||||||
|
indexFormat: 0
|
||||||
|
secondaryUVAngleDistortion: 8
|
||||||
|
secondaryUVAreaDistortion: 15.000001
|
||||||
|
secondaryUVHardAngle: 88
|
||||||
|
secondaryUVMarginMethod: 1
|
||||||
|
secondaryUVMinLightmapResolution: 40
|
||||||
|
secondaryUVMinObjectScale: 1
|
||||||
|
secondaryUVPackMargin: 4
|
||||||
|
useFileScale: 1
|
||||||
|
tangentSpace:
|
||||||
|
normalSmoothAngle: 60
|
||||||
|
normalImportMode: 0
|
||||||
|
tangentImportMode: 3
|
||||||
|
normalCalculationMode: 4
|
||||||
|
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||||
|
blendShapeNormalImportMode: 1
|
||||||
|
normalSmoothingSource: 0
|
||||||
|
referencedClips: []
|
||||||
|
importAnimation: 1
|
||||||
|
humanDescription:
|
||||||
|
serializedVersion: 3
|
||||||
|
human: []
|
||||||
|
skeleton: []
|
||||||
|
armTwist: 0.5
|
||||||
|
foreArmTwist: 0.5
|
||||||
|
upperLegTwist: 0.5
|
||||||
|
legTwist: 0.5
|
||||||
|
armStretch: 0.05
|
||||||
|
legStretch: 0.05
|
||||||
|
feetSpacing: 0
|
||||||
|
globalScale: 1
|
||||||
|
rootMotionBoneName:
|
||||||
|
hasTranslationDoF: 0
|
||||||
|
hasExtraRoot: 0
|
||||||
|
skeletonHasParents: 1
|
||||||
|
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||||
|
autoGenerateAvatarMappingIfUnspecified: 1
|
||||||
|
animationType: 2
|
||||||
|
humanoidOversampling: 1
|
||||||
|
avatarSetup: 0
|
||||||
|
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||||
|
additionalBone: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -92,6 +92,7 @@ GameObject:
|
||||||
- component: {fileID: 6017927708412883801}
|
- component: {fileID: 6017927708412883801}
|
||||||
- component: {fileID: 15271022823392547}
|
- component: {fileID: 15271022823392547}
|
||||||
- component: {fileID: 6826224726842612557}
|
- component: {fileID: 6826224726842612557}
|
||||||
|
- component: {fileID: 777276912498055800}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: "\u5DE1\u68C0\u6309\u94AE"
|
m_Name: "\u5DE1\u68C0\u6309\u94AE"
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -112,6 +113,7 @@ RectTransform:
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 3801440158260306696}
|
- {fileID: 3801440158260306696}
|
||||||
|
- {fileID: 6702246760630620327}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -202,3 +204,218 @@ MonoBehaviour:
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
--- !u!114 &777276912498055800
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6049137575551768901}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 9870614729c7a3442b01276782ece894, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
img: {fileID: 6702246760630620320}
|
||||||
|
--- !u!1 &6702246760630620320
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6702246760630620327}
|
||||||
|
- component: {fileID: 6702246760630620325}
|
||||||
|
- component: {fileID: 6702246760630620326}
|
||||||
|
- component: {fileID: 6702246760630620324}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Image
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 2147483647
|
||||||
|
m_IsActive: 0
|
||||||
|
--- !u!224 &6702246760630620327
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6702246760630620320}
|
||||||
|
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: 6702246761233490369}
|
||||||
|
m_Father: {fileID: 2070078800726626112}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 1, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 55.7984, y: 25}
|
||||||
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
|
--- !u!222 &6702246760630620325
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6702246760630620320}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &6702246760630620326
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6702246760630620320}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 3a3b5242babc65a4c898f644975a9f50, type: 2}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 0
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 5895648463d446d4d85e2513897ecff9, type: 3}
|
||||||
|
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!114 &6702246760630620324
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6702246760630620320}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_WrapAround: 0
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_SelectedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_SelectedTrigger: Selected
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 6702246760630620326}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
--- !u!1 &6702246761233490370
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6702246761233490369}
|
||||||
|
- component: {fileID: 6702246761233490375}
|
||||||
|
- component: {fileID: 6702246761233490368}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text (Legacy)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 2147483647
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &6702246761233490369
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6702246761233490370}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.19999999, y: 0.20000002, z: 0.20000002}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 6702246760630620327}
|
||||||
|
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: 320, y: 150}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &6702246761233490375
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6702246761233490370}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &6702246761233490368
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6702246761233490370}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 2100000, guid: 3a3b5242babc65a4c898f644975a9f50, type: 2}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 0
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
|
||||||
|
m_FontSize: 66
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 1
|
||||||
|
m_MaxSize: 101
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: "\u5230\u8FD9\u91CC"
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -645,7 +645,7 @@ Transform:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1319418505828120484}
|
m_GameObject: {fileID: 1319418505828120484}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: -0.2093969, y: 0.06274602, z: 0.11922716}
|
m_LocalPosition: {x: -0.2093969, y: 0.0144, z: 0.1089}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
|
|
@ -2115,7 +2115,7 @@ Transform:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7120735052878813037}
|
m_GameObject: {fileID: 7120735052878813037}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: -0.14224297, y: 0.06274602, z: 0.11922716}
|
m_LocalPosition: {x: -0.14224297, y: 0.0129, z: 0.1192}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
|
|
@ -3134,7 +3134,7 @@ Transform:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 8615470440775114591}
|
m_GameObject: {fileID: 8615470440775114591}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: -0.17717034, y: 0.06274602, z: 0.11922716}
|
m_LocalPosition: {x: -0.17717034, y: 0.0125, z: 0.1192}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
|
|
@ -3217,7 +3217,7 @@ Transform:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 9053396689318511238}
|
m_GameObject: {fileID: 9053396689318511238}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: -0.28060967, y: 0.06274602, z: 0.11922716}
|
m_LocalPosition: {x: -0.28060967, y: 0.0141, z: 0.1192}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -262,7 +262,7 @@ public class CameraRT : MonoBehaviour
|
||||||
DOTween.To(() => target.position, v => target.position = v, pos_target, dotween_duration);
|
DOTween.To(() => target.position, v => target.position = v, pos_target, dotween_duration);
|
||||||
DOTween.To(() => target.eulerAngles, v => target.eulerAngles = v, target_init_eulerAngles, dotween_duration).OnComplete(() =>
|
DOTween.To(() => target.eulerAngles, v => target.eulerAngles = v, target_init_eulerAngles, dotween_duration).OnComplete(() =>
|
||||||
{
|
{
|
||||||
Debug.Log("全景auto_move改变了");
|
//Debug.Log("全景auto_move改变了");
|
||||||
auto_move = false;
|
auto_move = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -340,7 +340,7 @@ public class CameraRT : MonoBehaviour
|
||||||
DOTween.To(() => target.position, v => target.position = v, pos_target, dotween_duration);
|
DOTween.To(() => target.position, v => target.position = v, pos_target, dotween_duration);
|
||||||
DOTween.To(() => target.eulerAngles, v => target.eulerAngles = v, new Vector3(0, 110, 0), dotween_duration).OnComplete(() =>
|
DOTween.To(() => target.eulerAngles, v => target.eulerAngles = v, new Vector3(0, 110, 0), dotween_duration).OnComplete(() =>
|
||||||
{
|
{
|
||||||
Debug.Log("鸟瞰auto_move改变了");
|
//Debug.Log("鸟瞰auto_move改变了");
|
||||||
auto_move = false;
|
auto_move = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -682,7 +682,8 @@ public class UIToCabinet : MonoBehaviour
|
||||||
{
|
{
|
||||||
//CalendarScript.Inst.open();
|
//CalendarScript.Inst.open();
|
||||||
CalendarDetails.Inst.init();
|
CalendarDetails.Inst.init();
|
||||||
RobotReturnData.Inst.gameObject.SetActive(true);
|
if (GameManager.Inst.Jk_URL != null)
|
||||||
|
RobotReturnData.Inst.init();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -781,7 +781,7 @@ public class GameManager : MonoBehaviour
|
||||||
}
|
}
|
||||||
else if (modelNum == "18")
|
else if (modelNum == "18")
|
||||||
{
|
{
|
||||||
MoveParentAndChildren(go.transform, new Vector3(-0.31f, 0f, -0.02f), false);
|
MoveParentAndChildren(go.transform, new Vector3(-0.31f, 0, 0), false);
|
||||||
}
|
}
|
||||||
else if (modelNum == "19")
|
else if (modelNum == "19")
|
||||||
{
|
{
|
||||||
|
|
@ -1985,9 +1985,6 @@ public class GameManager : MonoBehaviour
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -2342,10 +2339,20 @@ public class GameManager : MonoBehaviour
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Header("红外监测详情-查询URL")] public string hwjc_cx;
|
[Header("红外监测详情-查询URL")] public string hwjc_cx;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 机器人保存指令URL
|
||||||
|
/// </summary>
|
||||||
|
[Header("机器人保存指令URL")] public string jqr_bczl;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 机器人保存坐标URL
|
||||||
|
/// </summary>
|
||||||
|
[Header("机器人保存坐标URL")] public string jqr_bczb;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 机器人返回筛选-查询URL
|
/// 机器人返回筛选-查询URL
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Header("机器人返回筛选-查询URL")] public string jqr_p_cx;
|
[Header("机器人返回筛选-查询URL")] public string jqr_xj_cx;
|
||||||
|
|
||||||
public webURL(string ct)
|
public webURL(string ct)
|
||||||
{
|
{
|
||||||
|
|
@ -2373,9 +2380,14 @@ public class GameManager : MonoBehaviour
|
||||||
|
|
||||||
cdqx_cx = ct + "machineRoom/menu/getMenus";
|
cdqx_cx = ct + "machineRoom/menu/getMenus";
|
||||||
|
|
||||||
hwjc_cx = ct + "";
|
hwjc_cx = ct + "machineRoom/lora/getLatestAlarms";
|
||||||
|
|
||||||
|
jqr_bczl = ct + "machineRoom/robot/saveInstruct";
|
||||||
|
|
||||||
|
jqr_bczb = ct + "machineRoom/robot/saveCoordinate";
|
||||||
|
|
||||||
|
jqr_xj_cx = ct + "machineRoom/robot/queryInspection";
|
||||||
|
|
||||||
jqr_p_cx = ct + "";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -143,7 +143,7 @@ public static class CombineJSON
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// POST获取数据的请求
|
/// POST获取数据的请求（无参）
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="apiUrl"></param>
|
/// <param name="apiUrl"></param>
|
||||||
/// <param name="token"></param>
|
/// <param name="token"></param>
|
||||||
|
|
@ -197,7 +197,7 @@ public static class CombineJSON
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// POST修改数据的请求
|
/// POST数据的请求(有参)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="apiUrl"></param>
|
/// <param name="apiUrl"></param>
|
||||||
/// <param name="token"></param>
|
/// <param name="token"></param>
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
|
using Unity.VisualScripting;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
|
@ -37,9 +38,29 @@ public class TOOL : MonoBehaviour
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
|
Debug.Log(Input.mousePosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float Map(float value, float inputMin, float inputMax, float outputMin, float outputMax)
|
||||||
|
{
|
||||||
|
return (value - inputMin) / (inputMax - inputMin) * (outputMax - outputMin) + outputMin;
|
||||||
|
}
|
||||||
|
|
||||||
|
[ContextMenu("设置线缆层级高度")]
|
||||||
|
public void SetxianLanHight()
|
||||||
|
{
|
||||||
|
for (int i = 0; i < gameObjects.Count; i++)
|
||||||
|
{
|
||||||
|
gameObjects[i].transform.localPosition += (new Vector3(0, 0.135f, 0) * i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
[ContextMenu("按顺序设置端口位置")]
|
||||||
|
public void setPortPos() {
|
||||||
|
for (int i = 0; i < gameObjects.Count; i++)
|
||||||
|
{
|
||||||
|
gameObjects[i].GetComponent<PortQuery>().portList.portPosition = (i + 1).ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[ContextMenu("重命名")]
|
[ContextMenu("重命名")]
|
||||||
public void reName()
|
public void reName()
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: a9ddd79d2961b3943a3eb95df9bda370
|
guid: 7f85a8b54a1924145b8764f2e7929b88
|
||||||
PrefabImporter:
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
|
|
@ -0,0 +1,58 @@
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.EventSystems;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
public class DropdownEx : Dropdown
|
||||||
|
{
|
||||||
|
public bool m_AlwaysCallback = false;
|
||||||
|
public void ShowController()
|
||||||
|
{
|
||||||
|
base.Show();
|
||||||
|
Transform toggleRoot = transform.Find("Dropdown List/Viewport/Content");
|
||||||
|
Toggle[] toggleList = toggleRoot.GetComponentsInChildren<Toggle>(false);
|
||||||
|
for (int i = 0; i < toggleList.Length; i++)
|
||||||
|
{
|
||||||
|
Toggle temp = toggleList[i];
|
||||||
|
temp.onValueChanged.RemoveAllListeners();
|
||||||
|
temp.isOn = false;
|
||||||
|
temp.onValueChanged.AddListener(x => OnSelectItemEx(temp));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnPointerClick(PointerEventData eventData)
|
||||||
|
{
|
||||||
|
ShowController();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnSelectItemEx(Toggle toggle)
|
||||||
|
{
|
||||||
|
if (!toggle.isOn)
|
||||||
|
{
|
||||||
|
toggle.isOn = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int selectedIndex = -1;
|
||||||
|
Transform tr = toggle.transform;
|
||||||
|
Transform parent = tr.parent;
|
||||||
|
for (int i = 0; i < parent.childCount; i++)
|
||||||
|
{
|
||||||
|
if (parent.GetChild(i) == tr)
|
||||||
|
{
|
||||||
|
// Subtract one to account for template child.
|
||||||
|
selectedIndex = i - 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selectedIndex < 0)
|
||||||
|
return;
|
||||||
|
if (value == selectedIndex && m_AlwaysCallback)
|
||||||
|
onValueChanged.Invoke(value);
|
||||||
|
else
|
||||||
|
value = selectedIndex;
|
||||||
|
Hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: eae1b85cd48a1274baf2c5c8167ab351
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -618,6 +618,22 @@ public class WebInteraction : MonoBehaviour
|
||||||
Application.ExternalCall("web_infraredsensor_close", "红外画面关");
|
Application.ExternalCall("web_infraredsensor_close", "红外画面关");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Òþ²ØѲ¼ì»Ãæ
|
||||||
|
/// </summary>
|
||||||
|
public void setbigXunJian()
|
||||||
|
{
|
||||||
|
Application.ExternalCall("web_Inspection_popup_magnify", "Òþ²ØѲ¼ì»Ãæ");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ÏÔʾѲ¼ì»Ãæ
|
||||||
|
/// </summary>
|
||||||
|
public void setlittleXunJian()
|
||||||
|
{
|
||||||
|
Application.ExternalCall("web_Inspection_popup_narrow", "ÏÔʾѲ¼ì»Ãæ");
|
||||||
|
}
|
||||||
|
|
||||||
public void changC(GameObject hight, string index)
|
public void changC(GameObject hight, string index)
|
||||||
{
|
{
|
||||||
hight.SetActive(true);
|
hight.SetActive(true);
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.EventSystems;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
public class PatrolRobotUI : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler
|
||||||
|
{
|
||||||
|
public GameObject img;
|
||||||
|
|
||||||
|
|
||||||
|
private void OnEnable()
|
||||||
|
{
|
||||||
|
img.SetActive(false);
|
||||||
|
}
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void OnPointerEnter(PointerEventData eventData)
|
||||||
|
{
|
||||||
|
img.SetActive(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnPointerExit(PointerEventData eventData)
|
||||||
|
{
|
||||||
|
img.SetActive(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9870614729c7a3442b01276782ece894
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,82 @@
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查询巡检结果
|
||||||
|
/// </summary>
|
||||||
|
[AddComponentMenu("QueryInspectionRobot/查询巡检结果")]
|
||||||
|
public class QueryInspectionRobot : MonoBehaviour
|
||||||
|
{
|
||||||
|
public static QueryInspectionRobot Inst;
|
||||||
|
public Root myroot = new Root();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
Inst = this;
|
||||||
|
}
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
[System.Serializable]
|
||||||
|
public class Data
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public int id;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string inspectionResult;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string instructId;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string createTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
[System.Serializable]
|
||||||
|
public class Root
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string code;
|
||||||
|
/// <summary>
|
||||||
|
/// 操作成功
|
||||||
|
/// </summary>
|
||||||
|
public string message;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public List<Data> data;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string serverTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 57259ef8152df5048b2040176d1ff162
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,59 @@
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 机器人保存坐标
|
||||||
|
/// </summary>
|
||||||
|
[AddComponentMenu("SaveCoordinateRobot/机器人保存坐标")]
|
||||||
|
public class SaveCoordinateRobot : MonoBehaviour
|
||||||
|
{
|
||||||
|
public static SaveCoordinateRobot Inst;
|
||||||
|
public Root myroot = new Root();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
Inst = this;
|
||||||
|
}
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[System.Serializable]
|
||||||
|
public class Root
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string code;
|
||||||
|
/// <summary>
|
||||||
|
/// 操作成功
|
||||||
|
/// </summary>
|
||||||
|
public string message;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public int data;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string serverTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9549e6a4fca18be48b80136058101dc2
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,60 @@
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 机器人保存指令
|
||||||
|
/// </summary>
|
||||||
|
[AddComponentMenu("SaveInstructRobot/机器人保存指令")]
|
||||||
|
public class SaveInstructRobot : MonoBehaviour
|
||||||
|
{
|
||||||
|
public static SaveInstructRobot Inst;
|
||||||
|
public Root myroot = new Root();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
Inst = this;
|
||||||
|
}
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
[System.Serializable]
|
||||||
|
public class Root
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string code;
|
||||||
|
/// <summary>
|
||||||
|
/// 操作成功
|
||||||
|
/// </summary>
|
||||||
|
public string message;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public int data;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string serverTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0a86f1f1a8ee0d04aaa7e3602e3b0dd5
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -20,9 +20,9 @@ public class RobotReturnData : MonoBehaviour
|
||||||
|
|
||||||
private void OnEnable()
|
private void OnEnable()
|
||||||
{
|
{
|
||||||
if (GameManager.Inst.Jk_URL == null)
|
//if (GameManager.Inst.Jk_URL == null)
|
||||||
return;
|
// return;
|
||||||
init();
|
//init();
|
||||||
}
|
}
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
|
|
@ -44,9 +44,11 @@ public class RobotReturnData : MonoBehaviour
|
||||||
|
|
||||||
public void init()
|
public void init()
|
||||||
{
|
{
|
||||||
|
gameObject.SetActive(true);
|
||||||
|
dropdown.value = -1;
|
||||||
CalendarDetails.Inst.close();
|
CalendarDetails.Inst.close();
|
||||||
CalendarDetails.Inst.gameObject.SetActive(false);
|
CalendarDetails.Inst.gameObject.SetActive(false);
|
||||||
CombineJSON.GetJson_GET(GameManager.Inst.Jk_URL.jqr_p_cx, GameManager.Inst.arguments.token, (jsonResult) =>
|
StartCoroutine(CombineJSON.GetJson_GET(GameManager.Inst.Jk_URL.jqr_xj_cx, GameManager.Inst.arguments.token, ((jsonResult) =>
|
||||||
{
|
{
|
||||||
if (jsonResult != null)
|
if (jsonResult != null)
|
||||||
{
|
{
|
||||||
|
|
@ -59,10 +61,10 @@ public class RobotReturnData : MonoBehaviour
|
||||||
sprites.Clear();
|
sprites.Clear();
|
||||||
for (int i = 0; i < myroot.data.Count; i++)
|
for (int i = 0; i < myroot.data.Count; i++)
|
||||||
{
|
{
|
||||||
var t = CombineJSON.Base64StringToTexture(myroot.data[i].img);
|
var t = CombineJSON.Base64StringToTexture(myroot.data[i].inspectionResult);
|
||||||
var u = Sprite.Create(t, new Rect(0, 0, t.width, t.height), Vector2.zero);
|
var u = Sprite.Create(t, new Rect(0, 0, t.width, t.height), Vector2.zero);
|
||||||
sprites.Add(u);
|
sprites.Add(u);
|
||||||
dropdown.options.Add(new Dropdown.OptionData(myroot.data[i].time));
|
dropdown.options.Add(new Dropdown.OptionData(myroot.data[i].createTime));
|
||||||
}
|
}
|
||||||
//CalendarDetails.Inst.delContent();
|
//CalendarDetails.Inst.delContent();
|
||||||
}
|
}
|
||||||
|
|
@ -73,10 +75,11 @@ public class RobotReturnData : MonoBehaviour
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
Debug.LogError(e.StackTrace);
|
||||||
SecondConfirmPanel.DeleteConform(null, "机器人返回图片序列化错误");
|
SecondConfirmPanel.DeleteConform(null, "机器人返回图片序列化错误");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
})));
|
||||||
}
|
}
|
||||||
|
|
||||||
[System.Serializable]
|
[System.Serializable]
|
||||||
|
|
@ -85,15 +88,19 @@ public class RobotReturnData : MonoBehaviour
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string taskId;
|
public string id;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string time;
|
public string inspectionResult;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string img;
|
public int instructId;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string createTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
[System.Serializable]
|
[System.Serializable]
|
||||||
|
|
|
||||||
|
|
@ -13,22 +13,22 @@ public class CreateLine : CabinetUIBase
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Transform xianLan;
|
public Transform xianLan;
|
||||||
|
|
||||||
public Transform A5;
|
//public Transform A5;
|
||||||
public Transform B5;
|
//public Transform B5;
|
||||||
public Transform A6;
|
//public Transform A6;
|
||||||
public Transform B6;
|
//public Transform B6;
|
||||||
public Transform A7;
|
//public Transform A7;
|
||||||
public Transform B7;
|
//public Transform B7;
|
||||||
public Transform A7_1;
|
//public Transform A7_1;
|
||||||
public Transform B7_1;
|
//public Transform B7_1;
|
||||||
public Transform A7_2;
|
//public Transform A7_2;
|
||||||
public Transform B7_2;
|
//public Transform B7_2;
|
||||||
public List<Transform> list7 = new List<Transform>();
|
public List<Transform> list7 = new List<Transform>();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 端口边距
|
/// 端口边距
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Header("端口边距")] public float edge_Distance = -1;
|
[Header("端口边距")] public float edge_Distance;
|
||||||
|
|
||||||
[Header("不同高度集"), SerializeField] List<Transform> _vectors_tall = new List<Transform>();
|
[Header("不同高度集"), SerializeField] List<Transform> _vectors_tall = new List<Transform>();
|
||||||
|
|
||||||
|
|
@ -134,7 +134,12 @@ public class CreateLine : CabinetUIBase
|
||||||
/// <param name="A"></param>
|
/// <param name="A"></param>
|
||||||
/// <param name="B"></param>
|
/// <param name="B"></param>
|
||||||
/// <param name="hierarchy">区</param>
|
/// <param name="hierarchy">区</param>
|
||||||
public void Creat5(Transform A, Transform B, int hierarchy = 0)
|
public void Creat5(Transform A, Transform B, int hierarchy = 0)//端口是否在模型16上
|
||||||
|
{
|
||||||
|
bool A16 = GameManager.Inst.FindParent(A.gameObject, GameManager.Inst.IsFindRacks_go).GetComponent<DeviceQuery>().deviceList.modelNum != "16";
|
||||||
|
bool B16 = GameManager.Inst.FindParent(B.gameObject, GameManager.Inst.IsFindRacks_go).GetComponent<DeviceQuery>().deviceList.modelNum != "16";
|
||||||
|
//都不在
|
||||||
|
if (A16 && B16)
|
||||||
{
|
{
|
||||||
GameObject xian = null;
|
GameObject xian = null;
|
||||||
var p = A.GetComponent<PortQuery>().portList;
|
var p = A.GetComponent<PortQuery>().portList;
|
||||||
|
|
@ -201,6 +206,85 @@ public class CreateLine : CabinetUIBase
|
||||||
setBasicInfo(A, B, xian, p, newColor);
|
setBasicInfo(A, B, xian, p, newColor);
|
||||||
//setPoss(prefab_xianlan, vector3s);
|
//setPoss(prefab_xianlan, vector3s);
|
||||||
}
|
}
|
||||||
|
//A在
|
||||||
|
else if (!A16 && B16)
|
||||||
|
{
|
||||||
|
Creat6(A, B, hierarchy);
|
||||||
|
}
|
||||||
|
//B在
|
||||||
|
else if (A16 && !B16)
|
||||||
|
{
|
||||||
|
Creat6(B, A, hierarchy);
|
||||||
|
}
|
||||||
|
//都在
|
||||||
|
else if (!A16 && !B16)
|
||||||
|
{
|
||||||
|
GameObject xian = null;
|
||||||
|
var p = A.GetComponent<PortQuery>().portList;
|
||||||
|
var v = Array.Find(xianLan.GetComponentsInChildren<LineInfor>(), (item) =>
|
||||||
|
{
|
||||||
|
return (item.cableGroupName == p.cableGroupName);
|
||||||
|
});
|
||||||
|
//CreateNewCablesTrail();
|
||||||
|
//GameObject prefab_xianlan = prefab_xianlan.gameObject;
|
||||||
|
if (v == null)
|
||||||
|
{
|
||||||
|
go = new GameObject("EmptyObject");
|
||||||
|
go.name = p.cableGroupName;
|
||||||
|
go.transform.SetParent(xianLan);
|
||||||
|
|
||||||
|
xian = new GameObject(p.cableName);
|
||||||
|
xian.transform.SetParent(go.transform);
|
||||||
|
go.SetActive(false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
xian = new GameObject(p.cableName);
|
||||||
|
go = v.gameObject;
|
||||||
|
xian.transform.SetParent(go.transform);
|
||||||
|
//prefab_xianlan.transform.SetParent(v.transform);
|
||||||
|
//prefab_xianlan.name = p.cableName;
|
||||||
|
go.SetActive(false);
|
||||||
|
//setBasicInfo(A, B, prefab_xianlan.gameObject, p);
|
||||||
|
}
|
||||||
|
|
||||||
|
Color newColor = lineColor;
|
||||||
|
//setColorline(p, prefab_xianlan.gameObject);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
HexToColor(PatternChoose.Inst.xianlan.lineCode_dic[p.portType], (x) =>
|
||||||
|
{
|
||||||
|
init(xian, x);
|
||||||
|
newColor = x;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Debug.Log("匹配线缆颜色错误 " + e.Message + "\n" + e.StackTrace);
|
||||||
|
init(xian, lineColor);
|
||||||
|
}
|
||||||
|
List<Vector3> vector3s = new List<Vector3>();
|
||||||
|
Vector3 v1 = A.position + new Vector3(-0.06f, 0, 0); ;
|
||||||
|
Vector3 v2 = A.position + new Vector3(edge_Distance * 2, 0, 0) * -1;
|
||||||
|
//同层 V3=V4 不同层 V3!=V4
|
||||||
|
Vector3 v3 = v2 + new Vector3(0, 0, B.position.z - v2.z);
|
||||||
|
Vector3 v4 = v3 + new Vector3(0, B.position.y - v3.y, 0);
|
||||||
|
Vector3 v5 = B.position + new Vector3(-0.06f, 0, 0); ;
|
||||||
|
|
||||||
|
vector3s.Add(v1);
|
||||||
|
if (vector3s[vector3s.Count - 1] != v2) vector3s.Add(v2);
|
||||||
|
if (vector3s[vector3s.Count - 1] != v3) vector3s.Add(v3);
|
||||||
|
if (vector3s[vector3s.Count - 1] != v4) vector3s.Add(v4);
|
||||||
|
if (vector3s[vector3s.Count - 1] != v5) vector3s.Add(v5);
|
||||||
|
|
||||||
|
lineRenderer.positionCount = vector3s.Count;
|
||||||
|
|
||||||
|
lineRenderer.SetPositions(vector3s.ToArray());
|
||||||
|
|
||||||
|
setBasicInfo(A, B, xian, p, newColor);
|
||||||
|
//setPoss(prefab_xianlan, vector3s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 设置线缆点
|
/// 设置线缆点
|
||||||
|
|
@ -334,32 +418,98 @@ public class CreateLine : CabinetUIBase
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 同列
|
/// A为模型16，B不是
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="A"></param>
|
/// <param name="A"></param>
|
||||||
/// <param name="B"></param>
|
/// <param name="B"></param>
|
||||||
/// <param name="hierarchy">高度层级</param>
|
/// <param name="hierarchy">高度层级</param>
|
||||||
public void Creat6(Transform A, Transform B, int hierarchy)
|
public void Creat6(Transform A, Transform B, int hierarchy = 0)
|
||||||
{
|
{
|
||||||
//init(Color.white);
|
#region old
|
||||||
|
////init(Color.white);
|
||||||
|
//List<Vector3> vector3s = new List<Vector3>();
|
||||||
|
//Vector3 v1 = A.position;
|
||||||
|
//Vector3 v2 = A.position + new Vector3(edge_Distance, 0, 0);
|
||||||
|
//Vector3 v3 = v2 + new Vector3(0, vectors_tall[hierarchy].y - v2.y, 0);
|
||||||
|
//Vector3 v4 = v3 + new Vector3(B.position.x - v3.x + edge_Distance, 0, 0);
|
||||||
|
//Vector3 v5 = v4 + new Vector3(0, B.position.y - v4.y, 0);
|
||||||
|
//Vector3 v6 = B.position;
|
||||||
|
|
||||||
|
//vector3s.Add(v1);
|
||||||
|
//vector3s.Add(v2);
|
||||||
|
//vector3s.Add(v3);
|
||||||
|
//vector3s.Add(v4);
|
||||||
|
//vector3s.Add(v5);
|
||||||
|
//vector3s.Add(v6);
|
||||||
|
|
||||||
|
////lineRenderer.positionCount = 6;
|
||||||
|
|
||||||
|
////lineRenderer.SetPositions(vector3s.ToArray());
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
GameObject xian = null;
|
||||||
|
var p = A.GetComponent<PortQuery>().portList;
|
||||||
|
//var v = Array.Find(xianLan.GetComponentsInChildren<LineInfor>(), (item) =>
|
||||||
|
var v = Array.Find(xianLan.GetComponentsInChildren<Transform>(), (item) =>
|
||||||
|
{
|
||||||
|
//return (item.cableGroupName == p.cableGroupName);
|
||||||
|
return (item.name == p.cableGroupName);
|
||||||
|
});
|
||||||
|
if (v == null)
|
||||||
|
{
|
||||||
|
go = new GameObject("EmptyObject");
|
||||||
|
go.name = p.cableGroupName;
|
||||||
|
go.transform.SetParent(xianLan);
|
||||||
|
|
||||||
|
xian = new GameObject(p.cableName);
|
||||||
|
xian.transform.SetParent(go.transform);
|
||||||
|
go.SetActive(false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
xian = new GameObject(p.cableName);
|
||||||
|
go = v.gameObject;
|
||||||
|
xian.transform.SetParent(go.transform);
|
||||||
|
go.SetActive(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
Color newColor = lineColor;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
HexToColor(PatternChoose.Inst.xianlan.lineCode_dic[p.portType], (x) =>
|
||||||
|
{
|
||||||
|
init(xian, x);
|
||||||
|
newColor = x;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Debug.Log("匹配线缆颜色错误 " + e.Message + "\n" + e.StackTrace);
|
||||||
|
init(xian, lineColor);
|
||||||
|
}
|
||||||
List<Vector3> vector3s = new List<Vector3>();
|
List<Vector3> vector3s = new List<Vector3>();
|
||||||
Vector3 v1 = A.position;
|
Vector3 v1 = A.position + new Vector3(-0.06f, 0, 0);
|
||||||
Vector3 v2 = A.position + new Vector3(edge_Distance, 0, 0);
|
Vector3 v2 = v1 + new Vector3(edge_Distance * 2, 0, 0) * -1;
|
||||||
Vector3 v3 = v2 + new Vector3(0, vectors_tall[hierarchy].y - v2.y, 0);
|
Vector3 v3 = v2 + new Vector3(0, vectors_tall[hierarchy].y - v2.y, 0);
|
||||||
Vector3 v4 = v3 + new Vector3(B.position.x - v3.x + edge_Distance, 0, 0);
|
Vector3 v4 = v3 + new Vector3(0, 0, B.position.z - v3.z);
|
||||||
Vector3 v5 = v4 + new Vector3(0, B.position.y - v4.y, 0);
|
Vector3 v5 = v4 + new Vector3(B.position.x - v3.x + edge_Distance, 0, 0);
|
||||||
Vector3 v6 = B.position;
|
Vector3 v6 = v5 + new Vector3(0, B.position.y - v5.y, 0);
|
||||||
|
Vector3 v7 = B.position;
|
||||||
|
|
||||||
vector3s.Add(v1);
|
vector3s.Add(v1);
|
||||||
vector3s.Add(v2);
|
if (vector3s[vector3s.Count - 1] != v2) vector3s.Add(v2);
|
||||||
vector3s.Add(v3);
|
if (vector3s[vector3s.Count - 1] != v3) vector3s.Add(v3);
|
||||||
vector3s.Add(v4);
|
if (vector3s[vector3s.Count - 1] != v4) vector3s.Add(v4);
|
||||||
vector3s.Add(v5);
|
if (vector3s[vector3s.Count - 1] != v5) vector3s.Add(v5);
|
||||||
vector3s.Add(v6);
|
if (vector3s[vector3s.Count - 1] != v6) vector3s.Add(v6);
|
||||||
|
if (vector3s[vector3s.Count - 1] != v7) vector3s.Add(v7);
|
||||||
|
|
||||||
//lineRenderer.positionCount = 6;
|
lineRenderer.positionCount = vector3s.Count;
|
||||||
|
|
||||||
//lineRenderer.SetPositions(vector3s.ToArray());
|
lineRenderer.SetPositions(vector3s.ToArray());
|
||||||
|
|
||||||
|
setBasicInfo(A, B, xian, p, newColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -369,13 +519,20 @@ public class CreateLine : CabinetUIBase
|
||||||
/// <param name="A"></param>
|
/// <param name="A"></param>
|
||||||
/// <param name="B"></param>
|
/// <param name="B"></param>
|
||||||
/// <param name="hierarchy">区</param>
|
/// <param name="hierarchy">区</param>
|
||||||
public void Creat7(Transform A, Transform B, int hierarchy)
|
public void Creat7(Transform A, Transform B, int hierarchy)//端口是否在模型16上
|
||||||
|
{
|
||||||
|
bool A16 = GameManager.Inst.FindParent(A.gameObject, GameManager.Inst.IsFindRacks_go).GetComponent<DeviceQuery>().deviceList.modelNum != "16";
|
||||||
|
bool B16 = GameManager.Inst.FindParent(B.gameObject, GameManager.Inst.IsFindRacks_go).GetComponent<DeviceQuery>().deviceList.modelNum != "16";
|
||||||
|
//都不在
|
||||||
|
if (A16 && B16)
|
||||||
{
|
{
|
||||||
GameObject xian = null;
|
GameObject xian = null;
|
||||||
var p = A.GetComponent<PortQuery>().portList;
|
var p = A.GetComponent<PortQuery>().portList;
|
||||||
var v = Array.Find(xianLan.GetComponentsInChildren<LineInfor>(), (item) =>
|
//var v = Array.Find(xianLan.GetComponentsInChildren<LineInfor>(), (item) =>
|
||||||
|
var v = Array.Find(xianLan.GetComponentsInChildren<Transform>(), (item) =>
|
||||||
{
|
{
|
||||||
return (item.cableGroupName == p.cableGroupName);
|
//return (item.cableGroupName == p.cableGroupName);
|
||||||
|
return (item.name == p.cableGroupName);
|
||||||
});
|
});
|
||||||
if (v == null)
|
if (v == null)
|
||||||
{
|
{
|
||||||
|
|
@ -433,17 +590,94 @@ public class CreateLine : CabinetUIBase
|
||||||
|
|
||||||
setBasicInfo(A, B, xian, p, newColor);
|
setBasicInfo(A, B, xian, p, newColor);
|
||||||
}
|
}
|
||||||
|
//A在
|
||||||
|
else if (!A16 && B16)
|
||||||
|
{
|
||||||
|
Creat6(A, B, hierarchy);
|
||||||
|
}
|
||||||
|
//B在
|
||||||
|
else if (A16 && !B16)
|
||||||
|
{
|
||||||
|
Creat6(B, A, hierarchy);
|
||||||
|
}
|
||||||
|
//都在
|
||||||
|
else if (!A16 && !B16)
|
||||||
|
{
|
||||||
|
GameObject xian = null;
|
||||||
|
var p = A.GetComponent<PortQuery>().portList;
|
||||||
|
//var v = Array.Find(xianLan.GetComponentsInChildren<LineInfor>(), (item) =>
|
||||||
|
var v = Array.Find(xianLan.GetComponentsInChildren<Transform>(), (item) =>
|
||||||
|
{
|
||||||
|
//return (item.cableGroupName == p.cableGroupName);
|
||||||
|
return (item.name == p.cableGroupName);
|
||||||
|
});
|
||||||
|
if (v == null)
|
||||||
|
{
|
||||||
|
go = new GameObject("EmptyObject");
|
||||||
|
go.name = p.cableGroupName;
|
||||||
|
go.transform.SetParent(xianLan);
|
||||||
|
|
||||||
|
xian = new GameObject(p.cableName);
|
||||||
|
xian.transform.SetParent(go.transform);
|
||||||
|
go.SetActive(false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
xian = new GameObject(p.cableName);
|
||||||
|
go = v.gameObject;
|
||||||
|
xian.transform.SetParent(go.transform);
|
||||||
|
go.SetActive(false);
|
||||||
|
}
|
||||||
|
Color newColor = lineColor;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
HexToColor(PatternChoose.Inst.xianlan.lineCode_dic[p.portType], (x) =>
|
||||||
|
{
|
||||||
|
init(xian, x);
|
||||||
|
newColor = x;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Debug.Log("匹配线缆颜色错误 " + e.Message + "\n" + e.StackTrace);
|
||||||
|
init(xian, lineColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Vector3> vector3s = new List<Vector3>();
|
||||||
|
Vector3 v1 = A.position + new Vector3(-0.06f, 0, 0);
|
||||||
|
Vector3 v2 = v1 + new Vector3(edge_Distance * 2, 0, 0) * -1;
|
||||||
|
Vector3 v3 = v2 + new Vector3(0, vectors_tall[hierarchy].y - v2.y, 0);
|
||||||
|
Vector3 v4 = v3 + new Vector3(0, 0, B.position.z - v3.z);
|
||||||
|
Vector3 v5 = v4 + new Vector3(B.position.x - v3.x, 0, 0) + new Vector3(edge_Distance * 2, 0, 0) * -1;
|
||||||
|
Vector3 v6 = v5 + new Vector3(0, B.position.y - v5.y, 0);
|
||||||
|
Vector3 v7 = B.position + new Vector3(-0.06f, 0, 0); ;
|
||||||
|
|
||||||
|
vector3s.Add(v1);
|
||||||
|
if (vector3s[vector3s.Count - 1] != v2) vector3s.Add(v2);
|
||||||
|
if (vector3s[vector3s.Count - 1] != v3) vector3s.Add(v3);
|
||||||
|
if (vector3s[vector3s.Count - 1] != v4) vector3s.Add(v4);
|
||||||
|
if (vector3s[vector3s.Count - 1] != v5) vector3s.Add(v5);
|
||||||
|
if (vector3s[vector3s.Count - 1] != v6) vector3s.Add(v6);
|
||||||
|
if (vector3s[vector3s.Count - 1] != v7) vector3s.Add(v7);
|
||||||
|
|
||||||
|
lineRenderer.positionCount = vector3s.Count;
|
||||||
|
|
||||||
|
lineRenderer.SetPositions(vector3s.ToArray());
|
||||||
|
|
||||||
|
setBasicInfo(A, B, xian, p, newColor);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[ContextMenu("同行")]
|
[ContextMenu("同行")]
|
||||||
public void F5()
|
public void F5()
|
||||||
{
|
{
|
||||||
Creat5(A5, B5);
|
//Creat5(A5, B5);
|
||||||
}
|
}
|
||||||
|
|
||||||
[ContextMenu("6点")]
|
[ContextMenu("6点")]
|
||||||
public void F6()
|
public void F6()
|
||||||
{
|
{
|
||||||
Creat6(A6, B6, 2);
|
//Creat6(A6, B6, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
[ContextMenu("批量画线")]
|
[ContextMenu("批量画线")]
|
||||||
|
|
@ -467,7 +701,7 @@ public class CreateLine : CabinetUIBase
|
||||||
int cjB = GameManager.Inst.CengJi((go2.GetComponent<DeviceQuery>().deviceList.devicePosition).Split('-')[0]);
|
int cjB = GameManager.Inst.CengJi((go2.GetComponent<DeviceQuery>().deviceList.devicePosition).Split('-')[0]);
|
||||||
if (cjA == cjB)
|
if (cjA == cjB)
|
||||||
{
|
{
|
||||||
Creat5(list7[i - 1], list7[i]);
|
Creat5(list7[i - 1], list7[i], cjB);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -41,10 +41,12 @@ public class CalendarDetails : MonoBehaviour
|
||||||
{
|
{
|
||||||
if (img_bg.transform.localScale.x > 0.6)
|
if (img_bg.transform.localScale.x > 0.6)
|
||||||
{
|
{
|
||||||
|
WebInteraction.Inst.setlittleXunJian();
|
||||||
setlittle();
|
setlittle();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
WebInteraction.Inst.setbigXunJian();
|
||||||
setbig();
|
setbig();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -58,6 +60,7 @@ public class CalendarDetails : MonoBehaviour
|
||||||
|
|
||||||
public void open()
|
public void open()
|
||||||
{
|
{
|
||||||
|
gameObject.SetActive(true);
|
||||||
img_bg.gameObject.SetActive(true);
|
img_bg.gameObject.SetActive(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ public class IRPopup : MonoBehaviour
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void LoadmoreDetails()
|
public void LoadmoreDetails()
|
||||||
{
|
{
|
||||||
CombineJSON.GetJson_GET(GameManager.Inst.Jk_URL.hwjc_cx, GameManager.Inst.arguments.token, (jsonResult) =>
|
StartCoroutine(CombineJSON.GetJson_GET(GameManager.Inst.Jk_URL.hwjc_cx, GameManager.Inst.arguments.token, (jsonResult) =>
|
||||||
{
|
{
|
||||||
if (jsonResult != null)
|
if (jsonResult != null)
|
||||||
{
|
{
|
||||||
|
|
@ -63,12 +63,15 @@ public class IRPopup : MonoBehaviour
|
||||||
myroot = JsonConvert.DeserializeObject<Root>(jsonResult);
|
myroot = JsonConvert.DeserializeObject<Root>(jsonResult);
|
||||||
if (myroot.message == "操作成功")
|
if (myroot.message == "操作成功")
|
||||||
{
|
{
|
||||||
for (int i = 0; i < myroot.data.Count; i++)
|
//for (int i = 0; i < myroot.data.Count; i++)
|
||||||
{
|
{
|
||||||
var go = GameObject.Instantiate(prefab, content);
|
var go = GameObject.Instantiate(prefab, content);
|
||||||
var t = go.GetComponent<calendarIcon>();
|
var t = go.GetComponent<calendarIcon>();
|
||||||
t.text1.text = myroot.data[i].time;
|
var txt = myroot.data.personFlag;
|
||||||
t.text2.text = myroot.data[i].particulars;
|
if (txt == "1") t.text1.text = "ÓÐÈË";
|
||||||
|
else if (txt == "0") t.text1.text = "ÎÞÈË";
|
||||||
|
//t.text1.text = myroot.data[i].personFlag;
|
||||||
|
//t.text2.text = myroot.data[i].particulars;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -81,24 +84,16 @@ public class IRPopup : MonoBehaviour
|
||||||
SecondConfirmPanel.DeleteConform(null, "红外检测序列化错误");
|
SecondConfirmPanel.DeleteConform(null, "红外检测序列化错误");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
[System.Serializable]
|
[System.Serializable]
|
||||||
public class Data
|
public class Data
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
/// 1-ÓÐÈË£»0-ÎÞÈË
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Id;
|
public string personFlag;
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
public string time;
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
public string particulars;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[System.Serializable]
|
[System.Serializable]
|
||||||
|
|
@ -115,7 +110,7 @@ public class IRPopup : MonoBehaviour
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public List<Data> data;
|
public Data data;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue