hi

FreeSR.Gateserver/Manager/Handlers/BattleReqGroup.cs

@@ -11,9 +11,8 @@ namespace FreeSR.Gateserver.Manager.Handlers
         public static void OnSetLineupNameCsReq(NetSession session, int cmdId, object data)
         {
             var request = data as SetLineupNameCsReq;
-            if(request.Name == "battle")
+            if (request.Name == "battle")
             {
-                
                 var lineupInfo = new LineupInfo
                 {
                     ExtraLineupType = ExtraLineupType.LineupNone,
@@ -31,7 +30,7 @@ namespace FreeSR.Gateserver.Manager.Handlers
                         Id = id,
                         Hp = 10000,
                         Satiety = 100,
-                        SpBar = new SpBarInfo {CurSp = 10000, MaxSp = 10000},
+                        SpBar = new SpBarInfo { CurSp = 10000, MaxSp = 10000 },
                         AvatarType = AvatarType.AvatarFormalType,
                         Slot = (uint)lineupInfo.AvatarLists.Count
                     });
@@ -70,7 +69,11 @@ namespace FreeSR.Gateserver.Manager.Handlers
                     },
                 };
 
-                sceneInfo.EntityLists.Add(calaxInfoTest);
+                sceneInfo.EntityGroupLists.Add(new SceneEntityGroupInfo
+                {
+                    GroupId = 19,
+                    EntityLists = { calaxInfoTest }
+                });
 
                 session.Send(CmdType.CmdEnterSceneByServerScNotify, new EnterSceneByServerScNotify
                 {
@@ -121,7 +124,7 @@ namespace FreeSR.Gateserver.Manager.Handlers
 
             Dictionary<uint, uint> monsterLevels = new Dictionary<uint, uint>
             {
-                {1,70},{2,70},{3,60}
+                { 1, 70 }, { 2, 70 }, { 3, 60 }
             };
 
             //basic
@@ -137,15 +140,19 @@ namespace FreeSR.Gateserver.Manager.Handlers
                 Id = 61011,
                 Level = 999,
                 MainAffixId = 1,
-                SubAffixLists = {new RelicAffix
+                SubAffixLists =
+                {
+                    new RelicAffix
                     {
                         AffixId = 4,
                         Step = 999
-                } }
+                    }
+                }
             };
 
             //avatar
-            List<uint> SkillIdEnds = new List<uint> { 1, 2, 3, 4, 7, 101, 102, 103, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210 };
+            List<uint> SkillIdEnds = new List<uint>
+                { 1, 2, 3, 4, 7, 101, 102, 103, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210 };
             List<uint> characters = new List<uint> { Avatar1, Avatar2, Avatar3, Avatar4 };
             foreach (uint avatarId in characters)
             {
@@ -160,13 +167,16 @@ namespace FreeSR.Gateserver.Manager.Handlers
                     WorldLevel = 6,
                     SpBar = new SpBarInfo { CurSp = 10000, MaxSp = 10000 },
                     RelicLists = { testRelic },
-                    EquipmentLists = {new BattleEquipment
+                    EquipmentLists =
+                    {
+                        new BattleEquipment
                         {
                             Id = 23006,
                             Level = 80,
                             Rank = 5,
                             Promotion = 6
-                    } }
+                        }
+                    }
                 };
 
                 foreach (uint end in SkillIdEnds)
@@ -208,8 +218,8 @@ namespace FreeSR.Gateserver.Manager.Handlers
                             MonsterId = monsterId
                         });
                     }
-                    
                 }
+
                 battleInfo.MonsterWaveLists.Add(monsterInfo);
             }
 

FreeSR.Gateserver/Manager/Handlers/PlayerReqGroup.cs

@@ -28,7 +28,7 @@
                 {
                     Version = 51,
                     Time = DateTimeOffset.Now.ToUnixTimeMilliseconds(),
-                    Data = Convert.FromBase64String("G0x1YVMBGZMNChoKBAQICHhWAAAAAAAAAAAAAAAod0ABD0BGcmVlU1JMdWEudHh0AAAAAAAAAAAAAQccAAAAJABAAClAQAApgEAAKcBAAFYAAQAsgAABXUBBAOSAQQAkAUAAKcFBAikBQgIpQUIC7AAAAWyAAACWgAIA6cDCAMEAwwEWAQMAqoABgKlBgQCpQUMDqYFDAxLAQwMRQACAqUGBAJ9BRIiewP1/GQCAABIAAAAEA0NTBAxVbml0eUVuZ2luZQQLR2FtZU9iamVjdAQFRmluZAQpVUlSb290L0Fib3ZlRGlhbG9nL0JldGFIaW50RGlhbG9nKENsb25lKQQYR2V0Q29tcG9uZW50c0luQ2hpbGRyZW4EB3R5cGVvZgQEUlBHBAdDbGllbnQEDkxvY2FsaXplZFRleHQTAAAAAAAAAAAEB0xlbmd0aBMBAAAAAAAAAAQLZ2FtZU9iamVjdAQFbmFtZQQJSGludFRleHQEBXRleHQUYTxiPkZyZWVTUiBpcyBhIGZyZWUgc29mdHdhcmUuRnJlZVNS5piv5LiA5Liq5YWN6LS56L2v5Lu244CCIGh0dHBzOi8vZGlzY29yZC5nZy9yZXZlcnNlZHJvb21zPC9iPgEAAAABAAAAAAAcAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAAEAAAABAAAAAQAAAAEAAAABAAAAAUAAAAFAAAABQAAAAUAAAAFAAAABgAAAAYAAAAEAAAACQAAAAYAAAAEb2JqBgAAABwAAAAHY29tcHRzDgAAABwAAAAMKGZvciBpbmRleCkSAAAAGwAAAAwoZm9yIGxpbWl0KRIAAAAbAAAACyhmb3Igc3RlcCkSAAAAGwAAAAJpEwAAABoAAAABAAAABV9FTlY=")
+                    Data = Convert.FromBase64String("bG9jYWwgb2JqID0gQ1MuVW5pdHlFbmdpbmUuR2FtZU9iamVjdC5GaW5kKCJVSVJvb3QvQWJvdmVEaWFsb2cvQmV0YUhpbnREaWFsb2coQ2xvbmUpIikKbG9jYWwgY29tcHRzID0gb2JqOkdldENvbXBvbmVudHNJbkNoaWxkcmVuKHR5cGVvZihDUy5SUEcuQ2xpZW50LkxvY2FsaXplZFRleHQpKQpmb3IgaSA9IDAsIGNvbXB0cy5MZW5ndGggLSAxIGRvCiAgaWYgY29tcHRzW2ldLmdhbWVPYmplY3QubmFtZSA9PSAiSGludFRleHQiIHRoZW4KICAgIGNvbXB0c1tpXS50ZXh0ID0gIjxiPkZyZWVTUiBpcyBhIGZyZWUgc29mdHdhcmUuRnJlZVNSXDIzMFwxNTJcMTc1XDIyOFwxODRcMTI4XDIyOFwxODRcMTcwXDIyOVwxMzNcMTQxXDIzMlwxODBcMTg1XDIzMlwxODlcMTc1XDIyOFwxODdcMTgyXDIyN1wxMjhcMTMwIGh0dHBzOi8vZGlzY29yZC5nZy9yZXZlcnNlZHJvb21zPC9iPiIKICBlbmQKZW5k")
                 },
                 ClientTimeMs = heartbeatReq.ClientTimeMs,
                 ServerTimeMs = (ulong)DateTimeOffset.Now.ToUnixTimeMilliseconds()