diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng.meta new file mode 100644 index 00000000..21d016e9 --- /dev/null +++ b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b69fd7e1b25df94484ae268a2f21083 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.fbx b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.fbx new file mode 100644 index 00000000..9e62cd25 Binary files /dev/null and b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.fbx differ diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.fbx.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.fbx.meta new file mode 100644 index 00000000..6d32ee2e --- /dev/null +++ b/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: diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.max b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.max new file mode 100644 index 00000000..798037df Binary files /dev/null and b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.max differ diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.max.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.max.meta new file mode 100644 index 00000000..26128731 --- /dev/null +++ b/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: diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.spp b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.spp new file mode 100644 index 00000000..eb76cb60 Binary files /dev/null and b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.spp differ diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.spp.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.spp.meta new file mode 100644 index 00000000..785e5901 --- /dev/null +++ b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng.spp.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fe590b64330aabd44906e6bcd19ff8d2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_BaseColor.png b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_BaseColor.png new file mode 100644 index 00000000..a26e6b13 Binary files /dev/null and b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_BaseColor.png differ diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_BaseColor.png.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_BaseColor.png.meta new file mode 100644 index 00000000..69204c19 --- /dev/null +++ b/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: diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Height.png b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Height.png new file mode 100644 index 00000000..677c3df0 Binary files /dev/null and b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Height.png differ diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Height.png.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Height.png.meta new file mode 100644 index 00000000..77842c7b --- /dev/null +++ b/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: diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Metallic.png b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Metallic.png new file mode 100644 index 00000000..78a7f1ab Binary files /dev/null and b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Metallic.png differ diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Metallic.png.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Metallic.png.meta new file mode 100644 index 00000000..f68dda5c --- /dev/null +++ b/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: diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Normal.png b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Normal.png new file mode 100644 index 00000000..cfc4c77a Binary files /dev/null and b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Normal.png differ diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Normal.png.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Normal.png.meta new file mode 100644 index 00000000..5823a695 --- /dev/null +++ b/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: diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Roughness.png b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Roughness.png new file mode 100644 index 00000000..a335d98d Binary files /dev/null and b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Roughness.png differ diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Roughness.png.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/dingpeng_01 - Default_Roughness.png.meta new file mode 100644 index 00000000..f24e5c5b --- /dev/null +++ b/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: diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/截图.png b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/截图.png new file mode 100644 index 00000000..6c35d02d Binary files /dev/null and b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/截图.png differ diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/截图.png.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/dingpeng/截图.png.meta new file mode 100644 index 00000000..33831492 --- /dev/null +++ b/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: diff --git a/xiaofang/Assets/ProtoBuf/Proto/Config.cs b/xiaofang/Assets/ProtoBuf/Proto/Config.cs new file mode 100644 index 00000000..4b9a1401 --- /dev/null +++ b/xiaofang/Assets/ProtoBuf/Proto/Config.cs @@ -0,0 +1,83 @@ +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: config.proto +// +#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; +/// Holder for reflection information generated from config.proto +public static partial class ConfigReflection { + + #region Descriptor + /// File descriptor for config.proto + 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 +/// +///错误码 +/// +public enum ERROR_CODE { + /// + ///OK + /// + [pbr::OriginalName("ERR_Ok")] ErrOk = 0, + /// + ///没有这个玩家 + /// + [pbr::OriginalName("ERR_NoPlayer")] ErrNoPlayer = 1, + /// + ///加入房间失败 + /// + [pbr::OriginalName("ERR_NoRoom")] ErrNoRoom = 2, + /// + ///Token验证失败 + /// + [pbr::OriginalName("ERR_Token")] ErrToken = 4, + /// + ///登录失败 + /// + [pbr::OriginalName("ERR_Login")] ErrLogin = 5, + /// + ///操作失败 + /// + [pbr::OriginalName("ERR_Action")] ErrAction = 6, + /// + ///参数错误 + /// + [pbr::OriginalName("ERR_Params")] ErrParams = 7, + /// + ///服务器内部错误 + /// + [pbr::OriginalName("ERR_Server")] ErrServer = 8, + /// + ///没有权限 + /// + [pbr::OriginalName("ERR_NoAuthority")] ErrNoAuthority = 9, +} + +#endregion + + +#endregion Designer generated code diff --git a/xiaofang/Assets/ProtoBuf/Proto/Config.cs.meta b/xiaofang/Assets/ProtoBuf/Proto/Config.cs.meta new file mode 100644 index 00000000..0511bd12 --- /dev/null +++ b/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: diff --git a/xiaofang/Assets/ProtoBuf/Proto/Fps.cs b/xiaofang/Assets/ProtoBuf/Proto/Fps.cs index b2a64f5d..1e4d0bec 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Fps.cs +++ b/xiaofang/Assets/ProtoBuf/Proto/Fps.cs @@ -25,17 +25,35 @@ public static partial class FpsReflection { "CglmcHMucHJvdG8iNgoRQnJvYWRjYXN0RnJhbWVNc2cSIQoGZnJhbWVzGAEg", "AygLMhEuRnJhbWVEYXRhUmVxdWVzdCJPChBGcmFtZURhdGFSZXF1ZXN0EhQK", "B2ZyYW1lSUQYASABKA1IAIgBARIZCgVpbnB1dBgCIAMoCzIKLklucHV0RGF0", - "YUIKCghfZnJhbWVJRCJpCglJbnB1dERhdGESCgoCaWQYASABKAkSCwoDc0lk", - "GAIgASgJEgkKAXgYAyABKAISCQoBeRgEIAEoAhISCgpyb29tU2VhdElkGAUg", - "ASgFEgkKAXoYBiABKAISDgoGcm9vbUlkGAggASgJIg8KDUVtcHR5UmVzcG9u", - "c2VCB1oFLi87cGJiBnByb3RvMw==")); + "YUIKCghfZnJhbWVJRCLyAgoJSW5wdXREYXRhEgoKAmlkGAEgASgJEgsKA3NJ", + "ZBgCIAEoCRIJCgF4GAMgASgCEgkKAXkYBCABKAISEgoKcm9vbVNlYXRJZBgF", + "IAEoBRIJCgF6GAYgASgCEg4KBnJvb21JZBgIIAEoCRIOCgZ2aXNpb24YCSAB", + "KAISEQoJZGlyZWN0aW9uGAogASgCEg4KBmFjdGlvbhgLIAEoBRIeCgpmaXJl", + "UGFyYW1zGAwgAygLMgouRmlyZVBhcmFtEh4KCnByb3BQYXJhbXMYDSADKAsy", + "Ci5Qcm9wUGFyYW0SHAoJbnBjUGFyYW1zGA4gAygLMgkuTnBjUGFyYW0SDQoF", + "c3BlZWQYDyABKAISDwoHbmV0d29yaxgQIAEoAhITCgt1c2VQb3dlckJveBgR", + "IAEoCBIeCgp0YXNrUGFyYW1zGBIgAygLMgouVGFza1BhcmFtEiEKC09ubGlu", + "ZVBhcmFtGBMgAygLMgwuT25saW5lUGFyYW0iDwoNRW1wdHlSZXNwb25zZSIo", + "CglGaXJlUGFyYW0SDQoFcG9pbnQYASABKAkSDAoEaGFsZhgCIAEoAiJYCglQ", + "cm9wUGFyYW0SDgoGcHJvcElkGAEgASgJEgsKA251bRgCIAEoBRIPCgdzZWNv", + "bmRzGAMgASgFEg0KBXBvaW50GAQgASgJEg4KBnN0YXR1cxgFIAEoBSI4CghO", + "cGNQYXJhbRINCgVucGNJZBgBIAEoCRINCgVwb2ludBgCIAEoCRIOCgZzdGF0", + "dXMYAyABKAUiMAoLT25saW5lUGFyYW0SDgoGcm9sZUlkGAEgASgJEhEKCW9u", + "bGluZU51bRgCIAEoBSJBCglUYXNrUGFyYW0SDgoGdGFza0lkGAEgASgJEhAK", + "CHRhc2tOYW1lGAIgASgJEhIKCnRhc2tTdGF0dXMYAyABKAVCB1oFLi87cGJi", + "BnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::BroadcastFrameMsg), global::BroadcastFrameMsg.Parser, new[]{ "Frames" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::FrameDataRequest), global::FrameDataRequest.Parser, new[]{ "FrameID", "Input" }, new[]{ "FrameID" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::InputData), global::InputData.Parser, new[]{ "Id", "SId", "X", "Y", "RoomSeatId", "Z", "RoomId" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::EmptyResponse), global::EmptyResponse.Parser, null, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::InputData), global::InputData.Parser, new[]{ "Id", "SId", "X", "Y", "RoomSeatId", "Z", "RoomId", "Vision", "Direction", "Action", "FireParams", "PropParams", "NpcParams", "Speed", "Network", "UsePowerBox", "TaskParams", "OnlineParam" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::EmptyResponse), global::EmptyResponse.Parser, null, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::FireParam), global::FireParam.Parser, new[]{ "Point", "Half" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::PropParam), global::PropParam.Parser, new[]{ "PropId", "Num", "Seconds", "Point", "Status" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::NpcParam), global::NpcParam.Parser, new[]{ "NpcId", "Point", "Status" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::OnlineParam), global::OnlineParam.Parser, new[]{ "RoleId", "OnlineNum" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::TaskParam), global::TaskParam.Parser, new[]{ "TaskId", "TaskName", "TaskStatus" }, null, null, null, null) })); } #endregion @@ -530,6 +548,17 @@ public sealed partial class InputData : pb::IMessage roomSeatId_ = other.roomSeatId_; z_ = other.z_; roomId_ = other.roomId_; + vision_ = other.vision_; + direction_ = other.direction_; + action_ = other.action_; + fireParams_ = other.fireParams_.Clone(); + propParams_ = other.propParams_.Clone(); + npcParams_ = other.npcParams_.Clone(); + speed_ = other.speed_; + network_ = other.network_; + usePowerBox_ = other.usePowerBox_; + taskParams_ = other.taskParams_.Clone(); + onlineParam_ = other.onlineParam_.Clone(); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -644,6 +673,166 @@ public sealed partial class InputData : pb::IMessage } } + /// Field number for the "vision" field. + public const int VisionFieldNumber = 9; + private float vision_; + /// + ///视野范围 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public float Vision { + get { return vision_; } + set { + vision_ = value; + } + } + + /// Field number for the "direction" field. + public const int DirectionFieldNumber = 10; + private float direction_; + /// + ///方向 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public float Direction { + get { return direction_; } + set { + direction_ = value; + } + } + + /// Field number for the "action" field. + public const int ActionFieldNumber = 11; + private int action_; + /// + ///动作 1 跑动 2 使用道具 3 救人 4 使用配电箱 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int Action { + get { return action_; } + set { + action_ = value; + } + } + + /// Field number for the "fireParams" field. + public const int FireParamsFieldNumber = 12; + private static readonly pb::FieldCodec _repeated_fireParams_codec + = pb::FieldCodec.ForMessage(98, global::FireParam.Parser); + private readonly pbc::RepeatedField fireParams_ = new pbc::RepeatedField(); + /// + /// 火势参数 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField FireParams { + get { return fireParams_; } + } + + /// Field number for the "propParams" field. + public const int PropParamsFieldNumber = 13; + private static readonly pb::FieldCodec _repeated_propParams_codec + = pb::FieldCodec.ForMessage(106, global::PropParam.Parser); + private readonly pbc::RepeatedField propParams_ = new pbc::RepeatedField(); + /// + /// 道具id列表 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField PropParams { + get { return propParams_; } + } + + /// Field number for the "npcParams" field. + public const int NpcParamsFieldNumber = 14; + private static readonly pb::FieldCodec _repeated_npcParams_codec + = pb::FieldCodec.ForMessage(114, global::NpcParam.Parser); + private readonly pbc::RepeatedField npcParams_ = new pbc::RepeatedField(); + /// + /// NPC参数列表 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField NpcParams { + get { return npcParams_; } + } + + /// Field number for the "speed" field. + public const int SpeedFieldNumber = 15; + private float speed_; + /// + /// 速度 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public float Speed { + get { return speed_; } + set { + speed_ = value; + } + } + + /// Field number for the "network" field. + public const int NetworkFieldNumber = 16; + private float network_; + /// + /// 网络延迟 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public float Network { + get { return network_; } + set { + network_ = value; + } + } + + /// Field number for the "usePowerBox" field. + public const int UsePowerBoxFieldNumber = 17; + private bool usePowerBox_; + /// + /// 是否使用配电箱 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool UsePowerBox { + get { return usePowerBox_; } + set { + usePowerBox_ = value; + } + } + + /// Field number for the "taskParams" field. + public const int TaskParamsFieldNumber = 18; + private static readonly pb::FieldCodec _repeated_taskParams_codec + = pb::FieldCodec.ForMessage(146, global::TaskParam.Parser); + private readonly pbc::RepeatedField taskParams_ = new pbc::RepeatedField(); + /// + /// 配电箱id列表 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField TaskParams { + get { return taskParams_; } + } + + /// Field number for the "OnlineParam" field. + public const int OnlineParamFieldNumber = 19; + private static readonly pb::FieldCodec _repeated_onlineParam_codec + = pb::FieldCodec.ForMessage(154, global::OnlineParam.Parser); + private readonly pbc::RepeatedField onlineParam_ = new pbc::RepeatedField(); + /// + /// 配电箱id列表 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField OnlineParam { + get { return onlineParam_; } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -666,6 +855,17 @@ public sealed partial class InputData : pb::IMessage if (RoomSeatId != other.RoomSeatId) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false; if (RoomId != other.RoomId) return false; + if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Vision, other.Vision)) return false; + if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Direction, other.Direction)) return false; + if (Action != other.Action) return false; + if(!fireParams_.Equals(other.fireParams_)) return false; + if(!propParams_.Equals(other.propParams_)) return false; + if(!npcParams_.Equals(other.npcParams_)) return false; + if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Speed, other.Speed)) return false; + if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Network, other.Network)) return false; + if (UsePowerBox != other.UsePowerBox) return false; + if(!taskParams_.Equals(other.taskParams_)) return false; + if(!onlineParam_.Equals(other.onlineParam_)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -680,6 +880,17 @@ public sealed partial class InputData : pb::IMessage if (RoomSeatId != 0) hash ^= RoomSeatId.GetHashCode(); if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z); if (RoomId.Length != 0) hash ^= RoomId.GetHashCode(); + if (Vision != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Vision); + if (Direction != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Direction); + if (Action != 0) hash ^= Action.GetHashCode(); + hash ^= fireParams_.GetHashCode(); + hash ^= propParams_.GetHashCode(); + hash ^= npcParams_.GetHashCode(); + if (Speed != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Speed); + if (Network != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Network); + if (UsePowerBox != false) hash ^= UsePowerBox.GetHashCode(); + hash ^= taskParams_.GetHashCode(); + hash ^= onlineParam_.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -726,6 +937,35 @@ public sealed partial class InputData : pb::IMessage output.WriteRawTag(66); output.WriteString(RoomId); } + if (Vision != 0F) { + output.WriteRawTag(77); + output.WriteFloat(Vision); + } + if (Direction != 0F) { + output.WriteRawTag(85); + output.WriteFloat(Direction); + } + if (Action != 0) { + output.WriteRawTag(88); + output.WriteInt32(Action); + } + fireParams_.WriteTo(output, _repeated_fireParams_codec); + propParams_.WriteTo(output, _repeated_propParams_codec); + npcParams_.WriteTo(output, _repeated_npcParams_codec); + if (Speed != 0F) { + output.WriteRawTag(125); + output.WriteFloat(Speed); + } + if (Network != 0F) { + output.WriteRawTag(133, 1); + output.WriteFloat(Network); + } + if (UsePowerBox != false) { + output.WriteRawTag(136, 1); + output.WriteBool(UsePowerBox); + } + taskParams_.WriteTo(output, _repeated_taskParams_codec); + onlineParam_.WriteTo(output, _repeated_onlineParam_codec); if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -764,6 +1004,35 @@ public sealed partial class InputData : pb::IMessage output.WriteRawTag(66); output.WriteString(RoomId); } + if (Vision != 0F) { + output.WriteRawTag(77); + output.WriteFloat(Vision); + } + if (Direction != 0F) { + output.WriteRawTag(85); + output.WriteFloat(Direction); + } + if (Action != 0) { + output.WriteRawTag(88); + output.WriteInt32(Action); + } + fireParams_.WriteTo(ref output, _repeated_fireParams_codec); + propParams_.WriteTo(ref output, _repeated_propParams_codec); + npcParams_.WriteTo(ref output, _repeated_npcParams_codec); + if (Speed != 0F) { + output.WriteRawTag(125); + output.WriteFloat(Speed); + } + if (Network != 0F) { + output.WriteRawTag(133, 1); + output.WriteFloat(Network); + } + if (UsePowerBox != false) { + output.WriteRawTag(136, 1); + output.WriteBool(UsePowerBox); + } + taskParams_.WriteTo(ref output, _repeated_taskParams_codec); + onlineParam_.WriteTo(ref output, _repeated_onlineParam_codec); if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -795,6 +1064,29 @@ public sealed partial class InputData : pb::IMessage if (RoomId.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(RoomId); } + if (Vision != 0F) { + size += 1 + 4; + } + if (Direction != 0F) { + size += 1 + 4; + } + if (Action != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Action); + } + size += fireParams_.CalculateSize(_repeated_fireParams_codec); + size += propParams_.CalculateSize(_repeated_propParams_codec); + size += npcParams_.CalculateSize(_repeated_npcParams_codec); + if (Speed != 0F) { + size += 1 + 4; + } + if (Network != 0F) { + size += 2 + 4; + } + if (UsePowerBox != false) { + size += 2 + 1; + } + size += taskParams_.CalculateSize(_repeated_taskParams_codec); + size += onlineParam_.CalculateSize(_repeated_onlineParam_codec); if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -828,6 +1120,29 @@ public sealed partial class InputData : pb::IMessage if (other.RoomId.Length != 0) { RoomId = other.RoomId; } + if (other.Vision != 0F) { + Vision = other.Vision; + } + if (other.Direction != 0F) { + Direction = other.Direction; + } + if (other.Action != 0) { + Action = other.Action; + } + fireParams_.Add(other.fireParams_); + propParams_.Add(other.propParams_); + npcParams_.Add(other.npcParams_); + if (other.Speed != 0F) { + Speed = other.Speed; + } + if (other.Network != 0F) { + Network = other.Network; + } + if (other.UsePowerBox != false) { + UsePowerBox = other.UsePowerBox; + } + taskParams_.Add(other.taskParams_); + onlineParam_.Add(other.onlineParam_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -875,6 +1190,50 @@ public sealed partial class InputData : pb::IMessage RoomId = input.ReadString(); break; } + case 77: { + Vision = input.ReadFloat(); + break; + } + case 85: { + Direction = input.ReadFloat(); + break; + } + case 88: { + Action = input.ReadInt32(); + break; + } + case 98: { + fireParams_.AddEntriesFrom(input, _repeated_fireParams_codec); + break; + } + case 106: { + propParams_.AddEntriesFrom(input, _repeated_propParams_codec); + break; + } + case 114: { + npcParams_.AddEntriesFrom(input, _repeated_npcParams_codec); + break; + } + case 125: { + Speed = input.ReadFloat(); + break; + } + case 133: { + Network = input.ReadFloat(); + break; + } + case 136: { + UsePowerBox = input.ReadBool(); + break; + } + case 146: { + taskParams_.AddEntriesFrom(input, _repeated_taskParams_codec); + break; + } + case 154: { + onlineParam_.AddEntriesFrom(input, _repeated_onlineParam_codec); + break; + } } } #endif @@ -922,6 +1281,50 @@ public sealed partial class InputData : pb::IMessage RoomId = input.ReadString(); break; } + case 77: { + Vision = input.ReadFloat(); + break; + } + case 85: { + Direction = input.ReadFloat(); + break; + } + case 88: { + Action = input.ReadInt32(); + break; + } + case 98: { + fireParams_.AddEntriesFrom(ref input, _repeated_fireParams_codec); + break; + } + case 106: { + propParams_.AddEntriesFrom(ref input, _repeated_propParams_codec); + break; + } + case 114: { + npcParams_.AddEntriesFrom(ref input, _repeated_npcParams_codec); + break; + } + case 125: { + Speed = input.ReadFloat(); + break; + } + case 133: { + Network = input.ReadFloat(); + break; + } + case 136: { + UsePowerBox = input.ReadBool(); + break; + } + case 146: { + taskParams_.AddEntriesFrom(ref input, _repeated_taskParams_codec); + break; + } + case 154: { + onlineParam_.AddEntriesFrom(ref input, _repeated_onlineParam_codec); + break; + } } } } @@ -1093,6 +1496,1426 @@ public sealed partial class EmptyResponse : pb::IMessage } +/// +/// 火势参数 +/// +[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +public sealed partial class FireParam : pb::IMessage +#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage +#endif +{ + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new FireParam()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pbr::MessageDescriptor Descriptor { + get { return global::FpsReflection.Descriptor.MessageTypes[4]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public FireParam() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public FireParam(FireParam other) : this() { + point_ = other.point_; + half_ = other.half_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public FireParam Clone() { + return new FireParam(this); + } + + /// Field number for the "point" field. + public const int PointFieldNumber = 1; + private string point_ = ""; + /// + ///着火点 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string Point { + get { return point_; } + set { + point_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "half" field. + public const int HalfFieldNumber = 2; + private float half_; + /// + ///半径 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public float Half { + get { return half_; } + set { + half_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as FireParam); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(FireParam other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Point != other.Point) return false; + if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Half, other.Half)) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + if (Point.Length != 0) hash ^= Point.GetHashCode(); + if (Half != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Half); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (Point.Length != 0) { + output.WriteRawTag(10); + output.WriteString(Point); + } + if (Half != 0F) { + output.WriteRawTag(21); + output.WriteFloat(Half); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (Point.Length != 0) { + output.WriteRawTag(10); + output.WriteString(Point); + } + if (Half != 0F) { + output.WriteRawTag(21); + output.WriteFloat(Half); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + if (Point.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Point); + } + if (Half != 0F) { + size += 1 + 4; + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(FireParam other) { + if (other == null) { + return; + } + if (other.Point.Length != 0) { + Point = other.Point; + } + if (other.Half != 0F) { + Half = other.Half; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + Point = input.ReadString(); + break; + } + case 21: { + Half = input.ReadFloat(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 10: { + Point = input.ReadString(); + break; + } + case 21: { + Half = input.ReadFloat(); + break; + } + } + } + } + #endif + +} + +/// +/// 道具参数 +/// +[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +public sealed partial class PropParam : pb::IMessage +#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage +#endif +{ + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PropParam()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pbr::MessageDescriptor Descriptor { + get { return global::FpsReflection.Descriptor.MessageTypes[5]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PropParam() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PropParam(PropParam other) : this() { + propId_ = other.propId_; + num_ = other.num_; + seconds_ = other.seconds_; + point_ = other.point_; + status_ = other.status_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PropParam Clone() { + return new PropParam(this); + } + + /// Field number for the "propId" field. + public const int PropIdFieldNumber = 1; + private string propId_ = ""; + /// + ///道具id + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string PropId { + get { return propId_; } + set { + propId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "num" field. + public const int NumFieldNumber = 2; + private int num_; + /// + ///道具数量 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int Num { + get { return num_; } + set { + num_ = value; + } + } + + /// Field number for the "seconds" field. + public const int SecondsFieldNumber = 3; + private int seconds_; + /// + ///道具使用时间 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int Seconds { + get { return seconds_; } + set { + seconds_ = value; + } + } + + /// Field number for the "point" field. + public const int PointFieldNumber = 4; + private string point_ = ""; + /// + ///道具使用位置 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string Point { + get { return point_; } + set { + point_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "status" field. + public const int StatusFieldNumber = 5; + private int status_; + /// + ///道具状态 0 未使用 1 使用中 2 已使用 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int Status { + get { return status_; } + set { + status_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as PropParam); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(PropParam other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (PropId != other.PropId) return false; + if (Num != other.Num) return false; + if (Seconds != other.Seconds) return false; + if (Point != other.Point) return false; + if (Status != other.Status) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + if (PropId.Length != 0) hash ^= PropId.GetHashCode(); + if (Num != 0) hash ^= Num.GetHashCode(); + if (Seconds != 0) hash ^= Seconds.GetHashCode(); + if (Point.Length != 0) hash ^= Point.GetHashCode(); + if (Status != 0) hash ^= Status.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (PropId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PropId); + } + if (Num != 0) { + output.WriteRawTag(16); + output.WriteInt32(Num); + } + if (Seconds != 0) { + output.WriteRawTag(24); + output.WriteInt32(Seconds); + } + if (Point.Length != 0) { + output.WriteRawTag(34); + output.WriteString(Point); + } + if (Status != 0) { + output.WriteRawTag(40); + output.WriteInt32(Status); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (PropId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(PropId); + } + if (Num != 0) { + output.WriteRawTag(16); + output.WriteInt32(Num); + } + if (Seconds != 0) { + output.WriteRawTag(24); + output.WriteInt32(Seconds); + } + if (Point.Length != 0) { + output.WriteRawTag(34); + output.WriteString(Point); + } + if (Status != 0) { + output.WriteRawTag(40); + output.WriteInt32(Status); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + if (PropId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(PropId); + } + if (Num != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Num); + } + if (Seconds != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Seconds); + } + if (Point.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Point); + } + if (Status != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Status); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(PropParam other) { + if (other == null) { + return; + } + if (other.PropId.Length != 0) { + PropId = other.PropId; + } + if (other.Num != 0) { + Num = other.Num; + } + if (other.Seconds != 0) { + Seconds = other.Seconds; + } + if (other.Point.Length != 0) { + Point = other.Point; + } + if (other.Status != 0) { + Status = other.Status; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + PropId = input.ReadString(); + break; + } + case 16: { + Num = input.ReadInt32(); + break; + } + case 24: { + Seconds = input.ReadInt32(); + break; + } + case 34: { + Point = input.ReadString(); + break; + } + case 40: { + Status = input.ReadInt32(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 10: { + PropId = input.ReadString(); + break; + } + case 16: { + Num = input.ReadInt32(); + break; + } + case 24: { + Seconds = input.ReadInt32(); + break; + } + case 34: { + Point = input.ReadString(); + break; + } + case 40: { + Status = input.ReadInt32(); + break; + } + } + } + } + #endif + +} + +/// +/// npc 参数 +/// +[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +public sealed partial class NpcParam : pb::IMessage +#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage +#endif +{ + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new NpcParam()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pbr::MessageDescriptor Descriptor { + get { return global::FpsReflection.Descriptor.MessageTypes[6]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public NpcParam() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public NpcParam(NpcParam other) : this() { + npcId_ = other.npcId_; + point_ = other.point_; + status_ = other.status_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public NpcParam Clone() { + return new NpcParam(this); + } + + /// Field number for the "npcId" field. + public const int NpcIdFieldNumber = 1; + private string npcId_ = ""; + /// + ///npc id + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string NpcId { + get { return npcId_; } + set { + npcId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "point" field. + public const int PointFieldNumber = 2; + private string point_ = ""; + /// + ///npc 位置 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string Point { + get { return point_; } + set { + point_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "status" field. + public const int StatusFieldNumber = 3; + private int status_; + /// + ///npc 状态 1 移动 2 倒下 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int Status { + get { return status_; } + set { + status_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as NpcParam); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(NpcParam other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (NpcId != other.NpcId) return false; + if (Point != other.Point) return false; + if (Status != other.Status) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + if (NpcId.Length != 0) hash ^= NpcId.GetHashCode(); + if (Point.Length != 0) hash ^= Point.GetHashCode(); + if (Status != 0) hash ^= Status.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (NpcId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(NpcId); + } + if (Point.Length != 0) { + output.WriteRawTag(18); + output.WriteString(Point); + } + if (Status != 0) { + output.WriteRawTag(24); + output.WriteInt32(Status); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (NpcId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(NpcId); + } + if (Point.Length != 0) { + output.WriteRawTag(18); + output.WriteString(Point); + } + if (Status != 0) { + output.WriteRawTag(24); + output.WriteInt32(Status); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + if (NpcId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(NpcId); + } + if (Point.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Point); + } + if (Status != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Status); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(NpcParam other) { + if (other == null) { + return; + } + if (other.NpcId.Length != 0) { + NpcId = other.NpcId; + } + if (other.Point.Length != 0) { + Point = other.Point; + } + if (other.Status != 0) { + Status = other.Status; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + NpcId = input.ReadString(); + break; + } + case 18: { + Point = input.ReadString(); + break; + } + case 24: { + Status = input.ReadInt32(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 10: { + NpcId = input.ReadString(); + break; + } + case 18: { + Point = input.ReadString(); + break; + } + case 24: { + Status = input.ReadInt32(); + break; + } + } + } + } + #endif + +} + +/// +/// 角色在线状态 +/// +[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +public sealed partial class OnlineParam : pb::IMessage +#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage +#endif +{ + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new OnlineParam()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pbr::MessageDescriptor Descriptor { + get { return global::FpsReflection.Descriptor.MessageTypes[7]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public OnlineParam() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public OnlineParam(OnlineParam other) : this() { + roleId_ = other.roleId_; + onlineNum_ = other.onlineNum_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public OnlineParam Clone() { + return new OnlineParam(this); + } + + /// Field number for the "roleId" field. + public const int RoleIdFieldNumber = 1; + private string roleId_ = ""; + /// + ///角色id + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string RoleId { + get { return roleId_; } + set { + roleId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "onlineNum" field. + public const int OnlineNumFieldNumber = 2; + private int onlineNum_; + /// + /// 在线人数 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int OnlineNum { + get { return onlineNum_; } + set { + onlineNum_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as OnlineParam); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(OnlineParam other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (RoleId != other.RoleId) return false; + if (OnlineNum != other.OnlineNum) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + if (RoleId.Length != 0) hash ^= RoleId.GetHashCode(); + if (OnlineNum != 0) hash ^= OnlineNum.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (RoleId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(RoleId); + } + if (OnlineNum != 0) { + output.WriteRawTag(16); + output.WriteInt32(OnlineNum); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (RoleId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(RoleId); + } + if (OnlineNum != 0) { + output.WriteRawTag(16); + output.WriteInt32(OnlineNum); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + if (RoleId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(RoleId); + } + if (OnlineNum != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(OnlineNum); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(OnlineParam other) { + if (other == null) { + return; + } + if (other.RoleId.Length != 0) { + RoleId = other.RoleId; + } + if (other.OnlineNum != 0) { + OnlineNum = other.OnlineNum; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + RoleId = input.ReadString(); + break; + } + case 16: { + OnlineNum = input.ReadInt32(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 10: { + RoleId = input.ReadString(); + break; + } + case 16: { + OnlineNum = input.ReadInt32(); + break; + } + } + } + } + #endif + +} + +/// +/// 任务列表参数 +/// +[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +public sealed partial class TaskParam : pb::IMessage +#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage +#endif +{ + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new TaskParam()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pbr::MessageDescriptor Descriptor { + get { return global::FpsReflection.Descriptor.MessageTypes[8]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public TaskParam() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public TaskParam(TaskParam other) : this() { + taskId_ = other.taskId_; + taskName_ = other.taskName_; + taskStatus_ = other.taskStatus_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public TaskParam Clone() { + return new TaskParam(this); + } + + /// Field number for the "taskId" field. + public const int TaskIdFieldNumber = 1; + private string taskId_ = ""; + /// + ///任务id + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string TaskId { + get { return taskId_; } + set { + taskId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "taskName" field. + public const int TaskNameFieldNumber = 2; + private string taskName_ = ""; + /// + ///任务名称 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string TaskName { + get { return taskName_; } + set { + taskName_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "taskStatus" field. + public const int TaskStatusFieldNumber = 3; + private int taskStatus_; + /// + ///任务状态 0 未完成 1 完成 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int TaskStatus { + get { return taskStatus_; } + set { + taskStatus_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as TaskParam); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(TaskParam other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (TaskId != other.TaskId) return false; + if (TaskName != other.TaskName) return false; + if (TaskStatus != other.TaskStatus) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + if (TaskId.Length != 0) hash ^= TaskId.GetHashCode(); + if (TaskName.Length != 0) hash ^= TaskName.GetHashCode(); + if (TaskStatus != 0) hash ^= TaskStatus.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (TaskId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(TaskId); + } + if (TaskName.Length != 0) { + output.WriteRawTag(18); + output.WriteString(TaskName); + } + if (TaskStatus != 0) { + output.WriteRawTag(24); + output.WriteInt32(TaskStatus); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (TaskId.Length != 0) { + output.WriteRawTag(10); + output.WriteString(TaskId); + } + if (TaskName.Length != 0) { + output.WriteRawTag(18); + output.WriteString(TaskName); + } + if (TaskStatus != 0) { + output.WriteRawTag(24); + output.WriteInt32(TaskStatus); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + if (TaskId.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(TaskId); + } + if (TaskName.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(TaskName); + } + if (TaskStatus != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(TaskStatus); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(TaskParam other) { + if (other == null) { + return; + } + if (other.TaskId.Length != 0) { + TaskId = other.TaskId; + } + if (other.TaskName.Length != 0) { + TaskName = other.TaskName; + } + if (other.TaskStatus != 0) { + TaskStatus = other.TaskStatus; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + TaskId = input.ReadString(); + break; + } + case 18: { + TaskName = input.ReadString(); + break; + } + case 24: { + TaskStatus = input.ReadInt32(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 10: { + TaskId = input.ReadString(); + break; + } + case 18: { + TaskName = input.ReadString(); + break; + } + case 24: { + TaskStatus = input.ReadInt32(); + break; + } + } + } + } + #endif + +} + #endregion diff --git a/xiaofang/Assets/ProtoBuf/Proto/Move.cs b/xiaofang/Assets/ProtoBuf/Proto/Move.cs index 3046dac2..42b19175 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Move.cs +++ b/xiaofang/Assets/ProtoBuf/Proto/Move.cs @@ -31,11 +31,12 @@ public static partial class MoveReflection { "KAsyCC5OcGNEYXRhInwKB05wY0RhdGESCQoBeBgBIAEoARIJCgF5GAIgASgB", "EgkKAXoYAyABKAESDgoGdXNlcklkGAQgASgJEhAKCG5pY2tOYW1lGAggASgJ", "EgwKBHR5cGUYBSABKAUSEQoJZm9ybWF0aW9uGAYgASgFEg0KBWV2ZW50GAcg", - "ASgFImYKEk1vdmVSb29tQW9pUmVxdWVzdBIOCgZyb29tSWQYASABKAkSDgoG", - "dXNlcklkGAIgASgDEgkKAXgYAyABKAISCQoBeRgEIAEoAhIJCgF6GAUgASgC", - "Eg8KB3NjZW5lSWQYBiABKAkiFQoTTW92ZVJvb21Bb2lSZXNwb25zZSI/Cg9O", - "cGNJbmZvUmVzcG9uc2USDQoFbnBjSWQYASABKAkSDwoHaW5qdXJlZBgCIAEo", - "CBIMCgRzdG9wGAMgASgIQgdaBS4vO3BiYgZwcm90bzM=")); + "ASgFIoUBChJNb3ZlUm9vbUFvaVJlcXVlc3QSDgoGcm9vbUlkGAEgASgJEg4K", + "BnVzZXJJZBgCIAEoAxIJCgF4GAMgASgCEgkKAXkYBCABKAISCQoBehgFIAEo", + "AhIPCgdzY2VuZUlkGAYgASgJEg0KBW5wY0lkGAcgASgJEg4KBmFjdGlvbhgI", + "IAEoBSIVChNNb3ZlUm9vbUFvaVJlc3BvbnNlIj8KD05wY0luZm9SZXNwb25z", + "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::IMessageField number for the "npcId" field. + public const int NpcIdFieldNumber = 7; + private string npcId_ = ""; + /// + /// npcId + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string NpcId { + get { return npcId_; } + set { + npcId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "action" field. + public const int ActionFieldNumber = 8; + private int action_; + /// + /// 是否扛起 1 扛起 2 放下 + /// + [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 public const int IdFieldNumber = 1; private string id_ = ""; /// - /// ID + /// 对象自定义ID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -117,7 +117,7 @@ public sealed partial class RequestObject : pb::IMessage public const int ObjectIdFieldNumber = 2; private string objectId_ = ""; /// - /// 对象ID + /// 对象基础ID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] diff --git a/xiaofang/Assets/ProtoBuf/Proto/Select.cs b/xiaofang/Assets/ProtoBuf/Proto/Select.cs index be4a918d..06aa24ac 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Select.cs +++ b/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", - "SWQYASABKAkSDgoGUm9sZUlkGAIgASgJIqQFCg5TZWxlY3RSZXNwb25zZRIK", - "CgJJZBgBIAEoCRIOCgZCYXNlSWQYAiABKAkSDAoETm90ZRgDIAEoCRINCgVH", - "cm91cBgEIAEoCRIRCglVbkRpc3BsYXkYBSABKAkSEAoIU2hvd1RleHQYBiAB", - "KAkSDAoESWNvbhgHIAEoCRIVCg1QcmVjb25kaXRpb25zGAggASgJEhEKCUV4", - "Y2x1c2l2ZRgJIAEoCRIQCghUYXNrVGltZRgKIAEoCRIRCglUaW1lTGltaXQY", - "CyABKAMSEgoKTmV4dFNlbGVjdBgMIAEoCRIQCghUYXNrTGluaxgNIAEoCRIX", - "Cg9UYXNrTGlua0RldGFpbHMYDiABKAkSEAoIQ2FsbE1vZGUYDyABKAkSFQoN", - "Q2FsbFJlY2lwaWVudBgQIAEoCRIVCg1Db3JyZWN0T3B0aW9uGBEgASgJEg4K", - "BlJld2FyZBgSIAEoCRIOCgZSZXN1bHQYEyABKAkSDQoFUm91dGUYFCABKAkS", - "FAoMVGltaW5nQ2hhbmdlGBUgASgJEhEKCUFwcGxpZWRVSRgWIAEoCRIRCglV", - "SURldGFpbHMYFyABKAkSCwoDU2VxGBggASgJEhIKClBsYXlTY3JpcHQYGSAB", - "KAkSDgoGUm9vbUlkGBogASgJEhIKCkNyZWF0ZVRpbWUYGyABKAkSEgoKVXBk", - "YXRlVGltZRgcIAEoCRIOCgZVc2VySWQYHSABKAkSDgoGUm9sZUlkGB4gASgJ", - "EjAKDlNlbGVjdFVzZXJMaXN0GB8gAygLMhguU2VsZWN0UmVzcG9uc2UuVXNl", - "ckxpc3QSFgoOU2VsZWN0Um9sZUxpc3QYICADKAkaKgoIVXNlckxpc3QSDgoG", - "VXNlcklkGAEgASgJEg4KBlJvbGVJZBgCIAEoCSJIChRTZWxlY3RIaXN0b3J5", - "UmVxdWVzdBIQCghTZWxlY3RJZBgBIAEoCRIOCgZVc2VySWQYAiABKAkSDgoG", - "Um9vbUlkGAMgASgJIjkKFVNlbGVjdEhpc3RvcnlSZXNwb25zZRIgCgdTZWxl", - "Y3RzGAEgAygLMg8uU2VsZWN0UmVzcG9uc2VCB1oFLi87cGJiBnByb3RvMw==")); + "dBIWCg5TZWxlY3RSb2xlTGlzdBgIIAMoCRIPCgdPdGhlcklkGAkgASgJEhAK", + "CE90aGVySWQyGAogASgJGioKCFVzZXJMaXN0Eg4KBlVzZXJJZBgBIAEoCRIO", + "CgZSb2xlSWQYAiABKAkipAUKDlNlbGVjdFJlc3BvbnNlEgoKAklkGAEgASgJ", + "Eg4KBkJhc2VJZBgCIAEoCRIMCgROb3RlGAMgASgJEg0KBUdyb3VwGAQgASgJ", + "EhEKCVVuRGlzcGxheRgFIAEoCRIQCghTaG93VGV4dBgGIAEoCRIMCgRJY29u", + "GAcgASgJEhUKDVByZWNvbmRpdGlvbnMYCCABKAkSEQoJRXhjbHVzaXZlGAkg", + "ASgJEhAKCFRhc2tUaW1lGAogASgJEhEKCVRpbWVMaW1pdBgLIAEoAxISCgpO", + "ZXh0U2VsZWN0GAwgASgJEhAKCFRhc2tMaW5rGA0gASgJEhcKD1Rhc2tMaW5r", + "RGV0YWlscxgOIAEoCRIQCghDYWxsTW9kZRgPIAEoCRIVCg1DYWxsUmVjaXBp", + "ZW50GBAgASgJEhUKDUNvcnJlY3RPcHRpb24YESABKAkSDgoGUmV3YXJkGBIg", + "ASgJEg4KBlJlc3VsdBgTIAEoCRINCgVSb3V0ZRgUIAEoCRIUCgxUaW1pbmdD", + "aGFuZ2UYFSABKAkSEQoJQXBwbGllZFVJGBYgASgJEhEKCVVJRGV0YWlscxgX", + "IAEoCRILCgNTZXEYGCABKAkSEgoKUGxheVNjcmlwdBgZIAEoCRIOCgZSb29t", + "SWQYGiABKAkSEgoKQ3JlYXRlVGltZRgbIAEoCRISCgpVcGRhdGVUaW1lGBwg", + "ASgJEg4KBlVzZXJJZBgdIAEoCRIOCgZSb2xlSWQYHiABKAkSMAoOU2VsZWN0", + "VXNlckxpc3QYHyADKAsyGC5TZWxlY3RSZXNwb25zZS5Vc2VyTGlzdBIWCg5T", + "ZWxlY3RSb2xlTGlzdBggIAMoCRoqCghVc2VyTGlzdBIOCgZVc2VySWQYASAB", + "KAkSDgoGUm9sZUlkGAIgASgJIkgKFFNlbGVjdEhpc3RvcnlSZXF1ZXN0EhAK", + "CFNlbGVjdElkGAEgASgJEg4KBlVzZXJJZBgCIAEoCRIOCgZSb29tSWQYAyAB", + "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 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 get { return selectRoleList_; } } + /// Field number for the "OtherId" field. + public const int OtherIdFieldNumber = 9; + private string otherId_ = ""; + /// + /// 其他ID 道具ID 交互对象ID 等 当触发属于消火栓增援任务时，需要传入消火栓的对象ID根据配置表获取 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string OtherId { + get { return otherId_; } + set { + otherId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "OtherId2" field. + public const int OtherId2FieldNumber = 10; + private string otherId2_ = ""; + /// + /// 其他ID2 道具ID 交互对象ID 等 当触发属于消火栓增援任务时，需要传消火栓唯一ID + /// + [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 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 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 } 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 } 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 } 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 } 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 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 selectRoleList_.AddEntriesFrom(ref input, _repeated_selectRoleList_codec); break; } + case 74: { + OtherId = input.ReadString(); + break; + } + case 82: { + OtherId2 = input.ReadString(); + break; + } } } } diff --git a/xiaofang/Assets/ProtoBuf/test.cs b/xiaofang/Assets/ProtoBuf/test.cs index 252168bb..6bf5e708 100644 --- a/xiaofang/Assets/ProtoBuf/test.cs +++ b/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(bytes); diff --git a/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs b/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs index 8cd6747e..9ea7a0e6 100644 --- a/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs +++ b/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs @@ -11,7 +11,7 @@ public class Skill_Pick : MonoBehaviour public Animator CharacterAnimator; public Transform player; - + public XFS xfs; private Transform rightHand, leftHand; @@ -59,14 +59,17 @@ public class Skill_Pick : MonoBehaviour // Ʒײ壬ֹһײ itemCollider.enabled = false; - + if (item.transform.name == "gun") + { + xfs = item.GetComponent().Xfs; + } // ƷΪֲӶ󣬲λúת item.transform.SetParent(rightHand, true); // falseʾƷתλ item.transform.localPosition = relativePosition; // һĬϵijλ item.transform.localRotation = Quaternion.Euler(relativeRotation); // ת Destroy(item.GetComponent()); - + Debug.Log("^^^^^^^^^^^^^^^^^^^^^^^^^"); // µǰеƷ return item; @@ -98,7 +101,10 @@ public class Skill_Pick : MonoBehaviour { itemCollider.enabled = true; } - + if (currentItem.transform.name == "gun") + { + xfs = null; + } currentItem.AddComponent(); // Ʒҵǰλõĵ diff --git a/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs b/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs index 62f86994..9421bdb4 100644 --- a/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs +++ b/xiaofang/Assets/Script/Character/Skills/Skill_watering.cs @@ -37,6 +37,10 @@ public class Skill_watering : MonoBehaviour { currentItem.GetComponent().StopFire(); } + if (currentItem.GetComponent() != null) + { + currentItem.GetComponent().water.SetActive(false); + } } public void StopWateringAnim( ) { @@ -72,9 +76,9 @@ public class Skill_watering : MonoBehaviour currentItem.GetComponent().StartFire(); } - if (currentItem.gameObject.name == "gun") + if (currentItem.GetComponent() != null) { - XFS.instance.water.SetActive(true); + currentItem.GetComponent().water.SetActive(true); } } } diff --git a/xiaofang/Assets/Script/Character/Skills/UseSkill.cs b/xiaofang/Assets/Script/Character/Skills/UseSkill.cs index 7dec7409..17bf2068 100644 --- a/xiaofang/Assets/Script/Character/Skills/UseSkill.cs +++ b/xiaofang/Assets/Script/Character/Skills/UseSkill.cs @@ -18,7 +18,7 @@ public class UseSkill : MonoBehaviour // еǰеƷ //[HideInInspector] public GameObject currentItem = null; - + public XFS Xfs; public Skill_Pick _skill_Pick; public Skill_Jump _skill_Jump; public Skill_watering _skill_Watering; @@ -44,8 +44,8 @@ public class UseSkill : MonoBehaviour { if(currentItem.gameObject.name=="gun") { - float dis= Vector3.Distance(GameObject.Find("player").transform.position, XFS.instance.transform.position); - if (dis >= 30f) + float dis= Vector3.Distance(GameObject.Find("player").transform.position, Xfs.gameObject.transform.position); + if (dis >= 20f) { Drop(); @@ -63,7 +63,7 @@ public class UseSkill : MonoBehaviour currentItem = null; } currentItem = _skill_Pick.Pick(); - + Xfs= _skill_Pick.xfs; if (currentItem.transform.name == "NoFire") { currentItem.transform.Rotate(180f, -80f, -30f); @@ -89,6 +89,7 @@ public class UseSkill : MonoBehaviour } if (currentItem.transform.name == "gun") { + currentItem.transform.rotation = new Quaternion(61.7036781f, 186.325302f, 348.049622f, 0); } } @@ -96,7 +97,7 @@ public class UseSkill : MonoBehaviour public void Drop() { currentItem = _skill_Pick.Drop(currentItem); - + Xfs = null; } //ʰȡ void Skill_Pick() @@ -109,13 +110,11 @@ public class UseSkill : MonoBehaviour if(currentItem.transform.name == "NoFire") { currentItem.transform.Rotate(180f, -80f, -30f); } - if (currentItem.transform.name == "gun") { currentItem.transform.rotation = new Quaternion(61.7036781f, 186.325302f, 348.049622f, 0); + if (currentItem.transform.name == "gun") { + currentItem.transform.rotation = new Quaternion(61.7036781f, 186.325302f, 348.049622f, 0); + Xfs = null; } - if (Input.GetKeyDown(KeyCode.Q)) - { - currentItem = _skill_Pick.Drop(currentItem); - } } diff --git a/xiaofang/Assets/Script/Item/Fire.cs b/xiaofang/Assets/Script/Item/Fire.cs index 95e2099b..65ba107a 100644 --- a/xiaofang/Assets/Script/Item/Fire.cs +++ b/xiaofang/Assets/Script/Item/Fire.cs @@ -12,7 +12,7 @@ public enum Firestate public class Fire : MonoBehaviour { - private bool isPlayerInRange = false; // ǷڷΧ + public bool isPlayerInRange = false; // ǷڷΧ private bool isExtinguishing = false; // Ƿ public float extinguishTime = 3f; // ʱ private float holdTime = 0f; // סťļʱ @@ -45,10 +45,7 @@ public class Fire : MonoBehaviour HurtPeople(); - if (XFS.instance.IShavewater) - { - MieFire(); - } + if (UseSkill == null) { @@ -58,8 +55,8 @@ public class Fire : MonoBehaviour { return; } - else if(UseSkill.currentItem.transform.name != "NoFire") - { + else if(UseSkill.currentItem.transform.name != "NoFire" && UseSkill.currentItem.transform.name!="gun") + { return; } MieFire(); @@ -114,6 +111,7 @@ public class Fire : MonoBehaviour // // ָҿ // if (!Input.GetMouseButton(0)) EnablePlayerControl(); //} + Debug.Log(11111111); if (isPlayerInRange&& UseSkill.IsWater) { // Դľ @@ -135,10 +133,6 @@ public class Fire : MonoBehaviour // Ұסﵽָʱ䣬ֹͣ StopFire(); isExtinguishing = true; // ֹظ - if (XFS.instance.IShavewater) - { - XFS.instance.water.SetActive(false); - } } } diff --git a/xiaofang/Assets/Script/Item/NoFire.cs b/xiaofang/Assets/Script/Item/NoFire.cs index 1a2d48b2..f22cdf73 100644 --- a/xiaofang/Assets/Script/Item/NoFire.cs +++ b/xiaofang/Assets/Script/Item/NoFire.cs @@ -6,6 +6,8 @@ public class NoFire : MonoBehaviour { // private GameObject MuzzlePos; + + public bool isuse = false; // Start is called before the first frame update void Start() { @@ -26,10 +28,12 @@ public class NoFire : MonoBehaviour public void StartFire() { MuzzlePos.SetActive(true); + isuse=true; } public void StopFire() { MuzzlePos.SetActive(false); + isuse=false; } } diff --git a/xiaofang/Assets/Script/XFS.cs b/xiaofang/Assets/Script/XFS.cs index 4b5cac9b..aaa6e419 100644 --- a/xiaofang/Assets/Script/XFS.cs +++ b/xiaofang/Assets/Script/XFS.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; public class XFS : MonoBehaviour { - public static XFS instance; + // Start is called before the first frame update public Button ConnectGun; public Button ConnectFa; @@ -22,7 +22,7 @@ public class XFS : MonoBehaviour void Start() { ShuiguanGameObject.SetActive(false); - instance =this; + UseSkill.Xfs = this; ConnectGun.onClick.AddListener((() => { PLayerLook(); @@ -62,14 +62,15 @@ public class XFS : MonoBehaviour public void openFa() { - water = Instantiate(firewater); + UseSkill.Initgun(); + water = Instantiate(firewater); water.transform.SetParent(Gun.transform); water.transform.localPosition = new Vector3(0, 0, 0); water.transform.localRotation = new Quaternion(0, 180, 0, 0); CharacterControl.enabled = true; water.SetActive(false); IShavewater = true; - UseSkill.Initgun(); + Gun.GetComponent().water=water; CharacterControl.DragTheScreen.enabled = true; } // Update is called once per frame diff --git a/xiaofang/Assets/Script/watergun.cs b/xiaofang/Assets/Script/watergun.cs new file mode 100644 index 00000000..ac5e80b9 --- /dev/null +++ b/xiaofang/Assets/Script/watergun.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class watergun : MonoBehaviour +{ + public XFS Xfs; + public GameObject water; + // Start is called before the first frame update + void Start() + { + Xfs=this.transform.parent.GetComponent(); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/xiaofang/Assets/Script/watergun.cs.meta b/xiaofang/Assets/Script/watergun.cs.meta new file mode 100644 index 00000000..ca9ce9ac --- /dev/null +++ b/xiaofang/Assets/Script/watergun.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9ee3f53d86720f249a148ad9823e0198 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: