Commit Graph

177 Commits (02c9585cd95dcda170a96bc0b191ca3553f46a64)

Author SHA1 Message Date
刘涛 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 357c942c42 【5680】【勋章】异形勋章挂点需要上移 2026-03-26 18:26:59 +08:00
yujia 4582eb66d8 【5607】头像ICON调整 2026-03-25 19:47:08 +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
louyahan fc53068561 更新皮肤时装 2026-03-19 12:04:34 +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
yujia f28dd57722 精二皮肤获得ICON替换 2026-02-25 21:12:42 +08:00
polaris be5b60eb6b build图标 2026-02-25 12:36:04 +08:00
zhengziyue 9db243969c 【策划】美术更新 2026-02-24 20:13:40 +08:00
yujia 0e0382cd4f 音乐盒物料修改 2026-02-24 19:43:06 +08:00
chenyu 83e0750143 【5060】修改伊丽莎白技能icon命名错误 2026-02-11 20:33:44 +08:00
chenyu 49998d4b86 【5060】修改错误技能icon命名,伊丽莎白 2026-02-11 20:28:57 +08:00
chenyu 4710b94d1a 【5060】修改错误技能icon命名,伊丽莎白 2026-02-11 20:28:25 +08:00
louyahan 8e68717971 替换资源 2026-02-11 19:13:56 +08:00
louyahan e3818939d0 替换新的技能icon 2026-02-11 18:59:36 +08:00
louyahan 8181cac586 提交头像 2026-02-11 18:46:47 +08:00
louyahan b8e0102a7d 提交头像 2026-02-11 18:44:14 +08:00
louyahan 3129515165 【角色】清芳结业证书资源加载失败 2026-02-11 15:44:40 +08:00
Brucz c484793cf4 “建筑物地格详情图标修改i” 2026-02-02 12:31:54 +08:00
Brucz 975da7bcdf “建筑物地格详情图标修改i” 2026-02-02 12:31:29 +08:00
Brucz d838cf8de6 地格详情建筑Icon补充添加 2026-02-02 12:11:41 +08:00
Brucz f24136f7e2 "载具技能图标命名还原 " 2026-01-26 15:19:50 +08:00
Brucz 8a8e9f082c "载具命名修改添加-1" 2026-01-26 15:17:42 +08:00
Brucz 2dce78a05d “载具技能Icon 图标上传添加” 2026-01-26 15:17:40 +08:00
Brucz 687eac4bf3 “技能图标上传” 2026-01-23 14:13:14 +08:00
Brucz 0942437646 “载具图标资源修改添加” 2026-01-20 16:27:17 +08:00
Brucz 0ea7d5499e "冗余载具资源清楚" 2026-01-20 15:35:00 +08:00
Brucz 4ab4569f45 “载具Icon新添加” 2026-01-20 15:33:36 +08:00
刘涛 09da7227fe 【资源】删除无用资源 2026-01-19 19:49:54 +08:00
Brucz 1986c0bc72 “ui buff图标上传,battlepass预制体修改添加” 2026-01-19 14:13:19 +08:00