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	新图标	2023-08-15 17:03:19 +08:00
FastExploreInfoPopup.lua	Merge branch 'dev_oneDis' into onepiece_demo	2023-08-29 17:58:24 +08:00
FastExploreInfoPopup.lua.meta	…
FightAreaRewardFullPopup.lua	…
FightAreaRewardFullPopup.lua.meta	…
FightAreaRewardPopup.lua	…
FightAreaRewardPopup.lua.meta	…
FightEndLvUpPanel.lua	…
FightEndLvUpPanel.lua.meta	…
FightLevelSwitchPopup.lua	…
FightLevelSwitchPopup.lua.meta	…
FightManager.lua	…
FightManager.lua.meta	…
FightMiddleChoosePanel.lua	…
FightMiddleChoosePanel.lua.meta	…
FightMopUpEndPanel.lua	…
FightMopUpEndPanel.lua.meta	…
FightPointPassMainPanel.lua	…
FightPointPassMainPanel.lua.meta	…
FightPointPassManager.lua	…
FightPointPassManager.lua.meta	…
FightPointPassRankPopup.lua	…
FightPointPassRankPopup.lua.meta	…
FightSelectAreaShowMopUpPanel.lua	…
FightSelectAreaShowMopUpPanel.lua.meta	…
FightSmallChoosePanel.lua	…
FightSmallChoosePanel.lua.meta	…
View.meta	…