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 |
|
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 |
|
chenxi
|
844c587d71
|
Merge branch 'dev_shenhe' into dev
|
2023-06-13 15:04:53 +08:00 |
|
chenxi
|
0e62320f31
|
审核模式不显示金猪
|
2023-06-13 15:04:47 +08:00 |
|
xiekaidong
|
ad7212ff13
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:06 +08:00 |
|
xiekaidong
|
f20f435227
|
Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-lua into fang/dungeon
# Conflicts:
# lua/app/config/chapter_dungeon_gold.lua
# lua/app/module/dungeon/dungeon_manager.lua
|
2023-06-12 18:50:40 +08:00 |
|
xiekaidong
|
30bfbb5476
|
接入战斗
|
2023-06-12 18:49:59 +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 |
|
xiekaidong
|
59289536d1
|
副本战斗
|
2023-06-12 17:58:40 +08:00 |
|
Fang
|
9d648fb450
|
补充逻辑
|
2023-06-12 17:14:00 +08:00 |
|
Fang
|
e4dad61f52
|
活动副本
|
2023-06-12 15:39:52 +08:00 |
|
xiekaidong
|
47ee292697
|
更改近身攻击距离
|
2023-06-12 10:09:42 +08:00 |
|
xiekaidong
|
225fa8ad1f
|
每日挑战不显示每日buff信息
|
2023-06-12 09:46:51 +08:00 |
|
chenxi
|
cd0f34f5ee
|
商店页签红点
|
2023-06-09 15:45:43 +08:00 |
|
chenxi
|
1d163ad8eb
|
商店
|
2023-06-09 15:41:54 +08:00 |
|
chenxi
|
4d898cee05
|
商店页签红点
|
2023-06-09 15:33:45 +08:00 |
|
chenxi
|
60e6251493
|
商店页签红点
|
2023-06-09 15:30:36 +08:00 |
|
chenxi
|
822b6baa75
|
商店热卖标签红点
|
2023-06-08 20:51:09 +08:00 |
|
chenxi
|
c1c5e8415e
|
金猪满了后下一次进主城要弹出来
|
2023-06-08 20:20:42 +08:00 |
|
xiekaidong
|
c800a0cc31
|
日志上报
|
2023-06-07 17:25:08 +08:00 |
|
CloudJ
|
a53c617f2a
|
登录触发的成长礼包增加满级不弹判断
|
2023-06-06 18:21:54 +08:00 |
|
chenxi
|
01054b8e3b
|
merge bireport
|
2023-06-06 18:14:34 +08:00 |
|
chenxi
|
ec3ae95cc4
|
上报相关
|
2023-06-06 18:14:07 +08:00 |
|
xiekaidong
|
e69b7a14e5
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-06-06 17:59:30 +08:00 |
|
xiekaidong
|
8bdd4ae3d3
|
英雄操作bi上报
|
2023-06-06 17:58:58 +08:00 |
|
chenxi
|
be52bb20b6
|
新号上报体力
|
2023-06-06 17:25:45 +08:00 |
|
chenxi
|
a9d40c0c64
|
新号上报
|
2023-06-06 17:21:57 +08:00 |
|
CloudJ
|
f84f0a103a
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-06 17:11:18 +08:00 |
|
CloudJ
|
f95926cfde
|
增加一部分上报
|
2023-06-06 17:11:16 +08:00 |
|
xiekaidong
|
538c9e51b1
|
bug修复
|
2023-06-06 16:44:59 +08:00 |
|
CloudJ
|
2c4aec0178
|
成长礼包屏蔽满级状态
|
2023-06-06 12:00:45 +08:00 |
|
CloudJ
|
8f27d79134
|
配置表
|
2023-06-05 19:41:10 +08:00 |
|
CloudJ
|
2342df9b36
|
首充礼包条件修改
|
2023-06-05 15:20:29 +08:00 |
|
CloudJ
|
6fa649d8f5
|
金币礼包结构调整
|
2023-06-05 14:21:40 +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
|
5d9e8d33de
|
容错处理
|
2023-06-05 10:59:10 +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
|
eb2872b7ee
|
修改bug，优化战斗流程逻辑
|
2023-06-03 19:11:19 +08:00 |
|
xiekaidong
|
63b03dba2a
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-02 19:01:36 +08:00 |
|
Fang
|
b6936a2c4a
|
功能解锁飞行动画
|
2023-06-02 18:35:36 +08:00 |
|
chenxi
|
2f2a993c12
|
打完第二章后七天乐没有开启的bug
|
2023-06-02 18:20:15 +08:00 |
|
xiekaidong
|
5a9558184b
|
火箭动画
|
2023-06-02 17:58:18 +08:00 |
|