Commit Graph

28 Commits

Author SHA1 Message Date
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
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
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
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
9b4a121e5b updat core 2024-10-23 18:46:37 +08:00
czbdw
631878d402 party1and 2 2024-10-23 15:17:37 +08:00
4fc0810107 updat core 2024-10-23 14:56:16 +08:00
61972881b6 Merge remote-tracking branch 'origin/MapXiaoXiong' 2024-10-22 20:36:37 +08:00
czbdw
b3d2fdf760 Part1EnemyCompeleted 2024-10-22 19:14:49 +08:00
d48401607d updat core 2024-10-22 19:10:15 +08:00
czbdw
9eda0a46d8 Part1Img Part1Box been completed 2024-10-21 21:41:00 +08:00
867dc79f5f updat core 2024-10-21 16:32:14 +08:00
93fe7b4d04 updat core 2024-10-21 16:20:37 +08:00
afc7f2d1bc Merge remote-tracking branch 'origin/MapXiaoXiong'
# Conflicts:
#	Assets/GameRes/Scenes/InitScene.unity
2024-10-21 10:23:24 +08:00
4a9f891d76 增加场景道具 2024-10-19 03:04:15 +08:00
31011e461d update core 2024-10-18 00:23:04 +08:00
e2469a4438 updat core 2024-10-17 00:46:57 +08:00
czbdw
e97db9e1ec part1 been completed 2024-10-16 17:20:10 +08:00
4920837ed7 增加功能 2024-10-16 16:43:53 +08:00
897058435c init 2024-10-16 00:03:41 +08:00