游戏牌局统计

gamesrv/chess/scenepolicy.go

@@ -1315,10 +1315,6 @@ func (this *SceneStateBilled) OnEnter(s *base.Scene) {
 		if isSave {
 			// 牌局记录
 			sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{})
-			if !sceneEx.IsMatchScene() {
-				sceneEx.SetSystemCoinOut(sceneEx.SystemCoinOut())
-				base.CoinPoolMgr.PushCoin(sceneEx.GetCoinSceneTypeId(), sceneEx.GetGroupId(), sceneEx.GetPlatform(), sceneEx.GetSystemCoinOut())
-			}
 		}
 	}
 	sceneEx.NotifySceneRoundPause()

gamesrv/thirteen/scenepolicy.go

@@ -1224,13 +1224,6 @@ func (this *StateBilled) OnEnter(s *base.Scene) {
 				if playerEx.score[6] > 0 {
 					playerEx.AddCoin(playerEx.score[6]*int64(sceneEx.GetBaseScore()), common.GainWay_LeaveCombat, base.SyncFlag_ToClient, "system", s.GetSceneName())
 				}
-				sceneEx.Statistics(&base.StaticParam{
-					SnId:           playerEx.SnId,
-					Gain:           playerEx.gainCoin,
-					GainTax:        playerEx.taxCoin,
-					IsAddTimes:     true,
-					HasRobotGaming: sceneEx.robotNum > 0,
-				})
 				billed = append(billed, &thirteen.Billed{
 					Pos:        proto.Int32(int32(playerEx.Pos)),
 					Coin:       proto.Int64(playerEx.Coin),
@@ -1320,6 +1313,13 @@ func (this *StateBilled) OnEnter(s *base.Scene) {
 						person = append(person, p)
 						///
 						if !o_player.IsRob {
+							sceneEx.Statistics(&base.StaticParam{
+								SnId:           o_player.SnId,
+								Gain:           o_player.gainCoin,
+								GainTax:        o_player.taxCoin,
+								IsAddTimes:     true,
+								HasRobotGaming: sceneEx.robotNum > 0,
+							})
 							//有真人 存真人的映射表
 							totalin, totalout := int64(0), int64(0)
 							if o_player.CurIsWin > 0 {

model/dataeventex.go

@@ -6,14 +6,13 @@ import (
 
 const (
 	DATASOURCE_NIL     = iota
-	DATASOURCE_HUNDRED //1:百人场 百人牛牛、红黑、龙虎 奔驰宝马 森林舞会 红包 德州牛仔 鱼虾蟹
+	DATASOURCE_HUNDRED //1:百人场
-	DATASOURCE_FIGHT   //2.对战场 经典牛牛、抢庄牛牛、推饼、赢三张、德州、十三水 斗地主、跑得快 二人麻将 十点半
+	DATASOURCE_FIGHT   //2.对战场
-	DATASOURCE_ROLL    //3.拉霸 水浒装 水果机 足球英豪 女赌神 世界杯 绝地求生 皇家老虎机 财神到 冰河世纪 财神 百战成神 复仇者联盟 复活岛
+	DATASOURCE_ROLL    //3.拉霸
 	DATASOURCE_FISH    //4.捕鱼
-	DATASOURCE_MINI    //5.小游戏 candy、caothap、minipoker、luckydice
 )
 
-// 百人场数据类型 ；百人牛牛、红黑、龙虎 奔驰宝马 森林舞会
+// 百人场数据类型
 func MarshalGameNoteByHUNDRED(hundRed interface{}) (data string, err error) {
 	raw := &RabbitMQDataRaw{
 		Source: DATASOURCE_HUNDRED,
@@ -36,7 +35,7 @@ func UnMarshalGameNoteByHUNDRED(data string) (roll interface{}, err error) {
 	return
 }
 
-// 对战场数据类型； 经典牛牛、抢庄牛牛、推饼、赢三张、德州、十三水 二人麻将、梭哈
+// 对战场数据类型
 func MarshalGameNoteByFIGHT(fight interface{}) (data string, err error) {
 	raw := &RabbitMQDataRaw{
 		Source: DATASOURCE_FIGHT,
@@ -64,120 +63,6 @@ func MarshalGameNoteByROLL(roll interface{}) (data string, err error) {
 	return
 }
 
-// 小游戏
-func MarshalGameNoteByMini(mini interface{}) (data string, err error) {
-	raw := &RabbitMQDataRaw{
-		Source: DATASOURCE_MINI,
-		Data:   mini,
-	}
-	d, e := json.Marshal(raw)
-	if e == nil {
-		data = string(d[:])
-	}
-	err = e
-	return
-}
-
-// 冰河世纪游戏记录
-func UnMarshalIceAgeGameNote(data string) (roll interface{}, err error) {
-	gnd := &IceAgeGameNoteData{}
-	if err := json.Unmarshal([]byte(data), gnd); err != nil {
-		return nil, err
-	}
-	roll = gnd.Data
-	return
-}
-
-// 复仇者联盟游戏记录
-func UnMarshalAvengersGameNote(data string) (roll interface{}, err error) {
-	gnd := &AvengersGameNoteData{}
-	if err := json.Unmarshal([]byte(data), gnd); err != nil {
-		return nil, err
-	}
-	roll = gnd.Data
-	return
-}
-
-//// 复仇者联盟游戏记录
-//func UnMarshalAvengersGameNote(data string) (roll interface{}, err error) {
-//	gnd := &AvengersGameNoteData{}
-//	if err := json.Unmarshal([]byte(data), gnd); err != nil {
-//		return nil, err
-//	}
-//	roll = gnd.Data
-//	return
-//}
-
-// 财神游戏记录
-func UnMarshalCaiShenGameNote(data string) (roll interface{}, err error) {
-	gnd := &CaiShenGameNoteData{}
-	if err := json.Unmarshal([]byte(data), gnd); err != nil {
-		return nil, err
-	}
-	roll = gnd.Data
-	return
-}
-
-// 财神游戏记录
-func UnMarshalTamQuocGameNote(data string) (roll interface{}, err error) {
-	gnd := &TamQuocGameNoteData{}
-	if err := json.Unmarshal([]byte(data), gnd); err != nil {
-		return nil, err
-	}
-	roll = gnd.Data
-	return
-}
-
-// 复活岛游戏记录
-func UnMarshalEasterIslandGameNote(data string) (roll interface{}, err error) {
-	gnd := &EasterIslandGameNoteData{}
-	if err := json.Unmarshal([]byte(data), gnd); err != nil {
-		return nil, err
-	}
-	roll = gnd.Data
-	return
-}
-
-// 糖果游戏记录
-func UnMarshalCandyGameNote(data string) (roll interface{}, err error) {
-	gnd := &CandyGameNoteData{}
-	if err := json.Unmarshal([]byte(data), gnd); err != nil {
-		return nil, err
-	}
-	roll = gnd.Data
-	return
-}
-
-// MiniPoker游戏记录
-func UnMarshalMiniPokerGameNote(data string) (roll interface{}, err error) {
-	gnd := &MiniPokerGameNoteData{}
-	if err := json.Unmarshal([]byte(data), gnd); err != nil {
-		return nil, err
-	}
-	roll = gnd.Data
-	return
-}
-
-// CaoThap游戏记录
-func UnMarshalCaoThapGameNote(data string) (roll interface{}, err error) {
-	gnd := &CaoThapGameNoteData{}
-	if err := json.Unmarshal([]byte(data), gnd); err != nil {
-		return nil, err
-	}
-	roll = gnd.Data
-	return
-}
-
-// 幸运骰子游戏记录
-func UnMarshalLuckyDiceGameNote(data string) (roll interface{}, err error) {
-	gnd := &LuckyDiceGameNoteData{}
-	if err := json.Unmarshal([]byte(data), gnd); err != nil {
-		return nil, err
-	}
-	roll = gnd.Data
-	return
-}
-
 // 捕鱼
 func MarshalGameNoteByFISH(fish interface{}) (data string, err error) {
 	raw := &RabbitMQDataRaw{

worldsrv/taskmgr.go

@@ -81,10 +81,11 @@ func (t *TaskHandle) TaskUpdate(id int, data any) {
 		return
 	}
 
-	t.AllTask(id, data)
-
 	num := info.Num
 	logger.Logger.Tracef("玩家任务事件 Snid = %d,GameId = %d,GameFreeId = %d,任务 id = %d,num = %d", info.SnId, info.GameID, info.GameFreeID, id, num)
+
+	t.AllTask(id, data)
+
 	switch id {
 	case common.TaskTypeAdv: // 看广告