43 Commits

Author SHA1 Message Date
xiekaidong
dd1a91051a bug修复 2023-08-04 16:59:30 +08:00
xiekaidong
b38cc4acca 新增buff和叠加方式优化 2023-07-21 14:40:39 +08:00
xiekaidong
70591027b2 更新配置,英雄排序问题 2023-07-21 11:47:26 +08:00
xiekaidong
7a3cda1a1b 支线副本 2023-07-20 21:56:34 +08:00
Fang
f01c611d72 导表 2023-07-20 19:35:17 +08:00
Fang
6f8acc2673 新号报错处理 2023-07-17 15:18:57 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
47a5446628 修改战斗伤害公式 2023-07-10 16:07:46 +08:00
xiekaidong
9d0901dc2b 免控 2023-06-19 11:55:52 +08:00
chenxi
25534ecacb 编译 2023-06-14 15:40:09 +08:00
chenxi
2fa49ed069 邮箱 2023-06-03 23:54:18 +08:00
xiekaidong
0f8e6d1cf2 bug修复 2023-06-01 17:26:16 +08:00
xiekaidong
179f1279e4 更新配置 2023-05-31 09:34:42 +08:00
chenxi
e6e294b949 七天乐 2023-05-30 22:23:55 +08:00
xiekaidong
b031fe8a9b 更新配置 2023-05-30 21:30:41 +08:00
chenxi
2fbe01e673 每日挑战 2023-05-30 11:45:27 +08:00
xiekaidong
994fc2e7a2 更新配置 2023-05-30 10:03:53 +08:00
chenxi
5eaa1f2f73 编译 2023-05-29 15:22:21 +08:00
CloudJ
f79e8ebe89 编译 2023-05-25 15:27:25 +08:00
chenxi
bcdbcec1db 编译 2023-05-18 22:11:58 +08:00
chenxi
9a122cf094 编译 2023-05-18 20:32:53 +08:00
chenxi
88aa8c35e3 编译 2023-05-17 20:06:15 +08:00
chenxi
82f8030d2f 战令 2023-05-17 14:41:30 +08:00
xiekaidong
9122032a63 一些技能机制 2023-05-11 19:19:06 +08:00
chenxi
5ab1e11c6b 设置界面 2023-05-08 21:11:13 +08:00
chenxi
786937833b 更新配置 2023-04-27 17:29:45 +08:00
chenxi
9afe9a1af0 编译 2023-04-25 14:40:59 +08:00
chenxi
d8f184dad7 编译 2023-04-24 21:21:49 +08:00
chenxi
82deccace8 更新配置 2023-04-24 17:26:29 +08:00
xiekaidong
4703cacf30 更新配置 2023-04-23 15:55:35 +08:00
chenxi
7f4d5d009b 编译 2023-04-19 20:06:53 +08:00
chenxi
65f1f4b1bd 编译 2023-04-19 12:24:24 +08:00
chenxi
529cd6c6b3 编译 2023-04-18 22:32:39 +08:00
xiekaidong
aa8de9d540 编译lua 2023-04-18 18:01:07 +08:00
chenxi
af8adbe236 编译 2023-04-17 16:53:55 +08:00
xiekaidong
a0e4002e55 更新配置 2023-04-14 18:02:24 +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
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