From d6111cc733a00140f620d960553b773f95a246d1 Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Tue, 6 Aug 2024 08:59:50 +0800
Subject: [PATCH] update develop

---
 data/DB_PropExchange.dat | Bin 384 -> 384 bytes
 data/DB_Task.dat         | Bin 5299 -> 5299 bytes
 public                   |   2 +-
 worldsrv/aaa             |  42 +++++++++++++++++++++++++++++++++++++++
 worldsrv/tmmatch.go      |  14 ++++++-------
 5 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 worldsrv/aaa

diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat
index b4c74d6b3e8901050076557058c3c27af8194124..429e0ad7f8df995c1f2aa09de496255ffe4b8ccc 100644
GIT binary patch
literal 384
zcmd-w<6snElw#w!+{O&1uR!UmQ2H8_z7C?5I5-yevI!h$vE|a^U;?YZ0hPZArEfv$
z+i2>;IUwf4%mvE>?S<KgVh>Opm$_hfDsh6{(XjRr3s)=$3yKGbH3()gx`Xb39nQ|N
N2<Xu-%v=n#g#csnJT(9S

literal 384
zcmd-w<6snElw#w!-o^~3FGJ}oQ2HvAz6PR|I5-yevI!h$vE|a^U;?YZ0hPZArEfv$
z+i2>;IUweP%>mknOCK)#VeW&N%L#Tz!`eqIT(KN1SRDdZ2($>@K$rvWKphJ6Aj|@=
S2b9=376Co_g_(<iwh#biqC7PK

diff --git a/data/DB_Task.dat b/data/DB_Task.dat
index 8f4b27a42f072e2d2faa08053507ddf58301499f..f0ad0cf3795451b5354026837eb122aeaa37188d 100644
GIT binary patch
delta 267
zcmdn2xmk0=d`3YIj)lE!0t<TCyx2IF09hiNH!#{WPA=gPnas@mPXHpl;xHpn`eGZi
zz+^#|-GUG%lNUsC!b1MZcUi2UqFhkX3rl?_Yp|Z3e4R&tk!dm;n<dnyhR!OWQHy{!
zu}%(PJ2Lq*x5#7-_NvKOxI`vzW8Vif1tiA^H3jId$*mkllSSA?CZFag2C5R99Kxv&
zG*x8sbWWqm%lQN+-{LgDqDz|VA4t_^UG7zklbbn3CcowZIT2*I2-I+(Q#PCN*0KWt
Dc?nP!

delta 281
zcmdn2xmk0=d`3YwjwQWp0wP`<91DT;f?l@G8yM{wCzo)DOlD^OC&0#Wv5i@P5h}gn
z@MJ-j-GUIc6BhD&L8O@`-(|6aie6ai0~O_(tigH~X#OIgxlB+44z$=#W@EF2in2mQ
z8#=2d2e2JMS38SmvMPHmn%V`2<R))sKRCIVS!8kthyG*{c9F@aIf}8U^5-;}e4R&R
w@^nt4$*Q~}lkalsf_2Gp{RW9|*5zKsIC(43b6k^O@YqgX&L_CpjJK8@074d08UO$Q

diff --git a/public b/public
index c935c31..ec13bc8 160000
--- a/public
+++ b/public
@@ -1 +1 @@
-Subproject commit c935c315a3ea01603ec80f3abe8a10d00a688b4c
+Subproject commit ec13bc8a4c52288af89a900dc457a76e7fedc659
diff --git a/worldsrv/aaa b/worldsrv/aaa
new file mode 100644
index 0000000..a4596c4
--- /dev/null
+++ b/worldsrv/aaa
@@ -0,0 +1,42 @@
+71001,71002,71003,72001,72002,72003,72004,72005,73001,73002,73003,73004,74001,74002,74003,74004,74005,74006,75001,75002,75003,75004,75005,75006,76001,76002,76003,76004,76005,76006,77001,77002,77003,77004,77005,78001,78002,78003,79001,79002,79003,79004,79005,77006
+
+5001,5002,5003,5004,5005,5006
+
+"72005":NumberLong(16),
+"71001":NumberLong(66),
+"71003":NumberLong(112),
+"72004":NumberLong(8),
+"71002":NumberLong(8),
+"73002":NumberLong(16),
+"72003":NumberLong(23),
+"73001":NumberLong(41),
+"74004":NumberLong(32),
+"75002":NumberLong(48),
+"76006":NumberLong(58),
+"79005":NumberLong(136),
+"75003":NumberLong(5),
+"72002":NumberLong(3),
+"79001":NumberLong(3),
+"72001":NumberLong(8),
+"76003":NumberLong(1),
+"75005":NumberLong(6),
+"77004":NumberLong(10),
+"76001":NumberLong(2),
+"75006":NumberLong(1),
+"75004":NumberLong(1),
+"75001":NumberLong(1),
+"76002":NumberLong(1)
+
+
+"30008":NumberLong(84),
+"30009":NumberLong(6),
+"30010":NumberLong(13),
+"30011":NumberLong(13)
+
+
+"5001":NumberLong(2),
+"5002":NumberLong(18),
+"5003":NumberLong(6),
+"5004":NumberLong(13),
+"5005":NumberLong(13),
+"5006":NumberLong(4)
\ No newline at end of file
diff --git a/worldsrv/tmmatch.go b/worldsrv/tmmatch.go
index 0676ae0..5442439 100644
--- a/worldsrv/tmmatch.go
+++ b/worldsrv/tmmatch.go
@@ -291,11 +291,11 @@ func (tm *TmMatch) RobotGradesDecline(round int) {
 			}
 		}
 	}
-	//logger.Logger.Tracef("======积分衰减======当前第 %v 轮============", round)
-	//for i, infos := range tm.robotGrades {
-	//	logger.Logger.Tracef(">>>积分历史>>> 第 %v 轮", i)
-	//	for _, info := range infos {
-	//		logger.Logger.Trace("Snid: ", info.copySnid, " grade: ", info.grade, " copyLv: ", info.copyLv, " copyRoleId: ", info.copyRoleId)
-	//	}
-	//}
+	logger.Logger.Tracef("======积分衰减======当前第 %v 轮============", round)
+	for i, infos := range tm.robotGrades {
+		logger.Logger.Tracef(">>>积分历史>>> 第 %v 轮", i)
+		for _, info := range infos {
+			logger.Logger.Trace("Snid: ", info.copySnid, " grade: ", info.grade, " copyLv: ", info.copyLv, " copyRoleId: ", info.copyRoleId)
+		}
+	}
 }