Merge branch 'main' of https://cnb.cool/blzing/blazing

logic/service/fight/effect/effect_413.go

@@ -29,7 +29,7 @@ func (e *Effect413) OnSkill() bool {
 	if isprop {
 		e.Ctx().Opp.Damage(e.Ctx().Our, &info.DamageZone{
 			Type:   info.DamageType.Fixed,
-			Damage: e.Ctx().Opp.CurrentPet.GetHP().Div(e.Args()[0]),
+			Damage: e.Args()[0],
 		})
 	}
 

logic/service/fight/info/info.go

@@ -52,6 +52,7 @@ type Fightinfo struct {
 	FightType uint32
 }
 type RPCFightinfo struct {
+	Type     int
 	PlayerID uint32
 	// 战斗模式 1 = 1v1  2 = 6v6  3大乱斗   0 什么都不做
 	Mode uint32
@@ -60,6 +61,15 @@ type RPCFightinfo struct {
 	Status uint32
 	// FightType uint32
 }
+type RPCFightStartinfo struct {
+	Servierid int // 非0表示rpc跨服
+	PlayerID  uint32
+	// 战斗模式 1 = 1v1  2 = 6v6  3大乱斗   0 什么都不做
+	Mode uint32
+	//Type uint32 //战斗类型
+
+	Status uint32
+}
 
 // FightPetInfo 战斗精灵信息结构体，FightPetInfo类
 type FightPetInfo struct {

logic/service/player/player.go

@@ -93,6 +93,7 @@ type Player struct {
 	MainConn gnet.Conn
 	baseplayer
 	IsLogin bool //是否登录
+	IsJoin  bool //是否加入RPC对局 用重连函数写临时缓存join，重连后统一join
 	Done
 
 	MapNPC *time.Timer