From 1231f711dcc4705a572fc5cf82d4f2d54fb1a59e Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Mon, 29 Apr 2024 16:50:35 +0800 Subject: [PATCH] =?UTF-8?q?xlsx=E5=B7=A5=E5=85=B7=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/DB_PropExchange.dat | 6 +- data/DB_Task.dat | Bin 1999 -> 1999 bytes data/DB_VIP.dat | Bin 2114 -> 839 bytes data/DB_VIP.json | 85 ----------------------- protocol/server/pbdata.pb.go | 40 ++++------- protocol/server/pbdata.proto | 2 - srvdata/db_activity1.go | 10 ++- srvdata/db_actsign.go | 10 ++- srvdata/db_animalcolor.go | 10 ++- srvdata/db_artilleryrate.go | 10 ++- srvdata/db_artilleryskin.go | 10 ++- srvdata/db_blackwhite.go | 10 ++- srvdata/db_cardsjd.go | 10 ++- srvdata/db_cardsyule.go | 10 ++- srvdata/db_chessbilledrules.go | 10 ++- srvdata/db_chessmatchrules.go | 10 ++- srvdata/db_chessrank.go | 10 ++- srvdata/db_clientver.go | 10 ++- srvdata/db_collectbox.go | 10 ++- srvdata/db_collectboxgain.go | 10 ++- srvdata/db_crashsearch.go | 10 ++- srvdata/db_createroom.go | 10 ++- srvdata/db_fish.go | 10 ++- srvdata/db_fishout.go | 10 ++- srvdata/db_fishpath.go | 10 ++- srvdata/db_fishroom.go | 10 ++- srvdata/db_fishskill.go | 10 ++- srvdata/db_fortunegod_odds.go | 10 ++- srvdata/db_fortunegod_turnrate.go | 10 ++- srvdata/db_fortunegod_weight.go | 10 ++- srvdata/db_fortunegod_weightcondition.go | 10 ++- srvdata/db_game_drop.go | 10 ++- srvdata/db_game_introduction.go | 10 ++- srvdata/db_game_pet.go | 10 ++- srvdata/db_game_role.go | 10 ++- srvdata/db_gamecoinpool.go | 10 ++- srvdata/db_gamefree.go | 10 ++- srvdata/db_gameitem.go | 10 ++- srvdata/db_gamematchlevel.go | 10 ++- srvdata/db_gamerule.go | 10 ++- srvdata/db_gamesubsidy.go | 10 ++- srvdata/db_gammatchlv.go | 10 ++- srvdata/db_giftbox.go | 10 ++- srvdata/db_giftcard.go | 10 ++- srvdata/db_iceageelementrate.go | 10 ++- srvdata/db_legend_odds.go | 10 ++- srvdata/db_legend_turnrate.go | 10 ++- srvdata/db_legend_weight.go | 10 ++- srvdata/db_legend_weightcondition.go | 10 ++- srvdata/db_matchrank.go | 10 ++- srvdata/db_name.go | 10 ++- srvdata/db_nameboy.go | 10 ++- srvdata/db_namegirl.go | 10 ++- srvdata/db_newplayer.go | 10 ++- srvdata/db_phonelottery.go | 10 ++- srvdata/db_playerexp.go | 10 ++- srvdata/db_playerinfo.go | 10 ++- srvdata/db_playertype.go | 10 ++- srvdata/db_potodd.go | 10 ++- srvdata/db_propexchange.go | 10 ++- srvdata/db_rankcycle.go | 10 ++- srvdata/db_ranklevel.go | 10 ++- srvdata/db_rankreward.go | 10 ++- srvdata/db_sensitive_words.go | 10 ++- srvdata/db_slotrateweight.go | 10 ++- srvdata/db_systemchance.go | 10 ++- srvdata/db_task.go | 10 ++- srvdata/db_thirdplatformgamemapping.go | 10 ++- srvdata/db_tips.go | 10 ++- srvdata/db_vip.go | 10 ++- tools/xlsx2proto/templ/gpb_mgr.templ | 53 +++++++++++++- tools/xlsx2proto/xlsx2proto.go | 74 +++++++++++--------- 72 files changed, 689 insertions(+), 211 deletions(-) diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 1b90e94..50dfcf0 100644 --- a/data/DB_PropExchange.dat +++ b/data/DB_PropExchange.dat @@ -1,5 +1,5 @@ -6Նֆ׆ӆԆ"= +6ӆԆՆֆ׆"= .؆نچۆ"= -WۆՆ׆؆چӆԆֆن"  -]ۆӆԆՆ؆܆ֆ׆نچ" \ No newline at end of file +WՆֆچۆӆԆ׆؆ن"  +]چۆӆԆֆ׆؆Նن܆" \ No newline at end of file diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 8fdc4061386831c4e9120576a186ba8d1b425ae5..99f39bdeec500c253a1678c26d296a0292a043ff 100644 GIT binary patch delta 189 zcmX@lf1Y1~ONoO~fKh@`fl-6efYFMLV@WTY0IL-T$3h@|p^bT>LbxDAkP9KWvEv$} z85_qUppq0TPO#F3hp)xCR5&L30S#kS;MQn3bX^~89!L>P>wy;A$y1opgdkdtpjr=1 g+sL$;huMM|Xc0)Y2-Kp6&Z^0wY`3t8IjZLKo;vng>XT1L9UG**BF&J z!Act*z7_|nT?AB{!llA7(GO@Cs{*%1!=dZ?lh-qfPoB<{Jh_BjXfqG91vAv7hR!Oe Q7Lm!JY`3t8IkaGZ^aOMN1fIun=9#4;TwF5QXmb%EsMOhz#E7)0q$j%CsZQ8yt}C^MLM5kmR0 o0C@(JPqG+*C^uFhWiPx# literal 2114 zcmcK4O=}ZD7zgmo%Wihlq^XN90|l9bQkYBIw2cb(;z8C+=}899{RCbt5oKv>X#+9Q zLY1v(#G)6g7AozbmJmF6Gk8%%M5PmhLg}F(c=Fkon*9K~hyQcfh5Y!>Gug~l%iP_n zwC}&Xd}&h9dPTV}%Fwja;C$cjGy zIrBnQU%9Biy|STJUHDN|e$<(L(_VX`c5bO{M^*1+t{KRp@M@TK(!7)Q*{Og<*w$ne z#&N>a2KM0sYvp+>FSPw7a~b`YO-Uk^W0r|8kFbRSzAzxPhMRpC${5=@Nh30ew=?zS zQC6GawF#kpduILZ%15M@lw2}2Umj!i2Z%$2=DcRl!wUwjk4rsb(>Pm~4BfYjtTj(K zL}>Nq$*+etvHN8@IXms!XBhmQI0Ux+{#1O@0(_V`izN<$jn9pLI>f16kl6^Hiu0!5FtPz&V2$N<%)J2zzgQ}3VRveum${_) zn?^3+N0_trgK}>Oy;0dj+o4aXeNpx%=l2HwD04o)HMuv0?%X{ Award = 18; - repeated string ParamName = 19; - } message DB_VIPArray { diff --git a/srvdata/db_activity1.go b/srvdata/db_activity1.go index 446181b..1474dce 100644 --- a/srvdata/db_activity1.go +++ b/srvdata/db_activity1.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_Activity1Mgr = &DB_Activity1Mgr{pool: make(map[int32]*server.DB_Activity1), Datas: &server.DB_Activity1Array{}} +var PBDB_Activity1Mgr = &DB_Activity1Mgr{ + Datas: &server.DB_Activity1Array{}, + pool: make(map[int32]*server.DB_Activity1), + +} type DB_Activity1Mgr struct { Datas *server.DB_Activity1Array pool map[int32]*server.DB_Activity1 + } func (this *DB_Activity1Mgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_Activity1Mgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_Activity1Mgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_Activity1Mgr) GetData(id int32) *server.DB_Activity1 { return nil } + func init() { DataMgr.register("DB_Activity1.dat", &ProtobufDataLoader{dh: PBDB_Activity1Mgr}) } diff --git a/srvdata/db_actsign.go b/srvdata/db_actsign.go index 96d5443..c438cb2 100644 --- a/srvdata/db_actsign.go +++ b/srvdata/db_actsign.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_ActSignMgr = &DB_ActSignMgr{pool: make(map[int32]*server.DB_ActSign), Datas: &server.DB_ActSignArray{}} +var PBDB_ActSignMgr = &DB_ActSignMgr{ + Datas: &server.DB_ActSignArray{}, + pool: make(map[int32]*server.DB_ActSign), + +} type DB_ActSignMgr struct { Datas *server.DB_ActSignArray pool map[int32]*server.DB_ActSign + } func (this *DB_ActSignMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_ActSignMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_ActSignMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_ActSignMgr) GetData(id int32) *server.DB_ActSign { return nil } + func init() { DataMgr.register("DB_ActSign.dat", &ProtobufDataLoader{dh: PBDB_ActSignMgr}) } diff --git a/srvdata/db_animalcolor.go b/srvdata/db_animalcolor.go index 4da09e2..4ad5b8e 100644 --- a/srvdata/db_animalcolor.go +++ b/srvdata/db_animalcolor.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_AnimalColorMgr = &DB_AnimalColorMgr{pool: make(map[int32]*server.DB_AnimalColor), Datas: &server.DB_AnimalColorArray{}} +var PBDB_AnimalColorMgr = &DB_AnimalColorMgr{ + Datas: &server.DB_AnimalColorArray{}, + pool: make(map[int32]*server.DB_AnimalColor), + +} type DB_AnimalColorMgr struct { Datas *server.DB_AnimalColorArray pool map[int32]*server.DB_AnimalColor + } func (this *DB_AnimalColorMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_AnimalColorMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_AnimalColorMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_AnimalColorMgr) GetData(id int32) *server.DB_AnimalColor { return nil } + func init() { DataMgr.register("DB_AnimalColor.dat", &ProtobufDataLoader{dh: PBDB_AnimalColorMgr}) } diff --git a/srvdata/db_artilleryrate.go b/srvdata/db_artilleryrate.go index 76ec3aa..239aa1d 100644 --- a/srvdata/db_artilleryrate.go +++ b/srvdata/db_artilleryrate.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_ArtilleryRateMgr = &DB_ArtilleryRateMgr{pool: make(map[int32]*server.DB_ArtilleryRate), Datas: &server.DB_ArtilleryRateArray{}} +var PBDB_ArtilleryRateMgr = &DB_ArtilleryRateMgr{ + Datas: &server.DB_ArtilleryRateArray{}, + pool: make(map[int32]*server.DB_ArtilleryRate), + +} type DB_ArtilleryRateMgr struct { Datas *server.DB_ArtilleryRateArray pool map[int32]*server.DB_ArtilleryRate + } func (this *DB_ArtilleryRateMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_ArtilleryRateMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_ArtilleryRateMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_ArtilleryRateMgr) GetData(id int32) *server.DB_ArtilleryRate { return nil } + func init() { DataMgr.register("DB_ArtilleryRate.dat", &ProtobufDataLoader{dh: PBDB_ArtilleryRateMgr}) } diff --git a/srvdata/db_artilleryskin.go b/srvdata/db_artilleryskin.go index 0895439..ef86c71 100644 --- a/srvdata/db_artilleryskin.go +++ b/srvdata/db_artilleryskin.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_ArtillerySkinMgr = &DB_ArtillerySkinMgr{pool: make(map[int32]*server.DB_ArtillerySkin), Datas: &server.DB_ArtillerySkinArray{}} +var PBDB_ArtillerySkinMgr = &DB_ArtillerySkinMgr{ + Datas: &server.DB_ArtillerySkinArray{}, + pool: make(map[int32]*server.DB_ArtillerySkin), + +} type DB_ArtillerySkinMgr struct { Datas *server.DB_ArtillerySkinArray pool map[int32]*server.DB_ArtillerySkin + } func (this *DB_ArtillerySkinMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_ArtillerySkinMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_ArtillerySkinMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_ArtillerySkinMgr) GetData(id int32) *server.DB_ArtillerySkin { return nil } + func init() { DataMgr.register("DB_ArtillerySkin.dat", &ProtobufDataLoader{dh: PBDB_ArtillerySkinMgr}) } diff --git a/srvdata/db_blackwhite.go b/srvdata/db_blackwhite.go index 7147d70..93a4f9e 100644 --- a/srvdata/db_blackwhite.go +++ b/srvdata/db_blackwhite.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_BlackWhiteMgr = &DB_BlackWhiteMgr{pool: make(map[int32]*server.DB_BlackWhite), Datas: &server.DB_BlackWhiteArray{}} +var PBDB_BlackWhiteMgr = &DB_BlackWhiteMgr{ + Datas: &server.DB_BlackWhiteArray{}, + pool: make(map[int32]*server.DB_BlackWhite), + +} type DB_BlackWhiteMgr struct { Datas *server.DB_BlackWhiteArray pool map[int32]*server.DB_BlackWhite + } func (this *DB_BlackWhiteMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_BlackWhiteMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_BlackWhiteMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_BlackWhiteMgr) GetData(id int32) *server.DB_BlackWhite { return nil } + func init() { DataMgr.register("DB_BlackWhite.dat", &ProtobufDataLoader{dh: PBDB_BlackWhiteMgr}) } diff --git a/srvdata/db_cardsjd.go b/srvdata/db_cardsjd.go index e799824..8bba2ce 100644 --- a/srvdata/db_cardsjd.go +++ b/srvdata/db_cardsjd.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_CardsJDMgr = &DB_CardsJDMgr{pool: make(map[int32]*server.DB_CardsJD), Datas: &server.DB_CardsJDArray{}} +var PBDB_CardsJDMgr = &DB_CardsJDMgr{ + Datas: &server.DB_CardsJDArray{}, + pool: make(map[int32]*server.DB_CardsJD), + +} type DB_CardsJDMgr struct { Datas *server.DB_CardsJDArray pool map[int32]*server.DB_CardsJD + } func (this *DB_CardsJDMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_CardsJDMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_CardsJDMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_CardsJDMgr) GetData(id int32) *server.DB_CardsJD { return nil } + func init() { DataMgr.register("DB_CardsJD.dat", &ProtobufDataLoader{dh: PBDB_CardsJDMgr}) } diff --git a/srvdata/db_cardsyule.go b/srvdata/db_cardsyule.go index 02557d3..11dd887 100644 --- a/srvdata/db_cardsyule.go +++ b/srvdata/db_cardsyule.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_CardsYuLeMgr = &DB_CardsYuLeMgr{pool: make(map[int32]*server.DB_CardsYuLe), Datas: &server.DB_CardsYuLeArray{}} +var PBDB_CardsYuLeMgr = &DB_CardsYuLeMgr{ + Datas: &server.DB_CardsYuLeArray{}, + pool: make(map[int32]*server.DB_CardsYuLe), + +} type DB_CardsYuLeMgr struct { Datas *server.DB_CardsYuLeArray pool map[int32]*server.DB_CardsYuLe + } func (this *DB_CardsYuLeMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_CardsYuLeMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_CardsYuLeMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_CardsYuLeMgr) GetData(id int32) *server.DB_CardsYuLe { return nil } + func init() { DataMgr.register("DB_CardsYuLe.dat", &ProtobufDataLoader{dh: PBDB_CardsYuLeMgr}) } diff --git a/srvdata/db_chessbilledrules.go b/srvdata/db_chessbilledrules.go index bd1693f..833358c 100644 --- a/srvdata/db_chessbilledrules.go +++ b/srvdata/db_chessbilledrules.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_ChessBilledRulesMgr = &DB_ChessBilledRulesMgr{pool: make(map[int32]*server.DB_ChessBilledRules), Datas: &server.DB_ChessBilledRulesArray{}} +var PBDB_ChessBilledRulesMgr = &DB_ChessBilledRulesMgr{ + Datas: &server.DB_ChessBilledRulesArray{}, + pool: make(map[int32]*server.DB_ChessBilledRules), + +} type DB_ChessBilledRulesMgr struct { Datas *server.DB_ChessBilledRulesArray pool map[int32]*server.DB_ChessBilledRules + } func (this *DB_ChessBilledRulesMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_ChessBilledRulesMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_ChessBilledRulesMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_ChessBilledRulesMgr) GetData(id int32) *server.DB_ChessBilledRule return nil } + func init() { DataMgr.register("DB_ChessBilledRules.dat", &ProtobufDataLoader{dh: PBDB_ChessBilledRulesMgr}) } diff --git a/srvdata/db_chessmatchrules.go b/srvdata/db_chessmatchrules.go index 519092c..fcd6d23 100644 --- a/srvdata/db_chessmatchrules.go +++ b/srvdata/db_chessmatchrules.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_ChessMatchRulesMgr = &DB_ChessMatchRulesMgr{pool: make(map[int32]*server.DB_ChessMatchRules), Datas: &server.DB_ChessMatchRulesArray{}} +var PBDB_ChessMatchRulesMgr = &DB_ChessMatchRulesMgr{ + Datas: &server.DB_ChessMatchRulesArray{}, + pool: make(map[int32]*server.DB_ChessMatchRules), + +} type DB_ChessMatchRulesMgr struct { Datas *server.DB_ChessMatchRulesArray pool map[int32]*server.DB_ChessMatchRules + } func (this *DB_ChessMatchRulesMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_ChessMatchRulesMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_ChessMatchRulesMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_ChessMatchRulesMgr) GetData(id int32) *server.DB_ChessMatchRules return nil } + func init() { DataMgr.register("DB_ChessMatchRules.dat", &ProtobufDataLoader{dh: PBDB_ChessMatchRulesMgr}) } diff --git a/srvdata/db_chessrank.go b/srvdata/db_chessrank.go index ee3fd34..2dd482f 100644 --- a/srvdata/db_chessrank.go +++ b/srvdata/db_chessrank.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_ChessRankMgr = &DB_ChessRankMgr{pool: make(map[int32]*server.DB_ChessRank), Datas: &server.DB_ChessRankArray{}} +var PBDB_ChessRankMgr = &DB_ChessRankMgr{ + Datas: &server.DB_ChessRankArray{}, + pool: make(map[int32]*server.DB_ChessRank), + +} type DB_ChessRankMgr struct { Datas *server.DB_ChessRankArray pool map[int32]*server.DB_ChessRank + } func (this *DB_ChessRankMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_ChessRankMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_ChessRankMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_ChessRankMgr) GetData(id int32) *server.DB_ChessRank { return nil } + func init() { DataMgr.register("DB_ChessRank.dat", &ProtobufDataLoader{dh: PBDB_ChessRankMgr}) } diff --git a/srvdata/db_clientver.go b/srvdata/db_clientver.go index 94c973a..3538da4 100644 --- a/srvdata/db_clientver.go +++ b/srvdata/db_clientver.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_ClientVerMgr = &DB_ClientVerMgr{pool: make(map[int32]*server.DB_ClientVer), Datas: &server.DB_ClientVerArray{}} +var PBDB_ClientVerMgr = &DB_ClientVerMgr{ + Datas: &server.DB_ClientVerArray{}, + pool: make(map[int32]*server.DB_ClientVer), + +} type DB_ClientVerMgr struct { Datas *server.DB_ClientVerArray pool map[int32]*server.DB_ClientVer + } func (this *DB_ClientVerMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_ClientVerMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_ClientVerMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_ClientVerMgr) GetData(id int32) *server.DB_ClientVer { return nil } + func init() { DataMgr.register("DB_ClientVer.dat", &ProtobufDataLoader{dh: PBDB_ClientVerMgr}) } diff --git a/srvdata/db_collectbox.go b/srvdata/db_collectbox.go index 8430d78..7df501d 100644 --- a/srvdata/db_collectbox.go +++ b/srvdata/db_collectbox.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_CollectBoxMgr = &DB_CollectBoxMgr{pool: make(map[int32]*server.DB_CollectBox), Datas: &server.DB_CollectBoxArray{}} +var PBDB_CollectBoxMgr = &DB_CollectBoxMgr{ + Datas: &server.DB_CollectBoxArray{}, + pool: make(map[int32]*server.DB_CollectBox), + +} type DB_CollectBoxMgr struct { Datas *server.DB_CollectBoxArray pool map[int32]*server.DB_CollectBox + } func (this *DB_CollectBoxMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_CollectBoxMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_CollectBoxMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_CollectBoxMgr) GetData(id int32) *server.DB_CollectBox { return nil } + func init() { DataMgr.register("DB_CollectBox.dat", &ProtobufDataLoader{dh: PBDB_CollectBoxMgr}) } diff --git a/srvdata/db_collectboxgain.go b/srvdata/db_collectboxgain.go index dfa8820..131e212 100644 --- a/srvdata/db_collectboxgain.go +++ b/srvdata/db_collectboxgain.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_CollectBoxGainMgr = &DB_CollectBoxGainMgr{pool: make(map[int32]*server.DB_CollectBoxGain), Datas: &server.DB_CollectBoxGainArray{}} +var PBDB_CollectBoxGainMgr = &DB_CollectBoxGainMgr{ + Datas: &server.DB_CollectBoxGainArray{}, + pool: make(map[int32]*server.DB_CollectBoxGain), + +} type DB_CollectBoxGainMgr struct { Datas *server.DB_CollectBoxGainArray pool map[int32]*server.DB_CollectBoxGain + } func (this *DB_CollectBoxGainMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_CollectBoxGainMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_CollectBoxGainMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_CollectBoxGainMgr) GetData(id int32) *server.DB_CollectBoxGain { return nil } + func init() { DataMgr.register("DB_CollectBoxGain.dat", &ProtobufDataLoader{dh: PBDB_CollectBoxGainMgr}) } diff --git a/srvdata/db_crashsearch.go b/srvdata/db_crashsearch.go index 375cf9c..0460866 100644 --- a/srvdata/db_crashsearch.go +++ b/srvdata/db_crashsearch.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_CrashSearchMgr = &DB_CrashSearchMgr{pool: make(map[int32]*server.DB_CrashSearch), Datas: &server.DB_CrashSearchArray{}} +var PBDB_CrashSearchMgr = &DB_CrashSearchMgr{ + Datas: &server.DB_CrashSearchArray{}, + pool: make(map[int32]*server.DB_CrashSearch), + +} type DB_CrashSearchMgr struct { Datas *server.DB_CrashSearchArray pool map[int32]*server.DB_CrashSearch + } func (this *DB_CrashSearchMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_CrashSearchMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_CrashSearchMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_CrashSearchMgr) GetData(id int32) *server.DB_CrashSearch { return nil } + func init() { DataMgr.register("DB_CrashSearch.dat", &ProtobufDataLoader{dh: PBDB_CrashSearchMgr}) } diff --git a/srvdata/db_createroom.go b/srvdata/db_createroom.go index 451c29d..a2721fb 100644 --- a/srvdata/db_createroom.go +++ b/srvdata/db_createroom.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_CreateroomMgr = &DB_CreateroomMgr{pool: make(map[int32]*server.DB_Createroom), Datas: &server.DB_CreateroomArray{}} +var PBDB_CreateroomMgr = &DB_CreateroomMgr{ + Datas: &server.DB_CreateroomArray{}, + pool: make(map[int32]*server.DB_Createroom), + +} type DB_CreateroomMgr struct { Datas *server.DB_CreateroomArray pool map[int32]*server.DB_Createroom + } func (this *DB_CreateroomMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_CreateroomMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_CreateroomMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_CreateroomMgr) GetData(id int32) *server.DB_Createroom { return nil } + func init() { DataMgr.register("DB_Createroom.dat", &ProtobufDataLoader{dh: PBDB_CreateroomMgr}) } diff --git a/srvdata/db_fish.go b/srvdata/db_fish.go index 0d8b480..f0d6736 100644 --- a/srvdata/db_fish.go +++ b/srvdata/db_fish.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_FishMgr = &DB_FishMgr{pool: make(map[int32]*server.DB_Fish), Datas: &server.DB_FishArray{}} +var PBDB_FishMgr = &DB_FishMgr{ + Datas: &server.DB_FishArray{}, + pool: make(map[int32]*server.DB_Fish), + +} type DB_FishMgr struct { Datas *server.DB_FishArray pool map[int32]*server.DB_Fish + } func (this *DB_FishMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_FishMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_FishMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_FishMgr) GetData(id int32) *server.DB_Fish { return nil } + func init() { DataMgr.register("DB_Fish.dat", &ProtobufDataLoader{dh: PBDB_FishMgr}) } diff --git a/srvdata/db_fishout.go b/srvdata/db_fishout.go index 2b62fd0..e2e2bfa 100644 --- a/srvdata/db_fishout.go +++ b/srvdata/db_fishout.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_FishOutMgr = &DB_FishOutMgr{pool: make(map[int32]*server.DB_FishOut), Datas: &server.DB_FishOutArray{}} +var PBDB_FishOutMgr = &DB_FishOutMgr{ + Datas: &server.DB_FishOutArray{}, + pool: make(map[int32]*server.DB_FishOut), + +} type DB_FishOutMgr struct { Datas *server.DB_FishOutArray pool map[int32]*server.DB_FishOut + } func (this *DB_FishOutMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_FishOutMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_FishOutMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_FishOutMgr) GetData(id int32) *server.DB_FishOut { return nil } + func init() { DataMgr.register("DB_FishOut.dat", &ProtobufDataLoader{dh: PBDB_FishOutMgr}) } diff --git a/srvdata/db_fishpath.go b/srvdata/db_fishpath.go index a0ac964..bef23d9 100644 --- a/srvdata/db_fishpath.go +++ b/srvdata/db_fishpath.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_FishPathMgr = &DB_FishPathMgr{pool: make(map[int32]*server.DB_FishPath), Datas: &server.DB_FishPathArray{}} +var PBDB_FishPathMgr = &DB_FishPathMgr{ + Datas: &server.DB_FishPathArray{}, + pool: make(map[int32]*server.DB_FishPath), + +} type DB_FishPathMgr struct { Datas *server.DB_FishPathArray pool map[int32]*server.DB_FishPath + } func (this *DB_FishPathMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_FishPathMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_FishPathMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_FishPathMgr) GetData(id int32) *server.DB_FishPath { return nil } + func init() { DataMgr.register("DB_FishPath.dat", &ProtobufDataLoader{dh: PBDB_FishPathMgr}) } diff --git a/srvdata/db_fishroom.go b/srvdata/db_fishroom.go index efc942a..ab1e06b 100644 --- a/srvdata/db_fishroom.go +++ b/srvdata/db_fishroom.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_FishRoomMgr = &DB_FishRoomMgr{pool: make(map[int32]*server.DB_FishRoom), Datas: &server.DB_FishRoomArray{}} +var PBDB_FishRoomMgr = &DB_FishRoomMgr{ + Datas: &server.DB_FishRoomArray{}, + pool: make(map[int32]*server.DB_FishRoom), + +} type DB_FishRoomMgr struct { Datas *server.DB_FishRoomArray pool map[int32]*server.DB_FishRoom + } func (this *DB_FishRoomMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_FishRoomMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_FishRoomMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_FishRoomMgr) GetData(id int32) *server.DB_FishRoom { return nil } + func init() { DataMgr.register("DB_FishRoom.dat", &ProtobufDataLoader{dh: PBDB_FishRoomMgr}) } diff --git a/srvdata/db_fishskill.go b/srvdata/db_fishskill.go index 9d53dd5..23be2f5 100644 --- a/srvdata/db_fishskill.go +++ b/srvdata/db_fishskill.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_FishSkillMgr = &DB_FishSkillMgr{pool: make(map[int32]*server.DB_FishSkill), Datas: &server.DB_FishSkillArray{}} +var PBDB_FishSkillMgr = &DB_FishSkillMgr{ + Datas: &server.DB_FishSkillArray{}, + pool: make(map[int32]*server.DB_FishSkill), + +} type DB_FishSkillMgr struct { Datas *server.DB_FishSkillArray pool map[int32]*server.DB_FishSkill + } func (this *DB_FishSkillMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_FishSkillMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_FishSkillMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_FishSkillMgr) GetData(id int32) *server.DB_FishSkill { return nil } + func init() { DataMgr.register("DB_FishSkill.dat", &ProtobufDataLoader{dh: PBDB_FishSkillMgr}) } diff --git a/srvdata/db_fortunegod_odds.go b/srvdata/db_fortunegod_odds.go index 709d110..4cb7978 100644 --- a/srvdata/db_fortunegod_odds.go +++ b/srvdata/db_fortunegod_odds.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_FortuneGod_OddsMgr = &DB_FortuneGod_OddsMgr{pool: make(map[int32]*server.DB_FortuneGod_Odds), Datas: &server.DB_FortuneGod_OddsArray{}} +var PBDB_FortuneGod_OddsMgr = &DB_FortuneGod_OddsMgr{ + Datas: &server.DB_FortuneGod_OddsArray{}, + pool: make(map[int32]*server.DB_FortuneGod_Odds), + +} type DB_FortuneGod_OddsMgr struct { Datas *server.DB_FortuneGod_OddsArray pool map[int32]*server.DB_FortuneGod_Odds + } func (this *DB_FortuneGod_OddsMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_FortuneGod_OddsMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_FortuneGod_OddsMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_FortuneGod_OddsMgr) GetData(id int32) *server.DB_FortuneGod_Odds return nil } + func init() { DataMgr.register("DB_FortuneGod_Odds.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_OddsMgr}) } diff --git a/srvdata/db_fortunegod_turnrate.go b/srvdata/db_fortunegod_turnrate.go index 1c0b884..39bc290 100644 --- a/srvdata/db_fortunegod_turnrate.go +++ b/srvdata/db_fortunegod_turnrate.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_FortuneGod_TurnRateMgr = &DB_FortuneGod_TurnRateMgr{pool: make(map[int32]*server.DB_FortuneGod_TurnRate), Datas: &server.DB_FortuneGod_TurnRateArray{}} +var PBDB_FortuneGod_TurnRateMgr = &DB_FortuneGod_TurnRateMgr{ + Datas: &server.DB_FortuneGod_TurnRateArray{}, + pool: make(map[int32]*server.DB_FortuneGod_TurnRate), + +} type DB_FortuneGod_TurnRateMgr struct { Datas *server.DB_FortuneGod_TurnRateArray pool map[int32]*server.DB_FortuneGod_TurnRate + } func (this *DB_FortuneGod_TurnRateMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_FortuneGod_TurnRateMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_FortuneGod_TurnRateMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_FortuneGod_TurnRateMgr) GetData(id int32) *server.DB_FortuneGod_T return nil } + func init() { DataMgr.register("DB_FortuneGod_TurnRate.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_TurnRateMgr}) } diff --git a/srvdata/db_fortunegod_weight.go b/srvdata/db_fortunegod_weight.go index edc188f..a417a7c 100644 --- a/srvdata/db_fortunegod_weight.go +++ b/srvdata/db_fortunegod_weight.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_FortuneGod_WeightMgr = &DB_FortuneGod_WeightMgr{pool: make(map[int32]*server.DB_FortuneGod_Weight), Datas: &server.DB_FortuneGod_WeightArray{}} +var PBDB_FortuneGod_WeightMgr = &DB_FortuneGod_WeightMgr{ + Datas: &server.DB_FortuneGod_WeightArray{}, + pool: make(map[int32]*server.DB_FortuneGod_Weight), + +} type DB_FortuneGod_WeightMgr struct { Datas *server.DB_FortuneGod_WeightArray pool map[int32]*server.DB_FortuneGod_Weight + } func (this *DB_FortuneGod_WeightMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_FortuneGod_WeightMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_FortuneGod_WeightMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_FortuneGod_WeightMgr) GetData(id int32) *server.DB_FortuneGod_Wei return nil } + func init() { DataMgr.register("DB_FortuneGod_Weight.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_WeightMgr}) } diff --git a/srvdata/db_fortunegod_weightcondition.go b/srvdata/db_fortunegod_weightcondition.go index 47bbc7d..1888f3a 100644 --- a/srvdata/db_fortunegod_weightcondition.go +++ b/srvdata/db_fortunegod_weightcondition.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_FortuneGod_WeightConditionMgr = &DB_FortuneGod_WeightConditionMgr{pool: make(map[int32]*server.DB_FortuneGod_WeightCondition), Datas: &server.DB_FortuneGod_WeightConditionArray{}} +var PBDB_FortuneGod_WeightConditionMgr = &DB_FortuneGod_WeightConditionMgr{ + Datas: &server.DB_FortuneGod_WeightConditionArray{}, + pool: make(map[int32]*server.DB_FortuneGod_WeightCondition), + +} type DB_FortuneGod_WeightConditionMgr struct { Datas *server.DB_FortuneGod_WeightConditionArray pool map[int32]*server.DB_FortuneGod_WeightCondition + } func (this *DB_FortuneGod_WeightConditionMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_FortuneGod_WeightConditionMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_FortuneGod_WeightConditionMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_FortuneGod_WeightConditionMgr) GetData(id int32) *server.DB_Fortu return nil } + func init() { DataMgr.register("DB_FortuneGod_WeightCondition.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_WeightConditionMgr}) } diff --git a/srvdata/db_game_drop.go b/srvdata/db_game_drop.go index 26ef2e6..9a09677 100644 --- a/srvdata/db_game_drop.go +++ b/srvdata/db_game_drop.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_Game_DropMgr = &DB_Game_DropMgr{pool: make(map[int32]*server.DB_Game_Drop), Datas: &server.DB_Game_DropArray{}} +var PBDB_Game_DropMgr = &DB_Game_DropMgr{ + Datas: &server.DB_Game_DropArray{}, + pool: make(map[int32]*server.DB_Game_Drop), + +} type DB_Game_DropMgr struct { Datas *server.DB_Game_DropArray pool map[int32]*server.DB_Game_Drop + } func (this *DB_Game_DropMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_Game_DropMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_Game_DropMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_Game_DropMgr) GetData(id int32) *server.DB_Game_Drop { return nil } + func init() { DataMgr.register("DB_Game_Drop.dat", &ProtobufDataLoader{dh: PBDB_Game_DropMgr}) } diff --git a/srvdata/db_game_introduction.go b/srvdata/db_game_introduction.go index 6a7e7d1..819d339 100644 --- a/srvdata/db_game_introduction.go +++ b/srvdata/db_game_introduction.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_Game_IntroductionMgr = &DB_Game_IntroductionMgr{pool: make(map[int32]*server.DB_Game_Introduction), Datas: &server.DB_Game_IntroductionArray{}} +var PBDB_Game_IntroductionMgr = &DB_Game_IntroductionMgr{ + Datas: &server.DB_Game_IntroductionArray{}, + pool: make(map[int32]*server.DB_Game_Introduction), + +} type DB_Game_IntroductionMgr struct { Datas *server.DB_Game_IntroductionArray pool map[int32]*server.DB_Game_Introduction + } func (this *DB_Game_IntroductionMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_Game_IntroductionMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_Game_IntroductionMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_Game_IntroductionMgr) GetData(id int32) *server.DB_Game_Introduct return nil } + func init() { DataMgr.register("DB_Game_Introduction.dat", &ProtobufDataLoader{dh: PBDB_Game_IntroductionMgr}) } diff --git a/srvdata/db_game_pet.go b/srvdata/db_game_pet.go index 0bf3d2e..275e373 100644 --- a/srvdata/db_game_pet.go +++ b/srvdata/db_game_pet.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_Game_PetMgr = &DB_Game_PetMgr{pool: make(map[int32]*server.DB_Game_Pet), Datas: &server.DB_Game_PetArray{}} +var PBDB_Game_PetMgr = &DB_Game_PetMgr{ + Datas: &server.DB_Game_PetArray{}, + pool: make(map[int32]*server.DB_Game_Pet), + +} type DB_Game_PetMgr struct { Datas *server.DB_Game_PetArray pool map[int32]*server.DB_Game_Pet + } func (this *DB_Game_PetMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_Game_PetMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_Game_PetMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_Game_PetMgr) GetData(id int32) *server.DB_Game_Pet { return nil } + func init() { DataMgr.register("DB_Game_Pet.dat", &ProtobufDataLoader{dh: PBDB_Game_PetMgr}) } diff --git a/srvdata/db_game_role.go b/srvdata/db_game_role.go index bd48bfd..b89ab9e 100644 --- a/srvdata/db_game_role.go +++ b/srvdata/db_game_role.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_Game_RoleMgr = &DB_Game_RoleMgr{pool: make(map[int32]*server.DB_Game_Role), Datas: &server.DB_Game_RoleArray{}} +var PBDB_Game_RoleMgr = &DB_Game_RoleMgr{ + Datas: &server.DB_Game_RoleArray{}, + pool: make(map[int32]*server.DB_Game_Role), + +} type DB_Game_RoleMgr struct { Datas *server.DB_Game_RoleArray pool map[int32]*server.DB_Game_Role + } func (this *DB_Game_RoleMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_Game_RoleMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_Game_RoleMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_Game_RoleMgr) GetData(id int32) *server.DB_Game_Role { return nil } + func init() { DataMgr.register("DB_Game_Role.dat", &ProtobufDataLoader{dh: PBDB_Game_RoleMgr}) } diff --git a/srvdata/db_gamecoinpool.go b/srvdata/db_gamecoinpool.go index d1c478f..6ba951c 100644 --- a/srvdata/db_gamecoinpool.go +++ b/srvdata/db_gamecoinpool.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_GameCoinPoolMgr = &DB_GameCoinPoolMgr{pool: make(map[int32]*server.DB_GameCoinPool), Datas: &server.DB_GameCoinPoolArray{}} +var PBDB_GameCoinPoolMgr = &DB_GameCoinPoolMgr{ + Datas: &server.DB_GameCoinPoolArray{}, + pool: make(map[int32]*server.DB_GameCoinPool), + +} type DB_GameCoinPoolMgr struct { Datas *server.DB_GameCoinPoolArray pool map[int32]*server.DB_GameCoinPool + } func (this *DB_GameCoinPoolMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_GameCoinPoolMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_GameCoinPoolMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_GameCoinPoolMgr) GetData(id int32) *server.DB_GameCoinPool { return nil } + func init() { DataMgr.register("DB_GameCoinPool.dat", &ProtobufDataLoader{dh: PBDB_GameCoinPoolMgr}) } diff --git a/srvdata/db_gamefree.go b/srvdata/db_gamefree.go index 8f59a79..325008a 100644 --- a/srvdata/db_gamefree.go +++ b/srvdata/db_gamefree.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_GameFreeMgr = &DB_GameFreeMgr{pool: make(map[int32]*server.DB_GameFree), Datas: &server.DB_GameFreeArray{}} +var PBDB_GameFreeMgr = &DB_GameFreeMgr{ + Datas: &server.DB_GameFreeArray{}, + pool: make(map[int32]*server.DB_GameFree), + +} type DB_GameFreeMgr struct { Datas *server.DB_GameFreeArray pool map[int32]*server.DB_GameFree + } func (this *DB_GameFreeMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_GameFreeMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_GameFreeMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_GameFreeMgr) GetData(id int32) *server.DB_GameFree { return nil } + func init() { DataMgr.register("DB_GameFree.dat", &ProtobufDataLoader{dh: PBDB_GameFreeMgr}) } diff --git a/srvdata/db_gameitem.go b/srvdata/db_gameitem.go index da5e908..abad399 100644 --- a/srvdata/db_gameitem.go +++ b/srvdata/db_gameitem.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_GameItemMgr = &DB_GameItemMgr{pool: make(map[int32]*server.DB_GameItem), Datas: &server.DB_GameItemArray{}} +var PBDB_GameItemMgr = &DB_GameItemMgr{ + Datas: &server.DB_GameItemArray{}, + pool: make(map[int32]*server.DB_GameItem), + +} type DB_GameItemMgr struct { Datas *server.DB_GameItemArray pool map[int32]*server.DB_GameItem + } func (this *DB_GameItemMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_GameItemMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_GameItemMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_GameItemMgr) GetData(id int32) *server.DB_GameItem { return nil } + func init() { DataMgr.register("DB_GameItem.dat", &ProtobufDataLoader{dh: PBDB_GameItemMgr}) } diff --git a/srvdata/db_gamematchlevel.go b/srvdata/db_gamematchlevel.go index 6b2476b..ec7a9f8 100644 --- a/srvdata/db_gamematchlevel.go +++ b/srvdata/db_gamematchlevel.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_GameMatchLevelMgr = &DB_GameMatchLevelMgr{pool: make(map[int32]*server.DB_GameMatchLevel), Datas: &server.DB_GameMatchLevelArray{}} +var PBDB_GameMatchLevelMgr = &DB_GameMatchLevelMgr{ + Datas: &server.DB_GameMatchLevelArray{}, + pool: make(map[int32]*server.DB_GameMatchLevel), + +} type DB_GameMatchLevelMgr struct { Datas *server.DB_GameMatchLevelArray pool map[int32]*server.DB_GameMatchLevel + } func (this *DB_GameMatchLevelMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_GameMatchLevelMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_GameMatchLevelMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_GameMatchLevelMgr) GetData(id int32) *server.DB_GameMatchLevel { return nil } + func init() { DataMgr.register("DB_GameMatchLevel.dat", &ProtobufDataLoader{dh: PBDB_GameMatchLevelMgr}) } diff --git a/srvdata/db_gamerule.go b/srvdata/db_gamerule.go index 46cd797..208aee0 100644 --- a/srvdata/db_gamerule.go +++ b/srvdata/db_gamerule.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_GameRuleMgr = &DB_GameRuleMgr{pool: make(map[int32]*server.DB_GameRule), Datas: &server.DB_GameRuleArray{}} +var PBDB_GameRuleMgr = &DB_GameRuleMgr{ + Datas: &server.DB_GameRuleArray{}, + pool: make(map[int32]*server.DB_GameRule), + +} type DB_GameRuleMgr struct { Datas *server.DB_GameRuleArray pool map[int32]*server.DB_GameRule + } func (this *DB_GameRuleMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_GameRuleMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_GameRuleMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_GameRuleMgr) GetData(id int32) *server.DB_GameRule { return nil } + func init() { DataMgr.register("DB_GameRule.dat", &ProtobufDataLoader{dh: PBDB_GameRuleMgr}) } diff --git a/srvdata/db_gamesubsidy.go b/srvdata/db_gamesubsidy.go index 14f8b21..7ef7cda 100644 --- a/srvdata/db_gamesubsidy.go +++ b/srvdata/db_gamesubsidy.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_GameSubsidyMgr = &DB_GameSubsidyMgr{pool: make(map[int32]*server.DB_GameSubsidy), Datas: &server.DB_GameSubsidyArray{}} +var PBDB_GameSubsidyMgr = &DB_GameSubsidyMgr{ + Datas: &server.DB_GameSubsidyArray{}, + pool: make(map[int32]*server.DB_GameSubsidy), + +} type DB_GameSubsidyMgr struct { Datas *server.DB_GameSubsidyArray pool map[int32]*server.DB_GameSubsidy + } func (this *DB_GameSubsidyMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_GameSubsidyMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_GameSubsidyMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_GameSubsidyMgr) GetData(id int32) *server.DB_GameSubsidy { return nil } + func init() { DataMgr.register("DB_GameSubsidy.dat", &ProtobufDataLoader{dh: PBDB_GameSubsidyMgr}) } diff --git a/srvdata/db_gammatchlv.go b/srvdata/db_gammatchlv.go index 997af33..d6f37b6 100644 --- a/srvdata/db_gammatchlv.go +++ b/srvdata/db_gammatchlv.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_GamMatchLVMgr = &DB_GamMatchLVMgr{pool: make(map[int32]*server.DB_GamMatchLV), Datas: &server.DB_GamMatchLVArray{}} +var PBDB_GamMatchLVMgr = &DB_GamMatchLVMgr{ + Datas: &server.DB_GamMatchLVArray{}, + pool: make(map[int32]*server.DB_GamMatchLV), + +} type DB_GamMatchLVMgr struct { Datas *server.DB_GamMatchLVArray pool map[int32]*server.DB_GamMatchLV + } func (this *DB_GamMatchLVMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_GamMatchLVMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_GamMatchLVMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_GamMatchLVMgr) GetData(id int32) *server.DB_GamMatchLV { return nil } + func init() { DataMgr.register("DB_GamMatchLV.dat", &ProtobufDataLoader{dh: PBDB_GamMatchLVMgr}) } diff --git a/srvdata/db_giftbox.go b/srvdata/db_giftbox.go index 37a0c92..b198f5e 100644 --- a/srvdata/db_giftbox.go +++ b/srvdata/db_giftbox.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_GiftBoxMgr = &DB_GiftBoxMgr{pool: make(map[int32]*server.DB_GiftBox), Datas: &server.DB_GiftBoxArray{}} +var PBDB_GiftBoxMgr = &DB_GiftBoxMgr{ + Datas: &server.DB_GiftBoxArray{}, + pool: make(map[int32]*server.DB_GiftBox), + +} type DB_GiftBoxMgr struct { Datas *server.DB_GiftBoxArray pool map[int32]*server.DB_GiftBox + } func (this *DB_GiftBoxMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_GiftBoxMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_GiftBoxMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_GiftBoxMgr) GetData(id int32) *server.DB_GiftBox { return nil } + func init() { DataMgr.register("DB_GiftBox.dat", &ProtobufDataLoader{dh: PBDB_GiftBoxMgr}) } diff --git a/srvdata/db_giftcard.go b/srvdata/db_giftcard.go index 9017fd9..ead9a65 100644 --- a/srvdata/db_giftcard.go +++ b/srvdata/db_giftcard.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_GiftCardMgr = &DB_GiftCardMgr{pool: make(map[int32]*server.DB_GiftCard), Datas: &server.DB_GiftCardArray{}} +var PBDB_GiftCardMgr = &DB_GiftCardMgr{ + Datas: &server.DB_GiftCardArray{}, + pool: make(map[int32]*server.DB_GiftCard), + +} type DB_GiftCardMgr struct { Datas *server.DB_GiftCardArray pool map[int32]*server.DB_GiftCard + } func (this *DB_GiftCardMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_GiftCardMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_GiftCardMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_GiftCardMgr) GetData(id int32) *server.DB_GiftCard { return nil } + func init() { DataMgr.register("DB_GiftCard.dat", &ProtobufDataLoader{dh: PBDB_GiftCardMgr}) } diff --git a/srvdata/db_iceageelementrate.go b/srvdata/db_iceageelementrate.go index f42fcd4..f69e73d 100644 --- a/srvdata/db_iceageelementrate.go +++ b/srvdata/db_iceageelementrate.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_IceAgeElementRateMgr = &DB_IceAgeElementRateMgr{pool: make(map[int32]*server.DB_IceAgeElementRate), Datas: &server.DB_IceAgeElementRateArray{}} +var PBDB_IceAgeElementRateMgr = &DB_IceAgeElementRateMgr{ + Datas: &server.DB_IceAgeElementRateArray{}, + pool: make(map[int32]*server.DB_IceAgeElementRate), + +} type DB_IceAgeElementRateMgr struct { Datas *server.DB_IceAgeElementRateArray pool map[int32]*server.DB_IceAgeElementRate + } func (this *DB_IceAgeElementRateMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_IceAgeElementRateMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_IceAgeElementRateMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_IceAgeElementRateMgr) GetData(id int32) *server.DB_IceAgeElementR return nil } + func init() { DataMgr.register("DB_IceAgeElementRate.dat", &ProtobufDataLoader{dh: PBDB_IceAgeElementRateMgr}) } diff --git a/srvdata/db_legend_odds.go b/srvdata/db_legend_odds.go index e926398..8330f13 100644 --- a/srvdata/db_legend_odds.go +++ b/srvdata/db_legend_odds.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_Legend_OddsMgr = &DB_Legend_OddsMgr{pool: make(map[int32]*server.DB_Legend_Odds), Datas: &server.DB_Legend_OddsArray{}} +var PBDB_Legend_OddsMgr = &DB_Legend_OddsMgr{ + Datas: &server.DB_Legend_OddsArray{}, + pool: make(map[int32]*server.DB_Legend_Odds), + +} type DB_Legend_OddsMgr struct { Datas *server.DB_Legend_OddsArray pool map[int32]*server.DB_Legend_Odds + } func (this *DB_Legend_OddsMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_Legend_OddsMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_Legend_OddsMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_Legend_OddsMgr) GetData(id int32) *server.DB_Legend_Odds { return nil } + func init() { DataMgr.register("DB_Legend_Odds.dat", &ProtobufDataLoader{dh: PBDB_Legend_OddsMgr}) } diff --git a/srvdata/db_legend_turnrate.go b/srvdata/db_legend_turnrate.go index 1794023..0012c69 100644 --- a/srvdata/db_legend_turnrate.go +++ b/srvdata/db_legend_turnrate.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_Legend_TurnRateMgr = &DB_Legend_TurnRateMgr{pool: make(map[int32]*server.DB_Legend_TurnRate), Datas: &server.DB_Legend_TurnRateArray{}} +var PBDB_Legend_TurnRateMgr = &DB_Legend_TurnRateMgr{ + Datas: &server.DB_Legend_TurnRateArray{}, + pool: make(map[int32]*server.DB_Legend_TurnRate), + +} type DB_Legend_TurnRateMgr struct { Datas *server.DB_Legend_TurnRateArray pool map[int32]*server.DB_Legend_TurnRate + } func (this *DB_Legend_TurnRateMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_Legend_TurnRateMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_Legend_TurnRateMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_Legend_TurnRateMgr) GetData(id int32) *server.DB_Legend_TurnRate return nil } + func init() { DataMgr.register("DB_Legend_TurnRate.dat", &ProtobufDataLoader{dh: PBDB_Legend_TurnRateMgr}) } diff --git a/srvdata/db_legend_weight.go b/srvdata/db_legend_weight.go index b6b3190..3a5d4d1 100644 --- a/srvdata/db_legend_weight.go +++ b/srvdata/db_legend_weight.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_Legend_WeightMgr = &DB_Legend_WeightMgr{pool: make(map[int32]*server.DB_Legend_Weight), Datas: &server.DB_Legend_WeightArray{}} +var PBDB_Legend_WeightMgr = &DB_Legend_WeightMgr{ + Datas: &server.DB_Legend_WeightArray{}, + pool: make(map[int32]*server.DB_Legend_Weight), + +} type DB_Legend_WeightMgr struct { Datas *server.DB_Legend_WeightArray pool map[int32]*server.DB_Legend_Weight + } func (this *DB_Legend_WeightMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_Legend_WeightMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_Legend_WeightMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_Legend_WeightMgr) GetData(id int32) *server.DB_Legend_Weight { return nil } + func init() { DataMgr.register("DB_Legend_Weight.dat", &ProtobufDataLoader{dh: PBDB_Legend_WeightMgr}) } diff --git a/srvdata/db_legend_weightcondition.go b/srvdata/db_legend_weightcondition.go index c5cce72..1898dcd 100644 --- a/srvdata/db_legend_weightcondition.go +++ b/srvdata/db_legend_weightcondition.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_Legend_WeightConditionMgr = &DB_Legend_WeightConditionMgr{pool: make(map[int32]*server.DB_Legend_WeightCondition), Datas: &server.DB_Legend_WeightConditionArray{}} +var PBDB_Legend_WeightConditionMgr = &DB_Legend_WeightConditionMgr{ + Datas: &server.DB_Legend_WeightConditionArray{}, + pool: make(map[int32]*server.DB_Legend_WeightCondition), + +} type DB_Legend_WeightConditionMgr struct { Datas *server.DB_Legend_WeightConditionArray pool map[int32]*server.DB_Legend_WeightCondition + } func (this *DB_Legend_WeightConditionMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_Legend_WeightConditionMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_Legend_WeightConditionMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_Legend_WeightConditionMgr) GetData(id int32) *server.DB_Legend_We return nil } + func init() { DataMgr.register("DB_Legend_WeightCondition.dat", &ProtobufDataLoader{dh: PBDB_Legend_WeightConditionMgr}) } diff --git a/srvdata/db_matchrank.go b/srvdata/db_matchrank.go index de52c8c..680bc5a 100644 --- a/srvdata/db_matchrank.go +++ b/srvdata/db_matchrank.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_MatchRankMgr = &DB_MatchRankMgr{pool: make(map[int32]*server.DB_MatchRank), Datas: &server.DB_MatchRankArray{}} +var PBDB_MatchRankMgr = &DB_MatchRankMgr{ + Datas: &server.DB_MatchRankArray{}, + pool: make(map[int32]*server.DB_MatchRank), + +} type DB_MatchRankMgr struct { Datas *server.DB_MatchRankArray pool map[int32]*server.DB_MatchRank + } func (this *DB_MatchRankMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_MatchRankMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_MatchRankMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_MatchRankMgr) GetData(id int32) *server.DB_MatchRank { return nil } + func init() { DataMgr.register("DB_MatchRank.dat", &ProtobufDataLoader{dh: PBDB_MatchRankMgr}) } diff --git a/srvdata/db_name.go b/srvdata/db_name.go index 25bdada..7a2703f 100644 --- a/srvdata/db_name.go +++ b/srvdata/db_name.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_NameMgr = &DB_NameMgr{pool: make(map[int32]*server.DB_Name), Datas: &server.DB_NameArray{}} +var PBDB_NameMgr = &DB_NameMgr{ + Datas: &server.DB_NameArray{}, + pool: make(map[int32]*server.DB_Name), + +} type DB_NameMgr struct { Datas *server.DB_NameArray pool map[int32]*server.DB_Name + } func (this *DB_NameMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_NameMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_NameMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_NameMgr) GetData(id int32) *server.DB_Name { return nil } + func init() { DataMgr.register("DB_Name.dat", &ProtobufDataLoader{dh: PBDB_NameMgr}) } diff --git a/srvdata/db_nameboy.go b/srvdata/db_nameboy.go index a5bd096..51c5305 100644 --- a/srvdata/db_nameboy.go +++ b/srvdata/db_nameboy.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_NameBoyMgr = &DB_NameBoyMgr{pool: make(map[int32]*server.DB_NameBoy), Datas: &server.DB_NameBoyArray{}} +var PBDB_NameBoyMgr = &DB_NameBoyMgr{ + Datas: &server.DB_NameBoyArray{}, + pool: make(map[int32]*server.DB_NameBoy), + +} type DB_NameBoyMgr struct { Datas *server.DB_NameBoyArray pool map[int32]*server.DB_NameBoy + } func (this *DB_NameBoyMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_NameBoyMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_NameBoyMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_NameBoyMgr) GetData(id int32) *server.DB_NameBoy { return nil } + func init() { DataMgr.register("DB_NameBoy.dat", &ProtobufDataLoader{dh: PBDB_NameBoyMgr}) } diff --git a/srvdata/db_namegirl.go b/srvdata/db_namegirl.go index 1005da7..c439d1d 100644 --- a/srvdata/db_namegirl.go +++ b/srvdata/db_namegirl.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_NameGirlMgr = &DB_NameGirlMgr{pool: make(map[int32]*server.DB_NameGirl), Datas: &server.DB_NameGirlArray{}} +var PBDB_NameGirlMgr = &DB_NameGirlMgr{ + Datas: &server.DB_NameGirlArray{}, + pool: make(map[int32]*server.DB_NameGirl), + +} type DB_NameGirlMgr struct { Datas *server.DB_NameGirlArray pool map[int32]*server.DB_NameGirl + } func (this *DB_NameGirlMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_NameGirlMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_NameGirlMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_NameGirlMgr) GetData(id int32) *server.DB_NameGirl { return nil } + func init() { DataMgr.register("DB_NameGirl.dat", &ProtobufDataLoader{dh: PBDB_NameGirlMgr}) } diff --git a/srvdata/db_newplayer.go b/srvdata/db_newplayer.go index 6742acb..317b02e 100644 --- a/srvdata/db_newplayer.go +++ b/srvdata/db_newplayer.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_NewPlayerMgr = &DB_NewPlayerMgr{pool: make(map[int32]*server.DB_NewPlayer), Datas: &server.DB_NewPlayerArray{}} +var PBDB_NewPlayerMgr = &DB_NewPlayerMgr{ + Datas: &server.DB_NewPlayerArray{}, + pool: make(map[int32]*server.DB_NewPlayer), + +} type DB_NewPlayerMgr struct { Datas *server.DB_NewPlayerArray pool map[int32]*server.DB_NewPlayer + } func (this *DB_NewPlayerMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_NewPlayerMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_NewPlayerMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_NewPlayerMgr) GetData(id int32) *server.DB_NewPlayer { return nil } + func init() { DataMgr.register("DB_NewPlayer.dat", &ProtobufDataLoader{dh: PBDB_NewPlayerMgr}) } diff --git a/srvdata/db_phonelottery.go b/srvdata/db_phonelottery.go index 862250d..cec9d0a 100644 --- a/srvdata/db_phonelottery.go +++ b/srvdata/db_phonelottery.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_PhoneLotteryMgr = &DB_PhoneLotteryMgr{pool: make(map[int32]*server.DB_PhoneLottery), Datas: &server.DB_PhoneLotteryArray{}} +var PBDB_PhoneLotteryMgr = &DB_PhoneLotteryMgr{ + Datas: &server.DB_PhoneLotteryArray{}, + pool: make(map[int32]*server.DB_PhoneLottery), + +} type DB_PhoneLotteryMgr struct { Datas *server.DB_PhoneLotteryArray pool map[int32]*server.DB_PhoneLottery + } func (this *DB_PhoneLotteryMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_PhoneLotteryMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_PhoneLotteryMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_PhoneLotteryMgr) GetData(id int32) *server.DB_PhoneLottery { return nil } + func init() { DataMgr.register("DB_PhoneLottery.dat", &ProtobufDataLoader{dh: PBDB_PhoneLotteryMgr}) } diff --git a/srvdata/db_playerexp.go b/srvdata/db_playerexp.go index c362309..6c969f1 100644 --- a/srvdata/db_playerexp.go +++ b/srvdata/db_playerexp.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_PlayerExpMgr = &DB_PlayerExpMgr{pool: make(map[int32]*server.DB_PlayerExp), Datas: &server.DB_PlayerExpArray{}} +var PBDB_PlayerExpMgr = &DB_PlayerExpMgr{ + Datas: &server.DB_PlayerExpArray{}, + pool: make(map[int32]*server.DB_PlayerExp), + +} type DB_PlayerExpMgr struct { Datas *server.DB_PlayerExpArray pool map[int32]*server.DB_PlayerExp + } func (this *DB_PlayerExpMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_PlayerExpMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_PlayerExpMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_PlayerExpMgr) GetData(id int32) *server.DB_PlayerExp { return nil } + func init() { DataMgr.register("DB_PlayerExp.dat", &ProtobufDataLoader{dh: PBDB_PlayerExpMgr}) } diff --git a/srvdata/db_playerinfo.go b/srvdata/db_playerinfo.go index 0b037cc..9a6e51d 100644 --- a/srvdata/db_playerinfo.go +++ b/srvdata/db_playerinfo.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_PlayerInfoMgr = &DB_PlayerInfoMgr{pool: make(map[int32]*server.DB_PlayerInfo), Datas: &server.DB_PlayerInfoArray{}} +var PBDB_PlayerInfoMgr = &DB_PlayerInfoMgr{ + Datas: &server.DB_PlayerInfoArray{}, + pool: make(map[int32]*server.DB_PlayerInfo), + +} type DB_PlayerInfoMgr struct { Datas *server.DB_PlayerInfoArray pool map[int32]*server.DB_PlayerInfo + } func (this *DB_PlayerInfoMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_PlayerInfoMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_PlayerInfoMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_PlayerInfoMgr) GetData(id int32) *server.DB_PlayerInfo { return nil } + func init() { DataMgr.register("DB_PlayerInfo.dat", &ProtobufDataLoader{dh: PBDB_PlayerInfoMgr}) } diff --git a/srvdata/db_playertype.go b/srvdata/db_playertype.go index 7f0610b..8444d02 100644 --- a/srvdata/db_playertype.go +++ b/srvdata/db_playertype.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_PlayerTypeMgr = &DB_PlayerTypeMgr{pool: make(map[int32]*server.DB_PlayerType), Datas: &server.DB_PlayerTypeArray{}} +var PBDB_PlayerTypeMgr = &DB_PlayerTypeMgr{ + Datas: &server.DB_PlayerTypeArray{}, + pool: make(map[int32]*server.DB_PlayerType), + +} type DB_PlayerTypeMgr struct { Datas *server.DB_PlayerTypeArray pool map[int32]*server.DB_PlayerType + } func (this *DB_PlayerTypeMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_PlayerTypeMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_PlayerTypeMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_PlayerTypeMgr) GetData(id int32) *server.DB_PlayerType { return nil } + func init() { DataMgr.register("DB_PlayerType.dat", &ProtobufDataLoader{dh: PBDB_PlayerTypeMgr}) } diff --git a/srvdata/db_potodd.go b/srvdata/db_potodd.go index 68f7abf..869092f 100644 --- a/srvdata/db_potodd.go +++ b/srvdata/db_potodd.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_PotOddMgr = &DB_PotOddMgr{pool: make(map[int32]*server.DB_PotOdd), Datas: &server.DB_PotOddArray{}} +var PBDB_PotOddMgr = &DB_PotOddMgr{ + Datas: &server.DB_PotOddArray{}, + pool: make(map[int32]*server.DB_PotOdd), + +} type DB_PotOddMgr struct { Datas *server.DB_PotOddArray pool map[int32]*server.DB_PotOdd + } func (this *DB_PotOddMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_PotOddMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_PotOddMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_PotOddMgr) GetData(id int32) *server.DB_PotOdd { return nil } + func init() { DataMgr.register("DB_PotOdd.dat", &ProtobufDataLoader{dh: PBDB_PotOddMgr}) } diff --git a/srvdata/db_propexchange.go b/srvdata/db_propexchange.go index 9d7ae2c..12a45fe 100644 --- a/srvdata/db_propexchange.go +++ b/srvdata/db_propexchange.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_PropExchangeMgr = &DB_PropExchangeMgr{pool: make(map[int32]*server.DB_PropExchange), Datas: &server.DB_PropExchangeArray{}} +var PBDB_PropExchangeMgr = &DB_PropExchangeMgr{ + Datas: &server.DB_PropExchangeArray{}, + pool: make(map[int32]*server.DB_PropExchange), + +} type DB_PropExchangeMgr struct { Datas *server.DB_PropExchangeArray pool map[int32]*server.DB_PropExchange + } func (this *DB_PropExchangeMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_PropExchangeMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_PropExchangeMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_PropExchangeMgr) GetData(id int32) *server.DB_PropExchange { return nil } + func init() { DataMgr.register("DB_PropExchange.dat", &ProtobufDataLoader{dh: PBDB_PropExchangeMgr}) } diff --git a/srvdata/db_rankcycle.go b/srvdata/db_rankcycle.go index 7792005..f7f114a 100644 --- a/srvdata/db_rankcycle.go +++ b/srvdata/db_rankcycle.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_RankCycleMgr = &DB_RankCycleMgr{pool: make(map[int32]*server.DB_RankCycle), Datas: &server.DB_RankCycleArray{}} +var PBDB_RankCycleMgr = &DB_RankCycleMgr{ + Datas: &server.DB_RankCycleArray{}, + pool: make(map[int32]*server.DB_RankCycle), + +} type DB_RankCycleMgr struct { Datas *server.DB_RankCycleArray pool map[int32]*server.DB_RankCycle + } func (this *DB_RankCycleMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_RankCycleMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_RankCycleMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_RankCycleMgr) GetData(id int32) *server.DB_RankCycle { return nil } + func init() { DataMgr.register("DB_RankCycle.dat", &ProtobufDataLoader{dh: PBDB_RankCycleMgr}) } diff --git a/srvdata/db_ranklevel.go b/srvdata/db_ranklevel.go index dd43651..f43183c 100644 --- a/srvdata/db_ranklevel.go +++ b/srvdata/db_ranklevel.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_RankLevelMgr = &DB_RankLevelMgr{pool: make(map[int32]*server.DB_RankLevel), Datas: &server.DB_RankLevelArray{}} +var PBDB_RankLevelMgr = &DB_RankLevelMgr{ + Datas: &server.DB_RankLevelArray{}, + pool: make(map[int32]*server.DB_RankLevel), + +} type DB_RankLevelMgr struct { Datas *server.DB_RankLevelArray pool map[int32]*server.DB_RankLevel + } func (this *DB_RankLevelMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_RankLevelMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_RankLevelMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_RankLevelMgr) GetData(id int32) *server.DB_RankLevel { return nil } + func init() { DataMgr.register("DB_RankLevel.dat", &ProtobufDataLoader{dh: PBDB_RankLevelMgr}) } diff --git a/srvdata/db_rankreward.go b/srvdata/db_rankreward.go index 164ddee..205b2cf 100644 --- a/srvdata/db_rankreward.go +++ b/srvdata/db_rankreward.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_RankRewardMgr = &DB_RankRewardMgr{pool: make(map[int32]*server.DB_RankReward), Datas: &server.DB_RankRewardArray{}} +var PBDB_RankRewardMgr = &DB_RankRewardMgr{ + Datas: &server.DB_RankRewardArray{}, + pool: make(map[int32]*server.DB_RankReward), + +} type DB_RankRewardMgr struct { Datas *server.DB_RankRewardArray pool map[int32]*server.DB_RankReward + } func (this *DB_RankRewardMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_RankRewardMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_RankRewardMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_RankRewardMgr) GetData(id int32) *server.DB_RankReward { return nil } + func init() { DataMgr.register("DB_RankReward.dat", &ProtobufDataLoader{dh: PBDB_RankRewardMgr}) } diff --git a/srvdata/db_sensitive_words.go b/srvdata/db_sensitive_words.go index 1ce4828..4ffa4a4 100644 --- a/srvdata/db_sensitive_words.go +++ b/srvdata/db_sensitive_words.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_Sensitive_WordsMgr = &DB_Sensitive_WordsMgr{pool: make(map[int32]*server.DB_Sensitive_Words), Datas: &server.DB_Sensitive_WordsArray{}} +var PBDB_Sensitive_WordsMgr = &DB_Sensitive_WordsMgr{ + Datas: &server.DB_Sensitive_WordsArray{}, + pool: make(map[int32]*server.DB_Sensitive_Words), + +} type DB_Sensitive_WordsMgr struct { Datas *server.DB_Sensitive_WordsArray pool map[int32]*server.DB_Sensitive_Words + } func (this *DB_Sensitive_WordsMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_Sensitive_WordsMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_Sensitive_WordsMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_Sensitive_WordsMgr) GetData(id int32) *server.DB_Sensitive_Words return nil } + func init() { DataMgr.register("DB_Sensitive_Words.dat", &ProtobufDataLoader{dh: PBDB_Sensitive_WordsMgr}) } diff --git a/srvdata/db_slotrateweight.go b/srvdata/db_slotrateweight.go index 8ed51f3..a1b4367 100644 --- a/srvdata/db_slotrateweight.go +++ b/srvdata/db_slotrateweight.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_SlotRateWeightMgr = &DB_SlotRateWeightMgr{pool: make(map[int32]*server.DB_SlotRateWeight), Datas: &server.DB_SlotRateWeightArray{}} +var PBDB_SlotRateWeightMgr = &DB_SlotRateWeightMgr{ + Datas: &server.DB_SlotRateWeightArray{}, + pool: make(map[int32]*server.DB_SlotRateWeight), + +} type DB_SlotRateWeightMgr struct { Datas *server.DB_SlotRateWeightArray pool map[int32]*server.DB_SlotRateWeight + } func (this *DB_SlotRateWeightMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_SlotRateWeightMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_SlotRateWeightMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_SlotRateWeightMgr) GetData(id int32) *server.DB_SlotRateWeight { return nil } + func init() { DataMgr.register("DB_SlotRateWeight.dat", &ProtobufDataLoader{dh: PBDB_SlotRateWeightMgr}) } diff --git a/srvdata/db_systemchance.go b/srvdata/db_systemchance.go index 02b8e93..2647172 100644 --- a/srvdata/db_systemchance.go +++ b/srvdata/db_systemchance.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_SystemChanceMgr = &DB_SystemChanceMgr{pool: make(map[int32]*server.DB_SystemChance), Datas: &server.DB_SystemChanceArray{}} +var PBDB_SystemChanceMgr = &DB_SystemChanceMgr{ + Datas: &server.DB_SystemChanceArray{}, + pool: make(map[int32]*server.DB_SystemChance), + +} type DB_SystemChanceMgr struct { Datas *server.DB_SystemChanceArray pool map[int32]*server.DB_SystemChance + } func (this *DB_SystemChanceMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_SystemChanceMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_SystemChanceMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_SystemChanceMgr) GetData(id int32) *server.DB_SystemChance { return nil } + func init() { DataMgr.register("DB_SystemChance.dat", &ProtobufDataLoader{dh: PBDB_SystemChanceMgr}) } diff --git a/srvdata/db_task.go b/srvdata/db_task.go index 5895733..fa57d81 100644 --- a/srvdata/db_task.go +++ b/srvdata/db_task.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_TaskMgr = &DB_TaskMgr{pool: make(map[int32]*server.DB_Task), Datas: &server.DB_TaskArray{}} +var PBDB_TaskMgr = &DB_TaskMgr{ + Datas: &server.DB_TaskArray{}, + pool: make(map[int32]*server.DB_Task), + +} type DB_TaskMgr struct { Datas *server.DB_TaskArray pool map[int32]*server.DB_Task + } func (this *DB_TaskMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_TaskMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_TaskMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_TaskMgr) GetData(id int32) *server.DB_Task { return nil } + func init() { DataMgr.register("DB_Task.dat", &ProtobufDataLoader{dh: PBDB_TaskMgr}) } diff --git a/srvdata/db_thirdplatformgamemapping.go b/srvdata/db_thirdplatformgamemapping.go index 28b6195..76752ae 100644 --- a/srvdata/db_thirdplatformgamemapping.go +++ b/srvdata/db_thirdplatformgamemapping.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_ThirdPlatformGameMappingMgr = &DB_ThirdPlatformGameMappingMgr{pool: make(map[int32]*server.DB_ThirdPlatformGameMapping), Datas: &server.DB_ThirdPlatformGameMappingArray{}} +var PBDB_ThirdPlatformGameMappingMgr = &DB_ThirdPlatformGameMappingMgr{ + Datas: &server.DB_ThirdPlatformGameMappingArray{}, + pool: make(map[int32]*server.DB_ThirdPlatformGameMapping), + +} type DB_ThirdPlatformGameMappingMgr struct { Datas *server.DB_ThirdPlatformGameMappingArray pool map[int32]*server.DB_ThirdPlatformGameMapping + } func (this *DB_ThirdPlatformGameMappingMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_ThirdPlatformGameMappingMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_ThirdPlatformGameMappingMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_ThirdPlatformGameMappingMgr) GetData(id int32) *server.DB_ThirdPl return nil } + func init() { DataMgr.register("DB_ThirdPlatformGameMapping.dat", &ProtobufDataLoader{dh: PBDB_ThirdPlatformGameMappingMgr}) } diff --git a/srvdata/db_tips.go b/srvdata/db_tips.go index c031f0a..012ed7c 100644 --- a/srvdata/db_tips.go +++ b/srvdata/db_tips.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_TipsMgr = &DB_TipsMgr{pool: make(map[int32]*server.DB_Tips), Datas: &server.DB_TipsArray{}} +var PBDB_TipsMgr = &DB_TipsMgr{ + Datas: &server.DB_TipsArray{}, + pool: make(map[int32]*server.DB_Tips), + +} type DB_TipsMgr struct { Datas *server.DB_TipsArray pool map[int32]*server.DB_Tips + } func (this *DB_TipsMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_TipsMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_TipsMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_TipsMgr) GetData(id int32) *server.DB_Tips { return nil } + func init() { DataMgr.register("DB_Tips.dat", &ProtobufDataLoader{dh: PBDB_TipsMgr}) } diff --git a/srvdata/db_vip.go b/srvdata/db_vip.go index d58aa42..8ae7c19 100644 --- a/srvdata/db_vip.go +++ b/srvdata/db_vip.go @@ -10,11 +10,16 @@ import ( "mongo.games.com/game/protocol/server" ) -var PBDB_VIPMgr = &DB_VIPMgr{pool: make(map[int32]*server.DB_VIP), Datas: &server.DB_VIPArray{}} +var PBDB_VIPMgr = &DB_VIPMgr{ + Datas: &server.DB_VIPArray{}, + pool: make(map[int32]*server.DB_VIP), + +} type DB_VIPMgr struct { Datas *server.DB_VIPArray pool map[int32]*server.DB_VIP + } func (this *DB_VIPMgr) unmarshal(data []byte) error { @@ -34,6 +39,7 @@ func (this *DB_VIPMgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + } else { *existItem = *item } @@ -54,6 +60,7 @@ func (this *DB_VIPMgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + } } @@ -64,6 +71,7 @@ func (this *DB_VIPMgr) GetData(id int32) *server.DB_VIP { return nil } + func init() { DataMgr.register("DB_VIP.dat", &ProtobufDataLoader{dh: PBDB_VIPMgr}) } diff --git a/tools/xlsx2proto/templ/gpb_mgr.templ b/tools/xlsx2proto/templ/gpb_mgr.templ index 82741aa..4f7a485 100644 --- a/tools/xlsx2proto/templ/gpb_mgr.templ +++ b/tools/xlsx2proto/templ/gpb_mgr.templ @@ -10,11 +10,24 @@ import ( "mongo.games.com/game/protocol/server" ) -var PB{{.ProtoName}}Mgr = &{{.ProtoName}}Mgr{pool: make(map[int32]*server.{{.ProtoName}}), Datas: &server.{{.ProtoName}}Array{}} +var PB{{.ProtoName}}Mgr = &{{.ProtoName}}Mgr{ + Datas: &server.{{.ProtoName}}Array{}, + pool: make(map[int32]*server.{{.ProtoName}}), + {{ range $index, $col := .Cols }}{{ if $col.IsIndex }} + {{ if eq $col.ColType 1 }}{{$col.ColName}}: make(map[int32][]*server.{{$.ProtoName}}), + {{ else if eq $col.ColType 5 }}{{$col.ColName}}: make(map[int64][]*server.{{$.ProtoName}}), + {{ else if eq $col.ColType 2 }}{{$col.ColName}}: make(map[string][]*server.{{$.ProtoName}}), + {{end}}{{end}}{{end}} +} type {{.ProtoName}}Mgr struct { Datas *server.{{.ProtoName}}Array pool map[int32]*server.{{.ProtoName}} + {{ range $index, $col := .Cols }}{{ if $col.IsIndex }} + {{ if eq $col.ColType 1 }}{{$col.ColName}} map[int32][]*server.{{$.ProtoName}} + {{ else if eq $col.ColType 5 }}{{$col.ColName}} map[int64][]*server.{{$.ProtoName}} + {{ else if eq $col.ColType 2 }}{{$col.ColName}} map[string][]*server.{{$.ProtoName}} + {{end}}{{end}}{{end}} } func (this *{{.ProtoName}}Mgr) unmarshal(data []byte) error { @@ -34,6 +47,9 @@ func (this *{{.ProtoName}}Mgr) reunmarshal(data []byte) error { if existItem == nil { this.pool[item.GetId()] = item this.Datas.Arr = append(this.Datas.Arr, item) + {{ range $index, $col := .Cols }}{{ if $col.IsIndex }} + this.{{$col.ColName}}[item.Get{{$col.ColName}}()] = append(this.{{$col.ColName}}[item.Get{{$col.ColName}}()], item) + {{end}}{{end}} } else { *existItem = *item } @@ -54,6 +70,9 @@ func (this *{{.ProtoName}}Mgr) arrangeData() { for _, data := range dataArr { this.pool[data.GetId()] = data + {{ range $index, $col := .Cols }}{{ if $col.IsIndex }} + this.{{$col.ColName}}[data.Get{{$col.ColName}}()] = append(this.{{$col.ColName}}[data.Get{{$col.ColName}}()], data) + {{end}}{{end}} } } @@ -63,6 +82,38 @@ func (this *{{.ProtoName}}Mgr) GetData(id int32) *server.{{.ProtoName}} { } return nil } +{{ range $index, $col := .Cols }}{{ if $col.IsIndex }} +{{ if eq $col.ColType 1 }}func (this *{{$.ProtoName}}Mgr) Get{{$col.ColName}}(id int32) *server.{{$.ProtoName}} { + arr := this.{{$col.ColName}}[id] + if len(arr) == 0 { + return nil + } + return arr[0] +} +{{ else if eq $col.ColType 5 }}func (this *{{$.ProtoName}}Mgr) Get{{$col.ColName}}(id int64) *server.{{$.ProtoName}} { + arr := this.{{$col.ColName}}[id] + if len(arr) == 0 { + return nil + } + return arr[0] +} +{{ else if eq $col.ColType 2 }}func (this *{{$.ProtoName}}Mgr) Get{{$col.ColName}}(id string) *server.{{$.ProtoName}} { + arr := this.{{$col.ColName}}[id] + if len(arr) == 0 { + return nil + } + return arr[0] +} +{{end}} +{{ if eq $col.ColType 1 }}func (this *{{$.ProtoName}}Mgr) Get{{$col.ColName}}Arr(id int32) []*server.{{$.ProtoName}} { + return this.{{$col.ColName}}[id] +} +{{ else if eq $col.ColType 5 }}func (this *{{$.ProtoName}}Mgr) Get{{$col.ColName}}Arr(id int64) []*server.{{$.ProtoName}} { + return this.{{$col.ColName}}[id] +} +{{ else if eq $col.ColType 2 }}func (this *{{$.ProtoName}}Mgr) Get{{$col.ColName}}Arr(id string) []*server.{{$.ProtoName}} { + return this.{{$col.ColName}}[id] +}{{end}}{{end}}{{end}} func init() { DataMgr.register("{{.ProtoName}}.dat", &ProtobufDataLoader{dh: PB{{.ProtoName}}Mgr}) diff --git a/tools/xlsx2proto/xlsx2proto.go b/tools/xlsx2proto/xlsx2proto.go index ca65cba..8c8a950 100644 --- a/tools/xlsx2proto/xlsx2proto.go +++ b/tools/xlsx2proto/xlsx2proto.go @@ -15,12 +15,13 @@ var XlsxFiles = make(map[string]string) var templates *template.Template type SheetColumnMetaStruct struct { - ColIndex int - ColName string - ColType int - CTString string - IsArray bool - IsMap bool + ColIndex int // 列序号 + ColName string // 列名称 + ColType int // 数据类型 + CTString string // proto数据类型 + IsArray bool // 是否数组 + IsMap bool // 是否map + IsIndex bool // 是否建立索引 } type SheetMetaStruct struct { @@ -31,17 +32,23 @@ type SheetMetaStruct struct { } const ( - INTTYPE string = "(int)" - INT64TYPE string = "(int64)" - STRTYPE = "(str)" - ARRINTTYPE = "(arrint)" - ARRINT64TYPE = "(arrint64)" - ARRSTRTYPE = "(arrstr)" - INTTYPE_PROTO = "int32" - INT64TYPE_PROTO = "int64" - STRTYPE_PROTO = "string" - MAPTYPE string = "(map)" - MAP_PROTO = "map" + // xlsx标签 + IntType = "(int)" + Int64Type = "(int64)" + StrType = "(str)" + ArrIntType = "(arrint)" + ArrInt64Type = "(arrint64)" + ArrStrType = "(arrstr)" + MapType = "(map)" + // xlsx索引类型,带索引 + IntTypeIndex = "(int*)" + Int64TypeIndex = "(int64*)" + StrTypeIndex = "(str*)" + // proto类型 + IntTypeProto = "int32" + Int64TypeProto = "int64" + StrTypeProto = "string" + MapProto = "map" ) func Init() { @@ -113,20 +120,25 @@ func main() { for _, row := range sheet.Rows { for i, cell := range row.Cells { s := cell.String() - if strings.HasSuffix(s, INTTYPE) { - sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, INTTYPE), 1, INTTYPE_PROTO, false, false}) - } else if strings.HasSuffix(s, STRTYPE) { - sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, STRTYPE), 2, STRTYPE_PROTO, false, false}) - } else if strings.HasSuffix(s, ARRINTTYPE) { - sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, ARRINTTYPE), 3, INTTYPE_PROTO, true, false}) - } else if strings.HasSuffix(s, ARRSTRTYPE) { - sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, ARRSTRTYPE), 4, STRTYPE_PROTO, true, false}) - } else if strings.HasSuffix(s, INT64TYPE) { - sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, INT64TYPE), 5, INT64TYPE_PROTO, false, false}) - } else if strings.HasSuffix(s, ARRINT64TYPE) { - sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, ARRINT64TYPE), 6, INT64TYPE_PROTO, true, false}) - } else if strings.HasSuffix(s, MAPTYPE) { - sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, MAPTYPE), 7, MAP_PROTO, false, true}) + switch { + case strings.HasSuffix(s, IntType): + sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, IntType), 1, IntTypeProto, false, false, false}) + case strings.HasSuffix(s, StrType): + sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, StrType), 2, StrTypeProto, false, false, false}) + case strings.HasSuffix(s, ArrIntType): + sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, ArrIntType), 3, IntTypeProto, true, false, false}) + case strings.HasSuffix(s, Int64Type): + sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, Int64Type), 5, Int64TypeProto, false, false, false}) + case strings.HasSuffix(s, ArrInt64Type): + sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, ArrInt64Type), 6, Int64TypeProto, true, false, false}) + case strings.HasSuffix(s, MapType): + sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, MapType), 7, MapProto, false, true, false}) + case strings.HasSuffix(s, IntTypeIndex): + sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, IntTypeIndex), 1, IntTypeProto, false, false, true}) + case strings.HasSuffix(s, Int64TypeIndex): + sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, Int64TypeIndex), 5, Int64TypeProto, false, false, true}) + case strings.HasSuffix(s, StrTypeIndex): + sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, StrTypeIndex), 2, StrTypeProto, false, false, true}) } } break //only fetch first row