puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_lua/lua/app/module
History
xiekaidong aacf7bc803 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 
# Conflicts:
#	lua/app/config/buff.lua.meta
#	lua/app/config/chapter.lua
#	lua/app/config/chapter.lua.meta
#	lua/app/config/hero.lua.meta
#	lua/app/config/hero_level.lua
#	lua/app/config/hero_level.lua.meta
#	lua/app/config/skill_hero.lua
#	lua/app/config/skill_hero.lua.meta
#	lua/app/config/strings/cn/chapter.lua.meta
#	lua/app/config/strings/cn/hero.lua.meta
#	lua/app/config/strings/cn/skill_hero.lua.meta
#	lua/app/config/strings/de/chapter.lua.meta
#	lua/app/config/strings/de/hero.lua.meta
#	lua/app/config/strings/de/skill_hero.lua.meta
#	lua/app/config/strings/en/chapter.lua.meta
#	lua/app/config/strings/en/hero.lua.meta
#	lua/app/config/strings/en/skill_hero.lua.meta
#	lua/app/config/strings/fr/chapter.lua.meta
#	lua/app/config/strings/fr/hero.lua.meta
#	lua/app/config/strings/fr/skill_hero.lua.meta
#	lua/app/config/strings/id/chapter.lua.meta
#	lua/app/config/strings/id/hero.lua.meta
#	lua/app/config/strings/id/skill_hero.lua.meta
#	lua/app/config/strings/ja/chapter.lua.meta
#	lua/app/config/strings/ja/hero.lua.meta
#	lua/app/config/strings/ja/skill_hero.lua.meta
#	lua/app/config/strings/ko/chapter.lua.meta
#	lua/app/config/strings/ko/hero.lua.meta
#	lua/app/config/strings/ko/skill_hero.lua.meta
#	lua/app/config/strings/pt/chapter.lua.meta
#	lua/app/config/strings/pt/hero.lua.meta
#	lua/app/config/strings/pt/skill_hero.lua.meta
#	lua/app/config/strings/ru/chapter.lua.meta
#	lua/app/config/strings/ru/hero.lua.meta
#	lua/app/config/strings/ru/skill_hero.lua.meta
#	lua/app/config/strings/th/chapter.lua.meta
#	lua/app/config/strings/th/hero.lua.meta
#	lua/app/config/strings/th/skill_hero.lua.meta
#	lua/app/config/strings/vi/chapter.lua.meta
#	lua/app/config/strings/vi/hero.lua.meta
#	lua/app/config/strings/vi/skill_hero.lua.meta
#	lua/app/config/strings/zh/chapter.lua.meta
#	lua/app/config/strings/zh/hero.lua.meta
#	lua/app/config/strings/zh/skill_hero.lua.meta
2023-04-10 09:58:58 +08:00
..
battle
代码提交
2023-04-10 09:58:43 +08:00
character_fsm
棋盘
2023-04-06 10:38:04 +08:00
gm
整理代码
2023-04-03 10:59:13 +08:00
item
棋盘
2023-04-06 10:38:04 +08:00
loading
整理代码
2023-04-03 10:59:13 +08:00
login
数据处理
2023-04-07 22:23:00 +08:00
maincity
整理一下
2023-04-07 15:22:56 +08:00
stage
整理一下
2023-04-07 15:22:56 +08:00
task
整理代码
2023-04-03 10:59:13 +08:00
tips
整理一下
2023-04-07 15:22:56 +08:00
tutorial
整理代码
2023-04-03 10:59:13 +08:00
activity.meta
整理代码
2023-04-03 10:59:13 +08:00
adventure.meta
整理代码
2023-04-03 10:59:13 +08:00
arena_manager.meta
整理代码
2023-04-03 10:59:13 +08:00
base_module.lua
整理一下
2023-04-07 15:22:56 +08:00
base_module.lua.meta
整理代码
2023-04-03 10:59:13 +08:00
battle.meta
整理代码
2023-04-03 10:59:13 +08:00
blessing.meta
整理代码
2023-04-03 10:59:13 +08:00
bounty.meta
整理代码
2023-04-03 10:59:13 +08:00
chapter.meta
整理代码
2023-04-03 10:59:13 +08:00
character_fsm.meta
整理代码
2023-04-03 10:59:13 +08:00
collection.meta
整理代码
2023-04-03 10:59:13 +08:00
commerce.meta
整理代码
2023-04-03 10:59:13 +08:00
daily_gift.meta
整理代码
2023-04-03 10:59:13 +08:00
dungeon.meta
整理代码
2023-04-03 10:59:13 +08:00
equip.meta
整理代码
2023-04-03 10:59:13 +08:00
game_setting.meta
整理代码
2023-04-03 10:59:13 +08:00
gm.meta
整理代码
2023-04-03 10:59:13 +08:00
grow_fund.meta
整理代码
2023-04-03 10:59:13 +08:00
hang_up.meta
整理代码
2023-04-03 10:59:13 +08:00
hero.meta
整理代码
2023-04-03 10:59:13 +08:00
idle.meta
整理代码
2023-04-03 10:59:13 +08:00
item.meta
整理代码
2023-04-03 10:59:13 +08:00
jewelry.meta
整理代码
2023-04-03 10:59:13 +08:00
loading.meta
整理代码
2023-04-03 10:59:13 +08:00
login.meta
整理代码
2023-04-03 10:59:13 +08:00
mail.meta
整理代码
2023-04-03 10:59:13 +08:00
maincity.meta
整理代码
2023-04-03 10:59:13 +08:00
mall.meta
整理代码
2023-04-03 10:59:13 +08:00
mastery.meta
整理代码
2023-04-03 10:59:13 +08:00
mining.meta
整理代码
2023-04-03 10:59:13 +08:00
player.meta
整理代码
2023-04-03 10:59:13 +08:00
server.meta
整理代码
2023-04-03 10:59:13 +08:00
signin.meta
整理代码
2023-04-03 10:59:13 +08:00
stage.meta
整理代码
2023-04-03 10:59:13 +08:00
storage.meta
整理代码
2023-04-03 10:59:13 +08:00
summon.meta
整理代码
2023-04-03 10:59:13 +08:00
task.meta
整理代码
2023-04-03 10:59:13 +08:00
tips.meta
整理代码
2023-04-03 10:59:13 +08:00
tower.meta
整理代码
2023-04-03 10:59:13 +08:00
train.meta
整理代码
2023-04-03 10:59:13 +08:00
tutorial.meta
整理代码
2023-04-03 10:59:13 +08:00