fix gfx levelup
This commit is contained in:
@@ -156,7 +156,7 @@ MonoBehaviour:
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 27efa9095a9bdd049b5f8e9ad441583c
|
||||
m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u51FB\u4E2D/\u8346\u68D8\u7B26\u51FB\u4E2D.gfx"
|
||||
m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u98DE\u884C/\u8346\u68D8\u7B26\u51FB\u4E2D.gfx"
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
@@ -236,7 +236,7 @@ MonoBehaviour:
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 3f8220f959ce0d14b881e63f9d628582
|
||||
m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u51FB\u4E2D/\u6B8B\u4F53\u5492\u51FB\u4E2D.gfx"
|
||||
m_Address: "gfx/\u7B56\u5212\u8054\u5165/\u4EBA\u7269\u6280\u80FD/\u98DE\u884C/\u6B8B\u4F53\u5492\u51FB\u4E2D.gfx"
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -12,6 +12,10 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: "\u89D2\u8272\u5347\u7EA7\u4EBA\u7C7B Variant"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2012129612555199890, guid: feaf190f48ec05741ad3801331ed8508, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3242001840766556792, guid: feaf190f48ec05741ad3801331ed8508, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
@@ -88,4 +92,5 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
_vfx: {fileID: 561032351675239899}
|
||||
_lifeTime: 7
|
||||
_isLoopVfx: 0
|
||||
m_iState: 0
|
||||
|
||||
@@ -27,7 +27,7 @@ Transform:
|
||||
m_GameObject: {fileID: 3603010962484759314}
|
||||
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.75, y: -0, z: -0.47}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
|
||||
@@ -352,7 +352,7 @@ namespace BrewMonster
|
||||
Quaternion rot = dir.sqrMagnitude > 1e-4f ? Quaternion.LookRotation(dir) : Quaternion.identity;*/
|
||||
|
||||
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
|
||||
|
||||
@@ -940,7 +940,7 @@ namespace BrewMonster
|
||||
if (SkillGfxMan.InstanceSub != null)
|
||||
SkillGfxMan.InstanceSub.RemoveAllTraceTargetGfx();
|
||||
|
||||
/*bool bLeft = false;
|
||||
bool bLeft = false;
|
||||
CECModel pWeapon = null;
|
||||
if (IsWeaponHookPos(pvs.GetHH(), out bLeft, out pWeapon))
|
||||
{
|
||||
@@ -957,7 +957,7 @@ namespace BrewMonster
|
||||
// [中文] 模型上的效果
|
||||
// [English] GFX on player model
|
||||
RemoveGfx(strGFXFile, pvs.GetHH(), (uint)PLAYERMODEL_TYPE.PLAYERMODEL_TYPEALL);
|
||||
}*/
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1066,6 +1066,7 @@ 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);
|
||||
@@ -2921,7 +2922,11 @@ namespace BrewMonster
|
||||
{
|
||||
if (string.IsNullOrEmpty(path)) return;
|
||||
string key = path + hook;
|
||||
// if (_stateGfxObjects.ContainsKey(key)) return;
|
||||
if (_stateGfxObjects.TryGetValue(key, out GameObject gfx))
|
||||
{
|
||||
gfx.GetComponent<ParticleSystem>().Play();
|
||||
return;
|
||||
};
|
||||
// path = "gfx/人物/技能/武侠/万剑诀预备.gfx";
|
||||
|
||||
GameObject prefab = await AddressableManager.Instance.LoadPrefabAsync(path);
|
||||
@@ -2938,10 +2943,9 @@ namespace BrewMonster
|
||||
|
||||
GameObject vfx = Instantiate(prefab, parent);
|
||||
if (vfx == null) return;
|
||||
|
||||
vfx.transform.localPosition = Vector3.zero;
|
||||
|
||||
// _stateGfxObjects[key] = vfx;
|
||||
_stateGfxObjects[key] = vfx;
|
||||
// BMLogger.Log($"[HoangDev StateGFX] Playing: {path}, hook: {hook}, scale: {fScale}");
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,25 @@
|
||||
{
|
||||
"items": [
|
||||
{
|
||||
"header": 2000,
|
||||
"param": 0,
|
||||
"hasParam": false,
|
||||
"describe": "Up Level",
|
||||
"lastUsedUtcTicks": 639136623463073402
|
||||
},
|
||||
{
|
||||
"header": 1992,
|
||||
"param": 0,
|
||||
"hasParam": false,
|
||||
"describe": "Buff rage",
|
||||
"lastUsedUtcTicks": 639134653927186702
|
||||
"lastUsedUtcTicks": 639136573213427110
|
||||
},
|
||||
{
|
||||
"header": 8903,
|
||||
"param": 73125,
|
||||
"hasParam": true,
|
||||
"describe": "NoCooldown",
|
||||
"lastUsedUtcTicks": 639136557491801533
|
||||
},
|
||||
{
|
||||
"header": 1988,
|
||||
@@ -13,20 +27,6 @@
|
||||
"hasParam": false,
|
||||
"describe": "Greedisgood",
|
||||
"lastUsedUtcTicks": 639123542756797721
|
||||
},
|
||||
{
|
||||
"header": 2000,
|
||||
"param": 0,
|
||||
"hasParam": false,
|
||||
"describe": "Up Level",
|
||||
"lastUsedUtcTicks": 639123542578681278
|
||||
},
|
||||
{
|
||||
"header": 8903,
|
||||
"param": 73125,
|
||||
"hasParam": true,
|
||||
"describe": "NoCooldown",
|
||||
"lastUsedUtcTicks": 639123542141980400
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -517,7 +517,7 @@ namespace BrewMonster
|
||||
public bool ApplySkillShortcut(int idSkill, bool bCombo = false /* false */,
|
||||
int idSelTarget = 0 /* 0 */, int iForceAtk = -1 /* -1 */)
|
||||
{
|
||||
// Debug.LogError($"ApplySkillShortcut: Skill 167 detected, calling idSkill :"+ idSkill);
|
||||
// Debug.LogError($"ApplySkillShortcut: Skill detected, calling idSkill :"+ idSkill);
|
||||
|
||||
//StackChecker::ACTrace(4);
|
||||
// Debug.Log($"[SKILL_CAST_DEBUG] ApplySkillShortcut: Entry, skillID={idSkill}, bCombo={bCombo}, idSelTarget={idSelTarget}, iForceAtk={iForceAtk}, " +
|
||||
|
||||
@@ -2916,8 +2916,8 @@ namespace BrewMonster
|
||||
// // Get all extend properties
|
||||
// pSession.c2s_CmdGetExtProps();
|
||||
|
||||
// if (m_pLevelUpGFX)
|
||||
// m_pLevelUpGFX.Start(true);
|
||||
// if (m_pLevelUpGFX)
|
||||
// m_pLevelUpGFX.Start(true);
|
||||
PlayGfx(EC_Resource.res_GFXFile((int)GfxResourceType.RES_GFX_LEVELUP), null, 1f, 1); //PLAYERMODEL_TYPEALL
|
||||
|
||||
EventBus.Publish(new HostPlayerLevelUpUIEvent());
|
||||
|
||||
Reference in New Issue
Block a user