Commit Graph

378 Commits (02c9585cd95dcda170a96bc0b191ca3553f46a64)

Author SHA1 Message Date
yujia 7ab45de62c 菱形BUFF设置修改 2026-03-30 18:06:35 +08:00
yujia e7322b581b 菱形图标上传 2026-03-30 18:00:38 +08:00
刘涛 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
yujia c2506ff1f1 【5384】【营地】营地训练场需要加上子菜单(教学关卡、靶场) 2026-03-26 20:11:10 +08:00
yujia 357c942c42 【5680】【勋章】异形勋章挂点需要上移 2026-03-26 18:26:59 +08:00
yujia 4582eb66d8 【5607】头像ICON调整 2026-03-25 19:47:08 +08:00
louyahan 19c3d4fdda 5311【抽卡】精英集结图片文本‘侦查’需要显示为侦察 2026-03-24 21:02:47 +08:00
刘涛 e3f5f5e6b8 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
刘涛 87f90fc80c 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/buffcfg_buffconfig.json
#	ProjectNLD/Assets/Config/Data/charactercfg_characterlikability.json
#	ProjectNLD/Assets/Config/Data/stringcfg_stringconfig.json
2026-03-24 18:57:29 +08:00
ZhaoTianqi 7f6be877da ID错误 2026-03-24 18:47:59 +08:00
ZhaoTianqi 8ce28c86b5 更新文件属性 2026-03-24 18:42:18 +08:00
Vinny 03b22cc414 图片分辨率 2026-03-24 18:17:32 +08:00
chenyu b292608ea5 【策划】上传新18个单位的技能icon 2026-03-24 17:07:34 +08:00
liuchunguang 5943689c26 Revert "根据白名单清除非白名单图片视频资源"
This reverts commit deb208b532.
2026-03-23 20:13:47 +08:00
liuchunguang ed0f9ce2d5 Revert "补充不该清理的资源"
This reverts commit 8bbdb38507.
2026-03-23 20:13:42 +08:00
liuchunguang 8bbdb38507 补充不该清理的资源 2026-03-23 19:37:38 +08:00
liuchunguang deb208b532 根据白名单清除非白名单图片视频资源 2026-03-23 18:28:36 +08:00
Vinny c7f7f8cf08 图片更新 2026-03-23 18:03:19 +08:00
yujia 1ac34ff8e7 vip弹窗底板修改 2026-03-20 16:41:28 +08:00
louyahan f6a55f4510 修改名称 2026-03-20 13:19:27 +08:00
louyahan d787aa07d1 修改名称 提交载具战斗icon 2026-03-20 13:16:32 +08:00
polaris 42638b1b82 字体色号修正 2026-03-19 20:42:49 +08:00
louyahan fc53068561 更新皮肤时装 2026-03-19 12:04:34 +08:00
yujia 01c0b9ab96 PV封面补充 2026-03-18 16:52:48 +08:00
louyahan 82267eee90 bug:视频图鉴封面图未配置(资源上传) 2026-03-17 19:31:56 +08:00
Yurui 1cc80ced77 [血条]新版血条增加换弹和瞄准表现 2026-03-17 16:15:41 +08:00
polaris 528fa50606 新血条加换弹条 2026-03-17 15:33:03 +08:00
polaris 00cc2a0537 素材修改 2026-03-17 15:05:32 +08:00
polaris 6f73021e56 素材修改 2026-03-17 15:00:21 +08:00
polaris 09456622ad 新版血条换弹瞄准圈素材 2026-03-17 14:42:16 +08:00
yujia 5bedd5a62e 商店侧页签物料新增 2026-03-17 14:28:13 +08:00
yujia 037d4cf8b7 A00071A00072,2D物料 2026-03-16 16:52:46 +08:00
yujia 9063f837a8 礼包物料替换 2026-03-13 16:41:03 +08:00
louyahan b817da2d79 更新商店 2026-03-11 23:44:32 +08:00
louyahan ac6a9e33ea 提交资源 2026-03-10 23:36:27 +08:00
louyahan 2f0950954c 增加新资源 修改高账 2026-03-10 22:05:41 +08:00
louyahan 5d6b4c8ada 传资源 2026-03-05 19:36:25 +08:00
louyahan 7f89893a8a 【关卡】技能相关 2026-03-05 17:51:06 +08:00
zhangaotian 30787d6ffd 礼包商品增加稀有度背景 2026-03-05 15:10:15 +08:00
louyahan daf3a8907d 【关卡】修改资源 2026-03-05 14:45:13 +08:00
liuchunguang fb8b257f14 同步画报元素资源 2026-03-04 16:40:46 +08:00
louyahan 7a97e9447d [关卡]提交关卡界面 2026-03-03 12:42:05 +08:00
Yurui 8960bda623 [选关UI]新增表现 2026-03-02 16:45:11 +08:00
louyahan 22ce98f9cf [关卡]提交关卡界面 2026-03-02 14:02:50 +08:00
liuchunguang 1da202d0f3 更新预设及相关资源配置 2026-02-28 16:13:02 +08:00
liuchunguang 53b41af01b Merge remote-tracking branch 'remotes/origin/dev' into feature/dev_pictorial_lcg
# Conflicts:
#	ProjectNLD/Assets/Code/Scripts/GamePlay_Dll/GamePlay.dll
#	ProjectNLD/Assets/Config/Data/actorcfg_gacha.json
2026-02-28 14:58:07 +08:00
liuchunguang 78a2224b59 同步画报资源;移除测试用的画报数据文件 2026-02-27 16:51:00 +08:00
louyahan 5bba24c4ae 提交抽卡资源(未完成 还需要继续修改) 2026-02-26 20:45:18 +08:00
yujia f28dd57722 精二皮肤获得ICON替换 2026-02-25 21:12:42 +08:00
polaris be5b60eb6b build图标 2026-02-25 12:36:04 +08:00