Prg_ZhangXuheng
/
NLDClient-yudde
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

引导中技能释放失败的特殊处理

main
yurui 2024-10-17 18:27:11 +08:00
parent 244f300e21
commit c0ef49c342
13 changed files with 1712 additions and 1733 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideComplete.cs
View File

@ -668,6 +668,7 @@ namespace Gameplay.Guide
private void OnCancelUseSkill()
{
GuideManager.Instance.IsUseSkillSuccess = false;
LevelManager.Instance.CurrentLevel.SetPause(true);
AreaManager.instance.LogicUpdate(0);
@ -677,6 +678,7 @@ namespace Gameplay.Guide
public void OnUseSkill()
{
GuideManager.Instance.IsUseSkillSuccess = true;
LevelManager.Instance.CurrentLevel.SetPause(false);
AreaManager.instance.LogicUpdate(0);

4
ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs
View File

@ -65,6 +65,10 @@ namespace Gameplay.Guide
/// 是否编队引导
/// </summary>
public bool IsEditTeamGuide = false;
/// <summary>
/// 使用技能成功
/// </summary>
public bool IsUseSkillSuccess = true;
public void Init()
{

3
ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideStep.cs
View File

@ -386,7 +386,8 @@ namespace Gameplay.Guide
null != LevelManager.Instance.CurrentLevel &&
LevelManager.Instance.CurrentLevel.isInBattle)
{
LevelManager.Instance.CurrentLevel.SetPause(false);
if (GuideManager.Instance.IsUseSkillSuccess)
LevelManager.Instance.CurrentLevel.SetPause(false);
}
UIRoot.Instance.IsEnableGraphicRaycasterByGuide(true);

2
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Guide/UI_GuideController.cs
View File

@ -750,7 +750,7 @@ public class UI_GuideController : UIWindow
}
case E_GuideArrowType.Floor:
{
Vector3 worldPos = TerrainGridSystem.instance.CellGetPosition(guideInfo.FloorIndex);
Vector3 worldPos = TerrainGridSystem.instance.CellGetPosition(guideInfo.FloorIndex, true, -100f);
Vector3 pos = PhxhSDK.Utils.WorldPos2ScreenPos(worldPos, CameraManager.Instance.MainCamera, PerformanceManager.instance.screenScale);
arrowItem.SetInfo(pos, guideInfo.Cfg); // 设置引导箭头位置
}

1420
ProjectNLD/Assets/Config/Data/charactercfg_characterattri.json
View File

File diff suppressed because it is too large Load Diff

10
ProjectNLD/Assets/Config/Data/charactercfg_factionattri.json
View File

@ -6,27 +6,27 @@
},
{
"Faction": 2,
"IconPath": "Assets/Art/UI/Texture/Icon/Fraction/UI_Fraction_Union.png",
"IconPath": "Assets/Art/UI/Texture/Icon/Fraction/UI_Fraction_Republic.png",
"FlagPicPath": "UI_CharacterRegion_02.png"
},
{
"Faction": 3,
"IconPath": "Assets/Art/UI/Texture/Icon/Fraction/UI_Fraction_Republic.png",
"IconPath": "Assets/Art/UI/Texture/Icon/Fraction/UI_Fraction_Kingdom.png",
"FlagPicPath": "UI_CharacterRegion_04.png"
},
{
"Faction": 4,
"IconPath": "Assets/Art/UI/Texture/Icon/Fraction/UI_Fraction_Republic.png",
"IconPath": "Assets/Art/UI/Texture/Icon/Fraction/UI_Free.png",
"FlagPicPath": "UI_CharacterRegion_06.png"
},
{
"Faction": 5,
"IconPath": "Assets/Art/UI/Texture/Icon/Fraction/UI_Fraction_Kingdom.png",
"IconPath": "Assets/Art/UI/Texture/Icon/Fraction/UI_Fraction_EO.png",
"FlagPicPath": "UI_CharacterRegion_05.png"
},
{
"Faction": 6,
"IconPath": "Assets/Art/UI/Texture/Icon/Fraction/UI_Fraction_Kingdom.png",
"IconPath": "Assets/Art/UI/Texture/Icon/Fraction/UI_Fraction_League.png",
"FlagPicPath": "UI_CharacterRegion_03.png"
},
{

218
ProjectNLD/Assets/Config/Data/conditionconfig.json
View File

@ -91,79 +91,149 @@
"Param3": 0
},
{
"Id": 101011,
"Id": 102001,
"Type": 3,
"Param1": 101010,
"Param2": 0,
"Param3": 0
},
{
"Id": 101012,
"Id": 102002,
"Type": 3,
"Param1": 101011,
"Param1": 102001,
"Param2": 0,
"Param3": 0
},
{
"Id": 101013,
"Id": 102003,
"Type": 3,
"Param1": 101012,
"Param1": 102002,
"Param2": 0,
"Param3": 0
},
{
"Id": 101014,
"Id": 102004,
"Type": 3,
"Param1": 101013,
"Param1": 102003,
"Param2": 0,
"Param3": 0
},
{
"Id": 101015,
"Id": 102005,
"Type": 3,
"Param1": 101014,
"Param1": 102004,
"Param2": 0,
"Param3": 0
},
{
"Id": 101016,
"Id": 102006,
"Type": 3,
"Param1": 101015,
"Param1": 102005,
"Param2": 0,
"Param3": 0
},
{
"Id": 101017,
"Id": 102007,
"Type": 3,
"Param1": 101016,
"Param1": 102006,
"Param2": 0,
"Param3": 0
},
{
"Id": 101018,
"Id": 102008,
"Type": 3,
"Param1": 101017,
"Param1": 102007,
"Param2": 0,
"Param3": 0
},
{
"Id": 101019,
"Id": 102009,
"Type": 3,
"Param1": 101018,
"Param1": 102008,
"Param2": 0,
"Param3": 0
},
{
"Id": 101020,
"Id": 102010,
"Type": 3,
"Param1": 101019,
"Param1": 102009,
"Param2": 0,
"Param3": 0
},
{
"Id": 103001,
"Type": 3,
"Param1": 102010,
"Param2": 0,
"Param3": 0
},
{
"Id": 103002,
"Type": 3,
"Param1": 103001,
"Param2": 0,
"Param3": 0
},
{
"Id": 103003,
"Type": 3,
"Param1": 103002,
"Param2": 0,
"Param3": 0
},
{
"Id": 103004,
"Type": 3,
"Param1": 103003,
"Param2": 0,
"Param3": 0
},
{
"Id": 103005,
"Type": 3,
"Param1": 103004,
"Param2": 0,
"Param3": 0
},
{
"Id": 103006,
"Type": 3,
"Param1": 103005,
"Param2": 0,
"Param3": 0
},
{
"Id": 103007,
"Type": 3,
"Param1": 103006,
"Param2": 0,
"Param3": 0
},
{
"Id": 103008,
"Type": 3,
"Param1": 103007,
"Param2": 0,
"Param3": 0
},
{
"Id": 103009,
"Type": 3,
"Param1": 103008,
"Param2": 0,
"Param3": 0
},
{
"Id": 103010,
"Type": 3,
"Param1": 103009,
"Param2": 0,
"Param3": 0
},
{
"Id": 201001,
"Type": 3,
"Param1": 101020,
"Param1": 101010,
"Param2": 0,
"Param3": 0
},
@ -231,72 +301,142 @@
"Param3": 0
},
{
"Id": 201011,
"Id": 202001,
"Type": 3,
"Param1": 201010,
"Param2": 0,
"Param3": 0
},
{
"Id": 201012,
"Id": 202002,
"Type": 3,
"Param1": 201011,
"Param1": 202001,
"Param2": 0,
"Param3": 0
},
{
"Id": 201013,
"Id": 202003,
"Type": 3,
"Param1": 201012,
"Param1": 202002,
"Param2": 0,
"Param3": 0
},
{
"Id": 201014,
"Id": 202004,
"Type": 3,
"Param1": 201013,
"Param1": 202003,
"Param2": 0,
"Param3": 0
},
{
"Id": 201015,
"Id": 202005,
"Type": 3,
"Param1": 201014,
"Param1": 202004,
"Param2": 0,
"Param3": 0
},
{
"Id": 201016,
"Id": 202006,
"Type": 3,
"Param1": 201015,
"Param1": 202005,
"Param2": 0,
"Param3": 0
},
{
"Id": 201017,
"Id": 202007,
"Type": 3,
"Param1": 201016,
"Param1": 202006,
"Param2": 0,
"Param3": 0
},
{
"Id": 201018,
"Id": 202008,
"Type": 3,
"Param1": 201017,
"Param1": 202007,
"Param2": 0,
"Param3": 0
},
{
"Id": 201019,
"Id": 202009,
"Type": 3,
"Param1": 201018,
"Param1": 202008,
"Param2": 0,
"Param3": 0
},
{
"Id": 201020,
"Id": 202010,
"Type": 3,
"Param1": 201019,
"Param1": 202009,
"Param2": 0,
"Param3": 0
},
{
"Id": 203001,
"Type": 3,
"Param1": 202010,
"Param2": 0,
"Param3": 0
},
{
"Id": 203002,
"Type": 3,
"Param1": 203001,
"Param2": 0,
"Param3": 0
},
{
"Id": 203003,
"Type": 3,
"Param1": 203002,
"Param2": 0,
"Param3": 0
},
{
"Id": 203004,
"Type": 3,
"Param1": 203003,
"Param2": 0,
"Param3": 0
},
{
"Id": 203005,
"Type": 3,
"Param1": 203004,
"Param2": 0,
"Param3": 0
},
{
"Id": 203006,
"Type": 3,
"Param1": 203005,
"Param2": 0,
"Param3": 0
},
{
"Id": 203007,
"Type": 3,
"Param1": 203006,
"Param2": 0,
"Param3": 0
},
{
"Id": 203008,
"Type": 3,
"Param1": 203007,
"Param2": 0,
"Param3": 0
},
{
"Id": 203009,
"Type": 3,
"Param1": 203008,
"Param2": 0,
"Param3": 0
},
{
"Id": 203010,
"Type": 3,
"Param1": 203009,
"Param2": 0,
"Param3": 0
},

20
ProjectNLD/Assets/Config/Data/guidecfg_guideconfig.json
View File

@ -1299,7 +1299,7 @@
"ArrowDirection": 1,
"ArrowOffset": {
"x": 0,
"y": 50
"y": 0
},
"TipKey": ""
},
@ -1321,10 +1321,10 @@
"CompleteTypeParams": [
"2"
],
"ArrowDirection": 6,
"ArrowDirection": 0,
"ArrowOffset": {
"x": 50,
"y": 50
"x": 0,
"y": 0
},
"TipKey": ""
},
@ -1346,10 +1346,10 @@
"CompleteTypeParams": [
"3"
],
"ArrowDirection": 6,
"ArrowDirection": 0,
"ArrowOffset": {
"x": 50,
"y": 50
"x": 0,
"y": 0
},
"TipKey": ""
},
@ -1371,10 +1371,10 @@
"CompleteTypeParams": [
"4"
],
"ArrowDirection": 6,
"ArrowDirection": 0,
"ArrowOffset": {
"x": 50,
"y": 50
"x": 0,
"y": 0
},
"TipKey": ""
},

1182
ProjectNLD/Assets/Config/Data/levelcfg_level.json
View File

File diff suppressed because it is too large Load Diff

20
ProjectNLD/Assets/Config/Data/monstercfg_monster.json
View File

@ -579,7 +579,7 @@
"HPFix": 1,
"ShieldFix": 1,
"DefenceFix": 1,
"FindEnemyRange": 4,
"FindEnemyRange": 20,
"MonsterLevel": 4
},
{
@ -590,7 +590,7 @@
"HPFix": 1,
"ShieldFix": 1,
"DefenceFix": 1,
"FindEnemyRange": 4,
"FindEnemyRange": 20,
"MonsterLevel": 4
},
{
@ -601,7 +601,7 @@
"HPFix": 1,
"ShieldFix": 1,
"DefenceFix": 1,
"FindEnemyRange": 4,
"FindEnemyRange": 20,
"MonsterLevel": 4
},
{
@ -612,7 +612,7 @@
"HPFix": 1,
"ShieldFix": 1,
"DefenceFix": 1,
"FindEnemyRange": 4,
"FindEnemyRange": 20,
"MonsterLevel": 4
},
{
@ -623,7 +623,7 @@
"HPFix": 1,
"ShieldFix": 1,
"DefenceFix": 1,
"FindEnemyRange": 5,
"FindEnemyRange": 20,
"MonsterLevel": 4
},
{
@ -1305,7 +1305,7 @@
"HPFix": 1,
"ShieldFix": 1,
"DefenceFix": 1,
"FindEnemyRange": 20,
"FindEnemyRange": 30,
"MonsterLevel": 11
},
{
@ -1316,7 +1316,7 @@
"HPFix": 1,
"ShieldFix": 1,
"DefenceFix": 1,
"FindEnemyRange": 20,
"FindEnemyRange": 30,
"MonsterLevel": 11
},
{
@ -1327,7 +1327,7 @@
"HPFix": 1,
"ShieldFix": 1,
"DefenceFix": 1,
"FindEnemyRange": 20,
"FindEnemyRange": 30,
"MonsterLevel": 11
},
{
@ -1338,7 +1338,7 @@
"HPFix": 1,
"ShieldFix": 1,
"DefenceFix": 1,
"FindEnemyRange": 20,
"FindEnemyRange": 30,
"MonsterLevel": 11
},
{
@ -1349,7 +1349,7 @@
"HPFix": 1,
"ShieldFix": 1,
"DefenceFix": 1,
"FindEnemyRange": 20,
"FindEnemyRange": 30,
"MonsterLevel": 11
},
{

350
ProjectNLD/Assets/Config/Data/skillcfg_skillconfig.json
View File

File diff suppressed because it is too large Load Diff

194
ProjectNLD/Assets/Config/Data/stringcfg_stringconfig.json
View File

@ -81599,6 +81599,198 @@
"Param2": "",
"Value_En": "Dialogue_100095042"
},
{
"Key": "Dialogue_100096001",
"Value": "被吓到了吗，准尉同志？既然你嫌娜塔莎不正宗，那就以联盟军官真正的样子接受考察吧！何况啊，这么多可爱的萌妹子被你独享，太浪费啦……",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096001"
},
{
"Key": "Dialogue_100096002",
"Value": "呀，准尉同志要开始一天的工作了吗？让我好好瞧瞧吧！",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096002"
},
{
"Key": "Dialogue_100096003",
"Value": "娜塔莎的抛枪动作很帅气吧？我可是对着镜子练了好几个月呢。",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096003"
},
{
"Key": "Dialogue_100096004",
"Value": "这，这河里的水好冷！…不，对于正宗的联盟军官来说，在结冰的河里游泳就跟洗热水澡一样自在！所以，我要再下去游一圈。",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096004"
},
{
"Key": "Dialogue_100096005",
"Value": "准尉同志，有件事想找你请示啦——娜塔莎准备好好学学外语，能不能让丽达妹妹来教教我呢？或者埃琳娜姐姐也可以……唔，为什么不找亚历珊德拉学？她毕竟不那么地道嘛。",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096005"
},
{
"Key": "Dialogue_100096006",
"Value": "当当当当！看吧，娜塔莎搜集了这么多的联盟勋章和奖章！花钱是小事，重要的是为此还做了许多研究！……诶，你、你说的对呀，不知道这些勋章的原主人是遭遇了什么，才会被迫把自己的荣誉拿出来卖钱…嗯，那还是不要挂出来了……",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096006"
},
{
"Key": "Dialogue_100096007",
"Value": "准尉同志？准尉同志？……嘿嘿，睡着了！娜塔莎出击，目标毛妹！",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096007"
},
{
"Key": "Dialogue_100096008",
"Value": "哦，原来准尉为了妹子们，已经经历了这么多生死考验……嗯，娜塔莎也不会输给你的！不管是肋骨摔断还是肩膀中枪都无所谓！不、不过屁股上穿四个洞还是……",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096008"
},
{
"Key": "Dialogue_100096009",
"Value": "可恶！作为联盟军官的完成度被准尉同志压制，作为毛妹猎手的强度也远远不及…啊，不过能经常从准尉同志身上嗅到毛妹的味道，也不错哦。",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096009"
},
{
"Key": "Dialogue_100096010",
"Value": "我收集的这些联盟的勋章，还是交给准尉同志保管吧，如果我出了什么事情，就得靠准尉同志将这些交还给原主了…黑马中队的妹子们，准尉也要照顾好她们哦，还有这瓶伏特加，我们也一起喝了吧！诶，什么时候漏光了，我都不知道……",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096010"
},
{
"Key": "Dialogue_100096011",
"Value": "杂鱼~杂鱼~，不敢对毛妹下手的杂鱼准尉同志，小心被娜塔莎取而代之，送去领特殊养老金哦~",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096011"
},
{
"Key": "Dialogue_100096012",
"Value": "嘿嘿，准尉同志对付毛妹的办法真~是老道，自娜塔莎学习了准尉同志的手腕，黑马中队变得听话多了！不过准尉同志要是来人家这里挖墙脚…什么，已经挖过了？！谁，谁被你挖到手了？！",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096012"
},
{
"Key": "Dialogue_100096013",
"Value": "哎呀呀，准尉同志您别推了，我不会对丽达妹妹出手的。",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096013"
},
{
"Key": "Dialogue_100096014",
"Value": "嗯，能力提升了，伏特加的度数也该提升一下了！",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096014"
},
{
"Key": "Dialogue_100096015",
"Value": "我变强啦，快拿新的名单过来！",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096015"
},
{
"Key": "Dialogue_100096016",
"Value": "侦察兵就绪，让我看看目标在哪。",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096016"
},
{
"Key": "Dialogue_100096017",
"Value": "赢了！娜塔莎是最强的！",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096017"
},
{
"Key": "Dialogue_100096018",
"Value": "啧，不小心失误了，下次我一定把对面干掉。",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096018"
},
{
"Key": "Dialogue_100096037",
"Value": "黑马中队的军装毛妹当然也很可爱，但果然还是准尉同志身边的更地道！所以今天也要努力在这里挖墙角……嗯，在努力学习！",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096037"
},
{
"Key": "Dialogue_100096038",
"Value": "侦察兵更喜欢夜晚，偷袭拿下一个，冲锋再拿下一个，然后就溜之大吉啦。不过，要想拿下准尉同志，有点困难哦。",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096038"
},
{
"Key": "Dialogue_100096039",
"Value": "诶，我为什么会在这里倒立呢？…我刚才好像是在跟踪丽达妹妹，但是她转过身来对我笑了一下，然后我眼前开始转圈圈，什么也不知道了…",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096039"
},
{
"Key": "Dialogue_100096040",
"Value": "下半夜岗务必要交给娜塔莎哦，要让毛妹们都好好休息，才能保持健康可爱嘛！",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096040"
},
{
"Key": "Dialogue_100096041",
"Value": "准尉同志快来参加我的生日派对吧，有很多毛妹一起玩耍哦！…不喜欢吗，那，那就，我们两个单独在一起庆祝一下？…",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096041"
},
{
"Key": "Dialogue_100096042",
"Value": "那个，祝准尉同志生日快乐，献上娜塔莎衷心的祝福，以及、以及世界上所有的恭喜啦！还有这瓶伏特加…不用担心，这一瓶是新买的。",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": "Dialogue_100096042"
},
{
"Key": "Dialogue_100098001",
"Value": "这，这是，是恶名昭彰的准尉本人！听好了！我有坚不可摧的自由意志，才不会被你那那些邪恶的洗脑科技和外星巫术催眠控制！所以别指望我会对你言听计从，百依百顺，做各种奇、奇怪的事情…，",
@ -83753,7 +83945,7 @@
},
{
"Key": "ItemIntroduction_1110002",
"Value": "本计划可用于一次特殊战斗员「招募」\n\n宁静的发射场，草原上点点星光…那是她在送我们远航",
"Value": "本计划可用于一次特殊战斗员「招募」\\n宁静的发射场，草原上点点星光…那是她在送我们远航",
"Param0": "",
"Param1": "",
"Param2": "",

20
ProjectNLD/Assets/Config/Data/vehiclecfg_vehicleconfig.json
View File

@ -27,9 +27,9 @@
"WeaponId": 10000101,
"ReloadTime": 4,
"FireRate": 1,
"MoveSpeed": 2,
"MoveSpeed": 6,
"TurnSpeed": 400,
"AttackDistance": 4,
"AttackDistance": 5,
"AttackIgnoreBlock": false,
"MoraleDamage": 70,
"ScaleForHuman": 1,
@ -71,9 +71,9 @@
"WeaponId": 10000201,
"ReloadTime": 4,
"FireRate": 1,
"MoveSpeed": 2,
"MoveSpeed": 6,
"TurnSpeed": 400,
"AttackDistance": 4,
"AttackDistance": 5,
"AttackIgnoreBlock": false,
"MoraleDamage": 70,
"ScaleForHuman": 1,
@ -115,9 +115,9 @@
"WeaponId": 10000601,
"ReloadTime": 4,
"FireRate": 1,
"MoveSpeed": 3,
"MoveSpeed": 9,
"TurnSpeed": 400,
"AttackDistance": 3,
"AttackDistance": 5,
"AttackIgnoreBlock": false,
"MoraleDamage": 70,
"ScaleForHuman": 1,
@ -159,9 +159,9 @@
"WeaponId": 10000801,
"ReloadTime": 4,
"FireRate": 1,
"MoveSpeed": 3,
"MoveSpeed": 9,
"TurnSpeed": 400,
"AttackDistance": 3,
"AttackDistance": 5,
"AttackIgnoreBlock": false,
"MoraleDamage": 70,
"ScaleForHuman": 1,
@ -203,9 +203,9 @@
"WeaponId": 10001201,
"ReloadTime": 4,
"FireRate": 1,
"MoveSpeed": 3,
"MoveSpeed": 6,
"TurnSpeed": 400,
"AttackDistance": 3,
"AttackDistance": 5,
"AttackIgnoreBlock": false,
"MoraleDamage": 70,
"ScaleForHuman": 1,