diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index 185df8d7..b4ec370c 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -83,9 +83,7 @@ void Android::GiveEquip() void Android::SetAiLevel(int ai_level) { if (ai) { - if (room->GetRoomMode() == kChiJiMode) { - ((AndroidAI*)ai)->SetAiLevel(ai_level); - } + ((AndroidAI*)ai)->SetAiLevel(ai_level); } } diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 5e4a1b3f..7a406ef0 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1340,6 +1340,7 @@ void Room::UpdateGasInactivePve() ClearPostBattleAutoFreeList(); OnBattleStart(); NotifyGameStart(); + InitAndroidAI(); } void Room::UpdateGasWaiting() diff --git a/server/tools/robot/virtualclient/new_robot.py b/server/tools/robot/virtualclient/new_robot.py index 9d51c41c..c9f03976 100644 --- a/server/tools/robot/virtualclient/new_robot.py +++ b/server/tools/robot/virtualclient/new_robot.py @@ -23,10 +23,10 @@ def main(): help = "account info") (options, args) = parser.parse_args() - ws_url = args if args else 'ws://192.168.100.21:7501/websocket' + ws_url = args if args else 'ws://192.168.100.21:7601/websocket?server_id=2' accounts = options.accounts.split(',') accounts = [] - for i in range(5): + for i in range(1): accounts.append('test' + str(i)) for account in accounts: ioloop.IOLoop.current().spawn_callback(createVirtualClient, account, ws_url) diff --git a/server/tools/robot/virtualclient/simulate.py b/server/tools/robot/virtualclient/simulate.py index 126b6d33..049a7e2d 100644 --- a/server/tools/robot/virtualclient/simulate.py +++ b/server/tools/robot/virtualclient/simulate.py @@ -177,7 +177,7 @@ class Simulate(object): buff = self.getBuffByUniId(entity, pb_buff.buff_uniid) if buff: entity.buff_list.remove(buff) - entity.buff_list.append(pb_buff) + #entity.buff_list.append(pb_buff) def _entityRemoveBuff(self, entity, pb_buff): buff = self.getBuffByUniId(entity, pb_buff.buff_uniid) diff --git a/server/tools/robot/virtualclient/virtualclient.py b/server/tools/robot/virtualclient/virtualclient.py index fe001e3f..1701705f 100644 --- a/server/tools/robot/virtualclient/virtualclient.py +++ b/server/tools/robot/virtualclient/virtualclient.py @@ -75,6 +75,14 @@ class VirtualClient(object): msg.server_id = 2 msg.account_id = self.account #msg.baseskin = 14001 + msg.team_uuid = '10000' + msg.show_team_ui = 1 + msg.auto_fill = 1 + msg.team_mode = 1 + member = msg.team_members.add() + member.account_id = self.account + member.rank = 1 + msg.pve_instance_id = 10001 self.sendMsg(conn, msg) def parsePacket(self, conn, recv_buf):