183 Commits

Author SHA1 Message Date
puxuan
e685c77351 伤害公式 2025-10-27 10:54:45 +08:00
puxuan
44531ae9f9 倍速 2025-10-20 16:40:15 +08:00
puxuan
9dae3eb965 buff 2025-10-20 14:06:23 +08:00
puxuan
f4387fca51 fix bug 2025-10-18 18:05:57 +08:00
puxuan
29ded94b59 肉鸽 2025-10-18 10:53:57 +08:00
puxuan
455e71bf7a fix bug 2025-10-17 20:37:51 +08:00
puxuan
2065c73a5c 特殊天赋 2025-10-17 16:13:58 +08:00
puxuan
c450235ffd 肉鸽 2025-10-17 12:18:03 +08:00
puxuan
3ea8d17837 肉鸽 2025-10-16 21:17:02 +08:00
puxuan
2ee6438cfc fix bug 2025-10-15 20:04:36 +08:00
kai
24c73e4b5f 天赋 2025-10-14 19:15:23 +08:00
puxuan
e36dd5e583 新增肉鸽类型 2025-09-19 14:50:04 +08:00
puxuan
21b5b2b20a 属性 2025-09-18 17:52:48 +08:00
puxuan
defa53883f boss技能 2025-09-05 15:04:36 +08:00
puxuan
a6dbfc3fa9 fix bug 2025-09-04 16:22:50 +08:00
puxuan
c530cf25b9 fix bug 2025-06-17 20:29:18 +08:00
puxuan
71edfe09ca fix bug 2025-06-16 20:59:30 +08:00
puxuan
68da2a7313 boss技能 2025-06-11 23:52:39 +08:00
puxuan
37dc0e4dad 受击 2025-06-09 23:51:29 +08:00
puxuan
b9e1915f98 fix bug 2025-06-06 16:29:18 +08:00
puxuan
d82329610d skill 2025-06-03 23:58:23 +08:00
xiekaidong
34a91873b6 锁定buff修复 2023-10-27 16:01:13 +08:00
xiekaidong
68ca7492e6 梦魇bug修复 2023-10-07 09:59:02 +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
Fang
0679e04395 属性fix 2023-09-13 18:24:56 +08:00
xiekaidong
75abb7d2bb 一些优化和审核模式处理 2023-09-13 14:56:25 +08:00
xiekaidong
35193331ef 符文副本 2023-09-12 10:09:29 +08:00
xiekaidong
81d593d09a buff修改 2023-09-11 10:49:35 +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
27be90073a buff数值上线 2023-09-05 17:15:27 +08:00
xiekaidong
ca627fc958 经验 2023-09-04 16:45:29 +08:00
xiekaidong
e4aa6e2edd 更新配置 2023-09-01 21:21:02 +08:00
xiekaidong
713c7b8f87 bug修复 2023-08-21 10:33:37 +08:00
xiekaidong
44becf62dd 设置abName 2023-08-15 21:43:21 +08:00
xiekaidong
4d1635dc3b 背景特效 2023-08-15 14:59:48 +08:00
xiekaidong
200ebe808b 技能位置 2023-08-15 09:22:18 +08:00
xiekaidong
9641889e5d 重生处理 2023-08-14 16:29:01 +08:00
xiekaidong
425bfe2fd7 更新配置 2023-08-11 10:41:28 +08:00
xiekaidong
b08ab375cc bug修复 2023-08-10 19:29:42 +08:00
xiekaidong
53e9da7a4f 皮肤技能表现 2023-08-10 10:49:22 +08:00
xiekaidong
ce7ad3cb8c 新buff和新机制 2023-08-08 16:39:03 +08:00
xiekaidong
3b61c03934 Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
#	Assets/lua/app/common/local_data.lua.bytes
#	Assets/lua/app/config/act_gift.lua.bytes
#	Assets/lua/app/config/arena_rank.lua.bytes
#	Assets/lua/app/config/chapter_board.lua.bytes
#	Assets/lua/app/config/const.lua.bytes
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/cn/buff.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/config/strings/cn/item.lua.bytes
#	Assets/lua/app/config/strings/de/item.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/es/item.lua.bytes
#	Assets/lua/app/config/strings/fr/item.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ja/skill.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/ru/item.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/config/strings/zh/skill.lua.bytes
#	Assets/lua/app/global/global_func.lua.bytes
#	Assets/lua/app/module/arena/arena_manager.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
#	Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
#	Assets/lua/app/module/equip/equip_manager.lua.bytes
#	Assets/lua/app/module/shop/shop_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/lua/app/ui/battle/battle_base_ui.lua.bytes
#	Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
#	Assets/lua/app/ui/ui_manager.lua.bytes
#	Assets/proto/protocol.bytes
2023-08-08 15:59:22 +08:00
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
32e93ec980 木棍边缘障碍物 2023-08-02 18:10:43 +08:00
xiekaidong
dfb2714266 更新配置 2023-07-31 16:28:15 +08:00
xiekaidong
863446d377 bug修复 2023-07-24 21:20:23 +08:00