Fang ee97ab1c93 Merge branch 'dev' into fang/dungeon ...

# Conflicts:
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/skill.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/global.lua.bytes
#	Assets/lua/app/config/strings/en/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/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/global.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/module/battle/battle_const.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes

2023-06-14 11:42:03 +08:00

..

act_sevenday_quest.lua.bytes

编译

2023-05-26 12:52:15 +08:00

act_sevenday_quest.lua.bytes.meta

ab name

2023-05-30 21:15:29 +08:00

avatar_frame.lua.bytes

编译

2023-06-13 14:38:38 +08:00

avatar_frame.lua.bytes.meta

编译

2023-06-13 14:38:38 +08:00

avatar.lua.bytes

编译

2023-06-13 14:38:38 +08:00

avatar.lua.bytes.meta

编译

2023-06-13 14:38:38 +08:00

buff_daily_challenge.lua.bytes

先更新一下格子

2023-06-02 16:54:59 +08:00

buff_daily_challenge.lua.bytes.meta

ab name

2023-05-30 21:15:29 +08:00

buff.lua.bytes

每日挑战不显示每日buff信息

2023-06-12 09:47:25 +08:00

buff.lua.bytes.meta

资源处理和ab name

2023-04-21 22:55:50 +08:00

chapter.lua.bytes

新的肉鸽机制-改变effect概率

2023-06-13 11:11:46 +08:00

chapter.lua.bytes.meta

资源处理和ab name

2023-04-21 22:55:50 +08:00

func_open.lua.bytes

账号删除

2023-05-31 17:54:31 +08:00

func_open.lua.bytes.meta

ab name

2023-05-30 21:15:29 +08:00

global.lua.bytes

技能音效

2023-06-13 17:44:37 +08:00

global.lua.bytes.meta

整理项目

2023-04-03 11:04:31 +08:00

hero.lua.bytes

Merge branch 'dev' into fang/dungeon

2023-06-14 11:42:03 +08:00

hero.lua.bytes.meta

资源处理和ab name

2023-04-21 22:55:50 +08:00

item.lua.bytes

Merge branch 'dev' into fang/dungeon

2023-06-14 11:42:03 +08:00

item.lua.bytes.meta

整理项目

2023-04-03 11:04:31 +08:00

mail.lua.bytes

更新配置

2023-06-05 15:54:49 +08:00

mail.lua.bytes.meta

boss入场动画

2023-05-22 20:32:26 +08:00

monster_base.lua.bytes

基金展示

2023-05-30 17:24:34 +08:00

monster_base.lua.bytes.meta

boss入场动画

2023-05-22 20:32:26 +08:00

skill_rogue.lua.bytes

新的肉鸽机制-改变effect概率

2023-06-13 11:11:46 +08:00

skill_rogue.lua.bytes.meta

资源处理和ab name

2023-04-21 22:55:50 +08:00

skill.lua.bytes

新的肉鸽机制-改变effect概率

2023-06-13 11:11:46 +08:00

skill.lua.bytes.meta

资源处理和ab name

2023-04-21 22:55:50 +08:00

task_daily_challenge.lua.bytes

编译

2023-06-06 18:44:31 +08:00

task_daily_challenge.lua.bytes.meta

ab name

2023-05-30 21:15:29 +08:00

task.lua.bytes

一些技能机制

2023-05-11 19:19:06 +08:00

task.lua.bytes.meta

boss入场动画

2023-05-22 20:32:26 +08:00

tutorial.lua.bytes

更新配置

2023-06-05 10:08:06 +08:00

tutorial.lua.bytes.meta

ab name

2023-04-24 21:58:09 +08:00