Commit Graph

79 Commits

Author SHA1 Message Date
czbdw
fa4ba677a1 updated 2024-10-27 19:17:10 +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
2bfcd95f09 update core 2024-10-25 15:35:39 +08:00
ba9f401013 update core 2024-10-25 11:44:30 +08:00
830b43c7f0 update core 2024-10-24 22:56:03 +08:00
5970551c45 Merge remote-tracking branch 'origin/master_mapDev'
# Conflicts:
#	Assets/GameRes/Scenes/InitScene.unity
#	Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
2024-10-24 22:46:08 +08:00
b56a237c6b update core 2024-10-24 22:45:29 +08:00
2181e42066 update core 2024-10-24 22:16:39 +08:00
czbdw
50db8cf805 part3 been completed 2024-10-24 20:39:03 +08:00
249705c952 update core 2024-10-24 18:21:00 +08:00
36824be9f5 增加开场cg 2024-10-24 18:20:24 +08:00
czbdw
2ed992f6cc updated 2024-10-24 14:11:26 +08:00
43c38fdc47 update core 2024-10-24 00:15:49 +08:00
7db07358ae Merge remote-tracking branch 'origin/master_mapDev'
# Conflicts:
#	Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/ChillOrganic_Medium SDF.asset
#	Assets/GameRes/AutoSource/Part/Part2.prefab
#	Assets/GameRes/AutoSource/Part/Part2Img.prefab
#	Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
2024-10-24 00:09:42 +08:00
b7c3557bd0 update core 2024-10-24 00:08:57 +08:00
0f8d8d46a2 update urp 2024-10-23 23:16:50 +08:00
czbdw
009ab64b0d Part2Enemy been completed 2024-10-23 22:59:15 +08:00
czbdw
c49332d442 part2 been completed 2024-10-23 22:43:10 +08:00
czbdw
fa3c7e2931 updated 2024-10-23 18:55:56 +08:00
czbdw
258c2ec138 Merge branch 'master' into master_mapDev
# Conflicts:
#	Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
2024-10-23 18:48:51 +08:00
czbdw
7e6b8c2897 part2box 2024-10-23 18:48:08 +08:00