chore: checkpoint stable battle and eidolon progression

internal/common/proto_convert.go

@@ -162,11 +162,36 @@ func (a *AvatarJson) ToAvatarPathDataProto(lightcone *Lightcone, relics []*Relic
 		out.EquipRelicList = append(out.EquipRelicList, r.ToEquipRelic())
 	}
 
-	for anchorType, level := range a.Data.SkillsByAnchorType {
-		out.AvatarPathSkillTree = append(out.AvatarPathSkillTree, &goproto.AvatarPathSkillTree{
-			PointId: anchorType,
-			Level:   level,
-		})
+	if len(a.Data.Skills) > 0 {
+		for pointID, level := range a.Data.Skills {
+			out.AvatarPathSkillTree = append(out.AvatarPathSkillTree, &goproto.AvatarPathSkillTree{
+				PointId: pointID,
+				Level:   level,
+			})
+		}
+	} else if len(a.Data.SkillsByAnchorType) > 0 {
+		res, _ := GameRes()
+		for anchorType, level := range a.Data.SkillsByAnchorType {
+			pointID := anchorType
+			if res != nil && res.AvatarSkillTreePoints != nil && res.AvatarSkillTreePoints[a.AvatarID] != nil {
+				if pid, ok := res.AvatarSkillTreePoints[a.AvatarID][anchorType]; ok && pid != 0 {
+					pointID = pid
+				}
+			}
+			out.AvatarPathSkillTree = append(out.AvatarPathSkillTree, &goproto.AvatarPathSkillTree{
+				PointId: pointID,
+				Level:   level,
+			})
+		}
+	} else {
+		if res, err := GameRes(); err == nil && res.AvatarSkillTreePoints != nil && res.AvatarSkillTreePoints[a.AvatarID] != nil {
+			for _, pid := range res.AvatarSkillTreePoints[a.AvatarID] {
+				out.AvatarPathSkillTree = append(out.AvatarPathSkillTree, &goproto.AvatarPathSkillTree{
+					PointId: pid,
+					Level:   1,
+				})
+			}
+		}
 	}
 	// deterministic order (Rust iterated the HashMap; order is irrelevant to the
 	// client, but stable output keeps packets reproducible)
@@ -211,8 +236,27 @@ func (a *AvatarJson) ToBattleAvatarProto(index uint32, lightcone *Lightcone, rel
 		},
 	}
 
-	for pointID, level := range a.Data.Skills {
-		ba.SkilltreeList = append(ba.SkilltreeList, &goproto.AvatarSkillTree{PointId: pointID, Level: level})
+	if len(a.Data.Skills) > 0 {
+		for pointID, level := range a.Data.Skills {
+			ba.SkilltreeList = append(ba.SkilltreeList, &goproto.AvatarSkillTree{PointId: pointID, Level: level})
+		}
+	} else if len(a.Data.SkillsByAnchorType) > 0 {
+		res, _ := GameRes()
+		for anchorType, level := range a.Data.SkillsByAnchorType {
+			pointID := anchorType
+			if res != nil && res.AvatarSkillTreePoints != nil && res.AvatarSkillTreePoints[a.AvatarID] != nil {
+				if pid, ok := res.AvatarSkillTreePoints[a.AvatarID][anchorType]; ok && pid != 0 {
+					pointID = pid
+				}
+			}
+			ba.SkilltreeList = append(ba.SkilltreeList, &goproto.AvatarSkillTree{PointId: pointID, Level: level})
+		}
+	} else {
+		if res, err := GameRes(); err == nil && res.AvatarSkillTreePoints != nil && res.AvatarSkillTreePoints[a.AvatarID] != nil {
+			for _, pid := range res.AvatarSkillTreePoints[a.AvatarID] {
+				ba.SkilltreeList = append(ba.SkilltreeList, &goproto.AvatarSkillTree{PointId: pid, Level: 1})
+			}
+		}
 	}
 	sortAvatarSkillTree(ba.SkilltreeList)