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

161 Commits

Author SHA1 Message Date
xiekaidong
94d59731c8 Merge branch 'dungeon_rune' into dev_20230919 
# Conflicts:
#	lua/app/config/buff.lua
#	lua/app/config/const.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/monster_dungeon_rune.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/skill_rogue.lua
#	lua/app/proto/proto_msg_type.lua
 2023-09-12 10:07:33 +08:00
xiekaidong
10253fbafb 符文副本 2023-09-11 20:01:55 +08:00
xiekaidong
b3af360cd3 buff修改 2023-09-11 10:49:18 +08:00
xiekaidong
c0a3356cfd 符文副本主界面 2023-09-07 19:14:39 +08:00
xiekaidong
2266324f94 新增属性 2023-09-06 16:44:00 +08:00
xiekaidong
297dcded77 魅惑、免疫buff，被控状态下，技能cd不递减 2023-09-06 16:26:48 +08:00
xiekaidong
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
xiekaidong
9249ee3210 重生处理 2023-08-14 16:27:52 +08:00
Fang
69790fd563 新加颜色生命值加成 2023-08-11 18:15:27 +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
0045bd6e13 新增两个反伤护盾 2023-08-04 16:35:33 +08:00
xiekaidong
82823526d9 自愈、海洋护盾buff 2023-08-04 16:19:59 +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
b8751b9229 支线副本 2023-07-20 19:44:41 +08:00
xiekaidong
2ffd6e88ba 装备副本 2023-07-19 20:16:17 +08:00
xiekaidong
000bc5e926 武器副本的一些界面 2023-07-19 16:52:28 +08:00
xiekaidong
de16d711ec 层数护盾 2023-07-17 14:28:55 +08:00
xiekaidong
90711c7e2a 英雄属性增加，以及战斗伤害治疗公式修改 2023-07-13 18:02:46 +08:00
xiekaidong
1759c04305 修改战斗伤害公式 2023-07-10 16:07:32 +08:00
xiekaidong
e597b9f7be 战斗中属性加密 2023-07-05 17:05:17 +08:00
xiekaidong
afd2c11ef1 连击提示 2023-07-05 11:22:46 +08:00
xiekaidong
d030ee5988 bug修复 2023-07-04 20:21:23 +08:00
xiekaidong
84f1f27c3c 战斗处理 2023-06-30 16:03:51 +08:00
xiekaidong
c259b2ed58 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena 
# Conflicts:
#	lua/app/module/battle/battle_const.lua
 2023-06-28 21:25:19 +08:00
xiekaidong
d4d92cf97d pvp战斗和整合pve战斗 2023-06-28 21:24:15 +08:00
Fang
cd09e79bca 竞技场 2023-06-27 18:27:11 +08:00
xiekaidong
a623c25f6f pvp战斗概念引入 2023-06-26 15:28:40 +08:00
xiekaidong
eb7d04a5dc 修改格子计算方式 2023-06-26 11:13:13 +08:00
xiekaidong
f1b4a21ae6 免控 2023-06-19 11:55:10 +08:00
xiekaidong
5214dd8136 伤害数字重叠问题 2023-06-14 18:35:20 +08:00
xiekaidong
e664f4ab0a 连携提示 2023-06-14 18:20:57 +08:00
Fang
98206fea34 Merge branch 'dev' into fang/dungeon 
# Conflicts:
#	lua/app/config/avatar.lua.meta
#	lua/app/config/avatar_frame.lua.meta
#	lua/app/config/skill.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/avatar.lua.meta
#	lua/app/config/strings/cn/avatar_frame.lua.meta
#	lua/app/config/strings/cn/hero.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/avatar.lua.meta
#	lua/app/config/strings/de/avatar_frame.lua.meta
#	lua/app/config/strings/en/avatar.lua.meta
#	lua/app/config/strings/en/avatar_frame.lua.meta
#	lua/app/config/strings/fr/avatar.lua.meta
#	lua/app/config/strings/fr/avatar_frame.lua.meta
#	lua/app/config/strings/id/avatar.lua.meta
#	lua/app/config/strings/id/avatar_frame.lua.meta
#	lua/app/config/strings/ja/avatar.lua.meta
#	lua/app/config/strings/ja/avatar_frame.lua.meta
#	lua/app/config/strings/ko/avatar.lua.meta
#	lua/app/config/strings/ko/avatar_frame.lua.meta
#	lua/app/config/strings/pt/avatar.lua.meta
#	lua/app/config/strings/pt/avatar_frame.lua.meta
#	lua/app/config/strings/ru/avatar.lua.meta
#	lua/app/config/strings/ru/avatar_frame.lua.meta
#	lua/app/config/strings/th/avatar.lua.meta
#	lua/app/config/strings/th/avatar_frame.lua.meta
#	lua/app/config/strings/vi/avatar.lua.meta
#	lua/app/config/strings/vi/avatar_frame.lua.meta
#	lua/app/config/strings/zh/avatar.lua.meta
#	lua/app/config/strings/zh/avatar_frame.lua.meta
 2023-06-14 11:41:12 +08:00
xiekaidong
4846a97b75 grideffect=6的处理 2023-06-13 15:08:02 +08:00
xiekaidong
e1c54ef97e Merge branch 'dev' into fang/dungeon 2023-06-12 16:56:14 +08:00
xiekaidong
99694fc1d8 整合一下战斗任务参数 2023-06-12 16:25:11 +08:00
Fang
bf1e7b7885 活动副本 2023-06-09 18:46:22 +08:00
xiekaidong
cb8006c377 显示修复 2023-06-07 17:47:29 +08:00
xiekaidong
44ff406135 boss机制棋盘效果处理 2023-06-02 22:28:22 +08:00
xiekaidong
1689436124 新增障碍物效果类型 2023-06-02 20:13:38 +08:00
xiekaidong
143f67c2f3 特效问题修复 2023-06-01 18:18:54 +08:00
xiekaidong
89b35ce6aa 战斗相关bug修复 2023-05-31 14:23:48 +08:00
xiekaidong
d4a1b5be93 描述修改 2023-05-31 11:10:29 +08:00
Fang
3880dfd3d2 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 
# Conflicts:
#	lua/app/common/module_manager.lua
#	lua/app/config/buff_daily_challenge.lua
#	lua/app/config/chapter.lua
#	lua/app/config/hero.lua
#	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
 2023-05-29 18:24:33 +08:00
xiekaidong
35c56dda72 带有流血buff时死亡触发的被动机制 2023-05-26 21:22:00 +08:00
xiekaidong
7fa2c93ad5 每日战斗战斗部分 2023-05-26 15:42:35 +08:00
xiekaidong
db985c714c 相互反击的bug 2023-05-24 11:02:26 +08:00
xiekaidong
c5609f4867 新增的buff 2023-05-23 19:08:26 +08:00
xiekaidong
e5bcfa3f09 冰冻状态、昏睡状态 2023-05-23 18:35:08 +08:00
xiekaidong
637264f383 格挡动作表现、反击界面表现 2023-05-23 16:39:29 +08:00