From 786c5d941d67402ad17db829f8666812ebe4c4be Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 10 Sep 2025 10:36:29 +0800 Subject: [PATCH 01/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/PlayerFunc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go index cc532587..8232075d 100644 --- a/src/server/game/PlayerFunc.go +++ b/src/server/game/PlayerFunc.go @@ -1033,7 +1033,7 @@ func (player *Player) FormatOrderReward() { PartBag := ChessMod.GetPartBag() Trigger := true for _, v := range OrderMod.GetOrderList() { - if v.Type == order.Trigger_type { + if v.Type == order.Part_type { Trigger = false } } From f28a9e7454fddb70da9c28ba559e89487e744b69 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 10 Sep 2025 11:11:38 +0800 Subject: [PATCH 02/34] =?UTF-8?q?20250910=E8=A1=A5=E5=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/CompensationFunc.go | 17 +- src/server/game/Gm.go | 2 +- .../game/mod/compensation/compensation.go | 334 +++++++++++++++--- 3 files changed, 300 insertions(+), 53 deletions(-) diff --git a/src/server/game/CompensationFunc.go b/src/server/game/CompensationFunc.go index 321209fe..52bfa247 100644 --- a/src/server/game/CompensationFunc.go +++ b/src/server/game/CompensationFunc.go @@ -6,28 +6,27 @@ import ( ) func (p *Player) Compensation() { - p.Compensation20250716() + p.Compensation20250910() } -func (p *Player) Compensation20250716() { +func (p *Player) Compensation20250910() { compensationMod := p.PlayMod.getCompensationMod() - if compensationMod.Is20250716() { + if compensationMod.Is20250910() { return // 已经领取过补偿 } PlayerBaseMod := p.GetPlayerBaseMod() - items := compensationMod.Compensation20250716(PlayerBaseMod.GetName()) + items := compensationMod.Compensation20250910(PlayerBaseMod.GetName()) if len(items) == 0 { return // 没有补偿物品 } - MailMod := p.PlayMod.getMailMod() MailMod.SendMail(&mail.MailStruct{ - Title: compensation.Compensation20250716_Mail_Config.Title, + Title: compensation.Compensation20250910_Mail_Config.Title, SubTitle: "", - Content: compensation.Compensation20250716_Mail_Config.Content, - TitleEn: compensation.Compensation20250716_Mail_Config.Title, + Content: compensation.Compensation20250910_Mail_Config.Content, + TitleEn: compensation.Compensation20250910_Mail_Config.Title, SubTitleEn: "", - ContentEn: compensation.Compensation20250716_Mail_Config.Content, + ContentEn: compensation.Compensation20250910_Mail_Config.Content, Items: items, Type: mail.MAIL_TYPE_NORMAL, }) diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go index d7a59a1e..e465ebec 100644 --- a/src/server/game/Gm.go +++ b/src/server/game/Gm.go @@ -498,7 +498,7 @@ func ReqGmCommand_(player *Player, Command string) error { player.HandleItem(items, msg.ITEM_POP_LABEL_GM.String()) case "resetCompensation": compensationMod := player.PlayMod.getCompensationMod() - compensationMod.C20250716 = false + compensationMod.C20250910 = false case "resetCode": BaseMod := player.PlayMod.getBaseMod() BaseMod.AddCode = fmt.Sprintf("MMM-%s-%s", "156", GoUtil.UniqueStringFromInt(int(BaseMod.Uid))) diff --git a/src/server/game/mod/compensation/compensation.go b/src/server/game/mod/compensation/compensation.go index da2b0533..e1cc174c 100644 --- a/src/server/game/mod/compensation/compensation.go +++ b/src/server/game/mod/compensation/compensation.go @@ -1,54 +1,22 @@ package compensation import ( - "server/GoUtil" "server/game/mod/item" ) type Compensation struct { - C20250716 bool // 2025年7月16日补偿 + C20250910 bool // 2025年9月10日补偿 } func (c *Compensation) InitData() { } -func (c *Compensation) Is20250716() bool { - return c.C20250716 +func (c *Compensation) Is20250910() bool { + return c.C20250910 } - -func (c *Compensation) Set20250716() { - c.C20250716 = true -} - -func (c *Compensation) Compensation20250716(UserName string) []*item.Item { - c.Set20250716() - // 获取补偿物品 - items := make([]*item.Item, 0, len(Compensation20250716_UserList)) - for i := 1; i <= len(Compensation20250716_UserList); i++ { - if GoUtil.InStringArray(UserName, Compensation20250716_UserList[i]) { - return Compensation20250716_Mail_Item[i] - } - } - return items -} - -var Compensation20250716_UserList = map[int][]string{ - // 大R - 1: {"xinshou76", "4920601d6e34e87038919438e242d52e", "93c80508360e35b7571f1a0a03f56a776370cfa0"}, - // 中R - 2: {"xinshou75", "9c65224bb7ed95148260db8f0fe3a0bd", "2efc5e0f7517c825cd7e4702085f885b", "b559595638f42a679284fef0374a549e", "26e701c36fbb004ee00dcccd9bd8cf0f", "51afdcc7d1b0d60044f3a33389f2c734", "ed0f5c193171226d343eae6996fa5ebf", "5c80e4c852b9a4cd1e28c6bcc04f308f", "48289bca7f497297b885203b2cc037bb", "5de84a24101ee25a3ac33168c8083abe", "a9264ed76dafbed52ed9e7afe63d4129", "051d7f087832091750d7d9cc00a5e04a", "04b4de4d67f2ed0399c6abffb956cade", "41c70beb9f22bada780feada5e62bbd1", "fc085d60508bc2e39fc51e5640d75516", "7c0fcfac6e9e8e056b983a30e4f30a09", "20d4b2aed241eda005679a1671bedeac", "857706a740154c8023ea9201d08b8864", "7f47313cd3dcd45a06ad985f2cb27cae", "057bf7221b86d61cce1f80558b929090", "95328e05928a61493c801e05e9e6270a", "491d7d28ce106938aee8b1e1a19b4ae5", "823943647d9adc4d8ddeb596614c0cfb", "d6ce7a43a045d4cd71dbc687787bd0bf", "c75a5faa056b819ad5bb41f4a3ba4a38", "e5815e97add54cb3ceca7dbd2e45bf97", "2cd42018cf56cb9d5a355aff14137b31", "820b48695d2dac1656a84d73e420178b", "2bf69272d55fb9d9d9e15894fb4694a4", "424ccad8b512d91d2f29c80939424564", "a51377da6a792ff69f6faf937e3417ce", "f5ff321d2b2c073e64042852a15dd9b1", "5d80e08adde8e9d59bc79501b16afe20", "53d8041da3964505857ddd1b3cdecf94", "0cc86c12b97d15019dfe25a3285a3e96", "235eb2c144e5b9edf6c44e8ab96082dd", "ed5bbc10a0fba93e591a35a2ec0291c5", "831ab28d8820675ad109c9b184ce9013", "445007c8ca0cc7a12d44d7abdff5cce3", "63f081723bd0e847d1434f5a04598683", "54e715c5c1f4ed795c9c17593de1b7e7", "addb314c66e16f13ddae30896b96c703", "6fc757735b67cf08a7a5ec3baf2a75a3", "2f50d795ddaab2eab1907b5f252705ac", "2137703e941d639f61aeded20f9dbb2b", "02439d94926af2d1473c75f74a00e119", "bd5f5f3e57bd3924e914cdbbc34cce5c", "ab5b80213f12aaaf6d07be2f1932ec43", "ceeb48146b3ebcad66a4cc036ed54d22", "a71625538207fa2b95bb9e8e21449c43", "a0ce6002bb25c2ae0f090a90018fc54c", "a3f5aef9e7dad7d5aa605a49430835b1", "1cf2a5325fa89bb9bb8be2c8616cb9d7", "b04b3963228f85182b6e62c3ef6d8144", "1e8dde7c182488128a5106c5e2d30b42", "71f91ead33b74f7d45be1e37c519286f", "dead5b7820a93351f2e97fe55c0ea5b4", "8732360803535d860fc16d7911c909a1", "7f957a374879d6a2fb635928ce89a525", "0d8ade527e8f3679392260d07b2912e5", "7bf0a3e6df56f0f209814f6547865f55", "d2438f28296a975d52b7d60d287e84ad", "6cafd1059a6c45a31f19f42ed092d633", "55655483cd1cce10b3461d947062f801", "08e04219504d9f37d32e2cfba2874762", "a3d83249211bc380a8ff97f8ab47583a", "c7b75f7ab09002bd245a6a182cbc18df", "d5ded02c0489e177e8f698e5204cfa3d", "e05933874f35069eb0632a433da36ca7", "684ad5e04c21c5a11ac77f2eda19847a", "bd269aa65aa8db830ecbba58bc64902d", "4ec2fd320c4c5ff36dc52fc88720b395", "863db41256074f9656ebbd46fbd85290", "411ca5c6b78844dea836aa399f42ed27", "f0cb8a1825c417e2f7b06a58cac75143", "fd9df16ee523e74d8003f46e47dcb642", "f4a9060aea89d38e2e3f01660491f5c5", "34ed9d69301c301953b2b88dcd13ee9a", "347376f2bf14f156e24fbc4a7285f81c", "dc264e609290d0f94f3e16ca37bbe0c9", "26347928b465b7ba373e9ba641b48199", "f29998d94e79b86c7c3d8937fa9e91e8", "d23081f6510236f4e4be9fb6d5304a6a", "e6718d5d9280570cc31d7a6473143e38", "8083f7ee7c1258aed3db5f40531c334c", "bcdd1c131475dcea35cab935057772eb", "eeb59425fc240ec52454e7dda9889633", "120e7116d570a2554b65f28e724ae758", "675899c81cfece5caa982844538b0191", "9a08781243dba23cbe85bf47c64aa8c4", "0bf5220563363300c6cf43ed20cb5ae7", "c071328705938dc141c8d646d345bf99", "659d71e3896f2f2c98c86c730d394f0b", "96fe50777f7562384e5d71eb010eae7c", "f621506531e0d8cf2bf343ec87042960", "38738aed39f8cea218bc055b5a400cc3", "970653b0d90e2fd43465f436c27845b5", "d7d93978b35d4af85daba89530bf668a", "5d50835ff8c5fdbecd4e92423b5754d3", "ee5648d165c5bab14896741b632b641b", "0b193cbcc1aa07dee619c5d74fdaf92e", "515701c302a9ac871e5b83af734cbdbc", "276c9182dd46575aeb66aac4cef03b7c", "464483a547102c193a44045c9e68fc54", "f421c2c4e1ef383e96df09476502bdaf", "b34e90cbbc0d6f9bf4d6ef80114c5b73", "7d204e48d8c2615c257c2520769fe6ca"}, - // 未付费 18级以上 - 3: {"xinshou79", "8c22f4e8d8edb80d591e716cf016a01a", "ad154577c6ed0c1234c971931fe44353", "cd5fc4cfb76993f1fb62f430895805b5", "ce2107e0f2d5e7c8095928127da643e9", "d95d63f6cbafa348dca4398c61eb7edc", "3c62b0c0e554a16fc54bd9c09a6c76b7", "af31d50b8c98869e9fde4562de7e3b89", "8b3dd61d65a21da33efd3fb9b0a99b55", "0351a4df40069b71de39a9be8c46e705", "786bf20cb74a4e1b9ddfa3035c96aa34", "7b3a3e96d92b48e6fc7fb8dc54c6f177", "05442D5E8EF144F8", "huang015", "585797c5605a8ad80f677312f3c76d64", "acbe55ba2c95f1cb72f4ed4d598cb4b2", "8770ee5ad6e7180ca831f9b23ae0fb2a", "6dea915a82fed9186e6461d2ed2da2aa", "c6bcac871e44dca717c2fd6fab7480d0", "dc9904a54b46116e6534e2c91b8e5164", "dd59d0d8f0e1384e14635035cf17c668", "379a4d820d6e52a7cb781c8f2d7eef5d", "729b80c2155f49043b266744065b5941", "6b997d889562961b44d62bc3e99b8af5"}, - // 未付费 7-17级 - 4: {"xinshou80", "764abc676187b5fb45cb2218b4076e32", "5c790273c5e51e9b8247f4614f6f4f1f", "bdcde03b4dc399118ce1e546690d8c61", "eaf25de5835afb920984eb09297103dd", "8b321645bb2df7ac618c085c849be2e6", "1f2066cb8fd35f6e8cc00c58f919f012", "f75ef1bf55789c8851338712aa1a3c25", "ac5d178c66ddaad2b04d82183dc902f7", "9baad73794e1e7f6f7284cb3fe679160", "20d207e40820d7879baa0781294ff021", "507416eb227f7f012a728f190537530b", "32beaaad0fa90c6dcafc456663d9d417", "7e4dcb931c89033cceac11a1b24b7d45", "b33892d661937e3bd1c3be62120fbf51", "7aed3a3c4703bf898bc20c360f38d09d", "172a008cab6d3606962bcb7add5b1553", "e838a9130e0bf7e0e2680eb825c0ff5a", "167d1a2c6944c65be30c2feb43bdedea", "fcf00eb8002da8ddc6cc72b9de48de55", "3edb0a525ae8a708d12ce15e8d606351", "2901b8332f6a39785194f52dbdecb420", "8efb7602f08d08351798e60791926d79", "8664fc8e96eea3cff44be59a72980635", "a40fedab76a2912bd896fcd8048a3842", "99c592a99716450e59a910d6c5192c7f", "bc3c3b7ca9e5de311ed337d6c3d617c6", "b12acbb51580947a7c1869070dea0d75", "c0ad232262fb2b912ade9aa1412e5406", "0f7e7c8a43f8f502356329ca4fe01a8d", "1eb7a5f2f9390a36b92488645baa6544", "0d56e34bac14cd02ecf98e880234485b", "cf9152a0206da604126c848e3abe3173", "d6c787411fc914c546092a6a6ee33873", "5c427a9e417dea683874bb9117a83899", "3eafdc409abd63f6fa40fcee615bb886", "ea224eb2ab657afe381535c8935b58dd", "717810be22b82f567e14f00c6eecdae7", "f38ce2b02121c800395a19e28174d3b4", "fcd7bce06319b6a590e04baca8958260", "4c5aca1ed18bd529e92792cc9e82d659", "6695418802da285c421eafc09c48256b", "fcb93bd158d212ec031b6f1ae05ab724", "b701386139828ec8f3a3db11731b0f81", "915d608525150d974f7f85bdf0f7b4e1", "0b2244d9b6c01cbb0daf685080d6d975"}, -} - -var Compensation20250716_Mail_Item = map[int][]*item.Item{ - 1: {item.NewItem(item.ITEM_DIAMOND_ID, 500), item.NewItem(item.ITEM_ENERGY_ID, 5000)}, // 大R - 2: {item.NewItem(item.ITEM_DIAMOND_ID, 200), item.NewItem(item.ITEM_ENERGY_ID, 3000)}, // 中R - 3: {item.NewItem(item.ITEM_DIAMOND_ID, 100), item.NewItem(item.ITEM_ENERGY_ID, 1500)}, // 未付费 18级以上 - 4: {item.NewItem(item.ITEM_ENERGY_ID, 500)}, // 未付费 7-17级 +func (c *Compensation) Set20250910() { + c.C20250910 = true } type MailConfig struct { @@ -57,10 +25,290 @@ type MailConfig struct { Items []*item.Item } -var Compensation20250716_Mail_Config = MailConfig{ - Title: "Update Issue reply", - Content: `Dear players, sorry about the update issues due to our release process and strategy changes—some even lost data. We take this issue very seriously. -We truly appreciate your support, so we've prepared a special compensation just for you. Please check it -We're already working on fixing things to make future updates smoother and more stable. -Thanks again for sticking with us. Enjoy your game! `, +var Compensation20250910_Mail_Config = MailConfig{ + Title: "Test Players' Refund", + Content: `Welcome back to our game! +Here comes your refund for your scene progress and payment in test version! +Have fun in new version!`, +} + +var Compensation20250910_UserList = map[string]int{ + "53d8041da3964505857ddd1b3cdecf94": 170, + "0cc86c12b97d15019dfe25a3285a3e96": 60, + "235eb2c144e5b9edf6c44e8ab96082dd": 180, + "00ec10e00f24b0ce7df47e4aa029213e": 10, + "7b3a3e96d92b48e6fc7fb8dc54c6f177": 50, + "8664fc8e96eea3cff44be59a72980635": 20, + "ed5bbc10a0fba93e591a35a2ec0291c5": 60, + "05442D5E8EF144F8": 40, + "6695418802da285c421eafc09c48256b": 30, + "831ab28d8820675ad109c9b184ce9013": 120, + "445007c8ca0cc7a12d44d7abdff5cce3": 60, + "63f081723bd0e847d1434f5a04598683": 225, + "54e715c5c1f4ed795c9c17593de1b7e7": 170, + "addb314c66e16f13ddae30896b96c703": 235, + "172a008cab6d3606962bcb7add5b1553": 10, + "6fc757735b67cf08a7a5ec3baf2a75a3": 170, + "2f50d795ddaab2eab1907b5f252705ac": 265, + "d95d63f6cbafa348dca4398c61eb7edc": 40, + "2137703e941d639f61aeded20f9dbb2b": 60, + "02439d94926af2d1473c75f74a00e119": 60, + "3c62b0c0e554a16fc54bd9c09a6c76b7": 40, + "bd5f5f3e57bd3924e914cdbbc34cce5c": 675, + "a40fedab76a2912bd896fcd8048a3842": 20, + "ab5b80213f12aaaf6d07be2f1932ec43": 245, + "f75ef1bf55789c8851338712aa1a3c25": 10, + "ceeb48146b3ebcad66a4cc036ed54d22": 170, + "a71625538207fa2b95bb9e8e21449c43": 620, + "ac5d178c66ddaad2b04d82183dc902f7": 30, + "a0ce6002bb25c2ae0f090a90018fc54c": 1060, + "a3f5aef9e7dad7d5aa605a49430835b1": 175, + "af31d50b8c98869e9fde4562de7e3b89": 40, + "1cf2a5325fa89bb9bb8be2c8616cb9d7": 565, + "b04b3963228f85182b6e62c3ef6d8144": 775, + "1e8dde7c182488128a5106c5e2d30b42": 170, + "71f91ead33b74f7d45be1e37c519286f": 245, + "dead5b7820a93351f2e97fe55c0ea5b4": 60, + "8732360803535d860fc16d7911c909a1": 615, + "7f957a374879d6a2fb635928ce89a525": 60, + "0d8ade527e8f3679392260d07b2912e5": 185, + "7bf0a3e6df56f0f209814f6547865f55": 560, + "d2438f28296a975d52b7d60d287e84ad": 500, + "6cafd1059a6c45a31f19f42ed092d633": 60, + "55655483cd1cce10b3461d947062f801": 225, + "acbe55ba2c95f1cb72f4ed4d598cb4b2": 50, + "507416eb227f7f012a728f190537530b": 70, + "32beaaad0fa90c6dcafc456663d9d417": 100, + "08e04219504d9f37d32e2cfba2874762": 2645, + "a3d83249211bc380a8ff97f8ab47583a": 60, + "c7b75f7ab09002bd245a6a182cbc18df": 170, + "a096f2c7613c757f2c26fe778b1fc1ba": 350, + "d5ded02c0489e177e8f698e5204cfa3d": 70, + "e05933874f35069eb0632a433da36ca7": 70, + "d80d5ba40fc19ca0779c243fbbf0325f": 20, + "684ad5e04c21c5a11ac77f2eda19847a": 60, + "bd269aa65aa8db830ecbba58bc64902d": 225, + "4ec2fd320c4c5ff36dc52fc88720b395": 900, + "45b6afd25cf8888c2b64e5b2aa386226": 115, + "7fb3198948932be272b8fa9b861e6d57": 225, + "c6fcf7db37b22728a1161df011c0be15": 785, + "e5126dab2148cf017315f93bcd6e0abd": 60, + "8c8b1a20454c794a06b3dcfec366233e": 60, + "2df586ff46c2e3ebd0002a8742e7da92": 30, + "d5dbdcf4483ad154e0aa55daeb66aa76": 335, + "b9ffe1d671754441b48dd48ab815c312": 30, + "06c77038344deb70d2d1cef06dd59e9c": 530, + "dd418046105cbb2dc34d59dfb3e25272": 60, + "417d43ea86146a25ef013a5b69d53be5": 10, + "92518c3e1c5e40aff4c0e7ce8cdc4f75": 115, + "3ccca8a3b2f56929d02d1b59656cb573": 60, + "fd6ea64f9e369b162dbda2621b6781a4": 330, + "f87f20d33e7ec16f2793e990377d65db": 230, + "63974585ca126154bd2e7167974e0ad8": 450, + "bb32f2e266ab5276eb2abfc0a62e85d6": 20, + "734a8c12f0f58d72a64124f4face65f9": 280, + "24bf149cba0cd5a75b252e6b4200bd01": 585, + "512930f1a90d978f206bf9a8dff2c517": 40, + "5dd568a88bc553e7c0feb8f02935d95a": 100, + "f413a92fc07f2b829e629345fa76f42b": 60, + "304f428215a4a80d1f6ef89c7fb343a6": 115, + "5954536fa0ebffe2ff05ae9bedb26f36": 30, + "79c576e73891ba8b5c3236450de0e408": 70, + "586563fb29ab0bd9bbfc55fd96356e31": 60, + "058b6cc4f3df68c309371ec52634db7e": 60, + "aa4c5e7cff8a833ae9116587b0a8c616": 115, + "379a4d820d6e52a7cb781c8f2d7eef5d": 60, + "ea224eb2ab657afe381535c8935b58dd": 20, + "9c65224bb7ed95148260db8f0fe3a0bd": 675, + "97357d270e12028ad645cf1dd71c274a": 150, + "7e4dcb931c89033cceac11a1b24b7d45": 10, + "2efc5e0f7517c825cd7e4702085f885b": 925, + "b559595638f42a679284fef0374a549e": 80, + "26e701c36fbb004ee00dcccd9bd8cf0f": 2605, + "51afdcc7d1b0d60044f3a33389f2c734": 1850, + "huang015": 60, + "ed0f5c193171226d343eae6996fa5ebf": 60, + "8c22f4e8d8edb80d591e716cf016a01a": 40, + "20d207e40820d7879baa0781294ff021": 50, + "5c80e4c852b9a4cd1e28c6bcc04f308f": 60, + "48289bca7f497297b885203b2cc037bb": 70, + "5de84a24101ee25a3ac33168c8083abe": 2765, + "a9264ed76dafbed52ed9e7afe63d4129": 170, + "717810be22b82f567e14f00c6eecdae7": 30, + "051d7f087832091750d7d9cc00a5e04a": 170, + "04b4de4d67f2ed0399c6abffb956cade": 170, + "ad154577c6ed0c1234c971931fe44353": 30, + "729b80c2155f49043b266744065b5941": 60, + "41c70beb9f22bada780feada5e62bbd1": 60, + "fc085d60508bc2e39fc51e5640d75516": 170, + "3edb0a525ae8a708d12ce15e8d606351": 20, + "872ce2732e9fb947a6cc0d2d9e6771f0": 20, + "585797c5605a8ad80f677312f3c76d64": 60, + "f38ce2b02121c800395a19e28174d3b4": 30, + "1eb7a5f2f9390a36b92488645baa6544": 20, + "7c0fcfac6e9e8e056b983a30e4f30a09": 60, + "20d4b2aed241eda005679a1671bedeac": 60, + "8b321645bb2df7ac618c085c849be2e6": 20, + "857706a740154c8023ea9201d08b8864": 115, + "fcd7bce06319b6a590e04baca8958260": 30, + "2901b8332f6a39785194f52dbdecb420": 10, + "786bf20cb74a4e1b9ddfa3035c96aa34": 40, + "7f47313cd3dcd45a06ad985f2cb27cae": 60, + "8efb7602f08d08351798e60791926d79": 100, + "057bf7221b86d61cce1f80558b929090": 60, + "95328e05928a61493c801e05e9e6270a": 555, + "491d7d28ce106938aee8b1e1a19b4ae5": 115, + "bdcde03b4dc399118ce1e546690d8c61": 20, + "823943647d9adc4d8ddeb596614c0cfb": 225, + "d6ce7a43a045d4cd71dbc687787bd0bf": 565, + "c75a5faa056b819ad5bb41f4a3ba4a38": 615, + "1f2066cb8fd35f6e8cc00c58f919f012": 130, + "cecf89cd063b93c63da531daf7204afa": 40, + "4c5aca1ed18bd529e92792cc9e82d659": 30, + "e5815e97add54cb3ceca7dbd2e45bf97": 125, + "2cd42018cf56cb9d5a355aff14137b31": 330, + "820b48695d2dac1656a84d73e420178b": 195, + "2bf69272d55fb9d9d9e15894fb4694a4": 210, + "4920601d6e34e87038919438e242d52e": 11810, + "cd5fc4cfb76993f1fb62f430895805b5": 30, + "424ccad8b512d91d2f29c80939424564": 2350, + "ce2107e0f2d5e7c8095928127da643e9": 70, + "a51377da6a792ff69f6faf937e3417ce": 115, + "f5ff321d2b2c073e64042852a15dd9b1": 1230, + "7aed3a3c4703bf898bc20c360f38d09d": 10, + "5d80e08adde8e9d59bc79501b16afe20": 100, + "bbd8078b62203fad0811d502c65a08e2": 930, + "24626967eb0f1a255d52e526493dcf7a": 1875, + "ea4494a31cbdc7c4c11526f223e2088d": 60, + "528cd6c67c5ea7d653b9a327fe1b795f": 1910, + "c9d50c17f871a5eb9a34dd9094beb287": 280, + "8720fab18c7eb6a784e2fc6d9fa4ae8b": 1340, + "43ccdfeba197c6dce085abebbedf1c32": 115, + "721c70d2bd4a1d64bca56242860c5eb6": 345, + "6027cef2427a2e19ccf544fb173481c3": 140, + "20e3c036450c699fc0c83adca6aec3bb": 110, + "a1070fd3fde30ee7aa9111541d1cc8e5": 60, + "e453465db054317aabce25da6032250c": 2315, + "89a2bc0d834bd5498c1faa90efd772dd": 225, + "3dee30fc88b83e271b4415c09937c93d": 60, + "b2f0261d7064b2ad201542fcd165dd61": 115, + "b03b31df1def262df7837a6de10022fb": 40, + "3f8b0c70b50f104fae1c0a1651139ca0": 1680, + "9a645845fa02cebd29c1fce2f7c258a8": 50, + "f8623082c5e2964be7a7a0c79e13793a": 110, + "de09a725644642cc20d1fcf5f1d4f831": 40, + "a2d5feaf4dcf977d27d782e82a988ce1": 115, + "1aab9af40a17c4a32c410b60699490c2": 20, + "fab340b389795f87676d02049721531d": 20, + "07f3d8eb9311c72e92b8bf15cdcd686d": 1910, + "f6c435f2782ddac3490e22a719092b0d": 90, + "37148fcbd6b1f49de0bc08e558aa2099": 395, + "978105bbd87fa7de8cf8579c7aecdf00": 60, + "12f03a9c3b8a8360d1e15399f99fef6d": 175, + "7c901d37700e63d5ac148c48cbf44643": 30, + "f5b69dd140e8b221b45e76f13d953a51": 115, + "4ff28ac51e2eb7f501caae153b887c70": 40, + "3ceb542cbb7e89401ee4e0bdb38cdc77": 60, + "e08afb745bf3df8469a3dbd04c48b821": 1640, + "93c80508360e35b7571f1a0a03f56a776370cfa0": 24850, + "8b3dd61d65a21da33efd3fb9b0a99b55": 30, + "0351a4df40069b71de39a9be8c46e705": 30, + "863db41256074f9656ebbd46fbd85290": 60, + "411ca5c6b78844dea836aa399f42ed27": 450, + "f0cb8a1825c417e2f7b06a58cac75143": 90, + "fd9df16ee523e74d8003f46e47dcb642": 255, + "fcb93bd158d212ec031b6f1ae05ab724": 30, + "99c592a99716450e59a910d6c5192c7f": 20, + "0d56e34bac14cd02ecf98e880234485b": 30, + "f4a9060aea89d38e2e3f01660491f5c5": 60, + "34ed9d69301c301953b2b88dcd13ee9a": 280, + "b701386139828ec8f3a3db11731b0f81": 30, + "347376f2bf14f156e24fbc4a7285f81c": 445, + "dc264e609290d0f94f3e16ca37bbe0c9": 950, + "26347928b465b7ba373e9ba641b48199": 60, + "cf9152a0206da604126c848e3abe3173": 20, + "e838a9130e0bf7e0e2680eb825c0ff5a": 10, + "f29998d94e79b86c7c3d8937fa9e91e8": 60, + "d23081f6510236f4e4be9fb6d5304a6a": 60, + "bc3c3b7ca9e5de311ed337d6c3d617c6": 10, + "e6718d5d9280570cc31d7a6473143e38": 60, + "8083f7ee7c1258aed3db5f40531c334c": 60, + "d6c787411fc914c546092a6a6ee33873": 20, + "bcdd1c131475dcea35cab935057772eb": 60, + "eeb59425fc240ec52454e7dda9889633": 4775, + "b12acbb51580947a7c1869070dea0d75": 20, + "120e7116d570a2554b65f28e724ae758": 60, + "5c427a9e417dea683874bb9117a83899": 20, + "675899c81cfece5caa982844538b0191": 60, + "915d608525150d974f7f85bdf0f7b4e1": 30, + "3eafdc409abd63f6fa40fcee615bb886": 20, + "764abc676187b5fb45cb2218b4076e32": 60, + "9baad73794e1e7f6f7284cb3fe679160": 50, + "0b2244d9b6c01cbb0daf685080d6d975": 30, + "9a08781243dba23cbe85bf47c64aa8c4": 375, + "0bf5220563363300c6cf43ed20cb5ae7": 3975, + "c071328705938dc141c8d646d345bf99": 3200, + "659d71e3896f2f2c98c86c730d394f0b": 285, + "96fe50777f7562384e5d71eb010eae7c": 1040, + "f621506531e0d8cf2bf343ec87042960": 290, + "eaf25de5835afb920984eb09297103dd": 60, + "167d1a2c6944c65be30c2feb43bdedea": 70, + "38738aed39f8cea218bc055b5a400cc3": 335, + "970653b0d90e2fd43465f436c27845b5": 560, + "8770ee5ad6e7180ca831f9b23ae0fb2a": 60, + "c0ad232262fb2b912ade9aa1412e5406": 20, + "5c790273c5e51e9b8247f4614f6f4f1f": 10, + "d7d93978b35d4af85daba89530bf668a": 2520, + "6dea915a82fed9186e6461d2ed2da2aa": 110, + "c6bcac871e44dca717c2fd6fab7480d0": 60, + "fcf00eb8002da8ddc6cc72b9de48de55": 20, + "2483c316d5ad3d52aca226b8214eab44": 10, + "dc9904a54b46116e6534e2c91b8e5164": 60, + "5d50835ff8c5fdbecd4e92423b5754d3": 180, + "dd59d0d8f0e1384e14635035cf17c668": 60, + "ee5648d165c5bab14896741b632b641b": 360, + "0b193cbcc1aa07dee619c5d74fdaf92e": 125, + "515701c302a9ac871e5b83af734cbdbc": 125, + "276c9182dd46575aeb66aac4cef03b7c": 60, + "464483a547102c193a44045c9e68fc54": 125, + "0f7e7c8a43f8f502356329ca4fe01a8d": 20, + "f421c2c4e1ef383e96df09476502bdaf": 2945, + "6b997d889562961b44d62bc3e99b8af5": 60, + "b34e90cbbc0d6f9bf4d6ef80114c5b73": 115, + "7d204e48d8c2615c257c2520769fe6ca": 4950, + "145f02eae2c0f2b02b64fa0ae312952e": 990, + "cdb17361fff527bc15537f53a1078d54": 10, + "b05461f7da6b12a16a738876beacd8a7": 50, + "161f3cc313f53a56e27e44ddc2114cd3": 20, + "0941cc1a875a37892dc6fbe01f80ae3f": 2250, + "dbf04e1923214e7ba8686eeb517018d3": 60, + "0216b810f943eb199d25584a27fed0f7": 50, + "0464fe31e58c167e9045b8dd7cf6b157": 20, + "c8b65426e1813def463b834516b07fdb": 20, + "3f5db99f93d7151a15f3cdb06871651b": 70, + "390b16d4dc4ed3d1acc92f3a4697c812": 225, + "73efc9c2c6e84bc25876aa77a7d7c269": 60, + "d4b3fa79d7dccece920a4ed29d531c70": 10, + "1ea1598790f03843cd6c7b090c64587e": 60, + "491a3c77ca5a905a023c41fc77c2014f": 60, + "99a4cf90305d2893f0b02040f091a5ac": 565, + "a80b4da7cb82927e2ea904c1990e5a2e": 140, + "e4bf30043bbf6ed0eb7220620bb8152d": 20, + "d295ed0e92c0630d60ab45b6c9117bfb": 60, + "6f9aaa887dedb44b0a169384b2ba164e": 505, + "86f1aaf1d4d1efc1b0a9c7a8ad2d7b12": 305, + "a84f71828ca783ee9011252cb9fb7253": 40, + "54feb3b2a6e54d1ac623adfce552060c": 110, + "e9c815ee02132dc70a2e9d6634a1e9d7": 60, +} + +func (c *Compensation) Compensation20250910(UserName string) []*item.Item { + c.Set20250910() + // 获取补偿物品 + if num, ok := Compensation20250910_UserList[UserName]; ok { + return []*item.Item{ + item.NewItem(item.ITEM_DIAMOND_ID, num), // 钻石 + } + } + return nil } From e6b1bbd1278e216184148a5c439911ac62b33233 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 10 Sep 2025 11:19:09 +0800 Subject: [PATCH 03/34] =?UTF-8?q?20250910=E8=A1=A5=E5=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/Player.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Player.go b/src/server/game/Player.go index 2adf5801..7aa1ff3e 100644 --- a/src/server/game/Player.go +++ b/src/server/game/Player.go @@ -380,15 +380,15 @@ func (p *Player) Login() { LimitedTimePlayroomWorkTrigger(p) // playroom打工 LimitedTimeEnergyAdd(p) // 能量定时处理 ActivityLogin(p) // 活动登录 - LoignBack(p) // 登录返回数据 - SyncMailMsg(p) // 同步邮件 + p.Compensation() + SyncMailMsg(p) // 同步邮件 BaseMod.Login() GuideTaskMod.Login() FaceMod.Login(PlayBaseMod.GetRegisterTime()) AvatarMod.Login(PlayBaseMod.GetRegisterTime()) HandbookItem := p.PlayMod.getCardMod().Login(G_GameLogicPtr.SeverInfo.OpenTime) - p.Compensation() p.HandleItem(HandbookItem, msg.ITEM_POP_LABEL_AllCollectRewardHB.String()) + LoignBack(p) // 登录补发 } func (p *Player) Outline() { From 871d2c564ad4bcc57a931b497250c40f715f5b7e Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 10 Sep 2025 11:30:58 +0800 Subject: [PATCH 04/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=9A=BE=E5=BA=A6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/order/OrderFunc.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go index 3788beb0..5a85bc43 100644 --- a/src/server/game/mod/order/OrderFunc.go +++ b/src/server/game/mod/order/OrderFunc.go @@ -111,8 +111,8 @@ func getChessDiff(ChessNum, OrderDiff, OrderN int) map[int]int { } secondDiff := GoUtil.RandMap(rand) rand = map[int]int{ - DIFF_LOW: 60, - DIFF_MID: 40, + DIFF_MID: 80, + DIFF_HIGH: 20, } thirdDiff := GoUtil.RandMap(rand) rs = map[int]int{ @@ -127,8 +127,8 @@ func getChessDiff(ChessNum, OrderDiff, OrderN int) map[int]int { } secondDiff := GoUtil.RandMap(rand) rand = map[int]int{ - DIFF_LOW: 50, - DIFF_MID: 50, + DIFF_MID: 70, + DIFF_HIGH: 30, } thirdDiff := GoUtil.RandMap(rand) rs = map[int]int{ From f91ae551a02c70268705565b1a2327adcc24f524 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 10 Sep 2025 12:13:28 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=BB=BA=E9=80=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/decorate/Decorate.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/server/game/mod/decorate/Decorate.go b/src/server/game/mod/decorate/Decorate.go index 67e56ee8..8ed17ed3 100644 --- a/src/server/game/mod/decorate/Decorate.go +++ b/src/server/game/mod/decorate/Decorate.go @@ -113,8 +113,7 @@ func (d *Decorate) DecorateAll(Star int) ([]*item.Item, []*item.Item, int, []int Id := decorateCfg.GetIdBySenceAndLv(d.AreaId, d.Progress) PartItem := d.PartCost[Id] if PartItem != nil { - SubItems = append(SubItems, PartItem.Items...) - delete(d.PartCost, Id) + break } d.Progress++ d.DecorateNum++ From b6d5cbd5e2a99711593e6107e35726d850de4000 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 10 Sep 2025 14:18:35 +0800 Subject: [PATCH 06/34] =?UTF-8?q?=E6=96=B0=E6=89=8B=E4=BB=BB=E5=8A=A1bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/quest/Quest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/mod/quest/Quest.go b/src/server/game/mod/quest/Quest.go index 66f69cc4..1620dbf0 100644 --- a/src/server/game/mod/quest/Quest.go +++ b/src/server/game/mod/quest/Quest.go @@ -88,7 +88,7 @@ func TriggerQuestProgress(q *QuestProgress, Tr *Trigger) bool { q.Num += 1 } case TRIGGER_LABEL_GUIDE_LOGIN: // 引导任务登录 - LoginDay := GoUtil.Int(q.A[0]) + LoginDay := GoUtil.Int(Tr.A[0]) q.Num = LoginDay case TRIGGER_LABEL_MERGETIME, // 合成x次 TRIGGER_LABEL_FINISHORDER, From acfcd08d38cd177721a06f0a23ebf54594756c6f Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 10 Sep 2025 16:57:45 +0800 Subject: [PATCH 07/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/PlayerFunc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go index 8232075d..e07269ed 100644 --- a/src/server/game/PlayerFunc.go +++ b/src/server/game/PlayerFunc.go @@ -991,7 +991,7 @@ func (player *Player) FormatOrderReward() { ExpCoin := (Exp-BaseMod.GetExp())*decorateCfg.GetAreaPerPExp(DecorateMod.GetAreaId()) - BaseMod.GetStar() PExpCoin := (PExp-BaseMod.GetPExp())*50 - player.GetPetOrderItemExp() OrderMod := player.PlayMod.getOrderMod() - if ExpCoin > PExpCoin || BaseMod.GetLevel() < 6 { + if ExpCoin > PExpCoin || BaseMod.GetLevel() < 17 { for k, v := range OrderMod.GetOrderList() { if len(v.Items) != 0 { continue From 558e4434275ab3f604b0059c8e6ef444c9415b09 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 10 Sep 2025 18:31:10 +0800 Subject: [PATCH 08/34] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=81=93=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B114?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/Player.go | 27 +++++++++++++++++++++------ src/server/game/mod/item/Item.go | 1 + 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/server/game/Player.go b/src/server/game/Player.go index 7aa1ff3e..313de61a 100644 --- a/src/server/game/Player.go +++ b/src/server/game/Player.go @@ -738,7 +738,23 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error { }) } BackDataType[item.ITEM_TYPE_PLAYROOM_DECORATION_SET] = struct{}{} - + case item.ITEM_TYPE_PLAYROOM_DRESS_SET: // playroom服饰套装 + Effect := itemCfg.GetItemEffectList(v.Id) + PlayroomMod := p.PlayMod.getPlayroomMod() + for _, v := range Effect { + if v == 0 { + continue + } + PlayroomMod.AddDress(v, Label) + Name := playroomCfg.GetDressName(v) + Type := playroomCfg.GetDressPart(v) + p.TeLog("pet_deco_get", map[string]interface{}{ + "pet_deco_type": Type, + "pet_deco_name": Name, + "pet_deco_get_type": Label, + }) + } + BackDataType[item.ITEM_TYPE_PLAYROOM_DRESS_SET] = struct{}{} default: err := ItemMod.AddItem(v.Id, v.Num) p.TeLog("asset_change", map[string]interface{}{ @@ -773,11 +789,10 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error { BackUserInfo(p) case item.ITEM_TYPE_FACE: BackUserInfo(p) - case item.ITEM_TYPE_PLAYROOM_DECORATION: - PlayroomBackData(p) - case item.ITEM_TYPE_PLAYROOM_DRESS: - PlayroomBackData(p) - case item.ITEM_TYPE_PLAYROOM_DECORATION_SET: + case item.ITEM_TYPE_PLAYROOM_DECORATION, + item.ITEM_TYPE_PLAYROOM_DRESS, + item.ITEM_TYPE_PLAYROOM_DECORATION_SET, + item.ITEM_TYPE_PLAYROOM_DRESS_SET: PlayroomBackData(p) } } diff --git a/src/server/game/mod/item/Item.go b/src/server/game/mod/item/Item.go index e2216cc4..6c6aba66 100644 --- a/src/server/game/mod/item/Item.go +++ b/src/server/game/mod/item/Item.go @@ -48,6 +48,7 @@ const ( ITEM_TYPE_PLAYROOM_DECORATION = 111 // playroom装饰 ITEM_TYPE_PLAYROOM_DRESS = 112 // playroom服饰 ITEM_TYPE_PLAYROOM_DECORATION_SET = 113 // playroom装饰套装 + ITEM_TYPE_PLAYROOM_DRESS_SET = 114 // playroom服饰套装 ) func (i *ItemMod) InitData() { From 9317aea2e3114055169e8f116b5ab36b131b1211 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 10 Sep 2025 19:08:29 +0800 Subject: [PATCH 09/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/PlayerFunc.go | 41 ++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go index e07269ed..be51738c 100644 --- a/src/server/game/PlayerFunc.go +++ b/src/server/game/PlayerFunc.go @@ -1007,27 +1007,28 @@ func (player *Player) FormatOrderReward() { }) OrderMod.OrderList[k] = v } - return - } - for k, v := range OrderMod.GetOrderList() { - if len(v.Items) != 0 { - continue - } - if v.Type != order.Common_type { - continue - } - Items := make([]*item.Item, 0) - Star := order.GetOrderStar(v.MergeId) - Star = int(float64(Star)*float64(OrderFactor)/10) * 10 - Items = player.GetPetOrderReward(Star, Items) - if len(Items) == 1 && Items[0].Id == item.ITEM_STAR_ID { - v.Type = order.Common_type - } else { - v.Type = order.Pet_type - } - v.Items = Items - OrderMod.OrderList[k] = v + } else { + for k, v := range OrderMod.GetOrderList() { + if len(v.Items) != 0 { + continue + } + if v.Type != order.Common_type { + continue + } + Items := make([]*item.Item, 0) + Star := order.GetOrderStar(v.MergeId) + Star = int(float64(Star)*float64(OrderFactor)/10) * 10 + Items = player.GetPetOrderReward(Star, Items) + if len(Items) == 1 && Items[0].Id == item.ITEM_STAR_ID { + v.Type = order.Common_type + } else { + v.Type = order.Pet_type + } + v.Items = Items + OrderMod.OrderList[k] = v + } } + // 触发式订单 满足条件生成零件订单 PartCost := DecorateMod.GetPartCost() PartBag := ChessMod.GetPartBag() From 55b80c9135c2717fbd625d0833a727db3b8bfc57 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 10:42:18 +0800 Subject: [PATCH 10/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/UnitTest.go | 8 +++++--- src/server/game/mod/order/Order.go | 12 ++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/server/game/UnitTest.go b/src/server/game/UnitTest.go index 0f05a11a..10960afd 100644 --- a/src/server/game/UnitTest.go +++ b/src/server/game/UnitTest.go @@ -41,11 +41,13 @@ func UnitChessShop(p *Player) error { func UnitOrder(p *Player) error { OrderMod := p.PlayMod.getOrderMod() - // ChessMod := p.PlayMod.getChessMod() - // BaseMod := p.PlayMod.getBaseMod() + ChessMod := p.PlayMod.getChessMod() + BaseMod := p.PlayMod.getBaseMod() OrderMod.OrderList = make(map[int]order.Order) for i := 0; i < 1000; i++ { - err := OrderMod.CreateNormalOrder(17, []int{87, 109, 145, 170, 189}, 2) + OrderMod.ChessPool = nil + OrderMod.EmitShuffle = nil + err := OrderMod.CreateNormalOrder(BaseMod.GetLevel(), ChessMod.GetOrderEmit(), BaseMod.GetEnergyMul()) if err != nil { return err } diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go index d57c1deb..acee21cb 100644 --- a/src/server/game/mod/order/Order.go +++ b/src/server/game/mod/order/Order.go @@ -534,8 +534,16 @@ func (o *OrderMod) CreateExtraOrder(AddChess, AddNewEmit, ChessList []int, Energ for k := range MaxLvChess { ChessNum := GoUtil.GetElemNum(ChessList, k) if ChessNum == 3 && Level >= 12 { - b1 = true - o.addOrder([]int{k, k, k}, DIFF_LOW, Extra_type) + b2 := true + for _, v := range o.OrderList { + if GoUtil.SliceEqual(v.MergeId, []int{k, k, k}) { + b2 = false + break + } + } + if b2 { + o.addOrder([]int{k, k, k}, DIFF_LOW, Extra_type) + } } } //额外订单补充1；CDEG发射器首次合成时，生成其对应2及棋子订单，完成后生成3及，再完成生成4及的； From daff3f15a1dac9f8f2e8e570a77373b5d9a305f1 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 10:59:20 +0800 Subject: [PATCH 11/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/order/Order.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go index acee21cb..d6c97c0d 100644 --- a/src/server/game/mod/order/Order.go +++ b/src/server/game/mod/order/Order.go @@ -530,11 +530,12 @@ func (o *OrderMod) CreateExtraOrder(AddChess, AddNewEmit, ChessList []int, Energ MaxLvChess[ChessId]++ } } + b2 := true //额外订单补充2；当玩家的棋盘中出现三个相同的满级产物时，立刻生成一个对应的收购订单； for k := range MaxLvChess { ChessNum := GoUtil.GetElemNum(ChessList, k) if ChessNum == 3 && Level >= 12 { - b2 := true + for _, v := range o.OrderList { if GoUtil.SliceEqual(v.MergeId, []int{k, k, k}) { b2 = false @@ -558,7 +559,7 @@ func (o *OrderMod) CreateExtraOrder(AddChess, AddNewEmit, ChessList []int, Energ o.addOrder([]int{ChessId}, DIFF_LOW, Preheat_type) } } - return b1 + return b1 || b2 } // 返回订单列表 From 938d586ebf52700aeba1db1a93b91ef4ef55c621 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 11:04:03 +0800 Subject: [PATCH 12/34] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/chess/Chess.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/game/mod/chess/Chess.go b/src/server/game/mod/chess/Chess.go index 23385ce8..6ef3ebd7 100644 --- a/src/server/game/mod/chess/Chess.go +++ b/src/server/game/mod/chess/Chess.go @@ -538,6 +538,9 @@ func (cb *ChessBorad) GetRetireChess(EmitType string) []int { } func (cb *ChessBorad) BeginRetire(EmitType string) error { + if cb.Retire == nil { + cb.Retire = make(map[string]int) + } _, ok := cb.Retire[EmitType] if ok { return errors.New("chess has been retired") From 1344325fcce9d7bbdac3092b130f9a2d99624ade Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 11:38:42 +0800 Subject: [PATCH 13/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/Trigger.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/game/Trigger.go b/src/server/game/Trigger.go index c03d78cc..6e642aa0 100644 --- a/src/server/game/Trigger.go +++ b/src/server/game/Trigger.go @@ -108,13 +108,12 @@ func TriggerShippingOrder(player *Player, req *msg.ReqShippingOrder) { if OrderData.PayStatus == MergeConst.ORDER_STATUS_PAY { break } - } if OrderData == nil { log.Debug("[order data nil] Uid:%d;OrderSn:%s;PayOrder:%s;", player.M_DwUin, OrderSn, req.ProduceId) return } - log.Debug("[order verify success] Uid:%d;OrderSn:%s;PayOrder:%s;", player.M_DwUin, OrderData.OrderId, OrderData.PayChannelOrderId) + log.Debug("[order verify success] Uid:%d;OrderSn:%s;PayOrder:%s;Token:%s", player.M_DwUin, OrderData.OrderId, OrderData.PayChannelOrderId, req.Token) player.lock.Lock() defer player.lock.Unlock() OrderExtraData := &ChargeExtra{} @@ -132,6 +131,7 @@ func TriggerShippingOrder(player *Player, req *msg.ReqShippingOrder) { SendCharge(player, OrderExtraData) } OrderData.PayStatus = MergeConst.ORDER_STATUS_SHIP + OrderData.PayChannelOrderId = req.Token db.UpdatePlayerChargeData(OrderData) player.PlayMod.save() orderDataMap := map[string]interface{}{ @@ -142,6 +142,7 @@ func TriggerShippingOrder(player *Player, req *msg.ReqShippingOrder) { "ProductId": OrderData.ProductId, "CreateTime": OrderData.CreateTime, "PayTime": OrderData.PayTime, + "Token": req.Token, "Price": OrderData.Price, "PayType": OrderData.PayType, } From 5ecdfd81bd51c981aa3cb74ac62888df183b3d44 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:10:51 +0800 Subject: [PATCH 14/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/order/Order.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go index d6c97c0d..014e5643 100644 --- a/src/server/game/mod/order/Order.go +++ b/src/server/game/mod/order/Order.go @@ -530,12 +530,12 @@ func (o *OrderMod) CreateExtraOrder(AddChess, AddNewEmit, ChessList []int, Energ MaxLvChess[ChessId]++ } } - b2 := true + b3 := false //额外订单补充2；当玩家的棋盘中出现三个相同的满级产物时，立刻生成一个对应的收购订单； for k := range MaxLvChess { ChessNum := GoUtil.GetElemNum(ChessList, k) if ChessNum == 3 && Level >= 12 { - + b2 := true for _, v := range o.OrderList { if GoUtil.SliceEqual(v.MergeId, []int{k, k, k}) { b2 = false @@ -543,6 +543,7 @@ func (o *OrderMod) CreateExtraOrder(AddChess, AddNewEmit, ChessList []int, Energ } } if b2 { + b3 = true o.addOrder([]int{k, k, k}, DIFF_LOW, Extra_type) } } @@ -559,7 +560,7 @@ func (o *OrderMod) CreateExtraOrder(AddChess, AddNewEmit, ChessList []int, Energ o.addOrder([]int{ChessId}, DIFF_LOW, Preheat_type) } } - return b1 || b2 + return b1 || b3 } // 返回订单列表 From 94ea5b5751404dad18c10f0ebc6e9e20366c16a4 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 15:01:21 +0800 Subject: [PATCH 15/34] =?UTF-8?q?=E8=A3=85=E9=A5=B0bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/decorate/Decorate.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/game/mod/decorate/Decorate.go b/src/server/game/mod/decorate/Decorate.go index 8ed17ed3..7e99b766 100644 --- a/src/server/game/mod/decorate/Decorate.go +++ b/src/server/game/mod/decorate/Decorate.go @@ -103,6 +103,11 @@ func (d *Decorate) DecorateAll(Star int) ([]*item.Item, []*item.Item, int, []int Num := 0 PetExp := 0 for _, v := range SubAlice { + Id := decorateCfg.GetIdBySenceAndLv(d.AreaId, v) + PartItem := d.PartCost[Id] + if PartItem != nil { + break + } NeedStar := decorateCfg.GetStarCost(d.AreaId, v) if Star < NeedStar { break @@ -110,11 +115,6 @@ func (d *Decorate) DecorateAll(Star int) ([]*item.Item, []*item.Item, int, []int Star -= NeedStar SubItem += NeedStar d.FinishList[v] = struct{}{} - Id := decorateCfg.GetIdBySenceAndLv(d.AreaId, d.Progress) - PartItem := d.PartCost[Id] - if PartItem != nil { - break - } d.Progress++ d.DecorateNum++ Num++ From d80d7adce59b6410dbb2b4ed40879ab00082e1e9 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 15:59:05 +0800 Subject: [PATCH 16/34] =?UTF-8?q?=E5=8F=91=E5=B0=84=E5=99=A8=E9=80=80?= =?UTF-8?q?=E9=9A=90=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/PlayerBaseMod.go | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/game/PlayerBaseMod.go b/src/server/game/PlayerBaseMod.go index a3ee0859..d43c9625 100644 --- a/src/server/game/PlayerBaseMod.go +++ b/src/server/game/PlayerBaseMod.go @@ -549,6 +549,7 @@ func (p *PlayerBaseData) AddExp(player *Player, exp int, pexp int) (int, error) return 0, err } } + EmitRetireTrigger2(player) player.PushClientRes(p.BackAsset()) return upLv, nil } From 4512648ae7f3cc9069cfcf3036194b18b8377d33 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 17:54:23 +0800 Subject: [PATCH 17/34] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/conf/endless/EndlessCfg.go | 4 ++-- src/server/game/Player.go | 2 +- src/server/game/RegisterNetworkFunc.go | 3 ++- src/server/game/UnitTest.go | 3 ++- src/server/game/mod/endless/Endless.go | 12 ++++++------ src/server/game/mod/endless/EndlessFunc.go | 12 ++++++------ 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/server/conf/endless/EndlessCfg.go b/src/server/conf/endless/EndlessCfg.go index 93661f65..1ab56785 100644 --- a/src/server/conf/endless/EndlessCfg.go +++ b/src/server/conf/endless/EndlessCfg.go @@ -67,14 +67,14 @@ func GetPerDiamond(Id int) float64 { return 0 } -func GetItemId(Diamond float64, Type int) []int { +func GetItemId(Diamond float64, Type, Lv int) []int { data, err := gamedata.GetData(CFG_ENDLESS_JACKPOT) if err != nil { return nil } var ItemId []int for _, v := range data { - if Diamond >= gamedata.GetFloatValue(v, "Diamond") && Type != gamedata.GetIntValue(v, "Type") && gamedata.GetIntValue(v, "ItemId") != item.ITEM_ENERGY_ID { + if Lv >= gamedata.GetIntValue(v, "Lv") && Diamond >= gamedata.GetFloatValue(v, "Diamond") && Type != gamedata.GetIntValue(v, "Type") && gamedata.GetIntValue(v, "ItemId") != item.ITEM_ENERGY_ID { ItemId = append(ItemId, gamedata.GetIntValue(v, "ItemId")) } } diff --git a/src/server/game/Player.go b/src/server/game/Player.go index 313de61a..e13edcba 100644 --- a/src/server/game/Player.go +++ b/src/server/game/Player.go @@ -314,7 +314,7 @@ func (p *Player) ZeroUpdate(a []interface{}) { p.PushClientRes(p.PlayMod.getChargeMod().BackData()) // 无尽礼包 - p.PlayMod.getEndlessMod().ZeroUpdate(p.PlayMod.getChargeMod().GetMaxCharge()) + p.PlayMod.getEndlessMod().ZeroUpdate(p.PlayMod.getChargeMod().GetMaxCharge(), p.PlayMod.getBaseMod().GetLevel()) p.PushClientRes(p.PlayMod.getEndlessMod().BackData()) // 宠物宝箱 diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index b4f71cb8..92c31541 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -2553,7 +2553,8 @@ func ReqEndlessReward(player *Player, buf []byte) error { req := &msg.ReqEndlessReward{} proto.Unmarshal(buf, req) EndlessMod := player.PlayMod.getEndlessMod() - itemList, err := EndlessMod.GetReward() + BaseMod := player.PlayMod.getBaseMod() + itemList, err := EndlessMod.GetReward(BaseMod.GetLevel()) if err != nil { player.SendErrClienRes(&msg.ResEndlessReward{ Code: msg.RES_CODE_FAIL, diff --git a/src/server/game/UnitTest.go b/src/server/game/UnitTest.go index 10960afd..2a8ead48 100644 --- a/src/server/game/UnitTest.go +++ b/src/server/game/UnitTest.go @@ -17,7 +17,8 @@ func UnitEndlessReward(p *Player) error { if EndlessMod == nil { return fmt.Errorf("EndlessMod is nil") } - Item, err := EndlessMod.GetReward() + BaseMod := p.PlayMod.getBaseMod() + Item, err := EndlessMod.GetReward(BaseMod.GetLevel()) if err != nil { return err } diff --git a/src/server/game/mod/endless/Endless.go b/src/server/game/mod/endless/Endless.go index dfd1e011..28f59309 100644 --- a/src/server/game/mod/endless/Endless.go +++ b/src/server/game/mod/endless/Endless.go @@ -33,7 +33,7 @@ func (e *EndlessMod) InitData() { } // 零点更新 重置礼包 -func (e *EndlessMod) ZeroUpdate(MaxMoney float64) { +func (e *EndlessMod) ZeroUpdate(MaxMoney float64, Lv int) { e.List = make(map[int]*Endless) e.Auto = 1 FirstMoney := 0.0 @@ -53,18 +53,18 @@ func (e *EndlessMod) ZeroUpdate(MaxMoney float64) { } var r map[int]*Endless - r, e.Auto = initGrade(FirstMoney, e.Auto) + r, e.Auto = initGrade(FirstMoney, e.Auto, Lv) for k, v := range r { e.List[k] = v } NextMoney := endlessCfg.NextMoney(FirstMoney) - r, e.Auto = initGrade(NextMoney, e.Auto) + r, e.Auto = initGrade(NextMoney, e.Auto, Lv) for k, v := range r { e.List[k] = v } NextMoney = endlessCfg.NextMoney(NextMoney) - r, e.Auto = initGrade(NextMoney, e.Auto) + r, e.Auto = initGrade(NextMoney, e.Auto, Lv) for k, v := range r { e.List[k] = v } @@ -73,7 +73,7 @@ func (e *EndlessMod) ZeroUpdate(MaxMoney float64) { } // 领取免费礼包 -func (e *EndlessMod) GetReward() ([]*item.Item, error) { +func (e *EndlessMod) GetReward(Lv int) ([]*item.Item, error) { v, ok := e.List[e.Id] if !ok { return nil, fmt.Errorf("EndlessMod Reward Id:%d not found", e.Id) @@ -87,7 +87,7 @@ func (e *EndlessMod) GetReward() ([]*item.Item, error) { if v1.Type == ENDLESS_TYPE_CHARGE { //领完一阶段 随机新的一阶段 var r map[int]*Endless NextMoney := endlessCfg.NextMoney(e.LastMoney) - r, e.Auto = initGrade(NextMoney, e.Auto) + r, e.Auto = initGrade(NextMoney, e.Auto, Lv) for k, v := range r { e.List[k] = v } diff --git a/src/server/game/mod/endless/EndlessFunc.go b/src/server/game/mod/endless/EndlessFunc.go index 7aab2554..550f4ed5 100644 --- a/src/server/game/mod/endless/EndlessFunc.go +++ b/src/server/game/mod/endless/EndlessFunc.go @@ -7,7 +7,7 @@ import ( ) // 初始化奖励 -func InitReward(Diamond float64, Order int) []*item.Item { +func InitReward(Diamond float64, Order, Lv int) []*item.Item { numRand := map[int]int{1: 30, 2: 60, 3: 10} Num := Util.RandMap(numRand) PerDiamond := endlessCfg.GetPerDiamond(item.ITEM_ENERGY_ID) @@ -17,7 +17,7 @@ func InitReward(Diamond float64, Order int) []*item.Item { } if Num == 2 { - ItemId := endlessCfg.GetItemId(Diamond, 0) + ItemId := endlessCfg.GetItemId(Diamond, 0, Lv) if len(ItemId) == 0 { return []*item.Item{item.NewItem(item.ITEM_ENERGY_ID, int(Diamond/PerDiamond))} } @@ -28,7 +28,7 @@ func InitReward(Diamond float64, Order int) []*item.Item { return []*item.Item{item.NewItem(item.ITEM_ENERGY_ID, ItemNum), item.NewItem(RandItem, 1)} } if Num == 3 { - ItemId := endlessCfg.GetItemId(Diamond, 0) + ItemId := endlessCfg.GetItemId(Diamond, 0, Lv) if len(ItemId) == 0 { return []*item.Item{item.NewItem(item.ITEM_ENERGY_ID, int(Diamond/PerDiamond))} } @@ -36,7 +36,7 @@ func InitReward(Diamond float64, Order int) []*item.Item { Type := endlessCfg.GetType(RandItem1) ItemDiamond := endlessCfg.GeDiamondByItemId(RandItem1) LastDiamond := Diamond - ItemDiamond - ItemId = endlessCfg.GetItemId(LastDiamond, Type) + ItemId = endlessCfg.GetItemId(LastDiamond, Type, Lv) if len(ItemId) == 0 { ItemNum := int(LastDiamond / PerDiamond) return []*item.Item{item.NewItem(item.ITEM_ENERGY_ID, ItemNum), item.NewItem(RandItem1, 1)} @@ -52,7 +52,7 @@ func InitReward(Diamond float64, Order int) []*item.Item { } // 初始化档次奖励 -func initGrade(Money float64, Auto int) (map[int]*Endless, int) { +func initGrade(Money float64, Auto, Lv int) (map[int]*Endless, int) { Diamond := endlessCfg.GetDiamond(Money) Per := []float64{0.5, 0.3, 0.2, 0.1} result := make(map[int]*Endless) @@ -71,7 +71,7 @@ func initGrade(Money float64, Auto int) (map[int]*Endless, int) { result[Auto] = &Endless{ ChargeId: Charge, Type: Type, - Items: InitReward(Diamond*Per[i-1], i), + Items: InitReward(Diamond*Per[i-1], i, Lv), } Auto++ } From eebc7bcdcecb00d5473d48c494303937148a8438 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 17:58:38 +0800 Subject: [PATCH 18/34] =?UTF-8?q?gm=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/Gm.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go index e465ebec..c0aeb852 100644 --- a/src/server/game/Gm.go +++ b/src/server/game/Gm.go @@ -399,6 +399,11 @@ func ReqGmCommand_(player *Player, Command string) error { DecorateMod.AreaId = S DecorateMod.FinishList = make(map[int]struct{}) DecorateMod.Progress = 0 + DecorateMod.PartCost = make(map[int]*decorate.PartCostInfo) + DecorateMod.PartClassPool = []int{} + DecorateMod.PartPool = make(map[int]int) + DecorateMod.InitData() + player.PushClientRes(DecorateMod.BackData()) case "setDecorateProgress": S, _ := strconv.Atoi(arg[1]) DecorateMod := player.PlayMod.getDecorateMod() From c3da735fe37fbb4df5a5a9cd9bfb6a98865db5c9 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 18:08:53 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/RegisterNetworkFunc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index 92c31541..8707bb6f 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -3358,7 +3358,7 @@ func ReqPlayroomInfo(player *Player, buf []byte) error { for _, v := range PlayerData.Chess { Color := mergeDataCfg.GetColorById(v) Lv := mergeDataCfg.GetLvById(v) - if GoUtil.InStringArray(Color, ColorList) && Lv <= 8 { + if GoUtil.InStringArray(Color, ColorList) && Lv <= 8 && Lv != 0 { RandList = append(RandList, v) } } From a3665587e4964b90976fe68745ab9bc7c890e19d Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 20:37:16 +0800 Subject: [PATCH 20/34] =?UTF-8?q?=E6=A3=8B=E5=AD=90=E5=95=86=E5=BA=97?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/charge/Charge.go | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/game/mod/charge/Charge.go b/src/server/game/mod/charge/Charge.go index 2abda169..71257a41 100644 --- a/src/server/game/mod/charge/Charge.go +++ b/src/server/game/mod/charge/Charge.go @@ -314,6 +314,7 @@ func (c *ChargeMod) InitChessShop(Emit []int) { if ColorType == mergeDataCfg.CHESS_PRODUCT_SECONDARY_TYPE { Diamond *= 2 } + Diamond = max(1, Diamond) RandList = append(RandList, &Rand{ChessId: c, Diamond: Diamond}) } } From 05dd4e3ab7cf40a12a27bbaff703d94fcc285bfe Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 20:39:27 +0800 Subject: [PATCH 21/34] =?UTF-8?q?=E6=A3=8B=E5=AD=90=E5=95=86=E5=BA=97?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/charge/Charge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/mod/charge/Charge.go b/src/server/game/mod/charge/Charge.go index 71257a41..0f7b41dd 100644 --- a/src/server/game/mod/charge/Charge.go +++ b/src/server/game/mod/charge/Charge.go @@ -311,10 +311,10 @@ func (c *ChargeMod) InitChessShop(Emit []int) { if ColorType == mergeDataCfg.CHESS_PRODUCT_SUB_TYPE { Diamond = int(math.Pow(2, float64(ChessLv-1))/2.5 + 6.4) } + Diamond = max(1, Diamond) if ColorType == mergeDataCfg.CHESS_PRODUCT_SECONDARY_TYPE { Diamond *= 2 } - Diamond = max(1, Diamond) RandList = append(RandList, &Rand{ChessId: c, Diamond: Diamond}) } } From 35d3fb5e81028335ac67c02159554d2c712e0565 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 22:19:41 +0800 Subject: [PATCH 22/34] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8F=91=E5=B0=84=E5=99=A8=E6=BB=A1=E7=BA=A7=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=9C=A8=E7=94=9F=E6=88=90=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E4=BA=A7=E7=89=A9=E7=9A=84=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/order/Order.go | 9 +++++++++ src/server/game/mod/order/OrderFunc.go | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go index 014e5643..add9cf5d 100644 --- a/src/server/game/mod/order/Order.go +++ b/src/server/game/mod/order/Order.go @@ -27,6 +27,7 @@ type OrderMod struct { OrderPool map[int]*Order // 订单池 FinishOrder []int // 已完成订单 IsCharge bool // 是否充值 + AutoEmit []string // 自动发射器 } type Order struct { @@ -212,6 +213,14 @@ func (o *OrderMod) TriggerOrder(lv int, Type string, Emit []int, EnergyMul int) o.OrderList[v.Id] = orderInfo } else { o.addFixOrder(v.Id, v.MergeList, Type, v.Items) + if v.Id == 78 { + o.Retire("D") + o.AutoEmit = append(o.AutoEmit, "D") + } + if v.Id == 79 { + o.Retire("I") + o.AutoEmit = append(o.AutoEmit, "I") + } } } } diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go index 5a85bc43..c1387ad8 100644 --- a/src/server/game/mod/order/OrderFunc.go +++ b/src/server/game/mod/order/OrderFunc.go @@ -391,6 +391,10 @@ func getEmitSeries(o *OrderMod, Emit []int) string { if o.EmitShuffle == nil { o.EmitShuffle = make([]string, 0) for _, v := range Emit { + EmitId := mergeDataCfg.GetEmitId(v) + if GoUtil.InStringArray(EmitId, o.AutoEmit) { + continue + } EmitProduct := mergeDataCfg.GetEmitProduceType(v) if len(EmitProduct) == 0 || EmitProduct[0] == "" { continue From 35b6f72d3015a4769b7cd78ea0964ba65a2cfaba Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 11 Sep 2025 23:03:33 +0800 Subject: [PATCH 23/34] =?UTF-8?q?=E8=A1=A5=E5=81=BF=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../game/mod/compensation/compensation.go | 324 ++---------------- 1 file changed, 38 insertions(+), 286 deletions(-) diff --git a/src/server/game/mod/compensation/compensation.go b/src/server/game/mod/compensation/compensation.go index e1cc174c..d51092ca 100644 --- a/src/server/game/mod/compensation/compensation.go +++ b/src/server/game/mod/compensation/compensation.go @@ -1,11 +1,12 @@ package compensation import ( + "server/GoUtil" "server/game/mod/item" ) type Compensation struct { - C20250910 bool // 2025年9月10日补偿 + C20250910 bool // 2025年7月16日补偿 } func (c *Compensation) InitData() { @@ -15,10 +16,41 @@ func (c *Compensation) InitData() { func (c *Compensation) Is20250910() bool { return c.C20250910 } + func (c *Compensation) Set20250910() { c.C20250910 = true } +func (c *Compensation) Compensation20250910(UserName string) []*item.Item { + c.Set20250910() + // 获取补偿物品 + items := make([]*item.Item, 0, len(Compensation20250910_UserList)) + for i := 1; i <= len(Compensation20250910_UserList); i++ { + if GoUtil.InStringArray(UserName, Compensation20250910_UserList[i]) { + return Compensation20250910_Mail_Item[i] + } + } + return items +} + +var Compensation20250910_UserList = map[int][]string{ + // 大R + 1: {"52b445340d919a013da196364747676c", "e08afb745bf3df8469a3dbd04c48b821", "24bf149cba0cd5a75b252e6b4200bd01", "07f3d8eb9311c72e92b8bf15cdcd686d", "18311051132", "e453465db054317aabce25da6032250c", "c6fcf7db37b22728a1161df011c0be15", "8720fab18c7eb6a784e2fc6d9fa4ae8b", "0941cc1a875a37892dc6fbe01f80ae3f", "528cd6c67c5ea7d653b9a327fe1b795f", "145f02eae2c0f2b02b64fa0ae312952e", "24626967eb0f1a255d52e526493dcf7a", "bbd8078b62203fad0811d502c65a08e2", "7d204e48d8c2615c257c2520769fe6ca", "4ec2fd320c4c5ff36dc52fc88720b395", "f421c2c4e1ef383e96df09476502bdaf", "f5ff321d2b2c073e64042852a15dd9b1", "424ccad8b512d91d2f29c80939424564", "4920601d6e34e87038919438e242d52e", "08e04219504d9f37d32e2cfba2874762", "c75a5faa056b819ad5bb41f4a3ba4a38", "8732360803535d860fc16d7911c909a1", "d7d93978b35d4af85daba89530bf668a", "96fe50777f7562384e5d71eb010eae7c", "c071328705938dc141c8d646d345bf99", "0bf5220563363300c6cf43ed20cb5ae7", "a0ce6002bb25c2ae0f090a90018fc54c", "a71625538207fa2b95bb9e8e21449c43", "eeb59425fc240ec52454e7dda9889633", "bd5f5f3e57bd3924e914cdbbc34cce5c", "dc264e609290d0f94f3e16ca37bbe0c9", "5de84a24101ee25a3ac33168c8083abe", "51afdcc7d1b0d60044f3a33389f2c734", "26e701c36fbb004ee00dcccd9bd8cf0f", "2efc5e0f7517c825cd7e4702085f885b", "9c65224bb7ed95148260db8f0fe3a0bd", "93c80508360e35b7571f1a0a03f56a776370cfa0"}, + // 中R + 2: {"aa4c5e7cff8a833ae9116587b0a8c616", "e9c815ee02132dc70a2e9d6634a1e9d7", "058b6cc4f3df68c309371ec52634db7e", "3ceb542cbb7e89401ee4e0bdb38cdc77", "586563fb29ab0bd9bbfc55fd96356e31", "79c576e73891ba8b5c3236450de0e408", "54feb3b2a6e54d1ac623adfce552060c", "304f428215a4a80d1f6ef89c7fb343a6", "f413a92fc07f2b829e629345fa76f42b", "f5b69dd140e8b221b45e76f13d953a51", "86f1aaf1d4d1efc1b0a9c7a8ad2d7b12", "6f9aaa887dedb44b0a169384b2ba164e", "12f03a9c3b8a8360d1e15399f99fef6d", "978105bbd87fa7de8cf8579c7aecdf00", "d295ed0e92c0630d60ab45b6c9117bfb", "37148fcbd6b1f49de0bc08e558aa2099", "a2d5feaf4dcf977d27d782e82a988ce1", "734a8c12f0f58d72a64124f4face65f9", "99a4cf90305d2893f0b02040f091a5ac", "1ea1598790f03843cd6c7b090c64587e", "63974585ca126154bd2e7167974e0ad8", "13260210932", "13148973903", "dd418046105cbb2dc34d59dfb3e25272", "73efc9c2c6e84bc25876aa77a7d7c269", "b2f0261d7064b2ad201542fcd165dd61", "390b16d4dc4ed3d1acc92f3a4697c812", "3dee30fc88b83e271b4415c09937c93d", "d5dbdcf4483ad154e0aa55daeb66aa76", "89a2bc0d834bd5498c1faa90efd772dd", "8c8b1a20454c794a06b3dcfec366233e", "a1070fd3fde30ee7aa9111541d1cc8e5", "721c70d2bd4a1d64bca56242860c5eb6", "e5126dab2148cf017315f93bcd6e0abd", "43ccdfeba197c6dce085abebbedf1c32", "dbf04e1923214e7ba8686eeb517018d3", "c9d50c17f871a5eb9a34dd9094beb287", "7fb3198948932be272b8fa9b861e6d57", "45b6afd25cf8888c2b64e5b2aa386226", "ea4494a31cbdc7c4c11526f223e2088d", "5d80e08adde8e9d59bc79501b16afe20", "b34e90cbbc0d6f9bf4d6ef80114c5b73", "bd269aa65aa8db830ecbba58bc64902d", "464483a547102c193a44045c9e68fc54", "684ad5e04c21c5a11ac77f2eda19847a", "276c9182dd46575aeb66aac4cef03b7c", "515701c302a9ac871e5b83af734cbdbc", "e05933874f35069eb0632a433da36ca7", "0b193cbcc1aa07dee619c5d74fdaf92e", "d5ded02c0489e177e8f698e5204cfa3d", "a096f2c7613c757f2c26fe778b1fc1ba", "a51377da6a792ff69f6faf937e3417ce", "ee5648d165c5bab14896741b632b641b", "5d50835ff8c5fdbecd4e92423b5754d3", "c7b75f7ab09002bd245a6a182cbc18df", "2bf69272d55fb9d9d9e15894fb4694a4", "820b48695d2dac1656a84d73e420178b", "2cd42018cf56cb9d5a355aff14137b31", "e5815e97add54cb3ceca7dbd2e45bf97", "a3d83249211bc380a8ff97f8ab47583a", "55655483cd1cce10b3461d947062f801", "d6ce7a43a045d4cd71dbc687787bd0bf", "823943647d9adc4d8ddeb596614c0cfb", "6cafd1059a6c45a31f19f42ed092d633", "d2438f28296a975d52b7d60d287e84ad", "491d7d28ce106938aee8b1e1a19b4ae5", "7bf0a3e6df56f0f209814f6547865f55", "0d8ade527e8f3679392260d07b2912e5", "7f957a374879d6a2fb635928ce89a525", "dead5b7820a93351f2e97fe55c0ea5b4", "71f91ead33b74f7d45be1e37c519286f", "1e8dde7c182488128a5106c5e2d30b42", "970653b0d90e2fd43465f436c27845b5", "38738aed39f8cea218bc055b5a400cc3", "95328e05928a61493c801e05e9e6270a", "057bf7221b86d61cce1f80558b929090", "f621506531e0d8cf2bf343ec87042960", "b04b3963228f85182b6e62c3ef6d8144", "659d71e3896f2f2c98c86c730d394f0b", "1cf2a5325fa89bb9bb8be2c8616cb9d7", "7f47313cd3dcd45a06ad985f2cb27cae", "a3f5aef9e7dad7d5aa605a49430835b1", "9a08781243dba23cbe85bf47c64aa8c4", "857706a740154c8023ea9201d08b8864", "20d4b2aed241eda005679a1671bedeac", "675899c81cfece5caa982844538b0191", "120e7116d570a2554b65f28e724ae758", "ceeb48146b3ebcad66a4cc036ed54d22", "7c0fcfac6e9e8e056b983a30e4f30a09", "ab5b80213f12aaaf6d07be2f1932ec43", "bcdd1c131475dcea35cab935057772eb", "fc085d60508bc2e39fc51e5640d75516", "8083f7ee7c1258aed3db5f40531c334c", "e6718d5d9280570cc31d7a6473143e38", "02439d94926af2d1473c75f74a00e119", "41c70beb9f22bada780feada5e62bbd1", "d23081f6510236f4e4be9fb6d5304a6a", "2137703e941d639f61aeded20f9dbb2b", "f29998d94e79b86c7c3d8937fa9e91e8", "04b4de4d67f2ed0399c6abffb956cade", "051d7f087832091750d7d9cc00a5e04a", "26347928b465b7ba373e9ba641b48199", "a9264ed76dafbed52ed9e7afe63d4129", "48289bca7f497297b885203b2cc037bb", "347376f2bf14f156e24fbc4a7285f81c", "5c80e4c852b9a4cd1e28c6bcc04f308f", "2f50d795ddaab2eab1907b5f252705ac", "6fc757735b67cf08a7a5ec3baf2a75a3", "34ed9d69301c301953b2b88dcd13ee9a", "f4a9060aea89d38e2e3f01660491f5c5", "addb314c66e16f13ddae30896b96c703", "54e715c5c1f4ed795c9c17593de1b7e7", "63f081723bd0e847d1434f5a04598683", "445007c8ca0cc7a12d44d7abdff5cce3", "831ab28d8820675ad109c9b184ce9013", "ed0f5c193171226d343eae6996fa5ebf", "ed5bbc10a0fba93e591a35a2ec0291c5", "b559595638f42a679284fef0374a549e", "fd9df16ee523e74d8003f46e47dcb642", "f0cb8a1825c417e2f7b06a58cac75143", "411ca5c6b78844dea836aa399f42ed27", "235eb2c144e5b9edf6c44e8ab96082dd", "863db41256074f9656ebbd46fbd85290", "0cc86c12b97d15019dfe25a3285a3e96", "53d8041da3964505857ddd1b3cdecf94"}, + // 未付费 18级以上 + 3: {"fd6ea64f9e369b162dbda2621b6781a4", "06c77038344deb70d2d1cef06dd59e9c", "6b997d889562961b44d62bc3e99b8af5", "dd59d0d8f0e1384e14635035cf17c668", "dc9904a54b46116e6534e2c91b8e5164", "acbe55ba2c95f1cb72f4ed4d598cb4b2", "c6bcac871e44dca717c2fd6fab7480d0", "6dea915a82fed9186e6461d2ed2da2aa", "8770ee5ad6e7180ca831f9b23ae0fb2a", "786bf20cb74a4e1b9ddfa3035c96aa34", "585797c5605a8ad80f677312f3c76d64", "729b80c2155f49043b266744065b5941", "05442D5E8EF144F8", "huang015", "7b3a3e96d92b48e6fc7fb8dc54c6f177", "379a4d820d6e52a7cb781c8f2d7eef5d"}, + // 未付费 7-17级 + 4: {"26075f43c670dfe30cd64e97a2bc88d4", "a535361baa5fa432484638ac32f9854c", "223a5bd59c1b3b7ac64de4ae5a581726", "72dc67afc808000df405ff213b55dfaa", "8e1865928d30854efd503511767983f9", "1a5efb9da0776cf25028011433e996dd", "7e8c6a967084bd23bd97530f49af03e9", "7f098ff3192a84b5fe28d85c43a201f8", "051545f1997830a59b7bf1060562a4b5", "d7507549b6ce4481b59c9c8ad4fcc831", "f407c898570154e42f6340541c5be57c", "a616d3aeec667b17c3768a9b09726c31", "2c229f4b706e581ca8a6fb0e833f1537", "3a8299ff3dacc829788b0ef19a3cad03", "56b23953c93d7b190410af6a0642c59b", "88a666f1bfe9032cf2a5fad0ca497289", "6b994c386f15c62ee17b39ca566b8dbf", "5e5f3f82d47371fc2c5095142c016985", "7f641c85c71e713650ece95a62ea196e", "b1b9d66ba806cba39c35aabcb5d2d422", "7c4c4705e68cfdee2134d0ecfe32c655", "c3519fea43e9d4e5bbf718ccf822037f", "c295b5b4350e5eee9c5f7ca9a15d8bfd", "c95ed665d99640dfca6f935eaf099ab0", "d6d220575379df1c2e5026023adbc755", "a57c1d279de0ad46ead226090ffed50f", "27908e96ebb055a6e9e279f7390eb6e9", "4ff28ac51e2eb7f501caae153b887c70", "49993a2e783585e50529650fcec88bb4", "c2d2dd6764bc8ecc0bd43c91b58e86a7", "dbfd588b6daf4ae33330e208397b84d7", "e228764a7b5c3ad2023e2644030d691d", "9db9ac3a8162646b6412547ad7ad5234", "f466d02ef5a9623fad517a8e01ffd158", "e2e452debabbe6f7e8522a39733c4add", "fa6448b29c55f005d9bbebb0921bc8b8", "cc54f4ba94604cb02e51e6dacd520203", "f2c3dbf9f5ae58a9b9eee06f21633777", "232434b20155ca0ef39f94df76f4b538", "fc872eec3b879cc841cea7035859c6cb", "5954536fa0ebffe2ff05ae9bedb26f36", "1064d00acb67323ffc2e6a87d0edad2b", "eec0092a69741450aaaca76234a0539d", "2fb98abae9162399e14ab26a8d612dd5", "da4f7ca42ea34bfd0c7af36e7c8afcf6", "385370a72363f6c0c9eb3e59d64355d1", "072f36501c721ff57585c600d8ea1719", "c275418a28e28b07aa200e6d225245af", "1fe8bcac316c9923d1624cdba720cd7f", "40e0a718b8f9e525e79269996d5de45d", "c9fedd4728bd038b60f1bcc252777138", "1060116da41ba1571569fcac5fa480f1", "2aaf170ab11f70bffbd991cc73c55c5f", "a5423e92dc42b395564ef420672662d7", "b23a35549cbf3803e9c325ae65e680d3", "11ceff574fe013505479e8b916a47eac", "d32421c28e9e4fa6f59b1f4dbc21098d", "a0fb7b33957a9dcec822ce46f388318e", "5dd568a88bc553e7c0feb8f02935d95a", "4b7972232dbff6e54e18fd254448e0b5", "a81507d0dfbdeb22ac13b94f5f6cc6e3", "9df473278c2adfe9b9972d41d2d12cc2", "66f8212197043cd3dd35083d39d78614", "6d0d8cd1976be01b3b302ddf71b06ff8", "21f831c4121e2cb0e872b17681746505", "72b6ec8347dfc670096cda9507a00f6c", "854a680566955aac2e5ea1355b0b8bff", "e22e807476b2545aec298de6f8ee607c", "19d469cf63aacf42a54b581075fc0389", "4443b6948cc575345527f4de8bc2ddf5", "c051b53dbd857710a3bf53754d8a62a8", "a84f71828ca783ee9011252cb9fb7253", "1db19bddcf3437f84ba2a25106674035", "0d688d5d4f89fdb292deeac017b7da2a", "dc5d97f7db3b8423bc2a835b55d34d51", "0fcf677f530def00166643d6433ec31c", "7e2907589f5f2813573493104f9337ed", "18ccab6ef98337d5f8239281f5305a94", "1e46d0cd9520f6b0144b98e3fbd10e3d", "7dd8d734810f0f395b06ecdf21d647c5", "f1435e03de53ce2ad7171485bea806b8", "512930f1a90d978f206bf9a8dff2c517", "29ebf35c9704184ad8f636955564afdd", "7c901d37700e63d5ac148c48cbf44643", "0d6914ee98329049c2dc8786aeb1faa0", "de3942876465688a892cec236815c8b9", "10500afc7a48a65e6d941a875c491d90", "e4bf30043bbf6ed0eb7220620bb8152d", "a720bfd58ee1ff7cdbd5cd9149ef5e49", "5ece537586921bff80c41fa1bb4051eb", "f1a88195f7cd9e4b948063b4cfd4b40f", "93533b4aa766a9e1c894b29922316903", "8016aa7c06e99d78fe00e82fcb4ad820", "f6c435f2782ddac3490e22a719092b0d", "751e3ffec36152e295b60c3fc78de903", "98282adda6ca026cbc1924fb462d0f16", "361ee86c3a825164db4f3dc2ac4278b2", "579f24e4e960d3dfd0644413d94bcae1", "d13cf3e0f989e65ea97830abb22625cf", "0857fdcc879dc8ed0d3f6c9323031831", "f9db110319f365640f580dc40bc44420", "5789f6ec14195f1420df138762a8d56d", "fab340b389795f87676d02049721531d", "2b9cfda79b57d30592239708fd400406", "67153fd2c575baf9371d34c78723c8ed", "a591bf45dab5dfd8dede0f698b5cec5c", "ede113a13abac838b13d63a4c8f0a659", "96f89e839f75c5cfa2583e665cf20f0c", "ebf03b43d34eccaa07f6d107464b7877", "1aab9af40a17c4a32c410b60699490c2", "b3773bdba0075c33e9bfaef36b3af964", "a80b4da7cb82927e2ea904c1990e5a2e", "1661c8c5e41f4fc91efe29a7ae6fcb22", "d851a608a77b05b1d2c3dc5b67ba611e", "0975ec7dd0136ebc89d35af1e98b5485", "fad17e1a2da78e9918772f1d0d2a27c5", "6fedf42f141b89785a2d4de122607ea2", "f7a719e2e93d5afc57bde04866e85c4f", "70447a755b96db42e19d8f52fce9f0ca", "4618163ed6c119878a4c951229ea8aa1", "4e5d3381b3ef65e1ae69ca2b5978aa84", "de09a725644642cc20d1fcf5f1d4f831", "84d19c5e40cd14b49347b8c25be52d14", "a1e8660986de62cfc3f321c301585da0", "b679c6de6b51e4a13e5567d841eed9f3", "aaaaf2c5dacf7356705673dfcad11dd7", "f8623082c5e2964be7a7a0c79e13793a", "dc71d970186b305dc2435c3e5318a6d8", "08bff962ab9a88f5808ff25f8b9db670", "c8201d347589938b18d1d72dcd84d87f", "491a3c77ca5a905a023c41fc77c2014f", "9a645845fa02cebd29c1fce2f7c258a8", "8e624a7f6374e9a7f5a20926067c0496", "7eac866e91967fe1d0eda5e03a1da307", "6f5792f05e59c4aa256900ae5735ce4c", "60285a471c9a5654ee6a2279f071b492", "f8a7f15ac92e0c3dcb19f0e2ad254e9e", "87e3b740d71466bedf6cbf5768c0b19b", "bb32f2e266ab5276eb2abfc0a62e85d6", "b69eb79a345e9711552b02e5bac02de2", "ede7117e1479c21c31bfd65315f028ee", "bd83860a778b33fe29a9701dad946022", "091bbbbab32b19acbc7d822aa792c60a", "e457c3ca1ceba5c7659f4206ea5953cb", "21fd346bc567ba0d0047226aad03ac6a", "bc06f2389fef07b02a3bd2da3f5716b6", "d4b3fa79d7dccece920a4ed29d531c70", "f87f20d33e7ec16f2793e990377d65db", "e60ee8371019e847bcbee6c91444bab7", "9afb63f9010025c78eed00cca00700ad", "8f576cd6fb8edbf99df70911214fc504", "16dd1279a26f9e967afea29d04155f6e", "5d23f35c7f19f5460dc1569203ae77eb", "39c8ca69056be75300fee4fe0e517a14", "417d43ea86146a25ef013a5b69d53be5", "f28adde36d8d398f9153b3a8dd4e1de4", "48c5e7a390cfcc6bd6a186dd7445e5c9", "633616b9b7e448dd3f582399381b64b3", "b03b31df1def262df7837a6de10022fb", "e54f85a63bc6f796df0a0c39084c1f41", "57237c618310d0796c3bc1a6605e636f", "af2c93ab401e7e7d7d748706442be1fe", "f5ef87e449defdcc23838a88ae691929", "b1cbcd72b0d993e30ff33d6e1b628241", "f3520b1fcb9f56cc428b0a2f958ce84a", "857c5e3e2dadc091b8b9ebc9c113d4b3", "88082bbf6958d63b059934ffbab38c8d", "91b968f724b72c1962993b2180f8a91a", "6609d686e3c5e7331945bd4f75b114f0", "5de3731f2cc1610f7d871dd601314e62", "5acd42158c7fbe61bb8989b412a8afea", "720f8c59806be328d41aabe79bd8fe90", "11f430f1441867fce2a91d4b551e9d25", "3bd07cd1031ba0b44408b961b76317e2", "c22acd3de5e56fc0de20d09cc4682102", "0fcbf84a47e123624d15fbb501ae87d1", "85d5846324cbbc25fbf8d0d0a3963d83", "aefc8c40098a4a067ecf46fd1871f9c8", "be3d849df00fc258f7739b0f2830bc5e", "29052729ffa3344b6dada91c13397c2c", "328a1800fb132974a45b6883278fb1de", "7bc8126ddfbf4e29626639817416cdb2", "e55caff3bb839914d3e528f38376624f", "b49f769be1a06cceeedb48c9654a32af", "289d3dc9cc706905e4d5d2b5432232ae", "c8b65426e1813def463b834516b07fdb", "20e3c036450c699fc0c83adca6aec3bb", "b825904aee098f4f96dbdb30243cdb1c", "489d5303618aed43a8010bffd467b52d", "a9cf1313624aae4bdc30b25198bd86eb", "59a7418416f3844c4a22a8cceebb1318", "bce194db96e4dcd5533ecd9ff68633c4", "a7a20a58d3b5050269b5bac1c5bed761", "6027cef2427a2e19ccf544fb173481c3", "bcff48f6b15197de4bed36ef306cafb0", "d8f6e5cbbf6209a65af36b1c1e5713fc", "123664da8a82b5f3b66f02e72e106698", "0464fe31e58c167e9045b8dd7cf6b157", "d1d84b1de7fd83326ee524052fdbe8ed", "8d3b66eec4bc65a4adc48a8511956e9f", "35a55919458cac21fed83de85668d463", "8fe21503527699bb792cd57a4e2d60c9", "161f3cc313f53a56e27e44ddc2114cd3", "b05461f7da6b12a16a738876beacd8a7", "88658f7cdd3081f6547b5a8f8a25cc13", "e37fa52764114fbc1db8a8fc2b67def5", "c0ca57fc455a0d1636d77d539425c683", "4dfb1461aa1fb7fc9102dd631d69dd18", "580148c37b38cda7d714af98df944384", "5c62c5b310766637a56e76bf5890e23a", "d595b5d638a80e3e11196469171ec74b", "d450760a052e5f4fbc0c2c9476e877c9", "07b9e109f9d6e2d0a09774e1a44aa105", "c92f6ff9106a87015e6bb0ed8c864022", "9469724fdfb56b16e4009d83d0ff622c", "c5d343dbb120ffe9a339fe2c4415ca96", "04bbb2587a786e9c74a731f37e2088a1", "a5c3226d3abe6d484d197dbafb54e1ed", "277341fc42a7ab254cf15ade24c7d070", "ebbb8bd6b2ae6f059cd241823a7fb4ba", "d3001fc047816896be2fd3f6f2321168", "dac9b230940fff1d183fb4890ecd7ab1", "db2104ce49cd38a7371dc64da252acca", "b8c15d98c62da6c8e84e68b7f31de00f", "2d964ce7129bbf2b8ae9368ccae3c938", "0c67dcd64b5111a2a7312d5f9eb250a8", "14107a27eed8226658f760939e204f96", "09215b30570420560bb742bd3576d400", "d938dc3f2ee4daa3f4b19f4ac8ea35a7", "6983ad86ab16d2e7f7b72ba00c6d670d", "628124cacdfea3f832b76efa8e248b4e", "0cbde8d151455ba226b6f00edc33c230", "9906fe90127379d859ea177fb9ecb8af", "4e5d7a56da6842d199c060336141a218", "25d207f92416c9954dffe37d94176f90", "cdb17361fff527bc15537f53a1078d54", "6b40ea5a0dc621e27db38ee9f1fd4027", "a9617827543067d7996fa73b79162475", "4f6d8ad654a5dcd42bb9952d5baf2619", "e02104c9b20854af17f26f8b69d253b1", "c6b032cae8fa461f830d5aae9af467a0", "a4ea67d04497d29661164787ecce5ca9", "83b86a1bfa0611951ed49123881d5a3e", "4578d34b5e732aff2f25dc3c159a2825", "f569302e05924ea0c15bbcf84b90fbc7", "462bfb42a0f1fc5a0e891c5975520e75", "0d35dcb90d3bc9960cb6765895676b74", "bd8cd93cff5208f99d67cb479495675a", "7baeb3ff107a859132e3bf99c02ed7b8", "cab2cb45b0d9bf7b77451e8c77e242a5", "945cfa22eabe291f4933345244e9370a", "37ea7d36edec158ee79c282e9f2d81da", "02ba5f26acd84c6e7c710bc98f6d0992", "def0c4237f3d67ae8691c84163a15220", "9375bed276209944be26ee14b11102f2", "6d5a44a69b2cb25ba24446a33fb681ff", "7a215f4c26b43601929e970bc5d8b957", "e65254596b4bba19d48a2dd40afc15a8", "8262a9cbf5ceaef4e5a9a2ff999f3fec", "ad3cb9d92b9611822da1d68979267bfc", "3aa8d0f1f3648c5ab827c0aceba618ae", "345b8f79e64cf5cdcf5677269f95d6c7", "080fe5509e886fc84d3191e0f94e715f", "fe46856adc0fcf8bc5e4c549be21cd50", "74838abde49ab247310ad1dec886a19f", "0c3f1cc139be85eb3c46bc6dddb56aa5", "73e61139b23e79e85339a8c24ca4db86", "4cdefbd1d5b36c4d9530ee6703753150", "869fe903087b9d61028f9e6a0af41d36", "e862d17df245163e49dbb50ad798a573", "7bbc548e02f8c314effe4399eca2bf0d", "4402521e358713c312b6d560bb3c6aaa", "0e5819a1a6b9ec77a44b4a1a70befee4", "fbc174fddad7114fbe4e498971acb400", "d84a0cb80b8b2afef29f77c6b9f7c8c7", "08ee7292f2a92fef6f7be8559c1ea52a", "a332e0008a82346afc01414a6b76071b", "a126fb9d82925825fb68c694903a7b8f", "445ab08a6ad0092a6049f6f2faf27ff1", "68671bbaa9a0de47b367a93a3f4b9059", "15930286589e7467d545db09de851b06", "0f7e7c8a43f8f502356329ca4fe01a8d", "5f4f04024c3f9adf87594c5c2b0e01a6", "6b829a159eae3901865875a6e4f5cc92", "c24c1b6e41bad786acce6d1a57eca0a8", "ae0f6053771d41a6645f6c0004cef778", "d109c87d86a635074ab2f4e99d3218f7", "3be253f6b1dfa7e3428fa2a10947213f", "dfb14f14c25f2edfbbe452c72d4b6d7d", "48ef133de824a69c4ceb72f8d06da6fe", "a2f8abb79d60736943bdb750870e05b3", "3c7e13c2d1010425cde0656a88256abc", "fe16486e6ae2f0029646843f5bd7b520", "a823fa47a71aa941e12d0c66d35f92f3", "9cad13ab3419ec92fda68cb1bc80e2a4", "c9b56aaa2d1d7b748607bab28da46dfb", "25f6d4c5c8e2516f3b84659d611b848a", "7aed3a3c4703bf898bc20c360f38d09d", "13d3a7a79b02d3b7f699578569fa0d70", "084ba16f51e36b8267dad33004f526e8", "ac1695d09b3dd6afb39f4a6ec770f2e9", "5c055611fdd1a2162cf12d1092ef5e9f", "ccd0b92964af566e62640f9f3c712fe5", "11b99627df8629d8daf4c2f9f1b5b6c4", "275dd2b43495fd3130eea4d60981915d", "dc06f3e3025ff2f63cae257e1a502e7a", "74e0853eb6f2aa131afffee41f0ab174", "03950bd134de1b5f568837ac584e56df", "ce2107e0f2d5e7c8095928127da643e9", "5944e029be990215557c699f72db08ed", "b33892d661937e3bd1c3be62120fbf51", "e8f7c5ceb30e82839cccf4a04cceca5a", "e35cb7330b5f2d7023bb8ff6bea2e538", "14e2357375e3d5721b254b3a62ba227d", "7093d65ef8d279e6c9c8c1d4bacd7245", "a3088f596bb9e00bd9e0f46f94e7bc90", "4181ebcce4b1c1840d6e1115533e1317", "1df45b857c9d82ba63d0deb9b22ba8b3", "f3380413a428a0a914615391185f72c6", "3d4b250e1b07e0ee81753fd44f8df07c", "5beac32d1f9cff9fbfeeeef0a43e6ac3", "1534eb56204cf4b4e4ae40ac2f45f593", "4c5aca1ed18bd529e92792cc9e82d659", "ddb2dbe7b640fcce7bfdbbf88ea1e008", "88223098015e7510b05e5e0a1afa5706", "8f0b1942718d8bf1b49c07a9bb6e85ca", "40a1da1a232521fc00237e3640af541f", "6f41a9ae6a31dadf9db253f007609b6b", "5ef87f9ebbadb7364beb5ce87409c904", "1f9523553574736cebee88f6e56eae15", "380cfe7d6ac738de44df8d209191c592", "32beaaad0fa90c6dcafc456663d9d417", "507416eb227f7f012a728f190537530b", "2e7a5fa446b65cfba22072057360f5c6", "bcf06e7b307c358cd273338e4bc13666", "fcf00eb8002da8ddc6cc72b9de48de55", "63dda2e3463465deccc7d050771b595e", "a327d17298671fcedd403fa8f4b7e84a", "9bbd1907e5f9046d301fd17714e20a98", "82ae6af6c8dba4cb1e143a3093694ff5", "9cf10013e10eb5fc29b639133aa844ac", "60abd6f318e24b76caf6025aff67e81c", "b098e9af9331bf1ba7a319c765100dd0", "539d8aa5f45f4c61cd8bc8b62c5b5900", "6094fc63b8e6dc4e06dd0fb38c8660b1", "8d553358534790438973a19f99489ae8", "ee5062030ad715ae9089ce6cfbff0c1c", "3adb99f02e594cdeecdb8883c72c240a", "5c4a4903c5340106eea926947eddc003", "ba5be7c787cd131da237233d5adc8c09", "1749e83718747b3f2d1d348536975126", "64cad3149fcefd8cfd29798ba2dd6e66", "5debbe3b9d2dc48470dccff1844bb6f1", "1d61197f7575012180648c6176042000", "04a1e5c1ddd949d9edd1317da589e1e9", "fdd8cdb4232b80fb9faec81b9d1b1ee0", "f660a969eca5363372d38662c9614c08", "2d331575770f34aef04acad77566ee15", "eb75d05180825a37a4c8a9e812eff607", "1dad02a85dc178cd9856ab8280aadd7d", "c0ad232262fb2b912ade9aa1412e5406", "c5f401671e4f3d831fd4c472b2fe54be", "08384c3694331fd2f44f5d8219454701", "f206c3549ebfc85e771015b35c47c149", "c002b84c18534fe1e1c207d851c9adaf", "aee229511a67bf9b960a7bed938eed8c", "167d1a2c6944c65be30c2feb43bdedea", "f8def380d7c8da5d71f886754dd6175a", "315c50782298e370ead7b99a7e0eff64", "79b995a6904dd1abadf2cbd82422cc9a", "ce72adc40a33d588f3a530aa447e73c0", "8efb7602f08d08351798e60791926d79", "ca90fdb8daa30a4a063f376d8c4e1e31", "ac7c796d087b63164f80f6d85a6fadad", "cf9bfa41a053140a652addfd14168b19", "e6fa2ba0a9e2ce1c36d56ac21d22c985", "fcbae6f8892b24549a2977925bf0a04c", "d9f9aa27277a34b9e559a61cfcedb922", "23da0a355730518d7713ab7a42a68225", "af492a4b8967ac8a4c8a8577faefe194", "be59738a26a0a4fa1a95847c66ae4300", "3fa8ee9585babdd419c64de1a60f45a2", "ff2173735c6f82f098d94975d3a8f4ef", "40c4e87f750debfbbfe7931305917a16", "df14eaf697e45da1eddcec2b1fbf33e2", "4b6ae17721f47634663fb88b18ffb602", "5139fe3d91f0e0cc246195cd46e671f6", "6aaabc72f9b5e61e215f5b2101e65be3", "5764846dedbddc1611fda657a3de6502", "06b3feec73106eae8e8d3d8f5b9092cd", "4b6065d4fb369c0a8cf2fa9c4aa5254f", "561d5d5c37a2f43a85d74a4c7038f5cc", "75cf37d6fad98c8f655d09289ce89621", "0aa5cb009177bd20a3f6d88869ffacf4", "6be754fe17ba2d5035091f08c75b0449", "2901b8332f6a39785194f52dbdecb420", "429ba0138f79788f198aea28e9a75a82", "2aa40b7c207854a604cc7e60dd4472d1", "0b2244d9b6c01cbb0daf685080d6d975", "cc4f0566af4c9008fbeaea927ecb9e9b", "c692dae086e143c5555a5cbfc6bc02c8", "bfe0f8209c148715b4ebfa836f2b39d8", "f1169f1a6d17241f26ab040a9c6a5a04", "9baad73794e1e7f6f7284cb3fe679160", "2715abc7527b9bb24d54d65de79b7897", "45542c68b64cb28cf715646c15933ee9", "f6d662aa182a9c40443a3ec920686ad7", "c96cb0784e60f755863da9e3821c952f", "8d56e22649c0e62cdd53b0ff36b65b5d", "c68e873a04e48bdc73dc7b5aa6872710", "fcd7bce06319b6a590e04baca8958260", "3eafdc409abd63f6fa40fcee615bb886", "915d608525150d974f7f85bdf0f7b4e1", "be09abe4625f96cc9f15847312373df9", "d85dac370946c8f79790390ff77e7b63", "7cd282941a42b507d23802d15e802adc", "0dff6c90d51208122906a3a25b762dbe", "751a761c48da68cf3524b98052f59a95", "6da85828cbba23500ee01cbdcf4a120d", "34cdab5b446b7e4cd0f60d93dbecec35", "7e972e22dcf197e2241050499eee1705", "70419fe46bf3e6f749cc94a4173e679e", "51671f4d25aeca255be4f604f359b2d2", "62f2dc6d54d91428aabe6bb0a77ce9ff", "5679c5fb666225e2a941d88820dc2953", "4d07352aed207788ea05f747f416496e", "60013564e978c63c80d7ce40ee4e56a1", "5c427a9e417dea683874bb9117a83899", "add41e51927ffd9bf782c215db386165", "157cc543c89fbd03e50628d87a00902f", "ac592b804c4a09f817286adecb4b16a7", "08ed677de8dd3b68716b5a7dfb02b342", "eb692ce229f1420bca69bcc7fd3bd0d7", "ac5d178c66ddaad2b04d82183dc902f7", "3e252f0e6372335e41948cda454528ae", "b12acbb51580947a7c1869070dea0d75", "54bc5aa0d9372de1976a6296fa94f198", "8ead6124f9fb9ba8c9f38e73e32146d7", "ea56ede46fd681336c83c7a668922d57", "ee4999c91bca1273cbf8505576eeef7c", "6c53b4ab854766594019e33d1625a57f", "fc77aa3f2d164aa01eed11b734c58c46", "8a2c36327a4f39fe7afd648c9e6a9b74", "05376f43e211079bbafba44342aa22f1", "b63cb3f3b096cdbc4ff43db72aa76fa4", "f75ef1bf55789c8851338712aa1a3c25", "c274a2b4b97a11d5c776797e1ce55eb4", "1eb7a5f2f9390a36b92488645baa6544", "6c0daf4c7c32a0ca9ca81082db8a36dd", "5c26cf2e51d0db5fe358f6bba5eb3ffb", "1f49f3eb02378bc63e306d4c77a31c43", "f38ce2b02121c800395a19e28174d3b4", "86522a5dbfc0f9cb54e5a4d7bc86512a", "d48995f6494575b499405f8193b5011c", "304b45381f4bc1651f1ed3a57b6d8c9c", "34188e3f4105c9b06691be8e03c1283b", "872ce2732e9fb947a6cc0d2d9e6771f0", "4c939f07c5216cd41ab79027ce4bf9d8", "8b503065db956e569948b3edcb88e07f", "c203a0af66d4f89fe7a3c831e10dbef8", "cad1f55fc23f0f84b71b300ee633757f", "5e2dd693027b843fb3ec6abd870826be", "261faa8ad31865b2f4800bb0e2889360", "cfdef264ef4b687d272118bb1dcb6b79", "77e73a972a15faf4e41c1a8b17893660", "7d983ce10296ef3174c8d53a5dfe3720", "d823e30143ba42717bdf9e4ff3dc1c8c", "994cd3e17933898ce3789a55d4aab972", "e5284aaea9c73050200bcd18ab70cd41", "c3cb3bc2fa90b581090737d157023271", "73922b69a49955cb20dae0f6c22d9418", "a40fedab76a2912bd896fcd8048a3842", "de411127862d22b96d78922cc33a2be6", "d6c787411fc914c546092a6a6ee33873", "3f971c29212b963aa21d25836445a646", "21e334dc87a432dad2fbc4134e4d09d0", "728ba58404740c398d1218451924a788", "3edb0a525ae8a708d12ce15e8d606351", "a8e2a2c8eced1a379d27db9e35487bf2", "906db7f94717209cc9704ccbc8b91cab", "bfddffd61ef32edee9657cf371b6f1f7", "a5ea240235dd08bf5d5f25c4b47f81e2", "91cf2889d13b20b1fa69824f5cfa078c", "f1cd25c0972858acb9b63818e18b1e17", "78364291b8bec669ed73603435bf5b56", "8b6210c2bf7b540a9592b9ebe4d9a3e8", "220ca24dd13598e4b55727bff0c8d50d", "d3d7952ebae2e08f7484a11a6aeed346", "f6e599d4f1c390c3438045b5f0f6250f", "7d83cf6b0e8a8ed2036055bd3962a446", "049ea115ecb6c2b2a18600e636263b7e", "c8de9f06d9ce9f1591f62ea46355d139", "0b3db7d1b9e9880d58ded2bf6502334c", "6296c2a9f441462f5e7119be0fa28ed8", "277e3b0870083c7b714a7828fdd438a0", "60561bd7e31926f273a2487b5786bb96", "bc3c3b7ca9e5de311ed337d6c3d617c6", "a5bc51d1c7cca732e87afd9c7ebe942a", "0a60a604262fb217cd2cda0f728c96b8", "05fd01adb5fa781b70245c5d568988e9", "1d8f2eb7e6d5a1d126d6269f83ba921a", "8684e6ed185e2c4ac9735f15c28365f4", "2eadd87b2ea955710f85af376155a78a", "b16457cbde462fa8b0b6c6356f3abb40", "bb3ff21cbc915f16abaa4af3d21d1d0e", "b37e3f210fd7c3c2b5e61593ac4fdebd", "4692566c87ef7fddd2a046e7329964a5", "6968597999e17f76c17a792f372705f3", "bf3f39e2e5ae14462fcd732a30a2c6f4", "d67f0b1a712ce7c5c20cff9077f0a933", "1fc46a23868977e9887b90d79d9596e3", "3675caca19314aeaa9c46014ddea447c", "0fbe78499ef048a8ae2c0a7482cac425", "ba4e783dd58850803cbfdb8b51bf8992", "61199fa072184939806c3e49f9736c8a", "53923eb1cc76db7d610b44867625b740", "6bab85f2217315f75c9addc6474ed21d", "251be1a93a398843c1c675d9defe8cb7", "e838a9130e0bf7e0e2680eb825c0ff5a", "9055098443ddcef22e6df393f4a9d30e", "e131aa8b54a2d82bb48bf58864cd67a2", "83586f2930da0fd57a183ee6573e3393", "bc890fce767afe51359a164e1212681d", "fb8798df5debc2c99a8fde9d4609f160", "e03374606e01028a6148528a2dea5eec", "497569d2b748e5c510e8165dfc10df82", "f5d82851ba6bba66fda061b83202b5bd", "cf9152a0206da604126c848e3abe3173", "2a23335b89851fa32ecb67351a5f721b", "6237e3558c79f2086f8bcd4ec34a0050", "c1c1f10e06f7a9f6468bb7e31a95c281", "e1434531e48f299a2d933f44c90896e7", "d42f35a8f1d9e21f76151546997d9507", "cb330f3248bba52df9e9d096cc0cc853", "83f144ccf42e3ef1c911bc32b50dc1b2", "f4d1c38dd08e247015121314c1cd9e2e", "929a389789b75558079b2be1724f733c", "e76b5bd7adf66ce5c7934238e814d2f1", "717810be22b82f567e14f00c6eecdae7", "17b8a2968be092ebecef025b103d65e4", "55c8d92d0f73c9285a3c12d55ffae50a", "46f4dd9072903178cfcbb509f073ae69", "cd5c6ac8de139fd276a785d96ddfaf73", "0e39d87dd95d8a393c1fd096e268eab6", "fa23ae0eb624396937002e16cca4d1de", "df1d763d35e056edeec2a570641f842e", "6f5fd6fa3d4ecb5f78ec942dc171e7f2", "d230f58197e12a151c73d40788ff591b", "e677b7c9a28ae7f026a89b64c5a55426", "17ebde775f0ce7816743dfb3a30eaa92", "234dc4dbe8edac023a5596d40a3fd30a", "4ae51fd5d38b9ab3acaefeb057adfd15", "cb923fd280951012db94646a3716b058", "a91a9818478d17e8c11a1ec630874e7f", "b701386139828ec8f3a3db11731b0f81", "ffe0f952068ff23d586ecbdeea3f1111", "20d207e40820d7879baa0781294ff021", "7ae092888b5d26c4e5be09a54f05a720", "a45abf0a9eec4fc6429d49754f84dba0", "6a73a734f16372c37c39afcb500f2f93", "6af74c7b7f05dbe556b55c3badd1e2af", "29b8a04794377809d41cd8c3e1ced064", "eb41730f88be43c35967c29433c764a4", "172a008cab6d3606962bcb7add5b1553", "11a9d11107fcc14beae6ef5ebafa29b6", "f8804d908f63bc75935f43fc58df6c04", "5980d9476319b995a70df2199ff5f235", "99cfef57251305978f782cf7a4714dc2", "70cf338fa0ce1036788ad2fc9ee24494", "b3996cd1f3e3de58398865b374f1b8dd", "cdbea30a69d9b7ac0a43981b061b9d41", "c2ca22e13fb893a831517d895c2a4e88", "8e1cc3d9903f8d13e27c6d0dcee0c4cb", "8fb8286fed5ee5a9f8e04cb0ce88a238", "50940cc3a7cd1647adc1b501a50796d9", "ead3e4d77047ab208e62366368b082d8", "512066513dfdf2c062178fc1176b788f", "f4791f838710c77332fcd3cc1c85975a", "85b03dd7b1d43f027a0a4a9e7d7787d6", "6695418802da285c421eafc09c48256b", "0f9da6a7a6211cfe96ebe9a674573513", "4ebe0f70fef832f3af9447a5208a6443", "9aea20016b44da189d8b8130331307b6", "b2df07767f73454b431506820ca53663", "9f40db497a0eb4b7b0dc7570a1b61b69", "fa821908ea57fb398403b52264c088bb", "badbfe8a79534cf426e7f476c6542706", "7c51419c89f08556bb6f9652eee060b6", "2edf810c383bcfa40fc1cdda9f00685f", "31a9670e49d1df639838d1ffde55b3a3", "e122d49dd5630dc2ee71b979ba5ec693", "a058befaf93fc0bbf5d9dc49e2c49adb", "001b5fe46542104f505c3130f14b5efd", "0d56e34bac14cd02ecf98e880234485b", "9661f520dc8b15bfbcc2f7fa80545f0f", "c5bd1d83d41b33ec335c69b3a970f9b1", "83dd97247c40305a79fc515a443182aa", "6972d5fbe08068e8c2380404ad5c1035", "24685f9f6980a41e13f8b934f277213d", "d8ef8a752e46b11d6192709e916169dd", "0cb89a71277f295c426dcd345b061d30", "417633057f716f3a3e7c7a6cd7d70713", "99c592a99716450e59a910d6c5192c7f", "12acc6a65a88734480ab8f9ff1821075", "huang010", "526fbb767fb1c4627351a35076e382c7", "54ba2cb6e73d84cda8418bdf4036fd1d", "d06edd9599abdc88dba623a8577ee22e", "96bb7bd53aad319df8499abd2e56be14", "0974a6d0766c45472d9db5905546dc89", "139b1b4974d2072d046448930e43248e", "030b942401eaea266efce74eb8405346", "3efa1ab3472d8d384168b39886593976", "b4073b81254868ae2a3d31ffa20b556b", "6aeb8553fc1dd93aac11d9cb444aa462", "9cadbc10da7154142bdb7836924ddb2c", "00b3635dceb5d07b0a997e5f58cf0260", "e840703fc6f82582b38bd9fa7dce9886", "3ad71eade26fdff645380c1ff22e7b67", "8d83e26924e363478766c888ce5510b2", "6b0aec155447b05766e39d01565a7a33", "51d0a2734399281d3acfcfaf16a3f37e", "95307db9172d150ddd58c8c874ff549e", "1a920a96eec386faf770d35609b9d042", "49f28d78fe33554bdb498ce09d3bbaf4", "6671f57790953bfc414295cec6e37cf1", "7f2d86b321cc8f63de3829dc216f9c5b", "477d06d44cf1284e2a19ebc758729fc1", "c63b5193d997c1750b53501cbab04d5b", "991b97775fe21e493de2186f43b31999", "8664fc8e96eea3cff44be59a72980635", "3f039c401a661683a2db6515a3b13377", "fcb93bd158d212ec031b6f1ae05ab724", "9b7cecde52af2cdb72b3066acf3bfa26", "4d751e0848bc8f87fafea16fe9964f0e", "9b193c0a568f0a4229561c297c77a763", "c5bf24ec6d963d7cfea81b55a74488fd", "adf24d9838f2602f12fd929710469ec4", "ef7d8b88fa376c2ad9fb77ad450b3c26", "6c66b2a2b00678663074f549c4a82e7e", "5339e63791d9b314046c602dac1bc998", "35753fc5ebf98e7927ad675a64511ec2", "7e4dcb931c89033cceac11a1b24b7d45", "888f52c89ed656f62f644b69690e614b", "5ff43e310e8224160b0da0ab282e8e05", "7557255328fa8fd00dd2a8c1f590da95", "765b54d3e099e37108b6289d5f7235a7", "7db4997af2b82672d84bc2880c2fdd19", "18ca9a8eb38fcb77b517eaffa31f82c1", "39b189d3414f25c65383320411a54879", "d1eeb34160e0caed53d9a9efd11609e2", "513560ce7a5dd3acd21b702a70f27c65", "2b74d3a765b0f4eef66be0b8689e3b67", "53aef51848bf72a8bb4ff0a93e52c850", "b6289231bccc948145b165f685cacee5", "c2c29e8da3dcf210a17d59fa44a19842", "97357d270e12028ad645cf1dd71c274a", "d0af8817c02129a01970c0e849bd8be0", "da4419f9de21ade29d05842eb9c4e5c9", "ef3e498a9b8ac0ffa486a9ba0d9343de", "9a1a91a52eb32edc323b33c17baf3a1e", "ee1ad6d6e6549e928b596f3094d452b9", "8f0a555380fc4276b451aa7b481305f4", "258255ea83e23b4920b272b90a61272c", "460a4ce3d8a2a8114da389d716755e5c", "18925eaf79a44ef2322bb67fc03c97ae", "79e6fad064d8a06a79e4fc31edfb5f33", "8cead81da5e7994c4c9075e8b9fb3b73", "3f8bfc371081e3330632c2abbf6fe6d6", "d3eb62cd86d387d3da6b5027d6580fae", "28f71f5fc29213b356ac3a724d97bc21", "9900fb9299207993bbabd4d5e2fa7307", "1f1e9288f25e87d8130f40b4a7dc602a", "c7c7d15ea1f249111c5290ad7a47e497", "7aa11eae56742eeacd6635a9d32478f9", "2bccd94abcf313e6ede421539513b62c", "048a10ec493553b0279ea12579799623", "cce8884371f4031ac380f59489c798ac", "2c8d4330463db694b8f5babbd426f5c0", "ef5f6f6ba791a0eab51aecef8d681a14", "ea224eb2ab657afe381535c8935b58dd", "824268a0feecbd2c5dd27d6ff6eb5ccb", "e080eee71dbbce9ce6cfb560f38e98a7", "0f0200bbad644a3fbe3170342a271e40", "882c6d1f469a24f65aeeb265874930b6", "6695d7dca309f35bb8aef2ad514af1fa", "5abd046775e38e5b8283be475fc0996c", "07d244db2b90b74a6fa8c51be2aa37c2", "d05bf038ea522b55db5373a3191d05b2"}, +} + +var Compensation20250910_Mail_Item = map[int][]*item.Item{ + 1: {item.NewItem(item.ITEM_ENERGY_ID, 1000)}, // 大R + 2: {item.NewItem(item.ITEM_ENERGY_ID, 600)}, // 中R + 3: {item.NewItem(item.ITEM_ENERGY_ID, 500)}, // 未付费 18级以上 + 4: {item.NewItem(item.ITEM_ENERGY_ID, 200)}, // 未付费 7-17级 +} + type MailConfig struct { Title string Content string @@ -26,289 +58,9 @@ type MailConfig struct { } var Compensation20250910_Mail_Config = MailConfig{ - Title: "Test Players' Refund", - Content: `Welcome back to our game! -Here comes your refund for your scene progress and payment in test version! -Have fun in new version!`, -} - -var Compensation20250910_UserList = map[string]int{ - "53d8041da3964505857ddd1b3cdecf94": 170, - "0cc86c12b97d15019dfe25a3285a3e96": 60, - "235eb2c144e5b9edf6c44e8ab96082dd": 180, - "00ec10e00f24b0ce7df47e4aa029213e": 10, - "7b3a3e96d92b48e6fc7fb8dc54c6f177": 50, - "8664fc8e96eea3cff44be59a72980635": 20, - "ed5bbc10a0fba93e591a35a2ec0291c5": 60, - "05442D5E8EF144F8": 40, - "6695418802da285c421eafc09c48256b": 30, - "831ab28d8820675ad109c9b184ce9013": 120, - "445007c8ca0cc7a12d44d7abdff5cce3": 60, - "63f081723bd0e847d1434f5a04598683": 225, - "54e715c5c1f4ed795c9c17593de1b7e7": 170, - "addb314c66e16f13ddae30896b96c703": 235, - "172a008cab6d3606962bcb7add5b1553": 10, - "6fc757735b67cf08a7a5ec3baf2a75a3": 170, - "2f50d795ddaab2eab1907b5f252705ac": 265, - "d95d63f6cbafa348dca4398c61eb7edc": 40, - "2137703e941d639f61aeded20f9dbb2b": 60, - "02439d94926af2d1473c75f74a00e119": 60, - "3c62b0c0e554a16fc54bd9c09a6c76b7": 40, - "bd5f5f3e57bd3924e914cdbbc34cce5c": 675, - "a40fedab76a2912bd896fcd8048a3842": 20, - "ab5b80213f12aaaf6d07be2f1932ec43": 245, - "f75ef1bf55789c8851338712aa1a3c25": 10, - "ceeb48146b3ebcad66a4cc036ed54d22": 170, - "a71625538207fa2b95bb9e8e21449c43": 620, - "ac5d178c66ddaad2b04d82183dc902f7": 30, - "a0ce6002bb25c2ae0f090a90018fc54c": 1060, - "a3f5aef9e7dad7d5aa605a49430835b1": 175, - "af31d50b8c98869e9fde4562de7e3b89": 40, - "1cf2a5325fa89bb9bb8be2c8616cb9d7": 565, - "b04b3963228f85182b6e62c3ef6d8144": 775, - "1e8dde7c182488128a5106c5e2d30b42": 170, - "71f91ead33b74f7d45be1e37c519286f": 245, - "dead5b7820a93351f2e97fe55c0ea5b4": 60, - "8732360803535d860fc16d7911c909a1": 615, - "7f957a374879d6a2fb635928ce89a525": 60, - "0d8ade527e8f3679392260d07b2912e5": 185, - "7bf0a3e6df56f0f209814f6547865f55": 560, - "d2438f28296a975d52b7d60d287e84ad": 500, - "6cafd1059a6c45a31f19f42ed092d633": 60, - "55655483cd1cce10b3461d947062f801": 225, - "acbe55ba2c95f1cb72f4ed4d598cb4b2": 50, - "507416eb227f7f012a728f190537530b": 70, - "32beaaad0fa90c6dcafc456663d9d417": 100, - "08e04219504d9f37d32e2cfba2874762": 2645, - "a3d83249211bc380a8ff97f8ab47583a": 60, - "c7b75f7ab09002bd245a6a182cbc18df": 170, - "a096f2c7613c757f2c26fe778b1fc1ba": 350, - "d5ded02c0489e177e8f698e5204cfa3d": 70, - "e05933874f35069eb0632a433da36ca7": 70, - "d80d5ba40fc19ca0779c243fbbf0325f": 20, - "684ad5e04c21c5a11ac77f2eda19847a": 60, - "bd269aa65aa8db830ecbba58bc64902d": 225, - "4ec2fd320c4c5ff36dc52fc88720b395": 900, - "45b6afd25cf8888c2b64e5b2aa386226": 115, - "7fb3198948932be272b8fa9b861e6d57": 225, - "c6fcf7db37b22728a1161df011c0be15": 785, - "e5126dab2148cf017315f93bcd6e0abd": 60, - "8c8b1a20454c794a06b3dcfec366233e": 60, - "2df586ff46c2e3ebd0002a8742e7da92": 30, - "d5dbdcf4483ad154e0aa55daeb66aa76": 335, - "b9ffe1d671754441b48dd48ab815c312": 30, - "06c77038344deb70d2d1cef06dd59e9c": 530, - "dd418046105cbb2dc34d59dfb3e25272": 60, - "417d43ea86146a25ef013a5b69d53be5": 10, - "92518c3e1c5e40aff4c0e7ce8cdc4f75": 115, - "3ccca8a3b2f56929d02d1b59656cb573": 60, - "fd6ea64f9e369b162dbda2621b6781a4": 330, - "f87f20d33e7ec16f2793e990377d65db": 230, - "63974585ca126154bd2e7167974e0ad8": 450, - "bb32f2e266ab5276eb2abfc0a62e85d6": 20, - "734a8c12f0f58d72a64124f4face65f9": 280, - "24bf149cba0cd5a75b252e6b4200bd01": 585, - "512930f1a90d978f206bf9a8dff2c517": 40, - "5dd568a88bc553e7c0feb8f02935d95a": 100, - "f413a92fc07f2b829e629345fa76f42b": 60, - "304f428215a4a80d1f6ef89c7fb343a6": 115, - "5954536fa0ebffe2ff05ae9bedb26f36": 30, - "79c576e73891ba8b5c3236450de0e408": 70, - "586563fb29ab0bd9bbfc55fd96356e31": 60, - "058b6cc4f3df68c309371ec52634db7e": 60, - "aa4c5e7cff8a833ae9116587b0a8c616": 115, - "379a4d820d6e52a7cb781c8f2d7eef5d": 60, - "ea224eb2ab657afe381535c8935b58dd": 20, - "9c65224bb7ed95148260db8f0fe3a0bd": 675, - "97357d270e12028ad645cf1dd71c274a": 150, - "7e4dcb931c89033cceac11a1b24b7d45": 10, - "2efc5e0f7517c825cd7e4702085f885b": 925, - "b559595638f42a679284fef0374a549e": 80, - "26e701c36fbb004ee00dcccd9bd8cf0f": 2605, - "51afdcc7d1b0d60044f3a33389f2c734": 1850, - "huang015": 60, - "ed0f5c193171226d343eae6996fa5ebf": 60, - "8c22f4e8d8edb80d591e716cf016a01a": 40, - "20d207e40820d7879baa0781294ff021": 50, - "5c80e4c852b9a4cd1e28c6bcc04f308f": 60, - "48289bca7f497297b885203b2cc037bb": 70, - "5de84a24101ee25a3ac33168c8083abe": 2765, - "a9264ed76dafbed52ed9e7afe63d4129": 170, - "717810be22b82f567e14f00c6eecdae7": 30, - "051d7f087832091750d7d9cc00a5e04a": 170, - "04b4de4d67f2ed0399c6abffb956cade": 170, - "ad154577c6ed0c1234c971931fe44353": 30, - "729b80c2155f49043b266744065b5941": 60, - "41c70beb9f22bada780feada5e62bbd1": 60, - "fc085d60508bc2e39fc51e5640d75516": 170, - "3edb0a525ae8a708d12ce15e8d606351": 20, - "872ce2732e9fb947a6cc0d2d9e6771f0": 20, - "585797c5605a8ad80f677312f3c76d64": 60, - "f38ce2b02121c800395a19e28174d3b4": 30, - "1eb7a5f2f9390a36b92488645baa6544": 20, - "7c0fcfac6e9e8e056b983a30e4f30a09": 60, - "20d4b2aed241eda005679a1671bedeac": 60, - "8b321645bb2df7ac618c085c849be2e6": 20, - "857706a740154c8023ea9201d08b8864": 115, - "fcd7bce06319b6a590e04baca8958260": 30, - "2901b8332f6a39785194f52dbdecb420": 10, - "786bf20cb74a4e1b9ddfa3035c96aa34": 40, - "7f47313cd3dcd45a06ad985f2cb27cae": 60, - "8efb7602f08d08351798e60791926d79": 100, - "057bf7221b86d61cce1f80558b929090": 60, - "95328e05928a61493c801e05e9e6270a": 555, - "491d7d28ce106938aee8b1e1a19b4ae5": 115, - "bdcde03b4dc399118ce1e546690d8c61": 20, - "823943647d9adc4d8ddeb596614c0cfb": 225, - "d6ce7a43a045d4cd71dbc687787bd0bf": 565, - "c75a5faa056b819ad5bb41f4a3ba4a38": 615, - "1f2066cb8fd35f6e8cc00c58f919f012": 130, - "cecf89cd063b93c63da531daf7204afa": 40, - "4c5aca1ed18bd529e92792cc9e82d659": 30, - "e5815e97add54cb3ceca7dbd2e45bf97": 125, - "2cd42018cf56cb9d5a355aff14137b31": 330, - "820b48695d2dac1656a84d73e420178b": 195, - "2bf69272d55fb9d9d9e15894fb4694a4": 210, - "4920601d6e34e87038919438e242d52e": 11810, - "cd5fc4cfb76993f1fb62f430895805b5": 30, - "424ccad8b512d91d2f29c80939424564": 2350, - "ce2107e0f2d5e7c8095928127da643e9": 70, - "a51377da6a792ff69f6faf937e3417ce": 115, - "f5ff321d2b2c073e64042852a15dd9b1": 1230, - "7aed3a3c4703bf898bc20c360f38d09d": 10, - "5d80e08adde8e9d59bc79501b16afe20": 100, - "bbd8078b62203fad0811d502c65a08e2": 930, - "24626967eb0f1a255d52e526493dcf7a": 1875, - "ea4494a31cbdc7c4c11526f223e2088d": 60, - "528cd6c67c5ea7d653b9a327fe1b795f": 1910, - "c9d50c17f871a5eb9a34dd9094beb287": 280, - "8720fab18c7eb6a784e2fc6d9fa4ae8b": 1340, - "43ccdfeba197c6dce085abebbedf1c32": 115, - "721c70d2bd4a1d64bca56242860c5eb6": 345, - "6027cef2427a2e19ccf544fb173481c3": 140, - "20e3c036450c699fc0c83adca6aec3bb": 110, - "a1070fd3fde30ee7aa9111541d1cc8e5": 60, - "e453465db054317aabce25da6032250c": 2315, - "89a2bc0d834bd5498c1faa90efd772dd": 225, - "3dee30fc88b83e271b4415c09937c93d": 60, - "b2f0261d7064b2ad201542fcd165dd61": 115, - "b03b31df1def262df7837a6de10022fb": 40, - "3f8b0c70b50f104fae1c0a1651139ca0": 1680, - "9a645845fa02cebd29c1fce2f7c258a8": 50, - "f8623082c5e2964be7a7a0c79e13793a": 110, - "de09a725644642cc20d1fcf5f1d4f831": 40, - "a2d5feaf4dcf977d27d782e82a988ce1": 115, - "1aab9af40a17c4a32c410b60699490c2": 20, - "fab340b389795f87676d02049721531d": 20, - "07f3d8eb9311c72e92b8bf15cdcd686d": 1910, - "f6c435f2782ddac3490e22a719092b0d": 90, - "37148fcbd6b1f49de0bc08e558aa2099": 395, - "978105bbd87fa7de8cf8579c7aecdf00": 60, - "12f03a9c3b8a8360d1e15399f99fef6d": 175, - "7c901d37700e63d5ac148c48cbf44643": 30, - "f5b69dd140e8b221b45e76f13d953a51": 115, - "4ff28ac51e2eb7f501caae153b887c70": 40, - "3ceb542cbb7e89401ee4e0bdb38cdc77": 60, - "e08afb745bf3df8469a3dbd04c48b821": 1640, - "93c80508360e35b7571f1a0a03f56a776370cfa0": 24850, - "8b3dd61d65a21da33efd3fb9b0a99b55": 30, - "0351a4df40069b71de39a9be8c46e705": 30, - "863db41256074f9656ebbd46fbd85290": 60, - "411ca5c6b78844dea836aa399f42ed27": 450, - "f0cb8a1825c417e2f7b06a58cac75143": 90, - "fd9df16ee523e74d8003f46e47dcb642": 255, - "fcb93bd158d212ec031b6f1ae05ab724": 30, - "99c592a99716450e59a910d6c5192c7f": 20, - "0d56e34bac14cd02ecf98e880234485b": 30, - "f4a9060aea89d38e2e3f01660491f5c5": 60, - "34ed9d69301c301953b2b88dcd13ee9a": 280, - "b701386139828ec8f3a3db11731b0f81": 30, - "347376f2bf14f156e24fbc4a7285f81c": 445, - "dc264e609290d0f94f3e16ca37bbe0c9": 950, - "26347928b465b7ba373e9ba641b48199": 60, - "cf9152a0206da604126c848e3abe3173": 20, - "e838a9130e0bf7e0e2680eb825c0ff5a": 10, - "f29998d94e79b86c7c3d8937fa9e91e8": 60, - "d23081f6510236f4e4be9fb6d5304a6a": 60, - "bc3c3b7ca9e5de311ed337d6c3d617c6": 10, - "e6718d5d9280570cc31d7a6473143e38": 60, - "8083f7ee7c1258aed3db5f40531c334c": 60, - "d6c787411fc914c546092a6a6ee33873": 20, - "bcdd1c131475dcea35cab935057772eb": 60, - "eeb59425fc240ec52454e7dda9889633": 4775, - "b12acbb51580947a7c1869070dea0d75": 20, - "120e7116d570a2554b65f28e724ae758": 60, - "5c427a9e417dea683874bb9117a83899": 20, - "675899c81cfece5caa982844538b0191": 60, - "915d608525150d974f7f85bdf0f7b4e1": 30, - "3eafdc409abd63f6fa40fcee615bb886": 20, - "764abc676187b5fb45cb2218b4076e32": 60, - "9baad73794e1e7f6f7284cb3fe679160": 50, - "0b2244d9b6c01cbb0daf685080d6d975": 30, - "9a08781243dba23cbe85bf47c64aa8c4": 375, - "0bf5220563363300c6cf43ed20cb5ae7": 3975, - "c071328705938dc141c8d646d345bf99": 3200, - "659d71e3896f2f2c98c86c730d394f0b": 285, - "96fe50777f7562384e5d71eb010eae7c": 1040, - "f621506531e0d8cf2bf343ec87042960": 290, - "eaf25de5835afb920984eb09297103dd": 60, - "167d1a2c6944c65be30c2feb43bdedea": 70, - "38738aed39f8cea218bc055b5a400cc3": 335, - "970653b0d90e2fd43465f436c27845b5": 560, - "8770ee5ad6e7180ca831f9b23ae0fb2a": 60, - "c0ad232262fb2b912ade9aa1412e5406": 20, - "5c790273c5e51e9b8247f4614f6f4f1f": 10, - "d7d93978b35d4af85daba89530bf668a": 2520, - "6dea915a82fed9186e6461d2ed2da2aa": 110, - "c6bcac871e44dca717c2fd6fab7480d0": 60, - "fcf00eb8002da8ddc6cc72b9de48de55": 20, - "2483c316d5ad3d52aca226b8214eab44": 10, - "dc9904a54b46116e6534e2c91b8e5164": 60, - "5d50835ff8c5fdbecd4e92423b5754d3": 180, - "dd59d0d8f0e1384e14635035cf17c668": 60, - "ee5648d165c5bab14896741b632b641b": 360, - "0b193cbcc1aa07dee619c5d74fdaf92e": 125, - "515701c302a9ac871e5b83af734cbdbc": 125, - "276c9182dd46575aeb66aac4cef03b7c": 60, - "464483a547102c193a44045c9e68fc54": 125, - "0f7e7c8a43f8f502356329ca4fe01a8d": 20, - "f421c2c4e1ef383e96df09476502bdaf": 2945, - "6b997d889562961b44d62bc3e99b8af5": 60, - "b34e90cbbc0d6f9bf4d6ef80114c5b73": 115, - "7d204e48d8c2615c257c2520769fe6ca": 4950, - "145f02eae2c0f2b02b64fa0ae312952e": 990, - "cdb17361fff527bc15537f53a1078d54": 10, - "b05461f7da6b12a16a738876beacd8a7": 50, - "161f3cc313f53a56e27e44ddc2114cd3": 20, - "0941cc1a875a37892dc6fbe01f80ae3f": 2250, - "dbf04e1923214e7ba8686eeb517018d3": 60, - "0216b810f943eb199d25584a27fed0f7": 50, - "0464fe31e58c167e9045b8dd7cf6b157": 20, - "c8b65426e1813def463b834516b07fdb": 20, - "3f5db99f93d7151a15f3cdb06871651b": 70, - "390b16d4dc4ed3d1acc92f3a4697c812": 225, - "73efc9c2c6e84bc25876aa77a7d7c269": 60, - "d4b3fa79d7dccece920a4ed29d531c70": 10, - "1ea1598790f03843cd6c7b090c64587e": 60, - "491a3c77ca5a905a023c41fc77c2014f": 60, - "99a4cf90305d2893f0b02040f091a5ac": 565, - "a80b4da7cb82927e2ea904c1990e5a2e": 140, - "e4bf30043bbf6ed0eb7220620bb8152d": 20, - "d295ed0e92c0630d60ab45b6c9117bfb": 60, - "6f9aaa887dedb44b0a169384b2ba164e": 505, - "86f1aaf1d4d1efc1b0a9c7a8ad2d7b12": 305, - "a84f71828ca783ee9011252cb9fb7253": 40, - "54feb3b2a6e54d1ac623adfce552060c": 110, - "e9c815ee02132dc70a2e9d6634a1e9d7": 60, -} - -func (c *Compensation) Compensation20250910(UserName string) []*item.Item { - c.Set20250910() - // 获取补偿物品 - if num, ok := Compensation20250910_UserList[UserName]; ok { - return []*item.Item{ - item.NewItem(item.ITEM_DIAMOND_ID, num), // 钻石 - } - } - return nil + Title: "New Version is Live!", + Content: `Dear player, this update brings some big changes! To provide a better experience, we’ve done a data reset. +As an apology, we’ve prepared a compensation pack for you—please check it. +Thank you for being with us, and we hope this new version brings you even more fun! +If you have any questions, feel free to reach out to us anytime. Enjoy the game! `, } From 8be09db21cb4497050e796a807308c7d493a6d94 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Fri, 12 Sep 2025 11:04:11 +0800 Subject: [PATCH 24/34] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/UnitTest.go | 57 +++++++++++++++++++++++++++++- src/server/game/mod/order/Order.go | 3 +- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/src/server/game/UnitTest.go b/src/server/game/UnitTest.go index 2a8ead48..85d74ca2 100644 --- a/src/server/game/UnitTest.go +++ b/src/server/game/UnitTest.go @@ -45,7 +45,7 @@ func UnitOrder(p *Player) error { ChessMod := p.PlayMod.getChessMod() BaseMod := p.PlayMod.getBaseMod() OrderMod.OrderList = make(map[int]order.Order) - for i := 0; i < 1000; i++ { + for i := 0; i < 5000; i++ { OrderMod.ChessPool = nil OrderMod.EmitShuffle = nil err := OrderMod.CreateNormalOrder(BaseMod.GetLevel(), ChessMod.GetOrderEmit(), BaseMod.GetEnergyMul()) @@ -54,6 +54,61 @@ func UnitOrder(p *Player) error { } } p.FormatOrderReward() + NumMap := make(map[int]int) + for _, v := range OrderMod.OrderList { + NumMap[len(v.MergeId)]++ + } + sum0 := 0 + for _, v := range NumMap { + sum0 += v + } + for k, v := range NumMap { + fmt.Printf("棋子数量： %d, 占比： %.2f%% \n", k, float64(v)/float64(sum0)*100) + } + DiffMap := make(map[int]int) + for _, v := range OrderMod.OrderList { + DiffMap[v.Diff]++ + } + sum := 0 + for _, v := range DiffMap { + sum += v + } + for k, v := range DiffMap { + fmt.Printf("难度等级： %d, 占比： %.2f%% \n", k, float64(v)/float64(sum)*100) + } + AP := make(map[string]int, 0) + BP := make(map[string]int, 0) + for _, v := range OrderMod.OrderList { + for _, id := range v.MergeId { + Color := mergeDataCfg.GetColorById(id) + if Color == "Bath Toys" { + AP["Bath Toys"] += 1 + } + if Color == "Cleaning Tools" { + AP["Cleaning Tools"] += 1 + } + if Color == "Baby Toy" { + BP["Baby Toy"] += 1 + } + if Color == "Books And Picture Books" { + BP["Books And Picture Books"] += 1 + } + } + } + sum1 := 0 + for _, v := range AP { + sum1 += v + } + sum2 := 0 + for _, v := range BP { + sum2 += v + } + for k, v := range AP { + fmt.Printf("%s %.2f\n", k, float64(v)/float64(sum1)*100) + } + for k, v := range BP { + fmt.Printf("%s %.2f\n", k, float64(v)/float64(sum2)*100) + } return nil } diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go index add9cf5d..e69c5b60 100644 --- a/src/server/game/mod/order/Order.go +++ b/src/server/game/mod/order/Order.go @@ -2,7 +2,6 @@ package order import ( "fmt" - "log" "server/GoUtil" limitedTimeEventCfg "server/conf/limitedTimeEvent" mergeDataCfg "server/conf/mergeData" @@ -431,7 +430,7 @@ func (o *OrderMod) CreateNormalOrder(lv int, Emit []int, EnergyMul int) error { } break } - log.Printf("CreateNormalOrder: %v, %v, %v", mergeList, OrderDiff, err) + //log.Printf("CreateNormalOrder: %v, %v, %v", mergeList, OrderDiff, err) o.addOrder(mergeList, OrderDiff, Common_type) return nil } From 72ad6c58933839433af18909b990b5385fd305be Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Fri, 12 Sep 2025 14:21:14 +0800 Subject: [PATCH 25/34] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/RegisterNetworkFunc.go | 56 +++++++++++++------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index 8707bb6f..7fabdaff 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -534,34 +534,34 @@ func ReqDecorateAll(player *Player, buf []byte) error { } func ReqDecorateReward(player *Player, buf []byte) error { - req := &msg.ReqDecorateReward{} - proto.Unmarshal(buf, req) - DecorateMod := player.PlayMod.getDecorateMod() - Item, err := DecorateMod.GetDecorateReward(int(req.AreaId)) - if err != nil { - player.SendErrClienRes(&msg.ResDecorateReward{ - Code: msg.RES_CODE_FAIL, - Msg: err.Error(), - }) - return err - } - err = player.HandleItem(Item, msg.ITEM_POP_LABEL_DecorateReward.String()) - if err != nil { - player.SendErrClienRes(&msg.ResDecorateReward{ - Code: msg.RES_CODE_FAIL, - Msg: err.Error(), - }) - return err - } - player.TeLog("scene_reward", map[string]interface{}{ - "deco_step_id": fmt.Sprintf("%d_%d", DecorateMod.AreaId, DecorateMod.Progress), - "item_list": Item, - }) - player.PushClientRes(&msg.ResDecorateReward{ - Code: msg.RES_CODE_SUCCESS, - }) - player.PushClientRes(DecorateMod.BackData()) - player.PlayMod.save() + // req := &msg.ReqDecorateReward{} + // proto.Unmarshal(buf, req) + // DecorateMod := player.PlayMod.getDecorateMod() + // Item, err := DecorateMod.GetDecorateReward(int(req.AreaId)) + // if err != nil { + // player.SendErrClienRes(&msg.ResDecorateReward{ + // Code: msg.RES_CODE_FAIL, + // Msg: err.Error(), + // }) + // return err + // } + // err = player.HandleItem(Item, msg.ITEM_POP_LABEL_DecorateReward.String()) + // if err != nil { + // player.SendErrClienRes(&msg.ResDecorateReward{ + // Code: msg.RES_CODE_FAIL, + // Msg: err.Error(), + // }) + // return err + // } + // player.TeLog("scene_reward", map[string]interface{}{ + // "deco_step_id": fmt.Sprintf("%d_%d", DecorateMod.AreaId, DecorateMod.Progress), + // "item_list": Item, + // }) + // player.PushClientRes(&msg.ResDecorateReward{ + // Code: msg.RES_CODE_SUCCESS, + // }) + // player.PushClientRes(DecorateMod.BackData()) + // player.PlayMod.save() return nil } From ec9ba10b6ee3c725d7c3c462d6cd370b9631595b Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Fri, 12 Sep 2025 14:21:14 +0800 Subject: [PATCH 26/34] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/RegisterNetworkFunc.go | 56 +++++++++++++------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index a015af5d..c25d7733 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -534,34 +534,34 @@ func ReqDecorateAll(player *Player, buf []byte) error { } func ReqDecorateReward(player *Player, buf []byte) error { - req := &msg.ReqDecorateReward{} - proto.Unmarshal(buf, req) - DecorateMod := player.PlayMod.getDecorateMod() - Item, err := DecorateMod.GetDecorateReward(int(req.AreaId)) - if err != nil { - player.SendErrClienRes(&msg.ResDecorateReward{ - Code: msg.RES_CODE_FAIL, - Msg: err.Error(), - }) - return err - } - err = player.HandleItem(Item, msg.ITEM_POP_LABEL_DecorateReward.String()) - if err != nil { - player.SendErrClienRes(&msg.ResDecorateReward{ - Code: msg.RES_CODE_FAIL, - Msg: err.Error(), - }) - return err - } - player.TeLog("scene_reward", map[string]interface{}{ - "deco_step_id": fmt.Sprintf("%d_%d", DecorateMod.AreaId, DecorateMod.Progress), - "item_list": Item, - }) - player.PushClientRes(&msg.ResDecorateReward{ - Code: msg.RES_CODE_SUCCESS, - }) - player.PushClientRes(DecorateMod.BackData()) - player.PlayMod.save() + // req := &msg.ReqDecorateReward{} + // proto.Unmarshal(buf, req) + // DecorateMod := player.PlayMod.getDecorateMod() + // Item, err := DecorateMod.GetDecorateReward(int(req.AreaId)) + // if err != nil { + // player.SendErrClienRes(&msg.ResDecorateReward{ + // Code: msg.RES_CODE_FAIL, + // Msg: err.Error(), + // }) + // return err + // } + // err = player.HandleItem(Item, msg.ITEM_POP_LABEL_DecorateReward.String()) + // if err != nil { + // player.SendErrClienRes(&msg.ResDecorateReward{ + // Code: msg.RES_CODE_FAIL, + // Msg: err.Error(), + // }) + // return err + // } + // player.TeLog("scene_reward", map[string]interface{}{ + // "deco_step_id": fmt.Sprintf("%d_%d", DecorateMod.AreaId, DecorateMod.Progress), + // "item_list": Item, + // }) + // player.PushClientRes(&msg.ResDecorateReward{ + // Code: msg.RES_CODE_SUCCESS, + // }) + // player.PushClientRes(DecorateMod.BackData()) + // player.PlayMod.save() return nil } From e43b18b34a4696e012c4a5e8161724a6bbade2e4 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 15 Sep 2025 10:19:08 +0800 Subject: [PATCH 27/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/order/OrderFunc.go | 47 +++++++++++++++++++++----- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go index c1387ad8..9fdc7bd7 100644 --- a/src/server/game/mod/order/OrderFunc.go +++ b/src/server/game/mod/order/OrderFunc.go @@ -145,15 +145,46 @@ func getChessDiff(ChessNum, OrderDiff, OrderN int) map[int]int { func getChessLv(Min, Max, Diff int) int { Start := Min End := Max - switch Diff { - case DIFF_LOW: - End = Min + (Max-Min+1)/3 - 1 - case DIFF_MID: - Start = Min + (Max-Min+1)/3 - End = Min + (Max-Min+1)/3*2 - 1 - case DIFF_HIGH: - Start = Min + (Max-Min+1)/3*2 + if Max-Min >= 5 { + switch Diff { + case DIFF_LOW: + End = Min + (Max-Min+1)/3 - 1 + case DIFF_MID: + Start = Min + (Max-Min+1)/3 + End = Min + (Max-Min+1)/3*2 - 1 + case DIFF_HIGH: + Start = Min + (Max-Min+1)/3*2 + } } + if Max-Min == 2 { + Start = Max - Diff + 1 + End = Start + } + if Max-Min == 3 { + switch Diff { + case DIFF_LOW: + End = Min + 1 + case DIFF_MID: + Start = Min + 2 + End = Min + 2 + case DIFF_HIGH: + Start = Min + 3 + End = Min + 3 + } + } + if Max-Min == 4 { + switch Diff { + case DIFF_LOW: + End = Min + 1 + case DIFF_MID: + Start = Min + 2 + End = Min + 3 + case DIFF_HIGH: + Start = Min + 4 + End = Min + 4 + } + } + Start = max(Min, Start) End = max(Start, End) End = min(Max, End) From c8b48541e19e4663bf12de74d42953d78c126da3 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 15 Sep 2025 10:37:47 +0800 Subject: [PATCH 28/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/Trigger.go | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/game/Trigger.go b/src/server/game/Trigger.go index 6e642aa0..b5e717e4 100644 --- a/src/server/game/Trigger.go +++ b/src/server/game/Trigger.go @@ -132,6 +132,7 @@ func TriggerShippingOrder(player *Player, req *msg.ReqShippingOrder) { } OrderData.PayStatus = MergeConst.ORDER_STATUS_SHIP OrderData.PayChannelOrderId = req.Token + OrderData.ProductDesc = req.ProduceId db.UpdatePlayerChargeData(OrderData) player.PlayMod.save() orderDataMap := map[string]interface{}{ From 81b48f07764a95931c5590a8d7539fa5e59f4677 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 16 Sep 2025 11:33:45 +0800 Subject: [PATCH 29/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/Trigger.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/game/Trigger.go b/src/server/game/Trigger.go index b5e717e4..7bb5119f 100644 --- a/src/server/game/Trigger.go +++ b/src/server/game/Trigger.go @@ -2,6 +2,7 @@ package game import ( "encoding/json" + "fmt" "math" "server/GoUtil" "server/MergeConst" @@ -97,6 +98,7 @@ func TriggerShippingOrder(player *Player, req *msg.ReqShippingOrder) { OrderData, err = GoogleVerify(player, OrderSn, req.ProduceId, req.Token) if err != nil { log.Debug("GoogleVerify parmas OrderSn：%s; ProduceId:%s; Token:%s", OrderSn, req.ProduceId, req.Token) + GoUtil.SendFeishuFatal(int(player.M_DwUin), "GoogleVerify", fmt.Sprintf("GoogleVerify parmas OrderSn：%s; ProduceId:%s; Token:%s", OrderSn, req.ProduceId, req.Token)) log.Debug("GoogleVerify err:%v", err) time.Sleep(1 * time.Second) continue From a1518fd1861341d65e88697ff448ae9272105ebb Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 16 Sep 2025 12:13:04 +0800 Subject: [PATCH 30/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/Trigger.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Trigger.go b/src/server/game/Trigger.go index 7bb5119f..55e52ef4 100644 --- a/src/server/game/Trigger.go +++ b/src/server/game/Trigger.go @@ -98,7 +98,6 @@ func TriggerShippingOrder(player *Player, req *msg.ReqShippingOrder) { OrderData, err = GoogleVerify(player, OrderSn, req.ProduceId, req.Token) if err != nil { log.Debug("GoogleVerify parmas OrderSn：%s; ProduceId:%s; Token:%s", OrderSn, req.ProduceId, req.Token) - GoUtil.SendFeishuFatal(int(player.M_DwUin), "GoogleVerify", fmt.Sprintf("GoogleVerify parmas OrderSn：%s; ProduceId:%s; Token:%s", OrderSn, req.ProduceId, req.Token)) log.Debug("GoogleVerify err:%v", err) time.Sleep(1 * time.Second) continue @@ -112,6 +111,7 @@ func TriggerShippingOrder(player *Player, req *msg.ReqShippingOrder) { } } if OrderData == nil { + GoUtil.SendFeishuFatal(int(player.M_DwUin), "GoogleVerify支付校验异常", fmt.Sprintf("GoogleVerify parmas OrderSn：%s; ProduceId:%s; Token:%s", OrderSn, req.ProduceId, req.Token)) log.Debug("[order data nil] Uid:%d;OrderSn:%s;PayOrder:%s;", player.M_DwUin, OrderSn, req.ProduceId) return } From 51bed78e8b396a562cb651553dd55869b14b0590 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 16 Sep 2025 17:07:06 +0800 Subject: [PATCH 31/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/conf/mergeData/MergeDataCfg.go | 6 +- src/server/game/UnitTest.go | 6 +- src/server/game/mod/order/Order.go | 11 ++- src/server/game/mod/order/OrderFunc.go | 91 ++++++++++++----------- 4 files changed, 62 insertions(+), 52 deletions(-) diff --git a/src/server/conf/mergeData/MergeDataCfg.go b/src/server/conf/mergeData/MergeDataCfg.go index 13d88283..516c2db5 100644 --- a/src/server/conf/mergeData/MergeDataCfg.go +++ b/src/server/conf/mergeData/MergeDataCfg.go @@ -45,10 +45,10 @@ func GetEmitTypeByColor(Color string) string { if err != nil { return "" } - for _, v := range data { - ColorList := strings.Split(gamedata.GetStringValue(data, "Order_Type"), ",") + for k, v := range data { + ColorList := strings.Split(gamedata.GetStringValue(v, "Order_Type"), ",") if GoUtil.InStringArray(Color, ColorList) { - return gamedata.GetStringValue(v, "Type") + return k } } return "" diff --git a/src/server/game/UnitTest.go b/src/server/game/UnitTest.go index 85d74ca2..4b492d16 100644 --- a/src/server/game/UnitTest.go +++ b/src/server/game/UnitTest.go @@ -44,10 +44,10 @@ func UnitOrder(p *Player) error { OrderMod := p.PlayMod.getOrderMod() ChessMod := p.PlayMod.getChessMod() BaseMod := p.PlayMod.getBaseMod() - OrderMod.OrderList = make(map[int]order.Order) + //OrderMod.OrderList = make(map[int]order.Order) for i := 0; i < 5000; i++ { - OrderMod.ChessPool = nil - OrderMod.EmitShuffle = nil + //OrderMod.ChessPool = nil + //OrderMod.EmitShuffle = nil err := OrderMod.CreateNormalOrder(BaseMod.GetLevel(), ChessMod.GetOrderEmit(), BaseMod.GetEnergyMul()) if err != nil { return err diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go index e69c5b60..dcf8fb6d 100644 --- a/src/server/game/mod/order/Order.go +++ b/src/server/game/mod/order/Order.go @@ -2,6 +2,7 @@ package order import ( "fmt" + "log" "server/GoUtil" limitedTimeEventCfg "server/conf/limitedTimeEvent" mergeDataCfg "server/conf/mergeData" @@ -22,6 +23,8 @@ type OrderMod struct { EimtOrder map[string]struct{} PreheatStep map[string]int // 预热订单步骤 EmitShuffle []string // 发射器乱序 + ColorShuffle []string // 棋子系列乱序 + LastColor string // 上次生成订单的棋子系列 ChessPool []int // 棋子池 OrderPool map[int]*Order // 订单池 FinishOrder []int // 已完成订单 @@ -430,7 +433,7 @@ func (o *OrderMod) CreateNormalOrder(lv int, Emit []int, EnergyMul int) error { } break } - //log.Printf("CreateNormalOrder: %v, %v, %v", mergeList, OrderDiff, err) + log.Printf("CreateNormalOrder: %v, %v, %v", mergeList, OrderDiff, err) o.addOrder(mergeList, OrderDiff, Common_type) return nil } @@ -670,7 +673,7 @@ func (o *OrderMod) Retire(EmitId string) { ChessPool = append(ChessPool, v) } o.ChessPool = ChessPool - o.EmitShuffle = nil + o.ColorShuffle = nil } func (o *OrderMod) DelOrder(OrderId int) (*Order, error) { @@ -709,8 +712,8 @@ func (o *OrderMod) CreateComfortOrder(lv int, Emit []int, EnergyMul, Diff, Chess } func (o *OrderMod) ResetChessPool() { - o.ChessPool = make([]int, 0) - o.EmitShuffle = nil + // o.ChessPool = make([]int, 0) + // o.EmitShuffle = nil } func (o *OrderMod) SetIsCharge() { diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go index 9fdc7bd7..20553f7a 100644 --- a/src/server/game/mod/order/OrderFunc.go +++ b/src/server/game/mod/order/OrderFunc.go @@ -417,10 +417,38 @@ func filterPool(o *OrderMod) { o.ChessPool = NewPool } +func ShuffleColor(List []string, Last string) []string { + Break := 0 + for { + Break++ + if Break > 100 { + break + } + Same := false + List = GoUtil.ShuffleStringArray(List) + if List[0] == Last { + continue + } + for i := 1; i < len(List); i++ { + BeforeSries := mergeDataCfg.GetEmitTypeByColor(List[i-1]) + NowSries := mergeDataCfg.GetEmitTypeByColor(List[i]) + if BeforeSries == NowSries { + Same = true + break + } + + } + if !Same { + return List + } + } + return List +} + // 获取发射器系列 func getEmitSeries(o *OrderMod, Emit []int) string { - if o.EmitShuffle == nil { - o.EmitShuffle = make([]string, 0) + if o.ColorShuffle == nil { + ColorShuffle := make([]string, 0) for _, v := range Emit { EmitId := mergeDataCfg.GetEmitId(v) if GoUtil.InStringArray(EmitId, o.AutoEmit) { @@ -430,48 +458,28 @@ func getEmitSeries(o *OrderMod, Emit []int) string { if len(EmitProduct) == 0 || EmitProduct[0] == "" { continue } - EmitSerie := mergeDataCfg.GetEmitId(v) - if GoUtil.InStringArray(EmitSerie, o.EmitShuffle) { + ColorShuffle = append(ColorShuffle, EmitProduct...) + } + o.ColorShuffle = ShuffleColor(ColorShuffle, o.LastColor) + } + PopEmitId, NewSlice := GoUtil.PopStringArray(o.ColorShuffle) + o.ColorShuffle = NewSlice + if len(o.ColorShuffle) == 0 { + ColorShuffle := make([]string, 0) + for _, v := range Emit { + EmitId := mergeDataCfg.GetEmitId(v) + if GoUtil.InStringArray(EmitId, o.AutoEmit) { continue } - for i := 0; i < len(EmitProduct); i++ { - o.EmitShuffle = append(o.EmitShuffle, EmitSerie) - } - } - o.EmitShuffle = GoUtil.ShuffleStringArray(o.EmitShuffle) - } - PopEmitId, NewSlice := GoUtil.PopStringArray(o.EmitShuffle) - o.EmitShuffle = NewSlice - if len(o.EmitShuffle) == 0 { - o.EmitShuffle = make([]string, 0) - for _, v := range Emit { EmitProduct := mergeDataCfg.GetEmitProduceType(v) if len(EmitProduct) == 0 || EmitProduct[0] == "" { continue } - EmitSerie := mergeDataCfg.GetEmitId(v) - if GoUtil.InStringArray(EmitSerie, o.EmitShuffle) { - continue - } - for i := 0; i < len(EmitProduct); i++ { - o.EmitShuffle = append(o.EmitShuffle, EmitSerie) - } - } - Num := 1 - for { - if len(o.EmitShuffle) == 1 { - break - } - o.EmitShuffle = GoUtil.ShuffleStringArray(o.EmitShuffle) - if o.EmitShuffle[0] != PopEmitId { - break - } - Num++ - if Num > 100 { - break - } + ColorShuffle = append(ColorShuffle, EmitProduct...) } + o.ColorShuffle = ShuffleColor(ColorShuffle, o.LastColor) } + o.LastColor = PopEmitId return PopEmitId } @@ -500,9 +508,9 @@ func GetChessByDiff(EmitId, EnergyMul, Diff int, Color string) []int { // 从棋子池中获取棋子 func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) int { - EmitSeries := getEmitSeries(o, Emit) - EmitChessId := getEmitBySeries(Emit, EmitSeries) - ColorRand := mergeDataCfg.GetEmitProduceType(EmitChessId) + Color := getEmitSeries(o, Emit) + EmitChessId := getEmitBySeries(Emit, Color) + //ColorRand := mergeDataCfg.GetEmitProduceType(EmitChessId) // 从棋子池中获取棋子 MinChessId := 0 for i, chess := range o.ChessPool { @@ -510,7 +518,7 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in if reflectChess[chess] > Diff { MinChessId = chess } - if !GoUtil.InStringArray(chessColor, ColorRand) { + if Color != chessColor { continue } ChessLv := mergeDataCfg.GetLvById(chess) @@ -541,7 +549,6 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in Chess := mergeDataCfg.GetChessIdByLvAndColor(NewLev2, MinChessColor) return Chess } - Color := GoUtil.RandStringSlice(ColorRand) ChessMinLv, ChessMaxLv := getChesslvRange(EmitChessId, EnergyMul, o.IsCharge) NewLev := getChessLv(ChessMinLv, ChessMaxLv, Diff) NewLev1 := mergeDataCfg.DynamicLev(NewLev, EmitChessId, Color) @@ -624,7 +631,7 @@ func getEmitBySeries(EmitList []int, EmitId string) int { if len(ProduceColor) == 0 || ProduceColor[0] == "" { continue } - if mergeDataCfg.GetEmitId(v) == EmitId { + if GoUtil.InStringArray(EmitId, ProduceColor) { return v } } From 00f6d544d80795654c84fb1c654f20c9f6390105 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 16 Sep 2025 18:46:17 +0800 Subject: [PATCH 32/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/order/Order.go | 15 +++++++-- src/server/game/mod/order/OrderFunc.go | 43 +++++++++++++++++++------- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go index dcf8fb6d..8dbec507 100644 --- a/src/server/game/mod/order/Order.go +++ b/src/server/game/mod/order/Order.go @@ -2,7 +2,6 @@ package order import ( "fmt" - "log" "server/GoUtil" limitedTimeEventCfg "server/conf/limitedTimeEvent" mergeDataCfg "server/conf/mergeData" @@ -30,6 +29,7 @@ type OrderMod struct { FinishOrder []int // 已完成订单 IsCharge bool // 是否充值 AutoEmit []string // 自动发射器 + LastChess int // 上次生成订单的棋子 } type Order struct { @@ -433,7 +433,18 @@ func (o *OrderMod) CreateNormalOrder(lv int, Emit []int, EnergyMul int) error { } break } - log.Printf("CreateNormalOrder: %v, %v, %v", mergeList, OrderDiff, err) + // if len(mergeList) == 2 { + // ColorMap := make(map[string]int) + // for _, v := range mergeList { + // Color := mergeDataCfg.GetColorById(v) + // ColorMap[Color]++ + // if ColorMap[Color] > 1 { + // log.Printf("CreateNormalOrder: %v, %v, %v", mergeList, OrderDiff, err) + // return fmt.Errorf("订单生成失败，重复颜色") + // } + // } + + // } o.addOrder(mergeList, OrderDiff, Common_type) return nil } diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go index 20553f7a..5b66f03b 100644 --- a/src/server/game/mod/order/OrderFunc.go +++ b/src/server/game/mod/order/OrderFunc.go @@ -421,17 +421,17 @@ func ShuffleColor(List []string, Last string) []string { Break := 0 for { Break++ - if Break > 100 { + if Break > 1000 { break } Same := false - List = GoUtil.ShuffleStringArray(List) - if List[0] == Last { + NewList := GoUtil.ShuffleStringArray(List) + if NewList[0] == Last { continue } - for i := 1; i < len(List); i++ { - BeforeSries := mergeDataCfg.GetEmitTypeByColor(List[i-1]) - NowSries := mergeDataCfg.GetEmitTypeByColor(List[i]) + for i := 1; i < len(NewList); i++ { + BeforeSries := mergeDataCfg.GetEmitTypeByColor(NewList[i-1]) + NowSries := mergeDataCfg.GetEmitTypeByColor(NewList[i]) if BeforeSries == NowSries { Same = true break @@ -439,7 +439,27 @@ func ShuffleColor(List []string, Last string) []string { } if !Same { - return List + return NewList + } + } + L1 := make(map[string][]string, 0) + for _, v := range List { + Sries := mergeDataCfg.GetEmitTypeByColor(v) + L1[Sries] = append(L1[Sries], v) + } + List = make([]string, 0) + for _, v := range L1 { + + List = append(List, v[0]) + } + for _, v := range L1 { + if len(v) > 1 { + List = append(List, v[1]) + } + } + for _, v := range L1 { + if len(v) > 2 { + List = append(List, v[2]) } } return List @@ -464,6 +484,7 @@ func getEmitSeries(o *OrderMod, Emit []int) string { } PopEmitId, NewSlice := GoUtil.PopStringArray(o.ColorShuffle) o.ColorShuffle = NewSlice + o.LastColor = PopEmitId if len(o.ColorShuffle) == 0 { ColorShuffle := make([]string, 0) for _, v := range Emit { @@ -479,7 +500,6 @@ func getEmitSeries(o *OrderMod, Emit []int) string { } o.ColorShuffle = ShuffleColor(ColorShuffle, o.LastColor) } - o.LastColor = PopEmitId return PopEmitId } @@ -515,12 +535,13 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in MinChessId := 0 for i, chess := range o.ChessPool { chessColor := mergeDataCfg.GetColorById(chess) - if reflectChess[chess] > Diff { - MinChessId = chess - } if Color != chessColor { continue } + if reflectChess[chess] > Diff { + MinChessId = chess + } + ChessLv := mergeDataCfg.GetLvById(chess) if reflectChess[chess] == Diff && ChessLv >= EnergyMul+1 && ChessLv <= EnergyMul+12 { o.ChessPool = append(o.ChessPool[:i], o.ChessPool[i+1:]...) From 48ebc10c8ea77a32ed4ddf47cdd5683e7339142c Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 16 Sep 2025 18:51:13 +0800 Subject: [PATCH 33/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/order/OrderFunc.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go index 5b66f03b..4572f948 100644 --- a/src/server/game/mod/order/OrderFunc.go +++ b/src/server/game/mod/order/OrderFunc.go @@ -552,22 +552,20 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in * 1. 选取最接近的棋子 */ if MinChessId != 0 { - MinChessColor := mergeDataCfg.GetColorById(MinChessId) - NewEmitChessId := GetEmitByColor(Emit, MinChessColor) - ColorRand := mergeDataCfg.GetEmitProduceType(NewEmitChessId) - ChessMinLv, ChessMaxLv := getChesslvRange(NewEmitChessId, EnergyMul, o.IsCharge) + ColorRand := mergeDataCfg.GetEmitProduceType(EmitChessId) + ChessMinLv, ChessMaxLv := getChesslvRange(EmitChessId, EnergyMul, o.IsCharge) NewLev := getChessLv(ChessMinLv, ChessMaxLv, Diff) MinChessLv := mergeDataCfg.GetLvById(MinChessId) - NewLev2 := mergeDataCfg.DynamicLev2(NewLev, NewEmitChessId, ColorRand[0], MinChessColor) + NewLev2 := mergeDataCfg.DynamicLev2(NewLev, EmitChessId, ColorRand[0], Color) NewLev3 := adjustLev(NewLev2, EnergyMul) o.ChessPool = GoUtil.DeleteEleByValue(o.ChessPool, MinChessId) for i := NewLev3; i < MinChessLv; i++ { - ChessId2 := mergeDataCfg.GetChessIdByLvAndColor(i, MinChessColor) + ChessId2 := mergeDataCfg.GetChessIdByLvAndColor(i, Color) if ChessId2 != 0 { o.ChessPool = append(o.ChessPool, ChessId2) } } - Chess := mergeDataCfg.GetChessIdByLvAndColor(NewLev2, MinChessColor) + Chess := mergeDataCfg.GetChessIdByLvAndColor(NewLev2, Color) return Chess } ChessMinLv, ChessMaxLv := getChesslvRange(EmitChessId, EnergyMul, o.IsCharge) From ed98fa7082005dc05cc1f887d0034562bec7eb60 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 16 Sep 2025 18:55:42 +0800 Subject: [PATCH 34/34] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/order/OrderFunc.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go index 4572f948..f85e8fad 100644 --- a/src/server/game/mod/order/OrderFunc.go +++ b/src/server/game/mod/order/OrderFunc.go @@ -462,6 +462,9 @@ func ShuffleColor(List []string, Last string) []string { List = append(List, v[2]) } } + if List[0] == Last { + List[0], List[1] = List[1], List[0] + } return List }