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

done excute skill bar

Browse Source
This commit is contained in:
VDH
2026-02-05 11:21:49 +07:00
parent 0462ddaadd
commit 414562f221
13 changed files with 1019 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
+2
View File
@@ -43,3 +43,5 @@ MonoBehaviour:
prefab: {fileID: 5492547392745930423, guid: 54cccb2c6a758a24183474cd385ccb2c, type: 3}
- id: CDlgInfoTooltip
prefab: {fileID: 6830833846243993097, guid: 97dd1de3aba08a04980849e40d5c1ea4, type: 3}
- id: MagicProgress1
prefab: {fileID: 1126053271199039253, guid: 526d462bd8c87b74c9e461e80d028cb2, type: 3}
Assets/PerfectWorld/Scripts/Managers/EC_HPWork.cs
+30 -15
View File
@@ -67,7 +67,20 @@ namespace BrewMonster.Scripts
m_pWorkMan = pWorkMan;
m_pHost = pWorkMan.GetHostPlayer();
}
public virtual bool Tick(float dwDeltaTime)
{
if (m_bFirstTick)
{
m_bFirstTick = false;
OnFirstTick();
}
return true;
}
protected virtual void OnFirstTick()
{
base.OnFirstTick();
}
// Operations
// Override from CECObjectWork
public override void Cancel()
@@ -284,6 +297,7 @@ namespace BrewMonster.Scripts
FinishWorkAtPriority(iPriority);
WorkList workList = m_WorkStack[iPriority];
workList.Add(pWork);
BMLogger.LogError("m_WorkStack " + pWork.GetWorkID());
if (shouldStart)
{
if (iPriority > m_iCurPriority)
@@ -497,7 +511,8 @@ namespace BrewMonster.Scripts
}
public void StartDelayedWork()
{
if (!HasDelayedWork()){
if (!HasDelayedWork())
{
return;
}
CECHPWork pWork = m_Delayed.pWork;
@@ -511,7 +526,8 @@ namespace BrewMonster.Scripts
}
public void ClearDelayedWork()
{
if (!HasDelayedWork()){
if (!HasDelayedWork())
{
return;
}
// LOG_DEBUG_INFO(AString().Format("delayed CECHPWork::%s priority=%d cleared", m_Delayed.pWork->GetWorkName(), m_Delayed.iPriority));
@@ -622,7 +638,6 @@ namespace BrewMonster.Scripts
return pWork;
}
public bool CanStartWork(int iWorkID, int iPriority = CECHPWorkMan.Work_priority.PRIORITY_1)
{
if (!ValidatePriority(iPriority))
@@ -847,29 +862,29 @@ namespace BrewMonster.Scripts
}
public bool IsMoving()
{
{
bool result = false;
if (ValidatePriority(m_iCurPriority))
if (ValidatePriority(m_iCurPriority))
{
WorkList workList = m_WorkStack[m_iCurPriority];
if(workList != null)
WorkList workList = m_WorkStack[m_iCurPriority];
if (workList != null)
{
for (int i = 0; i < workList.Count; ++ i)
for (int i = 0; i < workList.Count; ++i)
{
if (workList[i].IsMoving())
if (workList[i].IsMoving())
{
result = true;
break;
}
result = true;
break;
}
}
}
}
return result;
}
return result;
}
public bool IsFreeFalling()
{
return IsWorkRunning(Host_work_ID.WORK_FREEFALL);
return IsWorkRunning(Host_work_ID.WORK_FREEFALL);
}
}
public abstract class CECHPWorkPostTickCommand
Assets/PerfectWorld/Scripts/Managers/EC_HPWorkSpell.cs
+46 -12
View File
@@ -1,4 +1,7 @@
using CSNetwork.GPDataType;
using Unity.VisualScripting;
using UnityEngine;
using static BrewMonster.Scripts.CECHPWorkSpell.Spell_magic_state;
namespace BrewMonster.Scripts
{
///////////////////////////////////////////////////////////////////////////
@@ -16,6 +19,7 @@ namespace BrewMonster.Scripts
public CECHPWorkSpell(CECHPWorkMan pWorkMan) : base(Host_work_ID.WORK_SPELLOBJECT, pWorkMan)
{
m_OverTimeCnt = new CECCounter();
m_dwMask = Work_mask.MASK_SPELLOBJECT;
m_dwTransMask = Work_mask.MASK_STAND | Work_mask.MASK_MOVETOPOS | Work_mask.MASK_TRACEOBJECT;
Reset();
@@ -30,20 +34,25 @@ namespace BrewMonster.Scripts
protected int m_iState;
protected int m_idTarget; // Target id
// On first tick
protected virtual void OnFirstTick()
{
//m_pHost.m_iMoveMode = CECHostPlayer::MOVE_STAND;
}
// Prepare cast
public void PrepareCast(int idTarget, CECSkill pSkill, int iIncantTime)
{
m_pSkill = pSkill;
m_iState = ST_INCANT;
m_idTarget = idTarget;
if (iIncantTime < 0)
iIncantTime = 0x7fffffff;
else
iIncantTime *= 2;
m_OverTimeCnt.SetPeriod(iIncantTime);
m_OverTimeCnt.Reset();
}
// Change state
public void ChangeState(int iState)
{
m_iState = iState;
}
// Get state
public int GetState()
@@ -56,14 +65,37 @@ namespace BrewMonster.Scripts
}
// Tick routine
public virtual bool Tick(uint dwDeltaTime)
{
return false;
}
// Reset work
public virtual void Reset()
public override bool Tick(float dwDeltaTime)
{
base.Tick(dwDeltaTime * 1000);
if (m_OverTimeCnt.IncCounter(dwDeltaTime * 1000))
m_bFinished = true;
if (m_idTarget != 0)
{
m_pHost.TurnFaceTo(m_idTarget);
}
if (!m_pHost.IsPlayingAction())
{
m_pHost.PlayAction((int)PLAYER_ACTION_TYPE.ACT_FIGHTSTAND);
}
return true;
}
protected override void OnFirstTick()
{
m_pHost.m_iMoveMode = (int)MoveMode.MOVE_STAND;
}
public override void Reset()
{
base.Reset();
m_OverTimeCnt.Reset();
m_pSkill = null;
m_iState = ST_INCANT;
m_idTarget = 0;
}
// Copy work data
public virtual bool CopyData(CECHPWork pWork)
@@ -73,6 +105,8 @@ namespace BrewMonster.Scripts
// Cancel work
public virtual void Cancel()
{
m_pHost.TurnFaceTo(0);
base.Cancel();
}
}
Assets/PerfectWorld/Scripts/Managers/EC_ObjectWork.cs
+1 -1
View File
@@ -62,6 +62,6 @@ namespace BrewMonster.Scripts
public uint GetTransferMask() => m_dwTransMask;
// On first tick
protected virtual void OnFirstTick() { }
public virtual void OnFirstTick() { }
}
}
Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
+36 -33
View File
@@ -82,7 +82,7 @@ namespace BrewMonster
protected int m_iBoothState = 0; // Booth state. 0, none; 1, prepare; 2, open booth; 3, visite other's booth
public int m_idFRole = GNETRoles._R_UNMEMBER; // ID of player's faction role
protected int m_idCountry = 0; // ¹úÕ½ÕóÓª id
public static int MAX_REINCARNATION = 2;
protected List<int> m_aCurEffects = new List<int>(); // Current effects
@@ -137,7 +137,7 @@ namespace BrewMonster
new MOVECONST(0.8f, 1.6f, 0.3f, 1.5f, 0.55f),
};
public A3DVECTOR3[] aExts = new A3DVECTOR3[(int)PROFESSION.NUM_PROFESSION * GENDER.NUM_GENDER]
public A3DVECTOR3[] aExts = new A3DVECTOR3[(int)PROFESSION.NUM_PROFESSION * GENDER.NUM_GENDER]
{
new A3DVECTOR3(0.4f, 0.9f, 0.4f), // ÎäÏÀ
new A3DVECTOR3(0.3f, 0.85f, 0.3f),
@@ -184,7 +184,7 @@ namespace BrewMonster
{
parentModel = transform.GetChild(0);
txtName = GetComponentInChildren<TextMeshProUGUI>();
if(transform.childCount >= 3)
if (transform.childCount >= 3)
{
pointCam = transform.GetChild(2);
}
@@ -1151,7 +1151,10 @@ namespace BrewMonster
}
public CECSkill GetCurSkill() { return m_pCurSkill; }
public bool IsHangerOn() { return m_bHangerOn; }
public bool IsPlayingAction()
{
return true /*GetLowerBodyAction() != -1*/ ;
}
public bool PlaySkillCastActionWithName(int idSkill, string szActName, bool bNoFX/* =false */)
{
return m_pActionController != null
@@ -1927,38 +1930,38 @@ namespace BrewMonster
/// Place holder for riding pet. Not test logic yet.
/// </summary>
public struct RIDINGPET
{
public int id;
public ushort color;
{
public int id;
public ushort color;
public RIDINGPET(bool isReset = true)
{
id = 0;
public RIDINGPET(bool isReset = true)
{
id = 0;
color = 0;
}
}
public bool GetColor(Color clr)
{
// ��ȡ��ǰ����Ⱦɫ��ɫ
return id>0 && GetColor(color, clr);
}
public bool GetColor(Color clr)
{
// ��ȡ��ǰ����Ⱦɫ��ɫ
return id > 0 && GetColor(color, clr);
}
public static bool GetColor(ushort c, Color clr)
{
// ��ѯ��ǰ����Ƿ�Ⱦ��ɫ�����Ⱦ��ɫ�����ر�Ⱦ֮�����ɫ
bool bRet = false;
if ((c & (1<<(8-1))) != 0)
{
// unsigned short ��λΪ1ʱ����ʾȾ��ɫ����ʱ�ɻ�ȡ��ɫ
clr = new Color(((c) & (0x1f << 10)) >> 7, ((c) & (0x1f << 5)) >> 2, ((c) & 0x1f) << 3);
bRet = true;
}
return bRet;
}
public static bool GetColor(ushort c, Color clr)
{
// ��ѯ��ǰ����Ƿ�Ⱦ��ɫ�����Ⱦ��ɫ�����ر�Ⱦ֮�����ɫ
bool bRet = false;
if ((c & (1 << (8 - 1))) != 0)
{
// unsigned short ��λΪ1ʱ����ʾȾ��ɫ����ʱ�ɻ�ȡ��ɫ
clr = new Color(((c) & (0x1f << 10)) >> 7, ((c) & (0x1f << 5)) >> 2, ((c) & 0x1f) << 3);
bRet = true;
}
return bRet;
}
public static Color GetDefaultColor()
{
return new Color(255, 255, 255);
}
};
public static Color GetDefaultColor()
{
return new Color(255, 255, 255);
}
};
}
Assets/PerfectWorld/Scripts/UI/Dialogs/AUIDialog.cs
+15 -4
View File
@@ -1,10 +1,12 @@
using BrewMonster.Network;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
namespace BrewMonster.UI
{
public abstract class AUIDialog : MonoBehaviour
public class AUIDialog : MonoBehaviour
{
protected Dictionary<int, string> m_StringTable = new Dictionary<int, string>();
protected bool m_bShow = false;
@@ -16,9 +18,12 @@ namespace BrewMonster.UI
protected string m_szName;
private bool m_bUpdateRenderTarget = false;
[SerializeField] TextMeshProUGUI skillNameText;
[SerializeField] Image imageProgress;
public virtual void Show(bool value)
{
BMLogger.LogError("AUIDialog::Show() not implemented i n gameObject.SetActive = " + value);
gameObject.SetActive(value);
m_bShow = value;
OnShowDialogue();
@@ -69,13 +74,19 @@ namespace BrewMonster.UI
m_strDataPtrName = strName;
m_pvData = pvData;
}
public TextMeshProUGUI GetSkillNameText()
{
return skillNameText;
}
public CECGameUIMan GetGameUIMan()
{
return EC_Game.GetGameRun().GetUIManager().GetInGameUIMan();
}
public Image GetProgressImage()
{
return imageProgress;
}
public CECHostPlayer GetHostPlayer()
{
return EC_Game.GetGameRun().GetHostPlayer();
@@ -267,7 +278,7 @@ namespace BrewMonster.UI
return formatStr;
}
}
public AUIManager GetAUIManager()
{
return m_pAUIManager;
Assets/PerfectWorld/Scripts/UI/SkillUI/CDlgHost.cs
+113
View File
@@ -0,0 +1,113 @@
using BrewMonster.Network;
using BrewMonster.UI;
using UnityEngine;
namespace BrewMonster
{
public class CDlgHost : MonoBehaviour
{
private void Update()
{
RefreshStatusBar();
}
public void RefreshStatusBar()
{
bool bShow = false;
bool bActive = true;
bShow |= RefreshIncantBar(bShow, bActive);
}
public bool RefreshIncantBar(bool bOtherShown, bool bActive)
{
CECHostPlayer pHost = CECGameRun.Instance.GetHostPlayer();
if(pHost == null) return false;
CECSkill pCurSkill = pHost.GetCurSkill();
bool bShow = false;
float nCur = 1;
float nMax = 1;
AUIDialog pDlg = CECUIManager.Instance.GetInGameUIMan().GetDialog("MagicProgress1");
if (!bOtherShown)
{
uint dwCurTime = 0, dwMaxTime = 0;
if(pCurSkill != null)
BMLogger.LogError($"CDlgHost::pHost.IsSpellingMagic()={pHost.IsSpellingMagic()} ; pCurSkill != null{pCurSkill != null}");
if (false/*pHost.GetUsingItemTimeCnt(dwCurTime, dwMaxTime)*/)
{
/* bShow = true;
nCur = dwCurTime;
nMax = dwMaxTime;
pDlg->GetDlgItem("Txt")->SetText(pHost->IsGatheringMonsterSpirit() ?
GetStringFromTable(738) : GetStringFromTable(726));*/
}
/*else if (pHost->IsOperatingPet())
{
bShow = true;
nCur = pHost->GetPetOptTime().GetCounter();
nMax = max(pHost->GetPetOptTime().GetPeriod(), 1);
switch (pHost->IsOperatingPet())
{
case 1:
pDlg->GetDlgItem("Txt")->SetText(GetStringFromTable(791));
break;
case 2:
pDlg->GetDlgItem("Txt")->SetText(GetStringFromTable(792));
break;
case 3:
pDlg->GetDlgItem("Txt")->SetText(GetStringFromTable(793));
break;
case 4:
pDlg->GetDlgItem("Txt")->SetText(GetStringFromTable(794));
break;
}
}*/
else if (pHost.IsSpellingMagic() && pCurSkill != null)
{
BMLogger.LogError("CDlgHost::RefreshIncantBar - IsSpellingMagic");
bShow = true;
CECCounter counter = pHost.GetIncantCnt();
nCur = counter.GetCounter();
nMax = Mathf.Max(counter.GetPeriod(), 1);
BMLogger.LogError($"CDlgHost::RefreshIncantBar - nCur=" + nCur + $"nMax={nMax} counter.GetPeriod()={counter.GetPeriod()} ");
pDlg.GetSkillNameText().text = (EC_Game.GetSkillDesc().GetWideString(pCurSkill.GetSkillID() * 10));
BMLogger.LogError("CDlgHost:: = (nCur / nMax)=" + (nCur / nMax));
BMLogger.LogError("CDlgHost::bShow =" + bShow);
}
/* else if (pHost.IsCongregating())
{
bShow = true;
CECCounter counter = pHost->GetCongregateCnt();
nCur = counter.GetCounter();
nMax = max(counter.GetPeriod(), 1);
int conType = pHost->IsCongregating() - 1;
pDlg->GetDlgItem("Txt")->SetText(GetStringFromTable(5700 + conType));
}*/
}
if (bShow)
{
if (!pDlg.IsShow())
{
BMLogger.LogError("CDlgHost::bShowbShow");
pDlg.Show(true);
}
pDlg.GetProgressImage().fillAmount = (nCur / nMax);
}
else
{
if (pDlg.IsShow())
{
pDlg.Show(false);
BMLogger.LogError("CDlgHost::bShowbShow not");
}
}
return bShow;
}
}
}
Assets/PerfectWorld/Scripts/UI/SkillUI/CDlgHost.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 01a97b889c107814eb3c4957c683c0b4
Assets/Prefabs/UI/MagicProgress1.prefab
+341
View File
@@ -0,0 +1,341 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1126053271199039253
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3062421795583818898}
- component: {fileID: 7778085681912340288}
m_Layer: 0
m_Name: MagicProgress1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3062421795583818898
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1126053271199039253}
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_Children:
- {fileID: 1925327431716214704}
- {fileID: 7830969636268911684}
- {fileID: 529978810702632783}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7778085681912340288
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1126053271199039253}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 923726bcb1a5625448a832da43198b7e, type: 3}
m_Name:
m_EditorClassIdentifier:
skillNameText: {fileID: 4156282290771635373}
imageProgress: {fileID: 7818904766065936941}
--- !u!1 &1961198748621413970
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 529978810702632783}
- component: {fileID: 4135657131716260047}
- component: {fileID: 4156282290771635373}
m_Layer: 0
m_Name: TextSkill
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &529978810702632783
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1961198748621413970}
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_Children: []
m_Father: {fileID: 3062421795583818898}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -243}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4135657131716260047
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1961198748621413970}
m_CullTransparentMesh: 1
--- !u!114 &4156282290771635373
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1961198748621413970}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: New Text
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &4998799320591488598
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1925327431716214704}
- component: {fileID: 1461720454802408635}
- component: {fileID: 1049556297056300177}
m_Layer: 0
m_Name: ImageProgressBG
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1925327431716214704
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4998799320591488598}
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_Children: []
m_Father: {fileID: 3062421795583818898}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 5.7217, y: -241.83194}
m_SizeDelta: {x: 467.6988, y: 42.6811}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1461720454802408635
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4998799320591488598}
m_CullTransparentMesh: 1
--- !u!114 &1049556297056300177
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4998799320591488598}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7916616395362301942
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7830969636268911684}
- component: {fileID: 6823947204623957556}
- component: {fileID: 7818904766065936941}
m_Layer: 0
m_Name: ImageProgress
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7830969636268911684
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7916616395362301942}
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_Children: []
m_Father: {fileID: 3062421795583818898}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 5.7217, y: -241.83194}
m_SizeDelta: {x: 467.6988, y: 42.6811}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6823947204623957556
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7916616395362301942}
m_CullTransparentMesh: 1
--- !u!114 &7818904766065936941
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7916616395362301942}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f9b44a2d0c26740aa9dafa84b0170f15, type: 3}
m_Type: 3
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 0
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
Assets/Prefabs/UI/MagicProgress1.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 526d462bd8c87b74c9e461e80d028cb2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/a61.unity
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:def3c6a4f58ef9b5c9558210328e5b6f3ed11bfee5b577271ee43fa110616b82
size 200521689
oid sha256:cabb2e46d95d8f468b78d754f336f9622b6c22c8647275ffb9c90ea216b67626
size 200522447
Assets/Scripts/CECHostPlayer.cs
+16 -14
View File
@@ -93,7 +93,6 @@ namespace BrewMonster
private int m_iWorldContribution;
private int m_iWorldContributionSpend;
private bool m_bSpellDSkill;
private CECSkill m_pCurSkill;
private CECSkill m_pTargetItemSkill; // Target item skill
public CECComboSkill m_pComboSkill; // Combo skill
public A3DVECTOR3 m_vAccel; // Accelerate\
@@ -437,7 +436,6 @@ namespace BrewMonster
//m_dwMoveRelDir = 0;
m_fVertSpeed = 0.0f;
UpdateTimers(Time.deltaTime);
// Auto team / Automatic party grouping
// m_pAutoTeam.Tick(Time.deltaTime);
}
@@ -1020,6 +1018,7 @@ namespace BrewMonster
private void OnMsgPlayerCastSkill(ECMSG Msg)
{
bool bDoOtherThing = false;
int idTarget = 0;
@@ -1031,8 +1030,6 @@ namespace BrewMonster
{
case int value2 when value2 == CommandID.OBJECT_CAST_SKILL:
{
// Cast skill on target object
// 对目标对象施法
cmd_object_cast_skill pCmd =
GPDataTypeHelper.FromBytes<cmd_object_cast_skill>((byte[])Msg.dwParam1);
@@ -1040,7 +1037,7 @@ namespace BrewMonster
{
m_pCurSkill.EndCharging();
}
BMLogger.LogError("OnMsgPlayerCastSkill Skill ID: " + pCmd.skill);
m_pCurSkill = GetPositiveSkillByID(pCmd.skill);
if (m_pCurSkill == null) m_pCurSkill = GetEquipSkillByID(pCmd.skill);
if (m_pCurSkill == null)
@@ -1058,8 +1055,9 @@ namespace BrewMonster
if (m_pCurSkill.GetExecuteTime() >= 0)
iWaitTime = pCmd.time + m_pCurSkill.GetExecuteTime();
CECHPWorkSpell pWork =
(CECHPWorkSpell)m_pWorkMan.CreateWork(CECHPWork.Host_work_ID.WORK_SPELLOBJECT);
CECHPWorkSpell pWork = (CECHPWorkSpell)m_pWorkMan.CreateWork(Host_work_ID.WORK_SPELLOBJECT);
BMLogger.LogError("OnMsgPlayerCastSkill CECHPWorkSpell : ");
pWork.PrepareCast(pCmd.target, m_pCurSkill, iWaitTime);
m_pWorkMan.StartWork_p1(pWork);
@@ -1120,6 +1118,7 @@ namespace BrewMonster
}
case int value2 when value2 == CommandID.HOST_STOP_SKILL:
{
BMLogger.LogError("OnMsgPlayerCastSkill HOST_STOP_SKILL");
m_pPrepSkill = null;
CECSkill pSkillToMatch = m_pCurSkill;
@@ -1157,6 +1156,7 @@ namespace BrewMonster
}
case int value2 when value2 == CommandID.SELF_SKILL_INTERRUPTED:
{
BMLogger.LogError("OnMsgPlayerCastSkill SELF_SKILL_INTERRUPTED");
// Skill interrupted
// 技能被打断
int skill_id = 0;
@@ -6081,8 +6081,9 @@ namespace BrewMonster
}
// Is spelling magic
bool IsSpellingMagic()
public bool IsSpellingMagic()
{
if(m_pWorkMan == null) return false;
return m_pWorkMan.IsSpellingMagic();
}
@@ -6799,11 +6800,11 @@ namespace BrewMonster
}
// Gather time counter
if (m_GatherCnt.IncCounter(iRealTime))
if (m_GatherCnt.IncCounter(iRealTime * 1000))
m_GatherCnt.Reset(true);
// Incant time counter
if (m_IncantCnt.IncCounter(dwDeltaTime))
if (m_IncantCnt.IncCounter(dwDeltaTime * 1000))
m_IncantCnt.Reset(true);
// Bind command cool counter
@@ -7277,6 +7278,7 @@ namespace BrewMonster
m_bRushFly = pCmd.is_active != 0 ? true : false;
}
}
public CECCounter GetIncantCnt() { return m_IncantCnt; }
public EC_Inventory GetPack(int iPack)
{
@@ -7606,7 +7608,7 @@ namespace BrewMonster
{
if (IsFlying() && pTaskDice.GetDBEssence().no_use_in_combat == 1)
{
if(showMsg)
if (showMsg)
pGameRun.AddFixedMessage((int)FixedMsg.FIXMSG_CANNOT_USE_IN_BATTLE);
return false;
}
@@ -7773,7 +7775,7 @@ namespace BrewMonster
}
}
}
else if(pSkill.GetType() == (int)CECSkill.SkillType.TYPE_BLESS)
else if (pSkill.GetType() == (int)CECSkill.SkillType.TYPE_BLESS)
{
// TODO: Implement pet blessing when petsystem is available
//CECSCPet pPet = EC_Game.GetGameRun().GetWorld().GetPetByID(m_idSelTarget);
@@ -8106,11 +8108,11 @@ namespace BrewMonster
return false;
CECWorld pWorld = CECGameRun.Instance.GetWorld();
if(pWorld == null)
if (pWorld == null)
return false;
CECObject pObject = pWorld.GetObject(idObject, 1);
if(ppObject == null)
if (ppObject == null)
return false;
ppObject = pObject;
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
+408 -671
View File
File diff suppressed because one or more lines are too long