64 Commits

Author SHA1 Message Date
Fang
8650d1b340 属性调整 2023-09-19 16:55:52 +08:00
Fang
8c1082793e 圆月活动 2023-09-15 19:22:15 +08:00
Fang
1f93123171 显示fix 2023-09-12 15:27:27 +08:00
Fang
f1f1daafa2 符文功能 2023-09-12 10:35:46 +08:00
xiekaidong
b3af360cd3 buff修改 2023-09-11 10:49:18 +08:00
xiekaidong
977459d074 显示问题优化 2023-09-11 10:17:21 +08:00
xiekaidong
eed3f88d79 首领公开赛 2023-09-01 21:10:05 +08:00
xiekaidong
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
Fang
2f59d74b96 竞技场皮肤属性完善 2023-08-15 12:20:17 +08:00
xiekaidong
42ad5ec9fa Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/buff.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/es/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/ja/skill.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
#	lua/app/config/strings/zh/skill.lua
2023-08-08 15:58:56 +08:00
xiekaidong
7aa2b95686 宝箱日志上报 2023-08-07 15:33:06 +08:00
xiekaidong
e05f02088c 统一接口,金币不足提示弹窗询问 2023-08-03 14:53:51 +08:00
Fang
b46d8de73a 奖励界面默认排序 2023-07-25 15:50:14 +08:00
xiekaidong
b1df62d3a4 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:15:46 +08:00
xiekaidong
026166478e buff机制修改 2023-07-21 11:37:29 +08:00
Fang
cc7feea039 review 2023-07-20 16:20:11 +08:00
Fang
28bf5ab6ad 装备系统 2023-07-20 10:15:42 +08:00
xiekaidong
000bc5e926 武器副本的一些界面 2023-07-19 16:52:28 +08:00
Fang
e580b332a9 添加头像、头像框道具解锁逻辑 2023-07-07 11:04:22 +08:00
Fang
7eabeeb752 超框 2023-07-06 19:23:17 +08:00
xiekaidong
e597b9f7be 战斗中属性加密 2023-07-05 17:05:17 +08:00
Fang
f47a35f2e7 显示fix 2023-06-21 15:17:14 +08:00
chenxi
4c80f6ee3d 白名单和审核模式 2023-06-21 11:35:44 +08:00
chenxi
1e8aebf944 注释和删除中文 2023-06-20 20:18:11 +08:00
Fang
e4dad61f52 活动副本 2023-06-12 15:39:52 +08:00
xiekaidong
4d6e578982 显示 2023-06-06 15:06:18 +08:00
CloudJ
9a5d42c753 音效 2023-06-06 11:08:37 +08:00
chenxi
40f09ed39f 战令界面 2023-06-04 22:31:11 +08:00
CloudJ
5f7a3e733b 商城UI替换 2023-06-01 21:09:06 +08:00
xiekaidong
ededa19132 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 18:06:18 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
chenxi
bd4672641a 作弊相关 2023-05-31 17:58:07 +08:00
Fang
2b92ed0909 main界面模块切换逻辑重构 2023-05-31 14:40:08 +08:00
xiekaidong
19f2695c22 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 11:10:33 +08:00
xiekaidong
d4a1b5be93 描述修改 2023-05-31 11:10:29 +08:00
chenxi
ce822360d2 七天乐界面调整 2023-05-31 10:11:45 +08:00
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
xiekaidong
5c1307ad0d 一些数据和更新配置 2023-05-26 15:43:01 +08:00
chenxi
56a4f329c3 紧急 2023-05-25 17:05:55 +08:00
chenxi
a1cfb3d3c3 邮箱 2023-05-19 21:55:40 +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
482e1a2127 任务 2023-05-11 18:20:10 +08:00
chenxi
4b6ee24312 购买体力 2023-05-09 14:52:36 +08:00
xiekaidong
18c83cfa0c 联网 2023-05-08 11:02: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