930 Commits

Author SHA1 Message Date
xiekaidong
c950bc52be 排序 2023-08-08 16:55:43 +08:00
xiekaidong
a6b05117b7 Merge branch 'master' into dev_20230809
# Conflicts:
#	lua/app/config/grid_type.lua
#	lua/app/userdata/dungeon/dungeon_armor_entity.lua
2023-08-08 11:41:34 +08:00
xiekaidong
ad56074c71 新增上报 2023-08-07 18:15:19 +08:00
xiekaidong
7aa2b95686 宝箱日志上报 2023-08-07 15:33:06 +08:00
xiekaidong
f74226c056 增加上报属性 2023-08-07 10:35:11 +08:00
xiekaidong
e51b9bf86a 更新配置 2023-08-04 16:56:37 +08:00
xiekaidong
0045bd6e13 新增两个反伤护盾 2023-08-04 16:35:33 +08:00
Fang
e79f7bcfa0 礼包界面展示冲突处理 2023-08-04 15:56:54 +08:00
xiekaidong
13a137a6fd bug修复 2023-08-04 15:16:19 +08:00
xiekaidong
8266b13b9a 棋盘机制调整 2023-08-04 14:24:01 +08:00
xiekaidong
5922e927a4 bug 2023-08-03 16:23:53 +08:00
xiekaidong
bcb336d344 不过修复 2023-08-03 16:09:58 +08:00
xiekaidong
a47f18db07 日志上报 2023-08-03 14:20:16 +08:00
xiekaidong
e0c2821f76 武器副本增加体力消耗 2023-08-03 11:08:04 +08:00
xiekaidong
4c8eff015e 显示bug修复 2023-08-03 09:47:21 +08:00
xiekaidong
24d90bfd1c 战斗血条优化 2023-08-02 20:34:25 +08:00
xiekaidong
2018d556bb 优化显示 2023-08-02 18:56:28 +08:00
xiekaidong
397724e8eb 木兰试玩增加至5章 2023-08-02 16:13:23 +08:00
xiekaidong
e56eca3242 反击问题 2023-08-01 18:34:38 +08:00
xiekaidong
a94b0b1a23 续关记录能量 2023-08-01 18:02:57 +08:00
xiekaidong
e954484a13 技能机制优化 2023-08-01 17:35:58 +08:00
Fang
678a8fbd4c 添加音效 2023-08-01 11:10:51 +08:00
xiekaidong
0c840c0cc8 Merge branch 'battle' into dev_20230809 2023-07-31 16:25:48 +08:00
xiekaidong
b846bd4ae8 meta 2023-07-31 16:23:29 +08:00
xiekaidong
caf1fd0af9 战斗续关 2023-07-31 16:22:05 +08:00
xiekaidong
9c04ce2fe0 增加gm 2023-07-31 14:11:25 +08:00
Fang
7c7d201e01 技能tips 2023-07-28 11:46:22 +08:00
xiekaidong
4ce2af94e0 邮件拉去增加一个随机延时 2023-07-28 11:16:21 +08:00
xiekaidong
a003f3498c 刷新界面 2023-07-25 23:40:50 +08:00
xiekaidong
ca3ab5bf39 bug修复 2023-07-25 21:18:32 +08:00
xiekaidong
74ccb9ac05 韩国社区跳转处理 2023-07-25 16:06:04 +08:00
xiekaidong
d8c8591e40 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-24 21:47:52 +08:00
xiekaidong
e4647b17dc 优化 2023-07-24 21:47:45 +08:00
Fang
0d04b99d3e 显示fix 2023-07-24 21:39:18 +08:00
xiekaidong
78704c6e35 bug修复 2023-07-24 20:54:47 +08:00
xiekaidong
c6d10d8825 调整一下逻辑 2023-07-24 18:47:46 +08:00
xiekaidong
0e2bb42a25 一些报错修复 2023-07-24 18:32:41 +08:00
xiekaidong
37482eb2ca 副本引导 2023-07-24 17:10:39 +08:00
xiekaidong
6bc0ce7738 添加一些容错 2023-07-24 17:04:40 +08:00
Fang
2933776048 支线基金 2023-07-24 11:54:09 +08:00
xiekaidong
dc84eb073d 新增道具宝箱显示 2023-07-24 11:18:21 +08:00
xiekaidong
b1df62d3a4 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:15:46 +08:00
xiekaidong
bfff21b619 伤害公式bug修复 2023-07-21 17:46:56 +08:00
xiekaidong
dbbfbf4842 优化技能的释放位置逻辑 2023-07-21 15:36:05 +08:00
xiekaidong
ac3388b96b 新增buff和叠加方式优化 2023-07-21 14:40:11 +08:00
xiekaidong
026166478e buff机制修改 2023-07-21 11:37:29 +08:00
xiekaidong
52dd2b1336 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-21 09:55:50 +08:00
xiekaidong
d96adead75 修改评价弹窗关卡 2023-07-21 09:55:47 +08:00
Fang
bafb8673ec 装备升级材料获取 2023-07-21 09:50:45 +08:00
Fang
61b302305e 装备礼包 2023-07-21 09:35:21 +08:00