miduo_client/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +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_JinJieYuLan.lua 神将 2023-08-11 19:03:48 +08:00
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 Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
GeneralBigPopup_WishDraw.lua.meta
GeneralBigPopup_WishEquipDraw.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
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
GeneralBigPopup_YuJianLastResult.lua.meta