From 6961b82f4132c3433549638661f7e3358cafac3d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 25 Jun 2019 13:23:58 +0800
Subject: [PATCH] 1

---
 server/gameserver/gamelog.cc           | 1 +
 server/gameserver/human.h              | 1 +
 server/gameserver/playermgr.cc         | 5 +++++
 server/tools/protobuild/cs_proto.proto | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/server/gameserver/gamelog.cc b/server/gameserver/gamelog.cc
index ce89556..9e9fa21 100644
--- a/server/gameserver/gamelog.cc
+++ b/server/gameserver/gamelog.cc
@@ -54,6 +54,7 @@ void GameLog::GameEnd(Player* hum)
     prop->SetVal("account_register_date", a8::TimestampToDateTime(hum->account_registertime));
     prop->SetVal("game_uniid", a8::XValue(hum->room->room_uuid).GetString());
     //prop->SetVal("game_param", "");
+    prop->SetVal("game_gold", hum->stats.gold);
     prop->SetVal("game_score", hum->stats.score);
     prop->SetVal("nickname", hum->name);
     //prop->SetVal("localuuid", "");
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index fb2e361..e010b36 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -38,6 +38,7 @@ class Human : public Entity
     long ip_saddr = 0;
     int team_id = 0;
     std::string account_id;
+    std::string session_id;
     std::string from_appid;
     std::string team_uuid;
     int account_registertime = 0;
diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc
index 09b7158..f6932b9 100644
--- a/server/gameserver/playermgr.cc
+++ b/server/gameserver/playermgr.cc
@@ -5,6 +5,8 @@
 #include "cs_proto.pb.h"
 #include "room.h"
 
+#include "framework/cpp/utils.h"
+
 void PlayerMgr::Init()
 {
 }
@@ -39,6 +41,8 @@ Player* PlayerMgr::CreatePlayerByCMJoin(long ip_saddr, int socket, const cs::CMJ
     hum->socket_handle = socket;
     hum->ip_saddr = ip_saddr;
     hum->account_id = msg.account_id();
+    hum->session_id = msg.session_id();
+    hum->from_appid = msg.from_appid();
     hum->name = msg.name();
     hum->health = 0;
     hum->team_uuid = msg.team_uuid();
@@ -49,6 +53,7 @@ Player* PlayerMgr::CreatePlayerByCMJoin(long ip_saddr, int socket, const cs::CMJ
     hum->avatar_url = msg.avatar_url();
     hum->energy_shield = msg.energy_shield();
     hum->create_tick = a8::XGetTickCount();
+    hum->account_registertime = f8::ExtractRegisterTimeFromSessionId(msg.session_id());
     for (auto& weapon : msg.weapons()) {
         if (weapon.weapon_id() != 0 && weapon.weapon_lv() > 0) {
             hum->weapon_configs[weapon.weapon_id()] = weapon.weapon_lv();
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 87b931a..44c3994 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -597,6 +597,8 @@ message CMJoin
     repeated MFWeapon weapons = 17; //武器列表
     repeated MFSkin skins = 18; //皮肤列表 key: 皮肤id value:皮肤等级
     repeated int32 prepare_items = 19; //战斗前准备道具 战前准备护盾存到energy_shield
+    optional string session_id = 20; //session_id
+    optional string from_appid = 21; //from_appid
 }
 
 //移动