xiekaidong
|
2d9c5b02b8
|
Merge branch 'new_arena' into arena
|
2023-07-04 10:44:09 +08:00 |
|
xiekaidong
|
a454faa670
|
Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
# Conflicts:
# lua/app/config/strings/cn/global.lua
|
2023-07-03 19:57:49 +08:00 |
|
xiekaidong
|
c976166cc9
|
竞技场弹窗礼包
|
2023-07-03 19:57:39 +08:00 |
|
Fang
|
c2843e5a88
|
完善细节
|
2023-07-03 18:34:51 +08:00 |
|
Fang
|
abe661f228
|
空名称处理
|
2023-07-03 14:16:03 +08:00 |
|
xiekaidong
|
9b738529fc
|
竞技场修改为自己先手
|
2023-07-03 09:46:39 +08:00 |
|
xiekaidong
|
4aa36c0122
|
Merge branch 'arena' into new_arena
|
2023-06-30 20:49:21 +08:00 |
|
xiekaidong
|
a51ee6d872
|
竞技场战斗流程更改
|
2023-06-30 20:47:22 +08:00 |
|
Fang
|
83f6a11b03
|
fix
|
2023-06-30 18:45:56 +08:00 |
|
xiekaidong
|
3f4f62903d
|
bug修复
|
2023-06-30 17:54:07 +08:00 |
|
Fang
|
9dc155e593
|
ui动画、结算界面逻辑
|
2023-06-30 16:50:50 +08:00 |
|
xiekaidong
|
84f1f27c3c
|
战斗处理
|
2023-06-30 16:03:51 +08:00 |
|
xiekaidong
|
e7c6c45f0d
|
战斗系数
|
2023-06-29 21:56:47 +08:00 |
|
xiekaidong
|
1035873eef
|
战斗bug修复
|
2023-06-29 21:25:14 +08:00 |
|
xiekaidong
|
cae3580d2c
|
竞技场敌方自动战斗
|
2023-06-29 20:51:55 +08:00 |
|
Fang
|
52a1631ad4
|
逻辑完善
|
2023-06-29 16:09:54 +08:00 |
|
xiekaidong
|
98d46965f9
|
界面调整
|
2023-06-29 15:22:42 +08:00 |
|
xiekaidong
|
7f7707094d
|
竞技场战斗
|
2023-06-29 14:24:29 +08:00 |
|
xiekaidong
|
efb9e79c4d
|
Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
|
2023-06-29 10:29:58 +08:00 |
|
xiekaidong
|
c391fb0fbc
|
bug修复
|
2023-06-29 10:29:46 +08:00 |
|
Fang
|
b2be4d375e
|
fix
|
2023-06-29 10:18:39 +08:00 |
|
xiekaidong
|
626c9b94f1
|
提交
|
2023-06-28 21:25:54 +08:00 |
|
xiekaidong
|
c259b2ed58
|
Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
# Conflicts:
# lua/app/module/battle/battle_const.lua
|
2023-06-28 21:25:19 +08:00 |
|
xiekaidong
|
d4d92cf97d
|
pvp战斗和整合pve战斗
|
2023-06-28 21:24:15 +08:00 |
|
Fang
|
a522015156
|
逻辑补充
|
2023-06-28 18:36:53 +08:00 |
|
CloudJ
|
519dc9822e
|
Merge branch 'arena' of git.juzugame.com:b6-client/b6-lua into arena
# Conflicts:
# lua/app/common/module_manager.lua
|
2023-06-28 09:38:58 +08:00 |
|
CloudJ
|
5cbcb29a4d
|
成长礼包
|
2023-06-28 09:38:29 +08:00 |
|
Fang
|
cd09e79bca
|
竞技场
|
2023-06-27 18:27:11 +08:00 |
|
CloudJ
|
b88c471ce0
|
Merge branch 'dev' into arena
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-06-27 17:25:42 +08:00 |
|
CloudJ
|
b59a8d20d6
|
入门礼包
|
2023-06-27 17:24:32 +08:00 |
|
xiekaidong
|
f17eeb8e68
|
Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
|
2023-06-26 15:28:43 +08:00 |
|
xiekaidong
|
a623c25f6f
|
pvp战斗概念引入
|
2023-06-26 15:28:40 +08:00 |
|
CloudJ
|
fdc773df09
|
竞技场战令
|
2023-06-26 11:26:28 +08:00 |
|
xiekaidong
|
eb7d04a5dc
|
修改格子计算方式
|
2023-06-26 11:13:13 +08:00 |
|
xiekaidong
|
8259a5e787
|
调整格子效果生效顺序
|
2023-06-21 16:02:44 +08:00 |
|
xiekaidong
|
c42d287b5a
|
登录界面优化
|
2023-06-21 10:24:15 +08:00 |
|
chenxi
|
1e8aebf944
|
注释和删除中文
|
2023-06-20 20:18:11 +08:00 |
|
xiekaidong
|
d46fdec70a
|
bug修复
|
2023-06-20 17:50:33 +08:00 |
|
xiekaidong
|
d9a6ccc527
|
bug修复
|
2023-06-20 16:28:51 +08:00 |
|
xiekaidong
|
5de785f28e
|
bug修复
|
2023-06-20 11:35:23 +08:00 |
|
xiekaidong
|
f1b4a21ae6
|
免控
|
2023-06-19 11:55:10 +08:00 |
|
Fang
|
f3924368ce
|
头像昵称功能
|
2023-06-19 10:57:39 +08:00 |
|
xiekaidong
|
e8e17acbdf
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-19 10:13:08 +08:00 |
|
xiekaidong
|
9a620ae064
|
bug修复
|
2023-06-19 10:13:05 +08:00 |
|
chenxi
|
0988c47259
|
adjust事件
|
2023-06-19 09:56:07 +08:00 |
|
xiekaidong
|
aa5f557c75
|
怪物经验可配置根据血量的分段经验
|
2023-06-16 18:42:41 +08:00 |
|
chenxi
|
a3f223ffe2
|
维护公告
|
2023-06-16 16:16:39 +08:00 |
|
chenxi
|
805b9bec93
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-16 15:38:10 +08:00 |
|
chenxi
|
7929c8ba37
|
维护公告
|
2023-06-16 15:38:07 +08:00 |
|
xiekaidong
|
7dae3a6ab5
|
火蛇海蛇效果
|
2023-06-16 15:13:38 +08:00 |
|