26 Commits

Author SHA1 Message Date
chenxi
b8652d1bbc 七天乐 2023-05-26 14:52:05 +08:00
chenxi
56e27bfd3f 基金界面 2023-05-24 19:26:13 +08:00
chenxi
3b47c0dc1a 编译 2023-05-23 19:03:11 +08:00
xiekaidong
97953f1958 格挡动作表现、反击界面表现 2023-05-23 16:40:45 +08:00
CloudJ
012dd355ea 编译 2023-05-23 14:20:32 +08:00
xiekaidong
cf654fe422 技能tips 2023-05-22 16:00:44 +08:00
xiekaidong
ee9f6680b9 更新资源 2023-05-19 20:00:57 +08:00
chenxi
d2b296fe95 宝箱tips 2023-05-19 16:37:44 +08:00
chenxi
e5cf6e09bf 战令 2023-05-15 21:34:02 +08:00
chenxi
c1f4013bb9 编译 2023-05-11 21:36:25 +08:00
chenxi
b781f3a483 设置 2023-05-08 20:40:33 +08:00
xiekaidong
33cad880c9 联网 2023-05-08 11:03:17 +08:00
chenxi
62b4039351 主城 2023-05-05 22:05:13 +08:00
xiekaidong
9249bc74f7 消除技能特效 2023-04-23 19:03:00 +08:00
chenxi
7354b90491 编译 2023-04-21 23:33:09 +08:00
chenxi
40b4ce4bf4 结算界面 2023-04-21 22:42:16 +08:00
chenxi
8ac46b5a63 技能特效 2023-04-21 15:53:38 +08:00
chenxi
82af267f87 buff显示逻辑 2023-04-19 22:20:48 +08:00
chenxi
5182596112 merge 2023-04-19 10:48:28 +08:00
xiekaidong
10159333ea 战斗回合概念 2023-04-14 18:00:58 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +08:00
chenxi
3d28196523 修复一些报错 2023-04-11 20:33:59 +08:00
chenxi
1163b9c827 编译 2023-04-10 21:56:12 +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