puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_unity/Assets/lua/app/userdata
History
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
..
activity
grideffect=6的处理
2023-06-13 15:08:42 +08:00
bag
编译
2023-05-26 12:52:15 +08:00
battle
技能音效
2023-06-13 17:44:37 +08:00
bounty
编译
2023-06-06 18:22:26 +08:00
chapter
挂机
2023-05-17 22:28:55 +08:00
daily_challenge
界面处理
2023-06-13 10:20:17 +08:00
dungeon
Merge branch 'dev' into fang/dungeon
2023-06-14 11:42:03 +08:00
formation
编译
2023-06-08 21:38:54 +08:00
fund
ab name
2023-05-30 21:15:29 +08:00
game_setting
编译
2023-04-23 10:28:01 +08:00
hero
编译
2023-06-08 21:38:54 +08:00
idle
boss入场动画
2023-05-22 20:32:26 +08:00
mail
邮箱加一个开启限制
2023-05-30 18:18:56 +08:00
player
编译
2023-06-08 21:38:54 +08:00
shop
merge
2023-06-13 10:45:07 +08:00
summon
编译
2023-06-01 10:23:11 +08:00
task
ab name
2023-05-30 21:15:29 +08:00
tutorial
联网
2023-05-08 11:03:17 +08:00
activity.meta
整理项目
2023-04-03 11:04:31 +08:00
bag.meta
整理项目
2023-04-03 11:04:31 +08:00
base_data.lua.bytes
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
2023-04-07 15:27:09 +08:00
base_data.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
battle.meta
整理项目
2023-04-03 11:04:31 +08:00
bounty.meta
整理项目
2023-04-03 11:04:31 +08:00
chapter.meta
整理项目
2023-04-03 11:04:31 +08:00
daily_challenge.meta
每日挑战
2023-05-30 11:45:27 +08:00
dungeon.meta
界面处理
2023-06-13 10:20:17 +08:00
formation.meta
修复一些报错
2023-04-11 20:33:59 +08:00
fund.meta
基金界面
2023-05-24 19:26:13 +08:00
game_setting.meta
整理项目
2023-04-03 11:04:31 +08:00
hero.meta
整理项目
2023-04-03 11:04:31 +08:00
idle.meta
挂机
2023-05-17 22:28:55 +08:00
mail.meta
更新资源
2023-05-19 20:00:57 +08:00
player.meta
整理项目
2023-04-03 11:04:31 +08:00
shop.meta
编译
2023-05-23 14:20:32 +08:00
summon.meta
格挡动作表现、反击界面表现
2023-05-23 16:40:45 +08:00
task.meta
任务
2023-05-09 17:42:07 +08:00
tutorial.meta
整理项目
2023-04-03 11:04:31 +08:00