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 |
|
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
|
2fd8f49f32
|
rechargeid
|
2023-06-09 17:08:04 +08:00 |
|
chenxi
|
4e4719a51e
|
ios 支付
|
2023-06-09 16:39:45 +08:00 |
|
chenxi
|
89d068133e
|
ios支付
|
2023-06-09 16:30:17 +08:00 |
|
xiekaidong
|
1ddb7bd43b
|
ios支付处理
|
2023-06-09 16:08:22 +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
|
c300705012
|
proto
|
2023-06-09 15:07:37 +08:00 |
|
chenxi
|
339d005e73
|
平台名
|
2023-06-09 11:46:47 +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
|
c56d52f640
|
fix bug
|
2023-06-08 18:29:17 +08:00 |
|
chenxi
|
7dc52dbfd9
|
Merge branch 'master' into dev_ios
|
2023-06-08 18:28:34 +08:00 |
|
chenxi
|
bda768c79f
|
bug
|
2023-06-08 18:05:55 +08:00 |
|
chenxi
|
c9a3ab1d14
|
启动界面
|
2023-06-08 17:30:16 +08:00 |
|
chenxi
|
c17ece443b
|
启动界面位置错误
|
2023-06-08 17:29:49 +08:00 |
|
chenxi
|
10e96bb030
|
Merge branch 'dev_20230608_hotupdate'
|
2023-06-08 17:08:30 +08:00 |
|
xiekaidong
|
cc8bace10b
|
上报修复
|
2023-06-08 17:07:04 +08:00 |
|
chenxi
|
5b37d50df4
|
多语言
|
2023-06-08 17:01:17 +08:00 |
|
xiekaidong
|
86e6e62fe9
|
bug修复
|
2023-06-08 16:41:07 +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 |
|