diff --git a/Assets/PerfectWorld/Prefab/UI/ButtonSkill.prefab b/Assets/PerfectWorld/Prefab/UI/ButtonSkill.prefab index 3483c34288..c928ffce00 100644 --- a/Assets/PerfectWorld/Prefab/UI/ButtonSkill.prefab +++ b/Assets/PerfectWorld/Prefab/UI/ButtonSkill.prefab @@ -87,7 +87,7 @@ GameObject: - component: {fileID: 2690941580050673919} - component: {fileID: 4280331804577109228} m_Layer: 5 - m_Name: Image + m_Name: ImageLock m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -170,7 +170,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5717981154351234976 RectTransform: m_ObjectHideFlags: 0 @@ -221,6 +221,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ClockIcon: {fileID: 4280331804577109228} + m_iMin: 0 + m_iMax: 0 + m_iPos: 0 --- !u!222 &1012268097730980895 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs index 2386436704..df56adc1af 100644 --- a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs +++ b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs @@ -153,6 +153,8 @@ namespace BrewMonster.Managers + + diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs b/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs index 5087821949..f37a48d445 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs @@ -148,6 +148,7 @@ namespace BrewMonster if (m_bCooling) { + BMLogger.LogError($"CECSkill Tick m_bCooling: = {m_bCooling}, m_iCoolCnt={m_iCoolCnt}"); // In cooling state m_iCoolCnt -= tickTime; if (m_iCoolCnt <= 0) @@ -321,7 +322,6 @@ namespace BrewMonster public float GetCastRange(float fAtkDist, float fPrayDistancePlus) { - BMLogger.LogError($"HoangDev: GetCastRange {m_pSkillCore}"); return m_pSkillCore != null ? m_pSkillCore.GetPrayRange(fAtkDist, fPrayDistancePlus) : 0f; } public string GetEffect() diff --git a/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs b/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs index 93a73831bc..5156504fe2 100644 --- a/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs +++ b/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs @@ -138,8 +138,7 @@ namespace BrewMonster s_allTaoistRanks[i] = new CECTaoistRank(); } s_allTaoistRanks[i].m_id = TaoistRankIDs[i]; - /* s_allTaoistRanks[i].m_name = - g_pGame->GetGameRun()->GetUIManager()->GetInGameUIMan()->GetStringFromTable(1001 + s_allTaoistRanks[i].m_id);*/ + s_allTaoistRanks[i].m_name = CECUIManager.Instance.GetInGameUIMan().GetStringFromTable(1001 + s_allTaoistRanks[i].m_id); if (i != (int)ToaistRank.BaseRankCount - 1 && i != (int)ToaistRank.BaseRankCount + (int)ToaistRank.GodRankCount - 1 && i != (int)ToaistRank.TotalRankCount - 1) diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs index 421504404f..88403766c2 100644 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GPDataType.cs @@ -1728,6 +1728,11 @@ namespace CSNetwork.GPDataType public int cooldown; public int max_cooltime; } + public struct cmd_set_cooldown + { + public int cooldown_index; + public int cooldown_time; + }; [StructLayout(LayoutKind.Sequential, Pack = 1)] // sizeof = 36 với padding 1 byte sau dir public struct cmd_npc_info_00 diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs index bb5d3acead..fc9da43662 100644 --- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs +++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs @@ -367,6 +367,7 @@ namespace CSNetwork // pAutoTeam.OnPrtcAutoTeamSetGoalRe((AutoTeamSetGoal_Re)protocol); } break; + default: _logger.Log(LogType.Warning, $"Received unhandled protocol type: {protocol.GetPType()}"); break; @@ -783,6 +784,9 @@ namespace CSNetwork case CommandID.MINE_GATHERED: EC_ManMessage.PostMessage(EC_MsgDef.MSG_PM_PLAYERGATHER, MANAGER_INDEX.MAN_PLAYER, -1, pDataBuf, pCmdHeader); break; + case CommandID.COOLTIME_DATA: + EC_ManMessage.PostMessage(EC_MsgDef.MSG_HST_COOLTIMEDATA, MANAGER_INDEX.MAN_PLAYER, 0, pDataBuf, pCmdHeader); + break; } } diff --git a/Assets/PerfectWorld/Scripts/Skills/skill.cs b/Assets/PerfectWorld/Scripts/Skills/skill.cs index 9012091f41..f22b7908d2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill.cs @@ -100,11 +100,9 @@ namespace BrewMonster.Scripts.Skills player.SetPrayrangeplus(prayplus); if (stub.type == (int)skill_type.TYPE_ATTACK || stub.type == (int)skill_type.TYPE_CURSE) { - BMLogger.LogError($"HoangDev: GetPrayRange AutoAttack {stub.auto_attack}"); if (stub.auto_attack) { float r = 0.3f * stub.GetPraydistance(this); - BMLogger.LogError($"HoangDev: r={r} "); if (r >= 1.0) return stub.GetPraydistance(this) - 1.0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill7.cs b/Assets/PerfectWorld/Scripts/Skills/skill7.cs index 5b7b2a4981..a099524133 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill7.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill7.cs @@ -182,6 +182,8 @@ namespace BrewMonster + + diff --git a/Assets/PerfectWorld/Scripts/Skills/skill8.cs b/Assets/PerfectWorld/Scripts/Skills/skill8.cs index e7732dc28d..a8600ecfd4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill8.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill8.cs @@ -180,6 +180,8 @@ namespace BrewMonster + + diff --git a/Assets/PerfectWorld/Scripts/Skills/skill9.cs b/Assets/PerfectWorld/Scripts/Skills/skill9.cs index a09098916c..03f7b9b796 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill9.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill9.cs @@ -119,6 +119,8 @@ namespace BrewMonster + + diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs index 56b63569bf..f8261cb92e 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs @@ -136,7 +136,7 @@ namespace BrewMonster.UI // ��ʼ�����������ڶԻ���һ���Է�����ڴ� / Initialize rank sub-dialogs once to avoid realloc private void CreateOneRankDlg(CECTaoistRank taoistRank) { - AUISubDialog pSubRank = Instantiate(m_pSubRank, m_contentRoot,transform); + AUISubDialog pSubRank = Instantiate(m_pSubRank, m_contentRoot, transform); pSubRank.SetName($"{m_pSubRank.GetName()}{taoistRank.GetID()}"); pSubRank.Show(false); @@ -175,7 +175,7 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetGodRankEnd(); taoistRank = taoistRank.GetNext()) { - BMLogger.LogError("CDlgSkillSubList::ResetDialog: Adding GetGodRankBegin rank "+ taoistRank.GetID()); + BMLogger.LogError("CDlgSkillSubList::ResetDialog: Adding GetGodRankBegin rank " + taoistRank.GetID()); AddDlgsOfOneRank(taoistRank); } @@ -234,11 +234,7 @@ namespace BrewMonster.UI //pSub.SetPos(0f, m_curBottom); //m_curBottom += m_rankHeight * m_windowScale; - TextMeshProUGUI label = pSub.GetComponentInChildren(true); - if (label != null) - { - label.text = CECTaoistRank.GetTaoistRank(rankID).GetName(); - } + pSub.SetLabel(CECTaoistRank.GetTaoistRank(rankID).GetName()); } // ����һ�����ܶԻ��򣬵��øú����������UpdateOneSubDlg / Add a skill sub dialog then update it diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs index 52c2ce7b69..f14d9af11d 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs @@ -10,7 +10,7 @@ using UnityEngine.UI; namespace BrewMonster { - public class CdlgQuickBar : MonoBehaviour + public class CDlgQuickBar : MonoBehaviour { //[SerializeField] List m_aSkillImage = new List(); //[SerializeField] List