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

575 Commits

Author SHA1 Message Date
xiekaidong
a24e64ba74 调整一下填充和格子效果的逻辑顺序 2023-08-28 14:50:14 +08:00
xiekaidong
d05cec484a bug修复 2023-08-28 11:11:04 +08:00
xiekaidong
08553687ae Merge branch 'master' into dev_20230829 
# Conflicts:
#	lua/app/common/event_manager.lua
 2023-08-21 09:48:11 +08:00
xiekaidong
1bb5bb0fb3 诅咒回血被腐败影响 2023-08-18 18:55:46 +08:00
xiekaidong
8ad104e38d 选技能buf修复 2023-08-18 11:44:57 +08:00
xiekaidong
eeeadeace0 复活判定逻辑 2023-08-15 17:32:54 +08:00
xiekaidong
aff0c425bf 背景特效 2023-08-15 14:59:15 +08:00
xiekaidong
27388b3238 bug修复 2023-08-15 11:51:36 +08:00
xiekaidong
75be639da9 Merge branch 'master' into dev_20230815 
# Conflicts:
#	lua/app/module/battle/controller/battle_base_controller.lua
 2023-08-15 09:36:53 +08:00
xiekaidong
9249ee3210 重生处理 2023-08-14 16:27:52 +08:00
xiekaidong
b99ec64aa0 删除打印 2023-08-14 14:11:24 +08:00
xiekaidong
c94018809f 一个容错 2023-08-14 11:15:21 +08:00
Fang
69790fd563 新加颜色生命值加成 2023-08-11 18:15:27 +08:00
xiekaidong
de16254cb0 bug修复 2023-08-11 17:50:15 +08:00
xiekaidong
866094a76f 边缘障碍物逻辑优化 2023-08-11 15:17:28 +08:00
xiekaidong
213e82f2c1 优化逻辑 2023-08-11 11:59:47 +08:00
xiekaidong
f5ed280271 优化木棍障碍物 2023-08-11 11:24:52 +08:00
xiekaidong
84f22f6123 bug修复 2023-08-10 17:33:30 +08:00
xiekaidong
aca97b775e bug修复 2023-08-10 16:27:36 +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
e8ad813399 删除打印 2023-08-09 16:50:39 +08:00
xiekaidong
996f3deeee 添加打印 2023-08-09 16:21:12 +08:00
xiekaidong
189d421c2b 反伤bug修复 2023-08-08 17:49:03 +08:00
xiekaidong
8f07e19054 新机制 2023-08-08 16:37:57 +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
42ad5ec9fa Merge branch 'dev_20230809' into dev_20230815 
# Conflicts:
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skill.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skill.lua
 2023-08-08 15:58:56 +08:00
xiekaidong
8ae11ac948 新机制 2023-08-08 15:58:17 +08:00
xiekaidong
97cddfa125 复活buff 2023-08-08 15:27:21 +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
8b2d0c6046 完善一下结算 2023-08-07 11:45:16 +08:00
xiekaidong
e51b9bf86a 更新配置 2023-08-04 16:56:37 +08:00
xiekaidong
0045bd6e13 新增两个反伤护盾 2023-08-04 16:35:33 +08:00
xiekaidong
82823526d9 自愈、海洋护盾buff 2023-08-04 16:19:59 +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
4c8eff015e 显示bug修复 2023-08-03 09:47:21 +08:00
xiekaidong
24d90bfd1c 战斗血条优化 2023-08-02 20:34:25 +08:00
xiekaidong
62ee8bab01 木棍边缘障碍物 2023-08-02 18:07:44 +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
xiekaidong
b846bd4ae8 meta 2023-07-31 16:23:29 +08:00
xiekaidong
caf1fd0af9 战斗续关 2023-07-31 16:22:05 +08:00
xiekaidong
78704c6e35 bug修复 2023-07-24 20:54:47 +08:00
xiekaidong
0e2bb42a25 一些报错修复 2023-07-24 18:32:41 +08:00
xiekaidong
6bc0ce7738 添加一些容错 2023-07-24 17:04:40 +08:00
xiekaidong
bfff21b619 伤害公式bug修复 2023-07-21 17:46:56 +08:00
xiekaidong
dbbfbf4842 优化技能的释放位置逻辑 2023-07-21 15:36:05 +08:00