puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_unity/Assets/lua/app/ui
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
金猪倒计时
2023-06-13 12:00:06 +08:00
battle
Merge branch 'dev' into fang/dungeon
2023-06-14 11:42:03 +08:00
bounty
编译
2023-06-06 17:51:48 +08:00
commerce
增加棋盘查看字段
2023-06-05 21:08:16 +08:00
common
界面处理
2023-06-13 10:20:17 +08:00
currency_bar
编译
2023-06-03 23:29:48 +08:00
daily_challenge
编译
2023-06-05 10:43:13 +08:00
dungeon
Merge branch 'dev' into fang/dungeon
2023-06-14 11:42:03 +08:00
fund
编译
2023-06-06 17:51:48 +08:00
game_setting
cdkey临时界面
2023-06-13 20:54:29 +08:00
gm
编译lua
2023-06-06 15:06:56 +08:00
hero
英雄升级特效
2023-06-13 18:50:19 +08:00
idle
编译
2023-06-08 21:38:54 +08:00
loading
编译
2023-06-06 12:01:23 +08:00
mail
编译
2023-06-08 21:38:54 +08:00
main_city
Merge branch 'dev' into fang/dungeon
2023-06-14 11:42:03 +08:00
player
音效
2023-06-06 11:09:18 +08:00
shop
merge
2023-06-13 10:45:07 +08:00
task
merge
2023-06-13 10:45:07 +08:00
tips
编译
2023-06-05 19:43:50 +08:00
tutorial
简单处理一下引导
2023-04-24 20:27:22 +08:00
activity.meta
整理项目
2023-04-03 11:04:31 +08:00
base_sub_ui.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
base_sub_ui.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
base_ui.lua.bytes
通用技能tips
2023-05-22 16:38:42 +08:00
base_ui.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
battle.meta
整理项目
2023-04-03 11:04:31 +08:00
bounty.meta
编译lua
2023-05-12 20:30:10 +08:00
commerce.meta
购买体力
2023-05-09 14:54:14 +08:00
common.meta
整理项目
2023-04-03 11:04:31 +08:00
currency_bar.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
fund.meta
基金界面
2023-05-24 19:26:13 +08:00
game_setting.meta
整理项目
2023-04-03 11:04:31 +08:00
gm.meta
删除多余的
2023-05-08 20:08:45 +08:00
hero.meta
整理项目
2023-04-03 11:04:31 +08:00
idle.meta
整理项目
2023-04-03 11:04:31 +08:00
loading.meta
整理项目
2023-04-03 11:04:31 +08:00
mail.meta
更新资源
2023-05-19 20:00:57 +08:00
main_city.meta
整理项目
2023-04-03 11:04:31 +08:00
player.meta
通用技能tips
2023-05-22 16:38:42 +08:00
shop.meta
编译
2023-05-12 21:08:02 +08:00
task.meta
任务
2023-05-09 17:42:07 +08:00
tips.meta
整理项目
2023-04-03 11:04:31 +08:00
tutorial.meta
整理项目
2023-04-03 11:04:31 +08:00
ui_manager.lua.bytes
编译
2023-06-08 21:38:54 +08:00
ui_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00