刘涛 e0c2ae53d6 Merge branch 'dev' into feature/dev_1.0 ... # Conflicts: # ProjectNLD/Assets/Code/Scripts/GamePlay_Dll/GamePlay.dll # ProjectNLD/Assets/Config/Data/Localize/EN/stringcfg_stringconfig.json # ProjectNLD/Assets/Config/Data/actorcfg_playerhead.json # ProjectNLD/Assets/Config/Data/stringcfg_stringconfig.json		2026-03-27 12:39:14 +08:00
..
BondRegion	图片分辨率	2026-03-24 18:17:32 +08:00
BuffIcon	图片分辨率	2026-03-24 18:17:32 +08:00
BuildingIcon	图片分辨率	2026-03-24 18:17:32 +08:00
Card	图片更新	2026-03-23 18:03:19 +08:00
CharacterChip	图片分辨率	2026-03-24 18:17:32 +08:00
CharacterRegion	图片分辨率	2026-03-24 18:17:32 +08:00
Coin	图片分辨率	2026-03-24 18:17:32 +08:00
Fraction	图片分辨率	2026-03-24 18:17:32 +08:00
Gift	图片更新	2026-03-23 18:03:19 +08:00
GridIcon	图片分辨率	2026-03-24 18:17:32 +08:00
Gun	图片分辨率	2026-03-24 18:17:32 +08:00
GunType	“养成武器剪影资源修改台南佳”	2025-12-19 15:00:01 +08:00
HeadPic	【5607】头像ICON调整	2026-03-25 19:47:08 +08:00
Job	图片分辨率	2026-03-24 18:17:32 +08:00
LevelDetail	图片分辨率	2026-03-24 18:17:32 +08:00
MaterialFragment	图片分辨率	2026-03-24 18:17:32 +08:00
Medal	【5680】【勋章】异形勋章挂点需要上移	2026-03-26 18:26:59 +08:00
MusicBox	图片分辨率	2026-03-24 18:17:32 +08:00
PVPBuilding	图片分辨率	2026-03-24 18:17:32 +08:00
Property	图片分辨率	2026-03-24 18:17:32 +08:00
Shop	图片更新	2026-03-23 18:03:19 +08:00
Skills	Merge branch 'feature/dev_1.0' of http://1.14.122.170:3000/PHXH/NLDClient into feature/dev_1.0	2026-03-24 19:01:54 +08:00
SkinGainTemp	图片分辨率	2026-03-24 18:17:32 +08:00
StoryItem	图片设置修改	2025-12-04 15:10:31 +08:00
TeamMark	图片分辨率	2026-03-24 18:17:32 +08:00
UI_CommanderHead	图片分辨率	2026-03-24 18:17:32 +08:00
UI_LegionTeam	图片分辨率	2026-03-24 18:17:32 +08:00
Vehicle	图片分辨率	2026-03-24 18:17:32 +08:00
gacha	图片更新	2026-03-23 18:03:19 +08:00
BondRegion.meta	…
BuffIcon.meta	…
BuildingIcon.meta	…
Card.meta	更新商店	2026-03-11 23:44:32 +08:00
CharacterChip.meta	…
CharacterRegion.meta	…
Coin.meta	…
Fraction.meta	…
Gift.meta	更新商店	2026-03-11 23:44:32 +08:00
GridIcon.meta	…
Gun.meta	…
GunType.meta	”枪械类型剪影添加“	2025-11-19 13:30:15 +08:00
HeadPic.meta	…
Job.meta	…
LegionHeadPic.meta	…
LevelDetail.meta	…
MaterialFragment.meta	…
MaterialFragment_CharacterSkin.meta	…
Medal.meta	…
MusicBox.meta	…
PVPBuilding.meta	…
Property.meta	…
Shop.meta	提交资源	2026-03-10 23:36:27 +08:00
Skills.meta	…
SkinGainTemp.meta	…
StoryItem.meta	…
TeamMark.meta	…
UI_CommanderHead.meta	…
UI_LegionTeam.meta	…
UnitIcon.meta	…
Vehicle.meta	…
gacha.meta	更新皮肤时装	2026-03-19 12:04:34 +08:00