Merge branch 'main' of http://100.88.157.105:8999/kubbo/chuanqi-server-instance
This commit is contained in:
@@ -72,12 +72,15 @@
|
||||
--#include "data/config/YYPlatform/YYMemberConfig.config" once
|
||||
--#include "data/config/YYPlatform/YYVIPConfig.config" once
|
||||
--#include "data/config/YYPlatform/GameVIPConfig.config" once
|
||||
<<<<<<< HEAD
|
||||
--#include "data/config/PlatformQQ/PlatformQQ.config" once --qq
|
||||
--#include "data/config/PlatformQQ/LoginQQ.config" once --qq
|
||||
--#include "data/config/PlatformQQ/BlueDiamondDaily.config" once --qq
|
||||
--#include "data/config/PlatformQQ/LevelBlueDiamond.config" once --qq
|
||||
|
||||
|
||||
=======
|
||||
>>>>>>> 44b47592110f16529c84a75e24c63ade008fbd02
|
||||
|
||||
-- 套装
|
||||
--#include "data/config/SuitConfig.config" once
|
||||
|
||||
Reference in New Issue
Block a user