From 4ec1bdb05d03e7ba437e7cab6ebc31af5ed9db75 Mon Sep 17 00:00:00 2001 From: AlessandroCH Date: Tue, 20 May 2025 19:56:14 +0200 Subject: [PATCH] testing some things with factory manager --- .../Data/res_versions/2089329-32/index_initial.json | 1 + Campofinale/Data/res_versions/2089329-32/ori.json | 1 + Campofinale/Game/Factory/FactoryManager.cs | 12 +++++++++--- Campofinale/Http/DispatchCN.cs | 6 ++---- 4 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 Campofinale/Data/res_versions/2089329-32/index_initial.json create mode 100644 Campofinale/Data/res_versions/2089329-32/ori.json diff --git a/Campofinale/Data/res_versions/2089329-32/index_initial.json b/Campofinale/Data/res_versions/2089329-32/index_initial.json new file mode 100644 index 0000000..efad5f3 --- /dev/null +++ b/Campofinale/Data/res_versions/2089329-32/index_initial.json @@ -0,0 +1 @@ +{"isInitial":true,"files":[{"index":1,"name":"VFS/CA2A581090AB4133/CA2A581090AB4133.blc","hash":"e75b8886d2426ec6b1e7f362bcd5255d","size":302,"urlPath":null,"manifest":7},{"index":2,"name":"VFS/CA2A581090AB4133/0DBA81C558A36AFC1D7D1C0A5A704A09.chk","hash":null,"size":80879438,"urlPath":null,"manifest":0},{"index":3,"name":"VFS/8F0DD938C04FD953/8F0DD938C04FD953.blc","hash":"d236d4691a5815ba973fa365ff6357f9","size":59,"urlPath":null,"manifest":3},{"index":4,"name":"VFS/16BB5AC00009A71B/16BB5AC00009A71B.blc","hash":"689374e7c7ec263dfd66fd255351fded","size":331,"urlPath":null,"manifest":3},{"index":5,"name":"VFS/16BB5AC00009A71B/6A2B02D8FCE1ED28849D1596D779CFA9.chk","hash":null,"size":14236423,"urlPath":null,"manifest":4},{"index":6,"name":"VFS/16BB5AC00009A71B/DA88C18EED8D9DEE8326BAA9AB78AA78.chk","hash":null,"size":1193655,"urlPath":null,"manifest":4},{"index":7,"name":"VFS/AAD6005BEB6AE986/AAD6005BEB6AE986.blc","hash":"51603590679e7d8590a3a1f908a38ed1","size":27360,"urlPath":null,"manifest":3},{"index":8,"name":"VFS/AAD6005BEB6AE986/1745D582258DFD069CDA135DDC740D34.chk","hash":null,"size":124467976,"urlPath":null,"manifest":4},{"index":9,"name":"VFS/B28236B7FAB03015/B28236B7FAB03015.blc","hash":"1baf1a032b9e204652eac0a7256621a7","size":15912,"urlPath":null,"manifest":7},{"index":10,"name":"VFS/B28236B7FAB03015/86BC72728AE017306E7CBE8DC67C93A9.chk","hash":null,"size":46679427,"urlPath":null,"manifest":0}],"types":null,"version":null} \ No newline at end of file diff --git a/Campofinale/Data/res_versions/2089329-32/ori.json b/Campofinale/Data/res_versions/2089329-32/ori.json new file mode 100644 index 0000000..7f7d19f --- /dev/null +++ b/Campofinale/Data/res_versions/2089329-32/ori.json @@ -0,0 +1 @@ +4Fmf1Xuly6yikdJUcayl2cpjWMibo8erW2rBrVmhocjKr1icY2OEppqdy1RxWomquGZ5o2R4l3BqYJ9ieHpnlZhqZaVzaaNtcWGWa2d5dZiWammQlKPFWmVSzpOqoFWeh5xtl5RvmnBvlJhmaW6Yx5uZZ8dpnZVua5LJlmxqaJnJWWKEpaDcnVtqmWJpZFXZ16OGw6afhHKnpdKeY1qgxdOgnMelq4RycK2SrVmhocjKr1icZGOEppqdy1RxWomquGZ5o2R4l3BqYJ9ieHpnlZhqZZJ2eaNwanObZ295ZpqmfXmTdm6maXxgp2d4b2OYpmdvkJWfzVplUs6TqqBVntOsos5eWdWhs5WIbG9oa5uea2maXlnXqqWAx6afWm3S2qOijlSkw6ailsulq1ptlOJjsYSbpcadsVKgZWNaocXSnFicVI2oi2horGJ7fGyXnXpmlnh7m21sX554Z3x3nZhveZJmfaZxbmOUlKObVZCHn5fVmlmcWp1imWibbGmdlphrmmNsxJlyZ5mYmGtpmcudbJVnbshxW1yIpaCymIafbG+OVKzUpImR2ppZcqHZ0aNihJ+Y0KGfldmmWXJm4ZGyWMugm8ewW2qaXlmmlNHKWXCEiH21Z2pmqHRseXaUlWdmm3Nuk3poYZx0eW10p5VnZpJreJlpe17InppaX4bNmKnKVHGEbnFpmWlrnWrHnJyZlGhqxp6dZpyYm2pomZhsZ8iWnMZaZVLZm7GdVZ6YameOVKzUpImR2ppZcqHZ0aNihJ+Y0KGfldmmWXJm4ZGyWMugm8ewW2qbXlmmlNHKWXCEiH21Z2pmqHRseXaUlWdmm3Nuk3poZqdkeWhlqJ19eadjfKZqcWiaa3tpaJ2be22Za3qoeXJeyZqiWl+GzZipylRx0K2lnJJUqqGtyYdxZ5Zkaphsa2OSVKyqn7TGq56EbKXXpKVciJ+YppzKyqqqhGxr32S0Us+gm52rhp9tYoSgmM+dW2qIiH2LYpWbeXiXc3qSaGlgn3NuaXWTqXhumnVomn1+dJ52cHx4qZ1qaJh0eKNxenKdanh5apyTmp7NVGOEoJqjzlRxpqjQ0WNY1Zuxx1pzYZdram5omZFZq9Seh8OsoVKgoKykn5CHpJfQm53Hq61SoGa0ZK6GzqWax6pZnG9lUtSTpJ1VnoeNfLVheKN8b2CWZ3l9dZqmfG+aaGajeX1mlmJsenimm3h7m2ptkJqlk4heWaCU181ZcIRnaJhobGWfYm1vbMmcm26Xa2fDa5phzGtncJSXnZyak1RjhKuiqstUcWpql5tnYoSnqc6ImqTOVHGmqNDRY1jPk6XLnp6j2lRxa7CQ4Fmf0Jac2lpzaJJUpZmgyYdxWLh4ipF5enScYmdtdamnbXena2+YZ2pnmmd7bWuWl2xupnh7km5yc6pzaGtoqKl6bZZie5VsZ5POnVlkVczGqp6EbKXXpKVciKWgspiGn2holmZtmXFwZpJUrKqftMarnoRspdekpVyIn5imnMrKqqqEbGvfZLRSz6CbnauGn3BihKCYz51baoiIfYtippdvaJVoeZl+enKWZWdpaJOnaW6UZW2kb39xqGJqaGSZk5mixVRjhKCao85UcVpkxsadZ8NiapSacpWYYmtuaJbKmJmSk26UbW9mmGOYb1WQh6qf3JdZnGluaZdkY1qo1tGHl9aaWZymrpzSXlmllNLOnZvVplmcb7Zc4VSgppfJ3Vlwk2JjhKaanctUcVqJqrhmeJRqaZVue2esc3loZpSWbGWaaHmlb2tnmGp4fWOVnGpmmHdupXp+aKp1bW92nZh4b5CVn81aZVLOk6qgVZ7TrKLOXlnVobOViGxrbmmbnmtomV5Z16qlgMemn1pt0tqjoo5UpMOmopbLpatabZTilGKEprDSnaxSoKCspJ+Qh62b1KWg0aZbatSno6Sw \ No newline at end of file diff --git a/Campofinale/Game/Factory/FactoryManager.cs b/Campofinale/Game/Factory/FactoryManager.cs index 91f395c..c30ec1f 100644 --- a/Campofinale/Game/Factory/FactoryManager.cs +++ b/Campofinale/Game/Factory/FactoryManager.cs @@ -1,4 +1,5 @@ -using Campofinale.Game.Factory.Components; +using Campofinale.Game.Entities; +using Campofinale.Game.Factory.Components; using Campofinale.Packets.Sc; using Campofinale.Protocol; using Campofinale.Resource; @@ -127,8 +128,12 @@ namespace Campofinale.Game.Factory GetOwner().Send(new PacketScFactorySyncChapter(GetOwner(), chapterId)); edit.Nodes.Add(node.ToProto()); Logger.Print(Newtonsoft.Json.JsonConvert.SerializeObject(edit, Newtonsoft.Json.Formatting.Indented)); + EntityInteractive e = new(place.TemplateId, GetOwner().roleId, new Vector3f(place.Position), new Vector3f(place.Direction), GetOwner().sceneManager.GetCurScene().sceneNumId, node.guid); + GetOwner().sceneManager.GetCurScene().entities.Add(e); + GetOwner().sceneManager.GetCurScene().SpawnEntity(e); GetOwner().Send(ScMsgId.ScFactoryModifyChapterNodes, edit); GetOwner().Send(new PacketScFactoryOpRet(GetOwner(), node.nodeId,FactoryOpType.Place),seq); + } public FactoryChapter(string chapterId,ulong ownerId) @@ -260,6 +265,7 @@ namespace Campofinale.Game.Factory TemplateId=templateId, StableId= GetStableId(), IsDeactive= deactive, + Power = new() { InPower= InPower(), @@ -272,7 +278,7 @@ namespace Campofinale.Game.Factory Position = position.ToProtoScd(), Direction=direction.ToProtoScd(), MapId=mapId, - + } }; @@ -283,7 +289,7 @@ namespace Campofinale.Game.Factory node.Transform.WorldRotation = direction.ToProto(); node.InteractiveObject = new() { - + ObjectId=guid, }; node.Flag = 0; node.InstKey = ""; diff --git a/Campofinale/Http/DispatchCN.cs b/Campofinale/Http/DispatchCN.cs index 20e00b5..e3bdc5e 100644 --- a/Campofinale/Http/DispatchCN.cs +++ b/Campofinale/Http/DispatchCN.cs @@ -42,9 +42,7 @@ namespace Campofinale.Http public static async Task cn_res_version(HttpContext ctx) { - string resp = "{\"version\": \"2089329-32\", \"kickFlag\": true}"; - - + string resp = "{\"version\": \"2089329-32\", \"kickFlag\": false}"; ctx.Response.StatusCode = 200; //ctx.Response.ContentLength = resp.Length; ctx.Response.ContentType = "application/json"; @@ -67,7 +65,7 @@ namespace Campofinale.Http public static async Task cn_android_res_version(HttpContext ctx) { - string resp = "{\"version\": \"2332867-572\", \"kickFlag\": true}"; + string resp = "{\"version\": \"2361763-612\", \"kickFlag\": false}"; ctx.Response.StatusCode = 200;