miduo_client/Assets/ManagedResources/~Lua/Modules/GeneralPanel
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
..
View Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
View2 七界特权描述修改 2022-11-07 15:06:33 +08:00
View3
AttriTips.lua
AttriTips.lua.meta
CongratulationPopup.lua
CongratulationPopup.lua.meta
GeneralBigPopup.lua 心愿法宝弹窗修改 2023-06-06 16:50:56 +08:00
GeneralBigPopup.lua.meta
GeneralInfoPopup.lua Merge branch 'china/dev' into 0功能/家园 2022-01-06 16:40:24 +08:00
GeneralInfoPopup.lua.meta
GeneralRankRewardPanel.lua 排行奖励切换奖励显示不正确修改 2021-11-24 07:24:17 +08:00
GeneralRankRewardPanel.lua.meta
GeneralSizeFitterPopup.lua 探索优化提交 2021-12-30 13:27:57 +08:00
GeneralSizeFitterPopup.lua.meta 探索提交 2021-12-23 13:09:34 +08:00
GeneralSizeFitterPopup_ExploreSelectFormation.lua [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
GeneralSizeFitterPopup_ExploreSelectFormation.lua.meta 探索提交 2021-12-23 13:09:34 +08:00
GeneralSizeFitterPopup_OneKeyExplore.lua [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
GeneralSizeFitterPopup_OneKeyExplore.lua.meta 探索提交 2021-12-23 13:09:34 +08:00
GeneralTreasureMangaer.lua 【七界试炼】提交 2021-09-24 19:23:30 +08:00
GeneralTreasureMangaer.lua.meta 【七界试炼】提交 2021-09-13 18:06:39 +08:00
GeneralTreasurePanel.lua [全民福利]=====提交 2022-09-15 16:48:56 +08:00
GeneralTreasurePanel.lua.meta 【七界试炼】提交 2021-09-13 18:06:39 +08:00
View.meta
View2.meta
View3.meta