Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

dbproxy/mq/c_invite.go

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

dbproxy/svc/u_player.go

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

protocol/webapi/common.pb.go

@@ -5978,7 +5978,7 @@ type ChannelSwitchConfig struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Tp            int32    `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"`                      // 开关类型 1.兑换 2.道具掉落
+	Tp            int32    `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"`                      // 开关类型 1.兑换 2.道具掉落 3.邀请活动开关
 	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"` // 开启渠道
 }

protocol/webapi/common.proto

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