From fc9d401cb7781241c59880e81f8a0cf971e4331f Mon Sep 17 00:00:00 2001 From: jackfiled Date: Sun, 12 Feb 2023 16:12:02 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20=E6=B7=BB=E5=8A=A0StormTrigger?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 12 +- Assets/Avatars.meta | 8 ++ Assets/Avatars/Stormtrigger.meta | 8 ++ .../t_d_assault_newera_01_body_csout.dds | 3 + .../t_d_assault_newera_01_body_csout.dds.meta | 19 +++ .../t_d_assault_newera_01_helmet_csout.dds | 3 + ..._d_assault_newera_01_helmet_csout.dds.meta | 19 +++ .../Stormtrigger/t_gloves_05_csout.dds | 3 + .../Stormtrigger/t_gloves_05_csout.dds.meta | 19 +++ Assets/Avatars/Stormtrigger/troop.fbx | 3 + Assets/Avatars/Stormtrigger/troop.fbx.meta | 121 ++++++++++++++++++ Assets/Models/PoseLandmark.cs | 2 +- Assets/Models/PoseLandmarkType.cs | 1 + ProjectSettings/AutoStreamingSettings.asset | 21 +++ 14 files changed, 231 insertions(+), 11 deletions(-) create mode 100644 Assets/Avatars.meta create mode 100644 Assets/Avatars/Stormtrigger.meta create mode 100644 Assets/Avatars/Stormtrigger/t_d_assault_newera_01_body_csout.dds create mode 100644 Assets/Avatars/Stormtrigger/t_d_assault_newera_01_body_csout.dds.meta create mode 100644 Assets/Avatars/Stormtrigger/t_d_assault_newera_01_helmet_csout.dds create mode 100644 Assets/Avatars/Stormtrigger/t_d_assault_newera_01_helmet_csout.dds.meta create mode 100644 Assets/Avatars/Stormtrigger/t_gloves_05_csout.dds create mode 100644 Assets/Avatars/Stormtrigger/t_gloves_05_csout.dds.meta create mode 100644 Assets/Avatars/Stormtrigger/troop.fbx create mode 100644 Assets/Avatars/Stormtrigger/troop.fbx.meta create mode 100644 ProjectSettings/AutoStreamingSettings.asset diff --git a/.gitattributes b/.gitattributes index 51e812c..1ce6886 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,9 +1,7 @@ ## Unity ## - *.cs diff=csharp text *.cginc text *.shader text - *.mat merge=unityyamlmerge eol=lf *.anim merge=unityyamlmerge eol=lf *.unity merge=unityyamlmerge eol=lf @@ -13,10 +11,7 @@ *.asset merge=unityyamlmerge eol=lf *.meta merge=unityyamlmerge eol=lf *.controller merge=unityyamlmerge eol=lf - - ## git-lfs ## - #Image *.jpg filter=lfs diff=lfs merge=lfs -text *.jpeg filter=lfs diff=lfs merge=lfs -text @@ -24,22 +19,19 @@ *.gif filter=lfs diff=lfs merge=lfs -text *.psd filter=lfs diff=lfs merge=lfs -text *.ai filter=lfs diff=lfs merge=lfs -text - #Audio *.mp3 filter=lfs diff=lfs merge=lfs -text *.wav filter=lfs diff=lfs merge=lfs -text *.ogg filter=lfs diff=lfs merge=lfs -text - #Video *.mp4 filter=lfs diff=lfs merge=lfs -text *.mov filter=lfs diff=lfs merge=lfs -text - #3D Object *.FBX filter=lfs diff=lfs merge=lfs -text *.fbx filter=lfs diff=lfs merge=lfs -text *.blend filter=lfs diff=lfs merge=lfs -text *.obj filter=lfs diff=lfs merge=lfs -text - +*.dds filter=lfs diff=lfs merge=lfs -text #ETC *.a filter=lfs diff=lfs merge=lfs -text *.exr filter=lfs diff=lfs merge=lfs -text @@ -52,4 +44,4 @@ *.ttf filter=lfs diff=lfs merge=lfs -text *.rns filter=lfs diff=lfs merge=lfs -text *.reason filter=lfs diff=lfs merge=lfs -text -*.lxo filter=lfs diff=lfs merge=lfs -text \ No newline at end of file +*.lxo filter=lfs diff=lfs merge=lfs -text diff --git a/Assets/Avatars.meta b/Assets/Avatars.meta new file mode 100644 index 0000000..399956c --- /dev/null +++ b/Assets/Avatars.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c41b9d4fbefa0ac4fb66bc9fc766dbc8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Avatars/Stormtrigger.meta b/Assets/Avatars/Stormtrigger.meta new file mode 100644 index 0000000..2c2ee10 --- /dev/null +++ b/Assets/Avatars/Stormtrigger.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5bdefde12bbdac342831132c369f6f94 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_body_csout.dds b/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_body_csout.dds new file mode 100644 index 0000000..eceb756 --- /dev/null +++ b/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_body_csout.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82c259b0f640497f5351a9d458ae917ed2548bdec6db70ee6d363d6b40f805d3 +size 16777344 diff --git a/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_body_csout.dds.meta b/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_body_csout.dds.meta new file mode 100644 index 0000000..864397c --- /dev/null +++ b/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_body_csout.dds.meta @@ -0,0 +1,19 @@ +fileFormatVersion: 2 +guid: 184e0d5cf7238d74cada3529d5a73851 +IHVImageFormatImporter: + externalObjects: {} + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + isReadable: 0 + sRGBTexture: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_helmet_csout.dds b/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_helmet_csout.dds new file mode 100644 index 0000000..4a4f827 --- /dev/null +++ b/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_helmet_csout.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d015902f9b6171d08053921ce127f4841f2f97f3d47cb209f9cdf9afd349f8d1 +size 4194432 diff --git a/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_helmet_csout.dds.meta b/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_helmet_csout.dds.meta new file mode 100644 index 0000000..b606d61 --- /dev/null +++ b/Assets/Avatars/Stormtrigger/t_d_assault_newera_01_helmet_csout.dds.meta @@ -0,0 +1,19 @@ +fileFormatVersion: 2 +guid: a5bf19dd73c202e4895c9fb07d4c2785 +IHVImageFormatImporter: + externalObjects: {} + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + isReadable: 0 + sRGBTexture: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Avatars/Stormtrigger/t_gloves_05_csout.dds b/Assets/Avatars/Stormtrigger/t_gloves_05_csout.dds new file mode 100644 index 0000000..2e00bce --- /dev/null +++ b/Assets/Avatars/Stormtrigger/t_gloves_05_csout.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff6ad3379f99652eb3c35ad442001eb011f05dbee699bf3cbd846cd9bdd31869 +size 1048704 diff --git a/Assets/Avatars/Stormtrigger/t_gloves_05_csout.dds.meta b/Assets/Avatars/Stormtrigger/t_gloves_05_csout.dds.meta new file mode 100644 index 0000000..d9e82b6 --- /dev/null +++ b/Assets/Avatars/Stormtrigger/t_gloves_05_csout.dds.meta @@ -0,0 +1,19 @@ +fileFormatVersion: 2 +guid: 4bd3df9855219d84e812ef9e90935edb +IHVImageFormatImporter: + externalObjects: {} + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + isReadable: 0 + sRGBTexture: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Avatars/Stormtrigger/troop.fbx b/Assets/Avatars/Stormtrigger/troop.fbx new file mode 100644 index 0000000..0c26b7f --- /dev/null +++ b/Assets/Avatars/Stormtrigger/troop.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c9cfd45c74a2ce2ee6d5a87f1d7bd3dbbed9f202aa09a1ea834b5c6a1478c25 +size 23870384 diff --git a/Assets/Avatars/Stormtrigger/troop.fbx.meta b/Assets/Avatars/Stormtrigger/troop.fbx.meta new file mode 100644 index 0000000..99b2f9b --- /dev/null +++ b/Assets/Avatars/Stormtrigger/troop.fbx.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: c5470c9a1aff50643b6a9ff0bab4297d +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: t_d_assault_newera_01_body_csout + second: {fileID: 2800000, guid: 184e0d5cf7238d74cada3529d5a73851, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: t_d_assault_newera_01_helmet_csout + second: {fileID: 2800000, guid: a5bf19dd73c202e4895c9fb07d4c2785, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: t_gloves_05_csout + second: {fileID: 2800000, guid: 4bd3df9855219d84e812ef9e90935edb, type: 3} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: mixamorig:Hips + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/PoseLandmark.cs b/Assets/Models/PoseLandmark.cs index 27bb89b..6520ef2 100644 --- a/Assets/Models/PoseLandmark.cs +++ b/Assets/Models/PoseLandmark.cs @@ -21,7 +21,7 @@ public class PoseLandmark /// /// 真实世界x坐标 /// 以米为单位 - /// 以臀部为重心 + /// 以臀部为重心 hip /// public float X { get; } diff --git a/Assets/Models/PoseLandmarkType.cs b/Assets/Models/PoseLandmarkType.cs index eae75fb..c32eda7 100644 --- a/Assets/Models/PoseLandmarkType.cs +++ b/Assets/Models/PoseLandmarkType.cs @@ -1,5 +1,6 @@ namespace Models { + //名字 public enum PoseLandmarkType { Nose, diff --git a/ProjectSettings/AutoStreamingSettings.asset b/ProjectSettings/AutoStreamingSettings.asset new file mode 100644 index 0000000..d3e071e --- /dev/null +++ b/ProjectSettings/AutoStreamingSettings.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1200 &1 +AutoStreamingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + mSearchMode: 15 + mCustomSearchFile: + mTextureSearchString: + mMeshSearchString: + mTextures: [] + mAudios: [] + mMeshes: [] + mScenes: [] + mConfigCCD: + useCCD: 0 + cosKey: + projectGuid: + bucketUuid: + bucketName: + badgeName: