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

get description skill

Browse Source
This commit is contained in:
VDH
2026-02-02 09:40:39 +07:00
parent 0de2995ab6
commit e91a491444
13 changed files with 230 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs
+16 -3
View File
@@ -75,6 +75,7 @@ namespace BrewMonster
// CECSkill class
public class CECSkill
{
// Skill type enum
public enum SkillType
{
@@ -292,11 +293,23 @@ namespace BrewMonster
return string.Empty;
StringBuilder sb = new StringBuilder(1024);
var skillStr = l_SkillStr as SkillStr;
string result = m_pSkillCore.GetIntroduction(sb, 1024, skillStr);
return result;
m_pSkillCore.GetIntroduction(sb, l_SkillStr);
return sb.ToString();
}
public static bool GetDesc(int idSkill, int iLevel, string szText, int iBufLen)
{
if (szText == null || iBufLen == 0)
return false;
CECSkill pSkill = new CECSkill(idSkill, iLevel);
if (pSkill == null)
{
return false;
}
string sz = pSkill.GetDesc();
return true;
}
public int GetCoreCoolingTime()
{
return m_pSkillCore != null ? m_pSkillCore.GetCoolingTime() : 0;
Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
+4 -1
View File
@@ -1408,7 +1408,10 @@ namespace BrewMonster
}
// Get character ID
// Play Gfx on Models
public static int GetRealmLayer(int realmLevel) { return realmLevel != 0 ? (realmLevel + 9) / 10 : 0; }
public static int GetRealmSubLevel(int realmLevel) { return realmLevel != 0 ? (realmLevel % 10 != 0 ? realmLevel % 10 : 10) : 0; }
protected bool PlayGfx(string szPath, string szHook, float fScale /*1.0f*/, uint iShapeTypeMask /*(1<<PLAYERMODEL_MAJOR)*/, bool bForceNoRecord = false)
{
// bool bPlayed(false);
Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs
+10
View File
@@ -304,6 +304,16 @@ namespace BrewMonster.Scripts.Skills
{
return CECGameRun.Instance.GetHostPlayer().CheckSkillLearnCondition(skillID, true);
}
public string GetSkillDescription(int skillID, int level)
{
string tmp = "";
if (CECSkill.GetDesc(skillID, level, tmp, 1024))
{
return (tmp);
}
return tmp;
}
public int GetRequiredBook(int skillID, int level)
{
int itemId = ElementSkill.GetRequiredBook((uint)skillID, level);
Assets/PerfectWorld/Scripts/Skills/ElementSkill.cs
+19 -2
View File
@@ -191,7 +191,7 @@ namespace BrewMonster.Scripts.Skills
return "";
}
// ����˵��
public virtual string GetIntroduction(StringBuilder buf, int len, SkillStr table) { return ""; }
public virtual void GetIntroduction(StringBuilder buf, SkillStr table) { }
// ����ְҵ����
public virtual int GetCls() { return -1; }
// ������ȴʱ�䣬��λ����
@@ -240,8 +240,25 @@ namespace BrewMonster.Scripts.Skills
int ret = skill.GetRequiredBook();
return ret;
}
// ѧϰ���󾳽�ȼ�?
public static int GetRequiredLevel(uint id, int level)
{
Skill s = Skill.Create(id, level);
if (s == null)
return 0;
int ret = s.GetRequiredLevel();
return ret;
}
public virtual int GetRequiredRealmLevel() { return 0; }
public static int GetRequiredRealmLevel(uint id, int level)
{
Skill s = Skill.Create(id, level);
if (s == null)
return 0;
int ret = s.GetRequiredRealmLevel();
return ret;
}
public virtual Dictionary<uint, int> GetRequiredSkill() => new Dictionary<uint, int>();
Assets/PerfectWorld/Scripts/Skills/SkillStubs1/skill1.cs
+3 -7
View File
@@ -141,18 +141,14 @@ namespace BrewMonster
public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1];
#if SKILL_CLIENT
public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format)
public override int GetIntroduction(Skill skill, StringBuilder buffer, string format)
{
string result = string.Format(format,
skill.GetLevel(),
-5 + 7 * skill.GetLevel(),
1.9 * skill.GetLevel() * skill.GetLevel() + 64 * skill.GetLevel() + 36.7);
if (result.Length < length)
{
buffer.Append(result);
return result.Length;
}
return 0;
buffer.Append(result);
return result.Length;
}
#endif
Assets/PerfectWorld/Scripts/Skills/skill.cs
+8 -2
View File
@@ -1,6 +1,9 @@
using BrewMonster.Assets.PerfectWorld.Scripts.Skills;
using System.Collections.Generic;
using System.Text;
using UnityEngine;
using UnityEngine.InputSystem;
using static UnityEngine.Rendering.DebugUI;
namespace BrewMonster.Scripts.Skills
{
@@ -74,7 +77,10 @@ namespace BrewMonster.Scripts.Skills
}
public override int GetRangeType() { return stub.GetRange().type; }
public override int GetRequiredLevel() { return stub.GetRequiredLevel(this); }
public override void GetIntroduction(StringBuilder buf, SkillStr table)
{
int n = stub.GetIntroduction(this, buf, table.Find((int)stub.id * 10 + 1));
}
public override int GetTargetType()
{
if (stub.restrict_corpse == 1)
@@ -298,7 +304,7 @@ namespace BrewMonster.Scripts.Skills
public virtual int GetExecutetime(Skill skill) { return 1000; }
public virtual bool CheckHpCondition(int hp, int max_hp) { return true; }
public virtual bool CheckComboSkExtraCondition(Skill skill) { return true; }
public virtual int GetIntroduction(Skill skill, ushort[] descBuffer, int descBufferLen, ushort[] titleBuffer) { return 0; }
public virtual int GetIntroduction(Skill skill, StringBuilder descBuffer, string titleBuffer) { return 0; }
// ������Ч�Լ�� // Validate weapon restriction
public bool ValidWeapon(int weapon)
Assets/PerfectWorld/Scripts/UI/GamePlay/CdlgQuickBar.cs
+1 -1
View File
@@ -28,7 +28,7 @@ namespace BrewMonster
#if !Applyforalicense
#if !ApplyforALicense
public bool UpdateShortcuts()
{
CECShortcut pSC;
Assets/PerfectWorld/Scripts/UI/GamePlay/EC_GameUIMan.cs
+13 -2
View File
@@ -151,6 +151,17 @@ namespace BrewMonster.UI
{
return m_dialogResouce;
}
public string GetRealmName(int realmLevel)
{
string strRealm = "";
if (realmLevel > 0)
{
int layer = CECPlayer.GetRealmLayer(realmLevel);
int subLevel = CECPlayer.GetRealmSubLevel(realmLevel);
strRealm += (GetStringFromTable(11100) + GetStringFromTable(11100 + layer) + GetStringFromTable(11120 + subLevel));
}
return strRealm;
}
public Canvas GetCanvas()
{
return m_canvas;
@@ -166,8 +177,8 @@ namespace BrewMonster.UI
m_pDlgTask = GetDialog(CECUIHelper.DlgTaskName).GetComponent<DlgTask>();
m_pDlgTask.Show(false);
m_IconMap[(byte)EC_GAMEUI_ICONS.ICONS_SKILL] =(SKILL_ICONLIST_NAME, Resources.LoadAll<Sprite>(SKILL_ICONLIST_NAME));
m_IconMap[(byte)EC_GAMEUI_ICONS.ICONS_ACTION] =(ACTION_ICONLIST_NAME, Resources.LoadAll<Sprite>(ACTION_ICONLIST_NAME));
m_IconMap[(byte)EC_GAMEUI_ICONS.ICONS_SKILL] = (SKILL_ICONLIST_NAME, Resources.LoadAll<Sprite>(SKILL_ICONLIST_NAME));
m_IconMap[(byte)EC_GAMEUI_ICONS.ICONS_ACTION] = (ACTION_ICONLIST_NAME, Resources.LoadAll<Sprite>(ACTION_ICONLIST_NAME));
}
public void SetCover(AUIImagePicture pImgPic, string nameImage, EC_GAMEUI_ICONS iCONS_SKILL)
{
Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs
+24 -6
View File
@@ -1,3 +1,4 @@
using BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay;
using BrewMonster.Scripts.Skills;
using BrewMonster.UI;
using CSNetwork.GPDataType;
@@ -18,6 +19,7 @@ namespace BrewMonster
[SerializeField] private Image skillIcon;
[SerializeField] private GameObject m_highlight;
[SerializeField] private Button m_upgradeBtn;
[SerializeField] private AUIImagePicture m_skillIconImgPic;
private int m_skillID;
private int m_curLevel;
@@ -135,20 +137,36 @@ namespace BrewMonster
break;
}
}
string skillDsc;
int reqLevel;
int reqRealmLevel;
if (enumSkillLearnedState.SKILL_NOT_LEARNED == learnedState)
{
skillIcon.color = Color.gray;
/* skillDsc = model.GetSkillDescription(m_skillID, 1);
reqLevel = GNET::ElementSkill::GetRequiredLevel(m_skillID, 1);
reqRealmLevel = GNET::ElementSkill::GetRequiredRealmLevel(m_skillID, 1);*/
skillDsc = model.GetSkillDescription(m_skillID, 1);
reqLevel = ElementSkill.GetRequiredLevel((uint)m_skillID, 1);
reqRealmLevel = ElementSkill.GetRequiredRealmLevel((uint)m_skillID, 1);
}
else
{
skillIcon.color = Color.white;
/* skillDsc = model.GetSkillDescription(m_skillID, m_curLevel);
reqLevel = GNET::ElementSkill::GetRequiredLevel(m_skillID, m_curLevel);
reqRealmLevel = GNET::ElementSkill::GetRequiredRealmLevel(m_skillID, m_curLevel);*/
skillDsc = model.GetSkillDescription(m_skillID, m_curLevel);
reqLevel = ElementSkill.GetRequiredLevel((uint)m_skillID, m_curLevel);
reqRealmLevel = ElementSkill.GetRequiredRealmLevel((uint)m_skillID, m_curLevel);
}
if (reqLevel == 0)
{
reqLevel = 1;
}
skillDsc += GPDataTypeHelper.ReplacePercentD(GetStringFromTable(11328), reqLevel);
if (reqRealmLevel != 0)
{
skillDsc += GetStringFromTable(11401);
skillDsc += GetGameUIMan().GetRealmName(reqRealmLevel);
}
//m_skillIconImgPic.SetHint(skillDsc);
string skillName = model.GetSkillName(m_skillID);
/* if (model.IsPassiveSkill(m_skillID))
Assets/Prefabs/UI/SkillUI.prefab
+115 -114
View File
@@ -365,10 +365,10 @@ RectTransform:
- {fileID: 6913810588620795676}
m_Father: {fileID: 3123930244098203053}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38, y: -140.39}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5889574211483133077
CanvasRenderer:
@@ -728,10 +728,10 @@ RectTransform:
- {fileID: 1609651149174304326}
m_Father: {fileID: 3123930244098203053}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38, y: -242.78}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &521924147895834695
CanvasRenderer:
@@ -1615,10 +1615,10 @@ RectTransform:
- {fileID: 1704697067466645826}
m_Father: {fileID: 3123930244098203053}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3604148096459499892
CanvasRenderer:
@@ -2282,7 +2282,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 0}
m_SizeDelta: {x: 143.9446, y: 91.87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6858302016506942629
CanvasRenderer:
@@ -2433,7 +2433,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 0}
m_SizeDelta: {x: 143.9446, y: 91.87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7562352963284824378
CanvasRenderer:
@@ -2749,10 +2749,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 210, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8358568677657722128
CanvasRenderer:
@@ -3362,10 +3362,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 382, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7646717020914693947
CanvasRenderer:
@@ -3512,7 +3512,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6723345811351538777
RectTransform:
m_ObjectHideFlags: 0
@@ -3950,9 +3950,9 @@ RectTransform:
- {fileID: 5885063335678115690}
m_Father: {fileID: 1263498971758389975}
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: 127, y: -18.5}
m_SizeDelta: {x: 254, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1887848967215853843
@@ -4113,7 +4113,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 309.47, y: -95}
m_SizeDelta: {x: 618.94, y: 0}
m_SizeDelta: {x: 618.94, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2264175676541462108
CanvasRenderer:
@@ -4223,10 +4223,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 554, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1725305811772317814
CanvasRenderer:
@@ -4599,10 +4599,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 468, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3765304872596771789
CanvasRenderer:
@@ -4886,10 +4886,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 296, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9207107349168631693
CanvasRenderer:
@@ -5046,7 +5046,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -322.47, y: 365.44547}
m_SizeDelta: {x: 644.94, y: 0}
m_SizeDelta: {x: 644.94, y: 703.38}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8275541816169387879
CanvasRenderer:
@@ -6567,10 +6567,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 124, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1291961236682885550
CanvasRenderer:
@@ -6643,9 +6643,9 @@ RectTransform:
- {fileID: 5918073574760109704}
m_Father: {fileID: 1285542512886306091}
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: 127, y: -18.5}
m_SizeDelta: {x: 254, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1257159900126729527
@@ -6718,10 +6718,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2268981575541439631
CanvasRenderer:
@@ -6800,7 +6800,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 335.47, y: -98.4}
m_SizeDelta: {x: 618.94, y: 0}
m_SizeDelta: {x: 618.94, y: 140.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2124054608285479539
CanvasRenderer:
@@ -7471,10 +7471,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 468, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &897642746592729160
CanvasRenderer:
@@ -7988,10 +7988,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 210, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7412806809519503430
CanvasRenderer:
@@ -8184,10 +8184,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 124, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8958294640541543931
CanvasRenderer:
@@ -8620,7 +8620,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 0}
m_SizeDelta: {x: 143.9446, y: 91.87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5438050072468631381
CanvasRenderer:
@@ -9151,7 +9151,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 0}
m_SizeDelta: {x: 143.9446, y: 91.87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3044764523714620351
CanvasRenderer:
@@ -9568,10 +9568,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 382, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8292637089760855876
CanvasRenderer:
@@ -9644,9 +9644,9 @@ RectTransform:
- {fileID: 3666972851124413242}
m_Father: {fileID: 1244895283146852732}
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: 127, y: -18.5}
m_SizeDelta: {x: 254, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4852245878945746775
@@ -9720,10 +9720,10 @@ RectTransform:
- {fileID: 7544910809585033678}
m_Father: {fileID: 3123930244098203053}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 382.5, y: -242.78}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2164606938053553701
CanvasRenderer:
@@ -9977,10 +9977,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4804628498516101234
CanvasRenderer:
@@ -10053,9 +10053,9 @@ RectTransform:
- {fileID: 7738777691134633714}
m_Father: {fileID: 332864778784360512}
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: 127, y: -18.5}
m_SizeDelta: {x: 254, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8557376726661632322
@@ -10206,7 +10206,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 335.47, y: -263.3}
m_SizeDelta: {x: 618.94, y: 0}
m_SizeDelta: {x: 618.94, y: 133}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5943966890611580968
CanvasRenderer:
@@ -10934,10 +10934,10 @@ RectTransform:
- {fileID: 7759567721800243228}
m_Father: {fileID: 3123930244098203053}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 382.5, y: -140.39}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2464100607009156610
CanvasRenderer:
@@ -11740,7 +11740,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 335.47, y: -530.58997}
m_SizeDelta: {x: 618.94, y: 0}
m_SizeDelta: {x: 618.94, y: 345.58002}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9030098628201859511
CanvasRenderer:
@@ -12663,10 +12663,10 @@ RectTransform:
- {fileID: 1335544207958730177}
m_Father: {fileID: 3123930244098203053}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 382.5, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3020341225908238861
CanvasRenderer:
@@ -12749,7 +12749,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 309.47, y: -205.19}
m_SizeDelta: {x: 618.94, y: 0}
m_SizeDelta: {x: 618.94, y: 280.78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3138218988396077083
CanvasRenderer:
@@ -12866,7 +12866,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -361.27, y: 365.44547}
m_SizeDelta: {x: 722.5344, y: 28}
m_SizeDelta: {x: 722.5344, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &7853130943468561016
CanvasRenderer:
@@ -13009,7 +13009,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 309.47, y: -102.8}
m_SizeDelta: {x: 618.94, y: 0}
m_SizeDelta: {x: 618.94, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &965625795563076259
CanvasRenderer:
@@ -13155,6 +13155,7 @@ MonoBehaviour:
skillIcon: {fileID: 3801278460223427377}
m_highlight: {fileID: 0}
m_upgradeBtn: {fileID: 2802100335901209485}
m_skillIconImgPic: {fileID: 0}
--- !u!114 &536870940929799852
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -13262,9 +13263,9 @@ RectTransform:
- {fileID: 8641794091682467561}
m_Father: {fileID: 4902026760249267287}
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: 127, y: -18.5}
m_SizeDelta: {x: 254, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7759539851022153828
@@ -13439,7 +13440,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -361.27, y: 365.44547}
m_SizeDelta: {x: 722.5344, y: 0}
m_SizeDelta: {x: 722.5344, y: 185.6}
m_Pivot: {x: 0, y: 1}
--- !u!222 &74166521354270119
CanvasRenderer:
@@ -13555,7 +13556,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 0}
m_SizeDelta: {x: 143.9446, y: 91.87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8934459415203184979
CanvasRenderer:
@@ -14399,10 +14400,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3490841402936291418}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 296, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8186299737150272153
CanvasRenderer:
@@ -14506,7 +14507,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4958559450723387948
RectTransform:
m_ObjectHideFlags: 0
@@ -14619,7 +14620,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 117.99603, y: 0}
m_SizeDelta: {x: 143.9446, y: 0}
m_SizeDelta: {x: 143.9446, y: 45.94}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8300893254371079820
CanvasRenderer:
@@ -14773,7 +14774,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 368.81186, y: -153.20001}
m_SizeDelta: {x: 685.6237, y: 0}
m_SizeDelta: {x: 685.6237, y: 64.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8076001380599592139
CanvasRenderer:
@@ -14885,10 +14886,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 3449045492221331241}
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_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 554, y: -38}
m_SizeDelta: {x: 76, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4341901141596287823
CanvasRenderer:
@@ -14967,7 +14968,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 368.81186, y: -60.4}
m_SizeDelta: {x: 685.6237, y: 0}
m_SizeDelta: {x: 685.6237, y: 64.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8659649200798903193
CanvasRenderer:
Assets/Scenes/a61.unity
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:abc415d54498bffa808447fe8b575721ead4686710d5536494ffdb8863894a56
size 200604471
oid sha256:95d6d825ffc45e6ba389d5e2baffd576d409d5718b1888331c763dfe2b9460e5
size 200522636
Assets/Scripts/CECHostPlayer.cs
+5 -5
View File
@@ -998,7 +998,7 @@ namespace BrewMonster
{
m_pPrepSkill = null;
CECSkill pSkillToMatch = m_pCurSkill;
CECSkill pSkillToMatch = m_pCurSkill;
if (m_pCurSkill != null)
{
ClearComActFlagAllRankNodes(true);
@@ -3864,9 +3864,9 @@ namespace BrewMonster
else if (iTargetType == 2)
iAliveFlag = 2;
/* CECObject pObject = EC_Game.GetGameRun().GetWorld().GetObject(idCastTarget, iAliveFlag);
if (!pObject)
return false;*/
/* CECObject pObject = EC_Game.GetGameRun().GetWorld().GetObject(idCastTarget, iAliveFlag);
if (!pObject)
return false;*/
}
if (!IsMeleeing() && !IsSpellingMagic() &&
@@ -4122,7 +4122,7 @@ namespace BrewMonster
Buffer.BlockCopy(buffer, index + contentBytes, tail, 0, trailing);
}
}
public bool NaturallyStopMoving()
public bool NaturallyStopMoving()
{
// if (!m_MoveCtrl.IsStop())
if (!IsPlayerMoving())
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
+10 -87
View File
File diff suppressed because one or more lines are too long