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

961 Commits

Author SHA1 Message Date
Fang
69790fd563 新加颜色生命值加成 2023-08-11 18:15:27 +08:00
xiekaidong
de16254cb0 bug修复 2023-08-11 17:50:15 +08:00
Fang
34282dc81b 竞技场宝箱弹出规则优化、bugfix 2023-08-11 15:37:26 +08:00
xiekaidong
7247cada75 Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-lua into dev_20230815 2023-08-11 15:17:32 +08:00
xiekaidong
866094a76f 边缘障碍物逻辑优化 2023-08-11 15:17:28 +08:00
Fang
84796cd4a8 活动礼包弹出逻辑补充 2023-08-11 15:08:23 +08:00
Fang
ba449382a9 细节完善 2023-08-11 14:26:52 +08:00
陈希
78c18dac68 Merge branch 'fang/夏日活动' into 'dev_20230815' 
夏日活动

See merge request b6-client/b6-lua!11
 2023-08-11 04:06:02 +00:00
xiekaidong
213e82f2c1 优化逻辑 2023-08-11 11:59:47 +08:00
Fang
e0db8bcfda 夏日活动 2023-08-11 11:52:12 +08:00
xiekaidong
f5ed280271 优化木棍障碍物 2023-08-11 11:24:52 +08:00
xiekaidong
0d979c5275 bug修复 2023-08-11 10:05:28 +08:00
xiekaidong
04a2694461 bug修复 2023-08-10 11:45:16 +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
efc8aa3dde 延迟提高一点 2023-08-09 17:32:57 +08:00
xiekaidong
1ecb11124d 补充 2023-08-09 17:18:14 +08:00
xiekaidong
e8ad813399 删除打印 2023-08-09 16:50:39 +08:00
xiekaidong
996f3deeee 添加打印 2023-08-09 16:21:12 +08:00
Fang
9c42fe1da6 皮肤功能 2023-08-09 14:16:27 +08:00
Fang
a81f9de468 装备副本扫荡触发礼包未立即弹出fix 2023-08-09 10:19:42 +08:00
xiekaidong
189d421c2b 反伤bug修复 2023-08-08 17:49:03 +08:00
xiekaidong
c950bc52be 排序 2023-08-08 16:55:43 +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
ad56074c71 新增上报 2023-08-07 18:15:19 +08:00
xiekaidong
7aa2b95686 宝箱日志上报 2023-08-07 15:33:06 +08:00
xiekaidong
8b2d0c6046 完善一下结算 2023-08-07 11:45:16 +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
xiekaidong
82823526d9 自愈、海洋护盾buff 2023-08-04 16:19:59 +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
1620d69548 英雄竞技场段位解锁 2023-08-03 18:07:24 +08:00
xiekaidong
5922e927a4 bug 2023-08-03 16:23:53 +08:00
xiekaidong
bcb336d344 不过修复 2023-08-03 16:09:58 +08:00
xiekaidong
e05f02088c 统一接口，金币不足提示弹窗询问 2023-08-03 14:53:51 +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
62ee8bab01 木棍边缘障碍物 2023-08-02 18:07:44 +08:00
xiekaidong
397724e8eb 木兰试玩增加至5章 2023-08-02 16:13:23 +08:00
xiekaidong
e56eca3242 反击问题 2023-08-01 18:34:38 +08:00