125 Commits

Author SHA1 Message Date
Fang
ea1d84b065 编译 2023-08-15 11:37:54 +08:00
Fang
566ac2d369 容错、导表 2023-08-14 18:33:10 +08:00
Fang
0531830c75 配置更新 2023-08-14 14:44:04 +08:00
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
dff0b5b08a 更新配置 2023-08-08 11:44:40 +08:00
xiekaidong
dd1a91051a bug修复 2023-08-04 16:59:30 +08:00
Fang
e79f3ea767 装备材料副本扫荡排序修改 2023-08-04 10:53:22 +08:00
xiekaidong
3b182e56c5 英雄竞技场段位解锁 2023-08-03 18:08:02 +08:00
xiekaidong
8de4c3340b 武器副本增加体力消耗 2023-08-03 11:08:40 +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
Fang
a43ea6c7d7 编译 2023-07-26 16:15:13 +08:00
Fang
e31bf25fa3 装备红点、文案 2023-07-26 15:16:01 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
xiekaidong
2af5fb2301 资源检查,更新配置,编译lua,更新pb 2023-07-25 22:09:41 +08:00
Fang
aa45c8bbf2 编译 2023-07-25 20:18:47 +08:00
xiekaidong
97708c861a 更新配置 2023-07-25 16:50:58 +08:00
Fang
e7927efe57 编译 2023-07-25 15:45:24 +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
a19624ff92 更新配置 2023-07-12 14:58:26 +08:00
xiekaidong
cdf3186a61 设置界面新增社区链接按钮 2023-07-11 15:46:31 +08:00
xiekaidong
ae12ce4101 更新配置 2023-07-07 16:06:18 +08:00
Fang
951cfb2d92 成长礼包触发方式修改 2023-07-06 18:21:15 +08:00
xiekaidong
3b67015da8 bug修复 2023-07-06 17:42:19 +08:00
xiekaidong
a048f7d2d9 编译lua 2023-07-06 10:42:17 +08:00
Fang
1d337ed62f 显示修复 2023-07-05 15:56:46 +08:00
xiekaidong
29c5bb9021 更新配置 2023-07-05 15:36:23 +08:00
Fang
0767c6eae5 编译 2023-07-05 15:04:42 +08:00
Fang
48293f54c1 竞技场宝箱功能补全 2023-07-05 14:54:34 +08:00
xiekaidong
c3789374c6 更新配置 2023-07-04 15:38:28 +08:00
Fang
c4dabad5c5 编译 2023-07-03 14:16:50 +08:00
xiekaidong
f7c7f3ad27 bug修复 2023-06-30 17:54:39 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
chenxi
5f9898ee06 更新配置 2023-06-21 11:21:41 +08:00
xiekaidong
dfd66067ec 更新配置 2023-06-20 21:03:38 +08:00
chenxi
cf3e9051f8 编译 2023-06-20 19:58:29 +08:00