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

更新引导

main
yurui 2024-10-17 12:33:34 +08:00
parent 06801808ee
commit d77adde489
5 changed files with 47 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,28 +106,35 @@ namespace Gameplay.Guide
public void BeginGuide(int completeStepId = 0)
{
#if GUIDE
if (IsGuiding)
return;
if (ConditionReactor.INVALID_ALLOC_ID != reactionID)
ConditionReactor.Instance.RemoveReaction(reactionID);
if (completeStepId == 0)
completeStepId = (int)Actor.Instance.Logic.GetCount((uint)LogicID.NewGuideProgress);
int groupId = GetGuideGroupId(completeStepId);
if (!dicGuideCfg.TryGetValue(groupId, out LinkedList<DataGuideCfg> linkCfg))
return;
curGroup = new GuideGroup(groupId, linkCfg);
if (curGroup.CurStep.Cfg.BeginCondition.Length <= 0)
try
{
OnBeginGuide(true, null, ConditionReactor.INVALID_ALLOC_ID);
return;
}
if (IsGuiding)
return;
reactionID = ConditionReactor.Instance.AddReaction(curGroup.CurStep.Cfg.BeginCondition, OnBeginGuide);
if (ConditionReactor.INVALID_ALLOC_ID != reactionID)
ConditionReactor.Instance.RemoveReaction(reactionID);
if (completeStepId == 0)
completeStepId = (int)Actor.Instance.Logic.GetCount((uint)LogicID.NewGuideProgress);
int groupId = GetGuideGroupId(completeStepId);
if (!dicGuideCfg.TryGetValue(groupId, out LinkedList<DataGuideCfg> linkCfg))
return;
curGroup = new GuideGroup(groupId, linkCfg);
if (curGroup.CurStep.Cfg.BeginCondition.Length <= 0)
{
OnBeginGuide(true, null, ConditionReactor.INVALID_ALLOC_ID);
return;
}
reactionID = ConditionReactor.Instance.AddReaction(curGroup.CurStep.Cfg.BeginCondition, OnBeginGuide);
}
catch (Exception e)
{
DebugUtil.LogError($"引导启动异常：{e}");
}
#endif
}

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

@ -524,7 +524,7 @@ namespace Gameplay.Guide
private async void OnCancelFightModel()
{
await UniTask.Delay(500);
await UniTask.Delay(400);
await UI_GuideController.Open(UI_GuideController.E_GuideArrowType.SliderButton, uiName, buttonPath, Cfg, floorIndex);
}
}
@ -1040,7 +1040,7 @@ namespace Gameplay.Guide
return;
team.ClearTeam();
uint[] characters = team.GetUnitIDs().ToArray();
uint[] characters = new uint[] { 0, 0, 0, 0 };
uint defaultCommander = 100001u;

312
ProjectNLD/Assets/Config/Data/actorcfg_item.json
View File

@ -5669,58 +5669,6 @@
],
"ExchangeParam": []
},
{
"ID": 102012,
"Type": 1,
"NameLocal": "ItemName_bk_1012",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102012.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102012",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 102013,
"Type": 1,
"NameLocal": "ItemName_bk_1013",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102013.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102013",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 102021,
"Type": 1,
@ -5747,58 +5695,6 @@
],
"ExchangeParam": []
},
{
"ID": 102022,
"Type": 1,
"NameLocal": "ItemName_bk_1022",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102022.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102022",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 102023,
"Type": 1,
"NameLocal": "ItemName_bk_1023",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102023.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102023",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 102031,
"Type": 1,
@ -5825,58 +5721,6 @@
],
"ExchangeParam": []
},
{
"ID": 102032,
"Type": 1,
"NameLocal": "ItemName_bk_1032",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102032.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102032",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 102033,
"Type": 1,
"NameLocal": "ItemName_bk_1033",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102033.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102033",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 102041,
"Type": 1,
@ -5903,58 +5747,6 @@
],
"ExchangeParam": []
},
{
"ID": 102042,
"Type": 1,
"NameLocal": "ItemName_bk_1042",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102042.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102042",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 102043,
"Type": 1,
"NameLocal": "ItemName_bk_1043",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102043.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102043",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 102051,
"Type": 1,
@ -5981,58 +5773,6 @@
],
"ExchangeParam": []
},
{
"ID": 102052,
"Type": 1,
"NameLocal": "ItemName_bk_1052",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102052.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102052",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 102053,
"Type": 1,
"NameLocal": "ItemName_bk_1053",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102053.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102053",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 102061,
"Type": 1,
@ -6059,58 +5799,6 @@
],
"ExchangeParam": []
},
{
"ID": 102062,
"Type": 1,
"NameLocal": "ItemName_bk_1062",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102062.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102062",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 102063,
"Type": 1,
"NameLocal": "ItemName_bk_1063",
"Param1": 0,
"Param2": 0,
"Param3": 0,
"Rarity": 0,
"BatchUsing": false,
"MaxCount": 0,
"IconPath": "Assets/Art/UI/Texture/Icon/MaterialFragment/Icon_102063.png",
"CoinIconPath": "",
"Selections": [],
"MaxUseCount": 0,
"ExpireTransfor": 0,
"ShowInStorage": true,
"StorageType": 3,
"IntroductionKey": "ItemIntroduction_102063",
"JumpToPos": 0,
"JumpToParam": 0,
"Acquisition": [
101001,
101002
],
"ExchangeParam": []
},
{
"ID": 104001,
"Type": 1,

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

@ -1178,7 +1178,7 @@
"Id": 519,
"GroupId": 500,
"BeginCondition": [],
"NextId": 520,
"NextId": 600,
"IsBeginStep": false,
"IsComplete": true,
"StepStartDelay": 0,
@ -1196,27 +1196,6 @@
},
"TipKey": ""
},
{
"Id": 520,
"GroupId": 500,
"BeginCondition": [],
"NextId": 600,
"IsBeginStep": false,
"IsComplete": false,
"StepStartDelay": 0,
"GuideStepType": 12,
"GuideTypeParams": [],
"GuideCompleteType": 4,
"CompleteTypeParams": [
"TeamChoose/UI_TeamInfo"
],
"ArrowDirection": 0,
"ArrowOffset": {
"x": 0,
"y": 0
},
"TipKey": ""
},
{
"Id": 600,
"GroupId": 600,

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

@ -3129,7 +3129,7 @@
},
{
"Key": "Exp_Consume",
"Value": "Exp消耗",
"Value": "指挥点数消耗",
"Param0": "",
"Param1": "",
"Param2": "",
@ -83839,6 +83839,22 @@
"Param2": "",
"Value_En": ""
},
{
"Key": "Package_JumpTo",
"Value": "跳转",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": ""
},
{
"Key": "Package_Lock",
"Value": "未解锁",
"Param0": "",
"Param1": "",
"Param2": "",
"Value_En": ""
},
{
"Key": "SkinInfo_PanelLocalText_Wearing",
"Value": "穿戴中",