chenxi
|
d3a00e325c
|
兑换码
|
2023-06-14 15:39:21 +08:00 |
|
chenxi
|
34332c6af9
|
merge cdkey
|
2023-06-14 15:04:56 +08:00 |
|
chenxi
|
5934e03198
|
cdkey
|
2023-06-14 15:04:26 +08:00 |
|
Fang
|
98206fea34
|
Merge branch 'dev' into fang/dungeon
# Conflicts:
# lua/app/config/avatar.lua.meta
# lua/app/config/avatar_frame.lua.meta
# lua/app/config/skill.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/avatar.lua.meta
# lua/app/config/strings/cn/avatar_frame.lua.meta
# lua/app/config/strings/cn/hero.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/avatar.lua.meta
# lua/app/config/strings/de/avatar_frame.lua.meta
# lua/app/config/strings/en/avatar.lua.meta
# lua/app/config/strings/en/avatar_frame.lua.meta
# lua/app/config/strings/fr/avatar.lua.meta
# lua/app/config/strings/fr/avatar_frame.lua.meta
# lua/app/config/strings/id/avatar.lua.meta
# lua/app/config/strings/id/avatar_frame.lua.meta
# lua/app/config/strings/ja/avatar.lua.meta
# lua/app/config/strings/ja/avatar_frame.lua.meta
# lua/app/config/strings/ko/avatar.lua.meta
# lua/app/config/strings/ko/avatar_frame.lua.meta
# lua/app/config/strings/pt/avatar.lua.meta
# lua/app/config/strings/pt/avatar_frame.lua.meta
# lua/app/config/strings/ru/avatar.lua.meta
# lua/app/config/strings/ru/avatar_frame.lua.meta
# lua/app/config/strings/th/avatar.lua.meta
# lua/app/config/strings/th/avatar_frame.lua.meta
# lua/app/config/strings/vi/avatar.lua.meta
# lua/app/config/strings/vi/avatar_frame.lua.meta
# lua/app/config/strings/zh/avatar.lua.meta
# lua/app/config/strings/zh/avatar_frame.lua.meta
|
2023-06-14 11:41:12 +08:00 |
|
Fang
|
ecb24214aa
|
fix
|
2023-06-14 11:38:50 +08:00 |
|
Fang
|
097812e730
|
fix
|
2023-06-14 10:22:34 +08:00 |
|
chenxi
|
8eed1c6a97
|
cdkey临时界面
|
2023-06-13 20:53:53 +08:00 |
|
xiekaidong
|
3c54f4e9c8
|
英雄升级特效
|
2023-06-13 18:49:55 +08:00 |
|
Fang
|
1d68846a85
|
ui细节调整
|
2023-06-13 18:44:47 +08:00 |
|
xiekaidong
|
e010700340
|
技能音效
|
2023-06-13 17:43:55 +08:00 |
|
Fang
|
a788b1cb8c
|
ui资源补充替换
|
2023-06-13 16:16:18 +08:00 |
|
xiekaidong
|
ee6a38b813
|
修改每日挑战战斗界面的任务入口
|
2023-06-13 15:24:48 +08:00 |
|
xiekaidong
|
81f68ec173
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-13 15:08:05 +08:00 |
|
xiekaidong
|
4846a97b75
|
grideffect=6的处理
|
2023-06-13 15:08:02 +08:00 |
|
chenxi
|
823dac78f8
|
金猪倒计时
|
2023-06-13 11:59:35 +08:00 |
|
chenxi
|
95fd46ed94
|
Merge branch 'dev_shenhe' into dev
|
2023-06-13 10:43:59 +08:00 |
|
chenxi
|
00ec7c553d
|
账号绑定的apple处理
|
2023-06-13 10:41:19 +08:00 |
|
xiekaidong
|
90bd77a4b7
|
显示调整
|
2023-06-13 10:36:44 +08:00 |
|
xiekaidong
|
43826faab8
|
界面处理
|
2023-06-13 10:16:58 +08:00 |
|
Fang
|
decabd89ee
|
补充奖励显示逻辑
|
2023-06-12 18:47:09 +08:00 |
|
chenxi
|
0d916a96e8
|
Merge branch 'dev_shenhe' into dev
|
2023-06-12 18:25:37 +08:00 |
|
chenxi
|
8891f004ff
|
审核模式
|
2023-06-12 18:25:14 +08:00 |
|
Fang
|
9d648fb450
|
补充逻辑
|
2023-06-12 17:14:00 +08:00 |
|
Fang
|
e4dad61f52
|
活动副本
|
2023-06-12 15:39:52 +08:00 |
|
xiekaidong
|
225fa8ad1f
|
每日挑战不显示每日buff信息
|
2023-06-12 09:46:51 +08:00 |
|
chenxi
|
608eb91087
|
英雄tips
|
2023-06-08 21:34:28 +08:00 |
|
chenxi
|
822b6baa75
|
商店热卖标签红点
|
2023-06-08 20:51:09 +08:00 |
|
chenxi
|
c1c5e8415e
|
金猪满了后下一次进主城要弹出来
|
2023-06-08 20:20:42 +08:00 |
|
chenxi
|
bda768c79f
|
bug
|
2023-06-08 18:05:55 +08:00 |
|
xiekaidong
|
fddb727eb4
|
删除冗余代码
|
2023-06-07 19:03:32 +08:00 |
|
xiekaidong
|
c46b80a567
|
新增上报
|
2023-06-07 17:33:54 +08:00 |
|
xiekaidong
|
22ca62a023
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-07 17:25:17 +08:00 |
|
xiekaidong
|
c800a0cc31
|
日志上报
|
2023-06-07 17:25:08 +08:00 |
|
chenxi
|
26ea46d608
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-07 16:49:16 +08:00 |
|
chenxi
|
2257dfc25d
|
挂机界面1分钟拉一次
|
2023-06-07 16:49:09 +08:00 |
|
xiekaidong
|
502c73bae8
|
主界面关卡宝箱领取显示bug修复
|
2023-06-07 10:30:37 +08:00 |
|
chenxi
|
695e9f1e7d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-06 21:11:42 +08:00 |
|
chenxi
|
3edeb6c50c
|
隐私政策，退回登录界面还是连不上的问题
|
2023-06-06 21:11:38 +08:00 |
|
xiekaidong
|
1c89ec147b
|
显示bug修复
|
2023-06-06 20:37:32 +08:00 |
|
CloudJ
|
f4b2f6d32c
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-06 17:51:23 +08:00 |
|
CloudJ
|
0d2144756d
|
调整上报参数
|
2023-06-06 17:51:18 +08:00 |
|
chenxi
|
9c94d29418
|
几个上报
|
2023-06-06 17:41:29 +08:00 |
|
Fang
|
be6d42fe88
|
战斗退出后显示主界面控制
|
2023-06-06 17:30:50 +08:00 |
|
CloudJ
|
f95926cfde
|
增加一部分上报
|
2023-06-06 17:11:16 +08:00 |
|
chenxi
|
469cd98661
|
显示重连
|
2023-06-06 15:29:52 +08:00 |
|
xiekaidong
|
e60cedc505
|
检查一下
|
2023-06-06 14:47:02 +08:00 |
|
xiekaidong
|
0afa71888e
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-06 14:12:53 +08:00 |
|
xiekaidong
|
0867e84815
|
切换波次时自动关闭buff弹窗
|
2023-06-06 14:12:50 +08:00 |
|
chenxi
|
48cc41ba97
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-06 11:59:44 +08:00 |
|
chenxi
|
24c71edd35
|
loading
|
2023-06-06 11:59:36 +08:00 |
|