From 9b7cafb97bdac2f5dbf734ee72e41c20df531c31 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 26 May 2022 19:09:48 +0800
Subject: [PATCH 1/5] 1

---
 server/gameserver/hero.ai.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/hero.ai.cc b/server/gameserver/hero.ai.cc
index fb67c2cf..f31ecc7c 100644
--- a/server/gameserver/hero.ai.cc
+++ b/server/gameserver/hero.ai.cc
@@ -582,7 +582,8 @@ RoomObstacle* HeroAI::FindObstacleTarget()
         myself->room->xtimer.AddDeadLineTimerAndAttach
             (
              SERVER_FRAME_RATE * 2,
-             a8::XParams(),
+             a8::XParams()
+             .SetSender(target),
              [] (const a8::XParams& param)
              {
                  RoomObstacle* obstacle = (RoomObstacle*)param.sender.GetUserData();

From 19c89ce3d65f6ca234248aadf752f37f357c62a1 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 26 May 2022 19:14:40 +0800
Subject: [PATCH 2/5] 1

---
 server/gameserver/hero.cc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/server/gameserver/hero.cc b/server/gameserver/hero.cc
index 84679ca9..ef316422 100644
--- a/server/gameserver/hero.cc
+++ b/server/gameserver/hero.cc
@@ -285,7 +285,18 @@ void Hero::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
 void Hero::OnAddToTargetPartObject(Entity* target)
 {
     if (delete_frameno > 0) {
+        #if 1
+        a8::UdpLog::Instance()->Warning
+            ("Hero::OnAddToTargetPartObject "
+             "dead_frameno:%d  "
+             "room.frameno:%d",
+             {
+                 dead_frameno,
+                     room->GetFrameNo()
+             });
+        #else
         A8_ABORT();
+        #endif
     }
 }
 

From c2911d2f85f5fc0162e3c2b5c4ff1e3c1a45eedc Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 26 May 2022 19:44:51 +0800
Subject: [PATCH 3/5] 1

---
 server/gameserver/hero.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/hero.cc b/server/gameserver/hero.cc
index ef316422..3e1eeaa4 100644
--- a/server/gameserver/hero.cc
+++ b/server/gameserver/hero.cc
@@ -288,10 +288,10 @@ void Hero::OnAddToTargetPartObject(Entity* target)
         #if 1
         a8::UdpLog::Instance()->Warning
             ("Hero::OnAddToTargetPartObject "
-             "dead_frameno:%d  "
+             "delete_frameno:%d  "
              "room.frameno:%d",
              {
-                 dead_frameno,
+                 delete_frameno,
                      room->GetFrameNo()
              });
         #else

From 00c5c72a0a8c3c907fae64ba0bc7c4335e6ba45c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 27 May 2022 12:52:49 +0800
Subject: [PATCH 4/5] 1

---
 server/gameserver/matchteam.cc         | 1 +
 server/tools/protobuild/cs_proto.proto | 1 +
 2 files changed, 2 insertions(+)

diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index b5137462..c69d4ad4 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -122,6 +122,7 @@ void MatchTeam::_CMMatchChoose(f8::MsgHdr& hdr, const cs::CMMatchChoose& msg)
     auto member = GetMemberBySocket(hdr.socket_handle);
     if (member && master_team_->phase_ == kMatchChoose) {
         member->msg->set_hero_id(msg.hero_id());
+        member->msg->set_hero_uniid(msg.hero_uniid());
         *member->msg->mutable_weapons() = msg.weapons();
         *member->msg->mutable_skins() = msg.skins();
         *member->msg->mutable_skill_list() = msg.skill_list();
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 068703e1..67ab9ae6 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -1151,6 +1151,7 @@ message CMMatchChoose
     repeated MFPair skill_list = 4; //技能列表 key:技能id value:预留给之后扩展,目前传0就行
     repeated int32 baseskin = 5; //皮肤id
     optional int32 hero_skin = 6; //头像框
+    optional string hero_uniid = 7; //英雄唯一id
 }
 
 //组队匹配-出击

From 24bd5206fc0879f01f322a656949a54f9b1c0c92 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 27 May 2022 15:27:45 +0800
Subject: [PATCH 5/5] 1

---
 server/tools/protobuild/out/cs_proto.proto  |  1 +
 server/tools/protobuild/out/metatable.proto | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/server/tools/protobuild/out/cs_proto.proto b/server/tools/protobuild/out/cs_proto.proto
index 123f18ba..58326b22 100644
--- a/server/tools/protobuild/out/cs_proto.proto
+++ b/server/tools/protobuild/out/cs_proto.proto
@@ -916,6 +916,7 @@ message CMMatchChoose
     repeated MFPair skill_list = 4; 
     repeated int32 baseskin = 5; 
     optional int32 hero_skin = 6; 
+    optional string hero_uniid = 7; 
 }
 
 message CMMatchStartGame
diff --git a/server/tools/protobuild/out/metatable.proto b/server/tools/protobuild/out/metatable.proto
index 881b0eeb..04dd1313 100644
--- a/server/tools/protobuild/out/metatable.proto
+++ b/server/tools/protobuild/out/metatable.proto
@@ -126,6 +126,7 @@ message Item
     optional int32 skinid = 6;
     optional int32 isdefaultskin = 7;
     optional int32 playerid = 8;
+    optional int32 relationship = 9;
 }
 
 message Equip
@@ -428,6 +429,20 @@ message GunTalentGrow
     optional string addattr = 5;
 }
 
+message HeroQuality
+{
+    optional int32 id = 1;
+    optional int32 quality = 2;
+    optional int32 gold_limit = 3;
+}
+
+message GunQuality
+{
+    optional int32 id = 1;
+    optional int32 quality = 2;
+    optional int32 gold_limit = 3;
+}
+
 
 message DoorObjJson
 {