tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tl_server_2:f25bef65557f2c748cc8b0fc501ee2c24b4509e6
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:343a7a7abb2d964cb8f4f55ea0238e5ff4dfc097
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

No commits in common. "f25bef65557f2c748cc8b0fc501ee2c24b4509e6" and "343a7a7abb2d964cb8f4f55ea0238e5ff4dfc097" have entirely different histories.
f25bef6555 ... 343a7a7abb

6 changed files with 211 additions and 409 deletions
Show Stats Expand all files Collapse all files

BIN
data/DB_GameItem.dat
View File

Binary file not shown.

595
data/DB_GameItem.json
View File

@ -6688,8 +6688,8 @@
} }
}, },
{ {
"Id": 271001, "Id": 171001,
"Name": "1元话费直兑券碎片", "Name": "电饭煲碎片",
"ShowLocation": [ "ShowLocation": [
1, 1,
1, 1,
@ -6723,12 +6723,12 @@
"Describe": "可联系客服兑换实物奖励", "Describe": "可联系客服兑换实物奖励",
"Entity": 1, "Entity": 1,
"Compound": { "Compound": {
"300008": 10 "71001": 10
} }
}, },
{ {
"Id": 271002, "Id": 171002,
"Name": "2元话费直兑券碎片", "Name": "热水壶碎片",
"ShowLocation": [ "ShowLocation": [
1, 1,
1, 1,
@ -6761,399 +6761,204 @@
"Location": "0", "Location": "0",
"Describe": "可联系客服兑换实物奖励", "Describe": "可联系客服兑换实物奖励",
"Entity": 1, "Entity": 1,
"Compound": {
"300009": 10
}
},
{
"Id": 271003,
"Name": "5元话费直兑券碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 1,
"Compound": {
"300010": 10
}
},
{
"Id": 271004,
"Name": "10元话费直兑券碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"300011": 10
}
},
{
"Id": 271005,
"Name": "iphone碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"77030": 10
}
},
{
"Id": 271006,
"Name": "大米碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"79001": 10
}
},
{
"Id": 271007,
"Name": "红米碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"76006": 10
}
},
{
"Id": 271008,
"Name": "鸡蛋碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"79005": 10
}
},
{
"Id": 271009,
"Name": "可乐碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"73004": 10
}
},
{
"Id": 271010,
"Name": "食用油碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"79002": 10
}
},
{
"Id": 271011,
"Name": "智能手环碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"76004": 10
}
},
{
"Id": 271012,
"Name": "电热水壶碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": { "Compound": {
"71002": 10 "71002": 10
} }
},
{
"Id": 171003,
"Name": "迷你小风扇碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 1,
"Compound": {
"71003": 10
}
},
{
"Id": 172001,
"Name": "厨房炊具套装碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"72001": 10
}
},
{
"Id": 172002,
"Name": "睡衣碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"72002": 10
}
},
{
"Id": 172003,
"Name": "洗衣液碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"72003": 10
}
},
{
"Id": 172004,
"Name": "水杯碎片",
"ShowLocation": [
1,
1,
0
],
"Classify": [
0,
0,
1
],
"Type": 27,
"Effect0": [
0,
0,
0,
0,
0,
1
],
"Effect": [
0,
0,
0,
0,
0,
1
],
"Composition": 1,
"CompositionMax": 9999,
"Location": "0",
"Describe": "可联系客服兑换实物奖励",
"Entity": 2,
"Compound": {
"72004": 10
}
} }
] ]
} }

14
gamesrv/tienlen/scenedata_tienlen.go
View File

@ -1433,11 +1433,8 @@ func (this *TienLenSceneData) SendHandCardOdds() {
cardsArr = cardsArr[:len(cardsArr)-1] cardsArr = cardsArr[:len(cardsArr)-1]
} }
} }
// 剩余人随机发牌 //机器人发牌和不调控的人
for _, v := range this.players { for _, v := range append(robotPlayers, realPlayers...) {
if v == nil || !v.IsGameing() || v.cards[0] != rule.InvalideCard {
continue
}
f1(v, cardsArr[0]) f1(v, cardsArr[0])
cardsArr = cardsArr[1:] cardsArr = cardsArr[1:]
} }
@ -1498,11 +1495,8 @@ func (this *TienLenSceneData) SendHandCardOdds() {
cardsArr = cardsArr[:len(cardsArr)-1] cardsArr = cardsArr[:len(cardsArr)-1]
} }
} }
// 剩余人随机发牌 //机器人发牌和不调控的人
for _, v := range this.players { for _, v := range append(robotPlayers, realPlayers...) {
if v == nil || !v.IsGameing() || v.cards[0] != rule.InvalideCard {
continue
}
f1(v, cardsArr[0]) f1(v, cardsArr[0])
cardsArr = cardsArr[1:] cardsArr = cardsArr[1:]
} }

4
worldsrv/action_bag.go
View File

@ -464,7 +464,7 @@ func CSUpBagInfo(s *netlib.Session, packetid int, data interface{}, sid int64) e
ItemNum: int64(-msg.GetItemNum()), ItemNum: int64(-msg.GetItemNum()),
}, },
}, },
GainWay: common.GainWayCompound, GainWay: common.GainWayItemFen,
Operator: "system", Operator: "system",
Remark: fmt.Sprintf("道具合成%v消耗", msg.GetItemId()), Remark: fmt.Sprintf("道具合成%v消耗", msg.GetItemId()),
}) })
@ -489,7 +489,7 @@ func CSUpBagInfo(s *netlib.Session, packetid int, data interface{}, sid int64) e
ItemNum: int64(msg.GetItemNum()), ItemNum: int64(msg.GetItemNum()),
}, },
}, },
GainWay: common.GainWayCompoundGain, GainWay: common.GainWayItemFenGain,
Operator: "system", Operator: "system",
Remark: "道具合成获得", Remark: "道具合成获得",
}) })

7
worldsrv/player.go
View File

@ -1638,8 +1638,11 @@ func (this *Player) OnMiniTimer() {
}) })
} }
// 长时间掉线又没有删除缓存 // 长时间掉线又没有删除缓存
if !this.dropTime.IsZero() && this.scene == nil && time.Now().Sub(this.dropTime).Minutes() > 20 { if !this.dropTime.IsZero() && time.Now().Sub(this.dropTime).Minutes() > 20 {
logger.Logger.Errorf("清除缓存异常 snid:%v dirty:%v lastLogoutTime:%v lastGameId:%v", this.SnId, this.dirty, this.LastLogoutTime, this.LastGameId) logger.Logger.Errorf("清除缓存异常玩家 snid:%v dirty:%v lastLogoutTime:%v lastGameId:%v", this.SnId, this.dirty, this.LastLogoutTime, this.LastGameId)
if this.scene != nil {
logger.Logger.Errorf("清除缓存异常玩家 sceneId:%v", this.scene.sceneId)
}
} }
} }

BIN
xlsx/DB_GameItem.xlsx
View File

Binary file not shown.