miduo_client/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View
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
..
GeneralBigPopup_ExpertRewardSortPanel.lua
GeneralBigPopup_ExpertRewardSortPanel.lua.meta
GeneralBigPopup_FourElementHelpFight.lua
GeneralBigPopup_FourElementHelpFight.lua.meta
GeneralBigPopup_GemCompound.lua
GeneralBigPopup_GemCompound.lua.meta
GeneralBigPopup_GodPrintUp.lua
GeneralBigPopup_GodPrintUp.lua.meta
GeneralBigPopup_IncarnationDes.lua
GeneralBigPopup_IncarnationDes.lua.meta
GeneralBigPopup_IncarnationDes2.lua
GeneralBigPopup_IncarnationDes2.lua.meta
GeneralBigPopup_JinJieYuLan.lua
GeneralBigPopup_JinJieYuLan.lua.meta
GeneralBigPopup_LingMaiRecord.lua
GeneralBigPopup_LingMaiRecord.lua.meta
GeneralBigPopup_PracticeStatePreview.lua
GeneralBigPopup_PracticeStatePreview.lua.meta
GeneralBigPopup_QiJieTreasure.lua
GeneralBigPopup_QiJieTreasure.lua.meta
GeneralBigPopup_RecrutDetail.lua
GeneralBigPopup_RecrutDetail.lua.meta
GeneralBigPopup_RoleGodSoulUp.lua
GeneralBigPopup_RoleGodSoulUp.lua.meta
GeneralBigPopup_SelectGem.lua
GeneralBigPopup_SelectGem.lua.meta
GeneralBigPopup_ShenYingShuXing.lua
GeneralBigPopup_ShenYingShuXing.lua.meta
GeneralBigPopup_ShenhunDes.lua
GeneralBigPopup_ShenhunDes.lua.meta
GeneralBigPopup_WishDraw.lua
GeneralBigPopup_WishDraw.lua.meta
GeneralBigPopup_WishEquipDraw.lua
GeneralBigPopup_WishEquipDraw.lua.meta
GeneralBigPopup_WishTailsmanSoulChip.lua
GeneralBigPopup_WishTailsmanSoulChip.lua.meta
GeneralBigPopup_WuJinShuXing.lua
GeneralBigPopup_WuJinShuXing.lua.meta
GeneralBigPopup_XiuXingSelectHero.lua
GeneralBigPopup_XiuXingSelectHero.lua.meta
GeneralBigPopup_XunBaoMiZong.lua
GeneralBigPopup_XunBaoMiZong.lua.meta
GeneralBigPopup_YiJingBaoKu.lua
GeneralBigPopup_YiJingBaoKu.lua.meta
GeneralBigPopup_YiJingBaoKuRewardPreview.lua
GeneralBigPopup_YiJingBaoKuRewardPreview.lua.meta
GeneralBigPopup_YuJianBet.lua
GeneralBigPopup_YuJianBet.lua.meta
GeneralBigPopup_YuJianLastResult.lua 【御剑行】跨期修改 2021-10-22 16:47:30 +08:00
GeneralBigPopup_YuJianLastResult.lua.meta