Fang
|
097812e730
|
fix
|
2023-06-14 10:22:34 +08:00 |
|
Fang
|
1d68846a85
|
ui细节调整
|
2023-06-13 18:44:47 +08:00 |
|
Fang
|
a788b1cb8c
|
ui资源补充替换
|
2023-06-13 16:16:18 +08:00 |
|
xiekaidong
|
90bd77a4b7
|
显示调整
|
2023-06-13 10:36:44 +08:00 |
|
xiekaidong
|
43826faab8
|
界面处理
|
2023-06-13 10:16:58 +08:00 |
|
xiekaidong
|
5def9aed8a
|
战斗
|
2023-06-12 18:54:27 +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 |
|
xiekaidong
|
59289536d1
|
副本战斗
|
2023-06-12 17:58:40 +08:00 |
|
Fang
|
9d648fb450
|
补充逻辑
|
2023-06-12 17:14:00 +08:00 |
|
xiekaidong
|
e1c54ef97e
|
Merge branch 'dev' into fang/dungeon
|
2023-06-12 16:56:14 +08:00 |
|
xiekaidong
|
87fe40ed94
|
金币副本
|
2023-06-12 16:46:55 +08:00 |
|
xiekaidong
|
71b4b2b4e0
|
战斗任务参数修改
|
2023-06-12 16:30:04 +08:00 |
|
xiekaidong
|
99694fc1d8
|
整合一下战斗任务参数
|
2023-06-12 16:25:11 +08:00 |
|
xiekaidong
|
f07822161f
|
战斗
|
2023-06-12 16:05:58 +08:00 |
|
xiekaidong
|
ee826d12c8
|
Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-lua into fang/dungeon
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/config/monster_dungeon_gold.lua
# lua/app/config/monster_dungeon_gold.lua.meta
# lua/app/config/skill.lua
# lua/app/config/skill_rogue.lua
# lua/app/module/dungeon/dungeon_manager.lua
# lua/app/ui/dungeon/dungeon_board_cell.lua
# lua/app/ui/dungeon/dungeon_difficulty_ui.lua
# lua/app/ui/main_city/component/dungeon_comp.lua
# lua/app/ui/main_city/main_city_ui.lua
# lua/app/userdata/dungeon/dungeon_data.lua
# lua/app/userdata/dungeon/dungeon_data_base_comp.lua
# lua/app/userdata/dungeon/dungeon_gold_data_comp.lua
# lua/app/userdata/dungeon/dungeon_shards_data_comp.lua
|
2023-06-12 15:43:30 +08:00 |
|
Fang
|
e4dad61f52
|
活动副本
|
2023-06-12 15:39:52 +08:00 |
|
xiekaidong
|
7a0efdbe09
|
逻辑处理
|
2023-06-12 15:38:32 +08:00 |
|
xiekaidong
|
1c46acc425
|
优化一版战斗结构
|
2023-06-12 15:30:00 +08:00 |
|
xiekaidong
|
5be91b491c
|
暂存
|
2023-06-12 15:21:26 +08:00 |
|
xiekaidong
|
39dacd3cdc
|
攻击距离可配置
|
2023-06-12 10:36:58 +08:00 |
|
xiekaidong
|
47ee292697
|
更改近身攻击距离
|
2023-06-12 10:09:42 +08:00 |
|
xiekaidong
|
225fa8ad1f
|
每日挑战不显示每日buff信息
|
2023-06-12 09:46:51 +08:00 |
|
Fang
|
bf1e7b7885
|
活动副本
|
2023-06-09 18:46:22 +08:00 |
|
xiekaidong
|
f848e7b5bc
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-09 17:34:10 +08:00 |
|
xiekaidong
|
66db212dd4
|
更新配置
|
2023-06-09 17:34:07 +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
|
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 |
|
chenxi
|
c17ece443b
|
启动界面位置错误
|
2023-06-08 17:29:49 +08:00 |
|
xiekaidong
|
75bcd50e85
|
支付奖励上报修复
|
2023-06-08 12:06:03 +08:00 |
|
chenxi
|
ba2903a60f
|
Merge branch 'dev_20230607_hotupdate' into dev
|
2023-06-07 20:57:35 +08:00 |
|
chenxi
|
4fd27dab0e
|
账号相关
|
2023-06-07 19:44:10 +08:00 |
|
chenxi
|
304ed48943
|
账号相关
|
2023-06-07 19:32:22 +08:00 |
|
chenxi
|
74a9205f30
|
账号绑定的bug
|
2023-06-07 19:13:20 +08:00 |
|
xiekaidong
|
fddb727eb4
|
删除冗余代码
|
2023-06-07 19:03:32 +08:00 |
|
xiekaidong
|
cb8006c377
|
显示修复
|
2023-06-07 17:47:29 +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
|
0b1b9f262e
|
新增一些上报信息
|
2023-06-07 15:27:11 +08:00 |
|
xiekaidong
|
502c73bae8
|
主界面关卡宝箱领取显示bug修复
|
2023-06-07 10:30:37 +08:00 |
|