22 Commits

Author SHA1 Message Date
Fang
02da483630 装备升级材料获取 2023-07-21 09:51:28 +08:00
xiekaidong
61336e5d6c 编译lua 2023-07-19 20:24:13 +08:00
CloudJ
ade6fd169a 编译 2023-06-06 10:22:05 +08:00
Fang
0216eabf3b 战斗结算界面动画 2023-06-05 17:17:26 +08:00
chenxi
6c7fecc0ce 英雄icon大小 2023-06-02 21:04:03 +08:00
xiekaidong
d391f68779 显示问题 2023-05-31 14:30:41 +08:00
chenxi
706fec62f4 奖励图标 2023-05-26 18:48:02 +08:00
chenxi
049900685c 调整英雄头像 2023-05-26 18:17:37 +08:00
chenxi
d2b296fe95 宝箱tips 2023-05-19 16:37:44 +08:00
chenxi
bcdbcec1db 编译 2023-05-18 22:11:58 +08:00
xiekaidong
fff1c9260e 宝箱 2023-05-17 19:20:18 +08:00
chenxi
f2622a2ae2 tips 2023-05-17 19:05:57 +08:00
chenxi
e5cf6e09bf 战令 2023-05-15 21:34:02 +08:00
xiekaidong
33cad880c9 联网 2023-05-08 11:03:17 +08:00
chenxi
7354b90491 编译 2023-04-21 23:33:09 +08:00
chenxi
6991dd2d36 伤害 2023-04-20 19:04:56 +08:00
chenxi
4b1ca125e0 随便 2023-04-20 17:40:58 +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
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