xiekaidong
|
d43dd92f9e
|
Merge branch 'master' into dev_20230809
# Conflicts:
# Assets/lua/app/common/bi_report.lua.bytes
# Assets/lua/app/config/grid_type.lua.bytes
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/ui/hero/armor_info_comp.lua.bytes
# Assets/lua/app/userdata/dungeon/dungeon_armor_entity.lua.bytes
# Assets/lua/app/userdata/player/player_data.lua.bytes
# Assets/lua/app/userdata/shop/shop_data.lua.bytes
|
2023-08-08 11:42:31 +08:00 |
|
xiekaidong
|
a8064bb578
|
棋盘机制调整
|
2023-08-04 14:24:13 +08:00 |
|
xiekaidong
|
80bb50137a
|
bug修复
|
2023-08-03 16:53:57 +08:00 |
|
xiekaidong
|
dfb2714266
|
更新配置
|
2023-07-31 16:28:15 +08:00 |
|
xiekaidong
|
863446d377
|
bug修复
|
2023-07-24 21:20:23 +08:00 |
|
xiekaidong
|
2bb3d99058
|
伤害公式bug修复
|
2023-07-21 17:47:07 +08:00 |
|
xiekaidong
|
5cb6ae349b
|
优化技能的释放位置逻辑
|
2023-07-21 15:36:27 +08:00 |
|
Fang
|
043dbf29c1
|
review
|
2023-07-20 19:35:17 +08:00 |
|
Fang
|
6f8acc2673
|
新号报错处理
|
2023-07-17 15:18:57 +08:00 |
|
Fang
|
2101a422bb
|
英雄图鉴
|
2023-07-14 17:08:08 +08:00 |
|
xiekaidong
|
47a5446628
|
修改战斗伤害公式
|
2023-07-10 16:07:46 +08:00 |
|
xiekaidong
|
84ae5c96c6
|
出包前得资源检查和设置abName
|
2023-07-07 16:04:44 +08:00 |
|
xiekaidong
|
288370bb15
|
战斗开始时更新英雄数据
|
2023-07-05 18:24:56 +08:00 |
|
xiekaidong
|
b8e057fab3
|
英雄面板属性加密
|
2023-07-05 17:25:46 +08:00 |
|
xiekaidong
|
cc0b2c05f8
|
战斗速度
|
2023-07-04 18:25:20 +08:00 |
|
xiekaidong
|
3c66b5c3da
|
取消连线
|
2023-07-04 18:05:41 +08:00 |
|
xiekaidong
|
4aaaf714bd
|
竞技场敌方自动战斗
|
2023-06-29 20:52:39 +08:00 |
|
xiekaidong
|
dfd66067ec
|
更新配置
|
2023-06-20 21:03:38 +08:00 |
|
xiekaidong
|
9d0901dc2b
|
免控
|
2023-06-19 11:55:52 +08:00 |
|
xiekaidong
|
da555bd8f3
|
怪物经验可配置根据血量的分段经验
|
2023-06-16 18:44:43 +08:00 |
|
xiekaidong
|
989a7c63e5
|
火蛇海蛇效果
|
2023-06-16 15:14:33 +08:00 |
|
xiekaidong
|
62f45a0392
|
战斗支持血量换皮肤
|
2023-06-15 18:56:07 +08:00 |
|
xiekaidong
|
2b3f4255a0
|
buff显示修改
|
2023-06-15 14:18:22 +08:00 |
|
xiekaidong
|
a3a9ac1fb7
|
连携提示
|
2023-06-14 18:21:48 +08:00 |
|
chenxi
|
25534ecacb
|
编译
|
2023-06-14 15:40:09 +08:00 |
|
xiekaidong
|
7e8b46effc
|
技能音效
|
2023-06-13 17:44:37 +08:00 |
|
xiekaidong
|
de0b2828a7
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:46 +08:00 |
|
xiekaidong
|
f48f17db38
|
攻击距离可配置
|
2023-06-12 10:38:07 +08:00 |
|
xiekaidong
|
dd104eae3f
|
每日挑战不显示每日buff信息
|
2023-06-12 09:47:25 +08:00 |
|
xiekaidong
|
cb667f4e9c
|
bug修复
|
2023-06-06 16:45:39 +08:00 |
|
xiekaidong
|
e6a28c8acd
|
修改bug,优化战斗流程逻辑
|
2023-06-03 19:12:33 +08:00 |
|
xiekaidong
|
c65d52c8de
|
水泡动画
|
2023-06-02 19:02:18 +08:00 |
|
xiekaidong
|
e4d84563f9
|
先更新一下格子
|
2023-06-02 16:54:59 +08:00 |
|
xiekaidong
|
88008cdf67
|
显示优化
|
2023-06-01 22:10:51 +08:00 |
|
xiekaidong
|
7e25cb28cb
|
三消格子支持spine动画表现
|
2023-05-31 20:18:57 +08:00 |
|
xiekaidong
|
b031fe8a9b
|
更新配置
|
2023-05-30 21:30:41 +08:00 |
|
xiekaidong
|
cd99e669cb
|
更新配置
|
2023-05-30 15:08:30 +08:00 |
|
xiekaidong
|
ca8109cd8d
|
buff描述
|
2023-05-30 14:16:28 +08:00 |
|
chenxi
|
2fbe01e673
|
每日挑战
|
2023-05-30 11:45:27 +08:00 |
|
xiekaidong
|
9738d04b4f
|
删除空余行
|
2023-05-29 21:00:47 +08:00 |
|
xiekaidong
|
b4b79bc62a
|
技能bug修复
|
2023-05-29 20:27:33 +08:00 |
|
xiekaidong
|
7df90d4051
|
优化
|
2023-05-29 11:45:41 +08:00 |
|
xiekaidong
|
d54864ecb5
|
存储一些技能效果
|
2023-05-29 10:51:29 +08:00 |
|
xiekaidong
|
1dbe6be188
|
禁锢效果
|
2023-05-26 18:09:46 +08:00 |
|
xiekaidong
|
c3e7ea9272
|
bug修复
|
2023-05-26 15:58:40 +08:00 |
|
xiekaidong
|
f40ddbf2ea
|
技能刷新接入联网
|
2023-05-24 10:03:20 +08:00 |
|
xiekaidong
|
f8bfac1c35
|
冰冻状态、昏睡状态
|
2023-05-23 18:36:03 +08:00 |
|
xiekaidong
|
1d657e3128
|
boss入场动画
|
2023-05-22 20:32:26 +08:00 |
|
xiekaidong
|
cf654fe422
|
技能tips
|
2023-05-22 16:00:44 +08:00 |
|
xiekaidong
|
1eae40bf23
|
更新配置
|
2023-05-19 16:29:20 +08:00 |
|