From dd5de3e66814e73cb8d3390720803ce2f9c4429c Mon Sep 17 00:00:00 2001 From: "jiannan.guo@yingxiong.com" Date: Fri, 25 Jul 2025 17:04:33 +0800 Subject: [PATCH] cansu --- .../CoreGame/AFramSync/Logic/BattleLogicWorld.cs | 12 ++++++------ .../AFramSync/Shared/Bridge/Context/BattleModel.cs | 4 ++-- .../CoreGame/AFramSync/Shared/CoreGameConfig.cs | 3 +++ client/client/Assets/Scripts/UI/Const/Context.cs | 7 +++---- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/BattleLogicWorld.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/BattleLogicWorld.cs index 2d195123..b2bccbfe 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/BattleLogicWorld.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/BattleLogicWorld.cs @@ -60,13 +60,13 @@ namespace CoreGame.Logic var size = LogicContext.WorldExtendSize; LEntityCreatorSvc.CreateBattleHero(battleModel); - LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(-size.x - Fixed64._0_50,0) , new Fixed64Vector2(1, size.y), 0); + LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(-size.x - Fixed64._0_50,0) , new Fixed64Vector2(1 - Fixed64._0_10, size.y), 0); LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(-size.x - Fixed64._0_50,0) , new Fixed64Vector2(Fixed64._0_75,size.y), 0); - LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(size.x + Fixed64._0_50, 0), new Fixed64Vector2(1, size.y), 1); + LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(size.x + Fixed64._0_50, 0), new Fixed64Vector2(1- Fixed64._0_10, size.y), 1); LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(size.x + Fixed64._0_50, 0), new Fixed64Vector2(Fixed64._0_75, size.y), 1); - LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(0, size.y + Fixed64._0_50), new Fixed64Vector2(size.x, 1), 2); + LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(0, size.y + Fixed64._0_50), new Fixed64Vector2(size.x, 1- Fixed64._0_10), 2); LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(0, size.y + Fixed64._0_50), new Fixed64Vector2(size.x, Fixed64._0_75), 2); - LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(0, -size.y - Fixed64._0_50), new Fixed64Vector2(size.x, 1), 3); + LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(0, -size.y - Fixed64._0_50), new Fixed64Vector2(size.x, 1- Fixed64._0_10), 3); LEntityCreatorSvc.CreateWallEntity(new Fixed64Vector2(0, -size.y - Fixed64._0_50), new Fixed64Vector2(size.x, Fixed64._0_75), 3); // for (int i = 0; i < size.x; i++) @@ -90,8 +90,8 @@ namespace CoreGame.Logic // LSingleton.instance.InitScene(20, 50); var global = LogicContext.CreateEntity("Global"); LogicContext.SetGlobalEnt(global); - LogicContext.SetWorldSize(new Fixed64Vector2(8, 13)); - global.AddLevelWave(15, 13, 1, 0, Fixed64._2); + LogicContext.SetWorldSize(CoreGameConfig.ExtendSize); + global.AddLevelWave((CoreGameConfig.ExtendSize.x * 2 - 1 + Fixed64._0_01).AsInt, CoreGameConfig.ExtendSize.y.AsInt, 1, 0, CoreGameConfig.TurnTime); LogicContext.SetPhyWorld(new PhysicsWorld(LogicTime.FrameSpanMs, 0, PhysicsConfig.DEFAULT_DAMPING)); PhysicsWorld.DrawLine = (start, end, color, duration) => diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/Bridge/Context/BattleModel.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/Bridge/Context/BattleModel.cs index 67cdefbd..32fd3320 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/Bridge/Context/BattleModel.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/Bridge/Context/BattleModel.cs @@ -63,8 +63,8 @@ namespace CoreGame.Shared.Bridge public static int n = 6; public static readonly Fixed64Vector2[,] s_Pos = new Fixed64Vector2[2, 2] { - {new(-5, -n), new (5, -n)}, - {new(5, n), new (-5, n)} + {new(-3, -n), new (3, -n)}, + {new(3, n), new (-3, n)} }; public static Fixed64Vector2 GetPos(this HeroModel heroModel) { diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/CoreGameConfig.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/CoreGameConfig.cs index 841aa1d5..e9649b7f 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/CoreGameConfig.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/CoreGameConfig.cs @@ -65,5 +65,8 @@ namespace CoreGame.Shared }; public static float AttachOutTime = 5f; + + public static Fixed64Vector2 ExtendSize = new Fixed64Vector2(Fixed64._0_50 + 4, 9); + public static Fixed64 TurnTime = Fixed64._2; } } \ No newline at end of file diff --git a/client/client/Assets/Scripts/UI/Const/Context.cs b/client/client/Assets/Scripts/UI/Const/Context.cs index 1b17ad7a..bf650b7f 100644 --- a/client/client/Assets/Scripts/UI/Const/Context.cs +++ b/client/client/Assets/Scripts/UI/Const/Context.cs @@ -2,11 +2,10 @@ { public static class Context { - public static string[] versionIPs = new string[] { "10.0.22.46" }; + public static string[] versionIPs = new string[] { "123.57.11.107" }; public static int versionPort = 9602; - public static string gameIP = "10.0.22.46"; - // public static int gamePort = 49720; - public static int gamePort = 9603; + public static string gameIP = "123.57.11.107"; + public static int gamePort = 9720; public static string maintenanceIP = "10.0.22.46"; public static string buildMode = "apk"; public static string lang = "en";