V2.0版本更新

components/mongo/component.go

@@ -2,7 +2,6 @@ package mhayaMongo
 
 import (
 	"context"
-	"crypto/tls"
 	"fmt"
 	"time"
 
@@ -94,13 +93,13 @@ func CreateDatabase(uri, dbName string, timeout ...time.Duration) (*mongo.Databa
 	if len(timeout) > 0 && timeout[0].Seconds() > 3 {
 		tt = timeout[0]
 	}
-	tlsConfig := &tls.Config{
-		MinVersion:               tls.VersionTLS12,
-		PreferServerCipherSuites: true,
-	}
-	o := options.Client().ApplyURI(uri).SetTLSConfig(tlsConfig)
-
-	//o := options.Client().ApplyURI(uri)
+	/*	tlsConfig := &tls.Config{
+			MinVersion:               tls.VersionTLS12,
+			PreferServerCipherSuites: true,
+		}
+		o := options.Client().ApplyURI(uri).SetTLSConfig(tlsConfig)
+	*/
+	o := options.Client().ApplyURI(uri)
 	if err := o.Validate(); err != nil {
 		return nil, err
 	}

game/config/data/discreteRuleConfig.json

@@ -11,5 +11,5 @@
 		{"ID":10,"Reward":null,"Condition":"1"},
 		{"ID":11,"Reward":null,"Condition":"1"},
 		{"ID":12,"Reward":null,"Condition":"4,6"},
-		{"ID":13,"Reward":null,"Condition":"0.1,500"}
+		{"ID":13,"Reward":null,"Condition":"0.2,2000"}
 ]

game/config/data/drawConfig.json

@@ -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":8,"Weight":1000,"Reward":[{"itemBaseType":4,"itemID":3,"amount":1000000}],"HourTotalCondition":2000,"DailyTotalCondition":7000,"WeeklyTotalCondition":0,"PersonTotalCondition":0},
+		{"ID":23,"Type":2,"Order":8,"Weight":1000,"Reward":[{"itemBaseType":4,"itemID":3,"amount":5000000}],"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}	
 ]

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":500,"Reward":null,"IsBot":1,"StartTime":"","EndTime":"","ShowTime":""},
-		{"ID":3,"Enable":0,"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":""}	
+	{"ID":1,"Enable":0,"Type":1,"Source":1,"ShowTotal":100,"Reward":null,"IsBot":1,"StartTime":"","EndTime":"","ShowTime":""},
+	{"ID":2,"Enable":1,"Type":1,"Source":2,"ShowTotal":500,"Reward":null,"IsBot":1,"StartTime":"","EndTime":"","ShowTime":""},
+	{"ID":3,"Enable":0,"Type":2,"Source":2,"ShowTotal":1000,"Reward":[{"itemBaseType":4,"itemID":3,"amount":500000000000}],"IsBot":1,"StartTime":"","EndTime":"","ShowTime":""},
+	{"ID":4,"Enable":0,"Type":1,"Source":3,"ShowTotal":100,"Reward":null,"IsBot":1,"StartTime":"","EndTime":"","ShowTime":""}
 ]

game/config/data/rankRewardConfig.json

@@ -1,42 +1,47 @@
 [
-		{"ID":1,"RankID":1,"Rank":{"min":1,"max":1},"Reward":[{"itemBaseType":1,"itemID":7,"amount":100},{"itemBaseType":2,"itemID":6,"amount":200}]},
-		{"ID":2,"RankID":1,"Rank":{"min":2,"max":2},"Reward":[{"itemBaseType":1,"itemID":7,"amount":70},{"itemBaseType":2,"itemID":6,"amount":150}]},
-		{"ID":3,"RankID":1,"Rank":{"min":3,"max":3},"Reward":[{"itemBaseType":1,"itemID":7,"amount":50},{"itemBaseType":2,"itemID":6,"amount":100}]},
-		{"ID":4,"RankID":1,"Rank":{"min":4,"max":10},"Reward":[{"itemBaseType":1,"itemID":7,"amount":30},{"itemBaseType":2,"itemID":6,"amount":50}]},
-		{"ID":5,"RankID":1,"Rank":{"min":11,"max":30},"Reward":[{"itemBaseType":1,"itemID":7,"amount":20},{"itemBaseType":2,"itemID":6,"amount":30}]},
-		{"ID":6,"RankID":1,"Rank":{"min":31,"max":50},"Reward":[{"itemBaseType":1,"itemID":7,"amount":10},{"itemBaseType":2,"itemID":6,"amount":20}]},
-		{"ID":7,"RankID":1,"Rank":{"min":51,"max":100},"Reward":[{"itemBaseType":1,"itemID":7,"amount":5},{"itemBaseType":2,"itemID":6,"amount":10}]},
-		{"ID":8,"RankID":2,"Rank":{"min":1,"max":1},"Reward":[{"itemBaseType":1,"itemID":7,"amount":100},{"itemBaseType":2,"itemID":6,"amount":200}]},
-		{"ID":9,"RankID":2,"Rank":{"min":2,"max":2},"Reward":[{"itemBaseType":1,"itemID":7,"amount":70},{"itemBaseType":2,"itemID":6,"amount":150}]},
-		{"ID":10,"RankID":2,"Rank":{"min":3,"max":3},"Reward":[{"itemBaseType":1,"itemID":7,"amount":50},{"itemBaseType":2,"itemID":6,"amount":100}]},
-		{"ID":11,"RankID":2,"Rank":{"min":4,"max":10},"Reward":[{"itemBaseType":1,"itemID":7,"amount":30},{"itemBaseType":2,"itemID":6,"amount":50}]},
-		{"ID":12,"RankID":2,"Rank":{"min":11,"max":30},"Reward":[{"itemBaseType":1,"itemID":7,"amount":20},{"itemBaseType":2,"itemID":6,"amount":30}]},
-		{"ID":13,"RankID":2,"Rank":{"min":31,"max":50},"Reward":[{"itemBaseType":1,"itemID":7,"amount":10},{"itemBaseType":2,"itemID":6,"amount":20}]},
-		{"ID":14,"RankID":2,"Rank":{"min":51,"max":100},"Reward":[{"itemBaseType":1,"itemID":7,"amount":5},{"itemBaseType":2,"itemID":6,"amount":10}]},
-		{"ID":15,"RankID":4,"Rank":{"min":1,"max":1},"Reward":[{"itemBaseType":1,"itemID":7,"amount":100},{"itemBaseType":2,"itemID":6,"amount":200}]},
-		{"ID":16,"RankID":4,"Rank":{"min":2,"max":2},"Reward":[{"itemBaseType":1,"itemID":7,"amount":70},{"itemBaseType":2,"itemID":6,"amount":150}]},
-		{"ID":17,"RankID":4,"Rank":{"min":3,"max":3},"Reward":[{"itemBaseType":1,"itemID":7,"amount":50},{"itemBaseType":2,"itemID":6,"amount":100}]},
-		{"ID":18,"RankID":4,"Rank":{"min":4,"max":10},"Reward":[{"itemBaseType":1,"itemID":7,"amount":30},{"itemBaseType":2,"itemID":6,"amount":50}]},
-		{"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":3500000000},{"itemBaseType":1,"itemID":5,"amount":50000000}]},
-		{"ID":23,"RankID":3,"Rank":{"min":2,"max":2},"Reward":[{"itemBaseType":4,"itemID":3,"amount":2000000000},{"itemBaseType":1,"itemID":5,"amount":20000000}]},
-		{"ID":24,"RankID":3,"Rank":{"min":3,"max":3},"Reward":[{"itemBaseType":4,"itemID":3,"amount":1000000000},{"itemBaseType":1,"itemID":5,"amount":10000000}]},
-		{"ID":25,"RankID":3,"Rank":{"min":4,"max":4},"Reward":[{"itemBaseType":4,"itemID":3,"amount":800000000},{"itemBaseType":1,"itemID":5,"amount":8000000}]},
-		{"ID":26,"RankID":3,"Rank":{"min":5,"max":5},"Reward":[{"itemBaseType":4,"itemID":3,"amount":700000000},{"itemBaseType":1,"itemID":5,"amount":7000000}]},
-		{"ID":27,"RankID":3,"Rank":{"min":6,"max":6},"Reward":[{"itemBaseType":4,"itemID":3,"amount":600000000},{"itemBaseType":1,"itemID":5,"amount":6000000}]},
-		{"ID":28,"RankID":3,"Rank":{"min":7,"max":7},"Reward":[{"itemBaseType":4,"itemID":3,"amount":500000000},{"itemBaseType":1,"itemID":5,"amount":5000000}]},
-		{"ID":29,"RankID":3,"Rank":{"min":8,"max":8},"Reward":[{"itemBaseType":4,"itemID":3,"amount":400000000},{"itemBaseType":1,"itemID":5,"amount":4000000}]},
-		{"ID":30,"RankID":3,"Rank":{"min":9,"max":9},"Reward":[{"itemBaseType":4,"itemID":3,"amount":300000000},{"itemBaseType":1,"itemID":5,"amount":3000000}]},
-		{"ID":31,"RankID":3,"Rank":{"min":10,"max":10},"Reward":[{"itemBaseType":4,"itemID":3,"amount":200000000},{"itemBaseType":1,"itemID":5,"amount":2000000}]},
-		{"ID":32,"RankID":3,"Rank":{"min":11,"max":20},"Reward":[{"itemBaseType":4,"itemID":3,"amount":180000000},{"itemBaseType":1,"itemID":5,"amount":1800000}]},
-		{"ID":33,"RankID":3,"Rank":{"min":21,"max":30},"Reward":[{"itemBaseType":4,"itemID":3,"amount":160000000},{"itemBaseType":1,"itemID":5,"amount":1600000}]},
-		{"ID":34,"RankID":3,"Rank":{"min":31,"max":40},"Reward":[{"itemBaseType":4,"itemID":3,"amount":140000000},{"itemBaseType":1,"itemID":5,"amount":1400000}]},
-		{"ID":35,"RankID":3,"Rank":{"min":41,"max":50},"Reward":[{"itemBaseType":4,"itemID":3,"amount":120000000},{"itemBaseType":1,"itemID":5,"amount":1200000}]},
-		{"ID":36,"RankID":3,"Rank":{"min":51,"max":60},"Reward":[{"itemBaseType":4,"itemID":3,"amount":100000000},{"itemBaseType":1,"itemID":5,"amount":1000000}]},
-		{"ID":37,"RankID":3,"Rank":{"min":61,"max":70},"Reward":[{"itemBaseType":4,"itemID":3,"amount":90000000},{"itemBaseType":1,"itemID":5,"amount":900000}]},
-		{"ID":38,"RankID":3,"Rank":{"min":71,"max":80},"Reward":[{"itemBaseType":4,"itemID":3,"amount":80000000},{"itemBaseType":1,"itemID":5,"amount":800000}]},
-		{"ID":39,"RankID":3,"Rank":{"min":81,"max":90},"Reward":[{"itemBaseType":4,"itemID":3,"amount":70000000},{"itemBaseType":1,"itemID":5,"amount":700000}]},
-		{"ID":40,"RankID":3,"Rank":{"min":91,"max":100},"Reward":[{"itemBaseType":4,"itemID":3,"amount":60000000},{"itemBaseType":1,"itemID":5,"amount":600000}]}	
+	{"ID":1,"RankID":1,"Rank":{"min":1,"max":1},"Reward":[{"itemBaseType":1,"itemID":7,"amount":100},{"itemBaseType":2,"itemID":6,"amount":200}]},
+	{"ID":2,"RankID":1,"Rank":{"min":2,"max":2},"Reward":[{"itemBaseType":1,"itemID":7,"amount":70},{"itemBaseType":2,"itemID":6,"amount":150}]},
+	{"ID":3,"RankID":1,"Rank":{"min":3,"max":3},"Reward":[{"itemBaseType":1,"itemID":7,"amount":50},{"itemBaseType":2,"itemID":6,"amount":100}]},
+	{"ID":4,"RankID":1,"Rank":{"min":4,"max":10},"Reward":[{"itemBaseType":1,"itemID":7,"amount":30},{"itemBaseType":2,"itemID":6,"amount":50}]},
+	{"ID":5,"RankID":1,"Rank":{"min":11,"max":30},"Reward":[{"itemBaseType":1,"itemID":7,"amount":20},{"itemBaseType":2,"itemID":6,"amount":30}]},
+	{"ID":6,"RankID":1,"Rank":{"min":31,"max":50},"Reward":[{"itemBaseType":1,"itemID":7,"amount":10},{"itemBaseType":2,"itemID":6,"amount":20}]},
+	{"ID":7,"RankID":1,"Rank":{"min":51,"max":100},"Reward":[{"itemBaseType":1,"itemID":7,"amount":5},{"itemBaseType":2,"itemID":6,"amount":10}]},
+	{"ID":8,"RankID":2,"Rank":{"min":1,"max":1},"Reward":[{"itemBaseType":1,"itemID":7,"amount":300},{"itemBaseType":2,"itemID":6,"amount":500},{"itemBaseType":1,"itemID":5,"amount":5000000}]},
+	{"ID":9,"RankID":2,"Rank":{"min":2,"max":2},"Reward":[{"itemBaseType":1,"itemID":7,"amount":200},{"itemBaseType":2,"itemID":6,"amount":300},{"itemBaseType":1,"itemID":5,"amount":3000000}]},
+	{"ID":10,"RankID":2,"Rank":{"min":3,"max":3},"Reward":[{"itemBaseType":1,"itemID":7,"amount":150},{"itemBaseType":2,"itemID":6,"amount":200},{"itemBaseType":1,"itemID":5,"amount":2000000}]},
+	{"ID":11,"RankID":2,"Rank":{"min":4,"max":10},"Reward":[{"itemBaseType":1,"itemID":7,"amount":100},{"itemBaseType":2,"itemID":6,"amount":100},{"itemBaseType":1,"itemID":5,"amount":1000000}]},
+	{"ID":12,"RankID":2,"Rank":{"min":11,"max":30},"Reward":[{"itemBaseType":1,"itemID":7,"amount":80},{"itemBaseType":2,"itemID":6,"amount":80},{"itemBaseType":1,"itemID":5,"amount":900000}]},
+	{"ID":13,"RankID":2,"Rank":{"min":31,"max":50},"Reward":[{"itemBaseType":1,"itemID":7,"amount":70},{"itemBaseType":2,"itemID":6,"amount":70},{"itemBaseType":1,"itemID":5,"amount":800000}]},
+	{"ID":14,"RankID":2,"Rank":{"min":51,"max":100},"Reward":[{"itemBaseType":1,"itemID":7,"amount":60},{"itemBaseType":2,"itemID":6,"amount":60},{"itemBaseType":1,"itemID":5,"amount":700000}]},
+	{"ID":41,"RankID":2,"Rank":{"min":101,"max":200},"Reward":[{"itemBaseType":1,"itemID":7,"amount":40},{"itemBaseType":2,"itemID":6,"amount":50},{"itemBaseType":1,"itemID":5,"amount":600000}]},
+	{"ID":42,"RankID":2,"Rank":{"min":201,"max":300},"Reward":[{"itemBaseType":1,"itemID":7,"amount":30},{"itemBaseType":2,"itemID":6,"amount":40},{"itemBaseType":1,"itemID":5,"amount":500000}]},
+	{"ID":43,"RankID":2,"Rank":{"min":301,"max":400},"Reward":[{"itemBaseType":1,"itemID":7,"amount":20},{"itemBaseType":2,"itemID":6,"amount":20},{"itemBaseType":1,"itemID":5,"amount":400000}]},
+	{"ID":44,"RankID":2,"Rank":{"min":401,"max":500},"Reward":[{"itemBaseType":1,"itemID":7,"amount":10},{"itemBaseType":2,"itemID":6,"amount":10},{"itemBaseType":1,"itemID":5,"amount":300000}]},
+	{"ID":45,"RankID":2,"Rank":{"min":501,"max":99999},"Reward":[{"itemBaseType":1,"itemID":5,"amount":10000}]},
+	{"ID":15,"RankID":4,"Rank":{"min":1,"max":1},"Reward":[{"itemBaseType":1,"itemID":7,"amount":100},{"itemBaseType":2,"itemID":6,"amount":200}]},
+	{"ID":16,"RankID":4,"Rank":{"min":2,"max":2},"Reward":[{"itemBaseType":1,"itemID":7,"amount":70},{"itemBaseType":2,"itemID":6,"amount":150}]},
+	{"ID":17,"RankID":4,"Rank":{"min":3,"max":3},"Reward":[{"itemBaseType":1,"itemID":7,"amount":50},{"itemBaseType":2,"itemID":6,"amount":100}]},
+	{"ID":18,"RankID":4,"Rank":{"min":4,"max":10},"Reward":[{"itemBaseType":1,"itemID":7,"amount":30},{"itemBaseType":2,"itemID":6,"amount":50}]},
+	{"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":3500000000},{"itemBaseType":1,"itemID":5,"amount":50000000}]},
+	{"ID":23,"RankID":3,"Rank":{"min":2,"max":2},"Reward":[{"itemBaseType":4,"itemID":3,"amount":2000000000},{"itemBaseType":1,"itemID":5,"amount":20000000}]},
+	{"ID":24,"RankID":3,"Rank":{"min":3,"max":3},"Reward":[{"itemBaseType":4,"itemID":3,"amount":1000000000},{"itemBaseType":1,"itemID":5,"amount":10000000}]},
+	{"ID":25,"RankID":3,"Rank":{"min":4,"max":4},"Reward":[{"itemBaseType":4,"itemID":3,"amount":800000000},{"itemBaseType":1,"itemID":5,"amount":8000000}]},
+	{"ID":26,"RankID":3,"Rank":{"min":5,"max":5},"Reward":[{"itemBaseType":4,"itemID":3,"amount":700000000},{"itemBaseType":1,"itemID":5,"amount":7000000}]},
+	{"ID":27,"RankID":3,"Rank":{"min":6,"max":6},"Reward":[{"itemBaseType":4,"itemID":3,"amount":600000000},{"itemBaseType":1,"itemID":5,"amount":6000000}]},
+	{"ID":28,"RankID":3,"Rank":{"min":7,"max":7},"Reward":[{"itemBaseType":4,"itemID":3,"amount":500000000},{"itemBaseType":1,"itemID":5,"amount":5000000}]},
+	{"ID":29,"RankID":3,"Rank":{"min":8,"max":8},"Reward":[{"itemBaseType":4,"itemID":3,"amount":400000000},{"itemBaseType":1,"itemID":5,"amount":4000000}]},
+	{"ID":30,"RankID":3,"Rank":{"min":9,"max":9},"Reward":[{"itemBaseType":4,"itemID":3,"amount":300000000},{"itemBaseType":1,"itemID":5,"amount":3000000}]},
+	{"ID":31,"RankID":3,"Rank":{"min":10,"max":10},"Reward":[{"itemBaseType":4,"itemID":3,"amount":200000000},{"itemBaseType":1,"itemID":5,"amount":2000000}]},
+	{"ID":32,"RankID":3,"Rank":{"min":11,"max":20},"Reward":[{"itemBaseType":4,"itemID":3,"amount":180000000},{"itemBaseType":1,"itemID":5,"amount":1800000}]},
+	{"ID":33,"RankID":3,"Rank":{"min":21,"max":30},"Reward":[{"itemBaseType":4,"itemID":3,"amount":160000000},{"itemBaseType":1,"itemID":5,"amount":1600000}]},
+	{"ID":34,"RankID":3,"Rank":{"min":31,"max":40},"Reward":[{"itemBaseType":4,"itemID":3,"amount":140000000},{"itemBaseType":1,"itemID":5,"amount":1400000}]},
+	{"ID":35,"RankID":3,"Rank":{"min":41,"max":50},"Reward":[{"itemBaseType":4,"itemID":3,"amount":120000000},{"itemBaseType":1,"itemID":5,"amount":1200000}]},
+	{"ID":36,"RankID":3,"Rank":{"min":51,"max":60},"Reward":[{"itemBaseType":4,"itemID":3,"amount":100000000},{"itemBaseType":1,"itemID":5,"amount":1000000}]},
+	{"ID":37,"RankID":3,"Rank":{"min":61,"max":70},"Reward":[{"itemBaseType":4,"itemID":3,"amount":90000000},{"itemBaseType":1,"itemID":5,"amount":900000}]},
+	{"ID":38,"RankID":3,"Rank":{"min":71,"max":80},"Reward":[{"itemBaseType":4,"itemID":3,"amount":80000000},{"itemBaseType":1,"itemID":5,"amount":800000}]},
+	{"ID":39,"RankID":3,"Rank":{"min":81,"max":90},"Reward":[{"itemBaseType":4,"itemID":3,"amount":70000000},{"itemBaseType":1,"itemID":5,"amount":700000}]},
+	{"ID":40,"RankID":3,"Rank":{"min":91,"max":100},"Reward":[{"itemBaseType":4,"itemID":3,"amount":60000000},{"itemBaseType":1,"itemID":5,"amount":600000}]}
 ]

game/game_cluster/internal/mdb/component.go

@@ -1,7 +1,6 @@
 package mdb
 
 import (
-	"crypto/tls"
 	"github.com/go-redis/redis/v8"
 	mhayaMongo "github.com/mhaya/components/mongo"
 	clog "github.com/mhaya/logger"
@@ -37,15 +36,15 @@ func (p *ActorDB) OnInit() {
 		clog.Panic("game_db_id not found")
 	}
 	redisConfig := cprofile.GetConfig("redis")
-	tlsConfig := &tls.Config{
+	/*	tlsConfig := &tls.Config{
 		MinVersion:               tls.VersionTLS12,
 		PreferServerCipherSuites: true,
-	}
+	}*/
 	RDB = redis.NewUniversalClient(&redis.UniversalOptions{
-		Addrs:     []string{redisConfig.GetString("address")},
-		Password:  redisConfig.GetString("password"),
-		DB:        redisConfig.GetInt("db"),
-		TLSConfig: tlsConfig,
+		Addrs:    []string{redisConfig.GetString("address")},
+		Password: redisConfig.GetString("password"),
+		DB:       redisConfig.GetInt("db"),
+		//	TLSConfig: tlsConfig,
 	})
 
 	if p.App().NodeId() == "m-center" {

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

@@ -6,9 +6,10 @@ import (
 )
 
 type CashOutRecord struct {
-	UserName    string `json:"userName" bson:"userName"`        // 用户名字
-	NickName    string `json:"nickName" bson:"nickName"`        // 昵称
-	Status      int    `json:"status" bson:"status"`            // 0:未审核 1:审核通过 2:审核失败
+	UserName    string `json:"userName" bson:"userName"` // 用户名字
+	NickName    string `json:"nickName" bson:"nickName"` // 昵称
+	Status      int    `json:"status" bson:"status"`     // 0:未审核 1:审核通过 2:审核失败
+	OpenId      string `json:"openId" bson:"openId"`
 	Amount      int    `json:"amount" bson:"amount"`            //
 	AfterAmount int    `json:"afterAmount" bson:"after_amount"` //
 	Type        int    `json:"type" bson:"type"`                // 货币内型

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

@@ -22,6 +22,7 @@ const (
 	DailyRecordTotalPoints
 	DailyRecordUProduced
 	DailyRecordUCashout
+	DailyRecordTonCashout
 )
 
 const (

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

@@ -438,7 +438,7 @@ func (p *Player) NewPlayer10Draw() {
 		MaxC := mhayaString.ToIntD(arr[1], 6)
 
 		p.Roll.NewDraw = make(map[int]int)
-		wei := []int{1, 2, 4, 5, 11, 12}
+		wei := []int{1, 2, 4, 5, 12}
 		wei2 := []int{1, 2, 4, 12}
 
 		var m []int
@@ -447,7 +447,7 @@ func (p *Player) NewPlayer10Draw() {
 			if r == 0 {
 				m = append(m, 5)
 			} else {
-				m = append(m, 11)
+				m = append(m, 5)
 			}
 		}
 		var num = len(m)
@@ -556,6 +556,10 @@ func (p *Player) DrawOnce() (*param.Draw, bool) {
 		}
 	} else {
 		curID = p.Roll.NewDraw[p.Roll.DrawTotal+1]
+		//0.1u兼容处理
+		if curID == 11 {
+			curID = 5
+		}
 	}
 
 	if d, ok := ret[curID]; ok {

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

@@ -478,7 +478,7 @@ func (p *actorPlayer) login(req *token.Token) (*models.Player, int32) {
 	p.Player.InitSignIn()
 	p.Player.InitAchieveTask()
 
-	p.updPassWordTime()
+	//p.updPassWordTime()
 
 	p.getAndUpdateAvatar()
 	//检查提现

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

@@ -2,6 +2,9 @@ package player
 
 import (
 	"context"
+	"log"
+	"time"
+
 	mhayaCrypto "github.com/mhaya/extend/crypto"
 	cstring "github.com/mhaya/extend/string"
 	mhayaTime "github.com/mhaya/extend/time"
@@ -15,8 +18,6 @@ import (
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo/options"
-	"log"
-	"time"
 )
 
 func (p *actorPlayer) cashOut(req *param.CashOutReq) int32 {
@@ -47,8 +48,9 @@ func (p *actorPlayer) cashOut(req *param.CashOutReq) int32 {
 		rs, err := mdb.MDB.Collection(constant.CNameCashOutRecord).InsertOne(context.Background(), &models.CashOutRecord{
 			UserName:    p.Player.UserName,
 			NickName:    p.Player.NickName,
+			OpenId:      p.Player.OpenId,
 			Status:      0,
-			Type:        1,
+			Type:        req.Tp,
 			AfterAmount: old,
 			Amount:      num,
 			Address:     p.Player.TonWall,
@@ -59,9 +61,10 @@ func (p *actorPlayer) cashOut(req *param.CashOutReq) int32 {
 		}
 		p.Player.IsCashOut = 1
 		p.dirty = true
-		p.cashOutStat(num)
+		p.cashOutStat(req.Tp, num)
+
+		p.Player.SetPlayerRewardLog(models.SourceCashOut, 0, []data.ItemReward{}, []data.ItemReward{{4, id, num}}, rs.InsertedID)
 
-		p.Player.SetPlayerRewardLog(models.SourceCashOut, 0, []data.ItemReward{}, []data.ItemReward{{4, models.ItemU, num}}, rs.InsertedID)
 	} else {
 		return code.NotEnoughItemsError
 	}

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

@@ -22,7 +22,7 @@ func (p *actorPlayer) invite() {
 	}
 	p.Player.Pid = pid
 	p.Player.SetInvite(pid)
-clog.Infof("player invite,playerName：%v, inviteName：%v", p.Player.UserName, pid)
+	clog.Infof("player invite,playerName：%v, inviteName：%v", p.Player.UserName, pid)
 }
 
 func (p *actorPlayer) inviteRecord() (*param.WeeklyRankConfigResp, int32) {
@@ -130,10 +130,10 @@ func (p *actorPlayer) inviteClaimRatio() int32 {
 		return code.OK
 	}
 
-	beforeNum := p.Player.Item[models.ItemScore].Num
-	p.Player.Item[models.ItemScore].Num = beforeNum + claimScore
+	p.Player.Item[models.ItemScore].Add(claimScore)
+
+	p.dirty = true
 
 	mdb.RDB.Del(context.Background(), key)
 	return code.OK
 }
-

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

@@ -45,8 +45,13 @@ func (p *actorPlayer) itemStat(item map[int]*data.ItemReward) {
 	}
 }
 
-func (p *actorPlayer) cashOutStat(num int) {
-	models.SetDailyRecord(p.Account.Platform, p.Account.Channel, models.DailyRecordUCashout, num)
+func (p *actorPlayer) cashOutStat(tp, num int) {
+	if tp == 1 {
+		models.SetDailyRecord(p.Account.Platform, p.Account.Channel, models.DailyRecordUCashout, num)
+	} else if tp == 2 {
+		models.SetDailyRecord(p.Account.Platform, p.Account.Channel, models.DailyRecordTonCashout, num)
+	}
+
 }
 
 func (p *actorPlayer) playerStart() {

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

@@ -19,7 +19,7 @@ func (p *Controller) cashOut(c *mhayaGin.Context) {
 		code.RenderResult(c, code.Error)
 		return
 	}
-	if pa.Tp == 0 || len(pa.PassWord) < 8 || len(pa.PassWord) > 50 {
+	if pa.Tp == 0 {
 		code.RenderResult(c, code.Error)
 		return
 	}

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

@@ -34,14 +34,12 @@ func (p *Controller) invite(c *mhayaGin.Context) {
 func (p *Controller) inviteRewardRatio(c *mhayaGin.Context) {
 
 	token, err := p.Auth(c)
-	_, err := p.Auth(c)
 	if code.IsFail(err) {
 		mhayaLogger.Warnf("if inviteRewardRatio token err {. params=%s", c.GetHeader(constant.Token))
 		code.RenderResult(c, code.AccountTokenValidateFail)
 		return
 	}
 
-	code.RenderResult(c, code.OK)
 	ctl, ok := p.GetChildActor(token.PlayerID)
 	if !ok {
 		code.RenderResult(c, code.Error)