30 Commits

Author SHA1 Message Date
Fang
7f99b9d771 装备礼包fix 2023-08-28 15:26:21 +08:00
xiekaidong
b8f7a7a783 更新配置 2023-08-15 21:39:40 +08:00
xiekaidong
4d1635dc3b 背景特效 2023-08-15 14:59:48 +08:00
Fang
ea1d84b065 编译 2023-08-15 11:37:54 +08:00
Fang
0aba4ec004 更表 2023-08-14 09:50:16 +08:00
xiekaidong
62907b1a83 边缘障碍物逻辑优化 2023-08-11 15:17:49 +08:00
xiekaidong
a3ab8f74fa 副本引导 2023-07-24 17:10:59 +08:00
xiekaidong
70591027b2 更新配置,英雄排序问题 2023-07-21 11:47:26 +08:00
Fang
f01c611d72 导表 2023-07-20 19:35:17 +08:00
chenxi
cf3e9051f8 编译 2023-06-20 19:58:29 +08:00
Fang
491599bf1a 导表 2023-06-20 11:44:52 +08:00
xiekaidong
fe19b35f7d 更新配置 2023-06-16 10:09:59 +08:00
chenxi
29832da12e 编译 2023-06-06 18:44:31 +08:00
chenxi
163ff77186 编译 2023-06-05 21:33:50 +08:00
Fang
70bb61e9b6 更表 2023-06-05 17:30:58 +08:00
chenxi
2fa49ed069 邮箱 2023-06-03 23:54:18 +08:00
xiekaidong
e4d84563f9 先更新一下格子 2023-06-02 16:54:59 +08:00
xiekaidong
0f8e6d1cf2 bug修复 2023-06-01 17:26:16 +08:00
chenxi
59cfb77e28 账号删除 2023-05-31 17:54:31 +08:00
chenxi
597b00d8ea 编译 2023-04-26 19:02:10 +08:00
chenxi
176fa1f3a7 编译 2023-04-25 17:49:16 +08:00
chenxi
9afe9a1af0 编译 2023-04-25 14:40:59 +08:00
chenxi
d8f184dad7 编译 2023-04-24 21:21:49 +08:00
chenxi
04c373fad1 技能音效 2023-04-23 19:21:15 +08:00
xiekaidong
dca6601d90 编译lua 2023-04-23 17:39:29 +08:00
chenxi
2eb797b0ed 编译 2023-04-21 18:23:00 +08:00
xiekaidong
fbeee8a970 引导和报错 2023-04-21 18:16:42 +08:00
xiekaidong
4e744fa0e1 编译lua 2023-04-21 16:28:05 +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