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

Merge branch 'develop' into feature/storage

Browse Source
This commit is contained in:
HungDK
2026-05-21 17:56:21 +07:00
parent a4559f5d5f 954769ea7a
commit e3a32c8780
63 changed files with 5432 additions and 10146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AddressableAssetSettings.asset
+1 -1
View File
@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 712e3991f28e549e7a56ee582a977810
m_currentHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
Hash: 564cd9ab0e63f961ec93494e99c5244d
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
-5
View File
@@ -25,11 +25,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1a472454097b73647b7593d1e33c3e75
m_Address: gfx/NullDefault
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1b653230886be4009808803501ad7d7f
m_Address: Assets/PerfectWorld/SO/TaskTemplContainerSO.asset
m_ReadOnly: 0
Assets/AddressableAssetsData/AssetGroups/gfx.asset
+11 -1
View File
@@ -75,6 +75,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 0bc230034c117aa4b871337ba0729153
m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u98DE\u884C/\u70C8\u706B\u7B26\u65BD\u653E.gfx"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 0de7e3933d738b54d9584f3523642248
m_Address: "gfx/\u4EBA\u7269/\u6280\u80FD/\u6B66\u4FA0/\u91D1\u949F\u7F691.gfx"
m_ReadOnly: 0
@@ -160,6 +165,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1a472454097b73647b7593d1e33c3e75
m_Address: "gfx/\u4EBA\u7269/\u6280\u80FD/\u5996\u517D/NullDefault.gfx"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1ad4c030bc8c20e488b30e9c505f30ad
m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u51FB\u4E2D/\u6BC1\u5929\u706D\u5730\u51FB\u4E2D.gfx"
m_ReadOnly: 0
@@ -1331,7 +1341,7 @@ MonoBehaviour:
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f1df339040ed6fc4eb3deb6d1e6fa288
m_Address: "gfx/\u4EBA\u7269/\u6280\u80FD/\u6B66\u4FA0/\u907F\u6C34\u8BC0\u65BD\u653E.gfx"
m_Address: "gfx/\u4EBA\u7269/\u6280\u80FD/\u6CD5\u5E08/\u907F\u6C34\u8BC0\u65BD\u653E.gfx"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
Assets/Jianghu/Materials/Liehuo Fu/Fu.mat
+21 -1
View File
@@ -11,7 +11,11 @@ Material:
m_Shader: {fileID: 4800000, guid: 0a016a83287664641b867743f19faf14, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_ValidKeywords:
- _DISSOLVETEXUVS_NORMAL
- _DISTORTTEXUVS_NORMAL
- _MAINTEXUVS_NORMAL
- _MASKTEXUVS_NORMAL
m_InvalidKeywords:
- _DISSOLVETEXAR_ON
- _DISTORTTEXAR_ON
@@ -118,7 +122,11 @@ Material:
- _DissolveFactor: 0
- _DissolveSoft: 0.1
- _DissolveTexAR: 1
- _DissolveTexClampU: 0
- _DissolveTexClampV: 0
- _DissolveTexRotate: 0
- _DissolveTexUSpeed: 0
- _DissolveTexUVS: 0
- _DissolveTexVSpeed: 0
- _DissolveWide: 0.05
- _DistortDissolveTex: 0
@@ -126,7 +134,11 @@ Material:
- _DistortMainTex: 0
- _DistortMaskTex: 0
- _DistortTexAR: 1
- _DistortTexClampU: 0
- _DistortTexClampV: 0
- _DistortTexRotate: 0
- _DistortTexUSpeed: 0
- _DistortTexUVS: 0
- _DistortTexVSpeed: 0
- _Dst: 1
- _DstBlend: 0
@@ -144,10 +156,18 @@ Material:
- _GlossyReflections: 0
- _MainAlpha: 1
- _MainTexAR: 0
- _MainTexClampU: 0
- _MainTexClampV: 0
- _MainTexRotate: 0
- _MainTexUSpeed: 0
- _MainTexUVS: 0
- _MainTexVSpeed: 0
- _MaskTexAR: 1
- _MaskTexClampU: 0
- _MaskTexClampV: 0
- _MaskTexRotate: 0
- _MaskTexUSpeed: 0
- _MaskTexUVS: 0
- _MaskTexVSpeed: 0
- _Metallic: 0
- _OcclusionStrength: 1
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
+9 -9
View File
@@ -26,13 +26,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3720844413911946937}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -0.178, y: -0.33000004, z: 0}
m_LocalRotation: {x: 0.76604444, y: 0, z: 0, w: 0.64278764}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4217133699093346958}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 100, y: 0, z: 0}
--- !u!198 &8924156590734961407
ParticleSystem:
m_ObjectHideFlags: 0
@@ -48,7 +48,7 @@ ParticleSystem:
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 1
looping: 0
looping: 1
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
@@ -4868,15 +4868,15 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4197944621747409826}
serializedVersion: 2
m_LocalRotation: {x: -0.6878776, y: -0.16378161, z: 0.16378164, w: 0.6878776}
m_LocalPosition: {x: 0.26, y: 1.51, z: -0.52}
m_LocalRotation: {x: -0.6874251, y: -0.1656708, z: 0.1656708, w: 0.6874251}
m_LocalPosition: {x: 0.26, y: 1.98, z: -0.52}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 9001597620150510150}
- {fileID: 4268857114784208764}
m_Father: {fileID: 1604809390761698253}
m_LocalEulerAnglesHint: {x: -63.215, y: -90, z: 90}
m_LocalEulerAnglesHint: {x: -62.9, y: -90, z: 90}
--- !u!198 &2477563411527212070
ParticleSystem:
m_ObjectHideFlags: 0
@@ -14601,13 +14601,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8351087001867188720}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalRotation: {x: 0.76604444, y: 0, z: 0, w: 0.64278764}
m_LocalPosition: {x: -0.178, y: -0.33000004, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4217133699093346958}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 100, y: 0, z: 0}
--- !u!198 &7496596049144268267
ParticleSystem:
m_ObjectHideFlags: 0
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/武侠/霸王龙飞预备1.prefab
+18 -18
View File
@@ -42,7 +42,7 @@ ParticleSystem:
m_GameObject: {fileID: 15156914950836463}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -4934,7 +4934,7 @@ ParticleSystem:
m_GameObject: {fileID: 349010415179721749}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -9826,7 +9826,7 @@ ParticleSystem:
m_GameObject: {fileID: 429752902677186327}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -14659,7 +14659,7 @@ ParticleSystem:
m_GameObject: {fileID: 524335427812590582}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -19494,7 +19494,7 @@ ParticleSystem:
m_GameObject: {fileID: 852501820064385231}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -24387,7 +24387,7 @@ ParticleSystem:
m_GameObject: {fileID: 1564838389531116705}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -34119,7 +34119,7 @@ ParticleSystem:
m_GameObject: {fileID: 1991856825253685314}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -39010,7 +39010,7 @@ ParticleSystem:
m_GameObject: {fileID: 2169994430969108881}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -43843,7 +43843,7 @@ ParticleSystem:
m_GameObject: {fileID: 2197194896416800428}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -48735,7 +48735,7 @@ ParticleSystem:
m_GameObject: {fileID: 2697318837988795809}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -53568,7 +53568,7 @@ ParticleSystem:
m_GameObject: {fileID: 4043570496662948557}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -58403,7 +58403,7 @@ ParticleSystem:
m_GameObject: {fileID: 4134620181112707567}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -63294,7 +63294,7 @@ ParticleSystem:
m_GameObject: {fileID: 4206773510139196571}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -68186,7 +68186,7 @@ ParticleSystem:
m_GameObject: {fileID: 5090543755686395234}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -73019,7 +73019,7 @@ ParticleSystem:
m_GameObject: {fileID: 6375197309835102049}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -77911,7 +77911,7 @@ ParticleSystem:
m_GameObject: {fileID: 6948268340964940849}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -82805,7 +82805,7 @@ ParticleSystem:
m_GameObject: {fileID: 8080659413948619737}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
@@ -87698,7 +87698,7 @@ ParticleSystem:
m_GameObject: {fileID: 8888732998432236564}
serializedVersion: 8
lengthInSec: 2.33
simulationSpeed: 1
simulationSpeed: 2
stopAction: 0
cullingMode: 0
ringBufferMode: 0
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/武侠/龙现施放.prefab
+22 -22
View File
@@ -14752,7 +14752,7 @@ ParticleSystem:
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 0
looping: 0
looping: 1
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
@@ -14760,7 +14760,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 3.2333333
scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -15308,7 +15308,7 @@ ParticleSystem:
m_RotationOrder: 4
randomizeRotationDirection: 0
gravitySource: 0
maxNumParticles: 10
maxNumParticles: 100
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
rotation3D: 0
@@ -15376,7 +15376,7 @@ ParticleSystem:
donutRadius: 0.2
m_Position: {x: 0, y: 0, z: 0}
m_Rotation: {x: 0, y: 0, z: 0}
m_Scale: {x: 0.5, y: 0.5, z: 0.5}
m_Scale: {x: 1, y: 1, z: 1}
placementMode: 0
m_MeshMaterialIndex: 0
m_MeshNormalOffset: 0
@@ -16012,8 +16012,8 @@ ParticleSystem:
maxColor: {r: 1, g: 1, b: 1, a: 1}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 0}
key1: {r: 1, g: 1, b: 1, a: 1}
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 0.47058824}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
@@ -16031,7 +16031,7 @@ ParticleSystem:
atime0: 0
atime1: 33153
atime2: 65535
atime3: 0
atime3: 65535
atime4: 0
atime5: 0
atime6: 0
@@ -24543,9 +24543,9 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 0
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -25307,7 +25307,7 @@ ParticleSystem:
rateOverTime:
serializedVersion: 2
minMaxState: 0
scalar: 10
scalar: 5
minScalar: 10
maxCurve:
serializedVersion: 2
@@ -30881,7 +30881,7 @@ ParticleSystem:
z:
serializedVersion: 2
minMaxState: 0
scalar: 1.76
scalar: 1
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -39236,7 +39236,7 @@ ParticleSystem:
serializedVersion: 2
minMaxState: 0
minColor: {r: 1, g: 1, b: 1, a: 1}
maxColor: {r: 1, g: 1, b: 1, a: 1}
maxColor: {r: 1, g: 1, b: 1, a: 0.3137255}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
@@ -40672,7 +40672,7 @@ ParticleSystem:
z:
serializedVersion: 2
minMaxState: 0
scalar: 1.16
scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -41043,7 +41043,7 @@ ParticleSystem:
radial:
serializedVersion: 2
minMaxState: 0
scalar: -0.21
scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -41146,7 +41146,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
inWorldSpace: 0
inWorldSpace: 1
InheritVelocityModule:
enabled: 0
m_Mode: 0
@@ -45564,7 +45564,7 @@ ParticleSystem:
z:
serializedVersion: 2
minMaxState: 0
scalar: 1.16
scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -45935,7 +45935,7 @@ ParticleSystem:
radial:
serializedVersion: 2
minMaxState: 0
scalar: -0.21
scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -50198,7 +50198,7 @@ ParticleSystem:
ctime6: 0
ctime7: 0
atime0: 0
atime1: 24576
atime1: 16962
atime2: 0
atime3: 0
atime4: 0
@@ -59856,13 +59856,13 @@ ParticleSystem:
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 0}
key1: {r: 1, g: 1, b: 1, a: 0.19607843}
key2: {r: 0, g: 0, b: 0, a: 1}
key3: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0.19607843}
key4: {r: 0, g: 0, b: 0, a: 1}
key5: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0.19607843}
key6: {r: 0, g: 0, b: 0, a: 1}
key7: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0.19607843}
ctime0: 0
ctime1: 65535
ctime2: 0
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/武侠/龙现预备.prefab
+1 -1
View File
@@ -9956,7 +9956,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 3
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/法师/涌泉释放.prefab
+12 -12
View File
@@ -28,8 +28,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5736636269951384828}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -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
@@ -4919,8 +4919,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5736636269951384828}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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
@@ -9923,8 +9923,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5736636269951384828}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -10001,7 +10001,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 1
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
randomSeed: 0
@@ -14814,8 +14814,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5736636269951384828}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -14892,7 +14892,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/人物/技能/法师/涌泉释放2.prefab
+2 -2
View File
@@ -4862,8 +4862,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5479861585319242189}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/法师/涌泉预备2.prefab
+14 -14
View File
@@ -28,8 +28,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5302997904303973426}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -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
@@ -5032,8 +5032,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5302997904303973426}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5110,7 +5110,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 1
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
randomSeed: 0
@@ -9924,7 +9924,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:
- {fileID: 5302997904303973426}
m_Father: {fileID: 0}
@@ -14757,8 +14757,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5302997904303973426}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -14835,7 +14835,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 1
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
randomSeed: 0
@@ -19648,8 +19648,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5302997904303973426}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -19726,7 +19726,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
moveWithTransform: 1
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
randomSeed: 0
@@ -24653,7 +24653,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: 2913586150649953525}
- {fileID: 6380462167527821582}
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/法师/火煞天灯预备.prefab
+12 -12
View File
@@ -28,8 +28,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -4861,8 +4861,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -9703,8 +9703,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -14536,8 +14536,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -24203,8 +24203,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -29265,8 +29265,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 759527828698941399}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/法师/落石术吟唱.prefab
+27 -27
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:
- {fileID: 3804150557139316312}
m_Father: {fileID: 0}
@@ -109,7 +109,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -4862,8 +4862,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 1.23, y: 1.23, z: 1.23}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 3048603693854496959}
- {fileID: 1152567544505827745}
@@ -4944,7 +4944,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -9696,7 +9696,7 @@ Transform:
m_GameObject: {fileID: 5365135853265903216}
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: 2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -9717,15 +9717,15 @@ ParticleSystem:
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 0
looping: 1
prewarm: 1
looping: 0
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 0
scalar: 0.52
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -9777,7 +9777,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -9785,7 +9785,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 4
scalar: 3
minScalar: 5
maxCurve:
serializedVersion: 2
@@ -10969,7 +10969,7 @@ ParticleSystem:
m_RotationOrder: 4
separateAxes: 1
ColorModule:
enabled: 0
enabled: 1
gradient:
serializedVersion: 2
minMaxState: 1
@@ -10978,7 +10978,7 @@ ParticleSystem:
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 0}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
@@ -10993,16 +10993,16 @@ ParticleSystem:
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime0: 22552
atime1: 65535
atime2: 0
atime2: 65535
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_ColorSpace: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -14529,7 +14529,7 @@ Transform:
m_GameObject: {fileID: 8786661549251732509}
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: 2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -14550,15 +14550,15 @@ ParticleSystem:
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
emitterVelocityMode: 0
looping: 1
prewarm: 1
looping: 0
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 1
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 0
scalar: 0.7
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -14610,7 +14610,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -14618,7 +14618,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 4
scalar: 2
minScalar: 5
maxCurve:
serializedVersion: 2
@@ -15802,7 +15802,7 @@ ParticleSystem:
m_RotationOrder: 4
separateAxes: 1
ColorModule:
enabled: 0
enabled: 1
gradient:
serializedVersion: 2
minMaxState: 1
@@ -15811,7 +15811,7 @@ ParticleSystem:
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 0}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
@@ -15826,16 +15826,16 @@ ParticleSystem:
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime0: 22552
atime1: 65535
atime2: 0
atime2: 65535
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_ColorSpace: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/法师/落石术预备.prefab
+16 -16
View File
@@ -28,7 +28,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1, y: 1, z: 0.5}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3131665278182786367}
@@ -108,7 +108,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -4025,7 +4025,7 @@ ParticleSystem:
lifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.5
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -4947,7 +4947,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1, y: 1, z: 0.5}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3131665278182786367}
@@ -5027,7 +5027,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -8944,7 +8944,7 @@ ParticleSystem:
lifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.5
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -9951,7 +9951,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -14704,7 +14704,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1, y: 1, z: 0.5}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3131665278182786367}
@@ -14784,7 +14784,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -18701,7 +18701,7 @@ ParticleSystem:
lifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.5
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -19623,7 +19623,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1, y: 1, z: 0.5}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3131665278182786367}
@@ -19703,7 +19703,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -24537,7 +24537,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -29290,7 +29290,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1, y: 1, z: 0.5}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3131665278182786367}
@@ -29370,7 +29370,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -33287,7 +33287,7 @@ ParticleSystem:
lifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1
scalar: 0.5
minScalar: 1
maxCurve:
serializedVersion: 2
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/武侠/避水诀施放.prefab → Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/法师/避水诀施放.prefab
+2 -2
View File
@@ -27,7 +27,7 @@ Transform:
m_GameObject: {fileID: 5565630157211486145}
serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 1.24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -9686,7 +9686,7 @@ Transform:
m_GameObject: {fileID: 8770230928908487655}
serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 1.24, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/武侠/避水诀施放.prefab.meta → Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/法师/避水诀施放.prefab.meta
View File
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
+9 -9
View File
@@ -41,7 +41,7 @@ ParticleSystem:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 229117972425434128}
serializedVersion: 8
lengthInSec: 0.19
lengthInSec: 0.25
simulationSpeed: 1
stopAction: 0
cullingMode: 0
@@ -116,7 +116,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 0.19
scalar: 0.25
minScalar: 5
maxCurve:
serializedVersion: 2
@@ -169,7 +169,7 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 0
scalar: 10
scalar: 2.5
minScalar: 5
maxCurve:
serializedVersion: 2
@@ -340,7 +340,7 @@ ParticleSystem:
startSizeY:
serializedVersion: 2
minMaxState: 0
scalar: 4
scalar: 1.5
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -604,7 +604,7 @@ ParticleSystem:
m_RotationOrder: 4
randomizeRotationDirection: 0
gravitySource: 0
maxNumParticles: 20
maxNumParticles: 30
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 1
rotation3D: 0
@@ -751,7 +751,7 @@ ParticleSystem:
sphericalDirectionAmount: 0
randomPositionAmount: 0
radius:
value: 0.3
value: 0.0001
mode: 0
spread: 0
speed:
@@ -9724,7 +9724,7 @@ ParticleSystem:
startDelay:
serializedVersion: 2
minMaxState: 0
scalar: 0
scalar: 0.14
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -9837,7 +9837,7 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 0
scalar: 10
scalar: 3
minScalar: 5
maxCurve:
serializedVersion: 2
@@ -10008,7 +10008,7 @@ ParticleSystem:
startSizeY:
serializedVersion: 2
minMaxState: 0
scalar: 2
scalar: 1.5
minScalar: 1
maxCurve:
serializedVersion: 2
Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/横扫千军击中.prefab
+12 -12
View File
@@ -28,8 +28,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 4157341981584991390}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -4919,8 +4919,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 4157341981584991390}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -9752,8 +9752,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 4157341981584991390}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -14585,8 +14585,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 4157341981584991390}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -19476,8 +19476,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 4157341981584991390}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -29206,8 +29206,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 4157341981584991390}
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
+10 -10
View File
@@ -4919,8 +4919,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 6717296312834069839}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -9810,8 +9810,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 6717296312834069839}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -14643,8 +14643,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 6717296312834069839}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -24425,8 +24425,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 6717296312834069839}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
@@ -34098,8 +34098,8 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 6717296312834069839}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/涌泉中招.prefab
+6 -6
View File
@@ -27,7 +27,7 @@ Transform:
m_GameObject: {fileID: 255763862912694038}
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, z: -1.6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -5034,7 +5034,7 @@ Transform:
m_GameObject: {fileID: 1601117092297342646}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 4.983}
m_LocalPosition: {x: 0, y: -0, z: 3.4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -9867,7 +9867,7 @@ Transform:
m_GameObject: {fileID: 3407305194182680281}
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, z: -1.6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -19539,7 +19539,7 @@ Transform:
m_GameObject: {fileID: 5941438645502177811}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 4.11}
m_LocalPosition: {x: 0, y: -0, z: 2.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -24372,7 +24372,7 @@ Transform:
m_GameObject: {fileID: 6338423815892977536}
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, z: -1.6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -29379,7 +29379,7 @@ Transform:
m_GameObject: {fileID: 8144569259740298413}
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, z: -1.6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/烈火符施放.prefab
+4912 -9804
View File
File diff suppressed because it is too large Load Diff
Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/飞行/烈火符施放.prefab.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6a68eb538370d2a4295bfeb815d4a57f
guid: 0bc230034c117aa4b871337ba0729153
PrefabImporter:
externalObjects: {}
userData:
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
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4370d12d63b3f482d2c5f38066604b3ba3cd462fa451d6ec7fe2f81b43614f82
size 124399
oid sha256:56de257a0dc137130cb44b00462bc5a346cf8f292d1178fb31e138075b1fdb8c
size 137951
Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
-1
View File
@@ -288,7 +288,6 @@ namespace BrewMonster.Scripts
/// </summary>
public async Task<AudioClip> LoadAudioClipAsync(string assetPath)
{
// BMLogger.LogError($"HoangDEv : AddressableManager: LoadAudioClipAsync called with assetPath: {assetPath}");
RemoveFromReleaseAssetDictionary(assetPath);
if (_loadedAudioAssets.TryGetValue(assetPath, out _loadedAudioClipHandle))
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/GameSpeedModifier.cs
+50
View File
@@ -0,0 +1,50 @@
using UnityEngine;
using UnityEngine.UI;
using TMPro;
namespace BrewMonster
{
public class GameSpeedModifier : MonoBehaviour
{
[SerializeField] private Button _speedUpButton;
[SerializeField] private Button _speedDownButton;
[SerializeField] private TextMeshProUGUI _gameSpeedText;
private readonly float[] _speedStages = { 0.25f, 0.5f, 0.75f, 1f, 2f };
private int _currentSpeedIndex = 3; // Default = 1x
private void Awake()
{
_speedUpButton.onClick.AddListener(OnSpeedUpButtonClicked);
_speedDownButton.onClick.AddListener(OnSpeedDownButtonClicked);
_currentSpeedIndex = 3; // Default = 1x
Time.timeScale = 1.0f;
ApplySpeed();
}
private void OnSpeedUpButtonClicked()
{
if (_currentSpeedIndex >= _speedStages.Length - 1)
return;
_currentSpeedIndex++;
ApplySpeed();
}
private void OnSpeedDownButtonClicked()
{
if (_currentSpeedIndex <= 0)
return;
_currentSpeedIndex--;
ApplySpeed();
}
private void ApplySpeed()
{
float speed = _speedStages[_currentSpeedIndex];
Time.timeScale = speed;
_gameSpeedText.text = speed.ToString("0.##X");
}
}
}
Assets/PerfectWorld/Scripts/AnimTestScene/GameSpeedModifier.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 79733da183fc7ce40aabe2e7baa4a373
Assets/PerfectWorld/Scripts/AnimTestScene/LogPanelAnimeScene.cs
+15 -2
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/Common/DebugSessionLog.cs
+48
View File
@@ -0,0 +1,48 @@
#if UNITY_EDITOR || DEVELOPMENT_BUILD
using System;
using System.IO;
using System.Text;
using UnityEngine;
namespace BrewMonster
{
/// <summary>NDJSON debug session logger (agent instrumentation).</summary>
public static class DebugSessionLog
{
const string LogPath = @"c:\Hoang\PW\debug-f32222.log";
const string SessionId = "f32222";
public static void Write(string location, string message, string hypothesisId, object data, string runId = "pre-fix")
{
try
{
var ts = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
var dataJson = data != null ? JsonUtility.ToJson(data) : "{}";
var line = $"{{\"sessionId\":\"{SessionId}\",\"runId\":\"{runId}\",\"hypothesisId\":\"{hypothesisId}\",\"location\":\"{Escape(location)}\",\"message\":\"{Escape(message)}\",\"data\":{dataJson},\"timestamp\":{ts}}}\n";
File.AppendAllText(LogPath, line, Encoding.UTF8);
}
catch { /* ignore */ }
}
static string Escape(string s) => (s ?? "").Replace("\\", "\\\\").Replace("\"", "\\\"");
}
[Serializable]
public class DebugSessionPayload
{
public int skillId;
public int hostId;
public int castTargetId;
public int targetId;
public int targetCount;
public bool castInTargets;
public bool alreadyFired;
public int flyClusterCount;
public int eventId;
public string flyGfx;
public string prevState;
public string newState;
public int frame;
}
}
#endif
Assets/PerfectWorld/Scripts/Common/DebugSessionLog.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: d83746d5d66ba3644a84fcb959accc7d
Assets/PerfectWorld/Scripts/Managers/A3DSkillGfxMan.cs
+17
View File
@@ -23,6 +23,7 @@ namespace BrewMonster
// TODO: remove singleton later
public class A3DSkillGfxMan
{
static int s_debugNextEventId = 1;
public static A3DSkillGfxMan _instance;
public static A3DSkillGfxMan Instance
@@ -74,6 +75,13 @@ namespace BrewMonster
bCluster = true;
}
#region agent log
#if UNITY_EDITOR || DEVELOPMENT_BUILD
DebugSessionLog.Write("A3DSkillGfxMan.AddSkillGfxEvent", "add_skill_gfx_event", "C",
new DebugSessionPayload { hostId = (int)nHostID, targetId = (int)nTargetID, flyClusterCount = nFlyGfxCount });
#endif
#endregion
for (int i = 0; i < nFlyGfxCount; i++)
{
string value = bOnlyOneHit && i != nFlyGfxCount - 1 ? "" : szHitGfx;
@@ -138,6 +146,14 @@ namespace BrewMonster
// 验证目标ID - 允许0用于区域技能，但对可疑的大负值发出警告
A3DSkillGfxEvent pEvent = SkillGfxMan.InstanceSub.GetEmptyEvent(mode);
pEvent.m_debugEventId = s_debugNextEventId++;
#region agent log
#if UNITY_EDITOR || DEVELOPMENT_BUILD
DebugSessionLog.Write("A3DSkillGfxMan.AddOneSkillGfxEvent", "add_gfx_event", "C",
new DebugSessionPayload { eventId = pEvent.m_debugEventId, hostId = (int)nHostID, targetId = (int)nTargetID, flyGfx = szFlyGfx ?? "" });
#endif
#endregion
pEvent.SetComposer(pComposer);
pEvent.SetHostID(nHostID);
@@ -212,6 +228,7 @@ namespace BrewMonster
protected bool m_bHostECMCreatedByGfx;
protected GfxSkillEventState m_enumState;
public int m_debugEventId;
public A3DSkillGfxEvent(GfxMoveMode mode)
{
Assets/PerfectWorld/Scripts/Managers/CECAttacksMan.cs
+56 -4
View File
@@ -235,7 +235,6 @@ namespace BrewMonster
while (node != null)
{
var next = node.Next;
//BMLogger.LogError("HoangDev: Update CECAttackEvent node.Value.m_bFinished: " + node.Value.m_bFinished);
if (node.Value.m_bFinished)
m_targets.Remove(node);
else
@@ -305,7 +304,6 @@ namespace BrewMonster
public CECAttackerEvents FindAttackByAttacker(int idHost)
{
CECAttackerEvents result = new CECAttackerEvents();
//BMLogger.LogError("HoangDev: FindAttackByAttacker idHost: " + m_AttackLinkedList.Count);
foreach (var attack in m_targets)
{
if (attack.m_idHost == idHost)
@@ -672,7 +670,6 @@ namespace BrewMonster
? null
: await AddressableManager.Instance.LoadPrefabAsync("gfx/" + hitGrdGfxName);
// BMLogger.LogError("HoangDev: Load A3DSkillGfxComposer GFX name: " + hitGfxName);
if (m_szFlyGfx == null && !string.IsNullOrEmpty(flyGfxName))
{
m_szFlyGfx = Resources.Load<GameObject>("GFX/" + "PlaceHolder");
@@ -766,6 +763,19 @@ namespace BrewMonster
{
bool bCastInTargets = false;
#region agent log
#if UNITY_EDITOR || DEVELOPMENT_BUILD
DebugSessionLog.Write("A3DSkillGfxComposer.Play", "composer_play_start", "B",
new DebugSessionPayload
{
hostId = nHostID,
castTargetId = nCastTargetID,
targetCount = targets?.Count ?? 0,
frame = Time.frameCount
});
#endif
#endregion
// Determine GFX names from loaded prefabs / 从已加载的预制体确定GFX名称
string szFly = m_szFlyGfx != null ? flyGfxName : null;
string szHit = m_szHitGfx != null ? hitGfxName : null;
@@ -811,6 +821,20 @@ namespace BrewMonster
}
}
#region agent log
#if UNITY_EDITOR || DEVELOPMENT_BUILD
DebugSessionLog.Write("A3DSkillGfxComposer.Play", "composer_play_end", "B",
new DebugSessionPayload
{
hostId = nHostID,
castTargetId = nCastTargetID,
targetCount = targets?.Count ?? 0,
castInTargets = bCastInTargets,
frame = Time.frameCount
});
#endif
#endregion
if (nCastTargetID != 0 && !bCastInTargets)
{
// Validate cast target exists before adding
@@ -928,6 +952,20 @@ namespace BrewMonster
return;
}
#region agent log
#if UNITY_EDITOR || DEVELOPMENT_BUILD
DebugSessionLog.Write("A3DSkillGfxComposer.AddOneTarget", "add_one_target", "B",
new DebugSessionPayload
{
hostId = _Host,
targetId = _Target,
castTargetId = nCastTargetID,
flyClusterCount = (int)m_FlyCluster.m_ulCount,
frame = Time.frameCount
});
#endif
#endregion
// 调用GFX管理器添加技能特效事件 / Call GFX manager to add skill GFX event
m_pSkillGfxMan.AddSkillGfxEvent(
this,
@@ -1054,6 +1092,21 @@ public class CECAttackEvent
bool DoFire()
{
#region agent log
#if UNITY_EDITOR || DEVELOPMENT_BUILD
DebugSessionLog.Write("CECAttackEvent.DoFire", "do_fire", "A",
new DebugSessionPayload
{
skillId = m_idSkill,
hostId = m_idHost,
castTargetId = m_idCastTarget,
targetCount = m_targets.Count,
alreadyFired = m_bDoFired,
frame = Time.frameCount
});
#endif
#endregion
m_bDoFired = true;
if (GPDataTypeHelper.ISPLAYERID(m_idHost))
@@ -1432,7 +1485,6 @@ public class CECAttackEvent
else if (GPDataTypeHelper.ISPLAYERID(idTarget))
{
CECPlayer pPlayer = EC_ManMessageMono.Instance.GetECManPlayer.GetPlayer(idTarget);
//BMLogger.LogError("HoangDev: CECPlayer pPlayer = " + pPlayer );
if (!pPlayer)
return true;
Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs
+27 -1
View File
@@ -235,6 +235,18 @@ namespace BrewMonster
// Spawn fly GFX when entering Flying state / 进入飞行状态时生成飞行特效
if (prevState == GfxSkillEventState.enumWait && m_enumState == GfxSkillEventState.enumFlying)
{
#region agent log
#if UNITY_EDITOR || DEVELOPMENT_BUILD
DebugSessionLog.Write("CECSkillGfxEvent.Tick", "wait_to_flying", "D",
new DebugSessionPayload
{
eventId = m_debugEventId,
prevState = prevState.ToString(),
newState = m_enumState.ToString(),
frame = Time.frameCount
});
#endif
#endregion
#if UNITY_EDITOR
Vector3 currentPos = m_pMoveMethod.GetPos();
@@ -350,9 +362,23 @@ namespace BrewMonster
Vector3 pos = m_pMoveMethod.GetPos();
/* Vector3 dir = m_pMoveMethod.GetMoveDir();
Quaternion rot = dir.sqrMagnitude > 1e-4f ? Quaternion.LookRotation(dir) : Quaternion.identity;*/
BMLogger.LogError($"[SKILL_GFX_DEBUG] SpawnFlyGfx: Fly GFX "+ m_pComposer.flyGfxName);
#region agent log
#if UNITY_EDITOR || DEVELOPMENT_BUILD
DebugSessionLog.Write("CECSkillGfxEvent.SpawnFlyGfx", "spawn_fly_gfx", "D",
new DebugSessionPayload
{
eventId = m_debugEventId,
hostId = (int)m_nHostID,
targetId = (int)m_nTargetID,
flyGfx = m_pComposer?.flyGfxName ?? "",
frame = Time.frameCount
});
#endif
#endregion
m_flyGfxInstance = GameObject.Instantiate(prefab, pos, prefab.transform.rotation);
// BMLogger.LogError("HoangDev: m_pComposer fly "+m_pComposer.flyGfxName);
SFXManager.Instance?.PlaySkillSfxAtPointAsync(m_pComposer.GetFlySfxPath(), pos).Forget();
// If m_bTraceTarget is true, add to tracking list when spawned
Assets/PerfectWorld/Scripts/Move/CECHostMove.cs
-2
View File
@@ -123,7 +123,6 @@ namespace BrewMonster
public void SendStopMoveCmd(in Vector3 vPos, float fSpeed, int iMoveMode)
{
// UnityEngine.Debug.LogWarning("HoangDev : SendStopMoveCmd");
iMoveMode |= (int)GPMoveMode.GP_MOVE_DEAD;
if (cmdstopdelayCounter >= 500)
@@ -389,7 +388,6 @@ namespace BrewMonster
cdr.fGravityAccel = 9.8f; // EC_GRAVITY
EC_CDR.OnGroundMove(ref cdr);
//BMLogger.LogError($"HoangDev: FlashMove seg={i} stepTime={cdr.t} center=({cdr.vCenter})");
var world = CECGameRun.Instance?.GetWorld();
if (world?.GetAssureMove() != null)
Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
+3 -10
View File
@@ -1,4 +1,4 @@
using BrewMonster.Managers;
using BrewMonster.Managers;
using BrewMonster.Network;
using BrewMonster.PerfectWorld.Scripts.Vfx;
using BrewMonster.Scripts;
@@ -1089,7 +1089,6 @@ namespace BrewMonster
protected void RemoveGfx(string szPath, string szHook, uint iShapeTypeMask)
{
string key = szPath + szHook;
// BMLogger.LogError("HoangDev: RemoveGfx " +szPath );
if (_stateGfxObjects.TryGetValue(key, out GameObject vfx) && vfx != null)
{
Destroy(vfx.gameObject);
@@ -2062,7 +2061,6 @@ namespace BrewMonster
{
pFashionConfig =
(FASHION_WEAPON_CONFIG)pDataMan.get_data_ptr(tid, ID_SPACE.ID_SPACE_CONFIG, ref DataType);
BMLogger.LogError($"HoangDev : get_data_ptr {pFashionConfig.GetType()}");
}
}
@@ -2142,7 +2140,6 @@ namespace BrewMonster
var target = EC_ManMessageMono.Instance?.GetObject(idTarget, 0)?.gameObject.transform;
if (target == null)
{
//BMLogger.LogError("HoangDev: ko có transform ");
return;
}
@@ -2266,7 +2263,6 @@ namespace BrewMonster
// Just play a wounded action
if (!OnDamaged(skill))
{
BMLogger.LogError(("HoangDev PlayAction((int)PLAYER_ACTION_TYPE.ACT_WOUNDED);"));
PlayAction((int)PLAYER_ACTION_TYPE.ACT_WOUNDED);
}
if ((dwModifier & (uint)MOD.MOD_IMMUNE) != 0)
@@ -2605,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
{
@@ -2674,17 +2672,14 @@ namespace BrewMonster
string name1, name2;
BMLogger.LogError("HoangDev: OnDamaged skill:"+skill + ", m_sciStateIDForStateAction.Length:"+m_sciStateIDForStateAction.Length);
for (int i = 0; i < m_sciStateIDForStateAction.Length; i++)
{
if (atkMan.GetSkillStateActionName(skill, m_sciStateIDForStateAction[i], out name1, out name2))
{
m_SkillIDForStateAction = skill;
BMLogger.LogError("HoangDev: atkMan.GetSkillStateActionName(ski");
return true;
}
}
BMLogger.LogError(("HoangDev: atkMan.GetSkillStateActionName(ski\" return false;"));
return false;
}
public CECSkill GetCurSkill() { return m_pCurSkill; }
@@ -3103,7 +3098,6 @@ namespace BrewMonster
vfx.transform.localPosition = Vector3.zero;
_stateGfxObjects[key] = vfx;
// BMLogger.Log($"[HoangDev StateGFX] Playing: {path}, hook: {hook}, scale: {fScale}");
}
// [中文] 在武器 CECModel 上移除状态效果 GFX（武器挂点逻辑未接入，暂存桩）
@@ -3203,7 +3197,6 @@ namespace BrewMonster
// Set part extend properties
public void SetPartExtendProps(int iPropIdx, object pData)
{
// BMLogger.LogError($"HoangDev: SetPartExtendProps iPropIdx={iPropIdx} pData={pData} ");
switch (iPropIdx)
{
case (int)ExtendPropertyClass.EXTPROPIDX_BASE:
Assets/PerfectWorld/Scripts/NPC/CECMonster.cs
-1
View File
@@ -18,7 +18,6 @@ public class CECMonster : CECNPC
public override bool Init(int tid, in info_npc info, ReadOnlySpan<byte> packet, int infoOffset)
{
base.Init(tid, info, packet, infoOffset);
//BrewMonster.BMLogger.Log("HoangDev: MonsterInit");
var pDB = ElementDataManProvider.GetElementDataMan();
DATA_TYPE DataType = default;
m_pDBEssence = (MONSTER_ESSENCE)pDB.get_data_ptr((uint)tid, ID_SPACE.ID_SPACE_ESSENCE, ref DataType);
Assets/PerfectWorld/Scripts/NPC/CECNPC.cs
-6
View File
@@ -167,7 +167,6 @@ public class CECNPC : CECObject
// ACHAR thường là UTF-16LE → len là số byte
var nameBytes = r.ReadBytes(len);
m_strName = System.Text.Encoding.Unicode.GetString(nameBytes);
// BMLogger.LogError($"HoangDev:m_npcUI = {m_npcUI}, NPC Name = " + m_strName);
if (m_npcUI != null)
{
m_npcUI.SetName(m_strName);
@@ -337,7 +336,6 @@ public class CECNPC : CECObject
{
// [中文] 添加新状态效果 GFX
// [English] Add new state GFX
BMLogger.Log($"[HoangDev NPC StateGFX] Playing: {strGFXFile}, hook: {pvs.GetHH()}");
m_pNPCModelPolicy.PlayGfx(strGFXFile,"HH_头顶" /*pvs.GetHH()*/);
}
}
@@ -389,7 +387,6 @@ public class CECNPC : CECObject
public void OnMsgAttackHostResult(int idHost, int nDamage, int nFlag, int nSpeed)
{
//BMLogger.LogError("HoangDev: OnMsgAttackHostResultNPC");
if (!IsDead())
{
// 🔹 Quay mặt về mục tiêu
@@ -856,7 +853,6 @@ public class CECNPC : CECObject
A3DVECTOR3 vPos = vDir * m_fMoveSpeed * deltaTime;
A3DVECTOR3 exPPos = vPos + vCurPos;
float fMoveDelta = Vector3.Magnitude(EC_Utility.ToVector3(exPPos) - EC_Utility.ToVector3(vCurPos));
BMLogger.LogMono(this, $"HoangDev: m_vServerPos:{m_vServerPos},vCurPos:{vCurPos},vDir:{vDir},fDist:{fDist},vPos:{vPos},fMoveDelta:{fMoveDelta}");
if (fMoveDelta >= fDist)
{
@@ -1455,7 +1451,6 @@ public class CECNPC : CECObject
public bool IsDirFixed() { return (m_dwStates & PlayerNPCState.GP_STATE_NPC_FIXDIR) != 0 ? true : false; }
public void ReleaseWork(int iWorkType)
{
//BrewMonster.BMLogger.LogError("HoangDev : ReleaseWorkl :"+ iWorkType);
Debug.Assert(iWorkType >= 0 && iWorkType < (int)WorkType.NUM_WORKTYPE);
switch (m_aWorks[iWorkType])
@@ -1678,7 +1673,6 @@ public class CECNPC : CECObject
public bool IsDead() { return (m_dwStates & PlayerNPCState.GP_STATE_CORPSE) != 0; }
public void PlayMoveAction(int iMoveMode)
{
//BrewMonster.BMLogger.LogError($"HoangDev: PlayMoveAction {iMoveMode}");
if (iMoveMode == (int)GPMoveMode.GP_MOVE_RUN || iMoveMode == (int)GPMoveMode.GP_MOVE_RETURN)
{
if (IsMonsterOrPet())
Assets/PerfectWorld/Scripts/NPC/CECNPCServer.cs
-1
View File
@@ -32,7 +32,6 @@ public class CECNPCServer : CECNPC
public override bool Init(int tid, in info_npc info, ReadOnlySpan<byte> packet, int infoOffset)
{
base.Init(tid, info, packet, infoOffset);
//BrewMonster.BMLogger.Log("HoangDev: MonsterInit");
var pDB = ElementDataManProvider.GetElementDataMan();
DATA_TYPE DataType = default;
var data = pDB.get_data_ptr((uint)tid, ID_SPACE.ID_SPACE_ESSENCE, ref DataType);
Assets/PerfectWorld/Scripts/NPC/NPCVisual.cs
-14
View File
@@ -19,13 +19,10 @@ public class NPCVisual : MonoBehaviour
public bool TryPlayAction(string animationName, CECAttackEvent cECAttackEvent, bool isHit = false, bool bRestart = true)
{
// BMLogger.LogMono(this, "HoangDev: TryPlayAction: " + animationName);
if (namedAnimancer == null) return false;
// BMLogger.LogMono(this, "HoangDev: namedAnimancer == null: " + animationName);
if (namedAnimancer.IsPlaying(animationName)) return false;
// BMLogger.LogMono(this, "HoangDev: namedAnimancerIsPlaying == null1: " + animationName);
_currentState = namedAnimancer.TryPlay(animationName, fadeTime);
if (isHit)
{
@@ -34,8 +31,6 @@ public class NPCVisual : MonoBehaviour
_currentState.Events.OnEnd = () => SetHitOnEnd(cECAttackEvent);
}
}
// if (_currentState != null)
// BMLogger.LogMono(this, "HoangDev: _currentState != null1: " + _currentState.Clip.name);
return _currentState != null;
}
private void SetHitOnEnd(CECAttackEvent cECAttackEvent)
@@ -57,14 +52,6 @@ public class NPCVisual : MonoBehaviour
}
private void OnClearComActFlagEvent(ClearComActFlagEvent @event)
{
// if (_currentState != null)
// BMLogger.LogError("HoangDev: OnClearComActFlagEvent _currentState:" + _currentState.Clip.name);
/*foreach (var state in _animationQueue)
{
BMLogger.LogMono(this,"HoangDev: OnClearComActFlagEvent state:" + state);
}
BMLogger.LogMono(this,"HoangDev: OnClearComActFlagEvent");*/
_animationQueue.Clear();
}
@@ -98,7 +85,6 @@ public class NPCVisual : MonoBehaviour
animName1 = _animationQueue.Peek();
if (_currentState.NormalizedTime < 1f) return;
string animName = _animationQueue.Dequeue();
BMLogger.LogMono(this,"HoangDev: PlayNext: " + animName);
_currentState = namedAnimancer.TryPlay(animName);
}
private void OnDestroy()
Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
-2
View File
@@ -2725,8 +2725,6 @@ namespace CSNetwork
{
gamedatasend gamedatasend = new gamedatasend();
gamedatasend.Data = C2SCommandFactory.CreateNPCSevLearnSkillCmd(idSkill);
// BMLogger.LogError("HoangDev : c2s_SendCmdNPCSevLearnSkill gamedatasend.Data : " + gamedatasend.Data.Size);
// BMLogger.LogError("HoangDev : c2s_SendCmdNPCSevLearnSkill idSkill : " + idSkill);
SendProtocol(gamedatasend);
}
Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
-1
View File
@@ -173,7 +173,6 @@ namespace BrewMonster.Network
public void c2s_SendCmdStopMove(in Vector3 vDest, float fSpeed, int iMoveMode,
byte byDir, ushort wStamp, int iTime)
{
BMLogger.LogWarning("HoangDev : c2s_SendCmdStopMove");
Instance._gameSession.c2s_SendCmdStopMove(vDest, fSpeed, iMoveMode, byDir, wStamp, iTime);
}
public void c2s_CmdPlayerMove(in Vector3 vCurPos, in Vector3 vDest,
Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs
-1
View File
@@ -966,7 +966,6 @@ namespace BrewMonster
return false;
}
}
BMLogger.LogError("HoangDev: (CommandID)m_iCommand:"+(CommandID)m_iCommand);
switch ((CommandID)m_iCommand)
{
case CMD_SITDOWN: pHost.CmdSitDown(!pHost.IsSitting()); break;
Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs
-4
View File
@@ -180,7 +180,6 @@ namespace BrewMonster.Scripts.Skills
/// <param name="professionOverride">When set (anim test scene), filters catalog by this profession instead of querying host.</param>
public void Initialize(int? professionOverride)
{
//BMLogger.LogError("HoangDev CECHostSkillModel Initialize called");
// Çå¿ÕËùÓм¼ÄÜ£¬·ÀÖ¹ÒòΪ¶à¸ö½ÇÉ«µÇ¼µ¼ÖÂÖظ´¼ÓÔؼ¼ÄÜ
Release();
@@ -197,7 +196,6 @@ namespace BrewMonster.Scripts.Skills
}
public void ProcessServiceList()
{
//BMLogger.LogError("HoangDev: ProcessServiceList");
if (m_npcListData == null)
{
BMLogger.LogError("CECHostSkillModel::ProcessServiceList, m_npcListData is null.");
@@ -266,7 +264,6 @@ namespace BrewMonster.Scripts.Skills
// Do not Clear m_npcListData: Initialize() may run ProcessServiceList again after Release();
// clearing here left npcDataSize 0 on world re-entry. New packets replace m_npcListData in RecvNPCServiceList.
}
//BMLogger.LogError("HoangDev: m_npcListData.Size :"+ m_npcListData.Size);
}
private readonly HashSet<int> m_curServiceSkills = new HashSet<int>();
@@ -629,7 +626,6 @@ namespace BrewMonster.Scripts.Skills
private void Release()
{
//BMLogger.LogError("HoangDev CECHostSkillModel Release called");
m_allProfSkills.Clear();
// Dọn sạch tất cả dictionary / map
Assets/PerfectWorld/Scripts/Skills/SkillStubs1/skill81.cs
+2 -2
View File
@@ -128,8 +128,8 @@ namespace BrewMonster
m_AttHitMode = (GfxAttackMode)0;
m_dwFlyTime = 1000000;
m_bTraceTarget = false;
m_FlyClusterCount = 2;
m_FlyClusterInterval = 1;
m_FlyClusterCount = 1;
m_FlyClusterInterval = 0;
m_HitClusterCount = 1;
m_HitClusterInterval = 0;
m_bOneHit = false;
Assets/PerfectWorld/Scripts/Sound/AudioManager.cs
-1
View File
@@ -66,7 +66,6 @@ public class AudioManager : MonoBehaviour
IEnumerator FadeInBGM(AudioClip clip, float fadeTime)
{
// BMLogger.LogError($"HoangDev: FadeInBGM fadeTime {fadeTime} clip: {clip.name}" );
if (bgmSource.isPlaying)
yield return StartCoroutine(FadeOutBGM(fadeTime));
Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgDragDrop.cs
-2
View File
@@ -24,5 +24,3 @@ namespace BrewMonster
}
}
/*AString s = WC2AS(*pstr); // convert wide -> ansi/utf8 tùy macro bạn định nghĩa
a_LogOutput(0, "HoangDev: 1 n=%d, pstr=%s", n, static_cast <const char*>(s));*/
Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs
-5
View File
@@ -222,7 +222,6 @@ namespace BrewMonster.UI
CDlgSkillSubListItem subListItem = pSub;
if(subListItem == null )
{
// BMLogger.LogError("HoangDev: UpdateOneSubDlg subListItem is null for skillID " + skillID);
return;
}
subListItem.UpdateSkill(skillID);
@@ -281,24 +280,20 @@ namespace BrewMonster.UI
if (allRankProfSkills == null)
{
//BMLogger.LogError("HoangDev: AddDlgsOfOneRank allRankProfSkills is null");
return;
}
if (IsEvil() && taoistRank.IsGodRank())
{
//BMLogger.LogError("HoangDev: AddDlgsOfOneRank IsEvil() && taoistRank.IsGodRank()");
return;
}
else if (!IsEvil() && taoistRank.IsEvilRank())
{
//BMLogger.LogError("HoangDev: AddDlgsOfOneRank !IsEvil() && taoistRank.IsEvilRank()");
return;
}
if (!allRankProfSkills.TryGetValue(rankID, out var rankItr) || rankItr == null || rankItr.Count == 0)
{
//BMLogger.LogError($"HoangDev: AddDlgsOfOneRank !allRankProfSkills.TryGetValue({rankID}, out var rankItr) || rankItr == null || rankItr.Count == 0");
return;
}
Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
-4
View File
@@ -160,12 +160,10 @@ namespace BrewMonster
{
if (pHost.CheckSkillCastCondition(pSkill) == 0)
{
//BMLogger.LogError("HoangDev: QuickBar Skill Not Interact: " + (uint)pSkill.GetSkillID() + " : " + ElementSkill.GetIcon((uint)pSkill.GetSkillID()));
pCell.SetInteract(true);
}
else
{
//BMLogger.LogError("HoangDev: QuickBar Skill Interact: " + (uint)pSkill.GetSkillID() + " : " + ElementSkill.GetIcon((uint)pSkill.GetSkillID()));
pCell.SetInteract(false);
}
}
@@ -182,7 +180,6 @@ namespace BrewMonster
}
else
{
//BMLogger.LogError("HoangDev: QuickBar Skill CoolTime: " + (uint)pSkill.GetSkillID() + " : " + ElementSkill.GetIcon((uint)pSkill.GetSkillID()) + " CoolTime: " + pSkill.GetCoolingTime() + " CoolCnt: " + pSkill.GetCoolingCnt());
pClock.SetProgressPos(pSkill.GetCoolingTime() - pSkill.GetCoolingCnt());
}
}
@@ -459,7 +456,6 @@ namespace BrewMonster
if (pSkill != null)
{
pCell.gameObject.SetActive(true);
//BMLogger.Log("HoangDev: QuickBar Set Skill Icon: " + (uint)pSkill.GetSkillID() + " : " + ElementSkill.GetIcon((uint)pSkill.GetSkillID()));
var nameskill = ElementSkill.GetIcon((uint)pSkill.GetSkillID());
var slot = GetGameUIMan().SetCover(pCell, nameskill, EC_GAMEUI_ICONS.ICONS_SKILL);
if (slot is AUIImagePicture picture)
Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs
-3
View File
@@ -167,7 +167,6 @@ namespace BrewMonster
public void UpdateSkill(int skillID)
{
//BMLogger.LogError("HoangDev: CDlgSkillSubListItem UpdateSkill skillID " + skillID);
CECHostSkillModel model = CECHostSkillModel.Instance;
m_skillID = skillID;
m_curLevel = model.GetSkillCurrentLevel(m_skillID);
@@ -291,7 +290,6 @@ namespace BrewMonster
}
}
//if (m_skillID == 234)
// BMLogger.LogError($"HoangDev: UpdateUpgradeBtn m_skillID:{m_skillID} spOK=" + spOK + ", moneyOK=" + moneyOK + ", preSkillOK=" + preSkillOK);
if (spOK && moneyOK && preSkillOK)
{
m_upgradeDisabledReason = null;
@@ -320,7 +318,6 @@ namespace BrewMonster
}
else
{
BMLogger.LogError("HoangDev: UpdateUpgradeBtn Skill is not served by NPC m_skillID:" + m_skillID);
m_upgradeDisabledReason = GetStringFromTable(11321);
}
}
Assets/PerfectWorld/Scripts/UI/SkillUI/DlgAssignSlots.cs
-3
View File
@@ -98,7 +98,6 @@ namespace BrewMonster
{
ClearPendingActionAssign();
_pendingComboGroupIndex = -1;
// Debug.Log("HoangDev: CreateSkillShortcut: " + currentSelectedSlotIndex + " : " + assignedSkill.GetSkillID());
// CECShortcutSet pSCS = CECGameRun.Instance.GetHostPlayer().GetShortcutSet1(0);
a_pSCS[currentListIndex].CreateSkillShortcut(currentSelectedSlotIndex, assignedSkill);
@@ -429,7 +428,6 @@ namespace BrewMonster
if (pSkill != null)
{
pCell.gameObject.SetActive(true);
//BMLogger.Log("HoangDev: QuickBar Set Skill Icon: " + (uint)pSkill.GetSkillID() + " : " + ElementSkill.GetIcon((uint)pSkill.GetSkillID()));
var nameskill = ElementSkill.GetIcon((uint)pSkill.GetSkillID());
var slot = GetGameUIMan().SetCover(pCell, nameskill, EC_GAMEUI_ICONS.ICONS_SKILL);
if (slot is AUIImagePicture picture)
@@ -531,7 +529,6 @@ namespace BrewMonster
if (currentSelectedSlotIndex != -1)
{
CreateSkillShortcut();
Debug.Log($"HoangDev: OnAssignSkillSelectionChanged: AfterCreateSkillShortcut: assignedSkillIsNull={(assignedSkill == null)} slotIndex={currentSelectedSlotIndex}");
}
}
else
Assets/PerfectWorld/Scripts/_Doc/AnimationSceneSkillTest.md.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 988a714394c70ce49b1aefe7af834cbf
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/CECHostPlayer.Combat.cs
-1
View File
@@ -128,7 +128,6 @@ namespace BrewMonster
private void OnMsgHstHurtResult(ECMSG Msg)
{
//BMLogger.LogError("HoangDev : OnMsgHstHurtResult");
int cmd = Convert.ToInt32(Msg.dwParam2);
if (cmd == CommandID.BE_HURT)
{
Assets/Scripts/CECHostPlayer.HostCmd.cs
-1
View File
@@ -29,7 +29,6 @@ namespace BrewMonster
// 坐下 / 站起
public bool CmdSitDown(bool bSitDown)
{
BMLogger.LogError("HoangDev: CmdSitDown:"+bSitDown);
if (!CanDo(ActionCanDo.CANDO_SITDOWN))
return false;
Assets/Scripts/CECHostPlayer.Interaction.cs
-1
View File
@@ -135,7 +135,6 @@ namespace BrewMonster
int iAction = (int)PLAYER_ACTION_TYPE.ACT_STAND;
bool bSession = false;
BMLogger.LogError("HoangDev: idEmote "+idEmote);
// Select action according to pose
switch (idEmote)
{
Assets/Scripts/CECHostPlayer.Skill.cs
-1
View File
@@ -603,7 +603,6 @@ namespace BrewMonster
}*/
else if (GetEquipSkillByID(idSkill) == null)
{
BMLogger.LogError("HoangDev: pSkill " + pSkill);
}
else
{
Assets/Scripts/CECHostPlayer.World.cs
-2
View File
@@ -15,14 +15,12 @@ namespace BrewMonster
{
public void OnMsgHstCorrectPos(in ECMSG Msg)
{
//Debug.LogError("HoangDev : OnMsgHstCorrectPos");
byte[] buf = (byte[])Msg.dwParam1; // chỗ bạn lưu pDataBuf
GCHandle handle = GCHandle.Alloc(buf, GCHandleType.Pinned);
cmd_host_correct_pos pCmd = (cmd_host_correct_pos)Marshal.PtrToStructure(
handle.AddrOfPinnedObject(), typeof(cmd_host_correct_pos));
handle.Free();
//cmd_host_correct_pos pCmd = GPDataTypeHelper.FromBytes<cmd_host_correct_pos>((byte[])Msg.dwParam1);
// Debug.LogError("HoangDev :pCmd.pos " + pCmd.pos);
SetPos(pCmd.pos);
m_vVelocity.Clear();
m_CDRInfo.vAbsVelocity.Clear();
Assets/Scripts/CECHostPlayer.cs
+9 -8
View File
@@ -366,7 +366,6 @@ namespace BrewMonster
public async Task<bool> LoadResources()
{
//BMLogger.LogError("HoangDev: CECHostPlayer::LoadResources");
RoleInfo RoleInfo = UnityGameSession.Instance.GetRoleInfo();
m_iProfession = RoleInfo.occupation;
m_iGender = RoleInfo.gender;
@@ -496,7 +495,6 @@ namespace BrewMonster
public void ProcessMessage(in ECMSG Msg)
{
var msg = (int)Msg.dwMsg;
//Debug.LogError("HoangDev : ProcessMessageProcessMessageProcessMessage " + msg);
switch (msg)
{
case EC_MsgDef.MSG_HST_CORRECTPOS: OnMsgHstCorrectPos(Msg); break;
@@ -575,6 +573,7 @@ namespace BrewMonster
case EC_MsgDef.MSG_HST_COOLTIMEDATA: OnMsgHstCoolTimeData(Msg); break;
case EC_MsgDef.MSG_HST_PRESSCANCEL: OnMsgHstPressCancel(Msg); break;
case EC_MsgDef.MSG_PM_PLAYERFLY: OnMsgPlayerFly(Msg); break;
case EC_MsgDef.MSG_PM_PLAYERSITDOWN: OnMsgPlayerSitDown(Msg); break;
case EC_MsgDef.MSG_HST_PETOPT: OnMsgHstPetOpt(Msg); break;
case EC_MsgDef.MSG_HST_SETPLAYERLIMIT: OnMsgHstSetPlayerLimit(Msg); break;
case EC_MsgDef.MSG_PM_PLAYERMOUNT: OnMsgPlayerMount(Msg); break;
@@ -1312,7 +1311,6 @@ namespace BrewMonster
// Message MSG_HST_SELTARGET handler
void OnMsgHstSelTarget(ECMSG Msg)
{
//BMLogger.LogError("HoangDev: OnMsgHstSelTarget");
if (Convert.ToInt32(Msg.dwParam2) == CommandID.SELECT_TARGET)
{
var data = (byte[])Msg.dwParam1;
@@ -1337,6 +1335,7 @@ namespace BrewMonster
m_IncantCnt = new CECCounter();
m_IncantCnt.SetPeriod(1000);
m_IncantCnt.Reset(true);
InitBindCmdCoolCnt();
m_bEnterGame = false;
}
@@ -2106,14 +2105,12 @@ namespace BrewMonster
bRet = true;
if (idTarget == 0)
{
//BMLogger.LogError("HoangDev: HostPlayer Unsetlect npc");
UnityGameSession.c2s_CmdUnselect();
m_idSelTarget = 0;
m_idUCSelTarget = 0;
}
else
{
//BMLogger.LogError("HoangDev: HostPlayer setlect npc");
UnityGameSession.c2s_CmdSelectTarget(idTarget);
m_idSelTarget = idTarget;
m_idUCSelTarget = idTarget;
@@ -2394,7 +2391,10 @@ namespace BrewMonster
public bool GetPushDir(ref Vector3 vPushDir, uint dwMask, float deltaTime)
{
vPushDir = Vector3.zero;
if (joystick.Horizontal == 0 && joystick.Vertical == 0)
if (IsDead())
return false;
if (joystick == null || (joystick.Horizontal == 0 && joystick.Vertical == 0))
{
if (isPressMoveUp)
{
@@ -3381,7 +3381,7 @@ namespace BrewMonster
if (iPose == (int)RoleExpression.ROLEEXP_SITDOWN)
{
// UnityGameSession.c2s_CmdSessionEmote(iPose);
UnityGameSession.c2s_CmdSessionEmote(iPose);
}
else if (iPose == (int)RoleExpression.ROLEEXP_KISS)
{
@@ -3662,9 +3662,10 @@ namespace BrewMonster
m_PetOptCnt.IncCounter(iRealTime);
// Bind command cool counter
/* if (m_BindCmdCoolCnt.IncCounter(dwDeltaTime))
if (m_BindCmdCoolCnt.IncCounter(iRealTime))
m_BindCmdCoolCnt.Reset(true);
/*
// Auto fashion time counter
if (m_bAutoFashion && GetBoothState() != 2 && !IsShapeChanged())
{
Assets/Scripts/PlayerVisual.cs
-1
View File
@@ -222,7 +222,6 @@ namespace BrewMonster
{
return;
}
BMLogger.LogError("HoangDev animationName:"+animationName);
bool isState = namedAnimancer.States.TryGet(animationName, out var existingState) ? true : false;
if (isState)
{