chenxi
|
11c14276b9
|
英雄详情
|
2023-06-05 17:00:02 +08:00 |
|
chenxi
|
449139eaf3
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 16:52:46 +08:00 |
|
chenxi
|
6c738a5641
|
奖励界面
|
2023-06-05 16:52:40 +08:00 |
|
CloudJ
|
6c673d7977
|
调整召唤动画
|
2023-06-05 16:50:54 +08:00 |
|
CloudJ
|
ec58c080ad
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 16:27:44 +08:00 |
|
CloudJ
|
7f2704969e
|
商城标题刘海适配
|
2023-06-05 16:27:42 +08:00 |
|
chenxi
|
6e20c37abf
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 16:25:44 +08:00 |
|
chenxi
|
30d134ecc8
|
调整一下侧边栏的按钮顺序
|
2023-06-05 16:25:41 +08:00 |
|
xiekaidong
|
e3420eeb8a
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-05 16:24:22 +08:00 |
|
xiekaidong
|
628da8aade
|
音效容错
|
2023-06-05 16:24:06 +08:00 |
|
chenxi
|
253ae25580
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 16:23:58 +08:00 |
|
chenxi
|
5216c8ff69
|
侧边栏优化
|
2023-06-05 16:23:55 +08:00 |
|
xiekaidong
|
9f6fbf2903
|
优化一下
|
2023-06-05 16:20:52 +08:00 |
|
xiekaidong
|
45ddce3dc3
|
向左遍历棋盘
|
2023-06-05 16:17:46 +08:00 |
|
xiekaidong
|
f081edb320
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-05 16:13:08 +08:00 |
|
xiekaidong
|
f8871a3109
|
加一个GM快速查看棋盘
|
2023-06-05 16:13:05 +08:00 |
|
CloudJ
|
b8a3e397a7
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 16:01:22 +08:00 |
|
CloudJ
|
2f1440bf74
|
UI调整
|
2023-06-05 16:01:19 +08:00 |
|
xiekaidong
|
d7e50de44d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-05 15:54:17 +08:00 |
|
xiekaidong
|
e85af27bf2
|
更新配置
|
2023-06-05 15:54:09 +08:00 |
|
chenxi
|
326cde1c4b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 15:49:48 +08:00 |
|
chenxi
|
0037311647
|
英雄大cell
|
2023-06-05 15:49:43 +08:00 |
|
xiekaidong
|
d08bc4b2b2
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/pay_manager.lua
|
2023-06-05 15:36:07 +08:00 |
|
xiekaidong
|
7acd32c46c
|
更改奖励上报
|
2023-06-05 15:35:05 +08:00 |
|
CloudJ
|
2342df9b36
|
首充礼包条件修改
|
2023-06-05 15:20:29 +08:00 |
|
chenxi
|
6dc6c75236
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 15:07:57 +08:00 |
|
chenxi
|
aa1fe04d66
|
金猪bug
|
2023-06-05 15:07:54 +08:00 |
|
CloudJ
|
f650bfef02
|
商城礼包更换UI
|
2023-06-05 14:50:04 +08:00 |
|
CloudJ
|
6fa649d8f5
|
金币礼包结构调整
|
2023-06-05 14:21:40 +08:00 |
|
CloudJ
|
6581df1b5c
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 14:10:29 +08:00 |
|
CloudJ
|
d20aa78385
|
配置表
|
2023-06-05 14:10:27 +08:00 |
|
chenxi
|
5d3f0c1bf7
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 12:03:46 +08:00 |
|
chenxi
|
447456612e
|
金猪bug
|
2023-06-05 12:03:37 +08:00 |
|
Fang
|
1ed63af6ed
|
主界面按钮spine替换
|
2023-06-05 11:45:51 +08:00 |
|
CloudJ
|
aa3bb714ac
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 11:45:42 +08:00 |
|
CloudJ
|
f2c8b0317b
|
替换宝箱UI
|
2023-06-05 11:45:39 +08:00 |
|
xiekaidong
|
523397f39a
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-05 11:05:03 +08:00 |
|
xiekaidong
|
c43e51b3d4
|
每日挑战引导
|
2023-06-05 11:05:00 +08:00 |
|
Fang
|
5d9e8d33de
|
容错处理
|
2023-06-05 10:59:10 +08:00 |
|
CloudJ
|
d5cd39c3fb
|
替换UI
|
2023-06-05 10:57:30 +08:00 |
|
CloudJ
|
1cf9b182d0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-05 10:56:45 +08:00 |
|
xiekaidong
|
ec365ee0d8
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-05 10:46:26 +08:00 |
|
xiekaidong
|
ba52482a95
|
技能选择规则优化
|
2023-06-05 10:46:18 +08:00 |
|
Fang
|
8d5d1f6346
|
Merge branch 'fang/victory_anim' into dev
|
2023-06-05 10:42:16 +08:00 |
|
Fang
|
827c282c62
|
首次进入每日挑战未显示任务弹窗fix
|
2023-06-05 10:41:20 +08:00 |
|
Fang
|
a8f727c014
|
每日挑战首次解锁显示fix
|
2023-06-05 10:41:20 +08:00 |
|
xiekaidong
|
5620d697e2
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-05 10:36:33 +08:00 |
|
xiekaidong
|
5340ecd4b7
|
bug修复
|
2023-06-05 10:36:30 +08:00 |
|
chenxi
|
38b099a0ec
|
英雄展示界面
|
2023-06-05 10:24:26 +08:00 |
|
CloudJ
|
c3d49992a6
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/strings/cn/global.lua
|
2023-06-05 10:24:10 +08:00 |
|