Merge branch 'master' of http://192.168.0.111:3000/tgbot/data

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

@@ -9,7 +9,7 @@
 		{"ID":8,"Type":1,"Order":7,"Weight":0,"Reward":[{"itemBaseType":4,"itemID":3,"amount":100000000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":0},
 		{"ID":9,"Type":1,"Order":5,"Weight":0,"Reward":[{"itemBaseType":4,"itemID":3,"amount":1000000000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":0},
 		{"ID":10,"Type":1,"Order":12,"Weight":0,"Reward":[{"itemBaseType":4,"itemID":4,"amount":1000000000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":0},
-		{"ID":11,"Type":1,"Order":4,"Weight":3000,"Reward":[{"itemBaseType":4,"itemID":3,"amount":1000000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":3},
+		{"ID":11,"Type":1,"Order":8,"Weight":3000,"Reward":[{"itemBaseType":4,"itemID":3,"amount":1000000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":3},
 		{"ID":12,"Type":1,"Order":10,"Weight":2500,"Reward":[{"itemBaseType":4,"itemID":3,"amount":100000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":3},
 		{"ID":13,"Type":2,"Order":6,"Weight":3500,"Reward":[{"itemBaseType":1,"itemID":5,"amount":10000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":0},
 		{"ID":14,"Type":2,"Order":3,"Weight":1400,"Reward":[{"itemBaseType":1,"itemID":5,"amount":100000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":0},
@@ -21,6 +21,6 @@
 		{"ID":20,"Type":2,"Order":7,"Weight":0,"Reward":[{"itemBaseType":4,"itemID":3,"amount":100000000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":0},
 		{"ID":21,"Type":2,"Order":5,"Weight":0,"Reward":[{"itemBaseType":4,"itemID":3,"amount":1000000000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":0},
 		{"ID":22,"Type":2,"Order":12,"Weight":0,"Reward":[{"itemBaseType":4,"itemID":4,"amount":1000000000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":0},
-		{"ID":23,"Type":2,"Order":4,"Weight":1000,"Reward":[{"itemBaseType":4,"itemID":3,"amount":1000000}],"HourTotalCondition":2000,"DailyTotalCondition":10000,"WeeklyTotalCondition":0,"PersonTotalCondition":0},
-		{"ID":24,"Type":2,"Order":10,"Weight":500,"Reward":[{"itemBaseType":4,"itemID":3,"amount":100000}],"HourTotalCondition":3000,"DailyTotalCondition":1000,"WeeklyTotalCondition":0,"PersonTotalCondition":0}	
+		{"ID":23,"Type":2,"Order":8,"Weight":1000,"Reward":[{"itemBaseType":4,"itemID":3,"amount":1000000}],"HourTotalCondition":2000,"DailyTotalCondition":7000,"WeeklyTotalCondition":0,"PersonTotalCondition":0},
+		{"ID":24,"Type":2,"Order":10,"Weight":500,"Reward":[{"itemBaseType":4,"itemID":3,"amount":100000}],"HourTotalCondition":0,"DailyTotalCondition":0,"WeeklyTotalCondition":0,"PersonTotalCondition":0}	
 ]

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

@@ -0,0 +1,62 @@
+// this file is auto create by program, don't edit manually
+
+package data
+
+import (
+	mhayaError "github.com/mhaya/error"
+	mhayaLogger "github.com/mhaya/logger"
+)
+
+type RuleConfig struct {
+	maps map[int]*RuleConfigRow
+}
+
+type RuleConfigRow struct {
+	ID      int // ID
+	Num     int // 注册人数
+	MaxTime int // 过期时间(按天)
+}
+
+func (p *RuleConfig) Name() string {
+	return "RuleConfig"
+}
+
+func (p *RuleConfig) Init() {
+	p.maps = make(map[int]*RuleConfigRow)
+}
+
+func (p *RuleConfig) OnLoad(maps interface{}, _ bool) (int, error) {
+	list, ok := maps.([]interface{})
+	if !ok {
+		return 0, mhayaError.Error("maps convert to []interface{} error.")
+	}
+
+	loadMaps := make(map[int]*RuleConfigRow)
+	for index, data := range list {
+		loadConfig := &RuleConfigRow{}
+		err := DecodeData(data, loadConfig)
+		if err != nil {
+			mhayaLogger.Warnf("decode error. [row = %d, %v], err = %s", index+1, loadConfig, err)
+			continue
+		}
+
+		loadMaps[loadConfig.ID] = loadConfig
+	}
+
+	p.maps = loadMaps
+
+	return len(list), nil
+}
+
+func (p *RuleConfig) OnAfterLoad(_ bool) {
+}
+
+func (p *RuleConfig) Get(pk int) (*RuleConfigRow, bool) {
+	i, found := p.maps[pk]
+	return i, found
+}
+
+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,9 @@ type RectRange struct {
 }
 
 type RoleConfig struct {
-	Names []string // 
-	Model ABAsset  // 
-	Icon  ABAsset  // 
+	Names []string //
+	Model ABAsset  //
+	Icon  ABAsset  //
 }
 
 type SdkParam struct {
@@ -106,21 +106,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 +130,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/component.go

@@ -4,42 +4,42 @@ package data
 
 import (
 	mhayaDataConfig "github.com/mhaya/components/data-config"
-	"github.com/mhaya/game/game_cluster/internal/types"
 	mhayaMapStructure "github.com/mhaya/extend/mapstructure"
+	"github.com/mhaya/game/game_cluster/internal/types"
 )
 
 var (
-	 ChannelConfig = &ChannelConfig{}
-	 PlatformConfig = &PlatformConfig{}
-	 achieveTaskConfig = &achieveTaskConfig{}
-	 dailyTaskConfig = &dailyTaskConfig{}
-	 discreteRuleConfig = &discreteRuleConfig{}
-	 drawConfig = &drawConfig{}
-	 itemConfig = &itemConfig{}
-	 levelConfig = &levelConfig{}
-	 rankConfig = &rankConfig{}
-	 rankRewardConfig = &rankRewardConfig{}
-	 sdkConfig = &sdkConfig{}
-	 weeklySignInConfig = &weeklySignInConfig{}
+	ChannelConfig      = &ChannelConfig{}
+	PlatformConfig     = &PlatformConfig{}
+	RuleConfig         = &RuleConfig{}
+	achieveTaskConfig  = &achieveTaskConfig{}
+	dailyTaskConfig    = &dailyTaskConfig{}
+	discreteRuleConfig = &discreteRuleConfig{}
+	drawConfig         = &drawConfig{}
+	itemConfig         = &itemConfig{}
+	levelConfig        = &levelConfig{}
+	rankConfig         = &rankConfig{}
+	rankRewardConfig   = &rankRewardConfig{}
+	sdkConfig          = &sdkConfig{}
+	weeklySignInConfig = &weeklySignInConfig{}
 )
 
-
 func New() *mhayaDataConfig.Component {
 	dataConfig := mhayaDataConfig.New()
 	dataConfig.Register(
-	 ChannelConfig,
-	 PlatformConfig,
-	 achieveTaskConfig,
-	 dailyTaskConfig,
-	 discreteRuleConfig,
-	 drawConfig,
-	 itemConfig,
-	 levelConfig,
-	 rankConfig,
-	 rankRewardConfig,
-	 sdkConfig,
-	 weeklySignInConfig,
-	
+		ChannelConfig,
+		PlatformConfig,
+		RuleConfig,
+		achieveTaskConfig,
+		dailyTaskConfig,
+		discreteRuleConfig,
+		drawConfig,
+		itemConfig,
+		levelConfig,
+		rankConfig,
+		rankRewardConfig,
+		sdkConfig,
+		weeklySignInConfig,
 	)
 	return dataConfig
 }
@@ -51,4 +51,4 @@ func DecodeData(input interface{}, output interface{}) error {
 		"json",
 		types.GetDecodeHooks(),
 	)
-}
+}

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
 }
@@ -20,12 +19,10 @@ type sdkConfigRow struct {
 	Desc         string   // 描述信息
 }
 
-
 func (p *sdkConfig) Name() string {
 	return "sdkConfig"
 }
 
-
 func (p *sdkConfig) Init() {
 	p.maps = make(map[int]*sdkConfigRow)
 }
@@ -65,4 +62,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
 }
-