# 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 |
||
---|---|---|
.. | ||
PayManager.lua | ||
PayManager.lua.meta |