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 |
|
chenxi
|
02cdb96b4b
|
ios支付
|
2023-06-13 18:19:01 +08:00 |
|
chenxi
|
1b27a8dfae
|
ios支付参数
|
2023-06-13 18:05:16 +08:00 |
|
xiekaidong
|
e010700340
|
技能音效
|
2023-06-13 17:43:55 +08:00 |
|
Fang
|
a788b1cb8c
|
ui资源补充替换
|
2023-06-13 16:16:18 +08:00 |
|
xiekaidong
|
2b5ec86898
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-13 15:24:51 +08:00 |
|
xiekaidong
|
ee6a38b813
|
修改每日挑战战斗界面的任务入口
|
2023-06-13 15:24:48 +08:00 |
|
chenxi
|
9779e5f4c6
|
删除多余的lua
|
2023-06-13 15:12:47 +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
|
4533b422cd
|
Merge branch 'dev_shenhe' into dev_ios
|
2023-06-13 15:05:05 +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 |
|
chenxi
|
c65113785d
|
更新配置
|
2023-06-13 14:37:42 +08:00 |
|
chenxi
|
58c539a789
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-13 11:59:38 +08:00 |
|
chenxi
|
823dac78f8
|
金猪倒计时
|
2023-06-13 11:59:35 +08:00 |
|
xiekaidong
|
1319417de0
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-13 11:11:09 +08:00 |
|
xiekaidong
|
ad7212ff13
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:06 +08:00 |
|
chenxi
|
da49331705
|
Merge branch 'dev_shenhe' into dev_ios
|
2023-06-13 10:45:42 +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 |
|
chenxi
|
d8b335daf5
|
支付转菊花
|
2023-06-12 22:19:11 +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 |
|
chenxi
|
df85eb2aed
|
Merge branch 'dev_shenhe' into dev_ios
|
2023-06-12 18:26:28 +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 |
|
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 |
|
chenxi
|
acccd99660
|
adjust事件
|
2023-06-09 19:00:54 +08:00 |
|
Fang
|
bf1e7b7885
|
活动副本
|
2023-06-09 18:46:22 +08:00 |
|