24 Commits

Author SHA1 Message Date
chenxi
3b90d16d0c 编译 2023-05-18 15:40:48 +08:00
chenxi
e5cf6e09bf 战令 2023-05-15 21:34:02 +08:00
xiekaidong
924dd75798 技能机制修改 2023-05-12 10:56:06 +08:00
chenxi
7dcfe8448c 任务 2023-05-11 22:22:27 +08:00
chenxi
c1f4013bb9 编译 2023-05-11 21:36:25 +08:00
chenxi
9a027c3125 购买体力 2023-05-09 14:54:14 +08:00
xiekaidong
af35eb8118 节奏 2023-05-04 17:42:00 +08:00
xiekaidong
d5a36b6c16 体力回复上报 2023-04-28 00:00:41 +08:00
xiekaidong
af05ae6dc5 棋盘死局 2023-04-27 20:15:53 +08:00
xiekaidong
4b877d44fe 改一下执行顺序 2023-04-27 09:49:15 +08:00
xiekaidong
e4c3d3b172 调整一下bi打印逻辑 2023-04-27 09:45:26 +08:00
xiekaidong
4f4f340b11 日志打点 2023-04-26 18:14:57 +08:00
chenxi
e30773b581 编译 2023-04-25 18:18:18 +08:00
chenxi
401b4c9e2e 编译 2023-04-25 16:20:47 +08:00
xiekaidong
1b051206e2 删除下落动画 2023-04-25 14:41:07 +08:00
chenxi
d8f184dad7 编译 2023-04-24 21:21:49 +08:00
xiekaidong
7cab14eba5 编译lua 2023-04-24 10:51:41 +08:00
chenxi
60a183314f 编译 2023-04-22 00:21:12 +08:00
chenxi
07dd3631c4 编译 2023-04-16 23:06:53 +08:00
xiekaidong
10159333ea 战斗回合概念 2023-04-14 18:00:58 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +08:00
xiekaidong
275533f77a 编译lua 2023-04-10 21:15:07 +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
xiekaidong
87af2478d9 整理项目 2023-04-03 11:04:31 +08:00