miduo_client/Assets/ManagedResources/Icon
zhangjiannan 19484d6b62 Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Icon/Haizeiskill.meta
#	Assets/ManagedResources/Icons/luofu_huobi_1.png
#	Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_2.png
#	Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_3.png
#	Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_4.png
#	Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
#	Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
#	Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
2024-10-11 16:36:50 +08:00
..
ArtFont 删除老版英雄头像 2024-02-07 16:31:58 +08:00
Box 添加图标修改预设 2024-09-11 21:25:45 +08:00
ChengHao 称号修改 2024-01-29 23:03:32 +08:00
Gem
Haizeiskill Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu 2024-10-11 16:36:50 +08:00
Hero Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu 2024-10-11 16:36:50 +08:00
Item Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu 2024-10-11 16:36:50 +08:00
LinshiSkill 【天蓬】图标 2023-05-16 11:49:23 +08:00
Pokemon 修改神龙图片和预设 2024-09-11 22:10:01 +08:00
SkillIcon 修改技能图标 2024-01-25 19:26:18 +08:00
ZuoQi
ArtFont.meta 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
Box.meta 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
ChengHao.meta 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
Gem.meta 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
Haizeiskill.meta 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
Hero.meta 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
Item.meta 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
LinshiSkill.meta 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
Pokemon.meta 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
SkillIcon.meta 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
ZuoQi.meta 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00