From 03f450866d0bd17261b2fd6316f7826eca3dd764 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 2 Aug 2024 11:37:47 +0800
Subject: [PATCH] 1

---
 server/gameserver/android.cc           | 10 +++++++++-
 server/gameserver/framemaker.cc        |  3 ++-
 server/gameserver/netdata.cc           |  7 +++++++
 server/gameserver/pbutils.cc           |  1 +
 server/tools/protobuild/cs_proto.proto |  1 +
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc
index 8e066cd4..2cc8a682 100644
--- a/server/gameserver/android.cc
+++ b/server/gameserver/android.cc
@@ -45,7 +45,7 @@ void Android::Initialize()
 {
     Human::Initialize();
     account_id = a8::Format("0000_2006_%d", {robot_meta->id()});
-    RandSkin();
+    //RandSkin();
     GiveEquip();
     RecalcBaseAttr();
     SetInfiniteBulletMode();
@@ -63,6 +63,7 @@ void Android::Initialize()
              );
         GetNetData()->Init(this);
     }
+    RandSkin();
     SetHP(GetNetData()->GetMaxHP());
     SetMaxHP(GetHP());
     {
@@ -176,6 +177,13 @@ void Android::GiveEquip()
 
 void Android::RandSkin()
 {
+#ifdef MYDEBUG
+    {
+        Skin& skin = skins[0];
+        skin.skin_id = 1 + meta->skinlist();
+        skin.skin_lv = 1;
+    }
+#endif
     #if 0
     if (!robot_meta->_skin_id.empty()) {
         Skin& skin = skins[0];
diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc
index 81342440..7753575d 100644
--- a/server/gameserver/framemaker.cc
+++ b/server/gameserver/framemaker.cc
@@ -15,6 +15,7 @@
 #include "sandtable.h"
 #include "stats.h"
 #include "ingamevoice.h"
+#include "netdata.h"
 
 #include "mt/AirLine.h"
 #include "mt/Hero.h"
@@ -636,7 +637,7 @@ void FrameMaker::SerializeVoices(cs::SMUpdate* msg, Room* room, Human* hum, Fram
                     p->mutable_kill_info()->set_dead_uniid(hum->GetUniId());
                     p->mutable_kill_info()->set_dead_name(hum->GetName());
                     p->mutable_kill_info()->set_dead_hero_id(hum->GetHeroMeta()->id());
-                    p->mutable_skin_id()->set_dead_hero_id(hum->GetNetData()->GetSkinId());
+                    p->mutable_kill_info()->set_dead_skin_id(hum->GetNetData()->GetSkinId());
                 }
             }
 #ifdef MYDEBUG
diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc
index 5828c627..a2499174 100644
--- a/server/gameserver/netdata.cc
+++ b/server/gameserver/netdata.cc
@@ -1076,6 +1076,13 @@ void BattleDataContext::Init(Creature* c)
     if (weapon2_ability_) {
         weapon2_ability_->Init(c);
     }
+#ifdef MYDEBUG
+    {
+        if (c->IsAndroid()) {
+            skin_id_ = 1 + c->GetHeroMeta()->skinlist();
+        }
+    }
+#endif
     if (skin_id_ && c->IsHuman()) {
         const mt::Item* item_meta = mt::Item::GetById(skin_id_);
         if (item_meta) {
diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 934df047..69a8e574 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -1094,6 +1094,7 @@ void Human::FillMFTeamMemberNew(cs::MFTeamMemberNew* p)
     p->set_hero_max_exp(GetHeroMaxExp());
     p->set_main_skill_cd(GetMainSkill()->GetLeftTime());
     p->set_main_skill_max_cd(GetMainSkill()->GetCd());
+    p->set_skin_id(GetNetData()->GetSkinId());
 }
 
 void Human::FillSMGameOver(cs::SMGameOver& msg)
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index a7342b42..c9616b32 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -765,6 +765,7 @@ message MFTeamMemberNew
     optional int32 hero_max_exp = 24; //hero max经验
     optional int32 main_skill_cd = 25 [default = 0]; //技能cd时间
     optional int32 main_skill_max_cd = 26 [default = 0]; //技能cd上限时间
+    optional int32 skin_id = 27 [default = 0]; //皮肤
 }
 
 //队伍数据-全量