From 0465ffb11445d8138d6090f0d7894cabd1e7b857 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 28 Jun 2023 15:52:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/equipment/modelEquipment.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go
index 65b439e22..a584c747c 100644
--- a/modules/equipment/modelEquipment.go
+++ b/modules/equipment/modelEquipment.go
@@ -132,7 +132,8 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma
 				}
 			}
 		} else {
-			err = fmt.Errorf("cfg.Game_equipment not found equip id %s", k)
+			//err = fmt.Errorf("cfg.Game_equipment not found equip id %s", k)  // 太多地方配置无效装备 这地方暂时只打印错误日志
+			this.module.Errorf("cfg.Game_equipment not found equip id %s", k)
 		}
 	}
 

From 24eda001281efdc441caa6402154b1f0c2a3f832 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Wed, 28 Jun 2023 16:09:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AB=9E=E6=8A=80=E5=9C=BA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/arena/api_info.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/arena/api_info.go b/modules/arena/api_info.go
index 1722c7d9e..799dde2f7 100644
--- a/modules/arena/api_info.go
+++ b/modules/arena/api_info.go
@@ -71,6 +71,8 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
 		}
 	} else {
 		info.Lv = user.Lv
+		info.Name = user.Name
+		info.Avatar = user.Avatar
 		this.module.modelArena.recoverTicket(session, info)
 		if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
 			errdata = &pb.ErrorData{