data/DB_GameItem.json

@@ -801,7 +801,7 @@
 				1,
 				0
 			],
-			"Type": 19,
+			"Type": 13,
 			"Effect0": [
 				0,
 				0,

model/player.go

@@ -75,7 +75,6 @@ type PlayerDiffData struct {
 	RankScore            map[int32]int64 // 排位积分
 	PhoneScore           int64           //手机积分
 	InviteScore          int64           // 邀请积分
-	Long                 int64           // 龙币
 }
 
 type PlayerBaseData struct {

protocol/player/player.proto

@@ -318,7 +318,6 @@ message PlayerData {
   int32 Age = 47; // 年龄
   repeated WeekInfo WeekCard = 48;//周卡
   repeated int32 RequestAddFriend = 49;//请求添加好友信息
-  int64 Long = 50; // 龙币
 }
 
 //周卡数据
@@ -361,7 +360,6 @@ message SCPlayerDataUpdate {
   map<int32,int64> RankScore = 12; // 排位积分
   int64 PhoneScore = 13;	//手机积分
   int64 InviteScore = 14; // 邀请积分
-  int64 Long = 15; // 龙币
 }
 
 //获取第三方玩家信息

public

@@ -1 +1 @@
-Subproject commit 63eadb869736b9d3e16c993cd99675c0e0de638c
+Subproject commit 8c59aeb37871428f135c6423cde777c09ad0e3f0

worldsrv/action_welfare.go

@@ -595,7 +595,7 @@ func CSPermitInfo(s *netlib.Session, packetid int, data interface{}, sid int64)
 	pack := &welfare.SCPermitInfo{
 		Exp:       exp,
 		Level:     level,
-		Timestamp: []int64{startTs, endTs - 1},
+		Timestamp: []int64{startTs, endTs},
 		IsPermit:  p.GetIsPermit(),
 		RefreshTs: common.GetDayNextStartTs(time.Now().Unix()),
 	}
@@ -698,12 +698,13 @@ func CSPermitAward(s *netlib.Session, packetid int, data interface{}, sid int64)
 	}
 	startTs := PlatformMgrSingleton.GetConfig(p.Platform).PermitStartTs
 	endTs := PlatformMgrSingleton.GetConfig(p.Platform).PermitEndTs
-	now := time.Now()
-	if startTs == 0 || endTs == 0 || now.Unix() < startTs || now.Unix() >= endTs {
+	if startTs == 0 || endTs == 0 {
 		logger.Logger.Errorf("CSPermitAward not startTs %v", p.SnId)
 		return nil
 	}
 
+	now := time.Now()
+
 	pack := &welfare.SCPermitAward{
 		OpRetCode: welfare.OpResultCode_OPRC_Sucess,
 		Tp:        msg.GetTp(),
@@ -776,8 +777,8 @@ func CSPermitAward(s *netlib.Session, packetid int, data interface{}, sid int64)
 					p.WelfData.PermitAward[v.GetRank()*1000] = now.Unix()
 				}
 			} else {
-				if v.GetRank()*1000 == msg.GetId() {
-					if IsPermitCanReward(p, msg.GetId()) {
+				if v.GetRank() == msg.GetId() {
+					if IsPermitCanReward(p, v.GetRank()*1000) {
 						for _, vv := range v.GetAward2() {
 							pack.Award2 = append(pack.Award2, &welfare.PropInfo{
 								ItemId:  vv.GetItemId(),
@@ -977,12 +978,13 @@ func CSPermitExchange(s *netlib.Session, packetid int, data interface{}, sid int
 	}
 	startTs := PlatformMgrSingleton.GetConfig(p.Platform).PermitStartTs
 	endTs := PlatformMgrSingleton.GetConfig(p.Platform).PermitEndTs
-	now := time.Now()
-	if startTs == 0 || endTs == 0 || now.Unix() < startTs || now.Unix() >= endTs {
+	if startTs == 0 || endTs == 0 {
 		logger.Logger.Errorf("CSPermitExchange not startTs %v", p.SnId)
 		return nil
 	}
 
+	now := time.Now()
+
 	isExchange, code := GetPermitCanExchange(p, msg.GetId())
 	pack := &welfare.SCPermitExchange{
 		OpRetCode: welfare.OpResultCode_OPRC_Sucess,
@@ -1018,26 +1020,26 @@ func CSPermitExchange(s *netlib.Session, packetid int, data interface{}, sid int
 			// 检查背包是否足够
 			var items []*Item
 			var costItems []*Item
-			for _, v := range exchangeConfig.GetCost() {
-				item := BagMgrSingleton.GetItem(p.SnId, v.GetItemId())
+			for k, v := range exchangeConfig.GetCost() {
+				item := BagMgrSingleton.GetItem(p.SnId, int32(k))
 				if item == nil || item.ItemNum < v.GetItemNum() {
 					send(welfare.OpResultCode_OPRC_ErrCost)
 					return nil
 				}
-				info := srvdata.PBDB_GameItemMgr.GetData(v.GetItemId())
+				info := srvdata.PBDB_GameItemMgr.GetData(int32(k))
 				if info != nil {
 					costItems = append(costItems, &Item{
-						ItemId:  v.GetItemId(),
+						ItemId:  int32(k),
 						ItemNum: v.GetItemNum(),
 						Name:    info.Name,
 					})
 				}
 			}
-			for _, v := range exchangeConfig.GetGain() {
-				info := srvdata.PBDB_GameItemMgr.GetData(v.GetItemId())
+			for k, v := range exchangeConfig.GetGain() {
+				info := srvdata.PBDB_GameItemMgr.GetData(int32(k))
 				if info != nil {
 					items = append(items, &Item{
-						ItemId:  v.GetItemId(),
+						ItemId:  int32(k),
 						ItemNum: v.GetItemNum(),
 						Name:    info.Name,
 					})
@@ -1053,7 +1055,11 @@ func CSPermitExchange(s *netlib.Session, packetid int, data interface{}, sid int
 		}
 	}
 
-	send(welfare.OpResultCode_OPRC_Sucess)
+	if !isExchange {
+		pack.OpRetCode = welfare.OpResultCode_OPRC_Error
+	}
+	p.SendToClient(int(welfare.SPacketID_PACKET_SCPermitExchange), pack)
+	logger.Logger.Tracef("SCPermitExchange: %v", pack)
 	return nil
 }
 

worldsrv/bagmgr.go

@@ -314,9 +314,6 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
 				})
 			}
 		}
-		if v == common.ItemIDLong {
-			p.SendDiffData()
-		}
 	}
 
 	if code != bag.OpResultCode_OPRC_Sucess {

worldsrv/etcd.go

@@ -207,6 +207,50 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
 	case *webapi.ActInviteConfig:
 		PlatformMgrSingleton.GetConfig(config.Platform).ActInviteConfig = config
 	case *webapi.ActPermitConfig:
+		break
+		PlatformMgrSingleton.GetConfig(config.Platform).ActPermitConfig = config
+		st := new(model.PermitStartTs)
+		permit := model.GetStrKVGameData(common.PermitStartTsKey + config.Platform)
+		if permit != "" {
+			if err := json.Unmarshal([]byte(permit), st); err != nil {
+				logger.Logger.Errorf("permit startts error: %v", err)
+				return
+			}
+			// 修改循环周期
+			endTs := st.StartTs + int64(config.GetDays()*24*3600)
+			if st.StartTs > 0 && endTs != st.EndTs {
+				st.EndTs = endTs
+			}
+			PlatformMgrSingleton.GetConfig(config.Platform).PermitStartTs = st.StartTs
+			PlatformMgrSingleton.GetConfig(config.Platform).PermitEndTs = st.EndTs
+		} else {
+			startTs := common.GetDayStartTs(config.StartTs)
+			endTs := startTs + int64(config.Days*24*3600)
+			st.StartTs = startTs
+			st.EndTs = endTs
+			PlatformMgrSingleton.GetConfig(config.Platform).PermitStartTs = startTs
+			PlatformMgrSingleton.GetConfig(config.Platform).PermitEndTs = endTs
+		}
+		task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
+			if st.StartTs <= 0 || st.EndTs <= 0 {
+				return nil
+			}
+			b, err := json.Marshal(st)
+			if err != nil {
+				logger.Logger.Errorf("permit startts save error: %v", err)
+			} else {
+				logger.Logger.Infof("update permit startts: %v %v", st.StartTs, st.EndTs)
+				err := model.UptStrKVGameData(common.PermitStartTsKey+config.Platform, string(b))
+				if err != nil {
+					logger.Logger.Errorf("permit startts update error:%v", err)
+				}
+			}
+			return nil
+		}), nil).StartByExecutor("permit_start_ts")
+
+	default:
+		logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey)
+	}
 	// test
 	actConfig := &webapi.ActPermitConfig{
 		Platform: "1",
@@ -313,51 +357,6 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
 	}), nil).StartByExecutor("permit_start_ts")
 	logger.Logger.Tracef("==> PermitConfig: %v ", actConfig)
 	// test
-		break
-		PlatformMgrSingleton.GetConfig(config.Platform).ActPermitConfig = config
-		st := new(model.PermitStartTs)
-		permit := model.GetStrKVGameData(common.PermitStartTsKey + config.Platform)
-		if permit != "" {
-			if err := json.Unmarshal([]byte(permit), st); err != nil {
-				logger.Logger.Errorf("permit startts error: %v", err)
-				return
-			}
-			// 修改循环周期
-			endTs := st.StartTs + int64(config.GetDays()*24*3600)
-			if st.StartTs > 0 && endTs != st.EndTs {
-				st.EndTs = endTs
-			}
-			PlatformMgrSingleton.GetConfig(config.Platform).PermitStartTs = st.StartTs
-			PlatformMgrSingleton.GetConfig(config.Platform).PermitEndTs = st.EndTs
-		} else {
-			startTs := common.GetDayStartTs(config.StartTs)
-			endTs := startTs + int64(config.Days*24*3600)
-			st.StartTs = startTs
-			st.EndTs = endTs
-			PlatformMgrSingleton.GetConfig(config.Platform).PermitStartTs = startTs
-			PlatformMgrSingleton.GetConfig(config.Platform).PermitEndTs = endTs
-		}
-		task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
-			if st.StartTs <= 0 || st.EndTs <= 0 {
-				return nil
-			}
-			b, err := json.Marshal(st)
-			if err != nil {
-				logger.Logger.Errorf("permit startts save error: %v", err)
-			} else {
-				logger.Logger.Infof("update permit startts: %v %v", st.StartTs, st.EndTs)
-				err := model.UptStrKVGameData(common.PermitStartTsKey+config.Platform, string(b))
-				if err != nil {
-					logger.Logger.Errorf("permit startts update error:%v", err)
-				}
-			}
-			return nil
-		}), nil).StartByExecutor("permit_start_ts")
-
-	default:
-		logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey)
-	}
-
 }
 
 func handlerEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) {

worldsrv/permitmgr.go

@@ -27,12 +27,11 @@ func (r *PermitMgr) OnDayTimer() {
 	logger.Logger.Info("(this *PermitMgr) OnDayTimer")
 	now := time.Now()
 	for _, v := range PlatformMgrSingleton.GetPlatforms() {
-		platform := v.IdStr
-		pl := PlatformMgrSingleton.GetConfig(platform).ActPermitConfig
+		pl := PlatformMgrSingleton.GetConfig(v.IdStr).ActPermitConfig
 		if pl == nil {
 			continue
 		}
-		b := model.GetStrKVGameData(common.PermitStartTsKey + platform)
+		b := model.GetStrKVGameData(common.PermitStartTsKey + v.IdStr)
 		if b == "" {
 			logger.Logger.Errorf("(this *PermitMgr) OnDayTimer GetStrKVGameData not found")
 			continue
@@ -42,7 +41,6 @@ func (r *PermitMgr) OnDayTimer() {
 			logger.Logger.Errorf("(this *PermitMgr) OnDayTimer json.Unmarshal err:%v", err)
 			continue
 		}
-		logger.Logger.Tracef("(this *PermitMgr) OnDayTimer se:%+v now:%v", *se, now)
 		if se.StartTs <= now.Unix() && now.Unix() < se.EndTs {
 			// 在活动内
 			continue
@@ -59,18 +57,18 @@ func (r *PermitMgr) OnDayTimer() {
 			var players []*model.PlayerBaseInfo
 			task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
 				list, err = model.FindPlayerPermitList(&model.FindPlayerPermitListArgs{
-					Platform: platform,
+					Platform: v.IdStr,
 					StartTs:  startTs,
 				})
 				for _, vv := range list.List {
 					player := PlayerMgrSington.GetPlayerBySnId(vv.SnId)
 					if player != nil {
 						players = append(players, &model.PlayerBaseInfo{
-							SnId:        player.SnId,
+							SnId:        0,
 							LastChannel: player.LastChannel,
 						})
 					} else {
-						baseInfo := model.GetPlayerBaseInfo(platform, vv.SnId)
+						baseInfo := model.GetPlayerBaseInfo(v.IdStr, vv.SnId)
 						players = append(players, baseInfo)
 					}
 				}
@@ -85,9 +83,8 @@ func (r *PermitMgr) OnDayTimer() {
 						logger.Logger.Errorf("PermitMgr OnDayTimer FindPlayerPermitList player is nil %v", list.List[k].SnId)
 						continue
 					}
-					curPlayer := player
 					// 发送奖励
-					cfg := PlatformMgrSingleton.GetPermitConfig(platform, player.LastChannel).GetRankConfig()
+					cfg := PlatformMgrSingleton.GetPermitConfig(v.IdStr, player.LastChannel).GetRankConfig()
 					rank := k + 1
 					for _, rankInfo := range cfg {
 						var has bool
@@ -102,22 +99,21 @@ func (r *PermitMgr) OnDayTimer() {
 								if len(items) == 0 {
 									break
 								}
-								logger.Logger.Infof("PermitMgr rank award snid:%v rank:%v", player.SnId, rank)
 								// 发邮件
 								var newMsg *model.Message
 								task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
 									title := i18n.Tr("languages", "PermitAwardTitle")
 									content := i18n.Tr("languages", "PermitAward", []int{rank, rank, rank, rank})
-									newMsg = model.NewMessage("", 0, "", curPlayer.SnId, model.MSGTYPE_RANK_REWARD,
-										title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, model.HallTienlen, nil)
-									err := model.InsertMessage(platform, newMsg)
+									newMsg = model.NewMessage("", 0, "", player.SnId, model.MSGTYPE_RANK_REWARD,
+										title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, v.IdStr, model.HallTienlen, nil)
+									err := model.InsertMessage(v.IdStr, newMsg)
 									if err != nil {
-										logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", curPlayer.SnId, err)
+										logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err)
 										return err
 									}
 									return nil
 								}), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) {
-									p := PlayerMgrSington.GetPlayerBySnId(curPlayer.SnId)
+									p := PlayerMgrSington.GetPlayerBySnId(player.SnId)
 									if p != nil {
 										p.AddMessage(newMsg)
 									}
@@ -139,15 +135,15 @@ func (r *PermitMgr) OnDayTimer() {
 				se.StartTs = common.GetDayStartTs(now.Unix())
 				se.EndTs = se.StartTs + int64(pl.Days*24*3600)
 			}
-			PlatformMgrSingleton.GetConfig(platform).PermitStartTs = se.StartTs
-			PlatformMgrSingleton.GetConfig(platform).PermitEndTs = se.EndTs
+			PlatformMgrSingleton.GetConfig(v.IdStr).PermitStartTs = se.StartTs
+			PlatformMgrSingleton.GetConfig(v.IdStr).PermitEndTs = se.EndTs
 			b, err := json.Marshal(se)
 			if err != nil {
 				logger.Logger.Errorf("(this *PermitMgr) OnDayTimer json.Marshal err:%v", err)
 				continue
 			}
 			task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
-				model.UptStrKVGameData(common.PermitStartTsKey+platform, string(b))
+				model.UptStrKVGameData(common.PermitStartTsKey+v.IdStr, string(b))
 				return nil
 			}), nil).StartByExecutor("permit_start_ts")
 		}

worldsrv/player.go

@@ -60,7 +60,6 @@ const (
 	UpdateField_RankScore
 	UpdateField_PhoneScore
 	UpdateField_InviteScore
-	UpdateField_Long
 )
 
 const (
@@ -2270,10 +2269,6 @@ func (this *Player) ResetPermit() {
 	permitStartTs := PlatformMgrSingleton.GetConfig(this.Platform).PermitStartTs
 	if (this.PermitStartTs == 0 || this.PermitStartTs < permitStartTs) && permitStartTs > 0 {
 		this.PermitStartTs = permitStartTs
-		this.Permit = time.Time{}
-		this.WelfData.PermitAward = make(map[int32]int64)
-		this.WelfData.PermitExchange = make(map[int32][]int64)
-		this.dirty = true
 		// 清理数据
 		bag := BagMgrSingleton.GetBagInfo(this.SnId)
 		if bag != nil {
@@ -2286,10 +2281,13 @@ func (this *Player) ResetPermit() {
 						ItemNum:    model.GameParamData.PermitInitScore,
 						ObtainTime: time.Now().Unix(),
 					}
-					this.Permit = time.Now()
 				}
 			}
 		}
+		this.Permit = time.Time{}
+		this.WelfData.PermitAward = make(map[int32]int64)
+		this.WelfData.PermitExchange = make(map[int32][]int64)
+		this.dirty = true
 	}
 }
 
@@ -2559,14 +2557,6 @@ func (this *Player) SendDiffData() {
 	if len(pack.RankScore) == 0 {
 		pack.RankScore = nil
 	}
-	// 龙币
-	itemLong := BagMgrSingleton.GetItem(this.SnId, common.ItemIDLong)
-	if itemLong != nil && this.diffData.Long != itemLong.ItemNum {
-		dirty = true
-		pack.Long = proto.Int64(itemLong.ItemNum)
-		this.diffData.Long = itemLong.ItemNum
-		pack.UpdateField += UpdateField_Long
-	}
 
 	if dirty {
 		FriendMgrSington.UpdateInfo(this.Platform, this.SnId)
@@ -3006,12 +2996,10 @@ func (this *Player) SendPlayerInfo() {
 		scPlayerData.Data.ReliefFundTimes = this.WelfData.ReliefFundTimes
 	}
 	if item := BagMgrSingleton.GetItem(this.SnId, VCard); item != nil {
-		scPlayerData.Data.VCoin = item.ItemNum //V卡
-	}
-	// 龙币
-	if item := BagMgrSingleton.GetItem(this.SnId, common.ItemIDLong); item != nil {
-		scPlayerData.Data.Long = item.ItemNum
+		scPlayerData.Data.VCoin = int64(item.ItemNum) //V卡
+
 	}
+
 	// 排位积分
 	scPlayerData.Data.RankScore = RankMgrSingleton.GetPlayerRankScore(this.SnId)