puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_lua/lua/app/ui
History
xiekaidong 820a22b051 Merge branch 'dev_20230919' into limit_pvp 
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/data_manager.lua
#	lua/app/common/pay_manager.lua
#	lua/app/config/activity_pvp_board.lua.meta
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/monster_activity.lua
#	lua/app/config/monster_base.lua
#	lua/app/config/skill.lua
#	lua/app/config/skin.lua
#	lua/app/config/skin_skill.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/cn/skill_rogue.lua
#	lua/app/config/strings/cn/skin.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/de/skin.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/en/skin.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/es/skin.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/fr/skin.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/id/skin.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skin.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/ko/skin.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/pt/skin.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/ru/skin.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/th/skin.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/vi/skin.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skin.lua
#	lua/app/config/task_type.lua.meta
#	lua/app/global/global_const.lua
#	lua/app/module/battle/battle_const.lua
#	lua/app/module/battle/battle_manager.lua
2023-09-16 17:55:38 +08:00
..
activity
Merge branch 'dev_20230919' into limit_pvp
2023-09-16 17:55:38 +08:00
arena
新手14天乐
2023-09-01 15:35:19 +08:00
battle
Merge branch 'dev_20230919' into limit_pvp
2023-09-16 17:55:38 +08:00
bounty
新手14天乐
2023-09-01 15:35:19 +08:00
collection
段位奖励展示修改、添加收集标签红点
2023-08-24 18:09:23 +08:00
commerce
一些界面响应安卓返回键
2023-06-15 22:02:38 +08:00
common
review
2023-09-15 19:22:15 +08:00
currency_bar
符文副本
2023-09-11 20:01:55 +08:00
daily_challenge
资源处理
2023-09-06 18:47:55 +08:00
dungeon
符文副本主界面
2023-09-07 19:14:39 +08:00
dungeon_armor
资源处理
2023-09-06 18:47:55 +08:00
dungeon_rune
Merge branch 'dev_20230919' into limit_pvp
2023-09-16 17:55:38 +08:00
dungeon_weapon
装备副本界面添加礼包入口
2023-08-11 16:34:50 +08:00
fund
日志上报
2023-08-03 14:20:16 +08:00
game_setting
封号删除账号
2023-08-28 14:12:36 +08:00
gm
战令一键领取
2023-08-16 17:35:17 +08:00
hero
报错及显示fix
2023-09-14 11:04:24 +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
Merge branch 'dev_20230919' into limit_pvp
2023-09-16 17:55:38 +08:00
player
音效
2023-06-06 11:08:37 +08:00
player_info
道具获取的头像品质颜色错误fix
2023-08-01 10:28:22 +08:00
runes
bug fix
2023-09-12 18:43:13 +08:00
shop
圆月活动
2023-09-15 19:22:15 +08:00
task
每日任务宝箱动画
2023-08-28 18:56:20 +08:00
tips
圆月活动
2023-09-15 19:22:15 +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_rune.meta
符文副本主界面
2023-09-07 19:14:39 +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
runes.meta
符文功能
2023-09-12 10:35:46 +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
bug修复
2023-09-04 20:06:11 +08:00
ui_manager.lua.meta
整理代码
2023-04-03 10:59:13 +08:00