puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_unity/Assets/lua/app/ui
History
xiekaidong 83b8dbe82d Merge branch 'dev' into arena 
# Conflicts:
#	Assets/arts/atlas/ui/common.spriteatlas
#	Assets/lua/app/common/bi_report.lua.bytes
#	Assets/lua/app/common/data_manager.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/module/chapter/chapter_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
#	Assets/lua/app/userdata/hero/hero_data.lua.bytes
#	Assets/proto/protocol.bytes
2023-07-04 15:33:45 +08:00
..
activity
金猪倒计时
2023-06-13 12:00:06 +08:00
arena
fix
2023-07-04 15:15:36 +08:00
battle
fix
2023-07-04 15:15:36 +08:00
bounty
竞技场敌方自动战斗
2023-06-29 20:52:39 +08:00
commerce
更新配置
2023-06-16 10:09:59 +08:00
common
完善细节
2023-07-03 18:35:49 +08:00
currency_bar
bug修复
2023-06-30 17:54:39 +08:00
daily_challenge
每日挑战任务完成情况上报
2023-06-15 17:30:49 +08:00
dungeon
bug修复
2023-06-30 17:54:39 +08:00
fund
更新配置
2023-06-16 10:09:59 +08:00
game_setting
客服红点
2023-07-04 10:42:37 +08:00
gm
竞技场敌方自动战斗
2023-06-29 20:52:39 +08:00
hero
竞技场敌方自动战斗
2023-06-29 20:52:39 +08:00
idle
编译
2023-06-08 21:38:54 +08:00
loading
编译
2023-06-06 12:01:23 +08:00
mail
界面调整
2023-06-16 17:36:57 +08:00
main_city
fix
2023-07-04 15:15:36 +08:00
player
音效
2023-06-06 11:09:18 +08:00
player_info
更新配置
2023-06-20 21:03:38 +08:00
shop
竞技场弹窗礼包
2023-07-03 20:02:46 +08:00
task
更新配置
2023-06-16 10:09:59 +08:00
tips
编译
2023-07-03 14:16:50 +08:00
tutorial
简单处理一下引导
2023-04-24 20:27:22 +08:00
activity.meta
整理项目
2023-04-03 11:04:31 +08:00
arena.meta
竞技场敌方自动战斗
2023-06-29 20:52:39 +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_info.meta
头像昵称
2023-06-19 10:57:28 +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-16 10:09:59 +08:00
ui_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00