From 4e08e7551063227b89b3f817192eaa5db92d44be Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Fri, 27 Dec 2024 10:35:07 +0800
Subject: [PATCH] update excel

---
 data/DB_PigBank_Diamond.dat   |   4 +-
 data/DB_PropExchange.dat      | Bin 384 -> 384 bytes
 data/DB_Task.dat              | Bin 5519 -> 5519 bytes
 srvdata/db_game_bankruptcy.go |  77 ----------------------------------
 worldsrv/welfmgr.go           |   2 +-
 5 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100644 srvdata/db_game_bankruptcy.go

diff --git a/data/DB_PigBank_Diamond.dat b/data/DB_PigBank_Diamond.dat
index 735a0e1..c40b846 100644
--- a/data/DB_PigBank_Diamond.dat
+++ b/data/DB_PigBank_Diamond.dat
@@ -1,4 +1,4 @@
 
 


 (€­â8–
@¡è;PdX–
`c
-< ((€­â2Ÿ
2óõ
8¬@¢è;JƸ
Jóõ
PdX¬`Ç

-?ÿÁ×/ 2(€­â2Ÿ2óõ
8î@£è;JƸJóõ
PdXî`ó
\ No newline at end of file
+< ((€­â2Ÿ
2óõ
8¬@¢è;Jóõ
JƸ
PdX¬`Ç

+?ÿÁ×/ 2(€­â2óõ
2Ÿ8î@£è;JƸJóõ
PdXî`ó
\ No newline at end of file
diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat
index 4cba38b2ee99301479f655deafb1443fb5300d51..e8c943cb7ae426c3fa4ddbe697bff5b345560b0f 100644
GIT binary patch
literal 384
zcmd-w<6snElw#w!(#8y?uR`f-Q2IKQz6_$3I5-yevI!h$vE|a^U;?YZ36;MErEf#&
z8))joIUweP%|WscMLkd)-8`)BQQ`!<qhakM7Oq$h7O+Fm9ZbmJJ5YzBI|yu{5<ABt
Nphv$jb1~2s0sv-uJT(9S

literal 384
zcmd-w<6snElw#w!-o^~3FGJ}oQ2HvAz6PR|I5-yevI!h$vE|a^U;?YZ0hPZArEfv$
z+i2>;IUwf4>_JzL)jpuRVCI9(1M<P{Q{n`>qhakM7Oq$h78Hkr9g5^3bOY`{9f)or
Tii4EcITisu`h}T`fwm9;Why*1

diff --git a/data/DB_Task.dat b/data/DB_Task.dat
index 1ed281a3fdd7f732002366f1766bd22f975fc9cc..3f51acb68279faf7fb0d4dc69988478af86907d1 100644
GIT binary patch
delta 227
zcmeCz?$@4BF385Qq?b)V#EXMtA&@>Wi)UkpI3t?qg*N8N8yJnDqH-{`Ew-D#Fh(;?
zZs8HxoXm2W87RL9Xa+M>{=ssg$?hEHP*GN>=z>FXllwUuCO7j7PFCPFfXXt$WP8~r
zCvuhwLR<qh!3%2U<ma3flfQC{Z7$_%V4NJ!CAOKH#{^`x;N$?lb(nT+=I3u<0|1&n
BKx_a2

delta 213
zcmeCz?$@4BF37>Lu$N8Xz$_jwHjX7gmdM5qaYm@<g*IlG=;RHI#xS)lwop;I&0iR!
znI;Etifm41xy%fef3RE#D8C437V~6x4)e(yxJ4#U;;0pbh>3VXY;5SPnykQSF!>pm
z*yJ?M0;nuAR2FE)<ma3flfQC{Z7$_%V4S>}S7b9Mj~NqG9V1lTf?l@C0etHwr|}AI
J=I3u<0|2}0J-q+`

diff --git a/srvdata/db_game_bankruptcy.go b/srvdata/db_game_bankruptcy.go
deleted file mode 100644
index e07d5b5..0000000
--- a/srvdata/db_game_bankruptcy.go
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// Code generated by xlsx2proto.
-// DO NOT EDIT!
-
-package srvdata
-
-import (
-	"google.golang.org/protobuf/proto"
-
-    "mongo.games.com/game/protocol/server"
-)
-
-var PBDB_Game_bankruptcyMgr = &DB_Game_bankruptcyMgr{
-    Datas: &server.DB_Game_bankruptcyArray{},
-    pool: make(map[int32]*server.DB_Game_bankruptcy),
-    
-}
-
-type DB_Game_bankruptcyMgr struct {
-	Datas *server.DB_Game_bankruptcyArray
-	pool  map[int32]*server.DB_Game_bankruptcy
-	
-}
-
-func (this *DB_Game_bankruptcyMgr) unmarshal(data []byte) error {
-	err := proto.Unmarshal(data, this.Datas)
-	if err == nil {
-		this.arrangeData()
-	}
-	return err
-}
-
-func (this *DB_Game_bankruptcyMgr) reunmarshal(data []byte) error {
-	newDatas := &server.DB_Game_bankruptcyArray{}
-	err := proto.Unmarshal(data, newDatas)
-	if err == nil {
-		for _, item := range newDatas.Arr {
-			existItem := this.GetData(item.GetId())
-			if existItem == nil {
-				this.pool[item.GetId()] = item
-				this.Datas.Arr = append(this.Datas.Arr, item)
-				
-			} else {
-				*existItem = *item
-			}
-		}
-	}
-	return err
-}
-
-func (this *DB_Game_bankruptcyMgr) arrangeData() {
-	if this.Datas == nil {
-		return
-	}
-
-	dataArr := this.Datas.GetArr()
-	if dataArr == nil {
-		return
-	}
-
-	for _, data := range dataArr {
-		this.pool[data.GetId()] = data
-		
-	}
-}
-
-func (this *DB_Game_bankruptcyMgr) GetData(id int32) *server.DB_Game_bankruptcy {
-	if data, ok := this.pool[id]; ok {
-		return data
-	}
-	return nil
-}
-
-
-func init() {
-	DataMgr.register("DB_Game_bankruptcy.dat", &ProtobufDataLoader{dh: PBDB_Game_bankruptcyMgr})
-}
diff --git a/worldsrv/welfmgr.go b/worldsrv/welfmgr.go
index bf8135d..97fe775 100644
--- a/worldsrv/welfmgr.go
+++ b/worldsrv/welfmgr.go
@@ -1118,7 +1118,7 @@ func (this *WelfareMgr) BlindBoxInfo(p *Player, bid int32) {
 			if cyc == 1 || blindBox.Cycle == model.WelfareOpen {
 				p.WelfData.BlindBoxId = 0
 			}
-		}                               // == 1代表当日循环
+		} // == 1代表当日循环
 		if p.WelfData.BlindBoxId == 0 { // 未领�过��机Date
 
 			idx := bid