21 Commits

Author SHA1 Message Date
xiekaidong
a2e84ce943 修改上报参数,bug修复 2023-07-11 10:21:05 +08:00
xiekaidong
145b72b1de 快捷切换多语言 2023-07-07 11:39:42 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
xiekaidong
bb0b9a6673 bug修复,上传资源 2023-06-20 17:51:19 +08:00
xiekaidong
972a339c4a bug修复 2023-06-14 19:05:47 +08:00
xiekaidong
9a6732acdd 增加棋盘查看字段 2023-06-05 21:08:16 +08:00
CloudJ
7bb5e7c18d 编译 2023-06-05 20:17:55 +08:00
xiekaidong
706cd68517 优化一下 2023-06-05 16:21:14 +08:00
xiekaidong
5920ca0d82 向左遍历棋盘 2023-06-05 16:17:55 +08:00
xiekaidong
74bf06ed0b 加一个GM快速查看棋盘 2023-06-05 16:13:42 +08:00
CloudJ
76d6e3d29f compile 2023-05-25 18:18:38 +08:00
CloudJ
7eb30359a3 编译 2023-05-24 16:01:10 +08:00
xiekaidong
33cad880c9 联网 2023-05-08 11:03:17 +08:00
chenxi
b6c15f641d 编译 2023-05-05 15:39:51 +08:00
xiekaidong
af35eb8118 节奏 2023-05-04 17:42:00 +08:00
chenxi
46f9462b79 回血加盾不算combo 2023-04-27 14:22:21 +08:00
chenxi
735d2b9523 编译 2023-04-27 10:11:13 +08:00
xiekaidong
11219e4716 bug修复 2023-04-24 10:14:38 +08:00
chenxi
7c3bf48beb 编译 2023-04-11 21:58:49 +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