xiekaidong
|
71058ccfee
|
增加战斗前后上阵英雄参数，方便查询作弊
|
2023-09-19 10:52:11 +08:00 |
|
xiekaidong
|
41434625e2
|
bug修复
|
2023-09-18 20:52:32 +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
|
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 |
|
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
|
9f0fd56ab4
|
修复bug
|
2023-09-12 19:46:47 +08:00 |
|
xiekaidong
|
6bfab0547f
|
bug修复
|
2023-09-12 16:32:07 +08:00 |
|
xiekaidong
|
27308ff7fd
|
bug修复
|
2023-09-12 16:22:26 +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
|
34953bab97
|
回合数提示
|
2023-09-12 14:32:16 +08:00 |
|
xiekaidong
|
9ff6dbeee0
|
战斗优化调整
|
2023-09-12 12:23:40 +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
|
ca627fc958
|
经验
|
2023-09-04 16:45:29 +08:00 |
|
xiekaidong
|
e4aa6e2edd
|
更新配置
|
2023-09-01 21:21:02 +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 |
|
xiekaidong
|
f470bacdbb
|
调整一下填充和格子效果的逻辑顺序
|
2023-08-28 14:50:44 +08:00 |
|
xiekaidong
|
c7b4a4a064
|
bug修复
|
2023-08-28 11:12:32 +08:00 |
|
xiekaidong
|
9b4ab7f785
|
bug修复
|
2023-08-21 11:24:57 +08:00 |
|
xiekaidong
|
713c7b8f87
|
bug修复
|
2023-08-21 10:33:37 +08:00 |
|
xiekaidong
|
7134e96cc8
|
Merge branch 'master' into dev_20230829
# Conflicts:
# Assets/lua/app/common/event_manager.lua.bytes
# Assets/lua/app/proto/proto_msg_type.lua.bytes
# Assets/proto/protocol.bytes
|
2023-08-21 09:47:38 +08:00 |
|
xiekaidong
|
deae480ef3
|
诅咒回血被腐败影响
|
2023-08-18 18:56:09 +08:00 |
|
xiekaidong
|
06797a20de
|
选技能buf修复
|
2023-08-18 11:45:05 +08:00 |
|
xiekaidong
|
2ac0456b2f
|
复活判定
|
2023-08-15 17:33:50 +08:00 |
|
xiekaidong
|
4d1635dc3b
|
背景特效
|
2023-08-15 14:59:48 +08:00 |
|
xiekaidong
|
c4d52097e8
|
bug修复
|
2023-08-15 11:52:02 +08:00 |
|
xiekaidong
|
9cdeac081d
|
编译lua
|
2023-08-15 09:38:22 +08:00 |
|
xiekaidong
|
9641889e5d
|
重生处理
|
2023-08-14 16:29:01 +08:00 |
|