# Conflicts: # Assets/ManagedResources/~Lua/Common/GlobalDefine.lua # Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua # Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua # Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua # data_execl/base_data/GlobalActivity.xlsx # data_execl/base_data/GlobalSystemConfig.xlsx # data_execl/base_data/ItemConfig.xlsx # data_execl/base_data/RechargeCommodityConfig.xlsx # data_execl/base_data/SpecialConfig.xlsx |
||
|---|---|---|
| .. | ||
| Language_data | ||
| Map_data | ||
| base_data | ||
| excelTool | ||
| skill_debug | ||