88 Commits

Author SHA1 Message Date
Fang
0aba4ec004 更表 2023-08-14 09:50:16 +08:00
Fang
51891b4d27 夏日活动功能 2023-08-11 12:00:11 +08:00
xiekaidong
425bfe2fd7 更新配置 2023-08-11 10:41:28 +08:00
xiekaidong
5c1fa9be63 更新配置 2023-08-10 09:41:33 +08:00
Fang
9c9cde6a89 皮肤功能 2023-08-09 14:15:12 +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
dd1a91051a bug修复 2023-08-04 16:59:30 +08:00
xiekaidong
3b182e56c5 英雄竞技场段位解锁 2023-08-03 18:08:02 +08:00
xiekaidong
410cc6b903 优化显示逻辑 2023-08-02 18:47:41 +08:00
xiekaidong
dfb2714266 更新配置 2023-07-31 16:28:15 +08:00
xiekaidong
b74826ee90 更新配置 2023-07-27 10:28:08 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
Fang
aa45c8bbf2 编译 2023-07-25 20:18:47 +08:00
xiekaidong
97708c861a 更新配置 2023-07-25 16:50:58 +08:00
xiekaidong
a3ab8f74fa 副本引导 2023-07-24 17:10:59 +08:00
xiekaidong
b1bb2f0302 处理界面显示 2023-07-24 10:36:45 +08:00
xiekaidong
5cb6ae349b 优化技能的释放位置逻辑 2023-07-21 15:36:27 +08:00
xiekaidong
70591027b2 更新配置,英雄排序问题 2023-07-21 11:47:26 +08:00
Fang
f01c611d72 导表 2023-07-20 19:35:17 +08:00
xiekaidong
61336e5d6c 编译lua 2023-07-19 20:24:13 +08:00
xiekaidong
b620281b43 更新配置和优化 2023-07-17 17:21:20 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
cdf3186a61 设置界面新增社区链接按钮 2023-07-11 15:46:31 +08:00
Fang
1d337ed62f 显示修复 2023-07-05 15:56:46 +08:00
Fang
0767c6eae5 编译 2023-07-05 15:04:42 +08:00
xiekaidong
c3789374c6 更新配置 2023-07-04 15:38:28 +08:00
Fang
c4dabad5c5 编译 2023-07-03 14:16:50 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
chenxi
cf3e9051f8 编译 2023-06-20 19:58:29 +08:00
xiekaidong
8a358a1604 更新配置 2023-06-20 15:30:04 +08:00
Fang
491599bf1a 导表 2023-06-20 11:44:52 +08:00
chenxi
3791c54170 ab name 2023-06-16 21:55:12 +08:00
chenxi
c3fdacbef8 编译 2023-06-16 21:34:55 +08:00
xiekaidong
da555bd8f3 怪物经验可配置根据血量的分段经验 2023-06-16 18:44:43 +08:00
chenxi
f3b3a3f117 更新配置 2023-06-16 12:05:53 +08:00
xiekaidong
fe19b35f7d 更新配置 2023-06-16 10:09:59 +08:00
xiekaidong
a3a9ac1fb7 连携提示 2023-06-14 18:21:48 +08:00
chenxi
25c4dcd4bd 编译 2023-06-13 14:38:38 +08:00
xiekaidong
de0b2828a7 新的肉鸽机制-改变effect概率 2023-06-13 11:11:46 +08:00
xiekaidong
8f63807099 更新配置 2023-06-05 15:54:49 +08:00
chenxi
cdd9d6183b 更新配置 2023-06-05 10:08:06 +08:00
xiekaidong
e4d84563f9 先更新一下格子 2023-06-02 16:54:59 +08:00
chenxi
59cfb77e28 账号删除 2023-05-31 17:54:31 +08:00
xiekaidong
179f1279e4 更新配置 2023-05-31 09:34:42 +08:00
chenxi
e6e294b949 七天乐 2023-05-30 22:23:55 +08:00
xiekaidong
b031fe8a9b 更新配置 2023-05-30 21:30:41 +08:00
chenxi
a58c63a617 ab name 2023-05-30 21:15:29 +08:00
chenxi
e8a737bec6 基金展示 2023-05-30 17:24:34 +08:00
xiekaidong
cd99e669cb 更新配置 2023-05-30 15:08:30 +08:00