xiekaidong
|
bc9ab3e3aa
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-24 11:02:29 +08:00 |
|
xiekaidong
|
db985c714c
|
相互反击的bug
|
2023-05-24 11:02:26 +08:00 |
|
CloudJ
|
21f1a9cd89
|
抽奖逻辑
|
2023-05-24 10:44:11 +08:00 |
|
CloudJ
|
dca47040cf
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-24 10:07:09 +08:00 |
|
CloudJ
|
4e5316033a
|
抽卡部分
|
2023-05-24 10:07:07 +08:00 |
|
xiekaidong
|
bff772a1de
|
技能刷新接入联网
|
2023-05-24 10:01:36 +08:00 |
|
xiekaidong
|
715408f15f
|
反击表现
|
2023-05-23 20:09:09 +08:00 |
|
xiekaidong
|
4a67422ac8
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-23 19:08:29 +08:00 |
|
xiekaidong
|
c5609f4867
|
新增的buff
|
2023-05-23 19:08:26 +08:00 |
|
chenxi
|
142bf926b2
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-23 19:02:33 +08:00 |
|
chenxi
|
9e1cf32daa
|
修改英雄界面
|
2023-05-23 19:02:30 +08:00 |
|
CloudJ
|
58f261aeef
|
注释
|
2023-05-23 18:49:27 +08:00 |
|
CloudJ
|
dc96fdcb1f
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-23 18:43:45 +08:00 |
|
CloudJ
|
9a7f8b069f
|
布局
|
2023-05-23 18:43:42 +08:00 |
|
chenxi
|
8574d33716
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-23 18:41:41 +08:00 |
|
chenxi
|
624dcb208e
|
英雄详情界面
|
2023-05-23 18:41:35 +08:00 |
|
CloudJ
|
af4c09d6b8
|
宝箱奖励
|
2023-05-23 18:38:58 +08:00 |
|
CloudJ
|
ada108ac82
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-23 18:37:12 +08:00 |
|
CloudJ
|
1fb818d12b
|
提交一波
|
2023-05-23 18:37:09 +08:00 |
|
xiekaidong
|
d3e38d6583
|
Merge branch 'battle' into dev
|
2023-05-23 18:35:42 +08:00 |
|
xiekaidong
|
e5bcfa3f09
|
冰冻状态、昏睡状态
|
2023-05-23 18:35:08 +08:00 |
|
chenxi
|
6f6b8ed3f3
|
金猪
|
2023-05-23 18:21:24 +08:00 |
|
chenxi
|
c95e0cb014
|
merge
|
2023-05-23 17:04:04 +08:00 |
|
chenxi
|
ee23cd83ad
|
金猪和邮件
|
2023-05-23 17:02:14 +08:00 |
|
xiekaidong
|
fb0ebff007
|
Merge branch 'battle' into dev
|
2023-05-23 16:40:13 +08:00 |
|
xiekaidong
|
637264f383
|
格挡动作表现、反击界面表现
|
2023-05-23 16:39:29 +08:00 |
|
CloudJ
|
38a9faffb6
|
提交一波
|
2023-05-23 16:37:01 +08:00 |
|
xiekaidong
|
1e6e99de9a
|
伤害数字
|
2023-05-23 15:05:23 +08:00 |
|
CloudJ
|
f5cfef0bbc
|
移除测试
|
2023-05-23 14:20:00 +08:00 |
|
CloudJ
|
74e2ecbb76
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-05-23 14:17:44 +08:00 |
|
CloudJ
|
13d53c5166
|
提一波
|
2023-05-23 14:17:29 +08:00 |
|
chenxi
|
0db618ef69
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 21:23:18 +08:00 |
|
chenxi
|
78e03328ce
|
邮件
|
2023-05-22 21:23:07 +08:00 |
|
xiekaidong
|
ccb54ff7e9
|
删除多余配置表
|
2023-05-22 20:37:02 +08:00 |
|
xiekaidong
|
f3946e1424
|
boss入场动画
|
2023-05-22 20:29:25 +08:00 |
|
xiekaidong
|
20bf29490f
|
容错
|
2023-05-22 18:13:19 +08:00 |
|
CloudJ
|
46a2c52ca4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-05-22 17:50:24 +08:00 |
|
CloudJ
|
066b5cdef9
|
cache
|
2023-05-22 17:50:02 +08:00 |
|
xiekaidong
|
1ab896c46b
|
bug修复
|
2023-05-22 17:46:22 +08:00 |
|
CloudJ
|
58de179979
|
每日特惠
|
2023-05-22 17:27:12 +08:00 |
|
xiekaidong
|
3f747de9aa
|
boss的buff自动提示
|
2023-05-22 17:23:36 +08:00 |
|
xiekaidong
|
b56f68d102
|
显示修改
|
2023-05-22 16:51:51 +08:00 |
|
xiekaidong
|
3aa34c82f8
|
Merge branch 'battle' into dev
|
2023-05-22 16:38:27 +08:00 |
|
xiekaidong
|
8ae7df28e2
|
通用技能tips
|
2023-05-22 16:38:04 +08:00 |
|
chenxi
|
8617d9e407
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 16:22:29 +08:00 |
|
chenxi
|
e97c1cd4e9
|
玩家升级界面
|
2023-05-22 16:22:26 +08:00 |
|
CloudJ
|
aec28d95e8
|
shop
|
2023-05-22 16:14:57 +08:00 |
|
CloudJ
|
99fedebb96
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 16:14:47 +08:00 |
|
xiekaidong
|
14dfdecddc
|
Merge branch 'battle' into dev
# Conflicts:
# lua/app/config/strings/cn/global.lua
|
2023-05-22 15:59:54 +08:00 |
|
xiekaidong
|
528ac6a89b
|
技能tips
|
2023-05-22 15:59:17 +08:00 |
|