修改bug : TG地址错误；等级奖励倍率错误

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

@@ -1,6 +1,6 @@
 [
 		{"ID":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://x.com/Mhaya_Official"},
-		{"ID":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://t.me/mhaya_official/389467"},
+		{"ID":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://t.me/mhaya_monopoly"},
 		{"ID":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,"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,"Enable":1,"Type":2,"Condition":1,"Reward":[{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":7,"amount":2}],"Url":""},

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":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}	
 ]

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

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

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

@@ -7,6 +7,7 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
+
 type PlatformConfig struct {
 	maps map[int]*PlatformConfigRow
 }
@@ -17,10 +18,12 @@ type PlatformConfigRow struct {
 	Enable int    // 是否开启（0否1是）
 }
 
+
 func (p *PlatformConfig) Name() string {
 	return "PlatformConfig"
 }
 
+
 func (p *PlatformConfig) Init() {
 	p.maps = make(map[int]*PlatformConfigRow)
 }
@@ -60,3 +63,4 @@ func (p *PlatformConfig) 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,10 +130,11 @@ 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,6 +7,7 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
+
 type achieveTaskConfig struct {
 	maps map[int]*achieveTaskConfigRow
 }
@@ -20,10 +21,12 @@ type achieveTaskConfigRow struct {
 	Url       string       // 链接
 }
 
+
 func (p *achieveTaskConfig) Name() string {
 	return "achieveTaskConfig"
 }
 
+
 func (p *achieveTaskConfig) Init() {
 	p.maps = make(map[int]*achieveTaskConfigRow)
 }
@@ -63,3 +66,4 @@ func (p *achieveTaskConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
+

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

@@ -4,40 +4,42 @@ package data
 
 import (
 	mhayaDataConfig "github.com/mhaya/components/data-config"
-	mhayaMapStructure "github.com/mhaya/extend/mapstructure"
 	"github.com/mhaya/game/game_cluster/internal/types"
+	mhayaMapStructure "github.com/mhaya/extend/mapstructure"
 )
 
 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{}
+	 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,
+	 achieveTaskConfig,
+	 dailyTaskConfig,
+	 discreteRuleConfig,
+	 drawConfig,
+	 itemConfig,
+	 levelConfig,
+	 rankConfig,
+	 rankRewardConfig,
+	 sdkConfig,
+	 weeklySignInConfig,
+	
 	)
 	return dataConfig
 }
@@ -49,4 +51,4 @@ func DecodeData(input interface{}, output interface{}) error {
 		"json",
 		types.GetDecodeHooks(),
 	)
-}
+}

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

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

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

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

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

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

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

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

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

@@ -7,6 +7,7 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
+
 type levelConfig struct {
 	maps map[int]*levelConfigRow
 }
@@ -23,10 +24,12 @@ 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)
 }
@@ -66,3 +69,4 @@ func (p *levelConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
+

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

@@ -7,6 +7,7 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
+
 type rankConfig struct {
 	maps map[int]*rankConfigRow
 }
@@ -24,10 +25,12 @@ 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)
 }
@@ -67,3 +70,4 @@ func (p *rankConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
+

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

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

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

@@ -7,6 +7,7 @@ import (
 	mhayaLogger "github.com/mhaya/logger"
 )
 
+
 type sdkConfig struct {
 	maps map[int]*sdkConfigRow
 }
@@ -19,10 +20,12 @@ type sdkConfigRow struct {
 	Desc         string   // 描述信息
 }
 
+
 func (p *sdkConfig) Name() string {
 	return "sdkConfig"
 }
 
+
 func (p *sdkConfig) Init() {
 	p.maps = make(map[int]*sdkConfigRow)
 }
@@ -62,3 +65,4 @@ func (p *sdkConfig) Contain(pk int) bool {
 	_, found := p.Get(pk)
 	return found
 }
+

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

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

ts.txt

@@ -1 +0,0 @@
-扥赛奥法赛