620 Commits

Author SHA1 Message Date
xiekaidong
ae1aeba1c5 编译lua 2023-09-18 09:39:22 +08:00
xiekaidong
1cf27e1a54 编译lua 2023-09-16 20:26:20 +08:00
Fang
0d50692a4f 请求优化 2023-09-15 20:54:35 +08:00
Fang
769cfbe34d 圆月活动 2023-09-15 19:23:25 +08:00
xiekaidong
cccce0625e pvp战斗取消元素随机加权 2023-09-15 17:41:37 +08:00
Fang
f409368faa bug fix 2023-09-13 15:45:27 +08:00
xiekaidong
96a0a976e6 优化 2023-09-13 09:43:41 +08:00
xiekaidong
4ef44130e9 优化和上传特效 2023-09-13 09:19:18 +08:00
xiekaidong
eaed3e859e 资源调整 2023-09-12 20:13:37 +08:00
xiekaidong
9f0fd56ab4 修复bug 2023-09-12 19:46:47 +08:00
xiekaidong
6bfab0547f bug修复 2023-09-12 16:32:07 +08:00
xiekaidong
f49e729db2 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-12 16:22:29 +08:00
xiekaidong
27308ff7fd bug修复 2023-09-12 16:22:26 +08:00
Fang
1e970493b3 优化 2023-09-12 16:17:22 +08:00
陈希
4094f79f7b Merge branch 'fang/runes' into 'dev_20230919'
符文功能

See merge request b6-client/b6-unity!17
2023-09-12 06:50:32 +00:00
xiekaidong
06f81a091a Merge branch 'master' into dev_20230919
# Conflicts:
#	Assets/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua.bytes
2023-09-12 14:41:48 +08:00
xiekaidong
34953bab97 回合数提示 2023-09-12 14:32:16 +08:00
xiekaidong
9ff6dbeee0 战斗优化调整 2023-09-12 12:23:40 +08:00
xiekaidong
57131fb59b 调整 2023-09-12 11:40:45 +08:00
xiekaidong
1e1e4835d3 更新配置 2023-09-12 11:23:24 +08:00
Fang
6eeff31530 符文功能 2023-09-12 10:41:44 +08:00
xiekaidong
c715f838f8 bug修复 2023-09-12 10:24:46 +08:00
xiekaidong
35193331ef 符文副本 2023-09-12 10:09:29 +08:00
xiekaidong
81d593d09a buff修改 2023-09-11 10:49:35 +08:00
xiekaidong
2c07878a4d 判定修复 2023-09-08 10:37:37 +08:00
xiekaidong
5fe814b753 合并符文怪物表 2023-09-08 09:38:10 +08:00
xiekaidong
980d92839d 魅惑、免疫buff,被控状态下,技能cd不递减 2023-09-06 16:28:01 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
32fd1db301 bug修复 2023-09-05 20:19:56 +08:00
xiekaidong
3d439234a4 更新配置 2023-09-05 18:00:45 +08:00
xiekaidong
27be90073a buff数值上线 2023-09-05 17:15:27 +08:00
xiekaidong
4bc0e14cdf 等级修改 2023-09-05 15:32:34 +08:00
xiekaidong
0e962c43ff bug修复 2023-09-05 11:54:38 +08:00
xiekaidong
0d901aff71 bug修复 2023-09-05 10:48:55 +08:00
xiekaidong
cbf95861d6 bug修复 2023-09-05 10:00:11 +08:00
xiekaidong
df9fb7cabb bug修复 2023-09-04 20:06:58 +08:00
xiekaidong
5666c71d2b 修复一些bug 2023-09-04 18:21:26 +08:00
xiekaidong
8c9945cc63 倒计时优化 2023-09-04 17:25:27 +08:00
xiekaidong
24b7793c44 bug修复 2023-09-04 16:55:13 +08:00
xiekaidong
ca627fc958 经验 2023-09-04 16:45:29 +08:00
xiekaidong
e4aa6e2edd 更新配置 2023-09-01 21:21:02 +08:00
Fang
9d6334e76e 新手14天乐 2023-09-01 15:35:31 +08:00
xiekaidong
b3b9e59f4a 优化 2023-08-29 21:32:29 +08:00
xiekaidong
cd1cea12fa bug修复 2023-08-29 21:04:37 +08:00
xiekaidong
1daeabac42 编译lua 2023-08-29 16:03:47 +08:00
xiekaidong
eb1a197cc0 Merge branch 'master' into dev_20230829
# Conflicts:
#	Assets/lua/app/config/skill_rogue.lua.bytes
#	Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
2023-08-29 16:02:44 +08:00
xiekaidong
a6665b8fc3 bug修复 2023-08-28 19:15:19 +08:00
xiekaidong
7722e968e3 逻辑调整 2023-08-28 19:12:19 +08:00
Fang
7f99b9d771 装备礼包fix 2023-08-28 15:26:21 +08:00
xiekaidong
dccabf26e2 bug修复 2023-08-28 15:16:30 +08:00