|
|
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
|
6a2b31b592
|
v2
|
2024-10-27 21:16:11 +08:00 |
|
czbdw
|
e48fd490cd
|
v1
|
2024-10-27 21:01:18 +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 |
|
|
|
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 |
|
czbdw
|
1a2ece04c0
|
Map adjusted
|
2024-10-27 17:07:12 +08:00 |
|
|
|
daeaa8487a
|
增加特效 ，优化道具外观
|
2024-10-27 17:06:07 +08:00 |
|
czbdw
|
6af680315c
|
TopMap been Completed
|
2024-10-26 23:56:45 +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 |
|
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
|
a63f29d42c
|
update img
|
2024-10-25 18:36:00 +08:00 |
|
czbdw
|
e39ab5a1e2
|
Part5 v1
|
2024-10-25 18:35:04 +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 |
|
|
|
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 |
|
