修复game 异常的bug

game/config/data/achieveTaskConfig.json

@@ -1,10 +1,10 @@
 [
-		{"ID":1,"Order":2,"Enable":1,"Type":1,"Condition":1,"Reward":[{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":5,"amount":10000},{"itemBaseType":1,"itemID":7,"amount":2}],"Url":"https://x.com/Mhaya_Official"},
-		{"ID":2,"Order":1,"Enable":1,"Type":1,"Condition":1,"Reward":[{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":5,"amount":10000},{"itemBaseType":1,"itemID":7,"amount":2}],"Url":"https://t.me/mhaya_official/389467"},
-		{"ID":3,"Order":3,"Enable":1,"Type":1,"Condition":1,"Reward":[{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":5,"amount":10000},{"itemBaseType":1,"itemID":7,"amount":2}],"Url":"https://www.youtube.com/@mhayaPlaytoearn"},
-		{"ID":4,"Order":4,"Enable":1,"Type":1,"Condition":1,"Reward":[{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":5,"amount":10000},{"itemBaseType":1,"itemID":7,"amount":2}],"Url":"https://discord.com/invite/mhaya"},
-		{"ID":5,"Order":5,"Enable":1,"Type":2,"Condition":1,"Reward":[{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":7,"amount":2}],"Url":""},
-		{"ID":6,"Order":6,"Enable":1,"Type":2,"Condition":6,"Reward":[{"itemBaseType":2,"itemID":6,"amount":15},{"itemBaseType":1,"itemID":7,"amount":3}],"Url":""},
-		{"ID":7,"Order":7,"Enable":1,"Type":2,"Condition":11,"Reward":[{"itemBaseType":2,"itemID":6,"amount":20},{"itemBaseType":1,"itemID":7,"amount":4}],"Url":""},
-		{"ID":8,"Order":8,"Enable":1,"Type":2,"Condition":21,"Reward":[{"itemBaseType":2,"itemID":6,"amount":25},{"itemBaseType":1,"itemID":7,"amount":5}],"Url":""}	
+		{"ID":1,"Enable":1,"Type":1,"Condition":{"min":1,"max":1},"Reward":[{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":5,"amount":10000},{"itemBaseType":1,"itemID":7,"amount":2}],"Url":"https://x.com/Mhaya_Official"},
+		{"ID":2,"Enable":1,"Type":1,"Condition":{"min":1,"max":1},"Reward":[{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":5,"amount":10000},{"itemBaseType":1,"itemID":7,"amount":2}],"Url":"https://t.me/mhaya_monopoly"},
+		{"ID":3,"Enable":1,"Type":1,"Condition":{"min":1,"max":1},"Reward":[{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":5,"amount":10000},{"itemBaseType":1,"itemID":7,"amount":2}],"Url":"https://www.youtube.com/@mhayaPlaytoearn"},
+		{"ID":4,"Enable":1,"Type":1,"Condition":{"min":1,"max":1},"Reward":[{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":5,"amount":10000},{"itemBaseType":1,"itemID":7,"amount":2}],"Url":"https://discord.com/invite/mhaya"},
+		{"ID":5,"Enable":1,"Type":2,"Condition":{"min":1,"max":5},"Reward":[{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":7,"amount":2}],"Url":""},
+		{"ID":6,"Enable":1,"Type":2,"Condition":{"min":6,"max":10},"Reward":[{"itemBaseType":2,"itemID":6,"amount":15},{"itemBaseType":1,"itemID":7,"amount":3}],"Url":""},
+		{"ID":7,"Enable":1,"Type":2,"Condition":{"min":11,"max":20},"Reward":[{"itemBaseType":2,"itemID":6,"amount":20},{"itemBaseType":1,"itemID":7,"amount":4}],"Url":""},
+		{"ID":8,"Enable":1,"Type":2,"Condition":{"min":21,"max":30},"Reward":[{"itemBaseType":2,"itemID":6,"amount":25},{"itemBaseType":1,"itemID":7,"amount":5}],"Url":""}	
 ]

game/config/data/itemConfig.json

@@ -5,5 +5,5 @@
 		{"ID":4,"Type":4,"ItemKey":"ton"},
 		{"ID":5,"Type":1,"ItemKey":"score"},
 		{"ID":6,"Type":2,"ItemKey":"allroll"},
-		{"ID":7,"Type":1,"ItemKey":"drawsnumber"}
+		{"ID":7,"Type":1,"ItemKey":"drawsnumber"}	
 ]

game/config/data/levelConfig.json

@@ -1,12 +1,12 @@
 [
 		{"ID":1,"DiceNum":0,"Invite":0,"Ratio":1,"DiceLimit":30,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
-		{"ID":2,"DiceNum":30,"Invite":0,"Ratio":2,"DiceLimit":60,"Rule1":200,"Rule2":1200,"Rule3":5200,"Rule4":10000},
-		{"ID":3,"DiceNum":2250,"Invite":1,"Ratio":3,"DiceLimit":90,"Rule1":300,"Rule2":1800,"Rule3":7800,"Rule4":15000},
-		{"ID":4,"DiceNum":4500,"Invite":3,"Ratio":4,"DiceLimit":120,"Rule1":400,"Rule2":2400,"Rule3":10400,"Rule4":20000},
-		{"ID":5,"DiceNum":9000,"Invite":3,"Ratio":5,"DiceLimit":150,"Rule1":500,"Rule2":3000,"Rule3":13000,"Rule4":25000},
-		{"ID":6,"DiceNum":18000,"Invite":3,"Ratio":6,"DiceLimit":180,"Rule1":600,"Rule2":3600,"Rule3":15600,"Rule4":30000},
-		{"ID":7,"DiceNum":36000,"Invite":5,"Ratio":7,"DiceLimit":210,"Rule1":700,"Rule2":4200,"Rule3":18200,"Rule4":35000},
-		{"ID":8,"DiceNum":72000,"Invite":5,"Ratio":8,"DiceLimit":240,"Rule1":800,"Rule2":4800,"Rule3":20800,"Rule4":40000},
-		{"ID":9,"DiceNum":144000,"Invite":5,"Ratio":9,"DiceLimit":270,"Rule1":900,"Rule2":5400,"Rule3":23400,"Rule4":45000},
-		{"ID":10,"DiceNum":288000,"Invite":10,"Ratio":10,"DiceLimit":300,"Rule1":1000,"Rule2":6000,"Rule3":26000,"Rule4":50000}	
+		{"ID":2,"DiceNum":30,"Invite":0,"Ratio":2,"DiceLimit":60,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":3,"DiceNum":2250,"Invite":1,"Ratio":3,"DiceLimit":90,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":4,"DiceNum":4500,"Invite":3,"Ratio":4,"DiceLimit":120,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":5,"DiceNum":9000,"Invite":3,"Ratio":5,"DiceLimit":150,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":6,"DiceNum":18000,"Invite":3,"Ratio":6,"DiceLimit":180,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":7,"DiceNum":36000,"Invite":5,"Ratio":7,"DiceLimit":210,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":8,"DiceNum":72000,"Invite":5,"Ratio":8,"DiceLimit":240,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":9,"DiceNum":144000,"Invite":5,"Ratio":9,"DiceLimit":270,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":10,"DiceNum":288000,"Invite":10,"Ratio":10,"DiceLimit":300,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000}	
 ]

game/config/data/rankConfig.json

@@ -1,6 +1,6 @@
 [
 		{"ID":1,"Enable":1,"Type":1,"Source":1,"ShowTotal":100,"Reward":null,"IsBot":1,"StartTime":"","EndTime":"","ShowTime":""},
 		{"ID":2,"Enable":1,"Type":1,"Source":2,"ShowTotal":100,"Reward":null,"IsBot":1,"StartTime":"","EndTime":"","ShowTime":""},
-		{"ID":3,"Enable":1,"Type":2,"Source":2,"ShowTotal":1000,"Reward":[{"itemBaseType":4,"itemID":3,"amount":5000000000}],"IsBot":1,"StartTime":"","EndTime":"","ShowTime":""},
+		{"ID":3,"Enable":1,"Type":2,"Source":2,"ShowTotal":1000,"Reward":[{"itemBaseType":4,"itemID":3,"amount":500000000000}],"IsBot":1,"StartTime":"","EndTime":"","ShowTime":""},
 		{"ID":4,"Enable":1,"Type":1,"Source":3,"ShowTotal":100,"Reward":null,"IsBot":1,"StartTime":"","EndTime":"","ShowTime":""}	
 ]

game/config/data/rankRewardConfig.json

@@ -20,23 +20,23 @@
 		{"ID":19,"RankID":4,"Rank":{"min":11,"max":30},"Reward":[{"itemBaseType":1,"itemID":7,"amount":20},{"itemBaseType":2,"itemID":6,"amount":30}]},
 		{"ID":20,"RankID":4,"Rank":{"min":31,"max":50},"Reward":[{"itemBaseType":1,"itemID":7,"amount":10},{"itemBaseType":2,"itemID":6,"amount":20}]},
 		{"ID":21,"RankID":4,"Rank":{"min":51,"max":100},"Reward":[{"itemBaseType":1,"itemID":7,"amount":5},{"itemBaseType":2,"itemID":6,"amount":10}]},
-		{"ID":22,"RankID":3,"Rank":{"min":1,"max":1},"Reward":[{"itemBaseType":4,"itemID":3,"amount":350},{"itemBaseType":1,"itemID":5,"amount":500000000}]},
-		{"ID":23,"RankID":3,"Rank":{"min":2,"max":2},"Reward":[{"itemBaseType":4,"itemID":3,"amount":200},{"itemBaseType":1,"itemID":5,"amount":200000000}]},
-		{"ID":24,"RankID":3,"Rank":{"min":3,"max":3},"Reward":[{"itemBaseType":4,"itemID":3,"amount":100},{"itemBaseType":1,"itemID":5,"amount":100000000}]},
-		{"ID":25,"RankID":3,"Rank":{"min":4,"max":4},"Reward":[{"itemBaseType":4,"itemID":3,"amount":80},{"itemBaseType":1,"itemID":5,"amount":80000000}]},
-		{"ID":26,"RankID":3,"Rank":{"min":5,"max":5},"Reward":[{"itemBaseType":4,"itemID":3,"amount":70},{"itemBaseType":1,"itemID":5,"amount":70000000}]},
-		{"ID":27,"RankID":3,"Rank":{"min":6,"max":6},"Reward":[{"itemBaseType":4,"itemID":3,"amount":60},{"itemBaseType":1,"itemID":5,"amount":60000000}]},
-		{"ID":28,"RankID":3,"Rank":{"min":7,"max":7},"Reward":[{"itemBaseType":4,"itemID":3,"amount":50},{"itemBaseType":1,"itemID":5,"amount":50000000}]},
-		{"ID":29,"RankID":3,"Rank":{"min":8,"max":8},"Reward":[{"itemBaseType":4,"itemID":3,"amount":40},{"itemBaseType":1,"itemID":5,"amount":40000000}]},
-		{"ID":30,"RankID":3,"Rank":{"min":9,"max":9},"Reward":[{"itemBaseType":4,"itemID":3,"amount":30},{"itemBaseType":1,"itemID":5,"amount":30000000}]},
-		{"ID":31,"RankID":3,"Rank":{"min":10,"max":10},"Reward":[{"itemBaseType":4,"itemID":3,"amount":20},{"itemBaseType":1,"itemID":5,"amount":20000000}]},
-		{"ID":32,"RankID":3,"Rank":{"min":11,"max":20},"Reward":[{"itemBaseType":4,"itemID":3,"amount":18},{"itemBaseType":1,"itemID":5,"amount":18000000}]},
-		{"ID":33,"RankID":3,"Rank":{"min":21,"max":30},"Reward":[{"itemBaseType":4,"itemID":3,"amount":16},{"itemBaseType":1,"itemID":5,"amount":16000000}]},
-		{"ID":34,"RankID":3,"Rank":{"min":31,"max":40},"Reward":[{"itemBaseType":4,"itemID":3,"amount":14},{"itemBaseType":1,"itemID":5,"amount":14000000}]},
-		{"ID":35,"RankID":3,"Rank":{"min":41,"max":50},"Reward":[{"itemBaseType":4,"itemID":3,"amount":12},{"itemBaseType":1,"itemID":5,"amount":12000000}]},
-		{"ID":36,"RankID":3,"Rank":{"min":51,"max":60},"Reward":[{"itemBaseType":4,"itemID":3,"amount":10},{"itemBaseType":1,"itemID":5,"amount":10000000}]},
-		{"ID":37,"RankID":3,"Rank":{"min":61,"max":70},"Reward":[{"itemBaseType":4,"itemID":3,"amount":9},{"itemBaseType":1,"itemID":5,"amount":9000000}]},
-		{"ID":38,"RankID":3,"Rank":{"min":71,"max":80},"Reward":[{"itemBaseType":4,"itemID":3,"amount":8},{"itemBaseType":1,"itemID":5,"amount":8000000}]},
-		{"ID":39,"RankID":3,"Rank":{"min":81,"max":90},"Reward":[{"itemBaseType":4,"itemID":3,"amount":7},{"itemBaseType":1,"itemID":5,"amount":7000000}]},
-		{"ID":40,"RankID":3,"Rank":{"min":91,"max":100},"Reward":[{"itemBaseType":4,"itemID":3,"amount":6},{"itemBaseType":1,"itemID":5,"amount":6000000}]}	
+		{"ID":22,"RankID":3,"Rank":{"min":1,"max":1},"Reward":[{"itemBaseType":4,"itemID":3,"amount":35000000000},{"itemBaseType":1,"itemID":5,"amount":500000000}]},
+		{"ID":23,"RankID":3,"Rank":{"min":2,"max":2},"Reward":[{"itemBaseType":4,"itemID":3,"amount":20000000000},{"itemBaseType":1,"itemID":5,"amount":200000000}]},
+		{"ID":24,"RankID":3,"Rank":{"min":3,"max":3},"Reward":[{"itemBaseType":4,"itemID":3,"amount":10000000000},{"itemBaseType":1,"itemID":5,"amount":100000000}]},
+		{"ID":25,"RankID":3,"Rank":{"min":4,"max":4},"Reward":[{"itemBaseType":4,"itemID":3,"amount":8000000000},{"itemBaseType":1,"itemID":5,"amount":80000000}]},
+		{"ID":26,"RankID":3,"Rank":{"min":5,"max":5},"Reward":[{"itemBaseType":4,"itemID":3,"amount":7000000000},{"itemBaseType":1,"itemID":5,"amount":70000000}]},
+		{"ID":27,"RankID":3,"Rank":{"min":6,"max":6},"Reward":[{"itemBaseType":4,"itemID":3,"amount":6000000000},{"itemBaseType":1,"itemID":5,"amount":60000000}]},
+		{"ID":28,"RankID":3,"Rank":{"min":7,"max":7},"Reward":[{"itemBaseType":4,"itemID":3,"amount":5000000000},{"itemBaseType":1,"itemID":5,"amount":50000000}]},
+		{"ID":29,"RankID":3,"Rank":{"min":8,"max":8},"Reward":[{"itemBaseType":4,"itemID":3,"amount":4000000000},{"itemBaseType":1,"itemID":5,"amount":40000000}]},
+		{"ID":30,"RankID":3,"Rank":{"min":9,"max":9},"Reward":[{"itemBaseType":4,"itemID":3,"amount":3000000000},{"itemBaseType":1,"itemID":5,"amount":30000000}]},
+		{"ID":31,"RankID":3,"Rank":{"min":10,"max":10},"Reward":[{"itemBaseType":4,"itemID":3,"amount":2000000000},{"itemBaseType":1,"itemID":5,"amount":20000000}]},
+		{"ID":32,"RankID":3,"Rank":{"min":11,"max":20},"Reward":[{"itemBaseType":4,"itemID":3,"amount":1800000000},{"itemBaseType":1,"itemID":5,"amount":18000000}]},
+		{"ID":33,"RankID":3,"Rank":{"min":21,"max":30},"Reward":[{"itemBaseType":4,"itemID":3,"amount":1600000000},{"itemBaseType":1,"itemID":5,"amount":16000000}]},
+		{"ID":34,"RankID":3,"Rank":{"min":31,"max":40},"Reward":[{"itemBaseType":4,"itemID":3,"amount":1400000000},{"itemBaseType":1,"itemID":5,"amount":14000000}]},
+		{"ID":35,"RankID":3,"Rank":{"min":41,"max":50},"Reward":[{"itemBaseType":4,"itemID":3,"amount":1200000000},{"itemBaseType":1,"itemID":5,"amount":12000000}]},
+		{"ID":36,"RankID":3,"Rank":{"min":51,"max":60},"Reward":[{"itemBaseType":4,"itemID":3,"amount":1000000000},{"itemBaseType":1,"itemID":5,"amount":10000000}]},
+		{"ID":37,"RankID":3,"Rank":{"min":61,"max":70},"Reward":[{"itemBaseType":4,"itemID":3,"amount":900000000},{"itemBaseType":1,"itemID":5,"amount":9000000}]},
+		{"ID":38,"RankID":3,"Rank":{"min":71,"max":80},"Reward":[{"itemBaseType":4,"itemID":3,"amount":800000000},{"itemBaseType":1,"itemID":5,"amount":8000000}]},
+		{"ID":39,"RankID":3,"Rank":{"min":81,"max":90},"Reward":[{"itemBaseType":4,"itemID":3,"amount":700000000},{"itemBaseType":1,"itemID":5,"amount":7000000}]},
+		{"ID":40,"RankID":3,"Rank":{"min":91,"max":100},"Reward":[{"itemBaseType":4,"itemID":3,"amount":600000000},{"itemBaseType":1,"itemID":5,"amount":6000000}]}	
 ]

game/config/data/sdkConfig.json

@@ -1,5 +1,5 @@
 [
-		{"ID":1,"CallbackName":"dev","Salt":"123456","Params":null,"S3":null,"Desc":""},
-		{"ID":2,"CallbackName":"Telegram-sdk","Salt":"qwe123","Params":{"BotToken":"6558312022:AAGcpPhC5_Y22qzvkWIYauuT0L1VhJrsPQg","BtUserName":"mhaya_bot","ChatIDName":"@mhaya_monopoly","AppID":"","AppKey":"","AppUrl":"https://api.telegram.org/bot"},"S3":null,"Desc":""},
-		{"ID":3,"CallbackName":"Telegram-sdk-test","Salt":"aaabbb","Params":{"BotToken":"7323406309:AAG-ruOQwqVLy4iWrK7yP_e2hD5Bb9Cnlvg","BtUserName":"mhaya_bot","ChatIDName":"@mhaya_monopoly","AppID":"","AppKey":"","AppUrl":"https://api.telegram.org/bot"},"S3":{"AccessKey":"AKIAQE3ROQJWW6SPTUF2","SecretKey":"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","Region":"ap-southeast-1","BucketName":"mhaya-img","UID":"010438476397"},"Desc":""}	
+		{"ID":1,"CallbackName":"dev","Salt":"123456","Params":null,"Desc":""},
+		{"ID":2,"CallbackName":"Telegram-sdk","Salt":"qwe123","Params":{"BotToken":"6558312022:AAGcpPhC5_Y22qzvkWIYauuT0L1VhJrsPQg","BtUserName":"mhaya_bot","ChatIDName":"@mhaya_monopoly","AppID":"","AppKey":"","AppUrl":"https://api.telegram.org/bot"},"Desc":""},
+		{"ID":3,"CallbackName":"Telegram-sdk-test","Salt":"aaabbb","Params":{"BotToken":"7023119999:AAENbsnH0b9nDbWC60yMdINiezDeUkqOq0Y","BtUserName":"mhaya_bot","ChatIDName":"@mhaya_monopoly","AppID":"","AppKey":"","AppUrl":"https://api.telegram.org/bot"},"Desc":""}	
 ]

game/game_cluster/internal/data/achieveTaskConfig.go

@@ -16,7 +16,7 @@ type AchieveTaskConfigRow struct {
 	Order     int          //顺序
 	Enable    int          // 是否开启(0否1是)
 	Type      int          // 任务类型(1基本类型2邀请好友相关)
-	Condition int          // 完成条件
+	Condition RangeInt32   // 完成条件等级
 	Reward    []ItemReward // 奖励
 	Url       string       // 链接
 }

game/game_cluster/internal/data/dailyTaskConfig.go

@@ -15,7 +15,7 @@ type DailyTaskConfigRow struct {
 	ID        int          // #任务ID
 	Enable    int          // 是否开启(0否1是)
 	Type      int          // 任务类型(1骰子次数相关任务)
-	Condition int          // 完成条件
+	Condition RangeInt32   // 完成条件
 	Reward    []ItemReward // 奖励
 }
 

game/game_cluster/internal/mdb/models/achieveTask.go

@@ -21,7 +21,7 @@ type AchieveTaskBase struct {
 	ID        int               `json:"id" bson:"id"`               // #任务ID
 	Order     int               `json:"order" bson:"order"`         //任务客户端排序
 	Type      int               `json:"type" bson:"type"`           // 任务类型(1基本类型2邀请好友相关)
-	Condition int               `json:"condition" bson:"condition"` // 完成条件
+	Condition data.RangeInt32   `json:"condition" bson:"condition"` // 完成范围 RangeInt32               `json:"condition" bson:"condition"` // 完成条件
 	Reward    []data.ItemReward `json:"reward" bson:"reward"`       // 奖励
 	Url       string            `json:"url" bson:"url"`             // 链接
 	Num       int               `json:"num" bson:"num"`             //已完成次数

game/game_cluster/internal/mdb/models/dailyTask.go

@@ -5,7 +5,7 @@ import "github.com/mhaya/game/game_cluster/internal/data"
 type DailyTaskBase struct {
 	ID        int               `json:"id" bson:"id"`
 	Type      int               `json:"type"`                 // 任务类型(1骰子次数相关任务)
-	Condition int               `json:"condition"`            // 完成条件
+	Condition data.RangeInt32   `json:"condition"`            // 完成条件
 	Reward    []data.ItemReward `json:"reward"`               // 奖励
 	Num       int               `json:"num"`                  //进度
 	Status    int               `json:"status" bson:"status"` //完成状态0未完成1已完成2已领取奖励

game/game_cluster/internal/mdb/models/player.go

@@ -268,20 +268,20 @@ func (p *Player) FinishAchieveTaskByType1(id int) bool {
 
 // FinishAchieveTaskByType2 完成成就类型2
 func (p *Player) FinishAchieveTaskByType2() bool {
-	var cur int
+	//var range data.RangeInt32{}
 	for _, v := range p.AchieveTask {
 		if v.Type == 2 {
 			ret, ok := data.AchieveTaskConfig.Get(v.ID)
 			if !ok {
 				continue
 			}
-			if v.Num < ret.Condition && v.Num >= cur {
+			if v.Num < ret.Condition.Max && v.Num >= ret.Condition.Min {
 				p.AchieveTask[v.ID].Num += 1
 				p.AchieveTask[v.ID].Status = 1
 				p.AchieveTask[v.ID].RewardNum += 1
 				return true
 			}
-			cur = ret.Condition
+			//range = ret.Range
 		}
 	}
 	return false
@@ -293,7 +293,7 @@ func (p *Player) FinishDailyTask(tp, num int) bool {
 		for _, v := range p.DailyTask {
 			if v.Type == tp && v.Status == 0 {
 				p.DailyTask[v.ID].Num += 1
-				if p.DailyTask[v.ID].Num == v.Condition {
+				if p.DailyTask[v.ID].Num == v.Condition.Max {
 					p.DailyTask[v.ID].Status = 1
 					f = true
 					continue

game/game_cluster/nodes/game/module/player/actor_player.go

@@ -90,7 +90,11 @@ func (p *actorPlayer) OnInit() {
 	p.Timer().Add(1*time.Minute, p.upatePlayerLevelStat)
 
 	//在线用户定时刷新
-	p.Timer().Add(1*time.Minute, p.initDaily)
+	p.Timer().Add(1*time.Minute, func() {
+		if !p.isOnline {
+			p.Player.InitDaily()
+		}
+	})
 
 	//p.Timer().Add(30*time.Second, p.getAndUpdateAvatar)  //排行榜头像
 

game/game_cluster/nodes/web/controller/controller.go

@@ -96,9 +96,9 @@ func (p *Controller) Auth(c *mhayaGin.Context) (*token.Token, int32) {
 // login 根据pid获取sdkConfig，与第三方进行帐号登陆效验
 func (p *Controller) auth(c *mhayaGin.Context) {
 	var pa param.LoginReq
-	body := c.GetBody()
+	//body := c.GetBody()
 	if err := c.BindJSON(&pa); err != nil {
-		mhayaLogger.Warnf("if login err {. params=%s c.GetBody() = %s", pa, body)
+		mhayaLogger.Warnf("if login err {. params=%s ", pa)
 		code.RenderResult(c, code.PIDError)
 		return
 	}