Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang

xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7b69fd7e1b25df94484ae268a2f21083
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.fbx.meta

@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 0c3292be5d8a7ed49b3ee68175c08592
+ModelImporter:
+  serializedVersion: 21300
+  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
+    strictVertexDataChecks: 0
+  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
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.max.meta

@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 9c2f6b6b6f7253041af0bb870086a9dc
+ModelImporter:
+  serializedVersion: 21300
+  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
+    strictVertexDataChecks: 0
+  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
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.spp.meta

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

xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_BaseColor.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 717575ed56b2a8e4faf81f1252438dd7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  cookieLightType: 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
+  - 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Height.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 86dd6ffc61b683b408cde129f7d6494d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  cookieLightType: 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
+  - 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Metallic.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: fefc9feedf8fe6a4a81ae92928f8d2a3
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  cookieLightType: 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
+  - 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Normal.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: a12597fa69169324090cc08ee7da559f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  cookieLightType: 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
+  - 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Roughness.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 5184153dfae65ac43b16f6e43f90ea38
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  cookieLightType: 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
+  - 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/截图.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: b217c4c481b43b140b883ceeafe0c223
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  cookieLightType: 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
+  - 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/ProtoBuf/Proto/Config.cs

@@ -0,0 +1,83 @@
+// <auto-generated>
+//     Generated by the protocol buffer compiler.  DO NOT EDIT!
+//     source: config.proto
+// </auto-generated>
+#pragma warning disable 1591, 0612, 3021, 8981
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+/// <summary>Holder for reflection information generated from config.proto</summary>
+public static partial class ConfigReflection {
+
+  #region Descriptor
+  /// <summary>File descriptor for config.proto</summary>
+  public static pbr::FileDescriptor Descriptor {
+    get { return descriptor; }
+  }
+  private static pbr::FileDescriptor descriptor;
+
+  static ConfigReflection() {
+    byte[] descriptorData = global::System.Convert.FromBase64String(
+        string.Concat(
+          "Cgxjb25maWcucHJvdG8qnQEKCkVSUk9SX0NPREUSCgoGRVJSX09rEAASEAoM",
+          "RVJSX05vUGxheWVyEAESDgoKRVJSX05vUm9vbRACEg0KCUVSUl9Ub2tlbhAE",
+          "Eg0KCUVSUl9Mb2dpbhAFEg4KCkVSUl9BY3Rpb24QBhIOCgpFUlJfUGFyYW1z",
+          "EAcSDgoKRVJSX1NlcnZlchAIEhMKD0VSUl9Ob0F1dGhvcml0eRAJQgdaBS4v",
+          "O3BiYgZwcm90bzM="));
+    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+        new pbr::FileDescriptor[] { },
+        new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ERROR_CODE), }, null, null));
+  }
+  #endregion
+
+}
+#region Enums
+/// <summary>
+///错误码
+/// </summary>
+public enum ERROR_CODE {
+  /// <summary>
+  ///OK
+  /// </summary>
+  [pbr::OriginalName("ERR_Ok")] ErrOk = 0,
+  /// <summary>
+  ///没有这个玩家
+  /// </summary>
+  [pbr::OriginalName("ERR_NoPlayer")] ErrNoPlayer = 1,
+  /// <summary>
+  ///加入房间失败
+  /// </summary>
+  [pbr::OriginalName("ERR_NoRoom")] ErrNoRoom = 2,
+  /// <summary>
+  ///Token验证失败
+  /// </summary>
+  [pbr::OriginalName("ERR_Token")] ErrToken = 4,
+  /// <summary>
+  ///登录失败
+  /// </summary>
+  [pbr::OriginalName("ERR_Login")] ErrLogin = 5,
+  /// <summary>
+  ///操作失败
+  /// </summary>
+  [pbr::OriginalName("ERR_Action")] ErrAction = 6,
+  /// <summary>
+  ///参数错误
+  /// </summary>
+  [pbr::OriginalName("ERR_Params")] ErrParams = 7,
+  /// <summary>
+  ///服务器内部错误
+  /// </summary>
+  [pbr::OriginalName("ERR_Server")] ErrServer = 8,
+  /// <summary>
+  ///没有权限
+  /// </summary>
+  [pbr::OriginalName("ERR_NoAuthority")] ErrNoAuthority = 9,
+}
+
+#endregion
+
+
+#endregion Designer generated code

xiaofang/Assets/ProtoBuf/Proto/Config.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 346cf22042cbc3d4093f61e53fafb557
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/ProtoBuf/Proto/Move.cs

@@ -31,11 +31,12 @@ public static partial class MoveReflection {
           "KAsyCC5OcGNEYXRhInwKB05wY0RhdGESCQoBeBgBIAEoARIJCgF5GAIgASgB",
           "EgkKAXoYAyABKAESDgoGdXNlcklkGAQgASgJEhAKCG5pY2tOYW1lGAggASgJ",
           "EgwKBHR5cGUYBSABKAUSEQoJZm9ybWF0aW9uGAYgASgFEg0KBWV2ZW50GAcg",
-          "ASgFImYKEk1vdmVSb29tQW9pUmVxdWVzdBIOCgZyb29tSWQYASABKAkSDgoG",
+          "ASgFIoUBChJNb3ZlUm9vbUFvaVJlcXVlc3QSDgoGcm9vbUlkGAEgASgJEg4K",
-          "dXNlcklkGAIgASgDEgkKAXgYAyABKAISCQoBeRgEIAEoAhIJCgF6GAUgASgC",
+          "BnVzZXJJZBgCIAEoAxIJCgF4GAMgASgCEgkKAXkYBCABKAISCQoBehgFIAEo",
-          "Eg8KB3NjZW5lSWQYBiABKAkiFQoTTW92ZVJvb21Bb2lSZXNwb25zZSI/Cg9O",
+          "AhIPCgdzY2VuZUlkGAYgASgJEg0KBW5wY0lkGAcgASgJEg4KBmFjdGlvbhgI",
-          "cGNJbmZvUmVzcG9uc2USDQoFbnBjSWQYASABKAkSDwoHaW5qdXJlZBgCIAEo",
+          "IAEoBSIVChNNb3ZlUm9vbUFvaVJlc3BvbnNlIj8KD05wY0luZm9SZXNwb25z",
-          "CBIMCgRzdG9wGAMgASgIQgdaBS4vO3BiYgZwcm90bzM="));
+          "ZRINCgVucGNJZBgBIAEoCRIPCgdpbmp1cmVkGAIgASgIEgwKBHN0b3AYAyAB",
+          "KAhCB1oFLi87cGJiBnByb3RvMw=="));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { },
         new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
@@ -44,7 +45,7 @@ public static partial class MoveReflection {
           new pbr::GeneratedClrTypeInfo(typeof(global::MoveRequest), global::MoveRequest.Parser, new[]{ "RoomId", "MoveType", "SelectId" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::MoveResponse), global::MoveResponse.Parser, new[]{ "UserId", "RoomId", "MoveData" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::NpcData), global::NpcData.Parser, new[]{ "X", "Y", "Z", "UserId", "NickName", "Type", "Formation", "Event" }, null, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::MoveRoomAoiRequest), global::MoveRoomAoiRequest.Parser, new[]{ "RoomId", "UserId", "X", "Y", "Z", "SceneId" }, null, null, null, null),
+          new pbr::GeneratedClrTypeInfo(typeof(global::MoveRoomAoiRequest), global::MoveRoomAoiRequest.Parser, new[]{ "RoomId", "UserId", "X", "Y", "Z", "SceneId", "NpcId", "Action" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::MoveRoomAoiResponse), global::MoveRoomAoiResponse.Parser, null, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::NpcInfoResponse), global::NpcInfoResponse.Parser, new[]{ "NpcId", "Injured", "Stop" }, null, null, null, null)
         }));
@@ -1639,6 +1640,8 @@ public sealed partial class MoveRoomAoiRequest : pb::IMessage<MoveRoomAoiRequest
     y_ = other.y_;
     z_ = other.z_;
     sceneId_ = other.sceneId_;
+    npcId_ = other.npcId_;
+    action_ = other.action_;
     _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
   }
 
@@ -1738,6 +1741,36 @@ public sealed partial class MoveRoomAoiRequest : pb::IMessage<MoveRoomAoiRequest
     }
   }
 
+  /// <summary>Field number for the "npcId" field.</summary>
+  public const int NpcIdFieldNumber = 7;
+  private string npcId_ = "";
+  /// <summary>
+  /// npcId
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string NpcId {
+    get { return npcId_; }
+    set {
+      npcId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+    }
+  }
+
+  /// <summary>Field number for the "action" field.</summary>
+  public const int ActionFieldNumber = 8;
+  private int action_;
+  /// <summary>
+  /// 是否扛起  1 扛起 2 放下
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public int Action {
+    get { return action_; }
+    set {
+      action_ = value;
+    }
+  }
+
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public override bool Equals(object other) {
@@ -1759,6 +1792,8 @@ public sealed partial class MoveRoomAoiRequest : pb::IMessage<MoveRoomAoiRequest
     if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Y, other.Y)) return false;
     if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false;
     if (SceneId != other.SceneId) return false;
+    if (NpcId != other.NpcId) return false;
+    if (Action != other.Action) return false;
     return Equals(_unknownFields, other._unknownFields);
   }
 
@@ -1772,6 +1807,8 @@ public sealed partial class MoveRoomAoiRequest : pb::IMessage<MoveRoomAoiRequest
     if (Y != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Y);
     if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z);
     if (SceneId.Length != 0) hash ^= SceneId.GetHashCode();
+    if (NpcId.Length != 0) hash ^= NpcId.GetHashCode();
+    if (Action != 0) hash ^= Action.GetHashCode();
     if (_unknownFields != null) {
       hash ^= _unknownFields.GetHashCode();
     }
@@ -1814,6 +1851,14 @@ public sealed partial class MoveRoomAoiRequest : pb::IMessage<MoveRoomAoiRequest
       output.WriteRawTag(50);
       output.WriteString(SceneId);
     }
+    if (NpcId.Length != 0) {
+      output.WriteRawTag(58);
+      output.WriteString(NpcId);
+    }
+    if (Action != 0) {
+      output.WriteRawTag(64);
+      output.WriteInt32(Action);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(output);
     }
@@ -1848,6 +1893,14 @@ public sealed partial class MoveRoomAoiRequest : pb::IMessage<MoveRoomAoiRequest
       output.WriteRawTag(50);
       output.WriteString(SceneId);
     }
+    if (NpcId.Length != 0) {
+      output.WriteRawTag(58);
+      output.WriteString(NpcId);
+    }
+    if (Action != 0) {
+      output.WriteRawTag(64);
+      output.WriteInt32(Action);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(ref output);
     }
@@ -1876,6 +1929,12 @@ public sealed partial class MoveRoomAoiRequest : pb::IMessage<MoveRoomAoiRequest
     if (SceneId.Length != 0) {
       size += 1 + pb::CodedOutputStream.ComputeStringSize(SceneId);
     }
+    if (NpcId.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(NpcId);
+    }
+    if (Action != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeInt32Size(Action);
+    }
     if (_unknownFields != null) {
       size += _unknownFields.CalculateSize();
     }
@@ -1906,6 +1965,12 @@ public sealed partial class MoveRoomAoiRequest : pb::IMessage<MoveRoomAoiRequest
     if (other.SceneId.Length != 0) {
       SceneId = other.SceneId;
     }
+    if (other.NpcId.Length != 0) {
+      NpcId = other.NpcId;
+    }
+    if (other.Action != 0) {
+      Action = other.Action;
+    }
     _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
   }
 
@@ -1949,6 +2014,14 @@ public sealed partial class MoveRoomAoiRequest : pb::IMessage<MoveRoomAoiRequest
           SceneId = input.ReadString();
           break;
         }
+        case 58: {
+          NpcId = input.ReadString();
+          break;
+        }
+        case 64: {
+          Action = input.ReadInt32();
+          break;
+        }
       }
     }
   #endif
@@ -1992,6 +2065,14 @@ public sealed partial class MoveRoomAoiRequest : pb::IMessage<MoveRoomAoiRequest
           SceneId = input.ReadString();
           break;
         }
+        case 58: {
+          NpcId = input.ReadString();
+          break;
+        }
+        case 64: {
+          Action = input.ReadInt32();
+          break;
+        }
       }
     }
   }

xiaofang/Assets/ProtoBuf/Proto/Object.cs

@@ -102,7 +102,7 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
   public const int IdFieldNumber = 1;
   private string id_ = "";
   /// <summary>
-  /// ID
+  /// 对象自定义ID
   /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
@@ -117,7 +117,7 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
   public const int ObjectIdFieldNumber = 2;
   private string objectId_ = "";
   /// <summary>
-  /// 对象ID
+  /// 对象基础ID
   /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]

xiaofang/Assets/ProtoBuf/Proto/Select.cs

@@ -22,34 +22,35 @@ public static partial class SelectReflection {
   static SelectReflection() {
     byte[] descriptorData = global::System.Convert.FromBase64String(
         string.Concat(
-          "CgxzZWxlY3QucHJvdG8i6AEKDVNlbGVjdFJlcXVlc3QSEAoIU2VsZWN0SWQY",
+          "CgxzZWxlY3QucHJvdG8iiwIKDVNlbGVjdFJlcXVlc3QSEAoIU2VsZWN0SWQY",
           "ASABKAkSDgoGVXNlcklkGAIgASgJEg4KBlJvb21JZBgDIAEoCRIOCgZUYXNr",
           "SWQYBCABKAkSDgoGUm9sZUlkGAUgASgJEhAKCElucHV0TnVtGAYgASgFEi8K",
           "DlNlbGVjdFVzZXJMaXN0GAcgAygLMhcuU2VsZWN0UmVxdWVzdC5Vc2VyTGlz",
-          "dBIWCg5TZWxlY3RSb2xlTGlzdBgIIAMoCRoqCghVc2VyTGlzdBIOCgZVc2Vy",
+          "dBIWCg5TZWxlY3RSb2xlTGlzdBgIIAMoCRIPCgdPdGhlcklkGAkgASgJEhAK",
-          "SWQYASABKAkSDgoGUm9sZUlkGAIgASgJIqQFCg5TZWxlY3RSZXNwb25zZRIK",
+          "CE90aGVySWQyGAogASgJGioKCFVzZXJMaXN0Eg4KBlVzZXJJZBgBIAEoCRIO",
-          "CgJJZBgBIAEoCRIOCgZCYXNlSWQYAiABKAkSDAoETm90ZRgDIAEoCRINCgVH",
+          "CgZSb2xlSWQYAiABKAkipAUKDlNlbGVjdFJlc3BvbnNlEgoKAklkGAEgASgJ",
-          "cm91cBgEIAEoCRIRCglVbkRpc3BsYXkYBSABKAkSEAoIU2hvd1RleHQYBiAB",
+          "Eg4KBkJhc2VJZBgCIAEoCRIMCgROb3RlGAMgASgJEg0KBUdyb3VwGAQgASgJ",
-          "KAkSDAoESWNvbhgHIAEoCRIVCg1QcmVjb25kaXRpb25zGAggASgJEhEKCUV4",
+          "EhEKCVVuRGlzcGxheRgFIAEoCRIQCghTaG93VGV4dBgGIAEoCRIMCgRJY29u",
-          "Y2x1c2l2ZRgJIAEoCRIQCghUYXNrVGltZRgKIAEoCRIRCglUaW1lTGltaXQY",
+          "GAcgASgJEhUKDVByZWNvbmRpdGlvbnMYCCABKAkSEQoJRXhjbHVzaXZlGAkg",
-          "CyABKAMSEgoKTmV4dFNlbGVjdBgMIAEoCRIQCghUYXNrTGluaxgNIAEoCRIX",
+          "ASgJEhAKCFRhc2tUaW1lGAogASgJEhEKCVRpbWVMaW1pdBgLIAEoAxISCgpO",
-          "Cg9UYXNrTGlua0RldGFpbHMYDiABKAkSEAoIQ2FsbE1vZGUYDyABKAkSFQoN",
+          "ZXh0U2VsZWN0GAwgASgJEhAKCFRhc2tMaW5rGA0gASgJEhcKD1Rhc2tMaW5r",
-          "Q2FsbFJlY2lwaWVudBgQIAEoCRIVCg1Db3JyZWN0T3B0aW9uGBEgASgJEg4K",
+          "RGV0YWlscxgOIAEoCRIQCghDYWxsTW9kZRgPIAEoCRIVCg1DYWxsUmVjaXBp",
-          "BlJld2FyZBgSIAEoCRIOCgZSZXN1bHQYEyABKAkSDQoFUm91dGUYFCABKAkS",
+          "ZW50GBAgASgJEhUKDUNvcnJlY3RPcHRpb24YESABKAkSDgoGUmV3YXJkGBIg",
-          "FAoMVGltaW5nQ2hhbmdlGBUgASgJEhEKCUFwcGxpZWRVSRgWIAEoCRIRCglV",
+          "ASgJEg4KBlJlc3VsdBgTIAEoCRINCgVSb3V0ZRgUIAEoCRIUCgxUaW1pbmdD",
-          "SURldGFpbHMYFyABKAkSCwoDU2VxGBggASgJEhIKClBsYXlTY3JpcHQYGSAB",
+          "aGFuZ2UYFSABKAkSEQoJQXBwbGllZFVJGBYgASgJEhEKCVVJRGV0YWlscxgX",
-          "KAkSDgoGUm9vbUlkGBogASgJEhIKCkNyZWF0ZVRpbWUYGyABKAkSEgoKVXBk",
+          "IAEoCRILCgNTZXEYGCABKAkSEgoKUGxheVNjcmlwdBgZIAEoCRIOCgZSb29t",
-          "YXRlVGltZRgcIAEoCRIOCgZVc2VySWQYHSABKAkSDgoGUm9sZUlkGB4gASgJ",
+          "SWQYGiABKAkSEgoKQ3JlYXRlVGltZRgbIAEoCRISCgpVcGRhdGVUaW1lGBwg",
-          "EjAKDlNlbGVjdFVzZXJMaXN0GB8gAygLMhguU2VsZWN0UmVzcG9uc2UuVXNl",
+          "ASgJEg4KBlVzZXJJZBgdIAEoCRIOCgZSb2xlSWQYHiABKAkSMAoOU2VsZWN0",
-          "ckxpc3QSFgoOU2VsZWN0Um9sZUxpc3QYICADKAkaKgoIVXNlckxpc3QSDgoG",
+          "VXNlckxpc3QYHyADKAsyGC5TZWxlY3RSZXNwb25zZS5Vc2VyTGlzdBIWCg5T",
-          "VXNlcklkGAEgASgJEg4KBlJvbGVJZBgCIAEoCSJIChRTZWxlY3RIaXN0b3J5",
+          "ZWxlY3RSb2xlTGlzdBggIAMoCRoqCghVc2VyTGlzdBIOCgZVc2VySWQYASAB",
-          "UmVxdWVzdBIQCghTZWxlY3RJZBgBIAEoCRIOCgZVc2VySWQYAiABKAkSDgoG",
+          "KAkSDgoGUm9sZUlkGAIgASgJIkgKFFNlbGVjdEhpc3RvcnlSZXF1ZXN0EhAK",
-          "Um9vbUlkGAMgASgJIjkKFVNlbGVjdEhpc3RvcnlSZXNwb25zZRIgCgdTZWxl",
+          "CFNlbGVjdElkGAEgASgJEg4KBlVzZXJJZBgCIAEoCRIOCgZSb29tSWQYAyAB",
-          "Y3RzGAEgAygLMg8uU2VsZWN0UmVzcG9uc2VCB1oFLi87cGJiBnByb3RvMw=="));
+          "KAkiOQoVU2VsZWN0SGlzdG9yeVJlc3BvbnNlEiAKB1NlbGVjdHMYASADKAsy",
+          "Dy5TZWxlY3RSZXNwb25zZUIHWgUuLztwYmIGcHJvdG8z"));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { },
         new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::SelectRequest), global::SelectRequest.Parser, new[]{ "SelectId", "UserId", "RoomId", "TaskId", "RoleId", "InputNum", "SelectUserList", "SelectRoleList" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::SelectRequest.Types.UserList), global::SelectRequest.Types.UserList.Parser, new[]{ "UserId", "RoleId" }, null, null, null, null)}),
+          new pbr::GeneratedClrTypeInfo(typeof(global::SelectRequest), global::SelectRequest.Parser, new[]{ "SelectId", "UserId", "RoomId", "TaskId", "RoleId", "InputNum", "SelectUserList", "SelectRoleList", "OtherId", "OtherId2" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::SelectRequest.Types.UserList), global::SelectRequest.Types.UserList.Parser, new[]{ "UserId", "RoleId" }, null, null, null, null)}),
           new pbr::GeneratedClrTypeInfo(typeof(global::SelectResponse), global::SelectResponse.Parser, new[]{ "Id", "BaseId", "Note", "Group", "UnDisplay", "ShowText", "Icon", "Preconditions", "Exclusive", "TaskTime", "TimeLimit", "NextSelect", "TaskLink", "TaskLinkDetails", "CallMode", "CallRecipient", "CorrectOption", "Reward", "Result", "Route", "TimingChange", "AppliedUI", "UIDetails", "Seq", "PlayScript", "RoomId", "CreateTime", "UpdateTime", "UserId", "RoleId", "SelectUserList", "SelectRoleList" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::SelectResponse.Types.UserList), global::SelectResponse.Types.UserList.Parser, new[]{ "UserId", "RoleId" }, null, null, null, null)}),
           new pbr::GeneratedClrTypeInfo(typeof(global::SelectHistoryRequest), global::SelectHistoryRequest.Parser, new[]{ "SelectId", "UserId", "RoomId" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::SelectHistoryResponse), global::SelectHistoryResponse.Parser, new[]{ "Selects" }, null, null, null, null)
@@ -102,6 +103,8 @@ public sealed partial class SelectRequest : pb::IMessage<SelectRequest>
     inputNum_ = other.inputNum_;
     selectUserList_ = other.selectUserList_.Clone();
     selectRoleList_ = other.selectRoleList_.Clone();
+    otherId_ = other.otherId_;
+    otherId2_ = other.otherId2_;
     _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
   }
 
@@ -229,6 +232,36 @@ public sealed partial class SelectRequest : pb::IMessage<SelectRequest>
     get { return selectRoleList_; }
   }
 
+  /// <summary>Field number for the "OtherId" field.</summary>
+  public const int OtherIdFieldNumber = 9;
+  private string otherId_ = "";
+  /// <summary>
+  /// 其他ID 道具ID 交互对象ID 等 当触发属于消火栓增援任务时，需要传入消火栓的对象ID根据配置表获取
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string OtherId {
+    get { return otherId_; }
+    set {
+      otherId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+    }
+  }
+
+  /// <summary>Field number for the "OtherId2" field.</summary>
+  public const int OtherId2FieldNumber = 10;
+  private string otherId2_ = "";
+  /// <summary>
+  /// 其他ID2 道具ID 交互对象ID 等 当触发属于消火栓增援任务时，需要传消火栓唯一ID
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string OtherId2 {
+    get { return otherId2_; }
+    set {
+      otherId2_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+    }
+  }
+
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public override bool Equals(object other) {
@@ -252,6 +285,8 @@ public sealed partial class SelectRequest : pb::IMessage<SelectRequest>
     if (InputNum != other.InputNum) return false;
     if(!selectUserList_.Equals(other.selectUserList_)) return false;
     if(!selectRoleList_.Equals(other.selectRoleList_)) return false;
+    if (OtherId != other.OtherId) return false;
+    if (OtherId2 != other.OtherId2) return false;
     return Equals(_unknownFields, other._unknownFields);
   }
 
@@ -267,6 +302,8 @@ public sealed partial class SelectRequest : pb::IMessage<SelectRequest>
     if (InputNum != 0) hash ^= InputNum.GetHashCode();
     hash ^= selectUserList_.GetHashCode();
     hash ^= selectRoleList_.GetHashCode();
+    if (OtherId.Length != 0) hash ^= OtherId.GetHashCode();
+    if (OtherId2.Length != 0) hash ^= OtherId2.GetHashCode();
     if (_unknownFields != null) {
       hash ^= _unknownFields.GetHashCode();
     }
@@ -311,6 +348,14 @@ public sealed partial class SelectRequest : pb::IMessage<SelectRequest>
     }
     selectUserList_.WriteTo(output, _repeated_selectUserList_codec);
     selectRoleList_.WriteTo(output, _repeated_selectRoleList_codec);
+    if (OtherId.Length != 0) {
+      output.WriteRawTag(74);
+      output.WriteString(OtherId);
+    }
+    if (OtherId2.Length != 0) {
+      output.WriteRawTag(82);
+      output.WriteString(OtherId2);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(output);
     }
@@ -347,6 +392,14 @@ public sealed partial class SelectRequest : pb::IMessage<SelectRequest>
     }
     selectUserList_.WriteTo(ref output, _repeated_selectUserList_codec);
     selectRoleList_.WriteTo(ref output, _repeated_selectRoleList_codec);
+    if (OtherId.Length != 0) {
+      output.WriteRawTag(74);
+      output.WriteString(OtherId);
+    }
+    if (OtherId2.Length != 0) {
+      output.WriteRawTag(82);
+      output.WriteString(OtherId2);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(ref output);
     }
@@ -377,6 +430,12 @@ public sealed partial class SelectRequest : pb::IMessage<SelectRequest>
     }
     size += selectUserList_.CalculateSize(_repeated_selectUserList_codec);
     size += selectRoleList_.CalculateSize(_repeated_selectRoleList_codec);
+    if (OtherId.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(OtherId);
+    }
+    if (OtherId2.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(OtherId2);
+    }
     if (_unknownFields != null) {
       size += _unknownFields.CalculateSize();
     }
@@ -409,6 +468,12 @@ public sealed partial class SelectRequest : pb::IMessage<SelectRequest>
     }
     selectUserList_.Add(other.selectUserList_);
     selectRoleList_.Add(other.selectRoleList_);
+    if (other.OtherId.Length != 0) {
+      OtherId = other.OtherId;
+    }
+    if (other.OtherId2.Length != 0) {
+      OtherId2 = other.OtherId2;
+    }
     _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
   }
 
@@ -460,6 +525,14 @@ public sealed partial class SelectRequest : pb::IMessage<SelectRequest>
           selectRoleList_.AddEntriesFrom(input, _repeated_selectRoleList_codec);
           break;
         }
+        case 74: {
+          OtherId = input.ReadString();
+          break;
+        }
+        case 82: {
+          OtherId2 = input.ReadString();
+          break;
+        }
       }
     }
   #endif
@@ -511,6 +584,14 @@ public sealed partial class SelectRequest : pb::IMessage<SelectRequest>
           selectRoleList_.AddEntriesFrom(ref input, _repeated_selectRoleList_codec);
           break;
         }
+        case 74: {
+          OtherId = input.ReadString();
+          break;
+        }
+        case 82: {
+          OtherId2 = input.ReadString();
+          break;
+        }
       }
     }
   }

xiaofang/Assets/ProtoBuf/test.cs

@@ -441,7 +441,7 @@ public class test : MonoBehaviour
     }   
     
     
-    //界面选项操作
+    //
     public void GetSelectHistoryList()
     {
         SelectHistoryRequest data = new SelectHistoryRequest();
@@ -717,7 +717,7 @@ public class test : MonoBehaviour
                 Debug.Log(requestObject);
 
                 break;
-            //对象触发操作
+            //
             case "move.MoveNpc":
                 Debug.Log("-----------move.MoveNpc");
                 MoveRequest moveRequest = ProtoBufffer.DeSerialize<MoveRequest>(bytes);