27 Commits

Author SHA1 Message Date
Fang
71fe08b57c 更表 2023-08-30 17:04:14 +08:00
Fang
566ac2d369 容错、导表 2023-08-14 18:33:10 +08:00
Fang
0aba4ec004 更表 2023-08-14 09:50:16 +08:00
xiekaidong
5c1fa9be63 更新配置 2023-08-10 09:41:33 +08:00
xiekaidong
3b182e56c5 英雄竞技场段位解锁 2023-08-03 18:08:02 +08:00
xiekaidong
dfb2714266 更新配置 2023-07-31 16:28:15 +08:00
Fang
e7927efe57 编译 2023-07-25 15:45:24 +08:00
xiekaidong
b1bb2f0302 处理界面显示 2023-07-24 10:36:45 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
3b67015da8 bug修复 2023-07-06 17:42:19 +08:00
Fang
0767c6eae5 编译 2023-07-05 15:04:42 +08:00
xiekaidong
c3789374c6 更新配置 2023-07-04 15:38:28 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
chenxi
cf3e9051f8 编译 2023-06-20 19:58:29 +08:00
chenxi
c3fdacbef8 编译 2023-06-16 21:34:55 +08:00
xiekaidong
de0b2828a7 新的肉鸽机制-改变effect概率 2023-06-13 11:11:46 +08:00
CloudJ
f79e8ebe89 编译 2023-05-25 15:27:25 +08:00
chenxi
bcdbcec1db 编译 2023-05-18 22:11:58 +08:00
xiekaidong
54fcd748cf 多段伤害 2023-05-18 10:59:17 +08:00
chenxi
ccd4a380d9 编译 2023-05-16 18:18:19 +08:00
chenxi
119deac852 编译 2023-05-12 21:09:16 +08:00
xiekaidong
9122032a63 一些技能机制 2023-05-11 19:19:06 +08:00
chenxi
5ab1e11c6b 设置界面 2023-05-08 21:11:13 +08:00
chenxi
822f2e6734 编译 2023-04-19 20:51:38 +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