104 Commits

Author SHA1 Message Date
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
9b4a121e5b updat core 2024-10-23 18:46:37 +08:00
czbdw
b76973d298 Merge remote-tracking branch 'origin/MapXiaoXiong' into MapXiaoXiong 2024-10-23 15:17:51 +08:00
czbdw
631878d402 party1and 2 2024-10-23 15:17:37 +08:00
czbdw
d0a45d96b5 Merge branch 'master' of http://private.lightyears.ltd:18640/foldcc/taptap2024_GJ_chidouren into MapXiaoXiong 2024-10-23 14:59:27 +08:00
czbdw
85c2d7d0bb party1and 2 2024-10-23 14:57:28 +08:00
4fc0810107 updat core 2024-10-23 14:56:16 +08:00
czbdw
e2ed62ddea Merge remote-tracking branch 'origin/master' into MapXiaoXiong 2024-10-23 14:37:17 +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
fbbd08e0a5 updat core 2024-10-21 22:29:53 +08:00
czbdw
9eda0a46d8 Part1Img Part1Box been completed 2024-10-21 21:41:00 +08:00
6c950bb377 updat core 2024-10-21 17:02:25 +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
9eb7927700 updat core 2024-10-21 10:22:53 +08:00
7badf4a6af update 主程序逻辑 2024-10-19 16:46:07 +08:00
71484ea988 修改基础版本 2024-10-19 16:08:52 +08:00
77bf6c1603 增加编辑器工具 2024-10-19 16:02:35 +08:00
4a9f891d76 增加场景道具 2024-10-19 03:04:15 +08:00
f7d5f98604 updat core 2024-10-18 10:55:32 +08:00
31011e461d update core 2024-10-18 00:23:04 +08:00
437b4dd13f update core 2024-10-17 17:58:11 +08:00
e2469a4438 updat core 2024-10-17 00:46:57 +08:00