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

fix animation with weapon

Browse Source
This commit is contained in:
VDH
2025-12-19 12:44:49 +07:00
parent eaaeaf6734
commit a980f64fbd
13 changed files with 67419 additions and 855 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ModelRenderer/Art/Animations/models/players/形象/妖兽男/躯干/tcks_妖兽男/tcks_妖兽男 1.controller
+72
View File
@@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-3359506361874593555
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: 1960055418093340064}
m_Position: {x: 310, y: 240, 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: 1960055418093340064}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "tcks_\u5996\u517D\u7537 1"
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -3359506361874593555}
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!1102 &1960055418093340064
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u5996\u517D\u7537_\u5954\u8DD1_\u901A\u7528"
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: 7400000, guid: 2d078e760e20f8a408d08a742ee73a12, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
Assets/ModelRenderer/Art/Animations/models/players/形象/妖兽男/躯干/tcks_妖兽男/tcks_妖兽男 1.controller.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 37ee34ed1d17328499b8d055ea2bdf47
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
Assets/ModelRenderer/Art/Animations/models/players/形象/妖精/躯干/tcks_妖精/奔跑_通用.anim
+35258 -4
View File
File diff suppressed because it is too large Load Diff
Assets/ModelRenderer/Art/Animations/models/players/形象/羽灵女/躯干/tcks_羽灵女/奔跑_通用.anim
+32022 -4
View File
File diff suppressed because it is too large Load Diff
Assets/ModelRenderer/Art/Models/models/players/形象/妖兽男/躯干/妖兽男.prefab
+36 -36
View File
@@ -30,7 +30,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7439959627987073148}
m_LocalEulerAnglesHint: {x: 2.6673512, y: -94.62244, z: 0.9596637}
m_LocalEulerAnglesHint: {x: -0.0000016814945, y: -91.3476, z: -0.00000041766424}
--- !u!1 &244314528437568868
GameObject:
m_ObjectHideFlags: 0
@@ -186,7 +186,7 @@ Transform:
m_Children:
- {fileID: 8864096731695825393}
m_Father: {fileID: 5538021221126112955}
m_LocalEulerAnglesHint: {x: -4.8726544, y: 11.449167, z: 64.10468}
m_LocalEulerAnglesHint: {x: -23.223736, y: 7.9247413, z: 41.577393}
--- !u!1 &377613247729663146
GameObject:
m_ObjectHideFlags: 0
@@ -220,7 +220,7 @@ Transform:
- {fileID: 8374671749731956261}
- {fileID: 5644260497524198183}
m_Father: {fileID: 1322029198309482693}
m_LocalEulerAnglesHint: {x: 9.523281, y: -150.4026, z: -175.60965}
m_LocalEulerAnglesHint: {x: 69.49795, y: -89.86986, z: -87.37809}
--- !u!1 &402291575838452352
GameObject:
m_ObjectHideFlags: 0
@@ -313,7 +313,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2661266554294842638}
m_LocalEulerAnglesHint: {x: -2.1718156, y: -15.630612, z: 2.475223}
m_LocalEulerAnglesHint: {x: -1.0910087, y: 8.146794, z: 0.41977823}
--- !u!1 &456276514471773318
GameObject:
m_ObjectHideFlags: 0
@@ -346,7 +346,7 @@ Transform:
- {fileID: 5850389395315652739}
- {fileID: 5060706955465588730}
m_Father: {fileID: 2175239638626736052}
m_LocalEulerAnglesHint: {x: -0.00000076121, y: 68.213326, z: -0.0000040300183}
m_LocalEulerAnglesHint: {x: 0.0000010219784, y: 30.711287, z: 0.00000032630845}
--- !u!1 &484443939120863642
GameObject:
m_ObjectHideFlags: 0
@@ -564,7 +564,7 @@ Transform:
m_Children:
- {fileID: 2175239638626736052}
m_Father: {fileID: 1880108615648505681}
m_LocalEulerAnglesHint: {x: -46.377327, y: -161.82666, z: 69.505005}
m_LocalEulerAnglesHint: {x: -6.4120903, y: -165.2831, z: 67.16381}
--- !u!1 &862794892519638133
GameObject:
m_ObjectHideFlags: 0
@@ -906,7 +906,7 @@ Transform:
m_Children:
- {fileID: 2526006074082774721}
m_Father: {fileID: 3977730433532276168}
m_LocalEulerAnglesHint: {x: -0.00017774692, y: 155.53693, z: -0.00002077233}
m_LocalEulerAnglesHint: {x: -0.00016696096, y: 142.94914, z: -0.000009211779}
--- !u!1 &1323087609303840240
GameObject:
m_ObjectHideFlags: 0
@@ -937,7 +937,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5392399492917364234}
m_LocalEulerAnglesHint: {x: -0.000029177914, y: -71, z: -0.000048022837}
m_LocalEulerAnglesHint: {x: -0.000041384217, y: -69.35389, z: -0.000029220435}
--- !u!1 &1402646025631384551
GameObject:
m_ObjectHideFlags: 0
@@ -1186,7 +1186,7 @@ Transform:
m_Children:
- {fileID: 5125684589084959909}
m_Father: {fileID: 5850389395315652739}
m_LocalEulerAnglesHint: {x: 2.3141944, y: -60.282623, z: -4.4848366}
m_LocalEulerAnglesHint: {x: 2.4494677, y: -58.544334, z: -4.412815}
--- !u!1 &1937186133837533737
GameObject:
m_ObjectHideFlags: 0
@@ -1218,7 +1218,7 @@ Transform:
m_Children:
- {fileID: 6193094595147620031}
m_Father: {fileID: 7537286070387449090}
m_LocalEulerAnglesHint: {x: 14.103656, y: 2.7595754, z: 5.059911}
m_LocalEulerAnglesHint: {x: 1.1071343, y: -9.996735, z: -1.2408978}
--- !u!1 &2001901433259696192
GameObject:
m_ObjectHideFlags: 0
@@ -1973,7 +1973,7 @@ Animator:
m_GameObject: {fileID: 2105786326208748952}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 592c06c231d30a34dbad61fecc2613ad, type: 2}
m_Controller: {fileID: 9100000, guid: 37ee34ed1d17328499b8d055ea2bdf47, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
@@ -2389,7 +2389,7 @@ Transform:
- {fileID: 1101689155962946974}
- {fileID: 5655127360926666241}
m_Father: {fileID: 3977730433532276168}
m_LocalEulerAnglesHint: {x: 5.2311707, y: -8.203921, z: -0.78540576}
m_LocalEulerAnglesHint: {x: -0.29741073, y: -10.969663, z: 4.809362}
--- !u!1 &2314788188119223903
GameObject:
m_ObjectHideFlags: 0
@@ -2513,7 +2513,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5333898864400154346}
m_LocalEulerAnglesHint: {x: -0.0000007342897, y: 30.593424, z: 0.0000010578977}
m_LocalEulerAnglesHint: {x: 0.0000031970633, y: -12.00859, z: 0.0000018926728}
--- !u!1 &2481262278227185334
GameObject:
m_ObjectHideFlags: 0
@@ -2732,7 +2732,7 @@ Transform:
- {fileID: 7439959627987073148}
- {fileID: 6370145861981848361}
m_Father: {fileID: 1101689155962946974}
m_LocalEulerAnglesHint: {x: -0.0000008515062, y: 88.970924, z: 0.00000045891824}
m_LocalEulerAnglesHint: {x: -0.0000010240558, y: 101.81239, z: 0.000002154722}
--- !u!1 &2815957815810531230
GameObject:
m_ObjectHideFlags: 0
@@ -2796,7 +2796,7 @@ Transform:
- {fileID: 5584712961357672422}
- {fileID: 556154652022186586}
m_Father: {fileID: 2801507161710873284}
m_LocalEulerAnglesHint: {x: 0.00000015384921, y: 66.320244, z: 0.00000018276546}
m_LocalEulerAnglesHint: {x: 0.0000010398622, y: 36.55616, z: 0.00000026993868}
--- !u!1 &2935358641061490333
GameObject:
m_ObjectHideFlags: 0
@@ -2984,7 +2984,7 @@ Transform:
- {fileID: 8997789159598732850}
- {fileID: 3616557925201614207}
m_Father: {fileID: 3897447146298061344}
m_LocalEulerAnglesHint: {x: 0.0000015409652, y: 81.176445, z: -0.0000009891781}
m_LocalEulerAnglesHint: {x: -0.0000026692462, y: 52.98943, z: -0.0000015835551}
--- !u!1 &3210512273110752031
GameObject:
m_ObjectHideFlags: 0
@@ -3078,7 +3078,7 @@ Transform:
m_Children:
- {fileID: 3897447146298061344}
m_Father: {fileID: 1880108615648505681}
m_LocalEulerAnglesHint: {x: -54.3169, y: -159.5786, z: -89.75354}
m_LocalEulerAnglesHint: {x: 16.827562, y: -170.24997, z: -89.12425}
--- !u!1 &3339490618301159717
GameObject:
m_ObjectHideFlags: 0
@@ -3111,7 +3111,7 @@ Transform:
- {fileID: 8971416682365344587}
- {fileID: 3978952165772221740}
m_Father: {fileID: 8576287902300599981}
m_LocalEulerAnglesHint: {x: 6.689655, y: 44.006, z: -177.675}
m_LocalEulerAnglesHint: {x: 4.1623354, y: 14.720808, z: 179.25063}
--- !u!1 &3378845113530656700
GameObject:
m_ObjectHideFlags: 0
@@ -5328,7 +5328,7 @@ Transform:
- {fileID: 7537286070387449090}
- {fileID: 1470181834098714162}
m_Father: {fileID: 8576287902300599981}
m_LocalEulerAnglesHint: {x: 1.2970592, y: 85.33128, z: 177.3608}
m_LocalEulerAnglesHint: {x: 1.4962896, y: 70.867615, z: -177.74043}
--- !u!1 &3816658556456952143
GameObject:
m_ObjectHideFlags: 0
@@ -5538,7 +5538,7 @@ Transform:
- {fileID: 2661266554294842638}
- {fileID: 5333898864400154346}
m_Father: {fileID: 6120553475674564225}
m_LocalEulerAnglesHint: {x: -0, y: 89.999916, z: 89.999916}
m_LocalEulerAnglesHint: {x: -0.0000066761854, y: 89.99991, z: 86.204834}
--- !u!1 &3941117903600713701
GameObject:
m_ObjectHideFlags: 0
@@ -5756,7 +5756,7 @@ Transform:
m_Children:
- {fileID: 1322029198309482693}
m_Father: {fileID: 2927964080498557358}
m_LocalEulerAnglesHint: {x: 30.842594, y: 42.029076, z: -22.946789}
m_LocalEulerAnglesHint: {x: -18.995369, y: -29.559723, z: -54.704376}
--- !u!1 &4278766920338167933
GameObject:
m_ObjectHideFlags: 0
@@ -5790,7 +5790,7 @@ Transform:
- {fileID: 924550734686426854}
- {fileID: 3723329099673797688}
m_Father: {fileID: 8864096731695825393}
m_LocalEulerAnglesHint: {x: -50.373253, y: 9.402092, z: -9.82097}
m_LocalEulerAnglesHint: {x: -69.49797, y: -89.869865, z: 87.378105}
--- !u!1 &4299950983959084159
GameObject:
m_ObjectHideFlags: 0
@@ -6380,7 +6380,7 @@ Transform:
m_Children:
- {fileID: 622737928913008524}
m_Father: {fileID: 8997789159598732850}
m_LocalEulerAnglesHint: {x: -4.674968, y: -19.671293, z: 1.900132}
m_LocalEulerAnglesHint: {x: -3.306417, y: -46.647705, z: 3.8127346}
--- !u!1 &5334289189829180036
GameObject:
m_ObjectHideFlags: 0
@@ -6599,7 +6599,7 @@ Transform:
- {fileID: 3362120949866563678}
- {fileID: 8293461291791834591}
m_Father: {fileID: 1880108615648505681}
m_LocalEulerAnglesHint: {x: 40.616714, y: -7.7728715, z: -8.060413}
m_LocalEulerAnglesHint: {x: -2.843099, y: 26.174717, z: 7.838703}
--- !u!1 &5707043307982419213
GameObject:
m_ObjectHideFlags: 0
@@ -6631,7 +6631,7 @@ Transform:
m_Children:
- {fileID: 5206941110577069070}
m_Father: {fileID: 8997789159598732850}
m_LocalEulerAnglesHint: {x: 77.04754, y: 128.21368, z: -171.73373}
m_LocalEulerAnglesHint: {x: 77.965096, y: -118.19592, z: -48.043015}
--- !u!1 &5730378002398842887
GameObject:
m_ObjectHideFlags: 0
@@ -6745,7 +6745,7 @@ Transform:
- {fileID: 2662211301128182155}
- {fileID: 8065888237917903913}
m_Father: {fileID: 9093093661518282336}
m_LocalEulerAnglesHint: {x: -3.5428686, y: -75.55654, z: -9.357314}
m_LocalEulerAnglesHint: {x: -0, y: -90.00006, z: -20.5}
--- !u!1 &5938155744799244006
GameObject:
m_ObjectHideFlags: 0
@@ -6870,7 +6870,7 @@ Transform:
m_Children:
- {fileID: 8003347115673265765}
m_Father: {fileID: 3977730433532276168}
m_LocalEulerAnglesHint: {x: 13.66776, y: 81.702545, z: -60.007477}
m_LocalEulerAnglesHint: {x: 14.469849, y: 84.97701, z: -178.8075}
--- !u!1 &6148195583531014640
GameObject:
m_ObjectHideFlags: 0
@@ -7030,7 +7030,7 @@ Transform:
- {fileID: 9158740774716693111}
- {fileID: 1240798248326156124}
m_Father: {fileID: 3791128350871612678}
m_LocalEulerAnglesHint: {x: 4.88935, y: -12.060019, z: -1.0472621}
m_LocalEulerAnglesHint: {x: -1.3833634, y: -0.34213692, z: 0.8158401}
--- !u!1 &6423422671037088644
GameObject:
m_ObjectHideFlags: 0
@@ -7455,7 +7455,7 @@ Transform:
m_Children:
- {fileID: 1373955870178791224}
m_Father: {fileID: 5850389395315652739}
m_LocalEulerAnglesHint: {x: -83.512985, y: 36.16401, z: -82.406136}
m_LocalEulerAnglesHint: {x: -74.122154, y: -141.39212, z: 65.09473}
--- !u!1 &6972515376437705832
GameObject:
m_ObjectHideFlags: 0
@@ -7548,7 +7548,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5584712961357672422}
m_LocalEulerAnglesHint: {x: -0.0006581258, y: -90.0134, z: -0.053579688}
m_LocalEulerAnglesHint: {x: -0.034650393, y: -88.923386, z: -0.0050520776}
--- !u!1 &7251445229151971001
GameObject:
m_ObjectHideFlags: 0
@@ -7611,7 +7611,7 @@ Transform:
m_Children:
- {fileID: 5431978342216098482}
m_Father: {fileID: 8576287902300599981}
m_LocalEulerAnglesHint: {x: 11.721263, y: -19.952326, z: -5.421054}
m_LocalEulerAnglesHint: {x: -2.5702634, y: -5.379121, z: 1.4302638}
--- !u!1 &7333832367743090253
GameObject:
m_ObjectHideFlags: 0
@@ -7642,7 +7642,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 924550734686426854}
m_LocalEulerAnglesHint: {x: -0.0000024548287, y: -44.093765, z: 0.000012506279}
m_LocalEulerAnglesHint: {x: 0.000012474074, y: -70.25422, z: 0.000020759098}
--- !u!1 &7369503426622952133
GameObject:
m_ObjectHideFlags: 0
@@ -8015,7 +8015,7 @@ Transform:
m_Children:
- {fileID: 5975974767019361818}
m_Father: {fileID: 8971416682365344587}
m_LocalEulerAnglesHint: {x: -21.573744, y: -63.374687, z: 3.0570788}
m_LocalEulerAnglesHint: {x: -0.78412426, y: 5.3385262, z: 2.731864}
--- !u!1 &8179723587388731739
GameObject:
m_ObjectHideFlags: 0
@@ -8049,7 +8049,7 @@ Transform:
- {fileID: 2927964080498557358}
- {fileID: 5538021221126112955}
m_Father: {fileID: 5431978342216098482}
m_LocalEulerAnglesHint: {x: -29.999985, y: -13.007111, z: 0.026382407}
m_LocalEulerAnglesHint: {x: 2.9113474, y: -13.15535, z: -12.280058}
--- !u!1 &8196021217093937973
GameObject:
m_ObjectHideFlags: 0
@@ -8080,7 +8080,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8178627207733606607}
m_LocalEulerAnglesHint: {x: 0.00004247412, y: -76.27176, z: -0.0000060245366}
m_LocalEulerAnglesHint: {x: 0.000043630564, y: -68.15898, z: 0.000037614867}
--- !u!1 &8204937604762030338
GameObject:
m_ObjectHideFlags: 0
@@ -8297,7 +8297,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8374671749731956261}
m_LocalEulerAnglesHint: {x: -0.000032220447, y: -83.6377, z: -0.000009706946}
m_LocalEulerAnglesHint: {x: -0.000025862315, y: -78.633965, z: -0.0000103884295}
--- !u!1 &8814838696718596083
GameObject:
m_ObjectHideFlags: 0
Assets/PerfectWorld/Scripts/Managers/CECManager.cs
+1
View File
@@ -141,5 +141,6 @@ namespace BrewMonster.Managers
Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
+3 -1
View File
@@ -420,7 +420,9 @@ namespace BrewMonster
{
m_iCurAction = iAction;
PLAYER_ACTION action = actionConfig;
var szAct = EC_Utility.BuildActionName(action, 0);
int weapon_type = GetShowingWeaponType();
var szAct = EC_Utility.BuildActionName(action, weapon_type);
EventBus.PublishChannel(m_PlayerInfo.cid, new PlayActionEvent(szAct, iTransTime));
return true;
}
Assets/PerfectWorld/Scripts/Skills/skill7.cs
+1
View File
@@ -172,3 +172,4 @@ namespace BrewMonster
Assets/PerfectWorld/Scripts/Skills/skill8.cs
+1
View File
@@ -170,3 +170,4 @@ namespace BrewMonster
Assets/PerfectWorld/Scripts/Skills/skill9.cs
+1
View File
@@ -109,3 +109,4 @@ namespace BrewMonster
Assets/Scenes/a61.unity
+1 -1
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:975015542771a1198336ce520573fa34bd28504be3cba6ee452a9e6d44d936bc
oid sha256:89b5832b8e2f8d88fce4cfde0f06399f6a47d80bc353af3974c0d1cd78ad26a6
size 200745217
Assets/Scripts/PlayerVisual.cs
+6 -2
View File
@@ -18,6 +18,7 @@ namespace BrewMonster
[SerializeField] private List<string> _animationList = new List<string>();
[SerializeField] private bool isHit;
[SerializeField] private int id;
[SerializeField] private bool isDebug;
private const float FadeTime = 0.1f;
private const FadeMode FadeMode = Animancer.FadeMode.NormalizedDuration;
@@ -130,8 +131,7 @@ namespace BrewMonster
}
string animName = _animationQueue.Dequeue();
_animationList = _animationQueue.ToList();
//TODO: default fadetime = 200 remake later
InternalPlayAnimation(animName,200);
InternalPlayAnimation(animName);
}
void ApplyDamage()
{
@@ -161,6 +161,10 @@ namespace BrewMonster
/// <param name="fadeMode"></param>
private void InternalPlayAnimation(string animationName, float duration = FadeTime, FadeMode fadeMode = FadeMode)
{
if (isDebug)
{
BMLogger.LogError($"InternalPlayAnimation: {animationName}");
}
_currentState = namedAnimancer.TryPlay(animationName, duration / 1000, fadeMode);
_currentAnimationName = animationName;
if (_currentState == null)
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
+9 -807
View File
File diff suppressed because one or more lines are too long