43 Commits

Author SHA1 Message Date
Fang
a43ea6c7d7 编译 2023-07-26 16:15:13 +08:00
Fang
aa45c8bbf2 编译 2023-07-25 20:18:47 +08:00
Fang
ab3b086d91 修复英雄首次升级装备报错 2023-07-25 16:48:49 +08:00
Fang
5cff8c0e57 超框、修复报错 2023-07-25 16:33:15 +08:00
Fang
e7927efe57 编译 2023-07-25 15:45:24 +08:00
xiekaidong
7752930572 bug修复 2023-07-25 15:36:24 +08:00
Fang
4b93fa1335 修复装备升级后,总属性显示错误 2023-07-24 20:33:56 +08:00
Fang
04730d1ad9 装备属性加成计算fix 2023-07-24 18:38:23 +08:00
xiekaidong
66d69032e6 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:16:26 +08:00
Fang
69e0ea2db1 英雄升级显示、战斗报错fix 2023-07-20 21:23:42 +08:00
Fang
2c7f90f837 英雄升级报错fix 2023-07-20 20:28:30 +08:00
Fang
622234139b review 2023-07-20 19:35:17 +08:00
Fang
043dbf29c1 review 2023-07-20 19:35:17 +08:00
Fang
047f17e6f3 装备系统 2023-07-20 19:35:17 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
cd0a81c0db 用户属性主线阵容上报信息错误修复,竞技场消耗上报增加段位id,竞技场结算上报增加胜负 2023-07-10 17:46:59 +08:00
xiekaidong
b8e057fab3 英雄面板属性加密 2023-07-05 17:25:46 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
xiekaidong
ca8109cd8d buff描述 2023-05-30 14:16:28 +08:00
chenxi
feb719eab7 英雄解锁 2023-05-30 10:20:22 +08:00
chenxi
5eaa1f2f73 编译 2023-05-29 15:22:21 +08:00
chenxi
0eaae0108e 编译 2023-05-26 12:52:15 +08:00
CloudJ
f79e8ebe89 编译 2023-05-25 15:27:25 +08:00
xiekaidong
cf654fe422 技能tips 2023-05-22 16:00:44 +08:00
xiekaidong
ee9f6680b9 更新资源 2023-05-19 20:00:57 +08:00
xiekaidong
1eae40bf23 更新配置 2023-05-19 16:29:20 +08:00
chenxi
c1f4013bb9 编译 2023-05-11 21:36:25 +08:00
xiekaidong
b78493fc7a 修复一些bug 2023-04-24 20:18:32 +08:00
xiekaidong
7cab14eba5 编译lua 2023-04-24 10:51:41 +08:00
xiekaidong
b1835f1da3 优化排序 2023-04-23 12:08:00 +08:00
chenxi
4aecc2ebde 编译 2023-04-23 10:35:56 +08:00
xiekaidong
9f35910fc6 英雄解锁逻辑 2023-04-20 21:53:22 +08:00
xiekaidong
46818a52e9 技能解锁 2023-04-20 21:27:33 +08:00
xiekaidong
899fde38c1 界面处理 2023-04-19 22:31:42 +08:00
chenxi
e9cf5af678 援助攻击 2023-04-17 22:11:09 +08:00
chenxi
25a3b2a846 编译 2023-04-17 18:41:06 +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