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

一些通用代码和pb上传防冲突

main
LuoFang 2023-11-15 15:23:27 +08:00
parent f7ab4dbe04
commit b64c942582
8 changed files with 194 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ProjectNLD/Assets/Code/Scripts/Framework/Event/Events.cs
View File

@ -135,6 +135,9 @@
//角色
GetNewCharacter,//获得新角色
//载具
VehecleUpgrade,
}
}
}

10
ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs
View File

@ -51,6 +51,10 @@ public partial class UIManager
_WindowMeta(UINameConst.UI_BeforeFight,UIWindowLayer.Normal);
_WindowMeta(UINameConst.UI_Setting,UIWindowLayer.Normal);
_WindowMeta(UINameConst.UI_Notice, UIWindowLayer.Normal);
_WindowMeta(UINameConst.UI_VehicleChoose, UIWindowLayer.Normal);
_WindowMeta(UINameConst.UI_VehicleCultivate, UIWindowLayer.Normal);
_WindowMeta(UINameConst.UI_VehicleLevelUp, UIWindowLayer.Normal);
}
@ -114,4 +118,10 @@ public static class UINameConst
public static readonly string UI_Setting = "Setting/UI_Setting";
public static readonly string UI_Notice = "Interface/UI_Notice";
public static readonly string UI_VehicleCultivate = "MainScene/VehicleCultivate/UI_VehicleCultivate";
public static readonly string UI_VehicleChoose = "MainScene/VehicleCultivate/UI_VehicleChoose";
public static readonly string UI_VehicleLevelUp = "MainScene/VehicleCultivate/UI_VehicleLevelUp";
}

2
ProjectNLD/Assets/Code/Scripts/Gameplay/Debug/SROptions.VehicleCutivate.cs
View File

@ -45,7 +45,7 @@ public partial class SROptions
public void UpgradeVehicle()
{
NetHelper.VehicleUpgrade((uint)VehicleId, (uint)VehicleUpgradeTypeInt);
//NetHelper.VehicleUpgrade((uint)VehicleId, (uint)VehicleUpgradeTypeInt);
}
}

7
ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Client/NetHelper.cs
View File

@ -52,11 +52,14 @@ namespace Gameplay.Net
}
// 载具升级
public static void VehicleUpgrade(uint nVehicleID, uint nUpgradeType)
public static void VehicleUpgrade(uint nVehicleID, uint[] upgrade_type, uint[] upgrade_count)
{
MSG_Clt_G_VehicleUpgrade msg = NetManager.Instance.GetMessage(NLDMID.MSGID.CltGVehicleUpgrade) as MSG_Clt_G_VehicleUpgrade;
msg.mPB.VehicleId = nVehicleID;
msg.mPB.UpgradeType = nUpgradeType;
msg.mPB.UpgradeType.Clear();
msg.mPB.UpgradeType.AddRange(upgrade_type);
msg.mPB.UpgradeCount.Clear();
msg.mPB.UpgradeCount.AddRange(upgrade_count);
NetManager.Instance.mClient.SendMessage(msg);
}

4
ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Messages/MSG_G_Clt_OpResult.cs
View File

@ -1,4 +1,4 @@
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
//
// 文件：/Code/Scripts/Gameplay/Net/Messages/MSG_G_Clt_OpResult.cs
// 作者：NLD Tools
@ -87,7 +87,7 @@ namespace Gameplay.Net
}
case (uint)MSGID.CltGVehicleUpgrade:
{
DebugUtil.LogError("升级成功"); ;
EventManager.Instance.Send(EventManager.EventName.VehecleUpgrade);
}
break;

130
ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Proto/Client.cs
View File

@ -72,36 +72,36 @@ namespace NLDPB {
"DkdfQ2x0X0l0ZW1MaXN0EhMKC2l0ZW1fc291cmNlGAEgASgNEhEKCXNvdXJj",
"ZV9pZBgCIAEoDRIPCgdpdGVtX2lkGAMgAygNEhIKCml0ZW1fY291bnQYBCAD",
"KA0SDQoFaW5kZXgYBSABKA0iNQoTQ2x0X0dfQ2hhcHRlclJld2FyZBIPCgdj",
"aGFwdGVyGAEgASgNEg0KBWluZGV4GAIgASgNIkAKFENsdF9HX1ZlaGljbGVV",
"aGFwdGVyGAEgASgNEg0KBWluZGV4GAIgASgNIlcKFENsdF9HX1ZlaGljbGVV",
"cGdyYWRlEhIKCnZlaGljbGVfaWQYASABKA0SFAoMdXBncmFkZV90eXBlGAIg",
"ASgNImMKDE1TR19UZWFtSW5mbxINCgVpbmRleBgBIAEoDRIMCgRuYW1lGAIg",
"ASgJEgwKBGljb24YAyABKA0SFAoMY2hhcmFjdGVyX2lkGAQgAygNEhIKCnZl",
"aGljbGVfaWQYBSABKA0iRgoPR19DbHRfQWN0b3JUZWFtEg4KBmlzX2FsbBgB",
"IAEoCBIjCgVpbmZvcxgCIAMoCzIULk5MRF9QQi5NU0dfVGVhbUluZm8iZwoQ",
"Q2x0X0dfQ3JlYXRlVGVhbRINCgVpbmRleBgBIAEoDRIMCgRuYW1lGAIgASgJ",
"EgwKBGljb24YAyABKA0SFAoMY2hhcmFjdGVyX2lkGAQgAygNEhIKCnZlaGlj",
"bGVfaWQYBSABKA0iKgoNQ2x0X0dfVXNlSXRlbRIKCgJpZBgBIAEoDRINCgVj",
"b3VudBgCIAEoDSIQCg5DbHRfR19UZXN0SW5pdCIeCg5DbHRfR19HaWZ0Q29k",
"ZRIMCgRjb2RlGAEgASgJIiAKD01sX0NsdF9NYWlsSW5mbxINCgVjb3VudBgB",
"IAEoDSIUChJDbHRfTWxfTWFpbFJlcXVlc3QiagoITVNHX01haWwSCgoCaWQY",
"ASABKAQSEQoJc2VuZF90aW1lGAIgASgNEg8KB21haWxfaWQYAyABKA0SEQoJ",
"bWFpbF9kYXRhGAQgASgMEg0KBXRpdGxlGAUgASgJEgwKBGJvZHkYBiABKAki",
"MgoPTWxfQ2x0X01haWxEYXRhEh8KBW1haWxzGAEgAygLMhAuTkxEX1BCLk1T",
"R19NYWlsIh4KD0NsdF9NbF9PcGVuTWFpbBILCgNpZHMYASADKAQiKQoMTVNH",
"X01haWxJdGVtEgoKAmlkGAEgASgNEg0KBWNvdW50GAIgASgNIkUKDE1TR19N",
"YWlsRGF0YRIjCgVpdGVtcxgBIAMoCzIULk5MRF9QQi5NU0dfTWFpbEl0ZW0S",
"EAoIbWFpbF9tc2cYAiADKAkiFgoUTWxfQ2x0X05ld0dsb2JhbE1haWwiNAoO",
"R19DbHRfTG9naW5LZXkSEQoJc2VydmVyX2lkGAIgASgNEg8KB2tleV9zdHIY",
"ASABKAkiNAoNQ2x0X0dfUmVsb2dpbhIQCghhY3Rvcl9pZBgBIAEoDRIRCgls",
"b2dpbl9rZXkYAiABKAkqPAoJTG9naW5UeXBlEggKBE5vbmUQABIJCgRQSFhI",
"EOgHEgsKBlRhcFRhcBDpBxINCghGaXJlYmFzZRDqByo6Cg1QSFhITG9naW5E",
"YXRhEgsKB0FjY291bnQQABIMCghQYXNzd29yZBABEg4KClBIWEhMRF9NYXgQ",
"AipACg9UYXBUYXBMb2dpbkRhdGESDwoLQWNjZXNzVG9rZW4QABIKCgZNYWNL",
"ZXkQARIQCgxUYXBUYXBMRF9NYXgQAiouChFGaXJlYmFzZUxvZ2luRGF0YRIL",
"CgdJRFRva2VuEAASDAoIRkJMRF9NYXgQASpjCgtVcGdyYWRlVHlwZRILCgdV",
"VF9Ob25lEAASDAoIVVRfTGV2ZWwQARIMCghVVF9CcmVhaxACEhEKDVVUX1Vs",
"dHJhU2tpbGwQAxIMCghVVF9Bd2FrZRAEEgoKBlVJX01heBAFQgtaCXBiL3hz",
"Zl9wYmIGcHJvdG8z"));
"AygNEhUKDXVwZ3JhZGVfY291bnQYAyADKA0iYwoMTVNHX1RlYW1JbmZvEg0K",
"BWluZGV4GAEgASgNEgwKBG5hbWUYAiABKAkSDAoEaWNvbhgDIAEoDRIUCgxj",
"aGFyYWN0ZXJfaWQYBCADKA0SEgoKdmVoaWNsZV9pZBgFIAEoDSJGCg9HX0Ns",
"dF9BY3RvclRlYW0SDgoGaXNfYWxsGAEgASgIEiMKBWluZm9zGAIgAygLMhQu",
"TkxEX1BCLk1TR19UZWFtSW5mbyJnChBDbHRfR19DcmVhdGVUZWFtEg0KBWlu",
"ZGV4GAEgASgNEgwKBG5hbWUYAiABKAkSDAoEaWNvbhgDIAEoDRIUCgxjaGFy",
"YWN0ZXJfaWQYBCADKA0SEgoKdmVoaWNsZV9pZBgFIAEoDSIqCg1DbHRfR19V",
"c2VJdGVtEgoKAmlkGAEgASgNEg0KBWNvdW50GAIgASgNIhAKDkNsdF9HX1Rl",
"c3RJbml0Ih4KDkNsdF9HX0dpZnRDb2RlEgwKBGNvZGUYASABKAkiIAoPTWxf",
"Q2x0X01haWxJbmZvEg0KBWNvdW50GAEgASgNIhQKEkNsdF9NbF9NYWlsUmVx",
"dWVzdCJqCghNU0dfTWFpbBIKCgJpZBgBIAEoBBIRCglzZW5kX3RpbWUYAiAB",
"KA0SDwoHbWFpbF9pZBgDIAEoDRIRCgltYWlsX2RhdGEYBCABKAwSDQoFdGl0",
"bGUYBSABKAkSDAoEYm9keRgGIAEoCSIyCg9NbF9DbHRfTWFpbERhdGESHwoF",
"bWFpbHMYASADKAsyEC5OTERfUEIuTVNHX01haWwiHgoPQ2x0X01sX09wZW5N",
"YWlsEgsKA2lkcxgBIAMoBCIpCgxNU0dfTWFpbEl0ZW0SCgoCaWQYASABKA0S",
"DQoFY291bnQYAiABKA0iRQoMTVNHX01haWxEYXRhEiMKBWl0ZW1zGAEgAygL",
"MhQuTkxEX1BCLk1TR19NYWlsSXRlbRIQCghtYWlsX21zZxgCIAMoCSIWChRN",
"bF9DbHRfTmV3R2xvYmFsTWFpbCI0Cg5HX0NsdF9Mb2dpbktleRIRCglzZXJ2",
"ZXJfaWQYAiABKA0SDwoHa2V5X3N0chgBIAEoCSI0Cg1DbHRfR19SZWxvZ2lu",
"EhAKCGFjdG9yX2lkGAEgASgNEhEKCWxvZ2luX2tleRgCIAEoCSo8CglMb2dp",
"blR5cGUSCAoETm9uZRAAEgkKBFBIWEgQ6AcSCwoGVGFwVGFwEOkHEg0KCEZp",
"cmViYXNlEOoHKjoKDVBIWEhMb2dpbkRhdGESCwoHQWNjb3VudBAAEgwKCFBh",
"c3N3b3JkEAESDgoKUEhYSExEX01heBACKkAKD1RhcFRhcExvZ2luRGF0YRIP",
"CgtBY2Nlc3NUb2tlbhAAEgoKBk1hY0tleRABEhAKDFRhcFRhcExEX01heBAC",
"Ki4KEUZpcmViYXNlTG9naW5EYXRhEgsKB0lEVG9rZW4QABIMCghGQkxEX01h",
"eBABKmMKC1VwZ3JhZGVUeXBlEgsKB1VUX05vbmUQABIMCghVVF9MZXZlbBAB",
"EgwKCFVUX0JyZWFrEAISEQoNVVRfVWx0cmFTa2lsbBADEgwKCFVUX0F3YWtl",
"EAQSCgoGVUlfTWF4EAVCC1oJcGIveHNmX3BiYgZwcm90bzM="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::NLDPB.LoginType), typeof(global::NLDPB.PHXHLoginData), typeof(global::NLDPB.TapTapLoginData), typeof(global::NLDPB.FirebaseLoginData), typeof(global::NLDPB.UpgradeType), }, null, new pbr::GeneratedClrTypeInfo[] {
@ -138,7 +138,7 @@ namespace NLDPB {
new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.MSG_NewRaffleResult), global::NLDPB.MSG_NewRaffleResult.Parser, new[]{ "Index", "ItemId" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.G_Clt_ItemList), global::NLDPB.G_Clt_ItemList.Parser, new[]{ "ItemSource", "SourceId", "ItemId", "ItemCount", "Index" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_ChapterReward), global::NLDPB.Clt_G_ChapterReward.Parser, new[]{ "Chapter", "Index" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_VehicleUpgrade), global::NLDPB.Clt_G_VehicleUpgrade.Parser, new[]{ "VehicleId", "UpgradeType" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_VehicleUpgrade), global::NLDPB.Clt_G_VehicleUpgrade.Parser, new[]{ "VehicleId", "UpgradeType", "UpgradeCount" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.MSG_TeamInfo), global::NLDPB.MSG_TeamInfo.Parser, new[]{ "Index", "Name", "Icon", "CharacterId", "VehicleId" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.G_Clt_ActorTeam), global::NLDPB.G_Clt_ActorTeam.Parser, new[]{ "IsAll", "Infos" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::NLDPB.Clt_G_CreateTeam), global::NLDPB.Clt_G_CreateTeam.Parser, new[]{ "Index", "Name", "Icon", "CharacterId", "VehicleId" }, null, null, null, null),
@ -8192,7 +8192,8 @@ namespace NLDPB {
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public Clt_G_VehicleUpgrade(Clt_G_VehicleUpgrade other) : this() {
vehicleId_ = other.vehicleId_;
upgradeType_ = other.upgradeType_;
upgradeType_ = other.upgradeType_.Clone();
upgradeCount_ = other.upgradeCount_.Clone();
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
}
@ -8219,17 +8220,30 @@ namespace NLDPB {
/// <summary>Field number for the "upgrade_type" field.</summary>
public const int UpgradeTypeFieldNumber = 2;
private uint upgradeType_;
private static readonly pb::FieldCodec<uint> _repeated_upgradeType_codec
= pb::FieldCodec.ForUInt32(18);
private readonly pbc::RepeatedField<uint> upgradeType_ = new pbc::RepeatedField<uint>();
/// <summary>
/// 升级的属性类型 参考 ActorCfg.VihecleUpgradeType
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public uint UpgradeType {
public pbc::RepeatedField<uint> UpgradeType {
get { return upgradeType_; }
set {
upgradeType_ = value;
}
}
/// <summary>Field number for the "upgrade_count" field.</summary>
public const int UpgradeCountFieldNumber = 3;
private static readonly pb::FieldCodec<uint> _repeated_upgradeCount_codec
= pb::FieldCodec.ForUInt32(26);
private readonly pbc::RepeatedField<uint> upgradeCount_ = new pbc::RepeatedField<uint>();
/// <summary>
/// 升级次数
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public pbc::RepeatedField<uint> UpgradeCount {
get { return upgradeCount_; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@ -8248,7 +8262,8 @@ namespace NLDPB {
return true;
}
if (VehicleId != other.VehicleId) return false;
if (UpgradeType != other.UpgradeType) return false;
if(!upgradeType_.Equals(other.upgradeType_)) return false;
if(!upgradeCount_.Equals(other.upgradeCount_)) return false;
return Equals(_unknownFields, other._unknownFields);
}
@ -8257,7 +8272,8 @@ namespace NLDPB {
public override int GetHashCode() {
int hash = 1;
if (VehicleId != 0) hash ^= VehicleId.GetHashCode();
if (UpgradeType != 0) hash ^= UpgradeType.GetHashCode();
hash ^= upgradeType_.GetHashCode();
hash ^= upgradeCount_.GetHashCode();
if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode();
}
@ -8280,10 +8296,8 @@ namespace NLDPB {
output.WriteRawTag(8);
output.WriteUInt32(VehicleId);
}
if (UpgradeType != 0) {
output.WriteRawTag(16);
output.WriteUInt32(UpgradeType);
}
upgradeType_.WriteTo(output, _repeated_upgradeType_codec);
upgradeCount_.WriteTo(output, _repeated_upgradeCount_codec);
if (_unknownFields != null) {
_unknownFields.WriteTo(output);
}
@ -8298,10 +8312,8 @@ namespace NLDPB {
output.WriteRawTag(8);
output.WriteUInt32(VehicleId);
}
if (UpgradeType != 0) {
output.WriteRawTag(16);
output.WriteUInt32(UpgradeType);
}
upgradeType_.WriteTo(ref output, _repeated_upgradeType_codec);
upgradeCount_.WriteTo(ref output, _repeated_upgradeCount_codec);
if (_unknownFields != null) {
_unknownFields.WriteTo(ref output);
}
@ -8315,9 +8327,8 @@ namespace NLDPB {
if (VehicleId != 0) {
size += 1 + pb::CodedOutputStream.ComputeUInt32Size(VehicleId);
}
if (UpgradeType != 0) {
size += 1 + pb::CodedOutputStream.ComputeUInt32Size(UpgradeType);
}
size += upgradeType_.CalculateSize(_repeated_upgradeType_codec);
size += upgradeCount_.CalculateSize(_repeated_upgradeCount_codec);
if (_unknownFields != null) {
size += _unknownFields.CalculateSize();
}
@ -8333,9 +8344,8 @@ namespace NLDPB {
if (other.VehicleId != 0) {
VehicleId = other.VehicleId;
}
if (other.UpgradeType != 0) {
UpgradeType = other.UpgradeType;
}
upgradeType_.Add(other.upgradeType_);
upgradeCount_.Add(other.upgradeCount_);
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
}
@ -8355,8 +8365,14 @@ namespace NLDPB {
VehicleId = input.ReadUInt32();
break;
}
case 18:
case 16: {
UpgradeType = input.ReadUInt32();
upgradeType_.AddEntriesFrom(input, _repeated_upgradeType_codec);
break;
}
case 26:
case 24: {
upgradeCount_.AddEntriesFrom(input, _repeated_upgradeCount_codec);
break;
}
}
@ -8378,8 +8394,14 @@ namespace NLDPB {
VehicleId = input.ReadUInt32();
break;
}
case 18:
case 16: {
UpgradeType = input.ReadUInt32();
upgradeType_.AddEntriesFrom(ref input, _repeated_upgradeType_codec);
break;
}
case 26:
case 24: {
upgradeCount_.AddEntriesFrom(ref input, _repeated_upgradeCount_codec);
break;
}
}

105
ProjectNLD/Assets/Code/Scripts/Gameplay/Net/Proto/Common.cs
View File

@ -36,7 +36,7 @@ namespace NLDPB {
"bktleUVycm9yEAYSDQoJTG9naW5Mb2NrEAcSFAoQTFJPdGhlckxvZ2luR2Ft",
"ZRAIEg8KC1N0YXR1c0Vycm9yEAkSEgoOTG9naW5BdXRoRXJyb3IQChITCg9M",
"b2dpblBhcmFtRXJyb3IQCxISCg5SZWxvZ2luVGltZW91dBAMEhUKEVJlbG9n",
"aW5LZXlJbnZhbGlkEA0SFgoSUmVsb2dpblN0YXR1c0Vycm9yEA4qrA4KCE9w",
"aW5LZXlJbnZhbGlkEA0SFgoSUmVsb2dpblN0YXR1c0Vycm9yEA4qzQ4KCE9w",
"UmVzdWx0EgYKAk9rEAASCwoHVG9vRmFzdBABEhIKDUl0ZW1fQ2ZnRXJyb3IQ",
"kE4SFgoRSXRlbV9DZmdUeXBlRXJyb3IQkU4SGAoTSXRlbV9DZmdTeXN0ZW1F",
"cnJvchCSThITCg5JdGVtX0Nhbm5vdFVzZRCTThITCg5JdGVtX05vdEVub3Vn",
@ -49,48 +49,49 @@ namespace NLDPB {
"Tm90RW5vdWdoEKecARIWChBWZWhpY2xlX05vdEV4aXN0EKicARIeChhWZWhp",
"Y2xlX1VwZ3JhZGVUeXBlRXJyb3IQqZwBEh0KF1ZlaGljbGVfVXBncmFkZUNm",
"Z0Vycm9yEKqcARIZChNWZWhpY2xlX1VwZ3JhZGVGdWxsEKucARIiChxWZWhp",
"Y2xlX1VwZ3JhZGVDb3N0Tm90RW5vdWdoEKycARIYChJUZWFtX05hbWVJc1Rv",
"b0xvbmcQrZwBEhsKFVRlYW1fQ2hhcmFjdGVySURFcnJvchCunAESHAoWVGVh",
"bV9DaGFyYWN0ZXJOb3RFeGlzdBCvnAESGgoUVGVhbV9WZWhpY2xlTm90RXhp",
"c3QQsJwBEhsKFVRlYW1fQ3JlYXRlSW5kZXhFcnJvchCxnAESEwoNVGVhbV9O",
"b3RFeGlzdBCynAESFgoQVGVhbV9NZW1iZXJFbXB0eRCznAESGwoVVW5sb2Nr",
"X1NjaGVtYU5vdGZvdW5kEIikARIWChBVbmxvY2tfVHlwZUVycm9yEImkARIc",
"ChZVbmxvY2tfQ2hlY2tOb3RIYW5kbGVyEIqkARIeChhVbmxvY2tfQ2hhcmFj",
"dGVyTm90RXhpc3QQi6QBEhUKD0xldmVsX0lzUnVubmluZxDwqwESGgoUTGV2",
"ZWxfU2NoZW1hTm90RXhpc3QQ8asBEhcKEUxldmVsX0V4aXRJbnZhbGlkEPKr",
"ARIXChFMZXZlbF9TdGFySW52YWxpZBDzqwESGQoTTGV2ZWxfSXRlbU5vdEVu",
"b3VnaBD0qwESGgoUTGV2ZWxfU3RhcklzVG9vTGFyZ2UQ9asBEhsKFUxldmVs",
"X0NoYXB0ZXJOb3RFeGlzdBD2qwESIwodTGV2ZWxfQ2hhcHRlclJld2FyZElu",
"ZGV4RXJyb3IQ96sBEiUKH0xldmVsX0NoYXB0ZXJSZXdhcmRJbmRleEludmFs",
"aWQQ+KsBEiYKIExldmVsX0NoYXB0ZXJSZXdhcmRTdGFyTm90RW5vdWdoEPmr",
"ARIVCg9MZXZlbF9Ob3RQYXNzZWQQ+qsBEhgKElJhZmZsZV9Qb29sTm90RXhp",
"dBDZswESGgoUUmFmZmxlX1Bvb2xOb3RVbmxvY2sQ2rMBEhoKFFJhZmZsZV9D",
"b3N0Tm90RW5vdWdoENuzARIYChJSYWZmbGVfU2NoZW1hRXJyb3IQ3LMBEhcK",
"EU1haWxfV2FpdHRpbmdEYXRhEMC7ARITCg1OaWNrbmFtZUV4aXN0ELDqARIZ",
"ChNHaWZ0Q29kZV9QYXJhbUVycm9yEKGNBhIYChJHaWZ0Q29kZV9Db2RlRXJy",
"b3IQpI0GEhoKFEdpZnRDb2RlX1BhcmFtRXJyb3IyEKWNBhIZChNHaWZ0Q29k",
"ZV9Db3VudExpbWl0EKaNBhIYChJHaWZ0Q29kZV9PdXRPZkRhdGUQqI0GEhYK",
"EEdpZnRDb2RlX05vdE9wZW4QqY0GEhoKFEdpZnRDb2RlX091dE9mU2VydmVy",
"EKqNBhIWChBHaWZ0Q29kZV9Ub29GYXN0EKuNBhIYChJHaWZ0Q29kZV9Ob3RF",
"bm91Z2gQrI0GEhgKEkdpZnRDb2RlX0F1dGhFcnJvchCtjQYSEwoNR2lmdENv",
"ZGVfQnVzeRCujQYSHAoWR2lmdENvZGVfU2VuZEl0ZW1FcnJvchCvjQYSGgoU",
"R2lmdENvZGVfQ29kZUludmFsaWQQsI0GEhoKFEdpZnRDb2RlX0NvdW50TGlt",
"aXQyELGNBhIaChRHaWZ0Q29kZV9TZXJ2ZXJFcnJvchCyjQYSGwoVR2lmdENv",
"ZGVfU2VydmVyRXJyb3IyELaNBhIbChVHaWZ0Q29kZV9TZXJ2ZXJFcnJvcjMQ",
"ocIeEhsKFUdpZnRDb2RlX1NlcnZlckVycm9yNBCiwh4qtQEKCUFjdG9yUHJv",
"cBINCglBY2NvdW50SUQQABILCgdBY3RvcklEEAESDAoITmlja25hbWUQAhIM",
"CghIZWFkSWNvbhADEg4KCkNyZWF0ZVRpbWUQBBINCglMYXN0TG9naW4QBRIP",
"CgtTZXROaWNrVGltZRAGEg4KCkxvZ291dFRpbWUQBxIJCgVMZXZlbBAIEgcK",
"A0V4cBAJEhAKDExvY2FsQWNjb3VudBAKEgoKBkFQX01heBALKpQBCgdMb2dp",
"Y0lEEhEKDURheUNoYW5nZVRpbWUQABINCglMZXZlbEluZm8QARIOCgpSYWZm",
"bGVJbmZvEAISDgoKQmF0dGxlVGVhbRADEhUKEUVuZXJneVJlY292ZXJUaW1l",
"EAQSEgoOV2Vla0NoYW5nZVRpbWUQBRIOCgpMYXN0TWFpbElEEAYSDAoHTElE",
"X01heBCIJyqqAQoKSXRlbVNvdXJjZRIUChBMZXZlbFBhc3NfTm9ybWFsEAAS",
"EwoPTGV2ZWxQYXNzX0ZpcnN0EAESEwoPTGV2ZWxQYXNzX1N0YXIxEAISEwoP",
"TGV2ZWxQYXNzX1N0YXIyEAMSEwoPTGV2ZWxQYXNzX1N0YXIzEAQSDwoLQ2hh",
"cHRlclN0YXIQBRIKCgZSYWZmbGUQBhIMCghHaWZ0Q29kZRAHEgcKA01heBBk",
"KjcKClRhc2tTdGF0dXMSDQoJVFNJbnZhbGlkEAASCwoHTmV3VGFzaxABEg0K",
"CVRTQ2xhaW1lZBACQgtaCXBiL3hzZl9wYmIGcHJvdG8z"));
"Y2xlX1VwZ3JhZGVDb3N0Tm90RW5vdWdoEKycARIfChlWZWhpY2xlX1VwZ3Jh",
"ZGVQYXJhbUVycm9yEK2cARIYChJUZWFtX05hbWVJc1Rvb0xvbmcQkZ0BEhsK",
"FVRlYW1fQ2hhcmFjdGVySURFcnJvchCSnQESHAoWVGVhbV9DaGFyYWN0ZXJO",
"b3RFeGlzdBCTnQESGgoUVGVhbV9WZWhpY2xlTm90RXhpc3QQlJ0BEhsKFVRl",
"YW1fQ3JlYXRlSW5kZXhFcnJvchCVnQESEwoNVGVhbV9Ob3RFeGlzdBCWnQES",
"FgoQVGVhbV9NZW1iZXJFbXB0eRCXnQESGwoVVW5sb2NrX1NjaGVtYU5vdGZv",
"dW5kEIikARIWChBVbmxvY2tfVHlwZUVycm9yEImkARIcChZVbmxvY2tfQ2hl",
"Y2tOb3RIYW5kbGVyEIqkARIeChhVbmxvY2tfQ2hhcmFjdGVyTm90RXhpc3QQ",
"i6QBEhUKD0xldmVsX0lzUnVubmluZxDwqwESGgoUTGV2ZWxfU2NoZW1hTm90",
"RXhpc3QQ8asBEhcKEUxldmVsX0V4aXRJbnZhbGlkEPKrARIXChFMZXZlbF9T",
"dGFySW52YWxpZBDzqwESGQoTTGV2ZWxfSXRlbU5vdEVub3VnaBD0qwESGgoU",
"TGV2ZWxfU3RhcklzVG9vTGFyZ2UQ9asBEhsKFUxldmVsX0NoYXB0ZXJOb3RF",
"eGlzdBD2qwESIwodTGV2ZWxfQ2hhcHRlclJld2FyZEluZGV4RXJyb3IQ96sB",
"EiUKH0xldmVsX0NoYXB0ZXJSZXdhcmRJbmRleEludmFsaWQQ+KsBEiYKIExl",
"dmVsX0NoYXB0ZXJSZXdhcmRTdGFyTm90RW5vdWdoEPmrARIVCg9MZXZlbF9O",
"b3RQYXNzZWQQ+qsBEhgKElJhZmZsZV9Qb29sTm90RXhpdBDZswESGgoUUmFm",
"ZmxlX1Bvb2xOb3RVbmxvY2sQ2rMBEhoKFFJhZmZsZV9Db3N0Tm90RW5vdWdo",
"ENuzARIYChJSYWZmbGVfU2NoZW1hRXJyb3IQ3LMBEhcKEU1haWxfV2FpdHRp",
"bmdEYXRhEMC7ARITCg1OaWNrbmFtZUV4aXN0ELDqARIZChNHaWZ0Q29kZV9Q",
"YXJhbUVycm9yEKGNBhIYChJHaWZ0Q29kZV9Db2RlRXJyb3IQpI0GEhoKFEdp",
"ZnRDb2RlX1BhcmFtRXJyb3IyEKWNBhIZChNHaWZ0Q29kZV9Db3VudExpbWl0",
"EKaNBhIYChJHaWZ0Q29kZV9PdXRPZkRhdGUQqI0GEhYKEEdpZnRDb2RlX05v",
"dE9wZW4QqY0GEhoKFEdpZnRDb2RlX091dE9mU2VydmVyEKqNBhIWChBHaWZ0",
"Q29kZV9Ub29GYXN0EKuNBhIYChJHaWZ0Q29kZV9Ob3RFbm91Z2gQrI0GEhgK",
"EkdpZnRDb2RlX0F1dGhFcnJvchCtjQYSEwoNR2lmdENvZGVfQnVzeRCujQYS",
"HAoWR2lmdENvZGVfU2VuZEl0ZW1FcnJvchCvjQYSGgoUR2lmdENvZGVfQ29k",
"ZUludmFsaWQQsI0GEhoKFEdpZnRDb2RlX0NvdW50TGltaXQyELGNBhIaChRH",
"aWZ0Q29kZV9TZXJ2ZXJFcnJvchCyjQYSGwoVR2lmdENvZGVfU2VydmVyRXJy",
"b3IyELaNBhIbChVHaWZ0Q29kZV9TZXJ2ZXJFcnJvcjMQocIeEhsKFUdpZnRD",
"b2RlX1NlcnZlckVycm9yNBCiwh4qtQEKCUFjdG9yUHJvcBINCglBY2NvdW50",
"SUQQABILCgdBY3RvcklEEAESDAoITmlja25hbWUQAhIMCghIZWFkSWNvbhAD",
"Eg4KCkNyZWF0ZVRpbWUQBBINCglMYXN0TG9naW4QBRIPCgtTZXROaWNrVGlt",
"ZRAGEg4KCkxvZ291dFRpbWUQBxIJCgVMZXZlbBAIEgcKA0V4cBAJEhAKDExv",
"Y2FsQWNjb3VudBAKEgoKBkFQX01heBALKpQBCgdMb2dpY0lEEhEKDURheUNo",
"YW5nZVRpbWUQABINCglMZXZlbEluZm8QARIOCgpSYWZmbGVJbmZvEAISDgoK",
"QmF0dGxlVGVhbRADEhUKEUVuZXJneVJlY292ZXJUaW1lEAQSEgoOV2Vla0No",
"YW5nZVRpbWUQBRIOCgpMYXN0TWFpbElEEAYSDAoHTElEX01heBCIJyqqAQoK",
"SXRlbVNvdXJjZRIUChBMZXZlbFBhc3NfTm9ybWFsEAASEwoPTGV2ZWxQYXNz",
"X0ZpcnN0EAESEwoPTGV2ZWxQYXNzX1N0YXIxEAISEwoPTGV2ZWxQYXNzX1N0",
"YXIyEAMSEwoPTGV2ZWxQYXNzX1N0YXIzEAQSDwoLQ2hhcHRlclN0YXIQBRIK",
"CgZSYWZmbGUQBhIMCghHaWZ0Q29kZRAHEgcKA01heBBkKjcKClRhc2tTdGF0",
"dXMSDQoJVFNJbnZhbGlkEAASCwoHTmV3VGFzaxABEg0KCVRTQ2xhaW1lZBAC",
"QgtaCXBiL3hzZl9wYmIGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::NLDPB.GlobalDefine), typeof(global::NLDPB.DisconnectReason), typeof(global::NLDPB.LoginResult), typeof(global::NLDPB.OpResult), typeof(global::NLDPB.ActorProp), typeof(global::NLDPB.LogicID), typeof(global::NLDPB.ItemSource), typeof(global::NLDPB.TaskStatus), }, null, null));
@ -288,33 +289,37 @@ namespace NLDPB {
/// </summary>
[pbr::OriginalName("Vehicle_UpgradeCostNotEnough")] VehicleUpgradeCostNotEnough = 20012,
/// <summary>
/// 升级参数错误
/// </summary>
[pbr::OriginalName("Vehicle_UpgradeParamError")] VehicleUpgradeParamError = 20013,
/// <summary>
/// 队伍名称太长
/// </summary>
[pbr::OriginalName("Team_NameIsTooLong")] TeamNameIsTooLong = 20013,
[pbr::OriginalName("Team_NameIsTooLong")] TeamNameIsTooLong = 20113,
/// <summary>
/// 队伍角色ID数量非法
/// </summary>
[pbr::OriginalName("Team_CharacterIDError")] TeamCharacterIderror = 20014,
[pbr::OriginalName("Team_CharacterIDError")] TeamCharacterIderror = 20114,
/// <summary>
/// 队伍中的角色不存在
/// </summary>
[pbr::OriginalName("Team_CharacterNotExist")] TeamCharacterNotExist = 20015,
[pbr::OriginalName("Team_CharacterNotExist")] TeamCharacterNotExist = 20115,
/// <summary>
/// 队伍中载具不存在
/// </summary>
[pbr::OriginalName("Team_VehicleNotExist")] TeamVehicleNotExist = 20016,
[pbr::OriginalName("Team_VehicleNotExist")] TeamVehicleNotExist = 20116,
/// <summary>
/// 队伍编号错误
/// </summary>
[pbr::OriginalName("Team_CreateIndexError")] TeamCreateIndexError = 20017,
[pbr::OriginalName("Team_CreateIndexError")] TeamCreateIndexError = 20117,
/// <summary>
/// 队伍不存在
/// </summary>
[pbr::OriginalName("Team_NotExist")] TeamNotExist = 20018,
[pbr::OriginalName("Team_NotExist")] TeamNotExist = 20118,
/// <summary>
/// 空队伍
/// </summary>
[pbr::OriginalName("Team_MemberEmpty")] TeamMemberEmpty = 20019,
[pbr::OriginalName("Team_MemberEmpty")] TeamMemberEmpty = 20119,
/// <summary>
/// 解锁条件对应的配置不存在
/// </summary>

43
ProjectNLD/Assets/Code/Scripts/Gameplay/Utils/CommonUtils.cs
View File

@ -1,4 +1,5 @@
using Cysharp.Threading.Tasks;
using cfg.VihecleCultivateCfg;
using Cysharp.Threading.Tasks;
using Framework;
using Gameplay.Character.Utils;
using Gameplay.Common;
@ -1138,6 +1139,46 @@ namespace Utils
return "拉取中";
}
public static string GetVehiclePicPath(int iD)
{
string str= TableManager.Instance.Tables.VehicleConfig.GetOrDefault(iD).Icon;
//return UI_Vehicle_IconPath+str+".png";
return "";
}
public static void AddItem(ref List<cfg.item.ItemCounts> sumItem, cfg.item.ItemCounts item1)
{
for (int i = 0; i < sumItem.Count; i++)
{
if (sumItem[i].Id==item1.Id)
{
sumItem[i]=new cfg.item.ItemCounts(sumItem[i].Id, sumItem[i].Count+item1.Count);
return;
}
}
sumItem.Add(item1);
}
public static cfg.item.ItemCounts ItemXNumber(cfg.item.ItemCounts item,int number)
{
return new cfg.item.ItemCounts(item.Id, item.Count * number);
}
public static string GetVehicleBonusStr(BonusType btype)
{
switch (btype)
{
case BonusType.Hp:
return GetLocalizeText("cultivate_Hp");
case BonusType.SkillLv:
return GetLocalizeText("vehicleCultivate_skillLv");
case BonusType.MoveSpeed:
return GetLocalizeText("vehicleCultivate_skillLv");
case BonusType.SeatCount:
return GetLocalizeText("");
}
return "";
}
}
}