Commit Graph

98 Commits

Author SHA1 Message Date
a03edb3cc6 Merge remote-tracking branch 'origin/master_mapDev'
# Conflicts:
#	Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
2024-10-27 22:26:09 +08:00
8f833c5063 update core 2024-10-27 22:24:41 +08:00
czbdw
27014e3258 v3 2024-10-27 21:46:37 +08:00
czbdw
351b978a5f Merge branch 'master' into master_mapDev 2024-10-27 21:22:01 +08:00
czbdw
6f16bfd496 volume adjusted 2024-10-27 21:20:44 +08:00
5227e64327 update core 2024-10-27 21:16:31 +08:00
czbdw
6a2b31b592 v2 2024-10-27 21:16:11 +08:00
3c8edf4613 update core 2024-10-27 21:13:14 +08:00
czbdw
cdc910fa4a Merge branch 'master' into master_mapDev
# Conflicts:
#	Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/SourceHanSansCN-Medium SDF.asset
2024-10-27 21:02:44 +08:00
czbdw
e48fd490cd v1 2024-10-27 21:01:18 +08:00
9eea176c23 Merge remote-tracking branch 'origin/master_mapDev'
# Conflicts:
#	Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/SourceHanSansCN-Medium SDF.asset
2024-10-27 20:54:02 +08:00
7380a29f60 update core 2024-10-27 20:40:21 +08:00
2013c1845b 增加音效 2024-10-27 20:39:18 +08:00
ccb8ef27c4 增加结尾动画 2024-10-27 20:33:42 +08:00
czbdw
d779da7417 SE V2 2024-10-27 20:12:00 +08:00
czbdw
e5c8732585 SE V1 2024-10-27 19:50:09 +08:00
czbdw
bf3f20b5fa Merge branch 'master' into master_mapDev
# Conflicts:
#	Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
2024-10-27 19:18:30 +08:00
czbdw
fa4ba677a1 updated 2024-10-27 19:17:10 +08:00
c818382408 增加音效接口 2024-10-27 19:08:26 +08:00
872e4b6938 增加音效 2024-10-27 19:02:07 +08:00
czbdw
c8d1c21e11 Merge branch 'master' into master_mapDev
# Conflicts:
#	Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/ChillOrganic_Medium SDF.asset
#	Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/SourceHanSansCN-Medium SDF.asset
#	Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
2024-10-27 17:17:52 +08:00
e6616c90d5 增加特效 ,优化道具外观 2024-10-27 17:14:19 +08:00
czbdw
1a2ece04c0 Map adjusted 2024-10-27 17:07:12 +08:00
daeaa8487a 增加特效 ,优化道具外观 2024-10-27 17:06:07 +08:00
czbdw
df0feeb0a4 updated 2024-10-27 16:01:07 +08:00
25e940ece8 Merge remote-tracking branch 'origin/master_mapDev' 2024-10-26 23:59:28 +08:00
bbfe2ee6ff 优化场景 2024-10-26 23:58:57 +08:00
9b9c06931b 优化场景 2024-10-26 23:58:39 +08:00
czbdw
33bf9b7f39 Merge branch 'master' into master_mapDev 2024-10-26 23:57:06 +08:00
czbdw
6af680315c TopMap been Completed 2024-10-26 23:56:45 +08:00
f8e241083e 增加boss 互动 2024-10-26 23:30:51 +08:00
71b922fe6b 优化代码 2024-10-26 22:42:24 +08:00
f4f01e9e59 Merge remote-tracking branch 'origin/master_mapDev' 2024-10-26 21:54:20 +08:00
6c3690c802 update core 完善核心游戏循环 2024-10-26 21:50:45 +08:00
czbdw
a60fb3d66a Merge branch 'master' into master_mapDev
# Conflicts:
#	Assets/GameRes/Scenes/InitScene.unity
2024-10-26 21:21:08 +08:00
a5ae3c79dc update core 2024-10-26 21:14:57 +08:00
czbdw
3a58f4f22f update map 2024-10-26 21:12:42 +08:00
19acf50391 update core 2024-10-26 21:11:33 +08:00
czbdw
9b86861ee0 Merge branch 'master' into master_mapDev 2024-10-26 14:43:33 +08:00
b86887ce09 增加boss 出场cg 2024-10-26 01:38:30 +08:00
czbdw
5a30325022 part2 Enemy been completed 2024-10-25 23:45:19 +08:00
czbdw
26e38348ab Merge branch 'master' into master_mapDev 2024-10-25 18:36:35 +08:00
czbdw
a63f29d42c update img 2024-10-25 18:36:00 +08:00
czbdw
e39ab5a1e2 Part5 v1 2024-10-25 18:35:04 +08:00
524c3afbc6 update core 2024-10-25 16:51:34 +08:00
czbdw
048f051a19 map linked 2024-10-25 16:33:05 +08:00
czbdw
ccfaaf0650 Merge branch 'master' into master_mapDev
# Conflicts:
#	Assets/GameRes/AutoSource/Part/Part1.prefab
2024-10-25 16:19:14 +08:00
2bb98a4b79 update core 2024-10-25 16:15:25 +08:00
czbdw
9b5bc64b94 Updated 2024-10-25 15:48:48 +08:00
3a38008dc4 update core 2024-10-25 15:45:26 +08:00