Fang 98206fea34 Merge branch 'dev' into fang/dungeon ...

# Conflicts:
#	lua/app/config/avatar.lua.meta
#	lua/app/config/avatar_frame.lua.meta
#	lua/app/config/skill.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/avatar.lua.meta
#	lua/app/config/strings/cn/avatar_frame.lua.meta
#	lua/app/config/strings/cn/hero.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/avatar.lua.meta
#	lua/app/config/strings/de/avatar_frame.lua.meta
#	lua/app/config/strings/en/avatar.lua.meta
#	lua/app/config/strings/en/avatar_frame.lua.meta
#	lua/app/config/strings/fr/avatar.lua.meta
#	lua/app/config/strings/fr/avatar_frame.lua.meta
#	lua/app/config/strings/id/avatar.lua.meta
#	lua/app/config/strings/id/avatar_frame.lua.meta
#	lua/app/config/strings/ja/avatar.lua.meta
#	lua/app/config/strings/ja/avatar_frame.lua.meta
#	lua/app/config/strings/ko/avatar.lua.meta
#	lua/app/config/strings/ko/avatar_frame.lua.meta
#	lua/app/config/strings/pt/avatar.lua.meta
#	lua/app/config/strings/pt/avatar_frame.lua.meta
#	lua/app/config/strings/ru/avatar.lua.meta
#	lua/app/config/strings/ru/avatar_frame.lua.meta
#	lua/app/config/strings/th/avatar.lua.meta
#	lua/app/config/strings/th/avatar_frame.lua.meta
#	lua/app/config/strings/vi/avatar.lua.meta
#	lua/app/config/strings/vi/avatar_frame.lua.meta
#	lua/app/config/strings/zh/avatar.lua.meta
#	lua/app/config/strings/zh/avatar_frame.lua.meta

2023-06-14 11:41:12 +08:00

..

act_sevenday_quest.lua

七天乐

2023-05-26 11:39:23 +08:00

act_sevenday_quest.lua.meta

七天乐

2023-05-26 11:39:23 +08:00

avatar_frame.lua

ui资源补充替换

2023-06-13 16:16:18 +08:00

avatar_frame.lua.meta

ui资源补充替换

2023-06-13 16:16:18 +08:00

avatar.lua

ui资源补充替换

2023-06-13 16:16:18 +08:00

avatar.lua.meta

ui资源补充替换

2023-06-13 16:16:18 +08:00

buff_daily_challenge.lua

先更新一下格子

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

buff_daily_challenge.lua.meta

紧急

2023-05-25 17:05:55 +08:00

buff.lua

更新配置

2023-05-31 09:34:19 +08:00

buff.lua.meta

更新配置

2023-04-19 20:05:47 +08:00

chapter.lua

ui资源补充替换

2023-06-13 16:16:18 +08:00

chapter.lua.meta

章节

2023-04-07 20:50:11 +08:00

func_open.lua

bug修复

2023-05-31 18:06:16 +08:00

func_open.lua.meta

禁锢

2023-05-26 18:08:05 +08:00

global.lua

体力恢复

2023-04-24 21:20:55 +08:00

global.lua.meta

整理代码

2023-04-03 10:59:13 +08:00

hero.lua

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

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

hero.lua.meta

章节

2023-04-07 20:50:11 +08:00

item.lua

ui资源补充替换

2023-06-13 16:16:18 +08:00

item.lua.meta

整理代码

2023-04-03 10:59:13 +08:00

monster_base.lua

基金显示模型

2023-05-30 17:22:42 +08:00

monster_base.lua.meta

boss入场动画

2023-05-22 20:29:25 +08:00

skill_rogue.lua

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

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

skill_rogue.lua.meta

章节

2023-04-07 20:50:11 +08:00

skill.lua

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

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

skill.lua.meta

移动攻击表现

2023-04-12 23:10:22 +08:00

task_daily_challenge.lua

紧急

2023-05-25 17:05:55 +08:00

task_daily_challenge.lua.meta

紧急

2023-05-25 17:05:55 +08:00