puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_lua/lua/app/ui
History
xiekaidong d311ea14aa Merge branch 'master' into dev_20230815 
# Conflicts:
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board.lua
#	lua/app/config/grid_type.lua
#	lua/app/config/strings/cn/avatar.lua
#	lua/app/config/strings/cn/avatar_frame.lua
#	lua/app/config/strings/en/avatar.lua
#	lua/app/config/strings/en/avatar_frame.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/avatar.lua
#	lua/app/config/strings/es/avatar_frame.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/id/avatar.lua
#	lua/app/config/strings/id/avatar_frame.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/avatar.lua
#	lua/app/config/strings/ja/avatar_frame.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ko/avatar.lua
#	lua/app/config/strings/ko/avatar_frame.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/avatar.lua
#	lua/app/config/strings/pt/avatar_frame.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/th/avatar.lua
#	lua/app/config/strings/th/avatar_frame.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/avatar.lua
#	lua/app/config/strings/vi/avatar_frame.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/avatar.lua
#	lua/app/config/strings/zh/avatar_frame.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/summon.lua
#	lua/app/module/battle/component/battle_unit_comp.lua
#	lua/app/module/battle/team/battle_team.lua
2023-08-10 09:39:07 +08:00
..
activity
金猪
2023-08-09 10:21:13 +08:00
arena
日志上报
2023-08-03 14:20:16 +08:00
battle
新机制
2023-08-08 16:37:57 +08:00
bounty
日志上报
2023-08-03 14:20:16 +08:00
collection
皮肤收集不需要帮助按钮
2023-08-09 16:47:03 +08:00
commerce
一些界面响应安卓返回键
2023-06-15 22:02:38 +08:00
common
Merge branch 'master' into dev_20230815
2023-08-10 09:39:07 +08:00
currency_bar
ui动画、结算界面逻辑
2023-06-30 16:50:50 +08:00
daily_challenge
每日挑战任务完成情况上报
2023-06-15 17:30:08 +08:00
dungeon
材料本扫荡后次数刷新不及时fix
2023-08-09 09:52:28 +08:00
dungeon_armor
bug修复
2023-08-09 10:26:20 +08:00
dungeon_weapon
宝箱日志上报
2023-08-07 15:33:06 +08:00
fund
日志上报
2023-08-03 14:20:16 +08:00
game_setting
韩国社区跳转处理
2023-07-25 16:06:04 +08:00
gm
增加gm
2023-07-31 14:11:25 +08:00
hero
皮肤功能
2023-08-09 14:16:27 +08:00
idle
挂机界面1分钟拉一次
2023-06-07 16:49:09 +08:00
loading
loading
2023-06-06 11:59:36 +08:00
mail
邮件容错
2023-06-16 16:59:54 +08:00
main_city
皮肤功能
2023-08-09 14:16:27 +08:00
player
音效
2023-06-06 11:08:37 +08:00
player_info
道具获取的头像品质颜色错误fix
2023-08-01 17:12:39 +08:00
shop
礼包界面展示冲突处理
2023-08-04 15:56:54 +08:00
task
一些界面响应安卓返回键
2023-06-15 22:02:38 +08:00
tips
bug修复
2023-08-03 16:53:47 +08:00
tutorial
竞技场引导问题修复
2023-07-10 15:22:20 +08:00
activity.meta
整理代码
2023-04-03 10:59:13 +08:00
arena.meta
竞技场战令
2023-06-26 11:26:28 +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
collect.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
collection.meta
英雄图鉴
2023-07-14 17:07:03 +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
daily_challenge.meta
每日挑战战斗界面
2023-05-26 15:43:01 +08:00
dungeon_armor.meta
支线副本
2023-07-20 17:41:42 +08:00
dungeon_weapon.meta
武器副本的一些界面
2023-07-19 16:52:28 +08:00
dungeon.meta
活动副本
2023-06-12 15:39:52 +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_info.meta
头像昵称功能
2023-06-19 10:57:39 +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
Merge branch 'dev_20230809' into dev_20230815
2023-08-08 15:58:56 +08:00
ui_manager.lua.meta
整理代码
2023-04-03 10:59:13 +08:00