Merge branch 'develop' into sdk

src/server/game/activity_func.go

@@ -163,7 +163,6 @@ func (p *Player) SendActivityMail2(items []*item.Item, mail_title, mail_content
 
 // 活动模块 零点更新
 func (p *Player) ActivityZeroUpdate() {
-	p.CatReturnGiftZeroUpdate()
 	p.ActivityLogin()
 	type zeroHandler struct {
 		actType  int
@@ -183,14 +182,7 @@ func (p *Player) ActivityZeroUpdate() {
 	}
 }
 func (p *Player) CatReturnGiftLogin() {
-	activityInfo := p.GetActivityInfo(activity.ACT_TYPE_CAT_RETURN_GIFT)
-	var aid int
-	var id int
-	if activityInfo != nil {
-		id = activityInfo.Id
-		aid = activityInfo.AId
-	}
-	p.GetCatReturnGiftMod().Login(id, aid)
+	p.CatReturnGiftZeroUpdate()
 }
 
 // 猫猫回礼0点更新
@@ -209,8 +201,11 @@ func (p *Player) CatReturnGiftZeroUpdate() {
 		items := make([]*item.Item, 0)
 		if cfg != nil {
 			for _, v := range cfg.RewardList {
-				if oldScore >= int(v.Score) && oldReward < int(v.Id) {
+				if oldScore >= int(v.Total) && oldReward < int(v.Id) {
 					items = append(items, item.MsgToItem(v.Reward)...)
+					if v.StarReward > 0 {
+						items = append(items, item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), p.GetOrderFactor())))
+					}
 				}
 			}
 		}

src/server/game/external.go

@@ -242,20 +242,22 @@ func HandleClientReq(args []interface{}) {
 				return
 			}
 			err = RunNewNetProcessByKey(m.GetFunc(), p.(*Player), &detailMsg)
-			if err != nil {
-				log.Error("uid : %d, func : %s, err : %s", p.(*Player).M_DwUin, m.GetFunc(), err)
-				p.(*Player).TeLog("func_exec_error", map[string]interface{}{
-					"method_name": m.GetFunc(),
-					"error_info":  err.Error(),
-				})
-				p.(*Player).Recover(backup) //还原Player的数据
-				return
-			}
 			str := ""
 			if conf.Server.GameName == "pet_home" || conf.Server.GameName == "merge_pet_sdk" {
 				strbuf, _ := protojson.Marshal(detailMsg)
 				str = string(strbuf)
 			}
+			if err != nil {
+				log.Error("uid : %d, func : %s, err : %s", p.(*Player).M_DwUin, m.GetFunc(), err)
+				p.(*Player).TeLog("func_exec_error", map[string]interface{}{
+					"method_name": m.GetFunc(),
+					"error_info":  err.Error(),
+					"proto":       str,
+				})
+				p.(*Player).Recover(backup) //还原Player的数据
+				return
+			}
+
 			p.(*Player).ProcessTrigger()
 			p.(*Player).TeLog("func_exec_time", map[string]interface{}{
 				"method_name": m.GetFunc(),

src/server/game/player_data.go

@@ -417,8 +417,8 @@ func (p *Player) ZeroUpdate(a []interface{}) {
 		p.PlayroomBackData()
 		p.ChampionshipZeroUpdate()
 		p.BackChampship()
-		p.InitActivity()
-		p.ActivityZeroUpdate()
+		// p.InitActivity()
+		// p.ActivityZeroUpdate()
 
 		// 每日任务
 		p.PlayMod.getDailyTaskMod().ZeroUpdate(p.GetPlayerBaseMod().GetLevel(), p.GetOrderFactor(), p.GetDailyTaskActivityId())
@@ -474,7 +474,7 @@ func (p *Player) Login() {
 	p.LimitedTimePlayroomTrigger()    // playroom数值变化
 	LimitedTimePlayroomWorkTrigger(p) // playroom打工
 	LimitedTimeEnergyAdd(p)           // 能量定时处理
-	p.ActivityLogin()                 // 活动登录
+	//p.ActivityLogin()                 // 活动登录
 	p.Compensation()
 	SyncMailMsg(p) // 同步邮件
 	Duration := BaseMod.Login()

src/server/unit_test/cat_return_gift_test.go

@@ -0,0 +1,11 @@
+package unit
+
+import "testing"
+
+func TestCatReturnGift(t *testing.T) {
+	player := getTestPlayer()
+	player.GetCatReturnGiftMod().AddScore(100)
+	player.GetCatReturnGiftMod().AId = 1776168200
+	player.GetCatReturnGiftMod().Id = 26
+	player.CatReturnGiftZeroUpdate()
+}