diff --git a/Assets/Jianghu/Materials/Liehuo Fu/Fu.mat b/Assets/Jianghu/Materials/Liehuo Fu/Fu.mat index 7769a57ac5..f7f7021416 100644 --- a/Assets/Jianghu/Materials/Liehuo Fu/Fu.mat +++ b/Assets/Jianghu/Materials/Liehuo Fu/Fu.mat @@ -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 diff --git a/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs b/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs index 4e3a45eb2a..0f4bc4d2d0 100644 --- a/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs +++ b/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs @@ -288,7 +288,6 @@ namespace BrewMonster.Scripts /// public async Task LoadAudioClipAsync(string assetPath) { - // BMLogger.LogError($"HoangDEv : AddressableManager: LoadAudioClipAsync called with assetPath: {assetPath}"); RemoveFromReleaseAssetDictionary(assetPath); if (_loadedAudioAssets.TryGetValue(assetPath, out _loadedAudioClipHandle)) diff --git a/Assets/PerfectWorld/Scripts/Managers/CECAttacksMan.cs b/Assets/PerfectWorld/Scripts/Managers/CECAttacksMan.cs index 0a2d336dbd..272e1a12f4 100644 --- a/Assets/PerfectWorld/Scripts/Managers/CECAttacksMan.cs +++ b/Assets/PerfectWorld/Scripts/Managers/CECAttacksMan.cs @@ -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("GFX/" + "PlaceHolder"); @@ -1432,7 +1429,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; diff --git a/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs b/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs index 059d0e5ec2..475b2e2091 100644 --- a/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs +++ b/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs @@ -352,7 +352,6 @@ 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 diff --git a/Assets/PerfectWorld/Scripts/Move/CECHostMove.cs b/Assets/PerfectWorld/Scripts/Move/CECHostMove.cs index 3577fe347e..fb2bc0b6a9 100644 --- a/Assets/PerfectWorld/Scripts/Move/CECHostMove.cs +++ b/Assets/PerfectWorld/Scripts/Move/CECHostMove.cs @@ -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) diff --git a/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs b/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs index b574175c58..79ad2101aa 100644 --- a/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs +++ b/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs @@ -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) @@ -2676,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; } @@ -3105,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（武器挂点逻辑未接入，暂存桩） @@ -3205,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: diff --git a/Assets/PerfectWorld/Scripts/NPC/CECMonster.cs b/Assets/PerfectWorld/Scripts/NPC/CECMonster.cs index af051e4245..b965fb90ec 100644 --- a/Assets/PerfectWorld/Scripts/NPC/CECMonster.cs +++ b/Assets/PerfectWorld/Scripts/NPC/CECMonster.cs @@ -18,7 +18,6 @@ public class CECMonster : CECNPC public override bool Init(int tid, in info_npc info, ReadOnlySpan 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); diff --git a/Assets/PerfectWorld/Scripts/NPC/CECNPC.cs b/Assets/PerfectWorld/Scripts/NPC/CECNPC.cs index dd4ca6e96c..0c66ce1fb7 100644 --- a/Assets/PerfectWorld/Scripts/NPC/CECNPC.cs +++ b/Assets/PerfectWorld/Scripts/NPC/CECNPC.cs @@ -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()) @@ -1906,7 +1900,7 @@ public class CECNPC : CECObject if (animancer != null) { m_pNPCCECModel.SetNamedAnimancerComponent(animancer); - } + } } } diff --git a/Assets/PerfectWorld/Scripts/NPC/CECNPCServer.cs b/Assets/PerfectWorld/Scripts/NPC/CECNPCServer.cs index ba314c8b5c..817effef0e 100644 --- a/Assets/PerfectWorld/Scripts/NPC/CECNPCServer.cs +++ b/Assets/PerfectWorld/Scripts/NPC/CECNPCServer.cs @@ -32,7 +32,6 @@ public class CECNPCServer : CECNPC public override bool Init(int tid, in info_npc info, ReadOnlySpan 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); diff --git a/Assets/PerfectWorld/Scripts/NPC/NPCVisual.cs b/Assets/PerfectWorld/Scripts/NPC/NPCVisual.cs index 6a544d802f..e42f2c3b3a 100644 --- a/Assets/PerfectWorld/Scripts/NPC/NPCVisual.cs +++ b/Assets/PerfectWorld/Scripts/NPC/NPCVisual.cs @@ -19,23 +19,18 @@ 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) - { + { if(_currentState != null) { _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() diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs index 9ba8cf2025..954b385052 100644 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs @@ -2710,8 +2710,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); } diff --git a/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs b/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs index 6c95b6d15d..7bc4f25a04 100644 --- a/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs +++ b/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs @@ -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, @@ -658,7 +657,6 @@ namespace BrewMonster.Network public static void c2s_CmdSitDown() { - BMLogger.LogError("HoangDev: c2s_CmdSitDown"); Instance._gameSession.c2s_SendCmdSitDown(); } diff --git a/Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs b/Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs index d5d1f683f6..cc17ea7a96 100644 --- a/Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs +++ b/Assets/PerfectWorld/Scripts/Objet/Shortcut/CECShortcutSet.cs @@ -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; diff --git a/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs b/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs index 1d0a72b644..97be7203c8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs +++ b/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs @@ -180,7 +180,6 @@ namespace BrewMonster.Scripts.Skills /// When set (anim test scene), filters catalog by this profession instead of querying host. 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 m_curServiceSkills = new HashSet(); @@ -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 diff --git a/Assets/PerfectWorld/Scripts/Sound/AudioManager.cs b/Assets/PerfectWorld/Scripts/Sound/AudioManager.cs index ea68f06c2b..b09c9f421f 100644 --- a/Assets/PerfectWorld/Scripts/Sound/AudioManager.cs +++ b/Assets/PerfectWorld/Scripts/Sound/AudioManager.cs @@ -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)); diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgDragDrop.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgDragDrop.cs index 41350d063c..828778e9d1 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgDragDrop.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgDragDrop.cs @@ -11,7 +11,7 @@ namespace BrewMonster { if (Input.GetKeyDown(KeyCode.S) ) OnSkillDragDrop(); - } + } #endif public void OnSkillDragDrop() { @@ -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 (s));*/ \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs index 934e9787fa..bd749400e9 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs @@ -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; } diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs index 4feadad966..f500f26b99 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs @@ -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) diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs index c06c7d3e5d..1da346a909 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs @@ -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); } } diff --git a/Assets/PerfectWorld/Scripts/UI/SkillUI/DlgAssignSlots.cs b/Assets/PerfectWorld/Scripts/UI/SkillUI/DlgAssignSlots.cs index c22c24898d..bbd7a7db06 100644 --- a/Assets/PerfectWorld/Scripts/UI/SkillUI/DlgAssignSlots.cs +++ b/Assets/PerfectWorld/Scripts/UI/SkillUI/DlgAssignSlots.cs @@ -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 diff --git a/Assets/Scripts/CECHostPlayer.Combat.cs b/Assets/Scripts/CECHostPlayer.Combat.cs index 03830871ed..f47beb2877 100644 --- a/Assets/Scripts/CECHostPlayer.Combat.cs +++ b/Assets/Scripts/CECHostPlayer.Combat.cs @@ -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) { diff --git a/Assets/Scripts/CECHostPlayer.HostCmd.cs b/Assets/Scripts/CECHostPlayer.HostCmd.cs index 229e964fe1..6b7495c0d8 100644 --- a/Assets/Scripts/CECHostPlayer.HostCmd.cs +++ b/Assets/Scripts/CECHostPlayer.HostCmd.cs @@ -29,7 +29,6 @@ namespace BrewMonster // 坐下 / 站起 public bool CmdSitDown(bool bSitDown) { - BMLogger.LogError("HoangDev: CmdSitDown:"+bSitDown); if (!CanDo(ActionCanDo.CANDO_SITDOWN)) return false; diff --git a/Assets/Scripts/CECHostPlayer.Interaction.cs b/Assets/Scripts/CECHostPlayer.Interaction.cs index 1fa25b3a17..c49bd9e17a 100644 --- a/Assets/Scripts/CECHostPlayer.Interaction.cs +++ b/Assets/Scripts/CECHostPlayer.Interaction.cs @@ -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) { diff --git a/Assets/Scripts/CECHostPlayer.Skill.cs b/Assets/Scripts/CECHostPlayer.Skill.cs index 07d923e504..4dae2e9cb6 100644 --- a/Assets/Scripts/CECHostPlayer.Skill.cs +++ b/Assets/Scripts/CECHostPlayer.Skill.cs @@ -603,7 +603,6 @@ namespace BrewMonster }*/ else if (GetEquipSkillByID(idSkill) == null) { - BMLogger.LogError("HoangDev: pSkill " + pSkill); } else { diff --git a/Assets/Scripts/CECHostPlayer.World.cs b/Assets/Scripts/CECHostPlayer.World.cs index ac98b65b39..5247a3a96f 100644 --- a/Assets/Scripts/CECHostPlayer.World.cs +++ b/Assets/Scripts/CECHostPlayer.World.cs @@ -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((byte[])Msg.dwParam1); - // Debug.LogError("HoangDev :pCmd.pos " + pCmd.pos); SetPos(pCmd.pos); m_vVelocity.Clear(); m_CDRInfo.vAbsVelocity.Clear(); diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs index b0ddb19f6b..032f95da30 100644 --- a/Assets/Scripts/CECHostPlayer.cs +++ b/Assets/Scripts/CECHostPlayer.cs @@ -359,7 +359,6 @@ namespace BrewMonster public async Task LoadResources() { - //BMLogger.LogError("HoangDev: CECHostPlayer::LoadResources"); RoleInfo RoleInfo = UnityGameSession.Instance.GetRoleInfo(); m_iProfession = RoleInfo.occupation; m_iGender = RoleInfo.gender; @@ -489,7 +488,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; @@ -1303,7 +1301,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; @@ -2098,14 +2095,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; @@ -3376,7 +3371,6 @@ namespace BrewMonster if (iPose == (int)RoleExpression.ROLEEXP_SITDOWN) { - BMLogger.LogError("HoangDev: c2s_CmdSessionEmote: "+iPose); UnityGameSession.c2s_CmdSessionEmote(iPose); } else if (iPose == (int)RoleExpression.ROLEEXP_KISS) diff --git a/Assets/Scripts/PlayerVisual.cs b/Assets/Scripts/PlayerVisual.cs index fe2f99d56b..c692b101c2 100644 --- a/Assets/Scripts/PlayerVisual.cs +++ b/Assets/Scripts/PlayerVisual.cs @@ -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) {