|
@@ -66,7 +66,7 @@ namespace ET.Server
|
|
|
{
|
|
|
response.SceneId = scene.InstanceId;
|
|
|
reply();
|
|
|
- WaitPlayerReady(session.DomainScene(), player.Id).Coroutine();
|
|
|
+ WaitPlayerReady(session.DomainScene(), scnInstance, player.Id).Coroutine();
|
|
|
|
|
|
|
|
|
|
|
@@ -86,15 +86,22 @@ namespace ET.Server
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- private async ETTask WaitPlayerReady(Scene scn, long playerid)
|
|
|
+ private async ETTask WaitPlayerReady(Scene scn, string scnInstance, long playerid)
|
|
|
{
|
|
|
|
|
|
await scn.GetComponent<ObjectWait>().Wait<Wait_PlayerReady>();
|
|
|
|
|
|
|
|
|
+ var playidstr = playerid.ToString();
|
|
|
|
|
|
var IceXmds = BattleIceAgentComponent.Instance.IceXmdsManager;
|
|
|
- IceXmds.playerReady(playerid.ToString());
|
|
|
+ IceXmds.playerReady(playidstr);
|
|
|
+
|
|
|
+
|
|
|
+ IceXmds.refreshPlayerPKMode(playidstr, false, (int)PkModel.All);
|
|
|
+
|
|
|
+
|
|
|
+ IceXmds.autoBattle(scnInstance, playidstr, true);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -105,7 +112,7 @@ namespace ET.Server
|
|
|
{
|
|
|
monsterHard = "",
|
|
|
calPKValue = false,
|
|
|
- allowAutoGuard = 1,
|
|
|
+ allowAutoGuard = 3,
|
|
|
usespaceDiv = false,
|
|
|
sceneType = 1,
|
|
|
areaType = 0,
|
|
@@ -128,8 +135,8 @@ namespace ET.Server
|
|
|
MaxHP = 666,
|
|
|
HPPer = 1,
|
|
|
HP = 233,
|
|
|
- Attack = 5,
|
|
|
- AttackPer = 1,
|
|
|
+ Attack = 10,
|
|
|
+ AttackPer = 100,
|
|
|
|
|
|
},
|
|
|
effectsExt = new { },
|
|
@@ -140,14 +147,12 @@ namespace ET.Server
|
|
|
tasks = new { },
|
|
|
flags = new { },
|
|
|
playerEntered = false,
|
|
|
- avatars = new
|
|
|
- {
|
|
|
- },
|
|
|
+ avatars = new { },
|
|
|
basic = new
|
|
|
{
|
|
|
name = "nickname",
|
|
|
alliesForce = 0,
|
|
|
- force = 0,
|
|
|
+ force = 1,
|
|
|
pro = 1,
|
|
|
serverId = 101,
|
|
|
titleId = 0,
|
|
@@ -169,7 +174,7 @@ namespace ET.Server
|
|
|
|
|
|
|
|
|
x = 3,
|
|
|
- y = 4,
|
|
|
+ y = 10,
|
|
|
direction = 0.1,
|
|
|
hp = 1000,
|
|
|
mp = 0,
|
|
@@ -184,7 +189,7 @@ namespace ET.Server
|
|
|
addTestPetData = 0,
|
|
|
sceneData = new
|
|
|
{
|
|
|
- allowAutoGuard = 1,
|
|
|
+ allowAutoGuard = 3,
|
|
|
},
|
|
|
};
|
|
|
var retjson = System.Text.Json.JsonSerializer.Serialize(json, new JsonSerializerOptions { IncludeFields = true });
|