puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_unity/Assets/lua/app/common
History
xiekaidong 977b3c8c91 Merge branch 'master' into dev_20230815 
# Conflicts:
#	Assets/lua/app/config/arena_bounty_level.lua.bytes
#	Assets/lua/app/config/arena_rank.lua.bytes
#	Assets/lua/app/config/avatar_frame.lua.bytes
#	Assets/lua/app/config/chapter.lua.bytes
#	Assets/lua/app/config/chapter_board.lua.bytes
#	Assets/lua/app/config/grid_type.lua.bytes
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/monster_chapter.lua.bytes
#	Assets/lua/app/config/monster_daily_challenge.lua.bytes
#	Assets/lua/app/config/monster_dungeon_armor.lua.bytes
#	Assets/lua/app/config/strings/cn/avatar.lua.bytes
#	Assets/lua/app/config/strings/cn/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/cn/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/en/avatar.lua.bytes
#	Assets/lua/app/config/strings/en/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/en/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/es/avatar.lua.bytes
#	Assets/lua/app/config/strings/es/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/es/item.lua.bytes
#	Assets/lua/app/config/strings/es/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/id/avatar.lua.bytes
#	Assets/lua/app/config/strings/id/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/id/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/ja/avatar.lua.bytes
#	Assets/lua/app/config/strings/ja/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ja/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/ko/avatar.lua.bytes
#	Assets/lua/app/config/strings/ko/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/ko/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/pt/avatar.lua.bytes
#	Assets/lua/app/config/strings/pt/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/pt/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/th/avatar.lua.bytes
#	Assets/lua/app/config/strings/th/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/th/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/vi/avatar.lua.bytes
#	Assets/lua/app/config/strings/vi/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/vi/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/zh/avatar.lua.bytes
#	Assets/lua/app/config/strings/zh/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/config/strings/zh/skill_rogue.lua.bytes
#	Assets/lua/app/config/summon.lua.bytes
#	Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
#	Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
#	Assets/lua/app/module/battle/team/battle_team.lua.bytes
#	Assets/lua/app/module/shop/shop_manager.lua.bytes
2023-08-10 09:38:07 +08:00
..
audio_manager.lua.bytes
添加音效
2023-08-01 11:11:29 +08:00
audio_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
bi_report.lua.bytes
新增上报
2023-08-07 18:15:55 +08:00
bi_report.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
camera_manager.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
camera_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
cell_manager.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
cell_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
config_manager.lua.bytes
编译lua
2023-07-19 20:24:13 +08:00
config_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
data_manager.lua.bytes
皮肤功能
2023-08-09 14:15:12 +08:00
data_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
device_helper.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
device_helper.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
dotween_manager.lua.bytes
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
2023-04-07 15:27:09 +08:00
dotween_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
effect_manager.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
effect_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
event_manager.lua.bytes
皮肤功能
2023-08-09 14:15:12 +08:00
event_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
font_manager.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
font_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
i18n_manager.lua.bytes
竞技场敌方自动战斗
2023-06-29 20:52:39 +08:00
i18n_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
local_data.lua.bytes
删除打印
2023-08-09 16:51:27 +08:00
local_data.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
logger.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
logger.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
model_manager.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
model_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
module_manager.lua.bytes
皮肤功能
2023-08-09 14:15:12 +08:00
module_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
pay_manager.lua.bytes
支线基金
2023-07-24 11:54:43 +08:00
pay_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
platform.lua.bytes
编译
2023-06-09 11:48:33 +08:00
platform.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
render_manager.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
render_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
resource_manager.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
resource_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
safe_area_manager.lua.bytes
刘海屏适配和伤害字层级
2023-04-26 21:19:52 +08:00
safe_area_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
scheduler_manager.lua.bytes
联网
2023-05-08 11:03:17 +08:00
scheduler_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
sdk_manager.lua.bytes
编译lua
2023-07-19 20:24:13 +08:00
sdk_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
sdk_pay_default_manager.lua.bytes
支付参数
2023-06-15 20:28:59 +08:00
sdk_pay_default_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
sdk_pay_google_manager.lua.bytes
google支付问题
2023-07-03 14:25:26 +08:00
sdk_pay_google_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
sdk_pay_ios_manager.lua.bytes
支付参数
2023-06-15 20:28:59 +08:00
sdk_pay_ios_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
server_push_manager.lua.bytes
新增上报
2023-08-07 18:15:55 +08:00
server_push_manager.lua.bytes.meta
删除多余的
2023-05-08 20:08:45 +08:00
spine_manager.lua.bytes
编译
2023-04-11 22:46:00 +08:00
spine_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
state_machine_manager.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
state_machine_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
texture_manager.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
texture_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
time.lua.bytes
更新配置和优化
2023-07-17 17:21:20 +08:00
time.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
uiprefab_manager.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
uiprefab_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
version_compatible.lua.bytes
节奏
2023-05-04 17:42:00 +08:00
version_compatible.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
webrequest_manager.lua.bytes
整理项目
2023-04-03 11:04:31 +08:00
webrequest_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
white_res_manager.lua.bytes
更新配置
2023-06-20 14:44:12 +08:00
white_res_manager.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00