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 四海历练助战修改 2024-02-29 18:19:57 +08:00
GeneralBigPopup_FourElementHelpFight.lua.meta
GeneralBigPopup_GemCompound.lua
GeneralBigPopup_GemCompound.lua.meta
GeneralBigPopup_GodPrintUp.lua 神印修改提交 2024-01-02 16:58:06 +08:00
GeneralBigPopup_GodPrintUp.lua.meta
GeneralBigPopup_IncarnationDes.lua
GeneralBigPopup_IncarnationDes.lua.meta
GeneralBigPopup_IncarnationDes2.lua 羁绊功能修改 2024-01-02 10:54:50 +08:00
GeneralBigPopup_IncarnationDes2.lua.meta 羁绊功能修改 2024-01-02 10:54:50 +08:00
GeneralBigPopup_JinJieYuLan.lua 战斗技能名称显示修改 2023-12-04 14:22:53 +08:00
GeneralBigPopup_JinJieYuLan.lua.meta
GeneralBigPopup_LingMaiRecord.lua 名称替换 2023-12-07 00:09:44 +08:00
GeneralBigPopup_LingMaiRecord.lua.meta
GeneralBigPopup_PracticeStatePreview.lua no message 2024-05-20 19:35:38 +08:00
GeneralBigPopup_PracticeStatePreview.lua.meta
GeneralBigPopup_QiJieTreasure.lua 七界页面修改 2024-06-29 17:28:51 +08:00
GeneralBigPopup_QiJieTreasure.lua.meta
GeneralBigPopup_RecrutDetail.lua 霸气修改为界神技 2024-09-12 18:55:11 +08:00
GeneralBigPopup_RecrutDetail.lua.meta
GeneralBigPopup_RoleGodSoulUp.lua 名称替换 2023-12-07 00:09:44 +08:00
GeneralBigPopup_RoleGodSoulUp.lua.meta
GeneralBigPopup_SelectGem.lua 图鉴预设修改提交 2024-01-20 14:21:47 +08:00
GeneralBigPopup_SelectGem.lua.meta
GeneralBigPopup_ShenYingShuXing.lua
GeneralBigPopup_ShenYingShuXing.lua.meta
GeneralBigPopup_ShenhunDes.lua
GeneralBigPopup_ShenhunDes.lua.meta
GeneralBigPopup_WishDraw.lua 心愿抽卡修改 2024-05-24 15:14:47 +08:00
GeneralBigPopup_WishDraw.lua.meta
GeneralBigPopup_WishEquipDraw.lua 生命卡修改为意念 预设修改 2024-09-12 18:34:47 +08:00
GeneralBigPopup_WishEquipDraw.lua.meta
GeneralBigPopup_WishTailsmanSoulChip.lua 法宝改成生命卡 2023-12-08 21:57:53 +08:00
GeneralBigPopup_WishTailsmanSoulChip.lua.meta
GeneralBigPopup_WuJinShuXing.lua
GeneralBigPopup_WuJinShuXing.lua.meta
GeneralBigPopup_XiuXingSelectHero.lua 更换名称 2023-12-07 01:11:27 +08:00
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