puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_lua/lua/app/config/strings
History
xiekaidong d311ea14aa Merge branch 'master' into dev_20230815 
# Conflicts:
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board.lua
#	lua/app/config/grid_type.lua
#	lua/app/config/strings/cn/avatar.lua
#	lua/app/config/strings/cn/avatar_frame.lua
#	lua/app/config/strings/en/avatar.lua
#	lua/app/config/strings/en/avatar_frame.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/avatar.lua
#	lua/app/config/strings/es/avatar_frame.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/id/avatar.lua
#	lua/app/config/strings/id/avatar_frame.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/avatar.lua
#	lua/app/config/strings/ja/avatar_frame.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ko/avatar.lua
#	lua/app/config/strings/ko/avatar_frame.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/avatar.lua
#	lua/app/config/strings/pt/avatar_frame.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/th/avatar.lua
#	lua/app/config/strings/th/avatar_frame.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/avatar.lua
#	lua/app/config/strings/vi/avatar_frame.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/avatar.lua
#	lua/app/config/strings/zh/avatar_frame.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/summon.lua
#	lua/app/module/battle/component/battle_unit_comp.lua
#	lua/app/module/battle/team/battle_team.lua
2023-08-10 09:39:07 +08:00
..
cn
Merge branch 'master' into dev_20230815
2023-08-10 09:39:07 +08:00
de
皮肤功能
2023-08-09 14:16:27 +08:00
en
Merge branch 'master' into dev_20230815
2023-08-10 09:39:07 +08:00
es
Merge branch 'master' into dev_20230815
2023-08-10 09:39:07 +08:00
fr
皮肤功能
2023-08-09 14:16:27 +08:00
id
Merge branch 'master' into dev_20230815
2023-08-10 09:39:07 +08:00
ja
Merge branch 'master' into dev_20230815
2023-08-10 09:39:07 +08:00
ko
Merge branch 'master' into dev_20230815
2023-08-10 09:39:07 +08:00
pt
Merge branch 'master' into dev_20230815
2023-08-10 09:39:07 +08:00
ru
皮肤功能
2023-08-09 14:16:27 +08:00
th
Merge branch 'master' into dev_20230815
2023-08-10 09:39:07 +08:00
vi
Merge branch 'master' into dev_20230815
2023-08-10 09:39:07 +08:00
zh
Merge branch 'master' into dev_20230815
2023-08-10 09:39:07 +08:00
cn.meta
整理代码
2023-04-03 10:59:13 +08:00
de.meta
整理代码
2023-04-03 10:59:13 +08:00
en.meta
整理代码
2023-04-03 10:59:13 +08:00
es.meta
更新配置
2023-06-16 10:09:20 +08:00
fr.meta
整理代码
2023-04-03 10:59:13 +08:00
id.meta
整理代码
2023-04-03 10:59:13 +08:00
ja.meta
整理代码
2023-04-03 10:59:13 +08:00
ko.meta
整理代码
2023-04-03 10:59:13 +08:00
pt.meta
整理代码
2023-04-03 10:59:13 +08:00
ru.meta
整理代码
2023-04-03 10:59:13 +08:00
th.meta
整理代码
2023-04-03 10:59:13 +08:00
vi.meta
整理代码
2023-04-03 10:59:13 +08:00
zh.meta
整理代码
2023-04-03 10:59:13 +08:00