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

Merge pull request 'feature/anim-test-scene' (#461) from feature/anim-test-scene into develop

Browse Source 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/461
This commit is contained in:
namth
2026-05-20 10:19:37 +00:00
parent 7bd8061374 fe2f30d1f1
commit baf9f0a453
10 changed files with 88 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/武侠/万剑诀预备.prefab
+1 -1
View File
@@ -9809,7 +9809,7 @@ Transform:
m_GameObject: {fileID: 1169012533657576942}
serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 1.959028, y: 0.52834785, z: -0.37840325}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/武侠/寸力.prefab
+8 -8
View File
@@ -106,7 +106,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 1
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
randomSeed: 0
@@ -4932,14 +4932,14 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1910986973726128733}
serializedVersion: 8
lengthInSec: 0.75
lengthInSec: 1
simulationSpeed: 1
stopAction: 0
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 1
looping: 1
looping: 0
prewarm: 0
playOnAwake: 0
useUnscaledTime: 0
@@ -4997,7 +4997,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 1
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
randomSeed: 0
@@ -10533,7 +10533,7 @@ ParticleSystem:
sphericalDirectionAmount: 0
randomPositionAmount: 0
radius:
value: 2
value: 0.5
mode: 0
spread: 0
speed:
@@ -10652,7 +10652,7 @@ ParticleSystem:
rateOverTime:
serializedVersion: 2
minMaxState: 0
scalar: 20
scalar: 5
minScalar: 10
maxCurve:
serializedVersion: 2
@@ -19559,7 +19559,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 1
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
randomSeed: 0
@@ -24450,7 +24450,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 1
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
randomSeed: 0
Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/凌风击中.prefab
+8 -8
View File
@@ -29,7 +29,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7720361514678472344}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -4862,7 +4862,7 @@ Transform:
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 1584046719737911208}
- {fileID: 2898972362276218062}
@@ -9702,7 +9702,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7720361514678472344}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -14535,7 +14535,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7720361514678472344}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -19426,7 +19426,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7720361514678472344}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -24317,7 +24317,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7720361514678472344}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -29150,7 +29150,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7720361514678472344}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -34041,7 +34041,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7720361514678472344}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/流水击中.prefab
+35 -35
View File
@@ -4927,12 +4927,12 @@ Transform:
m_GameObject: {fileID: 3256418640688347232}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0.3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3231107605069454651}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &9215611861532867277
ParticleSystem:
m_ObjectHideFlags: 0
@@ -5504,7 +5504,7 @@ ParticleSystem:
m_RotationOrder: 4
randomizeRotationDirection: 0
gravitySource: 0
maxNumParticles: 15
maxNumParticles: 20
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
rotation3D: 0
@@ -5564,14 +5564,14 @@ ParticleSystem:
ShapeModule:
serializedVersion: 6
enabled: 1
type: 0
angle: 25
type: 5
angle: 60
length: 5
boxThickness: {x: 0, y: 0, z: 0}
radiusThickness: 1
donutRadius: 0.2
m_Position: {x: 0, y: 0, z: 0}
m_Rotation: {x: 0, y: 0, z: 0}
m_Rotation: {x: -90, y: 0, z: 0}
m_Scale: {x: 1, y: 1, z: 1}
placementMode: 0
m_MeshMaterialIndex: 0
@@ -5647,11 +5647,11 @@ ParticleSystem:
m_TextureColorAffectsParticles: 1
m_TextureAlphaAffectsParticles: 1
m_TextureBilinearFiltering: 0
randomDirectionAmount: 0
sphericalDirectionAmount: 0
randomDirectionAmount: 0.3
sphericalDirectionAmount: 0.5
randomPositionAmount: 0
radius:
value: 0.0001
value: 1
mode: 0
spread: 0
speed:
@@ -5710,7 +5710,7 @@ ParticleSystem:
arc:
value: 360
mode: 3
spread: 0
spread: 1
speed:
serializedVersion: 2
minMaxState: 0
@@ -6225,7 +6225,7 @@ ParticleSystem:
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime1: 31418
atime2: 0
atime3: 0
atime4: 0
@@ -14660,12 +14660,12 @@ Transform:
m_GameObject: {fileID: 5023512060464390003}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0.3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3231107605069454651}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &6002097150549873619
ParticleSystem:
m_ObjectHideFlags: 0
@@ -15237,7 +15237,7 @@ ParticleSystem:
m_RotationOrder: 4
randomizeRotationDirection: 0
gravitySource: 0
maxNumParticles: 15
maxNumParticles: 20
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
rotation3D: 0
@@ -15297,14 +15297,14 @@ ParticleSystem:
ShapeModule:
serializedVersion: 6
enabled: 1
type: 0
angle: 25
type: 5
angle: 30
length: 5
boxThickness: {x: 0, y: 0, z: 0}
radiusThickness: 1
donutRadius: 0.2
m_Position: {x: 0, y: 0, z: 0}
m_Rotation: {x: 0, y: 0, z: 0}
m_Rotation: {x: -90, y: 0, z: 0}
m_Scale: {x: 1, y: 1, z: 1}
placementMode: 0
m_MeshMaterialIndex: 0
@@ -15380,11 +15380,11 @@ ParticleSystem:
m_TextureColorAffectsParticles: 1
m_TextureAlphaAffectsParticles: 1
m_TextureBilinearFiltering: 0
randomDirectionAmount: 0
sphericalDirectionAmount: 0
randomDirectionAmount: 0.3
sphericalDirectionAmount: 0.5
randomPositionAmount: 0
radius:
value: 0.0001
value: 1
mode: 0
spread: 0
speed:
@@ -15443,7 +15443,7 @@ ParticleSystem:
arc:
value: 360
mode: 3
spread: 0
spread: 1
speed:
serializedVersion: 2
minMaxState: 0
@@ -15958,7 +15958,7 @@ ParticleSystem:
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime1: 31418
atime2: 0
atime3: 0
atime4: 0
@@ -19493,12 +19493,12 @@ Transform:
m_GameObject: {fileID: 5308768341035957248}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0.3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3231107605069454651}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &7633681881829888443
ParticleSystem:
m_ObjectHideFlags: 0
@@ -20070,7 +20070,7 @@ ParticleSystem:
m_RotationOrder: 4
randomizeRotationDirection: 0
gravitySource: 0
maxNumParticles: 15
maxNumParticles: 20
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
rotation3D: 0
@@ -20130,14 +20130,14 @@ ParticleSystem:
ShapeModule:
serializedVersion: 6
enabled: 1
type: 0
angle: 25
type: 5
angle: 45
length: 5
boxThickness: {x: 0, y: 0, z: 0}
radiusThickness: 1
donutRadius: 0.2
m_Position: {x: 0, y: 0, z: 0}
m_Rotation: {x: 0, y: 0, z: 0}
m_Rotation: {x: -90, y: 0, z: 0}
m_Scale: {x: 1, y: 1, z: 1}
placementMode: 0
m_MeshMaterialIndex: 0
@@ -20213,11 +20213,11 @@ ParticleSystem:
m_TextureColorAffectsParticles: 1
m_TextureAlphaAffectsParticles: 1
m_TextureBilinearFiltering: 0
randomDirectionAmount: 0
sphericalDirectionAmount: 0
randomDirectionAmount: 0.3
sphericalDirectionAmount: 0.5
randomPositionAmount: 0
radius:
value: 0.0001
value: 1
mode: 0
spread: 0
speed:
@@ -20276,7 +20276,7 @@ ParticleSystem:
arc:
value: 360
mode: 3
spread: 0
spread: 1
speed:
serializedVersion: 2
minMaxState: 0
@@ -20791,7 +20791,7 @@ ParticleSystem:
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime1: 31418
atime2: 0
atime3: 0
atime4: 0
@@ -24325,7 +24325,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5683280527051761755}
serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -24338,7 +24338,7 @@ Transform:
- {fileID: 8006776571976264621}
- {fileID: 1709277404122753344}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &5863453012670137202
ParticleSystem:
m_ObjectHideFlags: 0
Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/龙现飞行.prefab
+15 -15
View File
@@ -28,8 +28,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 2.469}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5308627417164020096}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
@@ -4919,8 +4919,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 1.2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5308627417164020096}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
@@ -9810,8 +9810,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 2.469}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5308627417164020096}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
@@ -14701,8 +14701,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5308627417164020096}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
@@ -19534,8 +19534,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 1.2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5308627417164020096}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
@@ -24425,8 +24425,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 1.8}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5308627417164020096}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
@@ -29317,7 +29317,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.03, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 8953170967735427344}
- {fileID: 4517791406877020305}
@@ -34156,8 +34156,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 1.2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5308627417164020096}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
Assets/PerfectWorld/Scene/AnimationTest.unity
+1 -1
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4370d12d63b3f482d2c5f38066604b3ba3cd462fa451d6ec7fe2f81b43614f82
oid sha256:cdf063328a3579dfa3a93d9dd16cec279b4fe914763a71443523e207d13cbd6d
size 124399
Assets/PerfectWorld/Scripts/AnimTestScene/AnimScenePlayerBootstrap.cs
+1 -1
View File
@@ -107,7 +107,7 @@ namespace PerfectWorld.Scripts
{
if(i<0)
activeCameraPos = cameraPoses.Count-1;
if (i>= cameraPoses.Count )
else if (i>= cameraPoses.Count )
activeCameraPos = 0;
else
activeCameraPos = i;
Assets/PerfectWorld/Scripts/AnimTestScene/LogPanelAnimeScene.cs
+16 -3
View File
@@ -132,9 +132,9 @@ namespace BrewMonster
public void LogPlayAttackEffectGfx(CECHostPlayer player, int skillId, int section = 0)
{
Debug.Log("LogPlayAttackEffectGfx: " + skillId + " " + section);
if (player == null)
return;
AddGfxEventsFromComAct(player.GetSkillAttackComActRise(skillId, section), "Attack");
AddGfxEventsFromComAct(player.GetSkillAttackComActFall(skillId, section), "Attack");
LogSkillStubFlyHitGfx(skillId, section);
@@ -151,16 +151,29 @@ namespace BrewMonster
public void AddGfxEventsFromComAct(A3DCombinedAction comAct, string label)
{
if (string.IsNullOrEmpty(label) || comAct?.m_EventInfoLst == null)
{
Debug.Log("AddGfxEventsFromComAct: " + label + " " + comAct?.m_strName);
return;
}
Debug.Log("AddGfxEventsFromComAct: " + label + " " + comAct?.m_strName + " " + comAct.m_EventInfoLst.Count);
var seen = new HashSet<string>();
foreach (var ev in comAct.m_EventInfoLst)
{
if (ev is not GFX_INFO gfx || gfx.m_strFilePaths == null)
Debug.Log("AddGfxEventsFromComAct: " + label + " " + comAct?.m_strName);
if (ev is not FX_BASE_INFO gfx || gfx.m_strFilePaths == null)
{
Debug.Log("AddGfxEventsFromComAct Failed: " + label + " " + ev?.GetType().Name);
continue;
}
foreach (string path in gfx.m_strFilePaths)
{
if(!path.Contains("gfx"))
{
continue;
}
Debug.Log("AddGfxEventsFromComAct: " + label + " " + path);
if (string.IsNullOrWhiteSpace(path))
continue;
Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
+2
View File
@@ -2601,7 +2601,9 @@ namespace BrewMonster
if (GetMoveEnv() == (int)MoveEnvironment.MOVEENV_GROUND)
{
riseName = EC_Utility.BuildActionName(data, weapon_type, "_施放起_");
Debug.Log("HoangDev: riseName: " + riseName);
fallName = EC_Utility.BuildActionName(data, weapon_type, "_施放落_");
Debug.Log("HoangDev: fallName: " + fallName);
}
else
{
Assets/PerfectWorld/Scripts/_Doc/AnimationSceneSkillTest.md.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b5fb40d75e8417f4eb8ec047e09cb6bd
guid: 988a714394c70ce49b1aefe7af834cbf
TextScriptImporter:
externalObjects: {}
userData: