323 Commits

Author SHA1 Message Date
xiekaidong
d5e8786233 更新配置 2023-08-08 11:44:16 +08:00
xiekaidong
e51b9bf86a 更新配置 2023-08-04 16:56:37 +08:00
Fang
84e1e14d79 装备材料副本扫荡排序修改 2023-08-04 10:53:00 +08:00
xiekaidong
b581328fd6 武器副本增加体力消耗 2023-08-03 11:08:19 +08:00
xiekaidong
e0c2821f76 武器副本增加体力消耗 2023-08-03 11:08:04 +08:00
xiekaidong
041d222d53 更新配置 2023-08-02 18:30:43 +08:00
xiekaidong
e0882c61c6 更新配置 2023-07-31 16:27:31 +08:00
xiekaidong
80be66cc4b Merge branch 'master' into dev_20230809
# Conflicts:
#	lua/app/userdata/hero/hero_entity.lua
2023-07-31 16:25:06 +08:00
xiekaidong
ef6969c4d9 引导修改 2023-07-28 18:40:11 +08:00
Fang
7c7d201e01 技能tips 2023-07-28 11:46:22 +08:00
xiekaidong
5a7249a545 更新配置 2023-07-27 12:32:51 +08:00
xiekaidong
2f98218e7d 更新配置 2023-07-27 10:27:48 +08:00
xiekaidong
08fa2ab356 更新配置 2023-07-26 15:58:03 +08:00
Fang
356cffc973 导表 2023-07-26 15:15:25 +08:00
xiekaidong
eece88ddce 更新配置 2023-07-25 22:09:55 +08:00
Fang
22a26bcda0 导表 2023-07-25 20:18:15 +08:00
xiekaidong
2f84455356 更新配置 2023-07-25 19:28:47 +08:00
Fang
b2d2b65e73 显示fix 2023-07-25 18:11:05 +08:00
xiekaidong
1071013356 更新配置 2023-07-25 16:50:38 +08:00
xiekaidong
3cd1b81e8f Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-25 16:06:07 +08:00
xiekaidong
74ccb9ac05 韩国社区跳转处理 2023-07-25 16:06:04 +08:00
Fang
5fcf27a659 基金ad奖励显示fix 2023-07-25 15:44:10 +08:00
Fang
ce1e2f557d 收集奖励报错fix 2023-07-25 15:44:10 +08:00
xiekaidong
e59b7f1ccb Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 18:47:54 +08:00
xiekaidong
c6d10d8825 调整一下逻辑 2023-07-24 18:47:46 +08:00
Fang
d10b9049f7 装备属性加成计算fix 2023-07-24 18:37:43 +08:00
xiekaidong
37482eb2ca 副本引导 2023-07-24 17:10:39 +08:00
Fang
2933776048 支线基金 2023-07-24 11:54:09 +08:00
xiekaidong
dc84eb073d 新增道具宝箱显示 2023-07-24 11:18:21 +08:00
xiekaidong
d7ed50ab8c 处理界面显示 2023-07-24 10:36:25 +08:00
xiekaidong
035fde1360 更新配置 2023-07-22 14:02:27 +08:00
xiekaidong
3148733679 更新配置,上传资源 2023-07-21 17:17:51 +08:00
xiekaidong
dbbfbf4842 优化技能的释放位置逻辑 2023-07-21 15:36:05 +08:00
xiekaidong
ac3388b96b 新增buff和叠加方式优化 2023-07-21 14:40:11 +08:00
xiekaidong
bab7c281ca 更新配置,英雄排序问题 2023-07-21 11:47:19 +08:00
xiekaidong
3ace684951 更新配置 2023-07-21 11:38:46 +08:00
xiekaidong
026166478e buff机制修改 2023-07-21 11:37:29 +08:00
Fang
bafb8673ec 装备升级材料获取 2023-07-21 09:50:45 +08:00
xiekaidong
a4a1574ace 支线副本 2023-07-20 21:56:24 +08:00
xiekaidong
b8751b9229 支线副本 2023-07-20 19:44:41 +08:00
xiekaidong
8b4933f4f0 支线副本 2023-07-20 17:41:42 +08:00
xiekaidong
2ffd6e88ba 装备副本 2023-07-19 20:16:17 +08:00
xiekaidong
000bc5e926 武器副本的一些界面 2023-07-19 16:52:28 +08:00
xiekaidong
854ce2b986 通用扫荡弹窗 2023-07-19 10:39:22 +08:00
xiekaidong
27ef576c8f 副本入口 2023-07-18 21:00:12 +08:00
xiekaidong
2610718eb2 副本入口 2023-07-18 17:01:27 +08:00
xiekaidong
0cfce182b3 更新配置 2023-07-18 16:45:46 +08:00
xiekaidong
3ed70b6c87 Merge branch 'master' into dev_20230725 2023-07-18 09:33:07 +08:00
xiekaidong
9642247f4e 更新日语多语言 2023-07-17 17:40:06 +08:00
xiekaidong
de04cbc6ff 更新配置和优化 2023-07-17 17:21:00 +08:00