新手10连抽0.1U概率调整为配置表处理,新增IP 登录限制策略

mhaya-config/Excel/TestServer/Data/RuleConfig.json

@@ -0,0 +1,3 @@
+[
+		{"ID":1,"Num":20,"MaxTime":5}	
+]

mhaya-config/Excel/TestServer/Data/dailyTaskConfig.json

@@ -1,5 +1,5 @@
 [
-		{"ID":1,"Enable":1,"Type":1,"Condition":3,"Reward":[{"itemBaseType":1,"itemID":5,"amount":100}]},
+		{"ID":1,"Enable":1,"Type":1,"Condition":3,"Reward":[{"itemBaseType":1,"itemID":5,"amount":10000}]},
 		{"ID":2,"Enable":1,"Type":1,"Condition":30,"Reward":[{"itemBaseType":1,"itemID":1,"amount":10}]},
 		{"ID":3,"Enable":1,"Type":1,"Condition":100,"Reward":[{"itemBaseType":1,"itemID":1,"amount":30}]},
 		{"ID":4,"Enable":1,"Type":1,"Condition":500,"Reward":[{"itemBaseType":2,"itemID":6,"amount":10}]}	

mhaya-config/Excel/TestServer/Data/discreteRuleConfig.json

@@ -9,5 +9,6 @@
 		{"ID":8,"Reward":[{"itemBaseType":1,"itemID":5,"amount":10000},{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":1,"amount":10}],"Condition":""},
 		{"ID":9,"Reward":null,"Condition":"7"},
 		{"ID":10,"Reward":null,"Condition":"1"},
-		{"ID":11,"Reward":null,"Condition":"1"}	
+		{"ID":11,"Reward":null,"Condition":"1"},
+		{"ID":12,"Reward":null,"Condition":"4,6"}	
 ]

mhaya-config/Excel/TestServer/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":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}	
+		{"ID":2,"DiceNum":30,"Invite":0,"Ratio":2,"DiceLimit":30,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":3,"DiceNum":2250,"Invite":1,"Ratio":3,"DiceLimit":30,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":4,"DiceNum":4500,"Invite":3,"Ratio":4,"DiceLimit":30,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":5,"DiceNum":9000,"Invite":3,"Ratio":5,"DiceLimit":30,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":6,"DiceNum":18000,"Invite":3,"Ratio":6,"DiceLimit":30,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":7,"DiceNum":36000,"Invite":5,"Ratio":7,"DiceLimit":30,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":8,"DiceNum":72000,"Invite":5,"Ratio":8,"DiceLimit":30,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":9,"DiceNum":144000,"Invite":5,"Ratio":9,"DiceLimit":30,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000},
+		{"ID":10,"DiceNum":288000,"Invite":10,"Ratio":10,"DiceLimit":30,"Rule1":100,"Rule2":600,"Rule3":2600,"Rule4":5000}	
 ]

mhaya-config/Excel/TestServer/Data/sdkConfig.json

@@ -1,5 +1,5 @@
 [
-		{"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":""}	
+		{"ID":1,"CallbackName":"dev","Salt":"123456","Params":null,"S3":null,"Desc":""},
+		{"ID":2,"CallbackName":"Telegram-sdk","Salt":"qwe123aa","Params":{"BotToken":"6558312022:AAGcpPhC5_Y22qzvkWIYauuT0L1VhJrsPQg","BtUserName":"mhaya_bot","ChatIDName":"@mhaya_monopoly","AppID":"","AppKey":"","AppUrl":"https://api.telegram.org/bot"},"S3":{"AccessKey":"AKIAQE3ROQJW2LCZ7XEA","SecretKey":"","Region":"","BucketName":"","Uid":""},"Desc":""},
+		{"ID":3,"CallbackName":"Telegram-sdk-test","Salt":"aaabbbaaaa","Params":{"BotToken":"7023119999:AAENbsnH0b9nDbWC60yMdINiezDeUkqOq0Y","BtUserName":"mhaya_bot","ChatIDName":"@mhaya_monopoly","AppID":"","AppKey":"","AppUrl":"https://api.telegram.org/bot"},"S3":null,"Desc":""}	
 ]

mhaya-config/Excel/TestServer/Parser/ChannelConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type ChannelConfig struct {
 	maps map[int]*ChannelConfigRow
 }
@@ -18,12 +17,10 @@ type ChannelConfigRow struct {
 	Enable int    // 是否开启（0否1是）
 }
 
-
 func (p *ChannelConfig) Name() string {
 	return "ChannelConfig"
 }
 
-
 func (p *ChannelConfig) Init() {
 	p.maps = make(map[int]*ChannelConfigRow)
 }
@@ -63,4 +60,3 @@ func (p *ChannelConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/PlatformConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type PlatformConfig struct {
 	maps map[int]*PlatformConfigRow
 }
@@ -18,12 +17,10 @@ type PlatformConfigRow struct {
 	Enable int    // 是否开启（0否1是）
 }
 
-
 func (p *PlatformConfig) Name() string {
 	return "PlatformConfig"
 }
 
-
 func (p *PlatformConfig) Init() {
 	p.maps = make(map[int]*PlatformConfigRow)
 }
@@ -63,4 +60,3 @@ func (p *PlatformConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/RuleConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type RuleConfig struct {
 	maps map[int]*RuleConfigRow
 }
@@ -18,12 +17,10 @@ type RuleConfigRow struct {
 	MaxTime int // 过期时间(按天)
 }
 
-
 func (p *RuleConfig) Name() string {
 	return "RuleConfig"
 }
 
-
 func (p *RuleConfig) Init() {
 	p.maps = make(map[int]*RuleConfigRow)
 }
@@ -63,4 +60,3 @@ func (p *RuleConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/TypeDefine.go

@@ -23,9 +23,9 @@ const (
 type EnumRelationShip int8
 
 const (
-	Friends EnumRelationShip = 0 // 
-	Enemy   EnumRelationShip = 1 // 
-	Unknown EnumRelationShip = 2 // 
+	Friends EnumRelationShip = 0 //
+	Enemy   EnumRelationShip = 1 //
+	Unknown EnumRelationShip = 2 //
 )
 
 type HonorType int8
@@ -45,13 +45,13 @@ const (
 
 // custom types
 type ABAsset struct {
-	Ab     string // 
-	Prefab string // 
+	Ab     string //
+	Prefab string //
 }
 
 type AreaDoorData struct {
 	Width  float32 // 存储一个建造区域里门的位置、宽、高信息
-	Height float32 // 
+	Height float32 //
 }
 
 type ItemDiscountWeight struct {
@@ -74,7 +74,7 @@ type ItemRewardWeight struct {
 
 type RangeInt32 struct {
 	Min int // 描述一个值的范围
-	Max int // 
+	Max int //
 }
 
 type RectRange struct {
@@ -83,9 +83,17 @@ type RectRange struct {
 }
 
 type RoleConfig struct {
-	Names []string // 
-	Model ABAsset  // 
-	Icon  ABAsset  // 
+	Names []string //
+	Model ABAsset  //
+	Icon  ABAsset  //
+}
+
+type S3Param struct {
+	AccessKey  string // AccessKey:string
+	SecretKey  string // SecretKey:string
+	Region     string // Region:string
+	BucketName string // BucketName:string
+	Uid        string // Uid:string
 }
 
 type SdkParam struct {
@@ -106,21 +114,21 @@ type StoreItemWeight struct {
 }
 
 type TileArea struct {
-	Rect TileAreaRange // 
-	Add  []TilePos     // 
-	Sub  []TilePos     // 
+	Rect TileAreaRange //
+	Add  []TilePos     //
+	Sub  []TilePos     //
 }
 
 type TileAreaRange struct {
-	XMin int // 
-	XMax int // 
-	YMin int // 
-	YMax int // 
+	XMin int //
+	XMax int //
+	YMin int //
+	YMax int //
 }
 
 type TilePos struct {
-	X int // 
-	Y int // 
+	X int //
+	Y int //
 }
 
 type UnlockCondition struct {
@@ -130,11 +138,10 @@ type UnlockCondition struct {
 
 type ValueRange struct {
 	Key       string     // 描述一个key对应value的范围
-	VaueRange RangeInt32 // 
+	VaueRange RangeInt32 //
 }
 
 type Vector2 struct {
 	X int // 存储一个二维空间的坐标
-	Y int // 
+	Y int //
 }
-

mhaya-config/Excel/TestServer/Parser/achieveTaskConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type achieveTaskConfig struct {
 	maps map[int]*achieveTaskConfigRow
 }
@@ -22,12 +21,10 @@ type achieveTaskConfigRow struct {
 	Order     int          // 排序
 }
 
-
 func (p *achieveTaskConfig) Name() string {
 	return "achieveTaskConfig"
 }
 
-
 func (p *achieveTaskConfig) Init() {
 	p.maps = make(map[int]*achieveTaskConfigRow)
 }
@@ -67,4 +64,3 @@ func (p *achieveTaskConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/dailyTaskConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type dailyTaskConfig struct {
 	maps map[int]*dailyTaskConfigRow
 }
@@ -20,12 +19,10 @@ type dailyTaskConfigRow struct {
 	Reward    []ItemReward // 奖励
 }
 
-
 func (p *dailyTaskConfig) Name() string {
 	return "dailyTaskConfig"
 }
 
-
 func (p *dailyTaskConfig) Init() {
 	p.maps = make(map[int]*dailyTaskConfigRow)
 }
@@ -65,4 +62,3 @@ func (p *dailyTaskConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/discreteRuleConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type discreteRuleConfig struct {
 	maps map[int]*discreteRuleConfigRow
 }
@@ -18,12 +17,10 @@ type discreteRuleConfigRow struct {
 	Condition string       // 条件
 }
 
-
 func (p *discreteRuleConfig) Name() string {
 	return "discreteRuleConfig"
 }
 
-
 func (p *discreteRuleConfig) Init() {
 	p.maps = make(map[int]*discreteRuleConfigRow)
 }
@@ -63,4 +60,3 @@ func (p *discreteRuleConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/drawConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type drawConfig struct {
 	maps map[int]*drawConfigRow
 }
@@ -24,12 +23,10 @@ type drawConfigRow struct {
 	PersonTotalCondition int          // 个人最多中奖次数条件
 }
 
-
 func (p *drawConfig) Name() string {
 	return "drawConfig"
 }
 
-
 func (p *drawConfig) Init() {
 	p.maps = make(map[int]*drawConfigRow)
 }
@@ -69,4 +66,3 @@ func (p *drawConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/itemConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type itemConfig struct {
 	maps map[int]*itemConfigRow
 }
@@ -18,12 +17,10 @@ type itemConfigRow struct {
 	ItemKey string // 键名
 }
 
-
 func (p *itemConfig) Name() string {
 	return "itemConfig"
 }
 
-
 func (p *itemConfig) Init() {
 	p.maps = make(map[int]*itemConfigRow)
 }
@@ -63,4 +60,3 @@ func (p *itemConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/levelConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type levelConfig struct {
 	maps map[int]*levelConfigRow
 }
@@ -24,12 +23,10 @@ type levelConfigRow struct {
 	Rule4     int // 规则4豹子111/666
 }
 
-
 func (p *levelConfig) Name() string {
 	return "levelConfig"
 }
 
-
 func (p *levelConfig) Init() {
 	p.maps = make(map[int]*levelConfigRow)
 }
@@ -69,4 +66,3 @@ func (p *levelConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/rankConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type rankConfig struct {
 	maps map[int]*rankConfigRow
 }
@@ -25,12 +24,10 @@ type rankConfigRow struct {
 	ShowTime  string       // 展示时间(如2024-01-01 00:00:00)
 }
 
-
 func (p *rankConfig) Name() string {
 	return "rankConfig"
 }
 
-
 func (p *rankConfig) Init() {
 	p.maps = make(map[int]*rankConfigRow)
 }
@@ -70,4 +67,3 @@ func (p *rankConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/rankRewardConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type rankRewardConfig struct {
 	maps map[int]*rankRewardConfigRow
 }
@@ -19,12 +18,10 @@ type rankRewardConfigRow struct {
 	Reward []ItemReward // 奖励
 }
 
-
 func (p *rankRewardConfig) Name() string {
 	return "rankRewardConfig"
 }
 
-
 func (p *rankRewardConfig) Init() {
 	p.maps = make(map[int]*rankRewardConfigRow)
 }
@@ -64,4 +61,3 @@ func (p *rankRewardConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/sdkConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type sdkConfig struct {
 	maps map[int]*sdkConfigRow
 }
@@ -17,15 +16,14 @@ type sdkConfigRow struct {
 	CallbackName string   // sdk名称
 	Salt         string   // 盐
 	Params       SdkParam // sdk配置信息
+	S3           S3Param  // S3配置信息
 	Desc         string   // 描述信息
 }
 
-
 func (p *sdkConfig) Name() string {
 	return "sdkConfig"
 }
 
-
 func (p *sdkConfig) Init() {
 	p.maps = make(map[int]*sdkConfigRow)
 }
@@ -65,4 +63,3 @@ func (p *sdkConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-

mhaya-config/Excel/TestServer/Parser/weeklySignInConfig.go

@@ -7,7 +7,6 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
-
 type weeklySignInConfig struct {
 	maps map[int]*weeklySignInConfigRow
 }
@@ -17,12 +16,10 @@ type weeklySignInConfigRow struct {
 	Reward []ItemReward // 奖励
 }
 
-
 func (p *weeklySignInConfig) Name() string {
 	return "weeklySignInConfig"
 }
 
-
 func (p *weeklySignInConfig) Init() {
 	p.maps = make(map[int]*weeklySignInConfigRow)
 }
@@ -62,4 +59,3 @@ func (p *weeklySignInConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
-