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

for test

Browse Source
This commit is contained in:
VDH
2026-01-06 19:36:22 +07:00
parent 9fed589a9e
commit 4aeae053b9
11 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/PerfectWorld/Scripts/Managers/CECManager.cs
+1
View File
@@ -155,5 +155,6 @@ namespace BrewMonster.Managers
Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs
+1 -2
View File
@@ -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)
Assets/PerfectWorld/Scripts/Skills/skill7.cs
+1
View File
@@ -184,5 +184,6 @@ namespace BrewMonster
Assets/PerfectWorld/Scripts/Skills/skill8.cs
+1
View File
@@ -182,5 +182,6 @@ namespace BrewMonster
Assets/PerfectWorld/Scripts/Skills/skill9.cs
+1
View File
@@ -121,5 +121,6 @@ namespace BrewMonster
Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs
+3 -7
View File
@@ -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<TextMeshProUGUI>(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
Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
-2
View File
@@ -103,11 +103,9 @@ namespace BrewMonster
pClock.SetProgressRange(0, pSkill.GetCoolingTime());
if (pHost.GetPrepSkill() == pSkill)
{
BMLogger.Log("HoangDev: Skill is preparing cast, so set cooling time to 0");
pClock.SetProgressPos(0); }
else
{
BMLogger.LogError($"HoangDev: GetCoolingTime:{pSkill.GetCoolingTime()}, GetCoolingCnt: {pSkill.GetCoolingCnt()} ");
pClock.SetProgressPos(pSkill.GetCoolingTime() - pSkill.GetCoolingCnt());
}
}
Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUIClockIcon.cs
-1
View File
@@ -17,7 +17,6 @@ namespace BrewMonster
m_iPos = Math.Clamp(progress, m_iMin, m_iMax);
UpdateClockIcon();
BMLogger.LogError("AUIClockIcon SetProgressPos ");
}
public void SetProgressRange(int min, int max)
{
Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs
+9 -1
View File
@@ -10,6 +10,8 @@ namespace BrewMonster
[SerializeField] private AUIDialog m_subDialog;
[SerializeField] private RectTransform m_rectTransform;
[SerializeField] private TextMeshProUGUI levelName;
[SerializeField] private TextMeshProUGUI label;
private int m_data;
private void Reset()
@@ -43,7 +45,13 @@ namespace BrewMonster
{
name = newName;
}
public void SetLabel(string strLabel)
{
if (label != null)
{
label.text = strLabel;
}
}
public Vector2Int GetSize()
{
if (m_rectTransform == null)
Assets/Prefabs/UI/SkillUI.prefab
+9 -9
View File
@@ -2079,9 +2079,9 @@ RectTransform:
- {fileID: 4504331075840543341}
m_Father: {fileID: 1361524257611413148}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 108.9562, y: -31.05}
m_SizeDelta: {x: 179.9124, y: 68.0217}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8804506040386004496
@@ -5904,9 +5904,9 @@ RectTransform:
- {fileID: 2027606699309904338}
m_Father: {fileID: 1361524257611413148}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 468.781, y: -31.05}
m_SizeDelta: {x: 179.9124, y: 68.0217}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6741821173640675138
@@ -18839,9 +18839,9 @@ RectTransform:
- {fileID: 911293677621153352}
m_Father: {fileID: 1361524257611413148}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 288.8686, y: -31.05}
m_SizeDelta: {x: 179.9124, y: 68.0217}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5623009994815814977
Assets/Scenes/a61.unity
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:07ea288063221ebe282d90b4c6c794d7ec886a625588aa5c70e16adeaed3e8f5
size 200762164
oid sha256:4e48c9be3ea9d07ee5f5073f5d0759c66181647b3d57a2d2358cd50ae5502408
size 200782987