puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,304 Commits 6 Branches 94 Tags
Commit Graph

163 Commits

Author SHA1 Message Date
xiekaidong
f839dc3b57 buff数值上线 2023-09-05 17:14:49 +08:00
xiekaidong
eb73910628 Merge branch 'master' into dev_20230829 2023-08-29 16:02:05 +08:00
xiekaidong
0549a8b37b bug修复 2023-08-21 10:33:14 +08:00
xiekaidong
1bb5bb0fb3 诅咒回血被腐败影响 2023-08-18 18:55:46 +08:00
xiekaidong
eeeadeace0 复活判定逻辑 2023-08-15 17:32:54 +08:00
xiekaidong
aff0c425bf 背景特效 2023-08-15 14:59:15 +08:00
xiekaidong
9249ee3210 重生处理 2023-08-14 16:27:52 +08:00
xiekaidong
b99ec64aa0 删除打印 2023-08-14 14:11:24 +08:00
xiekaidong
d311ea14aa Merge branch 'master' into dev_20230815 
# Conflicts:
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board.lua
#	lua/app/config/grid_type.lua
#	lua/app/config/strings/cn/avatar.lua
#	lua/app/config/strings/cn/avatar_frame.lua
#	lua/app/config/strings/en/avatar.lua
#	lua/app/config/strings/en/avatar_frame.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/avatar.lua
#	lua/app/config/strings/es/avatar_frame.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/id/avatar.lua
#	lua/app/config/strings/id/avatar_frame.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/avatar.lua
#	lua/app/config/strings/ja/avatar_frame.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ko/avatar.lua
#	lua/app/config/strings/ko/avatar_frame.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/avatar.lua
#	lua/app/config/strings/pt/avatar_frame.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/th/avatar.lua
#	lua/app/config/strings/th/avatar_frame.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/avatar.lua
#	lua/app/config/strings/vi/avatar_frame.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/avatar.lua
#	lua/app/config/strings/zh/avatar_frame.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/summon.lua
#	lua/app/module/battle/component/battle_unit_comp.lua
#	lua/app/module/battle/team/battle_team.lua
 2023-08-10 09:39:07 +08:00
xiekaidong
189d421c2b 反伤bug修复 2023-08-08 17:49:03 +08:00
xiekaidong
26862b0e02 Merge branch 'dev_20230815' into battle 
# Conflicts:
#	lua/app/config/buff.lua
#	lua/app/config/strings/de/buff.lua
#	lua/app/config/strings/en/buff.lua
#	lua/app/config/strings/es/buff.lua
#	lua/app/config/strings/fr/buff.lua
#	lua/app/config/strings/id/buff.lua
#	lua/app/config/strings/ja/buff.lua
#	lua/app/config/strings/ko/buff.lua
#	lua/app/config/strings/pt/buff.lua
#	lua/app/config/strings/ru/buff.lua
#	lua/app/config/strings/th/buff.lua
#	lua/app/config/strings/vi/buff.lua
#	lua/app/config/strings/zh/buff.lua
#	lua/app/module/battle/battle_const.lua
#	lua/app/module/battle/helper/battle_buff_handle.lua
 2023-08-08 16:02:24 +08:00
xiekaidong
97cddfa125 复活buff 2023-08-08 15:27:21 +08:00
xiekaidong
8b2d0c6046 完善一下结算 2023-08-07 11:45:16 +08:00
xiekaidong
82823526d9 自愈、海洋护盾buff 2023-08-04 16:19:59 +08:00
xiekaidong
e954484a13 技能机制优化 2023-08-01 17:35:58 +08:00
xiekaidong
0e2bb42a25 一些报错修复 2023-07-24 18:32:41 +08:00
xiekaidong
026166478e buff机制修改 2023-07-21 11:37:29 +08:00
Fang
015de6fc70 英雄升级显示、战斗报错fix 2023-07-20 21:23:02 +08:00
Fang
cc7feea039 review 2023-07-20 16:20:11 +08:00
xiekaidong
85f016086d 层数buff完善 2023-07-17 14:46:02 +08:00
xiekaidong
de16d711ec 层数护盾 2023-07-17 14:28:55 +08:00
xiekaidong
da664585a0 Merge branch 'master' into dev 
# Conflicts:
#	lua/app/module/battle/controller/battle_controller.lua
 2023-07-07 17:17:01 +08:00
xiekaidong
d4d92cf97d pvp战斗和整合pve战斗 2023-06-28 21:24:15 +08:00
xiekaidong
16c0fe7182 添加容错 2023-06-25 10:30:21 +08:00
xiekaidong
d9a6ccc527 bug修复 2023-06-20 16:28:51 +08:00
xiekaidong
f1b4a21ae6 免控 2023-06-19 11:55:10 +08:00
xiekaidong
9a620ae064 bug修复 2023-06-19 10:13:05 +08:00
xiekaidong
aa5f557c75 怪物经验可配置根据血量的分段经验 2023-06-16 18:42:41 +08:00
xiekaidong
027809a5bd 战斗支持血量换皮肤 2023-06-15 18:55:10 +08:00
xiekaidong
4cce3bb36b buff显示修改 2023-06-15 14:17:48 +08:00
xiekaidong
5214dd8136 伤害数字重叠问题 2023-06-14 18:35:20 +08:00
xiekaidong
e664f4ab0a 连携提示 2023-06-14 18:20:57 +08:00
xiekaidong
e3b8eaa04c 显示buff 2023-06-14 15:34:21 +08:00
xiekaidong
6cf247d86d 对手先手期间，英雄不会播放死亡动作bug修复 2023-06-14 10:03:21 +08:00
xiekaidong
e010700340 技能音效 2023-06-13 17:43:55 +08:00
xiekaidong
47ee292697 更改近身攻击距离 2023-06-12 10:09:42 +08:00
xiekaidong
0441e09d12 bug修复 2023-06-05 18:24:06 +08:00
xiekaidong
628da8aade 音效容错 2023-06-05 16:24:06 +08:00
xiekaidong
fd4b60dfd2 多段伤害音效 2023-06-02 20:22:54 +08:00
xiekaidong
dd86bf5283 战斗速度 2023-06-02 15:15:10 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
xiekaidong
12d73fc941 特效反转 2023-05-31 17:22:48 +08:00
xiekaidong
8c779f826c bug修复 2023-05-31 16:04:46 +08:00
xiekaidong
8e8930230f 容错 2023-05-30 11:54:33 +08:00
陈希
bbc196035c Merge branch 'fang/daily_challenge' into 'dev' 
每日挑战

See merge request b6-client/b6-lua!1
 2023-05-30 03:38:33 +00:00
xiekaidong
c3bcb35a33 没有战斗动作的技能 2023-05-30 11:29:59 +08:00
Fang
9b3a00e809 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 
# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/de/buff.lua
#	lua/app/config/strings/en/buff.lua
#	lua/app/config/strings/fr/buff.lua
#	lua/app/config/strings/id/buff.lua
#	lua/app/config/strings/ja/buff.lua
#	lua/app/config/strings/ko/buff.lua
#	lua/app/config/strings/pt/buff.lua
#	lua/app/config/strings/ru/buff.lua
#	lua/app/config/strings/th/buff.lua
#	lua/app/config/strings/vi/buff.lua
#	lua/app/config/strings/zh/buff.lua
 2023-05-30 10:35:05 +08:00
xiekaidong
09e8acb915 删除空余行 2023-05-29 21:00:24 +08:00
xiekaidong
fe6994625c bug修复 2023-05-29 20:56:46 +08:00
xiekaidong
c50f92bbc0 bug修复 2023-05-29 20:21:05 +08:00