Merge pull request #14 from jay602/1.x

safekill后bots报错 #1180

scripts/bots/Avatar.py

@@ -59,6 +59,9 @@ def onBecomePlayer( self ):
 		当这个entity被引擎定义为角色时被调用
 		"""
 		DEBUG_MSG("%s::onBecomePlayer: %i" % (self.__class__.__name__, self.id))
+
+	def onBecomeNonPlayer(self):
+		DEBUG_MSG("%s::onBecomeNonPlayer: %i" % (self.__class__.__name__, self.id))
 
 	def onJump(self):
 		"""
@@ -79,6 +82,7 @@ def __init__(self):
 		self.testType = random.randint(0, 2) # 测试类别， 0：随机移动， 1：找目标攻击， 2：测试传送
 		self.changeTestTypeTime = time.time()
 		self.spawnPosition = Math.Vector3( self.position )
+		self.cbID = 0
 
 	def onBecomePlayer( self ):
 		"""
@@ -91,7 +95,10 @@ def onBecomePlayer( self ):
 		# 这里手动进行初始化一下
 		self.__init__()
 
-		KBEngine.callback(1, self.update)
+		self.cbID = KBEngine.callback(1, self.update)
+
+	def onBecomeNonPlayer(self):
+		KBEngine.cancelCallback(self.cbID)
 
 	def onEnterSpace(self):
 		"""
@@ -186,7 +193,7 @@ def update(self):
 		if self.isDestroyed:
 			return
 
-		KBEngine.callback(1, self.update)
+		self.cbID = KBEngine.callback(1, self.update)
 
 		# 如果自己已经死亡了，那么延时一下复活
 		if self.isState(GlobalDefine.ENTITY_STATE_DEAD):