diff --git a/go.work b/go.work
index cc6b4c72..df7fa9f5 100644
--- a/go.work
+++ b/go.work
@@ -1,7 +1,5 @@
 go 1.20
 
-toolchain go1.21.4
-
 use (
 	./common
 	./common/contrib/drivers/mysql
diff --git a/logic/controller/task.go b/logic/controller/task.go
index 95e08539..f6a75d8e 100644
--- a/logic/controller/task.go
+++ b/logic/controller/task.go
@@ -109,11 +109,16 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player.
  */
 func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *player.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
 	result = &task.GetTaskBufOutboundInfo{}
+<<<<<<< HEAD
 	c.Service.Task(data.TaskId, func(te *model.TaskEX)bool {
 		result.TaskId = te.TaskID
 		result.TaskList = te.Data
 		return false
 	})
+=======
+	result.TaskId = data.TaskId
+	result.TaskList = info.Data
+>>>>>>> ea1148039e70e6b1dadf6c892b49e547d0f10ac7
 
 	return result, 0
 }
diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go
index 50378809..deaaecb8 100644
--- a/logic/service/fight/fightc.go
+++ b/logic/service/fight/fightc.go
@@ -41,11 +41,11 @@ func (f *FightC) GetInputByPlayer(c common.PlayerI, isOpposite bool) *input.Inpu
 	// 判断当前玩家是否为我方玩家
 	isOurPlayer := c == f.Our.Player
 
-	// 逻辑简化：当"是否为我方玩家"与"是否需要对方"状态一致时，返回对方输入，否则返回我方输入
-	if isOurPlayer == isOpposite {
-		return f.Opp
+	// 当isOurPlayer与isOpposite值不同时返回我方，相同时返回对方
+	if isOurPlayer != isOpposite {
+		return f.Our
 	}
-	return f.Our
+	return f.Opp
 }
 
 func (f *FightC) GetInputByAction(c BattleActionI, isOpposite bool) *input.Input {
@@ -320,35 +320,34 @@ func (f *FightC) battleLoop() {
 
 			switch {
 			case faction.ItemID >= 30001 && faction.ItemID <= 300010: //胶囊
-				f.Broadcast(func(ff *input.Input) {
-					//todo 将血量和技能pp传回enterturn
-					tt, ok := ff.Player.(*player.Player)
-					mo, ism := f.Opp.Player.(*player.AI_player)
 
-					if ok && ism && mo.CanCapture { //如果获取玩家
+				//todo 将血量和技能pp传回enterturn
+				tt, ok := f.Our.Player.(*player.Player)
+				mo, ism := f.Opp.Player.(*player.AI_player)
 
-						ok, _ := f.Our.Capture(f.Opp.CurrentPet, faction.ItemID, -1)
-						if ok { //todo 待补充
-							tt.Service.PetAdd(*f.Opp.CurrentPet.Info)
-							tt.CatchPetInfo(info.CatchMonsterOutboundInfo{
-								CatchTime: uint32(f.Opp.CurrentPet.Info.CatchTime),
-								PetId:     uint32(f.Opp.CurrentPet.ID),
-							})
-							ff.Player.SendFightEndInfo(info.FightOverInfo{
+				if ok && ism && mo.CanCapture { //如果获取玩家
 
-								WinnerId: f.ownerID,
-							})
-							f.closefight = true
-						} else {
-							tt.CatchPetInfo(info.CatchMonsterOutboundInfo{})
-						}
+					ok, _ := f.Our.Capture(f.Opp.CurrentPet, faction.ItemID, -1)
+					if ok { //todo 待补充
+						tt.Service.PetAdd(*f.Opp.CurrentPet.Info)
+						tt.CatchPetInfo(info.CatchMonsterOutboundInfo{
+							CatchTime: uint32(f.Opp.CurrentPet.Info.CatchTime),
+							PetId:     uint32(f.Opp.CurrentPet.ID),
+						})
+						tt.SendFightEndInfo(info.FightOverInfo{
 
-					} else { //说明不是可以捕捉的
+							WinnerId: f.ownerID,
+						})
+						f.closefight = true
+					} else {
 						tt.CatchPetInfo(info.CatchMonsterOutboundInfo{})
-
 					}
 
-				})
+				} else { //说明不是可以捕捉的
+					tt.CatchPetInfo(info.CatchMonsterOutboundInfo{})
+
+				}
+
 				// 当 ItemID 在 30001-300010 之间时执行的逻辑
 				fmt.Println("ItemID 在范围内")
 			case faction.ItemID == 300001:
@@ -465,6 +464,9 @@ func (f *FightC) processSkillAttack(attacker, defender *input.Input, a *SelectSk
 
 func (f *FightC) enterturn(fattack, sattack BattleActionI) {
 
+	if f.closefight { //战斗结束
+		return
+	}
 	f.initAttackers(fattack) //初始化先后手
 	var attacker, defender *input.Input
 
diff --git a/logic/service/fight/input/input.go b/logic/service/fight/input/input.go
index 75958d49..fcf9148e 100644
--- a/logic/service/fight/input/input.go
+++ b/logic/service/fight/input/input.go
@@ -28,7 +28,7 @@ type Input struct {
 
 func NewInput(c common.FightI, p common.PlayerI) *Input {
 	ret := &Input{FightC: c, Player: p}
-	t := NodeM[1000000]
+	t, _ := ret.GetDamageEffect(1)
 	ret.AddEffect(deepcopy.Copy(t).(Effect)) //添加默认基类,实现继承
 	p.SetFightC(c)                           //给玩家设置战斗容器
 	return ret
diff --git a/logic/service/fight/playeraction.go b/logic/service/fight/playeraction.go
index 02736b39..46fd5b80 100644
--- a/logic/service/fight/playeraction.go
+++ b/logic/service/fight/playeraction.go
@@ -44,8 +44,13 @@ func (f *FightC) ChangePet(c common.PlayerI, id uint32) {
 		BaseAction: NewBaseAction(c.GetInfo().UserID),
 	}
 	f.Switch = append(f.Switch, ret)
+	if c.GetInfo().UserID == f.ownerID {
 
-	f.GetInputByPlayer(c, false).CurrentPet, ret.Reason = f.GetInputByPlayer(c, false).GetPet(id)
+		f.GetInputByPlayer(c, false).CurrentPet, ret.Reason = f.GetInputByPlayer(c, false).GetPet(id)
+	} else {
+
+		f.GetInputByPlayer(c, true).CurrentPet, ret.Reason = f.GetInputByPlayer(c, true).GetPet(id)
+	}
 
 	f.actionChan <- ret
 }
diff --git a/logic/service/player/new.go b/logic/service/player/new.go
index 32306974..dbc37be9 100644
--- a/logic/service/player/new.go
+++ b/logic/service/player/new.go
@@ -17,7 +17,7 @@ func NewPlayer(opts ...PlayerOption) *Player {
 	p.StopChan = make(chan struct{})
 
 	// 启动刷怪协程
-	go func(stopChan chan struct{}, currentMap int) {
+	go func(stopChan chan struct{}) {
 
 		ticker := time.NewTicker(10 * time.Second)
 		defer ticker.Stop()
@@ -35,7 +35,7 @@ func NewPlayer(opts ...PlayerOption) *Player {
 
 			}
 		}
-	}(p.StopChan, int(p.Info.MapID))
+	}(p.StopChan)
 	for _, opt := range opts {
 		opt(p)
 	}
diff --git a/modules/blazing/model/pet.go b/modules/blazing/model/pet.go
index 2d270c79..ffe08c26 100644
--- a/modules/blazing/model/pet.go
+++ b/modules/blazing/model/pet.go
@@ -61,6 +61,11 @@ type PetEX struct {
 	
 }
 
+type PetS struct {
+	Pet
+	Data []PetInfo `orm:"data" dc:"资源规格"`
+}
+
 func LastFourElements[T any](s []T) []T {
 	n := len(s)
 	if n <= 4 {
diff --git a/modules/blazing/model/task.go b/modules/blazing/model/task.go
index ad450218..e0de7414 100644
--- a/modules/blazing/model/task.go
+++ b/modules/blazing/model/task.go
@@ -15,10 +15,20 @@ type Task struct {
 	Data     string `gorm:"type:text;not null;comment:'全部数据'" json:"data"`
 }
 
+<<<<<<< HEAD
 // TaskEX 单个任务的详细信息，包含任务步骤状态和整体状态
 type TaskEX struct {
 	Task
 	Data []uint32 `struc:"[20]byte"  orm:"data" json:"data"`
+=======
+// TaskInfo 单个任务的详细信息，包含任务步骤状态和整体状态
+type TaskInfo struct {
+	Task
+	// TaskInfo 任务步骤信息，
+	// struc:"[20]byte" 确保二进制序列化时固定20字节长度，json标签指定JSON字段名
+	//TaskID   uint32   `json:"task_id"` //区分是每日任务还是常规任务,常规为0,每日为1
+	Data []uint32 `orm:"data" struc:"[20]byte" json:"task_info"`
+>>>>>>> ea1148039e70e6b1dadf6c892b49e547d0f10ac7
 	//LastResetTime time.Time `gorm:"not null;comment:'上次重置时间（UTC）'" json:"last_reset_time"` //这里是每天重置
 	// Status 任务整体状态：0-未接受，1-已接受，2-已完成未领取，3-已完成已领取
 	// json标签指定JSON字段名，与业务状态说明保持一致