28 Commits

Author SHA1 Message Date
chenxi
2fbe01e673 每日挑战 2023-05-30 11:45:27 +08:00
xiekaidong
f40ddbf2ea 技能刷新接入联网 2023-05-24 10:03:20 +08:00
xiekaidong
430637632b 弹窗 2023-05-22 10:25:26 +08:00
xiekaidong
fff1c9260e 宝箱 2023-05-17 19:20:18 +08:00
xiekaidong
63ad1d641a 神灯障碍物 2023-05-16 21:24:26 +08:00
xiekaidong
098220b08c 编译lua 2023-05-12 20:30:10 +08:00
chenxi
b6c15f641d 编译 2023-05-05 15:39:51 +08:00
chenxi
cc406cece5 fix bug 2023-04-26 19:34:26 +08:00
xiekaidong
4f4f340b11 日志打点 2023-04-26 18:14:57 +08:00
xiekaidong
d08bdb2a1f 技能选择界面改到战斗界面中 2023-04-25 23:28:01 +08:00
xiekaidong
a1cfdd0d4c 编译lua 2023-04-25 20:39:31 +08:00
xiekaidong
891d0d35ed 消除bug修复 2023-04-24 20:50:18 +08:00
xiekaidong
b2fb08e435 英雄排序bug修复 2023-04-23 15:49:10 +08:00
xiekaidong
4e744fa0e1 编译lua 2023-04-21 16:28:05 +08:00
xiekaidong
5222c799bb 动画 2023-04-20 18:46:11 +08:00
chenxi
779ae429f2 编译 2023-04-20 15:22:06 +08:00
chenxi
7024404d8f 编译 2023-04-18 20:10:27 +08:00
xiekaidong
aa8de9d540 编译lua 2023-04-18 18:01:07 +08:00
chenxi
eebce5736f 编译 2023-04-18 17:45:05 +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
edd53e0280 编译 2023-04-11 22:46:00 +08:00
chenxi
3d28196523 修复一些报错 2023-04-11 20:33:59 +08:00
xiekaidong
275533f77a 编译lua 2023-04-10 21:15:07 +08:00
chenxi
5c05e888c9 章节 2023-04-07 20:50: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