Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +08:00 |
|
Fang
|
9c42fe1da6
|
皮肤功能
|
2023-08-09 14:16:27 +08:00 |
|
Fang
|
bafb8673ec
|
装备升级材料获取
|
2023-07-21 09:50:45 +08:00 |
|
xiekaidong
|
100e125c19
|
Merge branch 'dev_20230725' into dungeon
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/module_manager.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/strings/cn/global.lua
|
2023-07-20 19:45:54 +08:00 |
|
xiekaidong
|
8b4933f4f0
|
支线副本
|
2023-07-20 17:41:42 +08:00 |
|
Fang
|
28bf5ab6ad
|
装备系统
|
2023-07-20 10:15:42 +08:00 |
|
xiekaidong
|
000bc5e926
|
武器副本的一些界面
|
2023-07-19 16:52:28 +08:00 |
|
Fang
|
b2dba1de2e
|
英雄图鉴
|
2023-07-14 17:07:03 +08:00 |
|
xiekaidong
|
29bcf831a3
|
Merge branch 'battle' into dev_20230725
|
2023-07-13 18:03:03 +08:00 |
|
xiekaidong
|
90711c7e2a
|
英雄属性增加，以及战斗伤害治疗公式修改
|
2023-07-13 18:02:46 +08:00 |
|
xiekaidong
|
dde65f49c3
|
设置界面新增社区链接按钮
|
2023-07-11 15:45:14 +08:00 |
|
xiekaidong
|
61b76292c9
|
英雄面板属性加密
|
2023-07-05 17:25:14 +08:00 |
|
xiekaidong
|
e597b9f7be
|
战斗中属性加密
|
2023-07-05 17:05:17 +08:00 |
|
xiekaidong
|
87cacec30c
|
竞技场暂停界面
|
2023-07-04 15:03:37 +08:00 |
|
Fang
|
c2843e5a88
|
完善细节
|
2023-07-03 18:34:51 +08:00 |
|
Fang
|
a522015156
|
逻辑补充
|
2023-06-28 18:36:53 +08:00 |
|
Fang
|
cd09e79bca
|
竞技场
|
2023-06-27 18:27:11 +08:00 |
|
Fang
|
6e3c2523a5
|
英雄编队拆分出来
|
2023-06-20 11:02:45 +08:00 |
|
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 |
|