CloudJ
|
095979cd65
|
容错
|
2023-05-25 14:32:00 +08:00 |
|
CloudJ
|
303b535ded
|
引导处理
|
2023-05-25 14:27:02 +08:00 |
|
CloudJ
|
93d091c462
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-25 12:01:04 +08:00 |
|
CloudJ
|
423b4a8f78
|
助力与金币礼包
|
2023-05-25 12:00:57 +08:00 |
|
xiekaidong
|
cbba15794a
|
增加一下受击动画容错
|
2023-05-25 10:37:49 +08:00 |
|
CloudJ
|
602cd716df
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/pay_manager.lua
|
2023-05-25 10:18:31 +08:00 |
|
chenxi
|
b5424dd9fd
|
红点
|
2023-05-24 22:17:39 +08:00 |
|
chenxi
|
b18187a937
|
主城货币显示
|
2023-05-24 21:50:51 +08:00 |
|
chenxi
|
80f6d6d76d
|
奖励展示
|
2023-05-24 21:48:13 +08:00 |
|
chenxi
|
d383c38631
|
玩家数据跨天重置
|
2023-05-24 21:45:00 +08:00 |
|
chenxi
|
8f8e8b3cf0
|
文本适配
|
2023-05-24 21:35:58 +08:00 |
|
chenxi
|
4212a80a4a
|
等级基金
|
2023-05-24 21:05:52 +08:00 |
|
chenxi
|
e421a044c2
|
删除不用的
|
2023-05-24 19:32:16 +08:00 |
|
chenxi
|
01522e6e0c
|
基金界面货币
|
2023-05-24 19:28:52 +08:00 |
|
chenxi
|
143c5282e0
|
merge
|
2023-05-24 19:20:05 +08:00 |
|
chenxi
|
fdc400fd8d
|
基金
|
2023-05-24 19:19:34 +08:00 |
|
CloudJ
|
08631456a2
|
助力礼包
|
2023-05-24 17:28:45 +08:00 |
|
CloudJ
|
5888ee766f
|
助力礼包
|
2023-05-24 17:26:52 +08:00 |
|
CloudJ
|
eb531423dd
|
章节礼包与新手礼包
|
2023-05-24 16:00:43 +08:00 |
|
CloudJ
|
9ac84611b4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-24 14:33:47 +08:00 |
|
xiekaidong
|
f7a4a0fe31
|
表现bug修复
|
2023-05-24 12:07:20 +08:00 |
|
CloudJ
|
ed77fc7695
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-24 11:33:57 +08:00 |
|
CloudJ
|
ca51dddab2
|
章节礼包
|
2023-05-24 11:33:54 +08:00 |
|
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 |
|