269 Commits

Author SHA1 Message Date
Fang
fe2f7de08b 礼包入口spine 2023-07-14 15:26:38 +08:00
xiekaidong
4c8b8116e3 更新配置 2023-07-12 14:57:56 +08:00
xiekaidong
dde65f49c3 设置界面新增社区链接按钮 2023-07-11 15:45:14 +08:00
xiekaidong
61a23d81c9 Merge branch 'master' into dev_20230712 2023-07-11 11:05:47 +08:00
xiekaidong
b1561991c6 更新配置 2023-07-10 18:30:30 +08:00
xiekaidong
1759c04305 修改战斗伤害公式 2023-07-10 16:07:32 +08:00
xiekaidong
460a60a34f 木兰试玩 2023-07-10 12:00:32 +08:00
xiekaidong
c8724b978f 更新配置 2023-07-07 16:53:19 +08:00
xiekaidong
576320840a 更新配置 2023-07-07 16:06:11 +08:00
Fang
7eabeeb752 超框 2023-07-06 19:23:17 +08:00
Fang
2a6d74482f 导表 2023-07-06 18:19:11 +08:00
xiekaidong
8ee590a831 bug修复 2023-07-06 17:41:58 +08:00
Fang
dfb1967899 竞技场战令文案替换 2023-07-06 14:42:10 +08:00
Fang
47418bab2e 竞技场宝箱增加每日次数控制 2023-07-06 10:24:53 +08:00
xiekaidong
592eb102ef 竞技场弹出礼包 2023-07-05 21:01:18 +08:00
Fang
dea1136538 竞技场ad宝箱权重奖励展示 2023-07-05 19:05:55 +08:00
Fang
f24f8d5e75 显示修复 2023-07-05 15:55:44 +08:00
xiekaidong
cd4af85987 更新配置 2023-07-05 15:35:10 +08:00
Fang
b563ed2970 导表 2023-07-05 15:04:22 +08:00
Fang
68f80b45d3 竞技场ad宝箱功能补全 2023-07-05 15:02:59 +08:00
xiekaidong
47d5b00318 取消连线 2023-07-04 18:05:17 +08:00
xiekaidong
7cb37f9d96 更新配置 2023-07-04 15:37:34 +08:00
xiekaidong
6b60a73944 竞技场主动退出判负 2023-07-04 15:12:33 +08:00
xiekaidong
87cacec30c 竞技场暂停界面 2023-07-04 15:03:37 +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
77b5452d00 动效添加 2023-07-03 17:16:30 +08:00
Fang
abe661f228 空名称处理 2023-07-03 14:16:03 +08:00
Fang
83f6a11b03 fix 2023-06-30 18:45:56 +08:00
Fang
9dc155e593 ui动画、结算界面逻辑 2023-06-30 16:50:50 +08:00
xiekaidong
d4d92cf97d pvp战斗和整合pve战斗 2023-06-28 21:24:15 +08:00
CloudJ
fdc773df09 竞技场战令 2023-06-26 11:26:28 +08:00
chenxi
68f9a47e00 更新配置 2023-06-21 14:05:45 +08:00
chenxi
98b2faca16 更新配置 2023-06-21 12:11:39 +08:00
chenxi
b49e4f261f 更新配置 2023-06-21 11:21:20 +08:00
chenxi
c7f465dbd0 更新配置 2023-06-20 22:19:26 +08:00
xiekaidong
b75fe6b754 更新配置 2023-06-20 21:03:20 +08:00
chenxi
594a6cced5 更新配置 2023-06-20 19:58:07 +08:00
xiekaidong
749de33dae 更新配置 2023-06-20 15:29:34 +08:00
chenxi
6f33fc030a 更新配置 2023-06-20 14:43:14 +08:00
Fang
b45ee34f5f 导表 2023-06-20 11:44:21 +08:00
Fang
ab4fbf3067 添加重命名与当前昵称相同提示 2023-06-19 16:25:18 +08:00
xiekaidong
f1b4a21ae6 免控 2023-06-19 11:55:10 +08:00
chenxi
d2f689e510 更新配置 2023-06-19 11:05:56 +08:00
chenxi
8032ca378d 更新配置 2023-06-16 21:34:30 +08:00
xiekaidong
aa5f557c75 怪物经验可配置根据血量的分段经验 2023-06-16 18:42:41 +08:00
xiekaidong
7dae3a6ab5 火蛇海蛇效果 2023-06-16 15:13:38 +08:00
chenxi
e402550d92 更新配置 2023-06-16 12:05:32 +08:00
xiekaidong
c1fb666388 更新配置 2023-06-16 10:09:20 +08:00
Fang
da6e53abfe 修改副本显示顺序、碎片副本奖励逻辑 2023-06-15 16:08:37 +08:00