Browse Source

提交人口转移

wartheking 4 months ago
parent
commit
34768c4010

BIN
Assets/Art/UI/YZT/B05/img_com_boxbg@2x.png


+ 159 - 0
Assets/Art/UI/YZT/B05/img_com_boxbg@2x.png.meta

@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 723c8a800065c94478372adf9c44157d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    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: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 981 - 1
Assets/Prefabs/UI/XHYZT/FHXS.prefab


+ 1 - 1
Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -11815,7 +11815,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 3414677846359689223}
   m_HandleRect: {fileID: 3911919129374042785}
   m_Direction: 2
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:

File diff suppressed because it is too large
+ 1310 - 100
Assets/Prefabs/UI/XHYZT/RKZY.prefab


File diff suppressed because it is too large
+ 1 - 98
Assets/Scene 1.unity


+ 0 - 468
Assets/Scenes/Main.unity

@@ -1,468 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!29 &1
-OcclusionCullingSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_OcclusionBakeSettings:
-    smallestOccluder: 5
-    smallestHole: 0.25
-    backfaceThreshold: 100
-  m_SceneGUID: 00000000000000000000000000000000
-  m_OcclusionCullingData: {fileID: 0}
---- !u!104 &2
-RenderSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 9
-  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  m_FogMode: 3
-  m_FogDensity: 0.01
-  m_LinearFogStart: 0
-  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
-  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
-  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
-  m_AmbientIntensity: 1
-  m_AmbientMode: 0
-  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
-  m_HaloStrength: 0.5
-  m_FlareStrength: 1
-  m_FlareFadeSpeed: 3
-  m_HaloTexture: {fileID: 0}
-  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
-  m_DefaultReflectionMode: 0
-  m_DefaultReflectionResolution: 128
-  m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
-  m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
-  m_UseRadianceAmbientProbe: 0
---- !u!157 &3
-LightmapSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 12
-  m_GIWorkflowMode: 1
-  m_GISettings:
-    serializedVersion: 2
-    m_BounceScale: 1
-    m_IndirectOutputScale: 1
-    m_AlbedoBoost: 1
-    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 1
-    m_EnableRealtimeLightmaps: 0
-  m_LightmapEditorSettings:
-    serializedVersion: 12
-    m_Resolution: 2
-    m_BakeResolution: 40
-    m_AtlasSize: 1024
-    m_AO: 0
-    m_AOMaxDistance: 1
-    m_CompAOExponent: 1
-    m_CompAOExponentDirect: 0
-    m_ExtractAmbientOcclusion: 0
-    m_Padding: 2
-    m_LightmapParameters: {fileID: 0}
-    m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
-    m_ReflectionCompression: 2
-    m_MixedBakeMode: 2
-    m_BakeBackend: 1
-    m_PVRSampling: 1
-    m_PVRDirectSampleCount: 32
-    m_PVRSampleCount: 512
-    m_PVRBounces: 2
-    m_PVREnvironmentSampleCount: 256
-    m_PVREnvironmentReferencePointCount: 2048
-    m_PVRFilteringMode: 1
-    m_PVRDenoiserTypeDirect: 1
-    m_PVRDenoiserTypeIndirect: 1
-    m_PVRDenoiserTypeAO: 1
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
-    m_PVREnvironmentMIS: 1
-    m_PVRCulling: 1
-    m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 5
-    m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ExportTrainingData: 0
-    m_TrainingDataDestination: TrainingData
-    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 0}
-  m_LightingSettings: {fileID: 0}
---- !u!196 &4
-NavMeshSettings:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_BuildSettings:
-    serializedVersion: 2
-    agentTypeID: 0
-    agentRadius: 0.5
-    agentHeight: 2
-    agentSlope: 45
-    agentClimb: 0.4
-    ledgeDropHeight: 0
-    maxJumpAcrossDistance: 0
-    minRegionArea: 2
-    manualCellSize: 0
-    cellSize: 0.16666667
-    manualTileSize: 0
-    tileSize: 256
-    accuratePlacement: 0
-    maxJobWorkers: 0
-    preserveTilesOutsideBounds: 0
-    debug:
-      m_Flags: 0
-  m_NavMeshData: {fileID: 0}
---- !u!1 &280064659
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 280064662}
-  - component: {fileID: 280064661}
-  - component: {fileID: 280064660}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &280064660
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 280064659}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_SendPointerHoverToParent: 1
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &280064661
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 280064659}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 10
---- !u!4 &280064662
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 280064659}
-  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: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1705358726
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1705358729}
-  - component: {fileID: 1705358728}
-  - component: {fileID: 1705358727}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!81 &1705358727
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1705358726}
-  m_Enabled: 1
---- !u!20 &1705358728
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1705358726}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &1705358729
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1705358726}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1821001660
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1821001662}
-  - component: {fileID: 1821001661}
-  m_Layer: 0
-  m_Name: Directional Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!108 &1821001661
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1821001660}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 1
-  m_Shape: 0
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 2
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
---- !u!4 &1821001662
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1821001660}
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1001 &1902424098124924365
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 1902424098152796944, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_Name
-      value: Canvas
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1902424098152796972, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f7bd5476b689fb449a711b8118bcac98, type: 3}

+ 0 - 7
Assets/Scenes/Main.unity.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2ff4b3d44fc4a6e4997c04a43f7f4c49
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 0
Assets/Scripts/UI/UIView/RKZY/LinePath.cs

@@ -37,6 +37,8 @@ public class LinePath : MonoBehaviour
     public Material firMat;
     public Material secMat;
 
+    public float xishu;
+
     void Start()
     {
         

+ 135 - 8
Assets/Scripts/UI/UIView/RKZY/RKZYLayer.cs

@@ -4,6 +4,7 @@ using Newtonsoft.Json.Linq;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Unity.VisualScripting;
@@ -11,6 +12,7 @@ using UnityAsync;
 using UnityEngine;
 using UnityEngine.Networking;
 using UnityEngine.UI;
+using Color = UnityEngine.Color;
 using WaitUntil = UnityAsync.WaitUntil;
 
 [System.Serializable]
@@ -139,20 +141,32 @@ public class RKZYLayer : YZTRootLayer
     public int page = 0;
 
 
+    public List<Thing1> allFilterPlans = new List<Thing1>();
+
     [Header("计算面板和三个新加的按钮")] 
     public GameObject calculatePanel;
     public Button closeCalculateButton;
     public Text lineNameText;
     public Text lineStarToEndText;
-    public Text peopleCountText;
-    public Text tunTuText;
-    public Text zhuangZaiText;
-    public Text moveTimeText;
+    public InputField peopleCountText;
+    public InputField tunTuText;
+    public InputField zhuangZaiText;
+    public InputField moveTimeText;
 
     public Button allLineButton;
-    public Button calculateButton;
+    public Button calculateShowButton;
     public Button showMoveButton;
-    
+
+    public GameObject calcMask;
+
+    public Button calcTimeBtn;
+    public Button resetTimeBtn;
+
+    private bool calcOpen = true;
+
+    public InputField searchPath;
+
+    public Thing1 currentPath;
     // Start is called before the first frame update
     async void Start()
     {
@@ -167,6 +181,7 @@ public class RKZYLayer : YZTRootLayer
         InitButton();
         InitAtten();
         await InitBaseData();
+
     }
 
     public override void OnUILeave()
@@ -303,7 +318,7 @@ public class RKZYLayer : YZTRootLayer
                 lineParent.homeNum = GlobalData.allServerMovePlans[i].homeNum;
                 lineParent.completeNum = GlobalData.allServerMovePlans[i].completeNum;
                 lineParent.dateTime = GlobalData.allServerMovePlans[i].dateTime;
-
+                lineParent.xishu = UnityEngine.Random.Range(10f, 30.0f);
                 if (lineParent.lineDir == LineDir.Out)
                 {
                     zYYADatas[1].totalmanNum += GlobalData.allServerMovePlans[i].manNum;
@@ -368,7 +383,7 @@ public class RKZYLayer : YZTRootLayer
                 lineParent.homeNum = GlobalData.allServerMovePlans[i].homeNum;
                 lineParent.completeNum = GlobalData.allServerMovePlans[i].completeNum;
                 lineParent.dateTime = GlobalData.allServerMovePlans[i].dateTime;
-
+                lineParent.xishu = UnityEngine.Random.Range(10f, 30.0f);
                 if (lineParent.lineDir == LineDir.Out)
                 {
                     zYYADatas[4].totalmanNum += GlobalData.allServerMovePlans[i].manNum;
@@ -428,6 +443,7 @@ public class RKZYLayer : YZTRootLayer
                     linePaths[i].gameObject.SetActive(false);
                 }
                 thing1.bindLinePath.gameObject.SetActive(true);
+                CheckCalcUsable(thing1);
             });
             plan.localScale = Vector3.one;
             plan.GetChild(0).GetComponent<Text>().text = i.ToString();
@@ -436,6 +452,7 @@ public class RKZYLayer : YZTRootLayer
             plan.GetChild(3).GetComponent<Text>().text = beforeLinePaths[i].manNum.ToString();
             plan.GetChild(4).GetComponent<Text>().text = beforeLinePaths[i].dateTime.ToString();
             movePlans.Add(thing1);
+            
 
         }
         for (int i = 0; i < afterLinePaths.Count; i++)
@@ -453,6 +470,7 @@ public class RKZYLayer : YZTRootLayer
                     linePaths[i].gameObject.SetActive(false);
                 }
                 thing1.bindLinePath.gameObject.SetActive(true);
+                CheckCalcUsable(thing1);
             });
             plan.localScale = Vector3.one;
             plan.GetChild(0).GetComponent<Text>().text = i.ToString();
@@ -468,6 +486,23 @@ public class RKZYLayer : YZTRootLayer
         
     }
 
+    void CheckCalcUsable(Thing1 thing1 = null) {
+        currentPath = thing1;
+        if (currentPath != null)
+        {
+            calcMask.gameObject.SetActive(false);
+
+            peopleCountText.text = currentPath.bindLinePath.manNum.ToString();
+            lineNameText.text = currentPath.bindLinePath.lineDir == LineDir.In ? "内转安置" : "外传安置";
+            lineStarToEndText.text = currentPath.bindLinePath.startPos + "→ " + currentPath.bindLinePath.endPos;
+            moveTimeText.text = "待计算";
+            tunTuText.text = currentPath.bindLinePath.xishu.ToString();
+        }
+        else {
+            calcMask.gameObject.SetActive(true);
+        }
+    }
+
     void ChangeLinePathChannel(int index) {
         switch (index)
         {
@@ -545,6 +580,91 @@ public class RKZYLayer : YZTRootLayer
             AfterBtnClick();
         });
 
+        allLineButton.onClick.AddListener(() =>
+        {
+            ChangeLinePathChannel(inOutIndex);
+
+            CheckCalcUsable();
+        });
+
+        calculateShowButton.onClick.AddListener(() =>
+        {
+            calcOpen = !calcOpen;
+            if (calcOpen)
+            {
+                calculateShowButton.GetComponent<Image>().color = new UnityEngine.Color(1, 1, 1, 1f);
+                calculatePanel.gameObject.SetActive(true);
+            }
+            else {
+                calculateShowButton.GetComponent<Image>().color = new UnityEngine.Color(1, 1, 1, 0.5f);
+                calculatePanel.gameObject.SetActive(false);
+            }
+        });
+
+        searchPath.onValueChanged.AddListener((string searchItem) =>
+        {
+            allFilterPlans.Clear();
+            for (int i = 0; i < movePlans.Count; i++)
+            {
+                if ((int)movePlans[i].bindLinePath.lineDir + 1 == inOutIndex || inOutIndex == 0)
+                {
+                    if (searchItem.Trim().Length < 1)
+                    {
+                        movePlans[i].gameObject.SetActive(true);
+                    }
+                    else {
+                        if (movePlans[i].bindLinePath.startPos.Contains(searchItem) || movePlans[i].bindLinePath.endPos.Contains(searchItem))
+                        {
+                            movePlans[i].gameObject.SetActive(true);
+                        }
+                        else {
+                            movePlans[i].gameObject.SetActive(false);
+                        }
+                    }
+                }
+                else {
+                    movePlans[i].gameObject.SetActive(false);
+                }
+            }
+        });
+
+        calcTimeBtn.onClick.AddListener(() =>
+        {
+            int manNum = 1;
+            int zzManNum = 1;
+            float tuntu = 0;
+            if (peopleCountText.text.Trim().Length < 1 || zhuangZaiText.text.Trim().Length < 1) 
+            {
+                moveTimeText.text = "请输入数据";
+                moveTimeText.transform.GetChild(2).GetComponent<Text>().color = Color.red;
+            } 
+            else if (!int.TryParse(peopleCountText.text,out manNum) || !int.TryParse(zhuangZaiText.text, out zzManNum) ||
+                !float.TryParse(tunTuText.text, out tuntu))
+            {
+                moveTimeText.text = "请检查数据";
+                moveTimeText.transform.GetChild(2).GetComponent<Text>().color = Color.red;
+            }
+            else
+            {
+                moveTimeText.text = (manNum / tuntu / zzManNum).ToString("0.0") + "小时";
+                moveTimeText.transform.GetChild(2).GetComponent<Text>().color = Color.white;
+            }
+        });
+
+        resetTimeBtn.onClick.AddListener(() =>
+        {
+            peopleCountText.text = "";
+            zhuangZaiText.text = "";
+            moveTimeText.text = "待计算";
+        });
+
+        closeCalculateButton.onClick.AddListener(() =>
+        {
+            calculatePanel.gameObject.SetActive(false);
+            calculateShowButton.GetComponent<Image>().color = new UnityEngine.Color(1, 1, 1, 0.5f);
+            calcOpen = false;
+        });
+
         allInOut[0].onClick.AddListener(() =>
         {
             inOutIndex = 0;
@@ -557,6 +677,7 @@ public class RKZYLayer : YZTRootLayer
             allInOut[1].gameObject.GetComponent<Image>().sprite = sprites[1];
             allInOut[2].gameObject.GetComponent<Image>().sprite = sprites[1];
             RefreshZYYAData();
+            CheckCalcUsable();
         });
 
         allInOut[1].onClick.AddListener(() =>
@@ -566,7 +687,9 @@ public class RKZYLayer : YZTRootLayer
             for (int i = 0; i < movePlans.Count; i++)
             {
                 if (movePlans[i].lineDir == LineDir.Out)
+                {
                     movePlans[i].gameObject.SetActive(true);
+                }
                 else
                     movePlans[i].gameObject.SetActive(false);
             }
@@ -574,6 +697,7 @@ public class RKZYLayer : YZTRootLayer
             allInOut[1].gameObject.GetComponent<Image>().sprite = sprites[0];
             allInOut[2].gameObject.GetComponent<Image>().sprite = sprites[1];
             RefreshZYYAData();
+            CheckCalcUsable();
         });
         allInOut[2].onClick.AddListener(() =>
         {
@@ -582,7 +706,9 @@ public class RKZYLayer : YZTRootLayer
             for (int i = 0; i < movePlans.Count; i++)
             {
                 if (movePlans[i].lineDir == LineDir.In)
+                {
                     movePlans[i].gameObject.SetActive(true);
+                }
                 else
                     movePlans[i].gameObject.SetActive(false);
             }
@@ -590,6 +716,7 @@ public class RKZYLayer : YZTRootLayer
             allInOut[1].gameObject.GetComponent<Image>().sprite = sprites[1];
             allInOut[2].gameObject.GetComponent<Image>().sprite = sprites[0];
             RefreshZYYAData();
+            CheckCalcUsable();
         });
         BeforeBtnClick();
     }

Some files were not shown because too many files changed in this diff