puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_lua/lua/app/ui
History
chenxi 189faa4701 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 
# Conflicts:
#	lua/app/config/buff_daily_challenge.lua.meta
#	lua/app/config/chapter_board_daily_challenge.lua.meta
#	lua/app/config/chapter_daily_challenge.lua.meta
#	lua/app/config/monster_daily_challenge.lua.meta
#	lua/app/config/strings/cn/buff_daily_challenge.lua.meta
#	lua/app/config/strings/cn/task_daily_challenge.lua.meta
#	lua/app/config/strings/de/buff_daily_challenge.lua.meta
#	lua/app/config/strings/de/task_daily_challenge.lua.meta
#	lua/app/config/strings/en/buff_daily_challenge.lua.meta
#	lua/app/config/strings/en/task_daily_challenge.lua.meta
#	lua/app/config/strings/fr/buff_daily_challenge.lua.meta
#	lua/app/config/strings/fr/task_daily_challenge.lua.meta
#	lua/app/config/strings/id/buff_daily_challenge.lua.meta
#	lua/app/config/strings/id/task_daily_challenge.lua.meta
#	lua/app/config/strings/ja/buff_daily_challenge.lua.meta
#	lua/app/config/strings/ja/task_daily_challenge.lua.meta
#	lua/app/config/strings/ko/buff_daily_challenge.lua.meta
#	lua/app/config/strings/ko/task_daily_challenge.lua.meta
#	lua/app/config/strings/pt/buff_daily_challenge.lua.meta
#	lua/app/config/strings/pt/task_daily_challenge.lua.meta
#	lua/app/config/strings/ru/buff_daily_challenge.lua.meta
#	lua/app/config/strings/ru/task_daily_challenge.lua.meta
#	lua/app/config/strings/th/buff_daily_challenge.lua.meta
#	lua/app/config/strings/th/task_daily_challenge.lua.meta
#	lua/app/config/strings/vi/buff_daily_challenge.lua.meta
#	lua/app/config/strings/vi/task_daily_challenge.lua.meta
#	lua/app/config/strings/zh/buff_daily_challenge.lua.meta
#	lua/app/config/strings/zh/task_daily_challenge.lua.meta
#	lua/app/config/task_daily_challenge.lua.meta
2023-05-25 17:06:46 +08:00
..
activity
金猪和邮件
2023-05-23 17:02:14 +08:00
battle
技能刷新接入联网
2023-05-24 10:01:36 +08:00
bounty
邮件
2023-05-22 21:23:07 +08:00
commerce
玩家数据跨天重置
2023-05-24 21:45:00 +08:00
common
邮件
2023-05-22 21:23:07 +08:00
currency_bar
购买体力
2023-05-09 14:52:36 +08:00
fund
紧急
2023-05-25 17:05:55 +08:00
game_setting
空邮件的表现
2023-05-22 12:00:39 +08:00
gm
gm命令
2023-05-08 11:17:18 +08:00
hero
修改英雄界面
2023-05-23 19:02:30 +08:00
idle
玩家升级界面
2023-05-22 16:22:26 +08:00
loading
整理代码
2023-04-03 10:59:13 +08:00
mail
金猪和邮件
2023-05-23 17:02:14 +08:00
main_city
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
2023-05-25 17:06:46 +08:00
player
金猪和邮件
2023-05-23 17:02:14 +08:00
shop
金币礼包逻辑调整
2023-05-25 16:30:10 +08:00
task
任务红点
2023-05-19 21:23:06 +08:00
tips
技能tips
2023-05-22 15:59:17 +08:00
tutorial
简单处理一下引导
2023-04-24 20:27:02 +08:00
activity.meta
整理代码
2023-04-03 10:59:13 +08:00
base_sub_ui.lua
整理代码
2023-04-03 10:59:13 +08:00
base_sub_ui.lua.meta
整理代码
2023-04-03 10:59:13 +08:00
base_ui.lua
玩家升级界面
2023-05-22 16:22:26 +08:00
base_ui.lua.meta
整理代码
2023-04-03 10:59:13 +08:00
battle.meta
整理代码
2023-04-03 10:59:13 +08:00
bounty.meta
战令
2023-05-12 15:32:53 +08:00
commerce.meta
购买体力
2023-05-09 14:52:36 +08:00
common.meta
整理代码
2023-04-03 10:59:13 +08:00
currency_bar.meta
整理代码
2023-04-03 10:59:13 +08:00
fund.meta
基金
2023-05-24 19:19:34 +08:00
game_setting.meta
整理代码
2023-04-03 10:59:13 +08:00
gm.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
loading.meta
整理代码
2023-04-03 10:59:13 +08:00
mail.meta
购买体力和邮箱
2023-05-19 18:32:23 +08:00
main_city.meta
整理代码
2023-04-03 10:59:13 +08:00
player.meta
玩家升级界面
2023-05-22 16:22:26 +08:00
shop.meta
商城
2023-05-12 21:07:05 +08:00
task.meta
任务
2023-05-09 17:41:27 +08:00
tips.meta
整理代码
2023-04-03 10:59:13 +08:00
tutorial.meta
整理代码
2023-04-03 10:59:13 +08:00
ui_manager.lua
战令
2023-05-16 18:17:05 +08:00
ui_manager.lua.meta
整理代码
2023-04-03 10:59:13 +08:00