时间线优化

src/server/game/Gm.go

@@ -92,7 +92,7 @@ func ReqGmCommand_(player *Player, Command string) error {
 		player.ZeroUpdate(nil)
 	case "addChampshipLog":
 		num, _ := strconv.Atoi(arg[1])
-		player.AddLog(num, friend.LOG_TYPE_PLAYROOM_CHAMPSHIP, fmt.Sprintf("%d,%d", 1, 1))
+		player.AddLog(num, friend.LOG_TYPE_PLAYROOM_CHAMPSHIP, fmt.Sprintf("%d_%d", 1, 1))
 	case "serverZeroUpdate":
 		VarMod := player.PlayMod.getVarMod()
 		VarMod.DailyResetTime = 0

src/server/game/PlayerFunc.go

@@ -197,7 +197,7 @@ func handle(p *Player, m *msg.Msg) error {
 		BackChampship(p)
 	case msg.HANDLE_TYPE_CHAMPSHIP_RESULT: // #  好友锦标赛结果
 		Extra := m.Extra.([]int)
-		p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_CHAMPSHIP, fmt.Sprintf("%d,%d", Extra[0], Extra[1]))
+		p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_CHAMPSHIP, fmt.Sprintf("%d_%d", Extra[0], Extra[1]))
 	case msg.HANDLE_TYPE_TREASURE_RESULT: // #  好友宝藏结果
 		p.AddLog(m.From, friend.LOG_TYPE_TREASURE, fmt.Sprintf("%d", m.Extra.(int)))
 	case msg.HANDLE_TYPE_MAIL: // 邮件操作
@@ -212,7 +212,7 @@ func handle(p *Player, m *msg.Msg) error {
 		PlayroomMod.AddMood(playroom.MOOD_TYPE_FOOD, -50)
 		PlayroomMod.AddMood(playroom.MOOD_TYPE_CLEAN, -50)
 		PlayroomMod.AddVisitor(m.From, m.SendT)
-		p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_VISIT, fmt.Sprintf("%d,%d", Items[0].Id, Items[0].Num))
+		p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_VISIT, fmt.Sprintf("%d_%d", Items[0].Id, Items[0].Num))
 		if len(Items) > 0 && Items[0].Id == item.ITEM_STAR_ID {
 			BaseMod := p.PlayMod.getBaseMod()
 			StarNum := BaseMod.GetStar()

src/server/game/RegisterNetworkFunc.go

@@ -3130,21 +3130,7 @@ func ReqPlayroomInteract(player *Player, buf []byte) error {
 		})
 		return err
 	}
-	if playroomCfg.IsStokeCat(int(req.Id)) {
-		player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_STOKECAT})
-	}
-	if playroomCfg.IsPlayCat(int(req.Id)) {
-		player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_PLAYCAT})
-	}
-	if playroomCfg.IsTakeCat(int(req.Id)) {
-		player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_TAKECAT})
-	}
-	switch req.Type {
-	case playroom.MOOD_TYPE_CLEAN:
-		player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_CLEANCAT})
-	case playroom.MOOD_TYPE_FOOD:
-		player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_FEEDCAT})
-	}
+	player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_INTERACT, A: []interface{}{int(req.Id)}})
 	player.PlayMod.save()
 	LimitedTimePlayroomTrigger(player)
 	player.PushClientRes(PlayroomMod.NotifyMood())
@@ -3569,7 +3555,7 @@ func ReqPlayroomTaskReward(player *Player, buf []byte) error {
 		})
 		return err
 	}
-	err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomTask.String())
+	err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomTaskReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomTaskReward{
 			Code: msg.RES_CODE_FAIL,

src/server/msg/Gameapi.pb.go

@@ -88,6 +88,7 @@ const (
 	ITEM_POP_LABEL_AddWish               ITEM_POP_LABEL = 61 // 心愿单奖励
 	ITEM_POP_LABEL_GetWish               ITEM_POP_LABEL = 62 // 心愿单奖励
 	ITEM_POP_LABEL_PlayroomTask          ITEM_POP_LABEL = 63 // playroom任务
+	ITEM_POP_LABEL_PlayroomTaskReward    ITEM_POP_LABEL = 64 // playroom任务奖励 大奖
 )
 
 // Enum value maps for ITEM_POP_LABEL.
@@ -157,6 +158,7 @@ var (
 		61: "AddWish",
 		62: "GetWish",
 		63: "PlayroomTask",
+		64: "PlayroomTaskReward",
 	}
 	ITEM_POP_LABEL_value = map[string]int32{
 		"Playroom":              0,
@@ -223,6 +225,7 @@ var (
 		"AddWish":               61,
 		"GetWish":               62,
 		"PlayroomTask":          63,
+		"PlayroomTaskReward":    64,
 	}
 )
 
@@ -23989,7 +23992,7 @@ const file_proto_Gameapi_proto_rawDesc = "" +
 	"\n" +
 	"ReqAdminGm\x12\x10\n" +
 	"\x03Uid\x18\x01 \x01(\x03R\x03Uid\x12\x18\n" +
-	"\aCommand\x18\x02 \x01(\tR\aCommand*\xbc\t\n" +
+	"\aCommand\x18\x02 \x01(\tR\aCommand*\xd4\t\n" +
 	"\x0eITEM_POP_LABEL\x12\f\n" +
 	"\bPlayroom\x10\x00\x12\r\n" +
 	"\tPiggyBank\x10\x01\x12\n" +
@@ -24061,7 +24064,8 @@ const file_proto_Gameapi_proto_rawDesc = "" +
 	"\x0eCatTrickReward\x10<\x12\v\n" +
 	"\aAddWish\x10=\x12\v\n" +
 	"\aGetWish\x10>\x12\x10\n" +
-	"\fPlayroomTask\x10?*B\n" +
+	"\fPlayroomTask\x10?\x12\x16\n" +
+	"\x12PlayroomTaskReward\x10@*B\n" +
 	"\vHANDLE_TYPE\x12\a\n" +
 	"\x03ADD\x10\x00\x12\v\n" +
 	"\aCOMPOSE\x10\x01\x12\a\n" +