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

Compare commits

base: tl_server_2:7786aeac9c7e6ef20c3bccb86e1c8a96d5210784
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:606aff2240dd647c4f9ac376ed8a01e6267808f5
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. "7786aeac9c7e6ef20c3bccb86e1c8a96d5210784" and "606aff2240dd647c4f9ac376ed8a01e6267808f5" have entirely different histories.
7786aeac9c ... 606aff2240

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

6
dbproxy/mq/c_invite.go
View File

@ -179,7 +179,7 @@ func init() {
case common.InviteScoreTypePay: case common.InviteScoreTypePay:
// 更新充值积分,上级积分增加 // 更新充值积分,上级积分增加
add(log.SnId, 0, 0, common.InviteScoreTypePayMe, log.Score, log.Money, 10000, false) add(log.SnId, 0, 0, log.Tp, log.Score, log.Money, 10000, false)
var psnid int32 var psnid int32
if len(log.Rate) > 0 { if len(log.Rate) > 0 {
add(log.InviteSnId, log.SnId, 1, log.Tp, log.Score, log.Money, log.Rate[0], true) add(log.InviteSnId, log.SnId, 1, log.Tp, log.Score, log.Money, log.Rate[0], true)
@ -201,13 +201,13 @@ func init() {
add(psnid, log.SnId, 3, log.Tp, log.Score, log.Money, log.Rate[2], false) add(psnid, log.SnId, 3, log.Tp, log.Score, log.Money, log.Rate[2], false)
} }
if addRechargeScore { if addRechargeScore {
add(log.InviteSnId, log.SnId, 1, common.InviteScoreTypeRecharge, log.RechargeScore, log.Money, 10000, true) add(log.InviteSnId, log.SnId, 0, common.InviteScoreTypeRecharge, log.RechargeScore, log.Money, 10000, true)
} }
case common.InviteScoreTypeRecharge: case common.InviteScoreTypeRecharge:
// 更新自己的积分 // 更新自己的积分
if addRechargeScore { if addRechargeScore {
add(log.InviteSnId, log.SnId, 1, log.Tp, log.RechargeScore, log.Money, 10000, true) add(log.InviteSnId, log.SnId, 0, log.Tp, log.RechargeScore, log.Money, 10000, true)
} else { } else {
// 只增加充值金额 // 只增加充值金额
add(log.InviteSnId, log.SnId, 0, log.Tp, 0, log.Money, 10000, true) add(log.InviteSnId, log.SnId, 0, log.Tp, 0, log.Money, 10000, true)

2
dbproxy/svc/u_player.go
View File

@ -395,7 +395,7 @@ func (svc *PlayerDataSvc) GetPlayerDataBySnId(args *model.GetPlayerDataBySnIdArg
code, _ = GetInviteCode(ret.Pd.Platform, ret.Pd.SnId) code, _ = GetInviteCode(ret.Pd.Platform, ret.Pd.SnId)
ret.Pd.ICode = code ret.Pd.ICode = code
ret.Pd.IScoreTs = time.Now() ret.Pd.IScoreTs = time.Now()
cplayerdata.Update(bson.M{"snid": args.SnId}, bson.M{"$set": bson.M{"icode": code, "iscorets": ret.Pd.IScoreTs}}) cplayerdata.Update(bson.M{"snid": args.SnId}, bson.M{"icode": code, "iscorets": ret.Pd.IScoreTs})
} }
f(ret.Pd) f(ret.Pd)
if args.CorrectData && ret.Pd != nil { if args.CorrectData && ret.Pd != nil {

2
protocol/webapi/common.pb.go
View File

@ -5978,7 +5978,7 @@ type ChannelSwitchConfig struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 开关类型 1.兑换 2.道具掉落 3.邀请活动开关 Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 开关类型 1.兑换 2.道具掉落
Platform string `protobuf:"bytes,2,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台id Platform string `protobuf:"bytes,2,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台id
OnChannelName []string `protobuf:"bytes,3,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启渠道 OnChannelName []string `protobuf:"bytes,3,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启渠道
} }

2
protocol/webapi/common.proto
View File

@ -664,7 +664,7 @@ message WelfareCollectConfig{
// etcd /game/channel/switch // etcd /game/channel/switch
message ChannelSwitchConfig{ message ChannelSwitchConfig{
int32 Tp = 1; // 开关类型 1.兑换 2.道具掉落 3.邀请活动开关 int32 Tp = 1; // 开关类型 1.兑换 2.道具掉落
string Platform = 2; // 平台id string Platform = 2; // 平台id
repeated string OnChannelName = 3; // 开启渠道 repeated string OnChannelName = 3; // 开启渠道
} }