update

Author: hhzzff

interface/interface_playback/Assets/Scripts/UI/InspectorControl.cs

@@ -30,7 +30,7 @@ void Update()
                 {
                     case MessageOfObj.MessageOfObjOneofCase.HomeMessage:
                         showText.text = "类型：基地" + (interactBase.messageOfObject.HomeMessage.TeamId == 0 ? "(RED)" : "(BLUE)") + "\n"
-                        + "血量：" + interactBase.messageOfObject.HomeMessage.Hp + "/24000" + "\n";
+                        + "血量：" + interactBase.messageOfObject.HomeMessage.Hp + "/48000" + "\n";
                         break;
                     case MessageOfObj.MessageOfObjOneofCase.ShipMessage:
                         showText.text = "类型：" + ShipTypeToString(interactBase.messageOfObject.ShipMessage.ShipType)
@@ -45,19 +45,19 @@ void Update()
                         break;
                     case MessageOfObj.MessageOfObjOneofCase.ResourceMessage:
                         showText.text = "类型：资源" + "\n"
-                        + "剩余资源：" + interactBase.messageOfObject.ResourceMessage.Progress + "/16000" + "\n";
+                        + "剩余资源：" + interactBase.messageOfObject.ResourceMessage.Progress + "/32000" + "\n";
                         break;
                     case MessageOfObj.MessageOfObjOneofCase.FactoryMessage:
                         showText.text = "类型：工厂" + (interactBase.messageOfObject.FactoryMessage.TeamId == 0 ? "(RED)" : "(BLUE)") + "\n"
-                        + "血量：" + interactBase.messageOfObject.FactoryMessage.Hp + "/8000" + "\n";
+                        + "血量：" + interactBase.messageOfObject.FactoryMessage.Hp + "/12000" + "\n";
                         break;
                     case MessageOfObj.MessageOfObjOneofCase.CommunityMessage:
                         showText.text = "类型：社区" + (interactBase.messageOfObject.CommunityMessage.TeamId == 0 ? "(RED)" : "(BLUE)") + "\n"
-                        + "血量：" + interactBase.messageOfObject.CommunityMessage.Hp + "/6000" + "\n";
+                        + "血量：" + interactBase.messageOfObject.CommunityMessage.Hp + "/10000" + "\n";
                         break;
                     case MessageOfObj.MessageOfObjOneofCase.FortMessage:
                         showText.text = "类型：堡垒" + (interactBase.messageOfObject.FortMessage.TeamId == 0 ? "(RED)" : "(BLUE)") + "\n"
-                        + "血量：" + interactBase.messageOfObject.FortMessage.Hp + "/12000" + "\n";
+                        + "血量：" + interactBase.messageOfObject.FortMessage.Hp + "/16000" + "\n";
                         break;
                     default: break;
                 }

interface/interface_playback/Assets/Scripts/UI/UIControl.cs

@@ -37,10 +37,10 @@ public void updateUI()
         if (CoreParam.currentFrame != null)
         {
             healthText1.text = "Health: " + CoreParam.currentFrame.AllMessage.RedHomeHp;
-            healthSlider1.value = CoreParam.currentFrame.AllMessage.RedHomeHp / 24000f;
+            healthSlider1.value = CoreParam.currentFrame.AllMessage.RedHomeHp / 48000f;
             ecoText1.text = "$" + CoreParam.currentFrame.AllMessage.RedTeamEnergy.ToString();
             healthText2.text = "Health: " + CoreParam.currentFrame.AllMessage.BlueHomeHp;
-            healthSlider2.value = CoreParam.currentFrame.AllMessage.BlueHomeHp / 24000f;
+            healthSlider2.value = CoreParam.currentFrame.AllMessage.BlueHomeHp / 48000f;
             ecoText2.text = "$" + CoreParam.currentFrame.AllMessage.BlueTeamEnergy.ToString();
         }
     }

logic/ClientTest/Program.cs

@@ -12,7 +12,7 @@ public static Task Main(string[] args)
             var client = new AvailableService.AvailableServiceClient(channel);
             PlayerMsg playerInfo = new()
             {
-                PlayerId = 0,
+                PlayerId = 1,
                 TeamId = 0,
                 ShipType = ShipType.CivilianShip
             };
@@ -33,10 +33,10 @@ public static Task Main(string[] args)
             while (true)
             {
                 Thread.Sleep(50);
-                MoveRes boolRes = client.Move(moveMsg);
+                //MoveRes boolRes = client.Move(moveMsg);
                 //if (boolRes.ActSuccess == false) break;
                 tot++;
-                if (tot % 10 == 0) moveMsg.Angle += 1;
+                //if (tot % 10 == 0) moveMsg.Angle += 1;
             }
             return Task.CompletedTask;
         }

logic/Gaming/Game.cs

@@ -25,8 +25,8 @@ public struct PlayerInitInfo(long teamID, long playerID, ShipType shipType)
         private readonly Map gameMap;
         public Map GameMap => gameMap;
         private readonly Random random = new();
-        public long AddPlayer(PlayerInitInfo playerInitInfo)
-        {
+        public long AddPlayer(PlayerInitInfo playerInitInfo) {
+            Console.WriteLine($"teamList.Count = {teamList.Count}");
             if (!gameMap.TeamExists(playerInitInfo.teamID))
             {
                 return GameObj.invalidID;

logic/Server/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Server": {
       "commandName": "Project",
-      "commandLineArgs": "--port 8888"
+      "commandLineArgs": "--port 8888 --teamCount 1 --shipNum 1"
     }
   }
 }

map-generator/JavaScript/assets/js/map.js

@@ -234,7 +234,9 @@ function generateConstruction(num = 5) {
 function generateShadow(prob = 0.015, crossBonus = 23) {
     for (var i = 0; i < 50; i++) {
         for (var j = 0; j < 50; j++) {
-            if (map[i][j] == 0 && Math.random() < prob * (haveSthCross(i, j, 1, placeType.Shadow) * crossBonus + 1)) {
+            const crossCount = haveSthCross(i, j, 1, placeType.Shadow);
+            console.log(`Cross count at (${i}, ${j}):`, crossCount);
+            if (map[i][j] == 0 && Math.random() < prob * (crossCount * crossBonus + 1)) {
                 map[i][j] = placeType.Shadow;
                 map[49 - i][49 - j] = placeType.Shadow;
             }