miduo_client/Assets/ManagedResources/~Lua/Modules/GeneralPanel
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
..
View Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu 2024-10-11 16:36:50 +08:00
View2
View3
ArenaNewRankRewardPanel.lua
ArenaNewRankRewardPanel.lua.meta
ArenaNewRewardPanel.lua
ArenaNewRewardPanel.lua.meta
AttriTips.lua
AttriTips.lua.meta
CongratulationPopup.lua
CongratulationPopup.lua.meta
GeneralBigPopup.lua
GeneralBigPopup.lua.meta
GeneralInfoPopup.lua
GeneralInfoPopup.lua.meta
GeneralRankRewardPanel.lua
GeneralRankRewardPanel.lua.meta
GeneralSizeFitterPopup.lua
GeneralSizeFitterPopup.lua.meta
GeneralSizeFitterPopup_ExploreSelectFormation.lua
GeneralSizeFitterPopup_ExploreSelectFormation.lua.meta
GeneralSizeFitterPopup_OneKeyExplore.lua
GeneralSizeFitterPopup_OneKeyExplore.lua.meta
GeneralTreasureMangaer.lua
GeneralTreasureMangaer.lua.meta
GeneralTreasurePanel.lua
GeneralTreasurePanel.lua.meta
View.meta
View2.meta
View3.meta