23 Commits

Author SHA1 Message Date
puxuan
f4387fca51 fix bug 2025-10-18 18:05:57 +08:00
puxuan
29ded94b59 肉鸽 2025-10-18 10:53:57 +08:00
puxuan
455e71bf7a fix bug 2025-10-17 20:37:51 +08:00
puxuan
2065c73a5c 特殊天赋 2025-10-17 16:13:58 +08:00
kai
ec76fd9ad9 肉鸽技能图标 2025-10-14 15:53:49 +08:00
kai
f841ca153f 肉鸽技能直接带入 2025-10-14 15:38:38 +08:00
puxuan
e041781019 fix bug 2025-08-22 15:47:26 +08:00
xiekaidong
7193f5dcbe fix 2024-01-26 11:09:44 +08:00
xiekaidong
df9fb7cabb bug修复 2023-09-04 20:06:58 +08:00
xiekaidong
8c9945cc63 倒计时优化 2023-09-04 17:25:27 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
chenxi
f04af250ac 编译 2023-06-16 10:37:25 +08:00
xiekaidong
59f0cd755b 修改每日挑战战斗界面的任务入口 2023-06-13 15:25:06 +08:00
xiekaidong
4b805302fc bug修复 2023-05-31 18:06:48 +08:00
xiekaidong
7f9bdc0508 显示bug修复 2023-05-30 18:13:01 +08:00
chenxi
2fbe01e673 每日挑战 2023-05-30 11:45:27 +08:00
xiekaidong
45a449c4df 暂停界面显示修改 2023-04-27 16:30:22 +08:00
xiekaidong
4f4f340b11 日志打点 2023-04-26 18:14:57 +08:00
chenxi
7e1f206064 fix bug 2023-04-25 22:04:30 +08:00
chenxi
779ae429f2 编译 2023-04-20 15:22:06 +08:00
xiekaidong
10159333ea 战斗回合概念 2023-04-14 18:00: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
xiekaidong
87af2478d9 整理项目 2023-04-03 11:04:31 +08:00