Fang
|
b57318f3a6
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
|
2023-05-26 18:26:21 +08:00 |
|
xiekaidong
|
cff917cac8
|
显示优化
|
2023-05-26 16:32:13 +08:00 |
|
Fang
|
9d212aaf26
|
部分ui逻辑
|
2023-05-26 15:43:01 +08:00 |
|
xiekaidong
|
5c1307ad0d
|
一些数据和更新配置
|
2023-05-26 15:43:01 +08:00 |
|
chenxi
|
0b6607d714
|
七天乐
|
2023-05-26 14:51:24 +08:00 |
|
chenxi
|
56a4f329c3
|
紧急
|
2023-05-25 17:05:55 +08:00 |
|
chenxi
|
fdc400fd8d
|
基金
|
2023-05-24 19:19:34 +08:00 |
|
chenxi
|
9e1cf32daa
|
修改英雄界面
|
2023-05-23 19:02:30 +08:00 |
|
CloudJ
|
38a9faffb6
|
提交一波
|
2023-05-23 16:37:01 +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
|
528ac6a89b
|
技能tips
|
2023-05-22 15:59:17 +08:00 |
|
CloudJ
|
d1d0c736cb
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 09:59:08 +08:00 |
|
chenxi
|
a1cfb3d3c3
|
邮箱
|
2023-05-19 21:55:40 +08:00 |
|
CloudJ
|
52bd3a3167
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/global/global_const.lua
|
2023-05-19 20:03:48 +08:00 |
|
CloudJ
|
f04108a58d
|
tmp
|
2023-05-19 20:03:28 +08:00 |
|
chenxi
|
0ab51fcc07
|
购买体力和邮箱
|
2023-05-19 18:32:23 +08:00 |
|
chenxi
|
a78be93bc1
|
宝箱tips
|
2023-05-19 16:36:59 +08:00 |
|
chenxi
|
49002c4407
|
挂机表现
|
2023-05-19 14:49:27 +08:00 |
|
chenxi
|
a783d2120c
|
挂机
|
2023-05-18 20:24:04 +08:00 |
|
chenxi
|
f7cd1c6094
|
战令
|
2023-05-16 18:17:05 +08:00 |
|
chenxi
|
32051d90c6
|
战令
|
2023-05-15 21:32:13 +08:00 |
|
chenxi
|
482e1a2127
|
任务
|
2023-05-11 18:20:10 +08:00 |
|
chenxi
|
124feb0b09
|
任务
|
2023-05-11 10:09:29 +08:00 |
|
chenxi
|
4b6ee24312
|
购买体力
|
2023-05-09 14:52:36 +08:00 |
|
chenxi
|
1ca913bfce
|
设置
|
2023-05-08 20:39:33 +08:00 |
|
xiekaidong
|
18c83cfa0c
|
联网
|
2023-05-08 11:02:42 +08:00 |
|
xiekaidong
|
cb0e613e47
|
Merge branch 'dev' into net
|
2023-05-08 09:48:06 +08:00 |
|
chenxi
|
5e2644ee6e
|
主城
|
2023-05-05 22:03:42 +08:00 |
|
xiekaidong
|
8801943ae3
|
整理一下代码，接入联网
|
2023-05-05 18:27:33 +08:00 |
|
chenxi
|
a430306743
|
整理时处理反了
|
2023-05-04 15:39:30 +08:00 |
|
chenxi
|
4727b573f1
|
整理
|
2023-05-04 15:19:55 +08:00 |
|
chenxi
|
e45900ee6f
|
删除不用的代码
|
2023-04-27 20:06:36 +08:00 |
|
xiekaidong
|
1f59264830
|
bug修复
|
2023-04-26 18:39:39 +08:00 |
|
xiekaidong
|
ce5d8a9832
|
日志打点
|
2023-04-26 18:12:49 +08:00 |
|
chenxi
|
7508f219d2
|
体力
|
2023-04-24 10:30:40 +08:00 |
|
xiekaidong
|
b250299dc4
|
消除技能特效
|
2023-04-23 19:02:44 +08:00 |
|
chenxi
|
d65f0021e1
|
icon frame
|
2023-04-21 23:31:49 +08:00 |
|
chenxi
|
594d5ac6c6
|
伤害统计
|
2023-04-21 22:41:32 +08:00 |
|
xiekaidong
|
5d1bc62572
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 16:10:31 +08:00 |
|
xiekaidong
|
eeb0af1262
|
战斗引导
|
2023-04-21 16:10:28 +08:00 |
|
chenxi
|
4d4bd0fc61
|
技能特效
|
2023-04-21 15:52:50 +08:00 |
|
xiekaidong
|
06bc25c2d2
|
rogue技能显示修改
|
2023-04-20 15:17:14 +08:00 |
|
chenxi
|
a6b3df378f
|
buff显示逻辑
|
2023-04-19 22:20:07 +08:00 |
|
xiekaidong
|
6633f28b66
|
更新图集
|
2023-04-19 09:32:04 +08:00 |
|
chenxi
|
e6015e7e8c
|
血条动画
|
2023-04-18 22:22:03 +08:00 |
|
chenxi
|
0d7d3a5b72
|
merge
|
2023-04-14 15:55:14 +08:00 |
|
chenxi
|
7400f41cea
|
伤害工时
|
2023-04-14 15:54:51 +08:00 |
|
xiekaidong
|
ab14bce85c
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-14 15:18:17 +08:00 |
|
xiekaidong
|
d1c95c8979
|
战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理
|
2023-04-14 15:18:14 +08:00 |
|
chenxi
|
442e59c95a
|
攻击属性
|
2023-04-14 00:21:26 +08:00 |
|