xiekaidong
|
d2eff9d230
|
随机位置
|
2023-05-19 20:59:18 +08:00 |
|
xiekaidong
|
16c0078704
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 20:55:44 +08:00 |
|
xiekaidong
|
4708ed1ae2
|
随机
|
2023-05-19 20:55:41 +08:00 |
|
chenxi
|
8ab3c40bef
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 20:45:33 +08:00 |
|
chenxi
|
9096635687
|
邮件推送
|
2023-05-19 20:45:30 +08:00 |
|
xiekaidong
|
9067a7ffa1
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 20:44:41 +08:00 |
|
xiekaidong
|
5309687502
|
果冻
|
2023-05-19 20:44:38 +08:00 |
|
chenxi
|
e85131f041
|
任务
|
2023-05-19 20:43:35 +08:00 |
|
chenxi
|
adca98cb90
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 20:14:40 +08:00 |
|
chenxi
|
55c6ba1263
|
邮箱界面
|
2023-05-19 20:14:37 +08:00 |
|
xiekaidong
|
1fcf0137e3
|
死局问题修改
|
2023-05-19 20:09:32 +08:00 |
|
xiekaidong
|
1718c96004
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 20:00:12 +08:00 |
|
xiekaidong
|
d51624b93b
|
容错
|
2023-05-19 20:00:06 +08:00 |
|
chenxi
|
0ab51fcc07
|
购买体力和邮箱
|
2023-05-19 18:32:23 +08:00 |
|
xiekaidong
|
b8d7fa533d
|
战斗内部计数相关任务
|
2023-05-19 18:18:33 +08:00 |
|
xiekaidong
|
58d366ba9d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 18:00:05 +08:00 |
|
xiekaidong
|
f6d5546d2b
|
战斗任务数据
|
2023-05-19 18:00:03 +08:00 |
|
chenxi
|
502f35bf2e
|
体力不足得时候弹出来购买体力界面
|
2023-05-19 17:08:19 +08:00 |
|
chenxi
|
af59a3f9a2
|
体力不足的时候弹出来购买体力
|
2023-05-19 17:05:28 +08:00 |
|
chenxi
|
e6acef616d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 16:51:27 +08:00 |
|
chenxi
|
9d398707e0
|
任务宝箱tips
|
2023-05-19 16:51:24 +08:00 |
|
xiekaidong
|
1f3fa74d39
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 16:47:41 +08:00 |
|
xiekaidong
|
d2dadaf448
|
增加一个容错
|
2023-05-19 16:47:38 +08:00 |
|
chenxi
|
23de1b57e0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 16:37:04 +08:00 |
|
chenxi
|
a78be93bc1
|
宝箱tips
|
2023-05-19 16:36:59 +08:00 |
|
xiekaidong
|
d1fe14d396
|
删除打印
|
2023-05-19 16:31:26 +08:00 |
|
xiekaidong
|
43dc8332f8
|
更新配置
|
2023-05-19 16:29:02 +08:00 |
|
xiekaidong
|
c98c11142b
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 16:28:01 +08:00 |
|
xiekaidong
|
ff56360efa
|
技能机制
|
2023-05-19 16:27:54 +08:00 |
|
xiekaidong
|
8316e48633
|
随机技能机制
|
2023-05-19 15:15:02 +08:00 |
|
chenxi
|
680992e0b6
|
挂机表现
|
2023-05-19 15:10:44 +08:00 |
|
chenxi
|
e55fdab3dd
|
快速挂机界面
|
2023-05-19 14:56:50 +08:00 |
|
chenxi
|
96957ccda4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 14:49:30 +08:00 |
|
chenxi
|
49002c4407
|
挂机表现
|
2023-05-19 14:49:27 +08:00 |
|
xiekaidong
|
aae0f74648
|
新增消除类型
|
2023-05-19 10:51:48 +08:00 |
|
xiekaidong
|
7ab28c41b4
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 10:00:16 +08:00 |
|
xiekaidong
|
91680e5c9a
|
被动触发时机
|
2023-05-19 10:00:14 +08:00 |
|
chenxi
|
ece138f7e3
|
更新配置
|
2023-05-18 22:11:31 +08:00 |
|
chenxi
|
4e1f4c2dbb
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/hero.lua
# lua/app/config/item.lua
# lua/app/config/skill.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/item.lua
|
2023-05-18 22:11:16 +08:00 |
|
chenxi
|
df51c37505
|
更新配置
|
2023-05-18 22:10:22 +08:00 |
|
xiekaidong
|
8225215773
|
导表
|
2023-05-18 22:10:04 +08:00 |
|
chenxi
|
9ab1297bce
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-18 22:09:46 +08:00 |
|
chenxi
|
b6da2f4bd6
|
挂机
|
2023-05-18 22:09:43 +08:00 |
|
xiekaidong
|
bbf302c331
|
Merge branch 'battle' into dev
# Conflicts:
# lua/app/config/hero.lua
|
2023-05-18 22:08:30 +08:00 |
|
xiekaidong
|
0f8121fea1
|
增加触发机制
|
2023-05-18 22:07:35 +08:00 |
|
xiekaidong
|
ccea5fedfa
|
技能生效条件
|
2023-05-18 21:20:10 +08:00 |
|
xiekaidong
|
82d95ee5fd
|
被动、buff触发时机
|
2023-05-18 20:43:10 +08:00 |
|
chenxi
|
a1e98528ca
|
更新配置
|
2023-05-18 20:32:10 +08:00 |
|
xiekaidong
|
6596d89003
|
Merge branch 'dev' into battle
|
2023-05-18 20:31:32 +08:00 |
|
chenxi
|
a783d2120c
|
挂机
|
2023-05-18 20:24:04 +08:00 |
|