修复雀魂刷新页面或掉线重连时牌谱解析异常的 bug

Author: EndlessCheng

main.go

@@ -87,18 +87,19 @@ func main() {
 
 	flags, restArgs := parseArgs(os.Args[1:])
 
+	considerOldYaku := flags.Bool("old")
+	util.SetConsiderOldYaku(considerOldYaku)
+
 	isMajsoul := flags.Bool("majsoul")
 	isTenhou := flags.Bool("tenhou")
 	isAnalysis := flags.Bool("analysis")
 	isInteractive := flags.Bool("i", "interactive")
+
 	showImproveDetail = flags.Bool("detail")
 	showAgariAboveShanten1 = flags.Bool("a", "agari")
 	showScore = flags.Bool("s", "score")
-	considerOldYaku := flags.Bool("old")
 	showAllYakuTypes = flags.Bool("y", "yaku")
 
-	util.SetConsiderOldYaku(considerOldYaku)
-
 	humanDoraTiles := flags.String("d", "dora")
 	humanTiles := strings.Join(restArgs, " ")
 	humanTilesInfo := &model.HumanTilesInfo{

majsoul.go

@@ -41,6 +41,9 @@ type majsoulMessage struct {
 	// 座位变更
 	ChangeSeatTo *int `json:"change_seat_to"`
 
+	// 游戏重连时收到的数据
+	SyncGameActions []*majsoulRecordAction `json:"sync_game_actions"`
+
 	// ResAuthGame
 	// {"seat_list":[x,x,x,x],"is_game_start":false,"game_config":{"category":1,"mode":{"mode":1,"ai":true,"detail_rule":{"time_fixed":60,"time_add":0,"dora_count":3,"shiduan":1,"init_point":25000,"fandian":30000,"bianjietishi":true,"ai_level":1,"fanfu":1}},"meta":{"room_id":18269}},"ready_id_list":[0,0,0]}
 	IsGameStart *bool              `json:"is_game_start"` // false=新游戏，true=重连
@@ -221,11 +224,6 @@ func (d *majsoulRoundData) SkipMessage() bool {
 		}
 	}
 
-	// 筛去重连的消息，目前的程序不考虑重连的情况 TODO
-	if msg.IsGameStart != nil && *msg.IsGameStart {
-		return true
-	}
-
 	return false
 }
 
@@ -330,13 +328,10 @@ func (d *majsoulRoundData) ParseInit() (roundNumber int, benNumber int, dealer i
 
 func (d *majsoulRoundData) IsSelfDraw() bool {
 	msg := d.msg
-
+	// ActionDealTile
 	if msg.Seat == nil || msg.Moqie != nil || msg.Tile == "" {
 		return false
 	}
-
-	// FIXME: 更好的判断？
-	// ActionDealTile
 	who := d.parseWho(*msg.Seat)
 	return who == 0
 }
@@ -376,7 +371,6 @@ func (d *majsoulRoundData) ParseDiscard() (who int, discardTile int, isRedFive b
 
 func (d *majsoulRoundData) IsOpen() bool {
 	msg := d.msg
-	// FIXME: 更好的判断？
 	// ActionChiPengGang || ActionAnGangAddGang
 	if msg.Tiles == nil {
 		return false

server.go

@@ -322,20 +322,9 @@ func (h *mjHandler) runAnalysisMajsoulMessageTask() {
 				go analysisCache.runMajsoulRecordAnalysisTask(fullActions)
 			}
 
-			if len(actions) == 0 {
-				break
-			}
-
-			fastRecordEnd := util.MaxInt(0, len(actions)-3)
-			h.majsoulRoundData.skipOutput = true
-			// 留最后三个刷新，这样确保会刷新界面
-			for _, action := range actions[:fastRecordEnd] {
-				h._analysisMajsoulRoundData(action.Action, "")
-			}
-			h.majsoulRoundData.skipOutput = false
-			for _, action := range actions[fastRecordEnd:] {
-				h._analysisMajsoulRoundData(action.Action, "")
-			}
+			h._fastLoadActions(actions)
+		case len(d.SyncGameActions) > 0:
+			h._fastLoadActions(d.SyncGameActions)
 		default:
 			// 其他：AI 分析
 			h._analysisMajsoulRoundData(d, originJSON)
@@ -382,13 +371,32 @@ func (h *mjHandler) _loadLiveAction(action *majsoulRecordAction, isFast bool) er
 }
 
 func (h *mjHandler) _analysisMajsoulRoundData(data *majsoulMessage, originJSON string) {
+	//if originJSON == "{}" {
+	//	return
+	//}
 	h.majsoulRoundData.msg = data
 	h.majsoulRoundData.originJSON = originJSON
 	if err := h.majsoulRoundData.analysis(); err != nil {
 		h.logError(err)
 	}
 }
 
+func (h *mjHandler) _fastLoadActions(actions []*majsoulRecordAction) {
+	if len(actions) == 0 {
+		return
+	}
+	fastRecordEnd := util.MaxInt(0, len(actions)-3)
+	h.majsoulRoundData.skipOutput = true
+	// 留最后三个刷新，这样确保会刷新界面
+	for _, action := range actions[:fastRecordEnd] {
+		h._analysisMajsoulRoundData(action.Action, "")
+	}
+	h.majsoulRoundData.skipOutput = false
+	for _, action := range actions[fastRecordEnd:] {
+		h._analysisMajsoulRoundData(action.Action, "")
+	}
+}
+
 func (h *mjHandler) _onRecordClick(clickAction string, clickActionIndex int, fastRecordTo int) {
 	if debugMode {
 		fmt.Println("[_onRecordClick] 收到", clickAction, clickActionIndex, fastRecordTo)