Commit Graph

1874 Commits (main)

Author SHA1 Message Date
polaris 9770c8732e 第一章后处理 2026-01-16 16:55:49 +08:00
Brucz 2d79f002dc "BugList uibug修改添加" 2026-01-16 15:33:21 +08:00
Guan3333 ffecbb9fcb Maps06_Grassland_2_a_0_9修改 2026-01-15 16:50:22 +08:00
Yurui cd21afb74b [选关UI]周常场景切换 2026-01-15 16:08:19 +08:00
Guan3333 92eea93844 Maps00_Plain_8_a_0_9_2补底图 2026-01-15 13:13:36 +08:00
liuchunguang e56cc687a5 抽卡添加五星效果 2026-01-14 14:35:19 +08:00
louyahan 7041523626 三个取消勾选 vertex color always in 2026-01-14 14:04:24 +08:00
mashaohua 87d6f57d63 场景补充修改完成 2026-01-14 12:45:10 +08:00
Yurui de051b058d [UI]恢复UINormal设置 2026-01-13 18:50:34 +08:00
Yurui 77097cafe1 [UI]UI相机和战斗UI层级调整 2026-01-13 13:51:32 +08:00
liuchunguang 7cca6a5632 添加支持在timeline中播放动画状态机的功能 2026-01-12 16:42:11 +08:00
tengwei c33e00287f 修改出击界面角色蒙皮 2026-01-12 14:10:02 +08:00
liuchunguang a36a906839 添加新载具动画及界面 2026-01-12 13:40:17 +08:00
polaris b7dd136e38 补动画 2026-01-09 15:49:38 +08:00
polaris 5d455a9f57 补timeline 2026-01-09 15:45:20 +08:00
polaris 3aa340076a 主场景加入载具获取界面 2026-01-09 14:50:56 +08:00
polaris 5cd4b66ae2 载具获得界面 2026-01-09 14:47:01 +08:00
tengwei 4a160f715f vehicleDispalyScene.prefab 2026-01-09 13:58:03 +08:00
Brucz daf13107dc “【UI】BugList 优化项修改” 2026-01-09 13:35:30 +08:00
马远征 dc095149a7 【UI】层级和UIRoot整理 2026-01-09 12:49:55 +08:00
liuchunguang 81e2ffb2c2 添加载具动画 2026-01-08 16:55:35 +08:00
Yurui 567293f867 选关场景渐隐时间减半 2026-01-08 13:41:19 +08:00
ZengTing921 28635bd456 演习结算动效 2026-01-07 19:14:14 +08:00
ZhuJuxian 070a3985d4 1-2修改 2026-01-06 20:17:16 +08:00
ZhuJuxian 027b3b5ce1 0-1 2026-01-06 18:29:12 +08:00
polaris 03eb44804a 选关差分镜头动画 2026-01-06 17:22:07 +08:00
polaris 83cbbc3629 关卡选择差分占位 2026-01-06 17:12:40 +08:00
ZhuJuxian b6187a9264 1-2修改 2026-01-06 16:55:25 +08:00
ZhuJuxian bf32015ffd 序章修改 2026-01-05 20:44:47 +08:00
ZhuJuxian 79f680d5f0 修改新地图后缀+临时后处理 2026-01-05 15:17:55 +08:00
polaris 26c792be70 后处理 2026-01-05 14:16:39 +08:00
polaris efcf9aad55 后处理 2026-01-05 14:12:38 +08:00
ZhuJuxian 76984ede27 3-3+临时后处理 2026-01-04 20:02:09 +08:00
ZhuJuxian 02a0acb072 导表+3-3 2026-01-04 16:47:02 +08:00
Brucz ff965ff848 "【UI】资源添加,BugList修改" 2025-12-31 16:50:26 +08:00
polaris 2e93a7ea28 主场景差分动画 2025-12-31 15:41:49 +08:00
zhangping 681458422b 主线2-5及2-8临时后处理 2025-12-30 16:38:11 +08:00
ZhuJuxian e5e912172e 4-10+临时后处理 2025-12-29 18:46:11 +08:00
Yurui d7ecb2b9af 出击界面渐隐功能 2025-12-29 18:09:27 +08:00
ZhuJuxian d5c8a038c8 4-8布置+临时后处理 2025-12-29 17:06:33 +08:00
polaris dc71a49ab6 载具获得界面测试场景 2025-12-29 16:49:32 +08:00
ZhuJuxian 795c2d6abb 4-5布置 2025-12-28 16:47:39 +08:00
ZhuJuxian d4f407414d 4-4布置 2025-12-28 15:47:44 +08:00
ZhuJuxian 11c0ff3889 4-3 2025-12-28 14:55:03 +08:00
ZhuJuxian 3071cbae51 4-1布置 2025-12-27 16:49:37 +08:00
ZhuJuxian 30e835dbf8 第四章表配置 2025-12-27 14:14:15 +08:00
ZhuJuxian 4ced91b27d 1-7布置+临时后处理 2025-12-27 13:58:10 +08:00
ZhuJuxian c2fd6c72fe 第一章调整 2025-12-27 13:33:26 +08:00
ZhuJuxian 3bb0c3a64a 1-5布置+临时后处理 2025-12-26 20:13:19 +08:00
zhangping 2650797be0 主线2-4/2-2修改 2025-12-26 19:20:44 +08:00
mashaohua d5fd1cb594 第六章场景修改完成 2025-12-26 14:50:51 +08:00
ZhuJuxian 8483667ae9 第四章关卡 2025-12-25 18:56:09 +08:00
polaris 1b577e2b59 耀斑106演出 2025-12-25 15:46:42 +08:00
polaris a724fe2982 补后处理 2025-12-24 14:18:53 +08:00
Guan3333 00c3270630 Merge branch 'dev' of http://1.14.122.170:3000/PHXH/NLDClient into dev 2025-12-24 13:15:42 +08:00
Guan3333 dd09b6030e Maps04_Snowfield_a_0_3 删改静物 2025-12-24 13:15:01 +08:00
mashaohua 19e9c4a4fe 场景修改 2025-12-24 13:14:39 +08:00
ZhuJuxian 0fe8e8cb2b 0-3布置 2025-12-24 12:21:44 +08:00
ZhuJuxian 14bdfe4945 序章0-1布置 2025-12-23 19:24:23 +08:00
polaris b54aa1b5ac 日常关后处理 2025-12-23 14:41:35 +08:00
ZhuJuxian 7c5633f8b7 新序章json和配置导表 2025-12-23 13:13:47 +08:00
Guan3333 4248383f3f Merge branch 'dev' of http://1.14.122.170:3000/PHXH/NLDClient into dev 2025-12-22 15:52:27 +08:00
Guan3333 4bfe459370 Maps04 Snowfield 1 a 0.9水面修复 2025-12-22 15:52:20 +08:00
mashaohua 743bc8cc83 地图修改 2025-12-22 14:31:48 +08:00
mashaohua b9d9f49934 地图5-6章修改 2025-12-22 14:24:53 +08:00
ZhuJuxian 4a8a17d15d 1-10布置+临时后处理 2025-12-21 18:16:06 +08:00
ZhuJuxian ce65ee6988 1-9布置+临时后处理 2025-12-21 17:23:31 +08:00
ZhuJuxian ce6b79cd9f 1-8布置+临时后处理 2025-12-21 16:44:23 +08:00
ZhuJuxian afec8ea124 1-6布置+临时后处理 2025-12-21 16:18:20 +08:00
ZhuJuxian 77b57dbbd5 1-4布置 2025-12-21 15:42:40 +08:00
ZhuJuxian 8d30f296cd 1-3布置 2025-12-21 14:40:32 +08:00
ZhuJuxian 6a7c438ed8 主线1-2布置 2025-12-21 14:03:38 +08:00
ZhuJuxian 213ead58bd 主线1-1关卡布置 2025-12-21 13:13:53 +08:00
马远征 40212d5463 【UI】合并 canvas root 和 ui layer
# Conflicts:
#	ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs
2025-12-19 15:41:50 +08:00
马远征 3a1dd5fe41 【UI】重命名root挂点名,准备与ui layer 合并; 2025-12-19 11:54:18 +08:00
polaris 1ed6a9675e 扫荡界面调整 2025-12-18 15:16:58 +08:00
Brucz efeec6a18d “游戏登陆界面 更新提示修改” 2025-12-17 11:55:35 +08:00
Vinny 76afe4046b 提交载具fade修改 补充修改错误的材质 提交预览场景 2025-12-16 18:38:26 +08:00
mashaohua efa39dc0c1 第三--第五章地图修改 2025-12-16 14:36:10 +08:00
mashaohua 8350708a08 删除红色汽油桶 2025-12-15 15:43:43 +08:00
polaris e5b729ce5d 载具关后处理 2025-12-10 15:14:02 +08:00
mashaohua 93f0f8ed1b 静物调整 2025-12-09 16:33:15 +08:00
mashaohua 75ba953201 场景完成提交 2025-12-09 15:40:59 +08:00
mashaohua cf59000457 Maps04_Snowfield_Vehicle_1场景完成 2025-12-09 15:26:10 +08:00
mashaohua 98a0beaa67 道路轨道修改 2025-12-09 15:14:00 +08:00
Guan3333 b8e6c4ceb9 Merge branch 'dev' of http://1.14.122.170:3000/PHXH/NLDClient into dev 2025-12-09 15:09:10 +08:00
Guan3333 e06bff51dd Maps00_Plain_Daily_Exp_1底图修改 2025-12-09 15:09:02 +08:00
mashaohua fbcf1ca5d8 0.9载具本 2025-12-09 14:41:38 +08:00
ChenZiang 28c7f40f40 【策划】性能测试关调整 2025-12-08 15:40:32 +08:00
ChenZiang e35a2a61b1 【策划】耀斑战斗关卡配置 2025-12-08 15:23:00 +08:00
mashaohua 8d3ec54660 Maps06_Grassland_Vehicle_1场景制作完成 2025-12-08 15:05:55 +08:00
ChenZiang 26a04b2ea2 【策划】剧情战斗关卡 2025-12-08 14:16:49 +08:00
mashaohua 8eb153a8ca 地图删减修改第二章 2025-12-04 16:02:14 +08:00
polaris 109f626005 载具关1后处理 2025-12-04 14:34:04 +08:00
Guan3333 243cdb1bfb Maps01_Mountainous_Vehicle_1修改 2025-12-03 20:14:13 +08:00
mashaohua 10ba2db5b7 Maps01_Mountainous_Vehicle_1场景制作完成 2025-12-03 19:56:18 +08:00
ChenZiang 59c206d08a 【策划】靶场关及塔防关
# Conflicts:
#	ProjectNLD/Assets/Config/Data/levelcfg_level.json
#	ProjectNLD/Assets/Config/Levels/LevelData_7_701007.json.meta
#	ProjectNLD/Assets/Config/Levels/LevelData_7_701008.json.meta
#	ProjectNLD/Assets/Config/Levels/LevelData_7_701009.json.meta
#	ProjectNLD/Assets/Config/Levels/LevelData_7_701010.json.meta
#	ProjectNLD/Assets/Config/Levels/LevelData_7_701011.json.meta
#	ProjectNLD/Assets/Config/Levels/LevelData_7_701012.json.meta
2025-12-03 17:38:01 +08:00
Guan3333 29df801d31 Maps06_Grassland_2_a_0.9 Maps04_Snowfield_1_a_0.9地格内容删改 2025-12-03 17:14:52 +08:00
mashaohua cd513ec4d8 删减地图修改 2025-12-03 16:28:47 +08:00
polaris 558f09ffa4 扫荡结算修改 2025-12-03 16:26:58 +08:00
Vinny 46c700d32e 修改场景设置和配置表 2025-12-03 15:47:30 +08:00
ChenZiang 064320cc3f 【策划】性能测试关预配置 2025-12-03 13:35:18 +08:00
Brucz 07eb1f8db3 “登陆界面修改” 2025-12-03 12:35:21 +08:00
zhangaotian 02c4703b78 修改后处理碰撞盒默认大小 2025-12-03 12:34:00 +08:00
ChenZiang 8568ec78b8 【策划】火车关预配置
以及后处理文件
2025-12-03 12:11:01 +08:00
Yurui 208accea1c 扫荡演出 2025-12-01 16:01:26 +08:00
ChenZiang 2e71a91977 【策划】日常金币本预配置 2025-12-01 15:40:06 +08:00
polaris 54813ea3f2 更新tineline 2025-12-01 15:31:07 +08:00
Yurui 63e7662f36 扫荡演出 2025-12-01 15:21:43 +08:00
ChenZiang 1cbc750b89 【关卡】靶场关配置 2025-11-28 18:15:03 +08:00
zhangaotian 43788bd70c 关卡场景添加新节点、后处理新流程 2025-11-27 17:03:38 +08:00
ChenZiang 340646f281 【关卡】载具本第一批地图MapData 2025-11-27 16:45:05 +08:00
Yurui 6c970475b6 PVP结算 2025-11-26 18:51:58 +08:00
Yurui f21dfe3ef1 PVP结算 2025-11-26 16:10:12 +08:00
Brucz 7d20d7b5be “gamelauncher修改添加” 2025-11-26 14:09:33 +08:00
Yurui c374ff67d4 PVP结算演出 2025-11-25 16:29:30 +08:00
polaris 9a8ad256e1 相机tag 2025-11-25 14:56:38 +08:00
Yurui d1cfe7ce31 PVP结算修改 2025-11-25 14:32:50 +08:00
Yurui 73f1f17e17 修改主场景相机tag 2025-11-25 12:53:43 +08:00
mashaohua 553ee752a1 测试场景提交 2025-11-24 15:02:47 +08:00
ChenZiang 6d45296034 性能测试关MapData 2025-11-24 14:20:53 +08:00
polaris 6fd08c685c 打点 2025-11-21 14:28:37 +08:00
Yurui c3cbbcf1fa TopCamera始终打开 2025-11-21 13:23:26 +08:00
polaris 26213ffe2c 耀斑主场景修改 2025-11-18 15:32:04 +08:00
Vinny 5937957370 Merge remote-tracking branch 'remotes/origin/main' into VinnyTest
# Conflicts:
#	ProjectNLD/Assets/Config/Data/Localize/EN/stringcfg_stringconfig.json
#	ProjectNLD/Assets/Config/Data/charactercfg_characterawaking.json
#	ProjectNLD/Assets/Config/Data/effectcfg_effectconfig.json
#	ProjectNLD/Assets/Config/Data/monstercfg_monster.json
#	ProjectNLD/Assets/PhxhSDK
#	ProjectNLD/Assets/Plugins/Android/OAID-SDK/oaidtest2-debug.aar
2025-11-17 18:54:52 +08:00
Vinny 5f56d901cf 修改bloom 更换Mainscene太阳材质 2025-11-13 15:04:54 +08:00
Vinny 29218707c1 EffectiveBloom测试 2025-11-12 19:11:15 +08:00
polaris 6375fe027d 缩地面贴图 2025-11-12 15:24:28 +08:00
polaris 578cef301a 缩地图尺寸 2025-11-12 15:00:51 +08:00
polaris da1cb54c7f 周特殊关后处理设置 2025-11-12 14:44:57 +08:00
mashaohua acdf56419c 静物调整替换 2025-11-12 14:12:30 +08:00
mashaohua 34d8cf81c3 Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-11-11 17:58:29 +08:00
mashaohua ac968f004d Maps06_GrassLand_Weekly_Special_1场景制作完成 2025-11-11 17:58:17 +08:00
Yurui 9970f549cf 关卡黑屏界面统一UI框架管理 2025-11-11 15:25:02 +08:00
ChenZiang fb82351a26 【关卡】补提专精本MapData 2025-11-11 12:11:30 +08:00
Guan3333 5bbaf3677f Maps06_GrassLand_Weekly_Special_1底图提交 2025-11-10 16:30:01 +08:00
ChenZiang 512805bbdc 【关卡】专精本MapData 2025-11-10 16:06:33 +08:00
Yuntao Hu 1d3af093e8 GameLauncher界面按钮绑定 2025-11-06 19:21:25 +08:00
Brucz b53742ff2b “登录界面修改” 2025-11-06 17:18:18 +08:00
刘涛 dc011a4fdd 【战斗】更新主场景 2025-11-06 16:05:51 +08:00
刘涛 38ac9da79b 【战斗】修改主场景 2025-11-06 15:36:06 +08:00
刘涛 aa2c068b67 【战斗】调整技能相机相关逻辑 2025-11-06 13:58:38 +08:00
Brucz 38f54a5ee9 "登录界面资源替换更新" 2025-11-06 13:19:01 +08:00
polaris 2ce996b60b 靶场关卡后处理 2025-11-04 17:04:36 +08:00
polaris 1d40c40f36 耀斑新增关卡后处理 2025-11-04 16:04:52 +08:00
mashaohua 78aa6f78e0 Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-11-04 13:59:28 +08:00
mashaohua 1668b00d01 靶场场景制作完成 2025-11-04 13:58:37 +08:00
chenyu dd4258fbf7 更新军团战地图地格buff 2025-11-03 18:46:54 +08:00
Guan3333 222eef8e04 Maps04_Snowfield_t_0_1底图提交 2025-11-03 15:30:55 +08:00
ChenZiang 9d46f142de 【关卡】靶场测试关Mapdata 2025-11-03 15:19:54 +08:00
chenyu aa12bcac6a 新增军团战默认地格999类型 2025-11-03 14:40:36 +08:00
Huliang 7db66862d7 字幕预制体修改
语音字幕显示
2025-10-31 16:43:07 +08:00
chenyu 7c1601f89f 更新军团战地图标记 2025-10-31 11:46:59 +08:00
mashaohua d105e607ab Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-10-28 18:42:40 +08:00
mashaohua 3e6ff0774a 填补缺失 2025-10-28 18:42:21 +08:00
polaris 2bb16af120 pvp地图更新 2025-10-28 17:20:25 +08:00
mashaohua 40940ada58 调整命名尺寸 2025-10-28 13:22:15 +08:00
mashaohua 11f08ee89b Maps04_Snowfield_b_5_4场景制作完成 2025-10-27 16:05:30 +08:00
polaris 27d2828280 pvp结算场景 2025-10-24 17:56:40 +08:00
polaris 733d0c7f07 新增两个结算场景 2025-10-24 17:31:24 +08:00
mashaohua e92aa56481 Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-10-24 16:23:29 +08:00
mashaohua c4c5dea801 Maps03_Woodland_b_5_5场景制作完成 2025-10-24 16:23:17 +08:00
polaris 6cc5223f56 耀斑选关后处理 2025-10-24 16:03:01 +08:00
polaris b6e0132bce 耀斑选关后处理 2025-10-24 15:50:07 +08:00
polaris 468a0019d2 耀斑选关后处理 2025-10-24 15:38:30 +08:00
polaris 445ad191f1 耀斑选关打点 2025-10-24 15:12:04 +08:00
Yurui 453a33c0ec 更新耀斑关卡点位 2025-10-23 19:53:12 +08:00
mashaohua a343fb6820 Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-10-23 17:43:03 +08:00
mashaohua 077cfaae21 Maps04_Snowfield_b_5_3场景制作完成 2025-10-23 17:42:54 +08:00
polaris 7020aa159a 补提后处理 2025-10-23 15:08:17 +08:00
polaris 0df45eb26e 耀斑关卡后处理 2025-10-23 14:38:06 +08:00
polaris 83b990fe86 耀斑关卡后处理 2025-10-23 14:09:25 +08:00
Yurui cd80a13b65 耀斑关卡 2025-10-23 12:55:42 +08:00
Yurui af3418e0da 耀斑关卡 2025-10-22 19:34:44 +08:00
Yurui 1ad62877fb 耀斑关卡场景增加EX点位 2025-10-22 18:54:38 +08:00
polaris f137fd24a9 雪地13应急用非正式 2025-10-22 18:06:28 +08:00
polaris 22d51fb05a 耀斑b22后处理 2025-10-22 18:01:43 +08:00
mashaohua 0a09162c32 修改摄像机背景颜色 2025-10-22 17:55:43 +08:00
mashaohua 2080d366c5 Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-10-22 17:45:27 +08:00
mashaohua 1f1dc5c921 Maps03_Woodland_b_5_6,场景完成 2025-10-22 17:45:14 +08:00
polaris 3af6550e55 回滚预制体 2025-10-22 17:39:19 +08:00
polaris 7f8cd00d0f 耀斑关卡后处理 2025-10-22 17:13:44 +08:00
ZhuJuxian 5be521822f 模范关地图和关卡数据+导表 2025-10-22 17:10:55 +08:00
polaris d2f0f0b875 耀斑关卡后处理b13 2025-10-22 16:48:46 +08:00
polaris 1833c9c894 耀斑选关地图 2025-10-22 16:00:34 +08:00
polaris a64785afbf 耀斑关卡后处理设置 2025-10-22 14:24:25 +08:00
Yurui 463e8b801c 耀斑关卡场景 2025-10-21 19:34:30 +08:00
Guan3333 7debef3fe5 Maps04_Snowfield_13删改 2025-10-21 18:41:02 +08:00
mashaohua 63472d5242 Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-10-21 17:51:53 +08:00
mashaohua d8cf27df79 后处理重新配置 2025-10-21 17:51:33 +08:00
Guan3333 fe7eb1c69f Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-10-21 17:17:36 +08:00
Guan3333 ddf533c683 Maps04_Snowfield_13删改 2025-10-21 17:17:25 +08:00
ZhuJuxian ad59dd0a09 模范关3基础配置 2025-10-21 17:09:59 +08:00
mashaohua 7b357d7351 Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-10-21 16:39:09 +08:00
mashaohua 18fbe38c0f Maps03_Woodland_b_5_2场景制作完成 2025-10-21 16:38:52 +08:00
ZhuJuxian a936a71280 模范关2 地图数据 2025-10-21 14:11:58 +08:00
Yurui 1f7b2685ed 耀斑关卡地图测试点位 2025-10-21 13:36:30 +08:00
Yurui 809e9cddd1 耀斑选关 2025-10-20 19:30:41 +08:00
mashaohua da05d36f7c Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient 2025-10-20 18:38:54 +08:00
mashaohua 50554f4b30 Maps03_Woodland_b_5_1场景制作 2025-10-20 18:38:48 +08:00