xiekaidong 3b61c03934 Merge branch 'dev_20230809' into dev_20230815 ...

# Conflicts:
#	Assets/lua/app/common/local_data.lua.bytes
#	Assets/lua/app/config/act_gift.lua.bytes
#	Assets/lua/app/config/arena_rank.lua.bytes
#	Assets/lua/app/config/chapter_board.lua.bytes
#	Assets/lua/app/config/const.lua.bytes
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/cn/buff.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/config/strings/cn/item.lua.bytes
#	Assets/lua/app/config/strings/de/item.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/es/item.lua.bytes
#	Assets/lua/app/config/strings/fr/item.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ja/skill.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/ru/item.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/config/strings/zh/skill.lua.bytes
#	Assets/lua/app/global/global_func.lua.bytes
#	Assets/lua/app/module/arena/arena_manager.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
#	Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
#	Assets/lua/app/module/equip/equip_manager.lua.bytes
#	Assets/lua/app/module/shop/shop_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/lua/app/ui/battle/battle_base_ui.lua.bytes
#	Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
#	Assets/lua/app/ui/ui_manager.lua.bytes
#	Assets/proto/protocol.bytes

2023-08-08 15:59:22 +08:00

..

base_cell.lua.bytes

Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev

2023-04-07 15:27:09 +08:00

base_cell.lua.bytes.meta

整理项目

2023-04-03 11:04:31 +08:00

equip_cell.lua.bytes

整理项目

2023-04-03 11:04:31 +08:00

equip_cell.lua.bytes.meta

整理项目

2023-04-03 11:04:31 +08:00

hero_cell.lua.bytes

英雄竞技场段位解锁

2023-08-03 18:08:02 +08:00

hero_cell.lua.bytes.meta

资源处理和ab name

2023-04-21 22:55:50 +08:00

item_cell.lua.bytes

英雄icon大小

2023-06-02 21:04:03 +08:00

item_cell.lua.bytes.meta

整理项目

2023-04-03 11:04:31 +08:00

large_hero_cell.lua.bytes

竞技场敌方自动战斗

2023-06-29 20:52:39 +08:00

large_hero_cell.lua.bytes.meta

资源处理和ab name

2023-04-21 22:55:50 +08:00

player_head_cell.lua.bytes

道具获取的头像品质颜色错误fix

2023-08-01 10:28:55 +08:00

player_head_cell.lua.bytes.meta

ab name

2023-06-20 14:32:36 +08:00

player_info_cell.lua.bytes

添加头像、头像框道具解锁逻辑

2023-07-07 11:05:29 +08:00

player_info_cell.lua.bytes.meta

出包前得资源检查和设置abName

2023-07-07 16:04:44 +08:00

player_record_cell.lua.bytes

英雄属性bug修复，查看其他玩家信息时带入装备信息

2023-07-22 18:16:26 +08:00

player_record_cell.lua.bytes.meta

设置adName

2023-07-25 22:15:06 +08:00

reward_cell.lua.bytes

装备升级材料获取

2023-07-21 09:51:28 +08:00

reward_cell.lua.bytes.meta

整理项目

2023-04-03 11:04:31 +08:00