From ff5334445b4940d8d237092e3c5d71335f1b5b61 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Tue, 14 Mar 2023 10:08:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=98=E6=96=97=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/battle/modelBattle.go            | 2 ++
 modules/practice/api_gyminfo.go          | 2 +-
 modules/practice/api_npcbattklefinish.go | 7 ++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go
index d43caaa57..9f4c18d49 100644
--- a/modules/battle/modelBattle.go
+++ b/modules/battle/modelBattle.go
@@ -703,6 +703,7 @@ func (this *modelBattleComp) createBattleRole(hero *pb.DBHero, tid, pos int) (ro
 			role.SubSuitSkill = suit.Skill
 		}
 	}
+	role.Currhp = role.Property[comm.Hp]
 	return
 }
 
@@ -778,6 +779,7 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt
 					roles[i].Property[comm.Atk] = int32(float32(roles[i].Property[comm.Atk]) * v.Atkpro)
 					roles[i].Property[comm.Def] = int32(float32(roles[i].Property[comm.Def]) * v.Defpro)
 					roles[i].Property[comm.Speed] = monst.Speed
+					roles[i].Currhp = roles[i].Property[comm.Hp]
 				}
 			}
 		}
diff --git a/modules/practice/api_gyminfo.go b/modules/practice/api_gyminfo.go
index ab752e87b..3d6a09bc5 100644
--- a/modules/practice/api_gyminfo.go
+++ b/modules/practice/api_gyminfo.go
@@ -31,6 +31,6 @@ func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoR
 			"gymrefresh": room.Gymrefresh,
 		})
 	}
-	session.SendMsg(string(this.module.GetType()), "gymInfo", &pb.PracticeGymInfoResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh})
+	session.SendMsg(string(this.module.GetType()), "gyminfo", &pb.PracticeGymInfoResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh})
 	return
 }
diff --git a/modules/practice/api_npcbattklefinish.go b/modules/practice/api_npcbattklefinish.go
index 467bfd59f..5e5686dc0 100644
--- a/modules/practice/api_npcbattklefinish.go
+++ b/modules/practice/api_npcbattklefinish.go
@@ -59,7 +59,12 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic
 				"refresh":  room.Refresh,
 			})
 		} else {
-			room.Formation = req.Report.Alive
+			room.Formation = make([]*pb.BattleRole, 5)
+			for _, v := range req.Report.Alive {
+				if v.Tid/200 == 1 {
+					room.Formation[v.Pos] = v
+				}
+			}
 			this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{
 				"npcstate":  room.Npcstate,
 				"battlenum": room.Battlenum,