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

修改载具模型为新的加载路径

main
刘涛 2024-01-15 12:12:47 +08:00
parent 3006445d23
commit ad5565661e
18 changed files with 426 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ProjectNLD/Assets/AddressableAssetsData/AddressableAssetSettings.asset
View File

@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 87cc8f526ab764b2ba576426816abb98
m_currentHash:
serializedVersion: 2
Hash: 6f25a09ed78918fb88600e278885bb6d
Hash: dcfa80519ef9e1d9b1b337f85ae51473
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 1
m_BundleLocalCatalog: 0
@ -106,7 +106,7 @@ MonoBehaviour:
- m_Id: d0ea7f1c242cc45e384d526d06d1f42d
m_Value: 80
- m_Id: 5bfb0ab98f3859143af22506ffa5aee4
m_Value:
m_Value:
- m_InheritedParent:
m_Id: fc7d3e7a400cf4b9997784a4f6a59e5a
m_ProfileName: Debug
@ -128,7 +128,7 @@ MonoBehaviour:
- m_Id: d0ea7f1c242cc45e384d526d06d1f42d
m_Value: 80
- m_Id: 5bfb0ab98f3859143af22506ffa5aee4
m_Value:
m_Value:
- m_InheritedParent:
m_Id: 8318f77bd41b94be2939bbcda22c10dd
m_ProfileName: Release

5
ProjectNLD/Assets/AddressableAssetsData/AssetGroups/Character.asset
View File

@ -32,11 +32,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c737d67ffb8ca644c89fe02629e9e649
m_Address: Assets/Art/Character/Prefabs/Vehicle
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 57363d90d371d4f9297bcadcb2c690e7, type: 2}
m_SchemaSet:

4
ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamPreviewNode.cs
View File

@ -6,6 +6,7 @@ using Framework;
using Gameplay;
using Gameplay.Common;
using Gameplay.Emoji;
using Gameplay.Utils;
using PhxhSDK;
using UnityEngine;
using Constants = Framework.Constants;
@ -305,7 +306,8 @@ public class TeamPreviewNode: MonoBehaviour
if (vehicleData != null)
{
var trans = vehiclePos;
var prefab = await AssetManager.Instance.LoadAssetAsync<GameObject>(vehicleData.Cfg.PrefabPath);
var prefabPath = PathEx.GetVehicleGameModelPath(vehicleData.Cfg.ID);
var prefab = await AssetManager.Instance.LoadAssetAsync<GameObject>(prefabPath);
if (!trans)
{
return;

4
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_Interface/UI_InterfacePreviewNode.cs
View File

@ -4,6 +4,7 @@ using Cysharp.Threading.Tasks;
using Framework;
using Gameplay;
using Gameplay.Common;
using Gameplay.Utils;
using PhxhSDK;
using UnityEngine;
using Constants = Framework.Constants;
@ -226,7 +227,8 @@ public class UI_InterfacePreviewNode : MonoBehaviour
if (vehicleData != null)
{
var trans = vehiclePos;
var prefab = await AssetManager.Instance.LoadAssetAsync<GameObject>(vehicleData.Cfg.PrefabPath);
var prefabPath = PathEx.GetVehicleGameModelPath(vehicleData.Cfg.ID);
var prefab = await AssetManager.Instance.LoadAssetAsync<GameObject>(prefabPath);
var go = Instantiate(prefab, trans.position, trans.rotation, vRoot.transform);
if (go)
{

6
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_PVPDefendPrepareController.cs
View File

@ -12,6 +12,7 @@ using Framework;
using Framework.Wrapper;
using Gameplay;
using Gameplay.Net;
using Gameplay.Utils;
using PhxhSDK;
using TGS;
@ -117,7 +118,8 @@ public class UI_PVPDefendPrepareController : UIWindow
else
{
var vehicleData = _allVehicleInfos[realIndex];
return vehicleData.Cfg.PrefabPath;
var prefabPath = PathEx.GetVehicleGameModelPath(vehicleData.Cfg.ID);
return prefabPath;
}
}
@ -138,7 +140,7 @@ public class UI_PVPDefendPrepareController : UIWindow
var vehicleData = VehicleCultivateDataManager.Instance.GetVehicleCultivateData((uint)unitInfo.unitID);
if (vehicleData != null)
{
result = vehicleData.Cfg.PrefabPath;
result = PathEx.GetVehicleGameModelPath(vehicleData.Cfg.ID);
}
break;

5
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/VehicleCultivate/UI_VehicleCultivateController.cs
View File

@ -6,6 +6,7 @@ using PhxhSDK;
using System;
using System.Collections.Generic;
using Gameplay;
using Gameplay.Utils;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
@ -174,8 +175,8 @@ public class UI_VehicleCultivateController : UIWindow
}
private async UniTask<GameObject> LoadModel()
{
return await AssetManager.Instance.LoadAssetAsync<GameObject>(TableManager.Instance.Tables.VehicleConfig.Get(mVehicleData.Cfg.ID).PrefabPath);
var prefabPath = PathEx.GetVehicleGameModelPath(mVehicleData.Cfg.ID);
return await AssetManager.Instance.LoadAssetAsync<GameObject>(prefabPath);
}

30
ProjectNLD/Assets/Code/Scripts/Gameplay/Utils/PathEx.cs Normal file
View File

@ -0,0 +1,30 @@
using Framework;
namespace Gameplay.Utils
{
public static class PathEx
{
/// <summary>
/// 用于获取载具的原始模型路径，用于导出,该路径并不会被addressable打包
/// </summary>
/// <param name="prefabName"></param>
/// <returns></returns>
public static string GetVehicleSrcModelPath(string prefabName)
{
return $"Assets/Art/Character/Prefabs/Vehicle/{prefabName}.prefab";
}
/// <summary>
/// 获取载具游戏中使用的模型路径，用于addressable打包
/// </summary>
/// <param name="configId"></param>
/// <returns></returns>
public static string GetVehicleGameModelPath(int configId)
{
var savePath = string.Format(Constants.VEHICLE_OUTPUT_PATH, configId);
var prefabPath = $"{savePath}/vehicle_{configId}.prefab";
return prefabPath;
}
}
}

3
ProjectNLD/Assets/Code/Scripts/Gameplay/Utils/PathEx.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 061a687c352148c383efd2fb5db0ea0c
timeCreated: 1705291291

4
ProjectNLD/Assets/Code/Scripts/Gameplay/Vehicle/Data/VehicleConfigData.cs
View File

@ -1,5 +1,6 @@
using cfg.VehicleCfg;
using Framework;
using Gameplay.Utils;
namespace Gameplay.Vehicle.Data
{
public class VehicleConfigData
@ -54,8 +55,7 @@ namespace Gameplay.Vehicle.Data
int level, int skillLevel)
{
configId = rawConfig.ID;
var savePath = string.Format(Constants.VEHICLE_OUTPUT_PATH, configId);
prefabPath = $"{savePath}/vehicle_{configId}.prefab";
prefabPath = PathEx.GetVehicleGameModelPath(configId);
this.level = level;

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

@ -2,7 +2,7 @@
{
"ID": 1,
"Type": 1,
"NameLocal": "goodsName_gold",
"NameLocal": "ItemName_gold",
"Param1": 0,
"Param2": 0,
"Param3": 0,
@ -12,7 +12,7 @@
{
"ID": 2,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_diamond",
"Param1": 0,
"Param2": 0,
"Param3": 0,
@ -22,7 +22,7 @@
{
"ID": 3,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_chaExp",
"Param1": 0,
"Param2": 0,
"Param3": 0,
@ -32,7 +32,7 @@
{
"ID": 4,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_stamina",
"Param1": 0,
"Param2": 0,
"Param3": 0,
@ -42,7 +42,7 @@
{
"ID": 6,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_pvp_stamina",
"Param1": 0,
"Param2": 0,
"Param3": 0,
@ -72,7 +72,7 @@
{
"ID": 100001,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_01",
"Param1": 100001,
"Param2": 0,
"Param3": 0,
@ -82,7 +82,7 @@
{
"ID": 100002,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_02",
"Param1": 100002,
"Param2": 0,
"Param3": 0,
@ -92,7 +92,7 @@
{
"ID": 100003,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_03",
"Param1": 100003,
"Param2": 0,
"Param3": 0,
@ -102,7 +102,7 @@
{
"ID": 100004,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_04",
"Param1": 100004,
"Param2": 0,
"Param3": 0,
@ -112,7 +112,7 @@
{
"ID": 100005,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_05",
"Param1": 100005,
"Param2": 0,
"Param3": 0,
@ -122,7 +122,7 @@
{
"ID": 100011,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_06",
"Param1": 100011,
"Param2": 0,
"Param3": 0,
@ -132,7 +132,7 @@
{
"ID": 100012,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_07",
"Param1": 100012,
"Param2": 0,
"Param3": 0,
@ -142,7 +142,7 @@
{
"ID": 100013,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_08",
"Param1": 100013,
"Param2": 0,
"Param3": 0,
@ -152,7 +152,7 @@
{
"ID": 100014,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_09",
"Param1": 100014,
"Param2": 0,
"Param3": 0,
@ -162,7 +162,7 @@
{
"ID": 100015,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_10",
"Param1": 100015,
"Param2": 0,
"Param3": 0,
@ -172,7 +172,7 @@
{
"ID": 100025,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_11",
"Param1": 100025,
"Param2": 0,
"Param3": 0,
@ -182,7 +182,7 @@
{
"ID": 100026,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_12",
"Param1": 100026,
"Param2": 0,
"Param3": 0,
@ -192,7 +192,7 @@
{
"ID": 100031,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_13",
"Param1": 100031,
"Param2": 0,
"Param3": 0,
@ -202,7 +202,7 @@
{
"ID": 100032,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_14",
"Param1": 100032,
"Param2": 0,
"Param3": 0,
@ -212,7 +212,7 @@
{
"ID": 100033,
"Type": 3,
"NameLocal": "",
"NameLocal": "ItemName_character_15",
"Param1": 100033,
"Param2": 0,
"Param3": 0,
@ -222,7 +222,7 @@
{
"ID": 101001,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_01",
"Param1": 100001,
"Param2": 0,
"Param3": 0,
@ -232,7 +232,7 @@
{
"ID": 101002,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_02",
"Param1": 100002,
"Param2": 0,
"Param3": 0,
@ -242,7 +242,7 @@
{
"ID": 101003,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_03",
"Param1": 100003,
"Param2": 0,
"Param3": 0,
@ -252,7 +252,7 @@
{
"ID": 101004,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_04",
"Param1": 100004,
"Param2": 0,
"Param3": 0,
@ -262,7 +262,7 @@
{
"ID": 101005,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_05",
"Param1": 100005,
"Param2": 0,
"Param3": 0,
@ -272,7 +272,7 @@
{
"ID": 101011,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_06",
"Param1": 100011,
"Param2": 0,
"Param3": 0,
@ -282,7 +282,7 @@
{
"ID": 101012,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_07",
"Param1": 100012,
"Param2": 0,
"Param3": 0,
@ -292,7 +292,7 @@
{
"ID": 101013,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_08",
"Param1": 100013,
"Param2": 0,
"Param3": 0,
@ -302,7 +302,7 @@
{
"ID": 101014,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_09",
"Param1": 100014,
"Param2": 0,
"Param3": 0,
@ -312,7 +312,7 @@
{
"ID": 101015,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_10",
"Param1": 100015,
"Param2": 0,
"Param3": 0,
@ -322,7 +322,7 @@
{
"ID": 101025,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_11",
"Param1": 100025,
"Param2": 0,
"Param3": 0,
@ -332,7 +332,7 @@
{
"ID": 101026,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_12",
"Param1": 100026,
"Param2": 0,
"Param3": 0,
@ -342,7 +342,7 @@
{
"ID": 101031,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_13",
"Param1": 100031,
"Param2": 0,
"Param3": 0,
@ -352,7 +352,7 @@
{
"ID": 101032,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_14",
"Param1": 100032,
"Param2": 0,
"Param3": 0,
@ -362,7 +362,7 @@
{
"ID": 101033,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_piece_15",
"Param1": 100033,
"Param2": 0,
"Param3": 0,
@ -372,7 +372,7 @@
{
"ID": 102011,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_bk_101",
"Param1": 0,
"Param2": 0,
"Param3": 0,
@ -382,7 +382,7 @@
{
"ID": 102012,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_bk_102",
"Param1": 0,
"Param2": 0,
"Param3": 0,
@ -392,7 +392,7 @@
{
"ID": 102013,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_bk_103",
"Param1": 0,
"Param2": 0,
"Param3": 0,
@ -552,7 +552,7 @@
{
"ID": 104011,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_skillup_101",
"Param1": 0,
"Param2": 0,
"Param3": 0,
@ -562,7 +562,7 @@
{
"ID": 104012,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_skillup_102",
"Param1": 0,
"Param2": 0,
"Param3": 0,
@ -672,7 +672,7 @@
{
"ID": 300001,
"Type": 4,
"NameLocal": "",
"NameLocal": "ItemName_vehicle_01",
"Param1": 300001,
"Param2": 0,
"Param3": 0,
@ -682,7 +682,7 @@
{
"ID": 300002,
"Type": 4,
"NameLocal": "",
"NameLocal": "ItemName_vehicle_02",
"Param1": 300002,
"Param2": 0,
"Param3": 0,
@ -692,7 +692,7 @@
{
"ID": 1000011,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_vehicleUp_01",
"Param1": 0,
"Param2": 0,
"Param3": 0,
@ -702,7 +702,7 @@
{
"ID": 1000012,
"Type": 1,
"NameLocal": "",
"NameLocal": "ItemName_vehicleUp_02",
"Param1": 0,
"Param2": 0,
"Param3": 0,

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

@ -42,20 +42,20 @@
{
"Id": 92001001,
"NameLocal": "shop_GoodsName_92001001",
"ItemID": 300001,
"ItemID": 1000011,
"ItemCount": 1,
"PriceID": 2,
"PriceCount": 1000,
"MaxPurchaseCount": 1,
"PriceCount": 10,
"MaxPurchaseCount": 100,
"Successor": 0
},
{
"Id": 92001002,
"NameLocal": "shop_GoodsName_92001002",
"ItemID": 1000011,
"ItemID": 1000012,
"ItemCount": 1,
"PriceID": 2,
"PriceCount": 10,
"PriceCount": 20,
"MaxPurchaseCount": 100,
"Successor": 0
},

4
ProjectNLD/Assets/Config/Data/campcfg_campshowconfig.json
View File

@ -80,7 +80,7 @@
1
],
"hasCharacter": false,
"characterID": 100002
"characterID": 10002
},
{
"GroupID": 4,
@ -89,7 +89,7 @@
2
],
"hasCharacter": false,
"characterID": 100001
"characterID": 10001
},
{
"GroupID": 5,

30
ProjectNLD/Assets/Config/Data/monstercfg_monsterclass.json
View File

@ -9,7 +9,7 @@
"EmojiEyesColor": "#00FF00",
"EmojiEyeBowsColor": "#00FF00",
"DefaultEmojiImgId": 2,
"Attack": 13,
"Attack": 8,
"AttackShiledScale": 1.5,
"AttackHpScale": 0.8,
"ShootSpeed": 6,
@ -21,8 +21,8 @@
"TurnSpeed": 400,
"ShootRange": 3,
"Defence": 250,
"Hp": 716,
"Shield": 2865,
"Hp": 430,
"Shield": 1719,
"DefenceStatusPara": 1.2,
"YaZhi": 8,
"MaxMorale": 1000,
@ -55,7 +55,7 @@
"EmojiEyesColor": "#00FF00",
"EmojiEyeBowsColor": "#00FF00",
"DefaultEmojiImgId": 2,
"Attack": 160,
"Attack": 96,
"AttackShiledScale": 1.6,
"AttackHpScale": 0.7,
"ShootSpeed": 0.8,
@ -67,8 +67,8 @@
"TurnSpeed": 400,
"ShootRange": 7,
"Defence": 250,
"Hp": 1333,
"Shield": 333,
"Hp": 800,
"Shield": 200,
"DefenceStatusPara": 1.2,
"YaZhi": 62,
"MaxMorale": 1000,
@ -101,7 +101,7 @@
"EmojiEyesColor": "#00FF00",
"EmojiEyeBowsColor": "#00FF00",
"DefaultEmojiImgId": 2,
"Attack": 16,
"Attack": 10,
"AttackShiledScale": 0.7,
"AttackHpScale": 1.6,
"ShootSpeed": 7,
@ -113,8 +113,8 @@
"TurnSpeed": 400,
"ShootRange": 3,
"Defence": 250,
"Hp": 726,
"Shield": 1693,
"Hp": 435,
"Shield": 1016,
"DefenceStatusPara": 1.2,
"YaZhi": 7,
"MaxMorale": 1000,
@ -147,7 +147,7 @@
"EmojiEyesColor": "#00FF00",
"EmojiEyeBowsColor": "#00FF00",
"DefaultEmojiImgId": 2,
"Attack": 22,
"Attack": 14,
"AttackShiledScale": 0.8,
"AttackHpScale": 1.3,
"ShootSpeed": 5,
@ -159,8 +159,8 @@
"TurnSpeed": 400,
"ShootRange": 5,
"Defence": 250,
"Hp": 1513,
"Shield": 1009,
"Hp": 908,
"Shield": 605,
"DefenceStatusPara": 1.2,
"YaZhi": 10,
"MaxMorale": 1000,
@ -193,7 +193,7 @@
"EmojiEyesColor": "#00FF00",
"EmojiEyeBowsColor": "#00FF00",
"DefaultEmojiImgId": 2,
"Attack": 60,
"Attack": 36,
"AttackShiledScale": 1.3,
"AttackHpScale": 0.8,
"ShootSpeed": 2,
@ -205,8 +205,8 @@
"TurnSpeed": 400,
"ShootRange": 6,
"Defence": 250,
"Hp": 764,
"Shield": 1145,
"Hp": 458,
"Shield": 687,
"DefenceStatusPara": 1.2,
"YaZhi": 25,
"MaxMorale": 1000,

35
ProjectNLD/Assets/Config/Data/storycfg_playermapperconfig.json
View File

@ -82,5 +82,40 @@
"PlayerType": 1,
"EmojiEyeBowsType": "",
"EmojiEyesColor": ""
},
{
"PlayerId": 900006,
"ModelPath": "",
"PlayerType": 0,
"EmojiEyeBowsType": "",
"EmojiEyesColor": ""
},
{
"PlayerId": 900007,
"ModelPath": "",
"PlayerType": 0,
"EmojiEyeBowsType": "",
"EmojiEyesColor": ""
},
{
"PlayerId": 900008,
"ModelPath": "",
"PlayerType": 0,
"EmojiEyeBowsType": "",
"EmojiEyesColor": ""
},
{
"PlayerId": 900009,
"ModelPath": "",
"PlayerType": 0,
"EmojiEyeBowsType": "",
"EmojiEyesColor": ""
},
{
"PlayerId": 900010,
"ModelPath": "",
"PlayerType": 0,
"EmojiEyeBowsType": "",
"EmojiEyesColor": ""
}
]

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

@ -1652,13 +1652,13 @@
{
"ID": 92005,
"Key": "shop_GoodsName_92001001",
"Value": "btr运输型",
"Value": "载具改修材料1",
"Value_En": ""
},
{
"ID": 92006,
"Key": "shop_GoodsName_92001002",
"Value": "载具改修材料1",
"Value": "载具改修材料2",
"Value_En": ""
},
{
@ -2329,8 +2329,266 @@
},
{
"ID": 120001,
"Key": "goodsName_gold",
"Key": "ItemName_gold",
"Value": "金币",
"Value_En": ""
},
{
"ID": 120002,
"Key": "ItemName_diamond",
"Value": "钻石",
"Value_En": ""
},
{
"ID": 120003,
"Key": "ItemName_chaExp",
"Value": "英雄经验点数",
"Value_En": ""
},
{
"ID": 120004,
"Key": "ItemName_stamina",
"Value": "体力",
"Value_En": ""
},
{
"ID": 120005,
"Key": "ItemName_pvp_stamina",
"Value": "pvp体力",
"Value_En": ""
},
{
"ID": 121001,
"Key": "ItemName_character_01",
"Value": "埃琳娜",
"Value_En": ""
},
{
"ID": 121002,
"Key": "ItemName_character_02",
"Value": "卡琳",
"Value_En": ""
},
{
"ID": 121003,
"Key": "ItemName_character_03",
"Value": "克劳迪娅",
"Value_En": ""
},
{
"ID": 121004,
"Key": "ItemName_character_04",
"Value": "莉莎",
"Value_En": ""
},
{
"ID": 121005,
"Key": "ItemName_character_05",
"Value": "米娅",
"Value_En": ""
},
{
"ID": 121006,
"Key": "ItemName_character_06",
"Value": "卡露拉",
"Value_En": ""
},
{
"ID": 121007,
"Key": "ItemName_character_07",
"Value": "露比",
"Value_En": ""
},
{
"ID": 121008,
"Key": "ItemName_character_08",
"Value": "米米",
"Value_En": ""
},
{
"ID": 121009,
"Key": "ItemName_character_09",
"Value": "提可",
"Value_En": ""
},
{
"ID": 121010,
"Key": "ItemName_character_10",
"Value": "蒂娜",
"Value_En": ""
},
{
"ID": 121011,
"Key": "ItemName_character_11",
"Value": "安吉拉",
"Value_En": ""
},
{
"ID": 121012,
"Key": "ItemName_character_12",
"Value": "切尔西",
"Value_En": ""
},
{
"ID": 121013,
"Key": "ItemName_character_13",
"Value": "瓦娜莱特",
"Value_En": ""
},
{
"ID": 121014,
"Key": "ItemName_character_14",
"Value": "阿兰西",
"Value_En": ""
},
{
"ID": 121015,
"Key": "ItemName_character_15",
"Value": "弦乐",
"Value_En": ""
},
{
"ID": 122001,
"Key": "ItemName_piece_01",
"Value": "埃琳娜碎片",
"Value_En": ""
},
{
"ID": 122002,
"Key": "ItemName_piece_02",
"Value": "卡琳碎片",
"Value_En": ""
},
{
"ID": 122003,
"Key": "ItemName_piece_03",
"Value": "克劳迪娅碎片",
"Value_En": ""
},
{
"ID": 122004,
"Key": "ItemName_piece_04",
"Value": "莉莎碎片",
"Value_En": ""
},
{
"ID": 122005,
"Key": "ItemName_piece_05",
"Value": "米娅碎片",
"Value_En": ""
},
{
"ID": 122006,
"Key": "ItemName_piece_06",
"Value": "卡露拉碎片",
"Value_En": ""
},
{
"ID": 122007,
"Key": "ItemName_piece_07",
"Value": "露比碎片",
"Value_En": ""
},
{
"ID": 122008,
"Key": "ItemName_piece_08",
"Value": "米米碎片",
"Value_En": ""
},
{
"ID": 122009,
"Key": "ItemName_piece_09",
"Value": "提可碎片",
"Value_En": ""
},
{
"ID": 122010,
"Key": "ItemName_piece_10",
"Value": "蒂娜碎片",
"Value_En": ""
},
{
"ID": 122011,
"Key": "ItemName_piece_11",
"Value": "安吉拉碎片",
"Value_En": ""
},
{
"ID": 122012,
"Key": "ItemName_piece_12",
"Value": "切尔西碎片",
"Value_En": ""
},
{
"ID": 122013,
"Key": "ItemName_piece_13",
"Value": "瓦娜莱特碎片",
"Value_En": ""
},
{
"ID": 122014,
"Key": "ItemName_piece_14",
"Value": "阿兰西碎片",
"Value_En": ""
},
{
"ID": 122015,
"Key": "ItemName_piece_15",
"Value": "弦乐碎片",
"Value_En": ""
},
{
"ID": 123001,
"Key": "ItemName_bk_101",
"Value": "突破材料1-1",
"Value_En": ""
},
{
"ID": 123002,
"Key": "ItemName_bk_102",
"Value": "突破材料1-2",
"Value_En": ""
},
{
"ID": 123003,
"Key": "ItemName_bk_103",
"Value": "突破材料1-3",
"Value_En": ""
},
{
"ID": 124001,
"Key": "ItemName_skillup_101",
"Value": "技能升级材料1-1",
"Value_En": ""
},
{
"ID": 124002,
"Key": "ItemName_skillup_102",
"Value": "技能升级材料1-2",
"Value_En": ""
},
{
"ID": 125001,
"Key": "ItemName_vehicle_01",
"Value": "btr运输型",
"Value_En": ""
},
{
"ID": 125002,
"Key": "ItemName_vehicle_02",
"Value": "btr运输型111",
"Value_En": ""
},
{
"ID": 125003,
"Key": "ItemName_vehicleUp_01",
"Value": "载具升级材料1",
"Value_En": ""
},
{
"ID": 125004,
"Key": "ItemName_vehicleUp_02",
"Value": "载具升级材料2",
"Value_En": ""
}
]

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

@ -3,7 +3,7 @@
"ID": 300001,
"Name": "测试载具1",
"UIHeadPath": "Assets/Art/UI/Texture/UI_Pic_Main/UI_Pic_Vehicle/UI_LevelUp/UI_VehiclePoster.png",
"PrefabPath": "Assets/Art/Character/Prefabs/Vehicle/P_C00001_01_R00001_01.prefab",
"PrefabPath": "P_C00001_01_R00001_01",
"TireMarkId": 1,
"StandCrossLevel": 1,
"MoveCrossLevel": 1,
@ -363,7 +363,7 @@
"ID": 300002,
"Name": "测试载具2",
"UIHeadPath": "Assets/Art/UI/Texture/UI_Pic_Main/UI_Pic_Vehicle/UI_LevelUp/UI_VehiclePoster.png",
"PrefabPath": "Assets/Art/Character/Prefabs/Vehicle/P_C00006_01_R00004_01.prefab",
"PrefabPath": "P_C00006_01_R00004_01",
"TireMarkId": 1,
"StandCrossLevel": 1,
"MoveCrossLevel": 1,
@ -723,7 +723,7 @@
"ID": 300003,
"Name": "测试载具3",
"UIHeadPath": "Assets/Art/UI/Texture/UI_Pic_Main/UI_Pic_Vehicle/UI_LevelUp/UI_VehiclePoster.png",
"PrefabPath": "Assets/Art/Character/Prefabs/Vehicle/P_C00007_01_R00005_01.prefab",
"PrefabPath": "P_C00007_01_R00005_01",
"TireMarkId": 1,
"StandCrossLevel": 1,
"MoveCrossLevel": 1,
@ -1083,7 +1083,7 @@
"ID": 300004,
"Name": "测试载具4",
"UIHeadPath": "Assets/Art/UI/Texture/UI_Pic_Main/UI_Pic_Vehicle/UI_LevelUp/UI_VehiclePoster.png",
"PrefabPath": "Assets/Art/Character/Prefabs/Vehicle/P_C00008_01_R00006_01.prefab",
"PrefabPath": "P_C00008_01_R00006_01",
"TireMarkId": 1,
"StandCrossLevel": 1,
"MoveCrossLevel": 1,
@ -1443,7 +1443,7 @@
"ID": 300005,
"Name": "测试载具5",
"UIHeadPath": "Assets/Art/UI/Texture/UI_Pic_Main/UI_Pic_Vehicle/UI_LevelUp/UI_VehiclePoster.png",
"PrefabPath": "Assets/Art/Character/Prefabs/Vehicle/P_C00009_01_R00007_01.prefab",
"PrefabPath": "P_C00009_01_R00007_01",
"TireMarkId": 1,
"StandCrossLevel": 1,
"MoveCrossLevel": 1,
@ -1803,7 +1803,7 @@
"ID": 300006,
"Name": "测试载具6",
"UIHeadPath": "Assets/Art/UI/Texture/UI_Pic_Main/UI_Pic_Vehicle/UI_LevelUp/UI_VehiclePoster.png",
"PrefabPath": "Assets/Art/Character/Prefabs/Vehicle/P_C00010_01_R00008_01.prefab",
"PrefabPath": "P_C00010_01_R00008_01",
"TireMarkId": 1,
"StandCrossLevel": 1,
"MoveCrossLevel": 1,
@ -2163,7 +2163,7 @@
"ID": 300007,
"Name": "测试载具7",
"UIHeadPath": "Assets/Art/UI/Texture/UI_Pic_Main/UI_Pic_Vehicle/UI_LevelUp/UI_VehiclePoster.png",
"PrefabPath": "Assets/Art/Character/Prefabs/Vehicle/P_C00012_01_R00010_01.prefab",
"PrefabPath": "P_C00012_01_R00010_01",
"TireMarkId": 1,
"StandCrossLevel": 1,
"MoveCrossLevel": 1,
@ -2523,7 +2523,7 @@
"ID": 300008,
"Name": "测试载具8",
"UIHeadPath": "Assets/Art/UI/Texture/UI_Pic_Main/UI_Pic_Vehicle/UI_LevelUp/UI_VehiclePoster.png",
"PrefabPath": "Assets/Art/Character/Prefabs/Vehicle/P_C00013_01_R00011_01.prefab",
"PrefabPath": "P_C00013_01_R00011_01",
"TireMarkId": 1,
"StandCrossLevel": 1,
"MoveCrossLevel": 1,
@ -2883,7 +2883,7 @@
"ID": 300009,
"Name": "测试载具9",
"UIHeadPath": "Assets/Art/UI/Texture/UI_Pic_Main/UI_Pic_Vehicle/UI_LevelUp/UI_VehiclePoster.png",
"PrefabPath": "Assets/Art/Character/Prefabs/Vehicle/P_C00014_01_R00012_01.prefab",
"PrefabPath": "P_C00014_01_R00012_01",
"TireMarkId": 1,
"StandCrossLevel": 1,
"MoveCrossLevel": 1,

3
ProjectNLD/Assets/Editor/SkillEditor/InnerUI/SingleSkillEditorWindow.cs
View File

@ -6,6 +6,7 @@ using cfg.SkillCfg;
using Framework;
using Gameplay.FakeFight;
using Gameplay.Skill;
using Gameplay.Utils;
using Sirenix.OdinInspector.Editor;
using Sirenix.Utilities;
using Sirenix.Utilities.Editor;
@ -443,7 +444,7 @@ namespace SkillEditor
// 载具
{
var selectConfig = _tables.VehicleConfig.DataList[_selectVehicleIndex];
var modelPath = selectConfig.PrefabPath;
var modelPath = PathEx.GetVehicleGameModelPath(selectConfig.ID);
objAsset = AssetDatabase.LoadAssetAtPath<GameObject>(modelPath);
// 实例化模型

3
ProjectNLD/Assets/Editor/VehicleBuilder/VehicleBuildData.cs
View File

@ -2,6 +2,7 @@
using System.IO;
using cfg.VehicleCfg;
using Framework;
using Gameplay.Utils;
using UnityEditor;
using UnityEditor.AddressableAssets;
using UnityEditor.Animations;
@ -56,7 +57,7 @@ namespace VehicleBuilder
public void Init()
{
var prefabPath = vehicleConfig.PrefabPath;
var prefabPath = PathEx.GetVehicleSrcModelPath(vehicleConfig.PrefabPath);
var prefab = AssetDatabase.LoadAssetAtPath<GameObject>(prefabPath);
if (prefab == null)
{