xiekaidong
|
d32e88ac01
|
编译lua
|
2023-09-19 15:03:21 +08:00 |
|
xiekaidong
|
9ca3f79c89
|
bug修复
|
2023-09-19 14:30:19 +08:00 |
|
Fang
|
8ec42e8a10
|
导入战令banner、fix
|
2023-09-19 11:52:59 +08:00 |
|
xiekaidong
|
37979729e0
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-19 11:05:00 +08:00 |
|
xiekaidong
|
5c3b431d25
|
提示
|
2023-09-19 11:04:57 +08:00 |
|
Fang
|
9a44044fa6
|
修改
|
2023-09-19 10:59:02 +08:00 |
|
xiekaidong
|
1e766a87c7
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-19 10:52:15 +08:00 |
|
xiekaidong
|
71058ccfee
|
增加战斗前后上阵英雄参数，方便查询作弊
|
2023-09-19 10:52:11 +08:00 |
|
Fang
|
6f5f4d94e9
|
自动淬炼加同步
|
2023-09-19 10:51:20 +08:00 |
|
xiekaidong
|
f07e452b82
|
提示
|
2023-09-18 21:51:21 +08:00 |
|
xiekaidong
|
41434625e2
|
bug修复
|
2023-09-18 20:52:32 +08:00 |
|
Fang
|
448aa0659e
|
符文自动淬炼修改、特效完善
|
2023-09-18 14:57:00 +08:00 |
|
xiekaidong
|
c54a6c48b9
|
更新图集，编译lua
|
2023-09-18 14:53:41 +08:00 |
|
xiekaidong
|
b6345dce5a
|
Merge branch 'master' into dev_20230919
# Conflicts:
# Assets/arts/atlas/ui/common.asset
# Assets/arts/textures/ui/common/common_lock_1.png
# Assets/arts/textures/ui/common/common_lock_1.png.meta
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
# Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
|
2023-09-18 14:51:32 +08:00 |
|
xiekaidong
|
b044273afc
|
bug修复
|
2023-09-18 12:00:41 +08:00 |
|
xiekaidong
|
33e84e5cc1
|
优化显示
|
2023-09-18 11:21:37 +08:00 |
|
xiekaidong
|
c0aeccf71a
|
显示优化
|
2023-09-18 10:52:38 +08:00 |
|
xiekaidong
|
b3f490c9ac
|
bug修复
|
2023-09-18 10:38:18 +08:00 |
|
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
|
75abb7d2bb
|
一些优化和审核模式处理
|
2023-09-13 14:56:25 +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 |
|