38 Commits

Author SHA1 Message Date
chenxi
5eaa1f2f73 编译 2023-05-29 15:22:21 +08:00
chenxi
706fec62f4 奖励图标 2023-05-26 18:48:02 +08:00
chenxi
049900685c 调整英雄头像 2023-05-26 18:17:37 +08:00
chenxi
3894964322 编译 2023-05-22 21:25:43 +08:00
xiekaidong
1d657e3128 boss入场动画 2023-05-22 20:32:26 +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
d880ae0f51 多语言 2023-05-17 16:26:56 +08:00
chenxi
f9d361e469 战令 2023-05-17 15:01:17 +08:00
chenxi
7501e9c08a 弹窗 2023-05-16 19:42:25 +08:00
chenxi
e5cf6e09bf 战令 2023-05-15 21:34:02 +08:00
chenxi
c1f4013bb9 编译 2023-05-11 21:36:25 +08:00
xiekaidong
33cad880c9 联网 2023-05-08 11:03:17 +08:00
xiekaidong
2c7f63baeb bug修复 2023-04-26 18:40:05 +08:00
chenxi
cc2dc24479 编译 2023-04-25 12:09:30 +08:00
xiekaidong
a849c21af9 一些spine 2023-04-24 15:50:14 +08:00
xiekaidong
b1835f1da3 优化排序 2023-04-23 12:08:00 +08:00
chenxi
7354b90491 编译 2023-04-21 23:33:09 +08:00
chenxi
1cf51cc739 资源处理和ab name 2023-04-21 22:55:50 +08:00
xiekaidong
2311761568 表现修改 2023-04-21 21:03:21 +08:00
xiekaidong
e4fe7b4882 关卡数据容错 2023-04-21 09:57:02 +08:00
chenxi
a065253b43 编译 2023-04-20 22:42:51 +08:00
chenxi
6991dd2d36 伤害 2023-04-20 19:04:56 +08:00
chenxi
4b1ca125e0 随便 2023-04-20 17:40:58 +08:00
xiekaidong
899fde38c1 界面处理 2023-04-19 22:31:42 +08:00
chenxi
164ce095d4 编译 2023-04-19 15:37:19 +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
xiekaidong
13a433d321 棋盘新的读取方式 2023-04-12 15:17:21 +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
468ded50d3 编译 2023-04-07 22:23:28 +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