up

kbengine · kbengine · commit 7790284b4501 · 2014-08-19T15:43:47.000+08:00
diff --git a/kbe/src/lib/helper/debug_helper.cpp b/kbe/src/lib/helper/debug_helper.cpp
@@ -280,11 +280,6 @@ void DebugHelper::clearBufferedLog(bool destroy)
 		Mercury::Bundle::ObjPool().reclaimObject(bufferedLogPackets_);
 	}
 
-#ifdef NO_USE_LOG4CXX
-#else
-	LOG4CXX_WARN(g_logger, "DebugHelper::clearBufferedLog()\n");
-#endif
-
 	Mercury::g_trace_packet = v;
 
 	hasBufferedLogPackets_ = 0;
diff --git a/kbe/src/server/loginapp/loginapp.cpp b/kbe/src/server/loginapp/loginapp.cpp
@@ -989,6 +989,18 @@ void Loginapp::onVersionNotMatch(Mercury::Channel* pChannel)
 	Mercury::Bundle::ObjPool().reclaimObject(pBundle);
 }
 
+//-------------------------------------------------------------------------------------
+void Loginapp::onScriptVersionNotMatch(Mercury::Channel* pChannel)
+{
+	Mercury::Bundle* pBundle = Mercury::Bundle::ObjPool().createObject();
+	
+	pBundle->newMessage(ClientInterface::onScriptVersionNotMatch);
+	(*pBundle) << KBEVersion::scriptVersionString();
+	(*pBundle).send(getNetworkInterface(), pChannel);
+
+	Mercury::Bundle::ObjPool().reclaimObject(pBundle);
+}
+
 //-------------------------------------------------------------------------------------
 void Loginapp::importClientMessages(Mercury::Channel* pChannel)
 {
diff --git a/kbe/src/server/loginapp/loginapp.hpp b/kbe/src/server/loginapp/loginapp.hpp
@@ -167,6 +167,9 @@ class Loginapp :	public ServerApp,
 	// ����汾��ƥ��
 	virtual void onVersionNotMatch(Mercury::Channel* pChannel);
 
+	// ����ű���汾��ƥ��
+	virtual void onScriptVersionNotMatch(Mercury::Channel* pChannel);
+
 	/** ����ӿ�
 		baseappͬ���Լ��ĳ�ʼ����Ϣ
 		startGlobalOrder: ȫ������˳�� �������ֲ�ͬ���

-Original file line number
+Diff line change
 	// 引擎版本不匹配
 	virtual void onVersionNotMatch(Mercury::Channel* pChannel);
 +	// 引擎脚本层版本不匹配
 +	virtual void onScriptVersionNotMatch(Mercury::Channel* pChannel);
++
 	/** 网络接口
 		baseapp同步自己的初始化信息
 		startGlobalOrder: 全局启动顺序 包括各种不同组件