# Conflicts: # AssetBundles/version.txt # Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab # Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab # Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab # Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab # Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab # Assets/ManagedResources/~Lua/Common/GlobalDefine.lua # Assets/ManagedResources/~Lua/Common/functions.lua # Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua # Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua # Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua # Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua # Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua # Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua # Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua # Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua # Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua # Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua # Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua # Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua |
||
|---|---|---|
| .. | ||
| FourElementMonsterCampPanel.lua | ||
| FourElementMonsterCampPanel.lua.meta | ||
| GodsWayTowerPanel.lua | ||
| GodsWayTowerPanel.lua.meta | ||
| MonsterCampMainPanel.lua | ||
| MonsterCampMainPanel.lua.meta | ||
| MonsterCampManager.lua | ||
| MonsterCampManager.lua.meta | ||
| MonsterCampNewPanel.lua | ||
| MonsterCampNewPanel.lua.meta | ||
| MonsterCampPanel.lua | ||
| MonsterCampPanel.lua.meta | ||