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

fix follow feed back

Browse Source
This commit is contained in:
vuong dinh hoang
2026-05-29 18:00:26 +07:00
parent 91c544e013
commit c4156a4d6e
19 changed files with 5366 additions and 5275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AddressableAssetSettings.asset
+1
View File
@@ -18,6 +18,7 @@ MonoBehaviour:
Hash: 00000000000000000000000000000000
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 1
m_BundleLocalCatalog: 0
m_CatalogRequestsTimeout: 0
m_DisableCatalogUpdateOnStart: 1
m_InternalIdNamingMode: 0
Assets/AddressableAssetsData/AssetGroups/gfx.asset
+5 -6
View File
@@ -1643,12 +1643,6 @@ MonoBehaviour:
m_SerializedLabels:
- RemoteContent
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c90db784f47aca643935a0fc667ca7af
m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u51FB\u4E2D/\u706B\u6D77\u5200\u5C71\u51FB\u4E2D.gfx"
m_ReadOnly: 0
m_SerializedLabels:
- RemoteContent
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ca5346b8caa8687488cf931f4b844d1d
m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u51FB\u4E2D/\u6613\u9AD3\u7ECF.gfx"
m_ReadOnly: 0
@@ -1850,6 +1844,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e416cd04d1f2e5140a1d4d88ebb85eec
m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u51FB\u4E2D/\u517D\u738B\u9524\u51FB\u4E2D.gfx"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e4a3a2fd961acfe46b3718cd1e538ef6
m_Address: "gfx/\u4EBA\u7269/\u6280\u80FD/\u6B66\u4FA0/\u6D41\u6C3411.gfx"
m_ReadOnly: 0
Assets/Jianghu/Materials/Skill/LianShe/lightning006.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:
- _COLOROVERLAY_ON
- _DISSOLVETEXAR_ON
@@ -128,7 +132,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
@@ -136,7 +144,11 @@ Material:
- _DistortMainTex: 0
- _DistortMaskTex: 0
- _DistortTexAR: 1
- _DistortTexClampU: 0
- _DistortTexClampV: 0
- _DistortTexRotate: 0
- _DistortTexUSpeed: 0
- _DistortTexUVS: 0
- _DistortTexVSpeed: 0
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
@@ -162,10 +174,18 @@ Material:
- _LightingEnabled: 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
- _Mode: 4
Assets/Jianghu/Materials/Skill/Ling zhu fu/环2.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/Jianghu/Materials/Skill/Wu qi chao yuan/circle024.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/Jianghu/Materials/Skill/Wu qi chao yuan/circle025.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/Jianghu/Materials/Skill/Yinerbufa/yiji.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/Jianghu/Materials/Weapon/Hongse xiong jia 2 ji/particle018.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
+16 -16
View File
@@ -108,7 +108,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -5138,7 +5138,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -10047,7 +10047,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -14947,7 +14947,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -19856,7 +19856,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -24756,7 +24756,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -29665,7 +29665,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -34574,7 +34574,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -39483,7 +39483,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -44303,8 +44303,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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 5714356192760232229}
- {fileID: 526232056115809175}
@@ -49231,7 +49231,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -58974,7 +58974,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -63874,7 +63874,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -68783,7 +68783,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -73692,7 +73692,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
Assets/ModelRenderer/Art/Gfx/gfx/人物/技能/通用/爆气效果.prefab
+26 -26
View File
@@ -109,7 +109,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -5001,7 +5001,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -9893,7 +9893,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -14784,7 +14784,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -19675,7 +19675,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -24567,7 +24567,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -29459,7 +29459,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -34350,7 +34350,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -39241,7 +39241,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -44132,7 +44132,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -49023,7 +49023,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -53914,7 +53914,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -58806,7 +58806,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -63697,7 +63697,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -68589,7 +68589,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -73487,7 +73487,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -78378,7 +78378,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -83270,7 +83270,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -88161,7 +88161,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -93052,7 +93052,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -97943,7 +97943,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -102754,8 +102754,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: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 7830348339912292777}
- {fileID: 6196732834502978086}
@@ -107676,7 +107676,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -112567,7 +112567,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -117458,7 +117458,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/兽王锤击中.prefab
+5379 -5379
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: 96405357221afa34990f1c8b0ad64755
guid: e416cd04d1f2e5140a1d4d88ebb85eec
PrefabImporter:
externalObjects: {}
userData:
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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3763250113416586939}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -4870,8 +4870,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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3763250113416586939}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -9703,8 +9703,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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3763250113416586939}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -14594,8 +14594,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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3763250113416586939}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -19485,8 +19485,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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3763250113416586939}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -29157,8 +29157,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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3763250113416586939}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
Assets/ModelRenderer/Art/Gfx/gfx/策划联入/人物技能/击中/绞杀击中.prefab
+11 -11
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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3560172102593716626}
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: 2540375651237269291}
- {fileID: 4133947733084616118}
@@ -9699,8 +9699,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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3560172102593716626}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -14532,8 +14532,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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3560172102593716626}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -19423,8 +19423,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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3560172102593716626}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
@@ -24256,8 +24256,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.66, y: 0.66, z: 0.66}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3560172102593716626}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
Assets/ModelRenderer/Art/Materials/GFX/寒冰护甲/盾.mat
+1 -1
View File
@@ -203,7 +203,7 @@ Material:
- _DissolveColor: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FnlColor: {r: 1, g: 1, b: 1, a: 1}
- _MainColor: {r: 1, g: 1, b: 1, a: 1}
- _MainColor: {r: 4.2370944, g: 4.2370944, b: 4.2370944, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
Assets/PerfectWorld/Scene/AnimationTest.unity
+1 -1
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa95dfb364ee6af6d4dac2c026057bfbba33638c76305b26a1611c3aeb134847
oid sha256:ae9957c9fce4d6cc838683462ae73b1957d1729753cfb49f653ba366248d845f
size 150615
Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs
+43 -52
View File
@@ -11,7 +11,6 @@ using UnityEngine;
namespace BrewMonster
{
public class CECSkillGfxEvent : A3DSkillGfxEvent
{
protected EC_ManPlayer m_pPlayerMan; // 玩家管理器 / Player manager
@@ -136,7 +135,8 @@ namespace BrewMonster
}
catch (System.Exception ex)
{
BMLogger.LogError($"[SKILL_GFX_DEBUG] GetTargetCenter: Exception accessing target {m_nTargetID} - {ex.Message}");
BMLogger.LogError(
$"[SKILL_GFX_DEBUG] GetTargetCenter: Exception accessing target {m_nTargetID} - {ex.Message}");
// Return last known position or zero
// 返回最后已知位置或零
return m_vTargetPos != Vector3.zero ? m_vTargetPos : Vector3.zero;
@@ -196,7 +196,8 @@ namespace BrewMonster
pTargetPos.szHanger,
pTargetPos.bChildHook);
m_bTargetDirAndUpExist = _get_dir_and_up_by_id(m_pPlayerMan, m_pNPCMan, (int)m_nTargetID, out m_vTargetDir, out m_vTargetUp);
m_bTargetDirAndUpExist = _get_dir_and_up_by_id(m_pPlayerMan, m_pNPCMan, (int)m_nTargetID,
out m_vTargetDir, out m_vTargetUp);
}
else
{
@@ -235,26 +236,14 @@ 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();
//BMLogger.LogError($"[SKILL_GFX_DEBUG] Event.Tick: Registering gizmo - hostPos={m_vHostPos}, targetPos={m_vTargetPos}, currentPos={currentPos}, hostExist={m_bHostExist}, targetExist={m_bTargetExist}");
if (m_vHostPos.sqrMagnitude > 0.01f && m_vTargetPos.sqrMagnitude > 0.01f)
{
SkillGfxGizmoDrawer.RegisterProjectile(m_nHostID, m_nTargetID, m_vHostPos, m_vTargetPos, m_pMoveMethod.GetMode());
SkillGfxGizmoDrawer.RegisterProjectile(m_nHostID, m_nTargetID, m_vHostPos, m_vTargetPos,
m_pMoveMethod.GetMode());
}
#endif
@@ -360,25 +349,9 @@ 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);
Quaternion rot = prefab.transform.rotation;
#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);
m_flyGfxInstance = GameObject.Instantiate(prefab, pos, rot);
SFXManager.Instance?.PlaySkillSfxAtPointAsync(m_pComposer.GetFlySfxPath(), pos).Forget();
// If m_bTraceTarget is true, add to tracking list when spawned
@@ -397,6 +370,12 @@ namespace BrewMonster
{
if (m_flyGfxInstance == null) return;
m_flyGfxInstance.transform.position = m_pMoveMethod.GetPos();
// enumOnTarget effects stay at target with prefab-authored rotation (e.g. skill 182 hail)
// enumOnTarget特效在目标处保持预制体原始旋转（例如技能182冰雹）
if (m_pMoveMethod.GetMode() == GfxMoveMode.enumOnTarget)
return;
Vector3 dir = m_pMoveMethod.GetMoveDir();
if (dir.sqrMagnitude > 1e-4f)
m_flyGfxInstance.transform.rotation = Quaternion.LookRotation(dir);
@@ -470,7 +449,8 @@ namespace BrewMonster
if (prefab == null)
{
BMLogger.LogWarning($"[SKILL_GFX_DEBUG] SpawnHitGfx: {(bTargetExists ? "Hit" : "Ground Hit")} GFX prefab is NULL - cannot spawn!");
BMLogger.LogWarning(
$"[SKILL_GFX_DEBUG] SpawnHitGfx: {(bTargetExists ? "Hit" : "Ground Hit")} GFX prefab is NULL - cannot spawn!");
return;
}
}
@@ -494,6 +474,7 @@ namespace BrewMonster
if (string.IsNullOrEmpty(hitSfxPath))
hitSfxPath = m_pComposer.GetHitSfxPath();
}
SFXManager.Instance?.PlaySkillSfxAtPointAsync(hitSfxPath, vTarget).Forget();
// If m_bTraceTarget is true, add to tracking list (don't auto-destroy)
@@ -571,7 +552,6 @@ namespace BrewMonster
// pHitGfx->SetActualScale(pHitGfx->GetScale() * 2.0f);
m_pHitGfx = pHitGfx;
}*/
private static bool get_pos_by_id(
EC_ManPlayer pPlayerMan,
CECNPCMan pNPCMan,
@@ -631,10 +611,12 @@ namespace BrewMonster
if (pHook != null)
{
Transform modelTransform = goblinModel.transform;
vPos = HookUtils.GetHookWorldPosition(pHook, pOffset, bRelHook, modelTransform);
vPos = HookUtils.GetHookWorldPosition(pHook, pOffset, bRelHook,
modelTransform);
#if UNITY_EDITOR
BMLogger.Log($"[HOOK_DEBUG] Found goblin hook '{szHook}' for player ID {nID}, position={vPos}");
BMLogger.Log(
$"[HOOK_DEBUG] Found goblin hook '{szHook}' for player ID {nID}, position={vPos}");
#endif
return true;
}
@@ -648,7 +630,8 @@ namespace BrewMonster
vPos.y += 0.5f;
#if UNITY_EDITOR
BMLogger.Log($"[HOOK_DEBUG] Using goblin center position for player ID {nID}, position={vPos}");
BMLogger.Log(
$"[HOOK_DEBUG] Using goblin center position for player ID {nID}, position={vPos}");
#endif
return true;
}
@@ -675,7 +658,8 @@ namespace BrewMonster
if (pModel == null)
{
#if UNITY_EDITOR
BMLogger.LogWarning($"[HOOK_DEBUG] Player model not found for ID {nID}, hook '{szHook}'");
BMLogger.LogWarning(
$"[HOOK_DEBUG] Player model not found for ID {nID}, hook '{szHook}'");
#endif
break;
}
@@ -688,7 +672,8 @@ namespace BrewMonster
if (pModel == null)
{
#if UNITY_EDITOR
BMLogger.LogWarning($"[HOOK_DEBUG] Child model '{szHanger}' not found for player ID {nID}, hook '{szHook}'");
BMLogger.LogWarning(
$"[HOOK_DEBUG] Child model '{szHanger}' not found for player ID {nID}, hook '{szHook}'");
#endif
break;
}
@@ -700,7 +685,8 @@ namespace BrewMonster
if (pHook == null)
{
#if UNITY_EDITOR
BMLogger.LogWarning($"[HOOK_DEBUG] Hook '{szHook}' not found for player ID {nID}, falling back to center position");
BMLogger.LogWarning(
$"[HOOK_DEBUG] Hook '{szHook}' not found for player ID {nID}, falling back to center position");
#endif
break;
}
@@ -714,7 +700,8 @@ namespace BrewMonster
vPos = HookUtils.GetHookWorldPosition(pHook, pOffset, bRelHook, modelTransform);
#if UNITY_EDITOR
BMLogger.Log($"[HOOK_DEBUG] Found hook '{szHook}' for player ID {nID}, position={vPos}, relative={bRelHook}, offset={pOffset}");
BMLogger.Log(
$"[HOOK_DEBUG] Found hook '{szHook}' for player ID {nID}, position={vPos}, relative={bRelHook}, offset={pOffset}");
#endif
return true;
@@ -771,7 +758,8 @@ namespace BrewMonster
if (pModel == null)
{
#if UNITY_EDITOR
BMLogger.LogWarning($"[HOOK_DEBUG] Child model '{szHanger}' not found for NPC ID {nID}, hook '{szHook}'");
BMLogger.LogWarning(
$"[HOOK_DEBUG] Child model '{szHanger}' not found for NPC ID {nID}, hook '{szHook}'");
#endif
break;
}
@@ -783,7 +771,8 @@ namespace BrewMonster
if (pHook == null)
{
#if UNITY_EDITOR
BMLogger.LogWarning($"[HOOK_DEBUG] Hook '{szHook}' not found for NPC ID {nID}, falling back to center position");
BMLogger.LogWarning(
$"[HOOK_DEBUG] Hook '{szHook}' not found for NPC ID {nID}, falling back to center position");
#endif
break;
}
@@ -797,7 +786,8 @@ namespace BrewMonster
vPos = HookUtils.GetHookWorldPosition(pHook, pOffset, bRelHook, modelTransform);
#if UNITY_EDITOR
BMLogger.Log($"[HOOK_DEBUG] Found hook '{szHook}' for NPC ID {nID}, position={vPos}, relative={bRelHook}, offset={pOffset}");
BMLogger.Log(
$"[HOOK_DEBUG] Found hook '{szHook}' for NPC ID {nID}, position={vPos}, relative={bRelHook}, offset={pOffset}");
#endif
return true;
@@ -869,6 +859,7 @@ namespace BrewMonster
return true;
}
}
return false;
}
@@ -960,12 +951,10 @@ namespace BrewMonster
{
_instancesub = new SkillGfxMan(EC_Game.GetGameRun());
}
return _instancesub;
}
set
{
_instancesub = value;
}
set { _instancesub = value; }
}
private const int DEFAULT_EVENT_BUF_SIZE = 10; // 默认事件缓冲区大小 / Default event buffer size
@@ -1012,6 +1001,7 @@ namespace BrewMonster
base.Dispose();
InstanceSub = null;
}
public A3DSkillGfxEvent GetEmptyEvent(GfxMoveMode mode)
{
int modeIndex = (int)mode;
@@ -1136,6 +1126,7 @@ namespace BrewMonster
{
GameObject.Destroy(gfx);
}
m_TraceTargetGfxList.Remove(gfx);
m_TraceTargetGfxSkillMap.Remove(gfx);
}
@@ -1166,6 +1157,7 @@ namespace BrewMonster
nullKeys.Add(kvp.Key);
}
}
foreach (var key in nullKeys)
{
m_TraceTargetGfxSkillMap.Remove(key);
@@ -1392,4 +1384,3 @@ namespace BrewMonster
public SGC_POS_INFO m_HitPos = new SGC_POS_INFO(); // 命中位置信息 / Hit position info
}
}
Assets/PerfectWorld/Scripts/Vfx/CGfxOnTargetMove.cs
-20
View File
@@ -45,26 +45,6 @@ namespace BrewMonster
{
m_vOffset = Vector3.zero;
}
#region agent log
#if UNITY_EDITOR || DEVELOPMENT_BUILD
DebugSessionLog.Write("CGfxOnTargetMove.StartMove", "on_target_start", "F",
new DebugSessionPayload
{
spawnX = m_vPos.x,
spawnY = m_vPos.y,
spawnZ = m_vPos.z,
targetX = vTarget.x,
targetY = vTarget.y,
targetZ = vTarget.z,
radius = m_fRadius,
offsetMag = m_vOffset.magnitude,
isCluster = m_bOneOfCluser,
isArea = m_bArea,
frame = Time.frameCount
});
#endif
#endregion
}
/// <summary>
Assets/Resources/DebugCmdHistory.json
+2 -2
View File
@@ -5,14 +5,14 @@
"param": 73125,
"hasParam": true,
"describe": "NoCooldown",
"lastUsedUtcTicks": 639156245789367476
"lastUsedUtcTicks": 639156347373042511
},
{
"header": 1992,
"param": 0,
"hasParam": false,
"describe": "Buff rage",
"lastUsedUtcTicks": 639156245763379689
"lastUsedUtcTicks": 639156346405221629
},
{
"header": 2000,