修改前置技能解锁条件的配置

main
yurui 2024-03-21 13:58:53 +08:00
parent fec5ccc398
commit d47110ef12
4 changed files with 195 additions and 142 deletions

View File

@ -197,11 +197,11 @@ public class CommandSkillData
}
/// <summary>
/// 解锁条件列表配置的id升一级就解锁
/// 前置解锁条件列表配置的id升一级就解锁
/// </summary>
public int[] ListUnLock
public int[] ListPreSkillID
{
get { return skillUpgradeData.Unlock; }
get { return skillUpgradeData.PreSkillID; }
}
/// <summary>

View File

@ -137,7 +137,7 @@ public class UI_CommandSkillCultivateController : UIWindow
for (int i = 0; i < lastFloorData.Count; ++i)
{
if (!((IList)skillItem.SkillData.ListUnLock).Contains(lastFloorData[i].SkillID))
if (!((IList)skillItem.SkillData.ListPreSkillID).Contains(lastFloorData[i].SkillID))
continue;
int lastValue = i * 2 + SKILL_COUNT - lastFloorData.Count;
@ -559,11 +559,11 @@ public class UI_CommandSkillCultivateController : UIWindow
if (PlayerSkillUpgradeHelper.IsSkillLock(curSelectItem.SkillData.SkillUpgradeData))
{
switch (curSelectItem.SkillData.ListUnLock.Length)
switch (curSelectItem.SkillData.ListPreSkillID.Length)
{
case 1:
{
int skillId = curSelectItem.SkillData.ListUnLock[0];
int skillId = curSelectItem.SkillData.ListPreSkillID[0];
string name1 = CommonUtils.GetLocalizeText(TableManager.Instance.Tables.PlayerSkillConfig.Get(skillId).NameLocal);
int level1 = Actor.Instance.PlayerSkill.GetLevel(skillId);
DataPlayerSkillUpgrade skillUpgrade1 = TableManager.Instance.Tables.PlayerSkillUpgrade.Get(skillId, level1);
@ -575,12 +575,12 @@ public class UI_CommandSkillCultivateController : UIWindow
break;
case 2:
{
int skillId1 = curSelectItem.SkillData.ListUnLock[0];
int skillId1 = curSelectItem.SkillData.ListPreSkillID[0];
string name1 = CommonUtils.GetLocalizeText(TableManager.Instance.Tables.PlayerSkillConfig.Get(skillId1).NameLocal);
int level1 = Actor.Instance.PlayerSkill.GetLevel(skillId1);
DataPlayerSkillUpgrade skillUpgrade1 = TableManager.Instance.Tables.PlayerSkillUpgrade.Get(skillId1, level1);
int skillId2 = curSelectItem.SkillData.ListUnLock[1];
int skillId2 = curSelectItem.SkillData.ListPreSkillID[1];
string name2 = CommonUtils.GetLocalizeText(TableManager.Instance.Tables.PlayerSkillConfig.Get(skillId2).NameLocal);
int level2 = Actor.Instance.PlayerSkill.GetLevel(skillId2);
DataPlayerSkillUpgrade skillUpgrade2 = TableManager.Instance.Tables.PlayerSkillUpgrade.Get(skillId2, level2);

View File

@ -29,10 +29,11 @@ public sealed partial class DataPlayerSkillUpgrade : Bright.Config.BeanBase
{ var __json0 = _json["DescParamProperty"]; if(!__json0.IsArray) { throw new SerializationException(); } DescParamProperty = new System.Collections.Generic.List<string>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { string __v0; { if(!__e0.IsString) { throw new SerializationException(); } __v0 = __e0; } DescParamProperty.Add(__v0); } }
{ if(!_json["CDTime"].IsNumber) { throw new SerializationException(); } CDTime = _json["CDTime"]; }
{ if(!_json["ShiedValue"].IsNumber) { throw new SerializationException(); } ShiedValue = _json["ShiedValue"]; }
{ var __json0 = _json["PreSkillID"]; if(!__json0.IsArray) { throw new SerializationException(); } int _n0 = __json0.Count; PreSkillID = new int[_n0]; int __index0=0; foreach(JSONNode __e0 in __json0.Children) { int __v0; { if(!__e0.IsNumber) { throw new SerializationException(); } __v0 = __e0; } PreSkillID[__index0++] = __v0; } }
PostInit();
}
public DataPlayerSkillUpgrade(int ID, int Level, int MaxLevel, PlayerSkillCfg.PlayerSkillType skillType, int LayerID, int SkillID, int[] Unlock, System.Collections.Generic.List<item.ItemCounts> Cost, System.Collections.Generic.List<string> DescParamProperty, float CDTime, float ShiedValue )
public DataPlayerSkillUpgrade(int ID, int Level, int MaxLevel, PlayerSkillCfg.PlayerSkillType skillType, int LayerID, int SkillID, int[] Unlock, System.Collections.Generic.List<item.ItemCounts> Cost, System.Collections.Generic.List<string> DescParamProperty, float CDTime, float ShiedValue, int[] PreSkillID )
{
this.ID = ID;
this.Level = Level;
@ -45,6 +46,7 @@ public sealed partial class DataPlayerSkillUpgrade : Bright.Config.BeanBase
this.DescParamProperty = DescParamProperty;
this.CDTime = CDTime;
this.ShiedValue = ShiedValue;
this.PreSkillID = PreSkillID;
PostInit();
}
@ -97,6 +99,10 @@ public sealed partial class DataPlayerSkillUpgrade : Bright.Config.BeanBase
/// 护甲值
/// </summary>
public float ShiedValue { get; private set; }
/// <summary>
/// 前置ID
/// </summary>
public int[] PreSkillID { get; private set; }
public const int __ID__ = -628465675;
public override int GetTypeId() => __ID__;
@ -126,6 +132,7 @@ public sealed partial class DataPlayerSkillUpgrade : Bright.Config.BeanBase
+ "DescParamProperty:" + Bright.Common.StringUtil.CollectionToString(DescParamProperty) + ","
+ "CDTime:" + CDTime + ","
+ "ShiedValue:" + ShiedValue + ","
+ "PreSkillID:" + Bright.Common.StringUtil.CollectionToString(PreSkillID) + ","
+ "}";
}

View File

@ -17,7 +17,8 @@
"0"
],
"CDTime": 1,
"ShiedValue": 1
"ShiedValue": 1,
"PreSkillID": []
},
{
"ID": 111,
@ -37,7 +38,8 @@
"0"
],
"CDTime": 2,
"ShiedValue": 2
"ShiedValue": 2,
"PreSkillID": []
},
{
"ID": 111,
@ -57,7 +59,8 @@
"0"
],
"CDTime": 3,
"ShiedValue": 3
"ShiedValue": 3,
"PreSkillID": []
},
{
"ID": 111,
@ -77,7 +80,8 @@
"CDTime"
],
"CDTime": 4,
"ShiedValue": 4
"ShiedValue": 4,
"PreSkillID": []
},
{
"ID": 111,
@ -98,7 +102,8 @@
"CDTime"
],
"CDTime": 5,
"ShiedValue": 5
"ShiedValue": 5,
"PreSkillID": []
},
{
"ID": 111,
@ -118,7 +123,8 @@
"ShieldValue"
],
"CDTime": 6,
"ShiedValue": 6
"ShiedValue": 6,
"PreSkillID": []
},
{
"ID": 1003,
@ -127,9 +133,7 @@
"skillType": 0,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
111
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -140,7 +144,10 @@
"0"
],
"CDTime": 7,
"ShiedValue": 7
"ShiedValue": 7,
"PreSkillID": [
111
]
},
{
"ID": 1003,
@ -149,9 +156,7 @@
"skillType": 0,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
111
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -162,7 +167,10 @@
"0"
],
"CDTime": 8,
"ShiedValue": 8
"ShiedValue": 8,
"PreSkillID": [
111
]
},
{
"ID": 1003,
@ -171,9 +179,7 @@
"skillType": 0,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
111
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -184,7 +190,10 @@
"0"
],
"CDTime": 9,
"ShiedValue": 9
"ShiedValue": 9,
"PreSkillID": [
111
]
},
{
"ID": 1003,
@ -193,9 +202,7 @@
"skillType": 0,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
111
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -206,7 +213,10 @@
"0"
],
"CDTime": 10,
"ShiedValue": 10
"ShiedValue": 10,
"PreSkillID": [
111
]
},
{
"ID": 1003,
@ -215,9 +225,7 @@
"skillType": 0,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
111
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -228,7 +236,10 @@
"0"
],
"CDTime": 11,
"ShiedValue": 11
"ShiedValue": 11,
"PreSkillID": [
111
]
},
{
"ID": 1003,
@ -237,9 +248,7 @@
"skillType": 0,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
111
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -250,7 +259,10 @@
"0"
],
"CDTime": 12,
"ShiedValue": 12
"ShiedValue": 12,
"PreSkillID": [
111
]
},
{
"ID": 3001,
@ -259,9 +271,7 @@
"skillType": 0,
"LayerID": 3,
"SkillID": 0,
"Unlock": [
1003
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -272,7 +282,10 @@
"0"
],
"CDTime": 13,
"ShiedValue": 13
"ShiedValue": 13,
"PreSkillID": [
1003
]
},
{
"ID": 3001,
@ -281,9 +294,7 @@
"skillType": 0,
"LayerID": 3,
"SkillID": 0,
"Unlock": [
1003
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -294,7 +305,10 @@
"0"
],
"CDTime": 14,
"ShiedValue": 14
"ShiedValue": 14,
"PreSkillID": [
1003
]
},
{
"ID": 3001,
@ -303,9 +317,7 @@
"skillType": 0,
"LayerID": 3,
"SkillID": 0,
"Unlock": [
1003
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -316,7 +328,10 @@
"0"
],
"CDTime": 15,
"ShiedValue": 15
"ShiedValue": 15,
"PreSkillID": [
1003
]
},
{
"ID": 3001,
@ -325,9 +340,7 @@
"skillType": 0,
"LayerID": 3,
"SkillID": 0,
"Unlock": [
1003
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -338,7 +351,10 @@
"ShieldValue"
],
"CDTime": 16,
"ShiedValue": 16
"ShiedValue": 16,
"PreSkillID": [
1003
]
},
{
"ID": 2002,
@ -347,9 +363,7 @@
"skillType": 0,
"LayerID": 3,
"SkillID": 0,
"Unlock": [
1003
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -360,7 +374,10 @@
"0"
],
"CDTime": 17,
"ShiedValue": 17
"ShiedValue": 17,
"PreSkillID": [
1003
]
},
{
"ID": 2002,
@ -369,9 +386,7 @@
"skillType": 0,
"LayerID": 3,
"SkillID": 0,
"Unlock": [
1003
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -382,7 +397,10 @@
"0"
],
"CDTime": 18,
"ShiedValue": 18
"ShiedValue": 18,
"PreSkillID": [
1003
]
},
{
"ID": 2002,
@ -391,9 +409,7 @@
"skillType": 0,
"LayerID": 3,
"SkillID": 0,
"Unlock": [
1003
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -404,7 +420,10 @@
"0"
],
"CDTime": 19,
"ShiedValue": 19
"ShiedValue": 19,
"PreSkillID": [
1003
]
},
{
"ID": 112,
@ -413,10 +432,7 @@
"skillType": 0,
"LayerID": 4,
"SkillID": 0,
"Unlock": [
2002,
3001
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -427,7 +443,11 @@
"0"
],
"CDTime": 20,
"ShiedValue": 20
"ShiedValue": 20,
"PreSkillID": [
2002,
3001
]
},
{
"ID": 112,
@ -436,10 +456,7 @@
"skillType": 0,
"LayerID": 4,
"SkillID": 0,
"Unlock": [
2002,
3001
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -450,7 +467,11 @@
"0"
],
"CDTime": 21,
"ShiedValue": 21
"ShiedValue": 21,
"PreSkillID": [
2002,
3001
]
},
{
"ID": 112,
@ -459,10 +480,7 @@
"skillType": 0,
"LayerID": 4,
"SkillID": 0,
"Unlock": [
2002,
3001
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -473,7 +491,11 @@
"0"
],
"CDTime": 22,
"ShiedValue": 22
"ShiedValue": 22,
"PreSkillID": [
2002,
3001
]
},
{
"ID": 311,
@ -493,7 +515,8 @@
"0"
],
"CDTime": 23,
"ShiedValue": 23
"ShiedValue": 23,
"PreSkillID": []
},
{
"ID": 311,
@ -513,7 +536,8 @@
"0"
],
"CDTime": 24,
"ShiedValue": 24
"ShiedValue": 24,
"PreSkillID": []
},
{
"ID": 311,
@ -533,7 +557,8 @@
"0"
],
"CDTime": 25,
"ShiedValue": 25
"ShiedValue": 25,
"PreSkillID": []
},
{
"ID": 311,
@ -553,7 +578,8 @@
"0"
],
"CDTime": 26,
"ShiedValue": 26
"ShiedValue": 26,
"PreSkillID": []
},
{
"ID": 311,
@ -573,7 +599,8 @@
"0"
],
"CDTime": 27,
"ShiedValue": 27
"ShiedValue": 27,
"PreSkillID": []
},
{
"ID": 311,
@ -593,7 +620,8 @@
"0"
],
"CDTime": 28,
"ShiedValue": 28
"ShiedValue": 28,
"PreSkillID": []
},
{
"ID": 1001,
@ -602,9 +630,7 @@
"skillType": 1,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
311
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -615,7 +641,10 @@
"0"
],
"CDTime": 29,
"ShiedValue": 29
"ShiedValue": 29,
"PreSkillID": [
311
]
},
{
"ID": 1001,
@ -624,9 +653,7 @@
"skillType": 1,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
311
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -637,7 +664,10 @@
"0"
],
"CDTime": 30,
"ShiedValue": 30
"ShiedValue": 30,
"PreSkillID": [
311
]
},
{
"ID": 1001,
@ -646,9 +676,7 @@
"skillType": 1,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
311
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -659,7 +687,10 @@
"0"
],
"CDTime": 31,
"ShiedValue": 31
"ShiedValue": 31,
"PreSkillID": [
311
]
},
{
"ID": 1001,
@ -668,9 +699,7 @@
"skillType": 1,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
311
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -681,7 +710,10 @@
"0"
],
"CDTime": 32,
"ShiedValue": 32
"ShiedValue": 32,
"PreSkillID": [
311
]
},
{
"ID": 1001,
@ -690,9 +722,7 @@
"skillType": 1,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
311
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -703,7 +733,10 @@
"0"
],
"CDTime": 33,
"ShiedValue": 33
"ShiedValue": 33,
"PreSkillID": [
311
]
},
{
"ID": 1001,
@ -712,9 +745,7 @@
"skillType": 1,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
311
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -725,7 +756,10 @@
"0"
],
"CDTime": 34,
"ShiedValue": 34
"ShiedValue": 34,
"PreSkillID": [
311
]
},
{
"ID": 3002,
@ -743,7 +777,8 @@
],
"DescParamProperty": [],
"CDTime": 35,
"ShiedValue": 35
"ShiedValue": 35,
"PreSkillID": []
},
{
"ID": 3002,
@ -761,7 +796,8 @@
],
"DescParamProperty": [],
"CDTime": 36,
"ShiedValue": 36
"ShiedValue": 36,
"PreSkillID": []
},
{
"ID": 3002,
@ -779,7 +815,8 @@
],
"DescParamProperty": [],
"CDTime": 37,
"ShiedValue": 37
"ShiedValue": 37,
"PreSkillID": []
},
{
"ID": 3002,
@ -797,7 +834,8 @@
],
"DescParamProperty": [],
"CDTime": 38,
"ShiedValue": 38
"ShiedValue": 38,
"PreSkillID": []
},
{
"ID": 3002,
@ -815,7 +853,8 @@
],
"DescParamProperty": [],
"CDTime": 39,
"ShiedValue": 39
"ShiedValue": 39,
"PreSkillID": []
},
{
"ID": 3002,
@ -833,7 +872,8 @@
],
"DescParamProperty": [],
"CDTime": 40,
"ShiedValue": 40
"ShiedValue": 40,
"PreSkillID": []
},
{
"ID": 231,
@ -842,9 +882,7 @@
"skillType": 2,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
3002
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -853,7 +891,10 @@
],
"DescParamProperty": [],
"CDTime": 41,
"ShiedValue": 41
"ShiedValue": 41,
"PreSkillID": [
3002
]
},
{
"ID": 231,
@ -862,9 +903,7 @@
"skillType": 2,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
3002
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -873,7 +912,10 @@
],
"DescParamProperty": [],
"CDTime": 42,
"ShiedValue": 42
"ShiedValue": 42,
"PreSkillID": [
3002
]
},
{
"ID": 231,
@ -882,9 +924,7 @@
"skillType": 2,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
3002
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -893,7 +933,10 @@
],
"DescParamProperty": [],
"CDTime": 43,
"ShiedValue": 43
"ShiedValue": 43,
"PreSkillID": [
3002
]
},
{
"ID": 231,
@ -902,9 +945,7 @@
"skillType": 2,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
3002
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -913,7 +954,10 @@
],
"DescParamProperty": [],
"CDTime": 44,
"ShiedValue": 44
"ShiedValue": 44,
"PreSkillID": [
3002
]
},
{
"ID": 231,
@ -922,9 +966,7 @@
"skillType": 2,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
3002
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -933,7 +975,10 @@
],
"DescParamProperty": [],
"CDTime": 45,
"ShiedValue": 45
"ShiedValue": 45,
"PreSkillID": [
3002
]
},
{
"ID": 231,
@ -942,9 +987,7 @@
"skillType": 2,
"LayerID": 2,
"SkillID": 0,
"Unlock": [
3002
],
"Unlock": [],
"Cost": [
{
"Id": 1,
@ -953,6 +996,9 @@
],
"DescParamProperty": [],
"CDTime": 46,
"ShiedValue": 46
"ShiedValue": 46,
"PreSkillID": [
3002
]
}
]