duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update wing for HP.

Browse Source
This commit is contained in:
Tungdv
2026-03-18 16:34:31 +07:00
parent c800b48d52
commit 0ccc726e3d
12 changed files with 493 additions and 2604 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AssetGroups/models.asset
+5 -5
View File
@@ -4581,6 +4581,11 @@ MonoBehaviour:
- equipment
- models
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 365a813dfb44a714c9c8cfd5d657629e
m_Address: "models/players/\u901A\u7528\u88C5\u5907/\u7FC5\u8180/\u5929\u9E45\u4E4B\u7FFC/\u5929\u9E45\u4E4B\u7FFC.ecm"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3666460d33268476aa2645c1d19c07e8
m_Address: "models/weapons/\u4EBA\u7269/\u65A7\u9524/\u53CC\u624B\u957F\u9524/\u661F\u5BBF\u957F\u9524/\u661F\u5BBF\u957F\u9524\u6781\u54C1.ecm"
m_ReadOnly: 0
@@ -16647,11 +16652,6 @@ MonoBehaviour:
- models
- npc
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c23ea5ca2a5a0ac4088fac117a059938
m_Address: "models/players/\u901A\u7528\u88C5\u5907/\u7FC5\u8180/\u5929\u9E45\u4E4B\u7FFC/\u5929\u9E45\u4E4B\u7FFC.ecm"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c25d8e9f2ba0ca84faf57bffd9196e0d
m_Address: "models/players/\u88C5\u5907/\u5973/20\u54C1\u6CD5\u888D\u62A4\u8155/\u5973\u901A\u752820\u54C1\u6CD5\u888D\u62A4\u8155.ecm"
m_ReadOnly: 0
Assets/ModelRenderer/Art/Models/models/players/通用装备/翅膀/天鹅之翼/Test_Swing.controller
+72
View File
@@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Test_Swing
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 372189457654392322}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1107 &372189457654392322
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 3640648413567200789}
m_Position: {x: 300, y: 280, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 3640648413567200789}
--- !u!1102 &3640648413567200789
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u5929\u9E45\u4E4B\u7FFC_\u98DE\u884C\u524D\u8FDB"
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -3880581976594992817, guid: 630d892029660db41be7bd6b41c7f53f, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
Assets/ModelRenderer/Art/Models/models/players/通用装备/翅膀/天鹅之翼/Test_Swing.controller.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8e23b3a2fa3c9bd49b36745e73b1ee0b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
Assets/ModelRenderer/Art/Models/models/players/通用装备/翅膀/天鹅之翼/天鹅之翼.fbx
BIN
View File
Binary file not shown.
Assets/ModelRenderer/Art/Models/models/players/通用装备/翅膀/天鹅之翼/天鹅之翼.fbx.meta
+165
View File
@@ -0,0 +1,165 @@
fileFormatVersion: 2
guid: 630d892029660db41be7bd6b41c7f53f
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
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:
- serializedVersion: 16
name: "\u5929\u9E45\u4E4B\u7FFC_\u98DE\u884C\u524D\u8FDB"
takeName: ArmatureAction
internalID: -3880581976594992817
firstFrame: 0
lastFrame: 35
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
- serializedVersion: 16
name: "\u5929\u9E45\u4E4B\u7FFC_\u5730\u7A7A\u4E0B\u964D"
takeName: ArmatureAction
internalID: 5159389594315289563
firstFrame: 40
lastFrame: 63
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 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
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/ModelRenderer/Art/Models/models/players/通用装备/翅膀/天鹅之翼/天鹅之翼.prefab
+73 -2589
View File
File diff suppressed because it is too large Load Diff
Assets/ModelRenderer/Art/Models/models/players/通用装备/翅膀/天鹅之翼/天鹅之翼.prefab.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c23ea5ca2a5a0ac4088fac117a059938
guid: 365a813dfb44a714c9c8cfd5d657629e
PrefabImporter:
externalObjects: {}
userData:
Assets/ModelRenderer/Art/Textures/models/players/通用装备/翅膀/天鹅之翼.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 12d1a58c001c98d419c41e57321cdf47
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/ModelRenderer/Art/Textures/models/players/通用装备/翅膀/天鹅之翼/textures.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 281bed9105b750741a8469e92bcd9183
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/ModelRenderer/Art/Textures/models/players/通用装备/翅膀/天鹅之翼/textures/羽人翅膀1.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 84 KiB

Assets/ModelRenderer/Art/Textures/models/players/通用装备/翅膀/天鹅之翼/textures/羽人翅膀1.png.meta
+143
View File
@@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 54469fe198e08c34a8542f7550ee81f9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/CECPlayer_Inventory.cs
+10 -9
View File
@@ -378,20 +378,21 @@ namespace BrewMonster
m_wingType = enumWingType.WINGTYPE_WING;
//ChangeWing(pResult, static_cast<const WINGMANWING_ESSENCE*>(pEquip)->file_model);
var pWingData = (WINGMANWING_ESSENCE)equipData;
//string path1 = "models/players/通用装备/翅膀/天鹅之翼/天鹅之翼_Test.ecm";
//var pWingPrefab = await AddressableManager.Instance.LoadPrefabAsync(path1);
var pWingPrefab = await AddressableManager.Instance.LoadPrefabAsync(pWingData.FileModel.ToLower().Replace('\\', '/'));
//Transform parentWing = FindChildRecursive(_pPlayerModel.transform, "HH_chibang");
if(pWingPrefab != null)
{
GameObject parentWing = new GameObject();
parentWing.name = _wing;
parentWing.transform.parent = m_pPlayerModel.transform;
m_Wing = parentWing.transform;
var pflySwordObject = Instantiate(pWingPrefab).transform;
pflySwordObject.parent = m_pPlayerCECModel.m_skeletonBuilder.GetHook("HH_chibang").transform;
pflySwordObject.localPosition = Vector3.zero;
pflySwordObject.localRotation = Quaternion.identity;
pflySwordObject.localScale = Vector3.one;
m_Wing = pflySwordObject.transform;
var pWingObject = Instantiate(pWingPrefab, parentWing.transform);
pWingObject.gameObject.SetActive(true);
m_Wing.gameObject.SetActive(false);
//pWingObject.name = _wing;
}
BMLogger.Log($"ShowEquipments():: Wingman Wing Essence: {pWingData.id} {pWingData.Name} -- {pWingData.FileModel}");
break;
@@ -564,4 +565,4 @@ namespace BrewMonster
return string.Format(_equipment_skin[nProfession * NUM_GENDER + nGender], szSkinName, szSkinName);
}
}
}
}