52 Commits

Author SHA1 Message Date
Fang
cbec901af5 玩家头像抽象成独立cell 2023-06-19 14:58:15 +08:00
Fang
f3924368ce 头像昵称功能 2023-06-19 10:57:39 +08:00
chenxi
d3bb4c3698 Merge branch 'dev_ios' into dev 2023-06-14 15:40:47 +08:00
Fang
a788b1cb8c ui资源补充替换 2023-06-13 16:16:18 +08:00
chenxi
d8b335daf5 支付转菊花 2023-06-12 22:19:11 +08:00
chenxi
1461bc9d7f 调长一点 2023-06-06 18:40:49 +08:00
CloudJ
8b0a3dd24a 界面调整 2023-06-06 10:16:13 +08:00
chenxi
38b099a0ec 英雄展示界面 2023-06-05 10:24:26 +08:00
chenxi
e3e0b5c761 邮箱 2023-06-03 23:52:18 +08:00
CloudJ
5b667ffc0b 替换主界面 2023-06-02 19:32:39 +08:00
chenxi
51a60e0f1e 模块解锁 2023-05-31 20:53:57 +08:00
chenxi
bd4672641a 作弊相关 2023-05-31 17:58:07 +08:00
CloudJ
0b6af4320d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/module_manager.lua
2023-05-30 19:35:22 +08:00
CloudJ
3baef020b0 替换首充界面 2023-05-30 19:34:37 +08:00
xiekaidong
b7614062f0 boss入场动画 2023-05-30 17:42:02 +08:00
Fang
3880dfd3d2 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
#	lua/app/common/module_manager.lua
#	lua/app/config/buff_daily_challenge.lua
#	lua/app/config/chapter.lua
#	lua/app/config/hero.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/global.lua
2023-05-29 18:24:33 +08:00
CloudJ
2f15a426bc 更新配置表 2023-05-29 16:25:50 +08:00
Fang
9d212aaf26 部分ui逻辑 2023-05-26 15:43:01 +08:00
chenxi
0b6607d714 七天乐 2023-05-26 14:51:24 +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
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
32051d90c6 战令 2023-05-15 21:32:13 +08:00
chenxi
124feb0b09 任务 2023-05-11 10:09:29 +08:00
chenxi
1ca913bfce 设置 2023-05-08 20:39:33 +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
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
chenxi
4d4bd0fc61 技能特效 2023-04-21 15:52:50 +08:00
chenxi
a6b3df378f buff显示逻辑 2023-04-19 22:20:07 +08:00
xiekaidong
6633f28b66 更新图集 2023-04-19 09:32:04 +08:00
chenxi
7400f41cea 伤害工时 2023-04-14 15:54:51 +08:00
chenxi
442e59c95a 攻击属性 2023-04-14 00:21:26 +08:00
xiekaidong
d1b80d3527 英雄养成 2023-04-13 21:13:43 +08:00
chenxi
4d31d587de 战斗 2023-04-11 18:23:25 +08:00
chenxi
ed7bf4ace4 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-10 21:54:54 +08:00
chenxi
83eda24cc4 英雄界面 2023-04-10 21:54:51 +08:00
xiekaidong
eb0856345f 一些技能的实现 2023-04-10 21:13:31 +08:00
xiekaidong
fb7de22e94 技能生成规则 2023-04-10 17:03:34 +08:00
chenxi
96483f028c 英雄列表 2023-04-08 17:52:36 +08:00
chenxi
2698e4044b 整理一下 2023-04-07 15:22:56 +08:00