43 Commits

Author SHA1 Message Date
puxuan
db8e86b49d fix bug 2025-10-28 11:34:25 +08:00
puxuan
2ed2daabf2 fix bug 2025-10-21 18:23:54 +08:00
puxuan
3ea8d17837 肉鸽 2025-10-16 21:17:02 +08:00
xiekaidong
ce7ad3cb8c 新buff和新机制 2023-08-08 16:39:03 +08:00
xiekaidong
3b67015da8 bug修复 2023-07-06 17:42:19 +08:00
xiekaidong
de21e7b5d7 显示问题修复 2023-07-05 14:26:04 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
xiekaidong
06191c7e8c bug修复 2023-06-21 17:16:12 +08:00
xiekaidong
989a7c63e5 火蛇海蛇效果 2023-06-16 15:14:33 +08:00
xiekaidong
19084e41f4 bug修复 2023-06-15 14:07:48 +08:00
chenxi
358a41e2ed 参数以及上报 2023-06-14 21:43:46 +08:00
xiekaidong
b60f9b1ca4 boss机制棋盘效果处理 2023-06-02 22:28:55 +08:00
xiekaidong
88008cdf67 显示优化 2023-06-01 22:10:51 +08:00
xiekaidong
7e25cb28cb 三消格子支持spine动画表现 2023-05-31 20:18:57 +08:00
xiekaidong
075d7a2480 层级调整 2023-05-30 22:04:57 +08:00
xiekaidong
cd99e669cb 更新配置 2023-05-30 15:08:30 +08:00
xiekaidong
63ad1d641a 神灯障碍物 2023-05-16 21:24:26 +08:00
xiekaidong
098220b08c 编译lua 2023-05-12 20:30:10 +08:00
xiekaidong
05965fa97e bug修复 2023-04-27 15:24:50 +08:00
xiekaidong
9e03ce63fc 章节障碍物和棋盘地图 2023-04-25 18:39:02 +08:00
xiekaidong
0ed41e1da1 显示修改 2023-04-25 15:50:04 +08:00
xiekaidong
39e9ba43a0 动画 2023-04-24 17:21:12 +08:00
xiekaidong
11219e4716 bug修复 2023-04-24 10:14:38 +08:00
xiekaidong
1da0916885 编译lua 2023-04-23 19:03:58 +08:00
xiekaidong
9249bc74f7 消除技能特效 2023-04-23 19:03:00 +08:00
xiekaidong
fd6eb94de4 bug和显示优化 2023-04-23 17:22:33 +08:00
xiekaidong
e82acf920a 编译lua 2023-04-23 14:20:08 +08:00
xiekaidong
97f473eb2c 修改特效,消除影响改为十字形 2023-04-22 00:47:15 +08:00
xiekaidong
0b47632138 bug修复 2023-04-21 11:00:32 +08:00
xiekaidong
6c0307c660 动画 2023-04-21 10:57:51 +08:00
xiekaidong
96cba83db9 动画调整 2023-04-20 20:30:56 +08:00
chenxi
6991dd2d36 伤害 2023-04-20 19:04:56 +08:00
xiekaidong
c1119c5b9a 修复 2023-04-20 18:50:27 +08:00
xiekaidong
5222c799bb 动画 2023-04-20 18:46:11 +08:00
chenxi
3d3276eaf2 编译 2023-04-19 16:29:38 +08:00
chenxi
5182596112 merge 2023-04-19 10:48:28 +08:00
chenxi
7024404d8f 编译 2023-04-18 20:10:27 +08:00
chenxi
07dd3631c4 编译 2023-04-16 23:06:53 +08:00
chenxi
edd53e0280 编译 2023-04-11 22:46:00 +08:00
chenxi
3d28196523 修复一些报错 2023-04-11 20:33:59 +08:00
xiekaidong
275533f77a 编译lua 2023-04-10 21:15:07 +08:00
chenxi
5c05e888c9 章节 2023-04-07 20:50:58 +08:00
chenxi
4809253845 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/textures/ui/common.meta
#	Assets/arts/textures/ui/common/common_alpha.png.meta
#	Assets/arts/textures/ui/common/common_arrow_3.png
#	Assets/arts/textures/ui/common/common_arrow_3.png.meta
#	Assets/arts/textures/ui/common/common_arrow_4.png
#	Assets/arts/textures/ui/common/common_arrow_4.png.meta
#	Assets/arts/textures/ui/common/common_bg_0.png.meta
#	Assets/arts/textures/ui/common/common_bg_3.png
#	Assets/arts/textures/ui/common/common_bg_3.png.meta
#	Assets/arts/textures/ui/common/common_board_10.png
#	Assets/arts/textures/ui/common/common_board_10.png.meta
#	Assets/arts/textures/ui/common/common_board_6.png
#	Assets/arts/textures/ui/common/common_board_6.png.meta
#	Assets/arts/textures/ui/common/common_board_7.png
#	Assets/arts/textures/ui/common/common_board_7.png.meta
#	Assets/arts/textures/ui/common/common_btn_2.png
#	Assets/arts/textures/ui/common/common_btn_2.png.meta
#	Assets/arts/textures/ui/common/common_btn_3.png
#	Assets/arts/textures/ui/common/common_btn_3.png.meta
#	Assets/arts/textures/ui/common/common_check_1.png
#	Assets/arts/textures/ui/common/common_check_1.png.meta
#	Assets/arts/textures/ui/common/common_chest_1.png
#	Assets/arts/textures/ui/common/common_chest_1.png.meta
#	Assets/arts/textures/ui/common/common_dec_1.png
#	Assets/arts/textures/ui/common/common_dec_1.png.meta
#	Assets/arts/textures/ui/common/common_hp.png
#	Assets/arts/textures/ui/common/common_hp.png.meta
#	Assets/arts/textures/ui/common/common_inf.png
#	Assets/arts/textures/ui/common/common_inf.png.meta
#	Assets/arts/textures/ui/common/common_lock_2.png
#	Assets/arts/textures/ui/common/common_lock_2.png.meta
#	Assets/arts/textures/ui/common/common_progress_4.png
#	Assets/arts/textures/ui/common/common_progress_4.png.meta
2023-04-07 15:27:09 +08:00